diff options
164 files changed, 2730 insertions, 1429 deletions
diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml index 3f864cf6504..4f7be8f8a82 100644 --- a/app-emacs/pymacs/metadata.xml +++ b/app-emacs/pymacs/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>emacs</herd> -<herd>python</herd> -<upstream> - <remote-id type="github">pinard/Pymacs</remote-id> -</upstream> + <herd>emacs</herd> + <herd>python</herd> + <upstream> + <remote-id type="github">pinard/Pymacs</remote-id> + </upstream> </pkgmetadata> diff --git a/app-emacs/pymacs/pymacs-0.25-r2.ebuild b/app-emacs/pymacs/pymacs-0.25-r2.ebuild new file mode 100644 index 00000000000..15852acb6d4 --- /dev/null +++ b/app-emacs/pymacs/pymacs-0.25-r2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit elisp distutils-r1 vcs-snapshot + +DESCRIPTION="A tool that allows both-side communication beetween Python and Emacs Lisp" +HOMEPAGE="http://www.emacswiki.org/emacs/PyMacs" +SRC_URI="https://github.com/pinard/Pymacs/tarball/v${PV} -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="doc" + +DEPEND="doc? ( >=dev-python/docutils-0.7 + virtual/latex-base )" +RDEPEND="" + +DISTUTILS_IN_SOURCE_BUILD=1 +SITEFILE="50${PN}-gentoo.el" + +# called by distutils-r1 for every python implementation +python_configure() { + # pre-process the files but don't run distutils + emake PYSETUP=: PYTHON=${EPYTHON} +} + +# called once +python_compile_all() { + elisp_src_compile + if use doc; then + VARTEXFONTS="${T}"/fonts emake RST2LATEX=rst2latex.py pymacs.pdf + fi +} + +python_install_all() { + elisp_src_install + + sed \ + -e '/pymacs-python-command/s:"python.*:"python":g' \ + -i "${ED}"/${SITELISP}/pymacs/pymacs.el || die + elisp-compile "${ED}"/${SITELISP}/pymacs/pymacs.el + + distutils-r1_python_install_all + dodoc pymacs.rst + use doc && dodoc pymacs.pdf +} diff --git a/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild index 9e2b24086e3..d2be7c5d90c 100644 --- a/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.5.2-r4.ebuild @@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then S="${WORKDIR}/${REPO}" live_eclass="mercurial" else - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" UPSTREAM_VER= SECURITY_VER=7 # vars set to reflect https://dev.gentoo.org/~idella4/ diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r7.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r7.ebuild index 69a38dd6ca9..d4d83ffe55b 100644 --- a/app-emulation/xen-tools/xen-tools-4.6.0-r7.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.6.0-r7.ebuild @@ -19,7 +19,7 @@ if [[ $PV == *9999 ]]; then EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" S="${WORKDIR}/${REPO}" else - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" UPSTREAM_VER=0 SECURITY_VER=7 # vars set to reflect https://dev.gentoo.org/~idella4/ diff --git a/app-emulation/xen/xen-4.5.2-r4.ebuild b/app-emulation/xen/xen-4.5.2-r4.ebuild index 562dff8085b..659c2909bc5 100644 --- a/app-emulation/xen/xen-4.5.2-r4.ebuild +++ b/app-emulation/xen/xen-4.5.2-r4.ebuild @@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git" SRC_URI="" else - KEYWORDS="~amd64 ~arm ~arm64 -x86" + KEYWORDS="amd64 ~arm ~arm64 -x86" UPSTREAM_VER= SECURITY_VER=0 # var set to reflect https://dev.gentoo.org/~idella4/ diff --git a/app-emulation/xen/xen-4.6.0-r8.ebuild b/app-emulation/xen/xen-4.6.0-r8.ebuild index e18fe471dbe..45064a4b497 100644 --- a/app-emulation/xen/xen-4.6.0-r8.ebuild +++ b/app-emulation/xen/xen-4.6.0-r8.ebuild @@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then EGIT_REPO_URI="git://xenbits.xen.org/xen.git" SRC_URI="" else - KEYWORDS="~amd64 ~arm ~arm64 -x86" + KEYWORDS="amd64 ~arm ~arm64 -x86" UPSTREAM_VER=0 SECURITY_VER=0 # var set to reflect https://dev.gentoo.org/~idella4/ diff --git a/app-misc/ckermit/metadata.xml b/app-misc/ckermit/metadata.xml index 59e2b8f78cb..8dc8f03abd0 100644 --- a/app-misc/ckermit/metadata.xml +++ b/app-misc/ckermit/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer> - <email>maintainer-needed@gentoo.org</email> - <name>Default assignee for orphaned packages</name> - </maintainer> + <herd>embedded</herd> </pkgmetadata> diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest index 341f83ac0d6..ea863478ddf 100644 --- a/app-shells/mksh/Manifest +++ b/app-shells/mksh/Manifest @@ -1,5 +1,2 @@ -DIST mksh-R50d.tgz 374014 SHA256 a2268826a1463959ff7b7979fbf9176f1298400ecc24ae13d6337eee5c63f982 SHA512 1bb545d00e3ce5783541c88e1fea47cbd01e2103c60be7d6f5b8bf02d30576d543c4e9f6786b8d14785554c11ca1123364297a2cce0c5c3a5901b6e717594bd8 WHIRLPOOL 899b3feed7610328971b17195701dedf732507c52cd35c69bc2f3778243b344f7c8546871b7b728d122c99aa38c9b525aedeb8f5be8cd90ee2c74b32cb2ce64b -DIST mksh-R50e.tgz 376013 SHA256 ad3c148769d08cf934a96be2837599ba9db355f38a8f49c7bc8876b80d2e08da SHA512 70d904eb4dfdaf28ee5858d1abec296d69e428e3a81e5802640bc4b95a4c77e08ad8f301b29063f329081428e4b9583f0203e9b509263e8e7b9a705ac63acde5 WHIRLPOOL 1b6d6e0c4413eac44f033945fc2fbe2891623821c1f1a5ceea0084dc834d8754f2582ffac72567138f337e7fdf069f19a79644fc3987fd6cb971c74bde5c209f -DIST mksh-R50f.tgz 377797 SHA256 74e051ce92ece9555d91505b956572f64668fc88c5ccabee742099e7f29a2bcb SHA512 ca0b5d986727afc8b295b4a81c84e0048f1650c4ea3c45dcc05cabcc474bca4ab4719a063b708f3ddee08d65f35651652c0938b4279f6d706182d46ea5566cc1 WHIRLPOOL a5845cf4fa89b91f076e6eb7af5a176e98dd766a9dc3840acb832f3305c1b7b4f5e01871684a33b0491e34f841a5f6d75f34fba78f99be4852634f337b2054b4 -DIST mksh-R51.tgz 382169 SHA256 9feeaa5ff33d8199c0123675dec29785943ffc67152d58d431802bc20765dadf SHA512 dea2dea283959c0564cb6e9dbb9eecf004365cd01d83f1a8bbaff319c8ebefc4eb5e85898e207c7ce0577af525be0563e7c6b5f4b3449a2439e93f3f8bfd43ea WHIRLPOOL e626b4ffe5f637486a75a4008e51ddd3dd4c9c739dcb6b1502ee0b04f9ade20e55856497dacb5e7228d5b16af015e55fd33753b1d092c8aa7adcd5dd5e30681a DIST mksh-R52.tgz 383814 SHA256 45c2f5cdd2c63a6a831ffae65cea0afd021eabb983537aa21ff893ee38b3768f SHA512 83b478baa401dc6116c363043d9d6629028bbcdf19448db939738c5b98f8e4f7da92932296c2ee813b317151d31a1b6cd55d27f062f79e587e22991b018a0285 WHIRLPOOL 524524b950d5f7f21a2660235f955c45e645bcebf1e6120e71c183a0d50da5974840d7f70a18ab6d0766ad5345f62cd657f2fbcc1cd2d33976943f3bb28c243a +DIST mksh-R52b.tgz 385085 SHA256 93231332a1df0a9c8d4a0d54a519d8b485989a52f7400f0e6451366a0c74b81f SHA512 d204f0d0e221a8592dc0efdb31b909ce522792708937ab1f3ec0a4b1098f2d5171c06cda029a9f7e63eb087a1acf53210f4701cee5564868c15c6294e6fe322f WHIRLPOOL 687eba233332ad7d4de53a57e53a5f851558190ea69daca21ea820a85fbeca00da8fa92e9d8a4dd833498d9adb80482c3394913a61251e9fe2a3cc9e962e74e4 diff --git a/app-shells/mksh/mksh-50d.ebuild b/app-shells/mksh/mksh-50d.ebuild deleted file mode 100644 index 016d79f5904..00000000000 --- a/app-shells/mksh/mksh-50d.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="MirBSD KSH Shell" -HOMEPAGE="http://mirbsd.de/mksh" -SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="static" -DEPEND="static? ( dev-libs/klibc )" -RDEPEND="" -S="${WORKDIR}/${PN}" - -src_compile() { - tc-export CC - # we want to build static with klibc - if use static ; then - unset CC - export CC="/usr/bin/klcc" - export LDSTATIC="-static" - fi - export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\"" - # we can't assume lto existing/enabled, so we add a fallback - sh Build.sh -r -c lto || sh Rebuild.sh || die -} - -src_install() { - exeinto /bin - doexe mksh - doman mksh.1 - dodoc dot.mkshrc -} - -src_test() { - ./test.sh || die -} diff --git a/app-shells/mksh/mksh-50e.ebuild b/app-shells/mksh/mksh-50e.ebuild deleted file mode 100644 index f400822beee..00000000000 --- a/app-shells/mksh/mksh-50e.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="MirBSD KSH Shell" -HOMEPAGE="http://mirbsd.de/mksh" -SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="static" -DEPEND="static? ( dev-libs/klibc )" -RDEPEND="" -S="${WORKDIR}/${PN}" - -src_compile() { - tc-export CC - # we want to build static with klibc - if use static ; then - unset CC - export CC="/usr/bin/klcc" - export LDSTATIC="-static" - fi - export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\"" - # we can't assume lto existing/enabled, so we add a fallback - sh Build.sh -r -c lto || sh Rebuild.sh || die -} - -src_install() { - exeinto /bin - doexe mksh - doman mksh.1 - dodoc dot.mkshrc -} - -src_test() { - ./test.sh || die -} - -pkg_postinst() { - ebegin "Updating /etc/shells" - ( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells - mv -f "${T}"/shells "${ROOT}"etc/shells - eend $? -} diff --git a/app-shells/mksh/mksh-50f.ebuild b/app-shells/mksh/mksh-50f.ebuild deleted file mode 100644 index f400822beee..00000000000 --- a/app-shells/mksh/mksh-50f.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="MirBSD KSH Shell" -HOMEPAGE="http://mirbsd.de/mksh" -SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="static" -DEPEND="static? ( dev-libs/klibc )" -RDEPEND="" -S="${WORKDIR}/${PN}" - -src_compile() { - tc-export CC - # we want to build static with klibc - if use static ; then - unset CC - export CC="/usr/bin/klcc" - export LDSTATIC="-static" - fi - export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\"" - # we can't assume lto existing/enabled, so we add a fallback - sh Build.sh -r -c lto || sh Rebuild.sh || die -} - -src_install() { - exeinto /bin - doexe mksh - doman mksh.1 - dodoc dot.mkshrc -} - -src_test() { - ./test.sh || die -} - -pkg_postinst() { - ebegin "Updating /etc/shells" - ( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells - mv -f "${T}"/shells "${ROOT}"etc/shells - eend $? -} diff --git a/app-shells/mksh/mksh-51.ebuild b/app-shells/mksh/mksh-51.ebuild deleted file mode 100644 index ee08d617cf7..00000000000 --- a/app-shells/mksh/mksh-51.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="MirBSD KSH Shell" -HOMEPAGE="http://mirbsd.de/mksh" -SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="static" -DEPEND="static? ( dev-libs/klibc )" -RDEPEND="" -S="${WORKDIR}/${PN}" - -src_compile() { - tc-export CC - # we want to build static with klibc - if use static ; then - unset CC - export CC="/usr/bin/klcc" - export LDSTATIC="-static" - fi - export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\"" - # we can't assume lto existing/enabled, so we add a fallback - sh Build.sh -r -c lto || sh Build.sh -r || die -} - -src_install() { - exeinto /bin - doexe mksh - doman mksh.1 - dodoc dot.mkshrc -} - -src_test() { - ./test.sh || die -} - -pkg_postinst() { - ebegin "Updating /etc/shells" - ( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells - mv -f "${T}"/shells "${ROOT}"etc/shells - eend $? -} diff --git a/app-shells/mksh/mksh-50d-r1.ebuild b/app-shells/mksh/mksh-52b.ebuild index f400822beee..e2df980dbb4 100644 --- a/app-shells/mksh/mksh-50d-r1.ebuild +++ b/app-shells/mksh/mksh-52b.ebuild @@ -27,7 +27,7 @@ src_compile() { fi export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\"" # we can't assume lto existing/enabled, so we add a fallback - sh Build.sh -r -c lto || sh Rebuild.sh || die + sh Build.sh -r -c lto || sh Build.sh -r || die } src_install() { diff --git a/dev-db/mycli/mycli-1.5.2-r1.ebuild b/dev-db/mycli/mycli-1.5.2-r1.ebuild new file mode 100644 index 00000000000..4b5c124e1f3 --- /dev/null +++ b/dev-db/mycli/mycli-1.5.2-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +inherit distutils-r1 + +DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting" + +HOMEPAGE="http://mycli.net" +SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND=" + >=dev-python/click-4.1[${PYTHON_USEDEP}] + >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}] + =dev-python/prompt_toolkit-0.46[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + >=dev-python/pygments-2.0[${PYTHON_USEDEP}] + >=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}] + >=dev-python/python-sqlparse-0.1.16[${PYTHON_USEDEP}] +" + +src_prepare() { + rm mycli/packages/counter.py || die "Could not remove python 2.6 counter.py" + distutils-r1_src_prepare +} diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild index a21b495be88..b9ceb8c0e8f 100644 --- a/dev-db/mycli/mycli-9999.ebuild +++ b/dev-db/mycli/mycli-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -20,8 +20,9 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND=" >=dev-python/click-4.1[${PYTHON_USEDEP}] >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}] + =dev-python/prompt_toolkit-0.57[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] >=dev-python/pygments-2.0[${PYTHON_USEDEP}] - =dev-python/prompt_toolkit-0.46[${PYTHON_USEDEP}] >=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}] >=dev-python/python-sqlparse-0.1.16[${PYTHON_USEDEP}] " diff --git a/dev-embedded/gnap-ext/metadata.xml b/dev-embedded/gnap-ext/metadata.xml index 2d5a14582e9..91f4e72fb54 100644 --- a/dev-embedded/gnap-ext/metadata.xml +++ b/dev-embedded/gnap-ext/metadata.xml @@ -2,6 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>gnap@gentoo.org</email> + <email>maintainer-needed@gentoo.org</email> </maintainer> </pkgmetadata> diff --git a/dev-games/ogre/files/ogre-1.9.0-samples.patch b/dev-games/ogre/files/ogre-1.9.0-samples.patch new file mode 100644 index 00000000000..d7573d7662b --- /dev/null +++ b/dev-games/ogre/files/ogre-1.9.0-samples.patch @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -519,7 +519,9 @@ + endif () + + # Setup samples +-add_subdirectory(Samples) ++if (OGRE_BUILD_SAMPLES) ++ add_subdirectory(Samples) ++endif () + + #Add android JNI binding + if(ANDROID) diff --git a/dev-games/ogre/ogre-1.9.0-r1.ebuild b/dev-games/ogre/ogre-1.9.0-r1.ebuild index 9b79034fd62..7488f4bff16 100644 --- a/dev-games/ogre/ogre-1.9.0-r1.ebuild +++ b/dev-games/ogre/ogre-1.9.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 CMAKE_REMOVE_MODULES="yes" -CMAKE_REMOVE_MODULES_LIST="FindFreetype" +CMAKE_REMOVE_MODULES_LIST="FindFreetype FindDoxygen FindZLIB" inherit eutils cmake-utils vcs-snapshot @@ -21,6 +21,7 @@ KEYWORDS="amd64 ~arm x86" IUSE="+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl poco profile tbb threads tools +zip" REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) ) + examples? ( ois ) poco? ( threads ) tbb? ( threads ) ?? ( gl3plus ( || ( gles2 gles3 ) ) ) @@ -71,7 +72,8 @@ src_prepare() { epatch \ "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" \ "${FILESDIR}/${P}-remove_media_path_to_bindir.patch" \ - "${FILESDIR}/${P}-gcc52.patch" + "${FILESDIR}/${P}-gcc52.patch" \ + "${FILESDIR}/${P}-samples.patch" } src_configure() { @@ -81,7 +83,6 @@ src_configure() { $(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG) $(cmake-utils_use doc OGRE_INSTALL_DOCS) $(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE) - $(cmake-utils_use examples OGRE_INSTALL_SAMPLES) $(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE) $(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL) $(cmake-utils_use gl3plus OGRE_BUILD_RENDERSYSTEM_GL3PLUS) @@ -90,9 +91,10 @@ src_configure() { $(cmake-utils_use gles3 OGRE_CONFIG_ENABLE_GLES3_SUPPORT) $(cmake-utils_use profile OGRE_PROFILING) $(cmake-utils_use examples OGRE_BUILD_SAMPLES) + $(cmake-utils_use examples OGRE_INSTALL_SAMPLES) $(cmake-utils_use examples OGRE_INSTALL_SAMPLES_SOURCE) -DOGRE_BUILD_TESTS=FALSE - $(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0") + -DOGRE_CONFIG_THREADS=$(usex threads 2 0) $(cmake-utils_use tools OGRE_BUILD_TOOLS) $(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP) ) diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest index e05fd1fff83..470c5002b0c 100644 --- a/dev-go/go-tools/Manifest +++ b/dev-go/go-tools/Manifest @@ -2,3 +2,4 @@ DIST go-favicon.ico 1150 SHA256 d76ca702a6d81e20ddd31c8c5a4368130e7c68d990600316 DIST go-tools-0_pre20150805.tar.gz 1633388 SHA256 80db6fc563df50eb924dbf4f96cef287fc6b89cc8b98595c1dac3c80a118f290 SHA512 80813c2da74c7b25fa2cfd15b2505757e7f466469ac701cb22d190dc83a607f091c4dea207a2e371e53d7a1f5459e7b53e5eea53c95565e958a6eb7fcb212359 WHIRLPOOL 3b000f830d81c35e6f76a9883d9430eb7fe0f546a36579a150a7bd8f825146a0623726a98a7b7f764825c9fee30af1f89b3bbc98efeaf05fe8f64bbb127a1f68 DIST go-tools-0_pre20150823.tar.gz 1633447 SHA256 12ac4c5e49134a7dcc9c2f3123d20562463d83360a6e1d2fc6ace5ec025a31ae SHA512 6d906bae8433182e7a105a46b92c4f64ac145196ccc72f8934376fc49e5d554182931745e92229c4571323a6eba9ce2f680b5add3844ecb593a194cbbc1b0b63 WHIRLPOOL acb3ac4e5abcc56a37bec461a7e4170e4a45ebd917ed9ca1dd016c92756a01b0ed0887e525bc17acd7a88a34fd5f9495a5ffa63f58a05d547e2fba17c4ff9a8e DIST go-tools-0_pre20150902.tar.gz 1630401 SHA256 c5026af549199f62a374b705981cf0f04661497af0d69ee47d54e9992ee44c8f SHA512 437d5178ce5bf6c4d39ad638259e7c18150d2574dffb632003fa0b83a61a9103e666e562aecc6e8412d995e4b5ffacda6bc12b1cfbbea0b22a5ff680a0a7e3e1 WHIRLPOOL bfc7998c3c042059213975dc6864814edf497b5c6ee70c228925bcb7dd283efb4f49d7ac05383b8ae2d85ccc7fbd7663e3c2899bffe47e4e36195bd639bc61c7 +DIST go-tools-0_pre20160121.tar.gz 1768660 SHA256 4f1d444643e06bc9da47655e6532d71cdd4dfe3167352d93fd48a8e31bec5a60 SHA512 ca4b213a6f398f9bb61a81784fb6dcb4a82994e2d7a95134fc5203ce0f65848d192b2d7c8975a59199db873942c23562866a5607347e060ac0af370d72e067e2 WHIRLPOOL fa4f0006211cb52eca9cba015235a07d7d640681864a62ed065454efceb789694ea3a6d0099adec910bee075153e56e1323cb7e6f4d9a7426d2b8e40474a715e diff --git a/dev-go/go-tools/go-tools-0_pre20160121.ebuild b/dev-go/go-tools/go-tools-0_pre20160121.ebuild new file mode 100644 index 00000000000..a2030fb98d4 --- /dev/null +++ b/dev-go/go-tools/go-tools-0_pre20160121.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +EGO_PN="golang.org/x/tools/..." + +if [[ ${PV} = *9999* ]]; then + inherit golang-vcs +else + EGIT_COMMIT="f3a63969dd29f8cfa913fdaea22f30c1ed537cb3" + ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + inherit golang-vcs-snapshot +fi +inherit golang-build + +DESCRIPTION="Go Tools" +HOMEPAGE="https://godoc.org/golang.org/x/tools" +SRC_URI="${ARCHIVE_URI} + http://golang.org/favicon.ico -> go-favicon.ico" +LICENSE="BSD" +SLOT="0" +IUSE="" +DEPEND="dev-go/go-net:= + !<dev-lang/go-1.5" +RDEPEND="" + +src_prepare() { + local go_src="${EGO_PN%/...}" + # disable broken tests + sed -e 's:TestWeb(:_\0:' \ + -e 's:TestWebIndex(:_\0:' \ + -i src/${go_src}/cmd/godoc/godoc_test.go || die + sed -e 's:TestVet(:_\0:' \ + -e 's:TestDivergentPackagesExamples(:_\0:' \ + -e 's:TestIncompleteExamples(:_\0:' \ + -i src/${go_src}/cmd/vet/vet_test.go || die + sed -e 's:TestImport(:_\0:' \ + -i src/${go_src}/go/gcimporter/gcimporter_test.go || die + sed -e 's:TestImportStdLib(:_\0:' \ + -i src/${go_src}/go/gcimporter15/gcimporter_test.go || die + sed -e 's:TestImportStdLib(:_\0:' \ + -i src/${go_src}/go/importer/import_test.go || die + sed -e 's:TestStdlib(:_\0:' \ + -i src/${go_src}/go/loader/stdlib_test.go || die + sed -e 's:TestStdlib(:_\0:' \ + -i src/${go_src}/go/ssa/stdlib_test.go || die + sed -e 's:TestGorootTest(:_\0:' \ + -e 's:TestFoo(:_\0:' \ + -e 's:TestTestmainPackage(:_\0:' \ + -i src/${go_src}/go/ssa/interp/interp_test.go || die + sed -e 's:TestBar(:_\0:' \ + -e 's:TestFoo(:_\0:' \ + -i src/${go_src}/go/ssa/interp/testdata/a_test.go || die + sed -e 's:TestCheck(:_\0:' \ + -i src/${go_src}/go/types/check_test.go || die + sed -e 's:TestStdlib(:_\0:' \ + -e 's:TestStdFixed(:_\0:' \ + -e 's:TestStdKen(:_\0:' \ + -i src/${go_src}/go/types/stdlib_test.go || die + sed -e 's:TestRepoRootForImportPath(:_\0:' \ + -i src/${go_src}/go/vcs/vcs_test.go || die + + # Add favicon to the godoc web interface (bug 551030) + cp "${DISTDIR}"/go-favicon.ico "src/${go_src}/godoc/static/favicon.ico" || + die + sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \ + -i src/${go_src}/godoc/static/makestatic.go || die + sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \ + -i src/${go_src}/godoc/static/godoc.html || die +} + +src_compile() { + # Generate static.go with favicon included + pushd src/golang.org/x/tools/godoc/static >/dev/null || die + go run makestatic.go || die + popd >/dev/null + + golang-build_src_compile +} + +src_test() { + # Create a writable GOROOT in order to avoid sandbox violations. + cp -sR "$(go env GOROOT)" "${T}/goroot" || die + mkdir -p "${T}/goroot/test" || die + GOROOT="${T}/goroot" golang-build_src_test + rm -rf "${T}/goroot" +} + +src_install() { + # Create a writable GOROOT in order to avoid sandbox violations. + cp -sR "$(go env GOROOT)" "${T}/goroot" || die + cp -sR "$(get_golibdir_gopath)" "${T}/gopath" || die + + GOROOT="${T}/goroot" GOPATH="${WORKDIR}/${P}:${T}/gopath" go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die + golang_install_pkgs + + # bug 558818: install binaries in $GOROOT/bin to avoid file collisions + exeinto "$(go env GOROOT)/bin" + doexe bin/* "${T}/goroot/bin/godoc" "${T}/gopath/bin/tipgodoc" + dodir /usr/bin + ln "${ED}$(go env GOROOT)/bin/godoc" "${ED}usr/bin/godoc" || die + + rm "${D}"$(go env GOROOT)/bin/{cover,vet} || die +} diff --git a/dev-go/godep/Manifest b/dev-go/godep/Manifest index 1de81c45543..75e8c4714fe 100644 --- a/dev-go/godep/Manifest +++ b/dev-go/godep/Manifest @@ -1,2 +1,3 @@ DIST godep-29.tar.gz 51852 SHA256 ca896c220f2995a50a5d9e63df929fa393c3cd1de9722210b5ef3684981bed2a SHA512 37fcfdbbba62cc942b077551953f45fda495b4db1ee5bafec69e4b3cc63c612785d3e97e8ff073825a532a74889c40b34e99cd592285ad255f64ccd3f8b76eff WHIRLPOOL 39f31d7562e3d8b3748d8958e1105578bbd8d799008d15aa6145eb71e4720985e7e71e0d927b32ba4e20195e2257b11a34748c7652454d1fae2d2df662beb146 DIST godep-49.tar.gz 69944 SHA256 f1b498f585fbc420df8cb7a784edeea2c3993341a9501443de521c292ba67829 SHA512 d934a96a3ed6e69c8a3fdaccaa4f46df33b1e9df5c018c6dc7d22e992c1971d83029edd6172aad2116910c233495022007bcc24e9a30e8c517b2c20bd3d8d457 WHIRLPOOL faef37fa87f47e523ad5467a62490ccbfda98eded3ab6eea370dac416ac88117cf8d759637f8813f7a4c9cdffe873a949ae992c8e65b41f0d8c782293b557ec0 +DIST godep-50.tar.gz 70100 SHA256 e474e663e9d696445129201e3d3598a724de9a673ce3ad6652af75a93da2aeed SHA512 b3c114885d7de362c8a3fa3a65f609f37c8610eeb3d9807628f70d49b5b813770a5445c4048bd749df635d9526e5136abcbd2c1d4bd415fd97e86d6599b98438 WHIRLPOOL d4b4e0e2dc3f9ecfd2a1f25cdb56b156b601fc5393527695655769ccb29fa2a45a104b09f95a182df7587e61a5311c1966e5f73ed9bab5cfb891a46fddf35c08 diff --git a/dev-go/godep/godep-50.ebuild b/dev-go/godep/godep-50.ebuild new file mode 100644 index 00000000000..6f0bf647b8a --- /dev/null +++ b/dev-go/godep/godep-50.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +EGO_PN=github.com/tools/godep + +if [[ ${PV} = *9999* ]]; then + inherit golang-vcs +else + KEYWORDS="~amd64" + EGIT_COMMIT=v${PV} + SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + inherit golang-vcs-snapshot +fi +inherit golang-build + +DESCRIPTION="dependency tool for go" +HOMEPAGE="https://github.com/tools/godep" +LICENSE="BSD" +SLOT="0" +IUSE="" +DEPEND="" +RDEPEND="" + +src_install() { + dobin godep +dodoc src/${EGO_PN}/*.md +} diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest index da54b84c146..14682b0c7d6 100644 --- a/dev-java/oracle-jdk-bin/Manifest +++ b/dev-java/oracle-jdk-bin/Manifest @@ -15,16 +15,6 @@ DIST jdk-7u80-solaris-sparcv9-demos.tar.gz 904770 SHA256 fa3a92e70e52b0bffdee8d2 DIST jdk-7u80-solaris-sparcv9.tar.gz 19301205 SHA256 1a2bce541efe7b81cafe683626b3edea56918a8ca897ff36a2deaed00a7fce05 SHA512 93ea0e8f5ae611dd1a620dffd72e315ecb6ce8375bd902a793fab128ac7e95d2cb338df1c273a2c29af6194e7cbdb810d79193b413b4b101538c08ebeef1eb41 WHIRLPOOL c9ae1f1b561c4ec1d3c1a7f5008e80642b49a9fd1c6459f8ada65c01accc338280bdd683712d54a9b7741eeccf856b4f2ee82e898fbe1f39260d58efab217185 DIST jdk-7u80-solaris-x64-demos.tar.gz 865205 SHA256 a08dd0665d35986675beeba0f80d5db54a91fb276d8641ce1ba16ba873a18682 SHA512 c53f026bfdfed8d83d42e3fce497baffeb370adf0423be2f891f6d200510088ac8227ae4f261ece059dbf29eb33cacafb20a0c328e7d8723387eba38def389d0 WHIRLPOOL 0539e964e194527055186b120df11e74ab3d9568fc2a5ff002ef405396f521a7c35013420067d37874b9602fe29d104dce63f22bfd687c45722689d62a8c552d DIST jdk-7u80-solaris-x64.tar.gz 17176587 SHA256 ccc156363e3080e92382cd675d96889460a4421464b4567333394c8405eeb709 SHA512 83ce229c3a38e454d9acafa189b3b6f247a4723ddb3c3fa08993323590949295b0f3740ab235c7c539f90a684b8cefad7839f82f566b7a141019b94af6cbad89 WHIRLPOOL 07412c6de5886c729b43726fb228783606b2a53c2a286b1af2dd5359975d1c75964a895d7da543f98c461adf0ab4b82fc32ebeb49e1835448effd93886f1b206 -DIST jdk-8u66-linux-i586-demos.tar.gz 55055872 SHA256 7d00b6943cabfcd98a7f4e9a8a61183fd5cf12cd64c9b2500fa56f86c1fd8fb5 SHA512 9d6e5790c2f695b089ce500c9f2e56b7e54362d3d88875164c08c4c07b3eef70395f083bb17f0b40757980c887db2a3988b74e04770d0a43af1b6a4eae172861 WHIRLPOOL 5383bb6c707e0e11bf534beef676a0d715e164eccfa971af11437aeaabc8f29903c24e0f0c1e5a61fcda6f2f8a0a294d503de513cd91114a07fc053da848d8bc -DIST jdk-8u66-linux-i586.tar.gz 183327641 SHA256 21026a8d789f479d3905a4ead0c97fd5190aa9b4d1bfc66413e9136513ca84a2 SHA512 e764d5ec297b02a96a0df4d5fd5e737b0b36cad72bb471b08ee254f762cb2648a4564fdd2b6ddf9048fa22a1ef830d11d0796bc447c4b19bf14324ad4607ce9a WHIRLPOOL 9dd2f07864e971e4b0f0a888ba886cc8ef130eaeff93d812ba03d61d1fc225b279d69e6d4448aca0da8ac9f468b5f7a92a29c152c3106f3f16d309238cc3b498 -DIST jdk-8u66-linux-x64-demos.tar.gz 55125358 SHA256 9211f6994beb4aea28c31fe916752ad120a195a39f27e0183006dcf68e305012 SHA512 8293b84a13e716e45f2ee2c0e4d30ea815bf13cf7bd4583b6d8e6c52ff341a193ea0ffec523814246a53c892d0369e600feab01b7101c88ab186243b7b00b0bc WHIRLPOOL 30ef642fc8f22b5b7d9a4f111502cae471e33304525559d9d7019fa24db0d75a60edd1edb731e883bf9ff74c06f55f5a79f8f66f4d9974fcffb29b24e0102dfa -DIST jdk-8u66-linux-x64.tar.gz 181287376 SHA256 7e95ad5fa1c75bc65d54aaac9e9986063d0a442f39a53f77909b044cef63dc0a SHA512 5fa9022aefc63d8b516996137ebbfa7094af8c5cce14f48bcaee7a5a0cdbf619772215a77a3e5d7193349b50aa6cfa4d2d657372da8b010088afce30eb56206c WHIRLPOOL 6cbf8722ca4f06d0cca522de00c635aab7c22a5a3bcdfe5c5be0f841f77db2e9727bafab9347f6609da8c5df1fbf6b00647a341a1242c7c3954ca82e6759d86d -DIST jdk-8u66-macosx-x64.dmg 238148444 SHA256 cd416de4f41f9f0a6984c456481437681674a717da62259740c54732f174fa08 SHA512 7842b2bc1aa010284413f83b9233df573a8994b245fa6dc624cba865d430fc404783204998c6609b2e7c72f58414b5eacd3b94f5dd6fd40229f3c4aa6d293e13 WHIRLPOOL bf1e60eed07978f00b7abcb1fb0e6d6dbdc3386cd81a683dc5371f8ceaa9792df48cad5b51c3aba3d01dccb9dcc86669497281ed43a1b755d22f187a9435ae38 -DIST jdk-8u66-macosx-x86_64-demos.zip 55653799 SHA256 67ad6ef432f1dac5297870cc4d3b03f6d1822a60f83e75173ea3e833848a0a6c SHA512 3419a82a756fd3156ba0e3066ea8c941c33dc1cc0cf913e63662ce6b7b558af5b3d3c0deef448a8dcfc912d413bc1bfe57a508721ae3fb990b748ad44dc4b105 WHIRLPOOL e5b1f09952a98ca59d9c7bf52b1603406d151cb059b1a68886f79c25f3e3047f4cd45d9ea94ff2ef8cc3f335d24357f6bb81a0e223364713d34c4dd0471aa4ab -DIST jdk-8u66-solaris-sparcv9-demos.tar.gz 9783879 SHA256 0ee1a6dc3d7f29109f4ef89be208be52e964c6d2525e89be281c7797a122f540 SHA512 89426acecb6c8be19171f42f6a5aea3f63077d93e216531631176e268678d8a736878dafd7cedd4ed941352a2013d82fcf88e25f01251b2d3bb9b09b1aeace37 WHIRLPOOL 31570c84b9283ea4f1659e843854fdaac27567d4e060c0a341aba4206182bd63df485b053f4cc254cbc79168d5c94d3d02a57f1c51c68c64438bfe7e4ee64373 -DIST jdk-8u66-solaris-sparcv9.tar.gz 103862002 SHA256 277f8dce70d76e263adba969635e2b43386bc4f1337cdcb8b35e00b0b6319f28 SHA512 f6815525f8be73fa6873285df41118f8910653c41ee452766158bf6e36ed92a724dfb95354e59b7dd0a9b944c05f564c2165f976634abdab61751df66991ccd7 WHIRLPOOL 7d612eed241be069ac755b170f75944f832be4b0f6ac21accd5df930e834e8103df1182611ff0b1e80758ed04af870fe209926baecf9709d806d29b9c25fafac -DIST jdk-8u66-solaris-x64-demos.tar.gz 9731094 SHA256 09c732254355349405786a736d7c0146c02d62b6e89977279a8971aad2371bfa SHA512 927aff3e602e365de4e54269e4e30ba849c3aa8302ebdf0a78251f991b8a18b558e37c5ab9a7ccb823193871b051dafca6b44d33a688f0f44129fb48fdf52397 WHIRLPOOL 19de300109c941113ec654909eab822260fe0ac561518d817d0ba53bd99b2f647d806438be7f8b1b8156aadc2a4f9fe54757b4475abea51f99e40852038a644b -DIST jdk-8u66-solaris-x64.tar.gz 100868042 SHA256 e35267b37de7cf6cbccaf4b428827d3cf47eaeff9521f807c683043f7ddba6d3 SHA512 f87132aff276087dbd838affe1406029fe4c1e66fbe7fa47b42f208e4ce0cf7a923fc6db8067b5283b68777a6f27844141250e0dea2f36eca77290fd8027043b WHIRLPOOL f2debdda6e8497e383c4078c6bdc5b9cea87ebe24989c31defcd5383833561f2afaf8f09b909c2ba283d492b9bb3c3fe396fd7b264d04d8987e50b37a2bb0e34 DIST jdk-8u71-linux-arm32-vfp-hflt-demos.tar.gz 10407117 SHA256 a4fc9c11c93266ffda9ff0969993ef8dde6cf82d83551583f9df4b1e03be223f SHA512 f38d4221877876307653317167e69267daa5c59b379e2383637f1db1e68ce417a5708eff98ebb05d7fa50ce580a819c0633ca79c3e9d3ddb134309750b969418 WHIRLPOOL c8495a0a29e56b569ea68bd35605b8c6b28aca424fd50d1ae4e06f764e62de1d37f7ea670d74d90bcd15c25e3a5ae334936312f6ee6d700f7513f0aab6b83fd4 DIST jdk-8u71-linux-arm32-vfp-hflt.tar.gz 81489608 SHA256 ba3356ab06790288aeb901d3e57297fb71808c5f7b3644f264a139341d74566f SHA512 204ee9e04b7e719fa601bdb51aa7f08a6bb6600fcc08941d7c6b7de527369e93f112c3d110b16c852c913b4191f430bac5219c2bedeb368887c658125aa89aa8 WHIRLPOOL 1ef2cc9abd91c88d709ff1790e4d83dc314c28732b112fd7f18966263406a35d46d4188ac8b98483ff54e6c67776d0c220c74f3cf046c74c7c7bacc55d57b737 DIST jdk-8u71-linux-arm64-vfp-hflt-demos.tar.gz 10409614 SHA256 164b79b736334797a681138455661ee0370ebce6926289573d81fad1215cef43 SHA512 f230ba4238952de3b795ab6c329689b624efe49083eaa5ea3d351753abd45aded9c82228746f7a9b5d50461efb9727dba983cc6eaf15a15efac2f9db0bd688a3 WHIRLPOOL 46a0482c2f6f656f656657074ae0c7f73a4e6315413306a43576826201f7d562eaf7fd743b396c2de54c6e0f8fc541897c073b86bfd10f99412114ea45ae9db1 diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml index e7dceb3bd76..665634310c4 100644 --- a/dev-java/oracle-jdk-bin/metadata.xml +++ b/dev-java/oracle-jdk-bin/metadata.xml @@ -4,7 +4,6 @@ <herd>java</herd> <longdescription>Oracle Java SE Development Kit, Official Binary Distribution</longdescription> <use> - <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag> <flag name="derby">Install bundled Derby (Java database)</flag> <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> <flag name="javafx">Install JavaFX libraries</flag> diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.66.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.66.ebuild deleted file mode 100644 index c73de8cb678..00000000000 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.66.ebuild +++ /dev/null @@ -1,356 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils java-vm-2 prefix versionator - -# This URIs need to be updated when bumping! -JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html" -JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html" - -# This is a list of archs supported by this update. -# Currently arm comes and goes. -AT_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x64-macos ) - -# Sometimes some or all of the demos are missing, this is to not have to rewrite half -# the ebuild when it happens. -DEMOS_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x64-macos ) - -if [[ "$(get_version_component_range 4)" == 0 ]] ; then - S_PV="$(get_version_component_range 1-3)" -else - MY_PV_EXT="u$(get_version_component_range 4)" - S_PV="$(get_version_component_range 1-4)" -fi - -MY_PV="$(get_version_component_range 2)${MY_PV_EXT}" - -AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz" -AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz" -AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz" -AT_x86="jdk-${MY_PV}-linux-i586.tar.gz" -AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz" -AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz" -AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg" - -DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz" -DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz" -DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz" -DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz" -DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz" -DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz" -DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip" - -JCE_DIR="UnlimitedJCEPolicyJDK8" -JCE_FILE="jce_policy-8.zip" - -DESCRIPTION="Oracle's Java SE Development Kit" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -for d in "${AT_AVAILABLE[@]}"; do - SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")" - if has ${d} "${DEMOS_AVAILABLE[@]}"; then - SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )" - fi - SRC_URI+=" )" -done -unset d -SRC_URI+=" jce? ( ${JCE_FILE} )" - -LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" -SLOT="1.8" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris" -IUSE="alsa +awt cups derby doc examples +fontconfig javafx jce nsplugin pax_kernel selinux source" -REQUIRED_USE="javafx? ( alsa fontconfig )" - -RESTRICT="fetch preserve-libs strip" -QA_PREBUILT="*" - -# NOTES: -# -# * cups is dlopened. -# -# * libpng is also dlopened but only by libsplashscreen, which isn't -# important, so we can exclude that. -# -# * We still need to work out the exact AWT and JavaFX dependencies -# under MacOS. It doesn't appear to use many, if any, of the -# dependencies below. -# -RDEPEND="!x64-macos? ( - awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - ) - javafx? ( - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/freetype:2 - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXxf86vm - x11-libs/pango - virtual/opengl - ) - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - doc? ( dev-java/java-sdk-docs:${SLOT} ) - fontconfig? ( media-libs/fontconfig:1.0 ) - !prefix? ( sys-libs/glibc:* ) - selinux? ( sec-policy/selinux-java )" - -# A PaX header isn't created by scanelf so depend on paxctl to avoid -# fallback marking. See bug #427642. -DEPEND="app-arch/zip - jce? ( app-arch/unzip ) - examples? ( x64-macos? ( app-arch/unzip ) ) - pax_kernel? ( sys-apps/paxctl )" - -S="${WORKDIR}/jdk" - -check_tarballs_available() { - local uri=$1; shift - local dl= unavailable= - for dl in "${@}" ; do - [[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}" - done - - if [[ -n "${unavailable}" ]] ; then - if [[ -z ${_check_tarballs_available_once} ]] ; then - einfo - einfo "Oracle requires you to download the needed files manually after" - einfo "accepting their license through a javascript capable web browser." - einfo - _check_tarballs_available_once=1 - fi - einfo "Download the following files:" - for dl in ${unavailable}; do - einfo " ${dl}" - done - einfo "at '${uri}'" - einfo "and move them to '${DISTDIR}'" - einfo - einfo "If the above mentioned urls do not point to the correct version anymore," - einfo "please download the files from Oracle's java download archive:" - einfo - einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR" - einfo - fi -} - -pkg_nofetch() { - local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") ) - if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then - distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") ) - fi - check_tarballs_available "${JDK_URI}" "${distfiles[@]}" - - use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}" -} - -src_unpack() { - if use x64-macos ; then - pushd "${T}" > /dev/null - mkdir dmgmount - hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \ - -mountpoint "${T}"/dmgmount - local update=$(get_version_component_range 4) - [[ ${#update} == 1 ]] && update="0${update}" - xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg - hdiutil detach "${T}"/dmgmount - zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv - mv Contents/Home "${WORKDIR}"/jdk${MY_PV} - popd > /dev/null - else - default - fi - - # Upstream is changing their versioning scheme every release around 1.8.0.*; - # to stop having to change it over and over again, just wildcard match and - # live a happy life instead of trying to get this new jdk1.8.0_05 to work. - mv "${WORKDIR}"/jdk* "${S}" || die -} - -src_prepare() { - if use jce ; then - mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die - fi - - if [[ -n ${JAVA_PKG_STRICT} ]] ; then - # Mark this binary early to run it now. - pax-mark Cm ./bin/javap - - eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936." - eqawarn - eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)" - fi - - # Remove the hook that calls Oracle's evil usage tracker. Not just - # because it's evil but because it breaks the sandbox during builds - # and we can't find any other feasible way to disable it or make it - # write somewhere else. See bug #559936 for details. - zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest#/}" - - # Create files used as storage for system preferences. - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die - - if ! use alsa ; then - rm -vf jre/lib/*/libjsoundalsa.* || die - fi - - if ! use awt ; then - rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \ - {,jre/}bin/{javaws,policytool} \ - bin/appletviewer || die - fi - - if ! use javafx ; then - rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \ - jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \ - bin/*javafx* || die - fi - - if ! use nsplugin ; then - rm -vf jre/lib/*/libnpjp2.* || die - else - local nsplugin=$(echo jre/lib/*/libnpjp2.*) - fi - - # Even though plugins linked against multiple ffmpeg versions are - # provided, they generally lag behind what Gentoo has available. - rm -vf jre/lib/*/libavplugin* || die - - dodoc COPYRIGHT - dodir "${dest}" - cp -pPR bin include jre lib man "${ddest}" || die - - if use derby ; then - cp -pPR db "${ddest}" || die - fi - - if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then - cp -pPR demo sample "${ddest}" || die - fi - - if use jce ; then - dodir "${dest}"/jre/lib/security/strong-jce - mv "${ddest}"/jre/lib/security/US_export_policy.jar \ - "${ddest}"/jre/lib/security/strong-jce || die - mv "${ddest}"/jre/lib/security/local_policy.jar \ - "${ddest}"/jre/lib/security/strong-jce || die - dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \ - "${dest}"/jre/lib/security/US_export_policy.jar - dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \ - "${dest}"/jre/lib/security/local_policy.jar - fi - - if use nsplugin ; then - install_mozilla_plugin "${dest}/${nsplugin}" - fi - - if use source ; then - cp -v src.zip "${ddest}" || die - - if use javafx ; then - cp -v javafx-src.zip "${ddest}" || die - fi - fi - - if [[ -d jre/lib/desktop ]] ; then - # Install desktop file for the Java Control Panel. - # Using ${PN}-${SLOT} to prevent file collision with jre and or - # other slots. make_desktop_entry can't be used as ${P} would - # end up in filename. - newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - sun-jcontrol-${PN}-${SLOT}.png || die - sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \ - -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - jre/lib/desktop/applications/sun_java.desktop \ - > "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop - fi - - # Prune all fontconfig files so libfontconfig will be used and only install - # a Gentoo specific one if fontconfig is disabled. - # http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html - rm "${ddest}"/jre/lib/fontconfig.* - if ! use fontconfig ; then - cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die - eprefixify "${T}"/fontconfig.properties - insinto "${dest}"/jre/lib/ - doins "${T}"/fontconfig.properties - fi - - # This needs to be done before CDS - #215225 - java-vm_set-pax-markings "${ddest}" - - # see bug #207282 - einfo "Creating the Class Data Sharing archives" - case ${ARCH} in - arm|ia64) - ${ddest}/bin/java -client -Xshare:dump || die - ;; - x86) - ${ddest}/bin/java -client -Xshare:dump || die - # limit heap size for large memory on x86 #467518 - # this is a workaround and shouldn't be needed. - ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die - ;; - *) - ${ddest}/bin/java -server -Xshare:dump || die - ;; - esac - - # Remove empty dirs we might have copied. - find "${D}" -type d -empty -exec rmdir -v {} + || die - - if use x64-macos ; then - # Fix miscellaneous install_name issues. - pushd "${ddest}"/jre/lib > /dev/null || die - local lib needed nlib npath - for lib in \ - decora_sse glass jfx{media,webkit} \ - javafx_{font,font_t2k,iio} prism_{common,es2,sw} \ - ; do - lib=lib${lib}.dylib - einfo "Fixing self-reference of ${lib}" - install_name_tool \ - -id "${EPREFIX}${dest}/jre/lib/${lib}" \ - "${lib}" - done - popd > /dev/null - - # This is still jdk1{5,6}, even on Java 8, so don't change it - # until you know different. - for nlib in jdk1{5,6} ; do - install_name_tool -change \ - /usr/lib/libgcc_s_ppc64.1.dylib \ - $($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \ - "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib - install_name_tool -id \ - "${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \ - "${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib - done - fi - - set_java_env - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.72.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.72.ebuild index ff5c4afeb12..19941b9cfc5 100644 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.72.ebuild +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.72.ebuild @@ -60,7 +60,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )" LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" SLOT="1.8" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris" IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux source" REQUIRED_USE="javafx? ( alsa fontconfig )" diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest index 835099094b5..d2e80a4c860 100644 --- a/dev-java/oracle-jre-bin/Manifest +++ b/dev-java/oracle-jre-bin/Manifest @@ -2,7 +2,5 @@ DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc DIST jre-7u80-linux-i586.tar.gz 48558751 SHA256 b773aef1458a4adde03af62f8163c7e4614b485e1f01699ff8f5f60919251575 SHA512 d85b8700248a4ad0a0873d0c84b2175fb0a66773c43899ab47ac531be089794c17eb0e8b7503d46efd78833da17c9fa8a83ad1cb9c062e191acfb77155639474 WHIRLPOOL 766c88748bc758a1b35bd6008750cc8f2678801b1cc5629bcb7a756e4a32973a5f5ad927348b3ce3ad9ecb3e7aca5d1af2b613fba35d4f53f9601b1ff42312b2 DIST jre-7u80-linux-x64.tar.gz 47110223 SHA256 4c01efd0d8e80bb6e2f324ec3408ce64f066d4506c7ec93a491f615a4523f4f3 SHA512 e61e78ab1be0313690e8ab8d6cbae7366dd78aa4716f47c8908178196b658b94ee318dd04043965a72c34d8ef5c1cb4902afaa2188e76eb944256f090339107d WHIRLPOOL 1af7417b327402abaf4074445f051924de8b19810668890e089b66a488dddfc7f50cdd96a012130a591940338177164f66c83caf54c5d6d370be27d119a907fe -DIST jre-8u66-linux-i586.tar.gz 73883805 SHA256 70ee96be46d1cdeb15720b58a74c4dff0eecb6fcdded91d887b16779789f3596 SHA512 c605027974e5d6ad55cefee9c75239cd15fcf726abe49617d1008cec44f8a927f6794fcf2819e1f1e35b9535d40f6bef1fd4b023271f80e3e392824fa8bb2111 WHIRLPOOL 67dd7ea33dd9845210177f3b608789c674be2d0a7550b924f68082da6e9484e81ae1186c7aa7bddd5895ea0eb7adf8f67949a063378a028673d20e16004d4d52 -DIST jre-8u66-linux-x64.tar.gz 71719193 SHA256 f2249370a6ac4ca8977b66d7665179f0fef4df732f3af80b0f34567d594588bf SHA512 ba0de83d6a485cab305c352091cfca74b6a64132fbda38b5bda53b9dd2569adafc64c93f92397dc3a40167b04690f4d8de9f1209485a8e51a236db312efe4b8c WHIRLPOOL 00a3f10bec2bc871534cc30a4ac2bb496695686d2b41bde985aeda662bcb988e979318eb16f886989d740f92f35e45e2ac344f6d49bcab2020f11babcd2e69e8 DIST jre-8u72-linux-i586.tar.gz 73963723 SHA256 f7cd307bacaf9714858cbbb3cdbbd9e73b6168d4bf59c6f46dc4ba052e647f94 SHA512 c8735e7e6f238748e63e3b641d5b2e7a48d5756fc5d13769a2592b7532aa2b5e65ccf899657767893ca734b9459819907ee3646e02f0295bc767e16e4f74affd WHIRLPOOL 5af965e0d37f3d1ff57d3ed6731716835114e9680e482a26ee5ff371d557aa773a78dee57630b4ee653ca443ef3ebf80d9d3e6805fd8d84604dd352f53dedb15 DIST jre-8u72-linux-x64.tar.gz 71780497 SHA256 0e287ce637d6115613e53d651313271e75f02299881cc04f444521db1ed11c85 SHA512 85123b9719afe011d518c5bc0d27a5fcc919b1900ab05d9489fc8f69751ac0abea8aa72b8cd0e3194b8a1443a952c5a576d3959d63c06ab4257fc1a9ac5ca288 WHIRLPOOL 1b459ef6ec3d6d78a75b638bb61fb309f4de63ef028b0c4d50bcb1c38e379cb4a5ffa12ce4def10b510161406e83aec334d03ccb503db891aced1880f4c23e4f diff --git a/dev-java/oracle-jre-bin/metadata.xml b/dev-java/oracle-jre-bin/metadata.xml index 223ad67ea1f..2e6cc172562 100644 --- a/dev-java/oracle-jre-bin/metadata.xml +++ b/dev-java/oracle-jre-bin/metadata.xml @@ -4,7 +4,6 @@ <herd>java</herd> <longdescription>Oracle Java SE Runtime Environment, Official Binary Distribution</longdescription> <use> - <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag> <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> <flag name="javafx">Install JavaFX libraries</flag> <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag> diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.66.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.66.ebuild deleted file mode 100644 index c03455a3609..00000000000 --- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.66.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils java-vm-2 prefix versionator - -# This URIs need updating when bumping! -JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html" -JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html" - -if [[ "$(get_version_component_range 4)" == 0 ]] ; then - S_PV="$(get_version_component_range 1-3)" -else - MY_PV_EXT="u$(get_version_component_range 4)" - S_PV="$(get_version_component_range 1-4)" -fi - -MY_PV="$(get_version_component_range 2)${MY_PV_EXT}" - -AT_amd64="jre-${MY_PV}-linux-x64.tar.gz" -AT_x86="jre-${MY_PV}-linux-i586.tar.gz" - -JCE_DIR="UnlimitedJCEPolicyJDK8" -JCE_FILE="jce_policy-8.zip" - -DESCRIPTION="Oracle's Java SE Runtime Environment" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -SRC_URI=" - amd64? ( ${AT_amd64} ) - x86? ( ${AT_x86} ) - jce? ( ${JCE_FILE} )" - -LICENSE="Oracle-BCLA-JavaSE" -SLOT="1.8" -KEYWORDS="amd64 x86" -IUSE="alsa +awt cups +fontconfig javafx jce nsplugin pax_kernel selinux" - -RESTRICT="fetch preserve-libs strip" -QA_PREBUILT="*" - -# NOTES: -# -# * cups is dlopened. -# -# * libpng is also dlopened but only by libsplashscreen, which isn't -# important, so we can exclude that. -# -# * We still need to work out the exact AWT and JavaFX dependencies -# under MacOS. It doesn't appear to use many, if any, of the -# dependencies below. -# -RDEPEND="!x64-macos? ( - awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - ) - javafx? ( - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/freetype:2 - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXxf86vm - x11-libs/pango - virtual/opengl - ) - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - fontconfig? ( media-libs/fontconfig:1.0 ) - !prefix? ( sys-libs/glibc:* ) - selinux? ( sec-policy/selinux-java )" - -# A PaX header isn't created by scanelf so depend on paxctl to avoid -# fallback marking. See bug #427642. -DEPEND="app-arch/zip - jce? ( app-arch/unzip ) - pax_kernel? ( sys-apps/paxctl )" - -S="${WORKDIR}/jre" - -pkg_nofetch() { - local AT_ARCH="AT_${ARCH}" - local AT="${!AT_ARCH}" - - einfo "Please download '${AT}' from:" - einfo "'${JRE_URI}'" - einfo "and move it to '${DISTDIR}'" - - if use jce; then - einfo "Also download '${JCE_FILE}' from:" - einfo "'${JCE_URI}'" - einfo "and move it to '${DISTDIR}'" - fi - - einfo - einfo "If the above mentioned urls do not point to the correct version anymore," - einfo "please download the files from Oracle's java download archive:" - einfo - einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR" - einfo - -} - -src_unpack() { - default - - # Upstream is changing their versioning scheme every release around 1.8.0.*; - # to stop having to change it over and over again, just wildcard match and - # live a happy life instead of trying to get this new jre1.8.0_05 to work. - mv "${WORKDIR}"/jre* "${S}" || die -} - -src_prepare() { - if use jce ; then - mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die - fi - - # Remove the hook that calls Oracle's evil usage tracker. Not just - # because it's evil but because it breaks the sandbox during builds - # and we can't find any other feasible way to disable it or make it - # write somewhere else. See bug #559936 for details. - zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest#/}" - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - if ! use alsa ; then - rm -vf lib/*/libjsoundalsa.* || die - fi - - if ! use awt ; then - rm -vf lib/*/lib*{[jx]awt,splashscreen}* \ - bin/{javaws,policytool} || die - fi - - if ! use javafx ; then - rm -vf lib/*/lib*{decora,fx,glass,prism}* \ - lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die - fi - - if ! use nsplugin ; then - rm -vf lib/*/libnpjp2.* || die - else - local nsplugin=$(echo lib/*/libnpjp2.*) - fi - - # Even though plugins linked against multiple ffmpeg versions are - # provided, they generally lag behind what Gentoo has available. - rm -vf lib/*/libavplugin* || die - - dodoc COPYRIGHT - dodir "${dest}" - cp -pPR bin lib man "${ddest}" || die - - if use jce ; then - dodir ${dest}/lib/security/strong-jce - mv "${ddest}"/lib/security/US_export_policy.jar \ - "${ddest}"/lib/security/strong-jce || die - mv "${ddest}"/lib/security/local_policy.jar \ - "${ddest}"/lib/security/strong-jce || die - dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \ - "${dest}"/lib/security/US_export_policy.jar - dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \ - "${dest}"/lib/security/local_policy.jar - fi - - if use nsplugin ; then - install_mozilla_plugin "${dest}/${nsplugin}" - fi - - # Install desktop file for the Java Control Panel. - # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. - # make_desktop_entry can't be used as ${P} would end up in filename. - newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - sun-jcontrol-${PN}-${SLOT}.png || die - sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \ - -e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - lib/desktop/applications/sun_java.desktop > \ - "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop - - # Prune all fontconfig files so libfontconfig will be used and only install - # a Gentoo specific one if fontconfig is disabled. - # http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html - rm "${ddest}"/lib/fontconfig.* || die - if ! use fontconfig ; then - cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die - eprefixify "${T}"/fontconfig.properties - insinto "${dest}"/lib/ - doins "${T}"/fontconfig.properties - fi - - # This needs to be done before CDS - #215225 - java-vm_set-pax-markings "${ddest}" - - # see bug #207282 - einfo "Creating the Class Data Sharing archives" - case ${ARCH} in - arm|ia64) - ${ddest}/bin/java -client -Xshare:dump || die - ;; - x86) - ${ddest}/bin/java -client -Xshare:dump || die - # limit heap size for large memory on x86 #467518 - # this is a workaround and shouldn't be needed. - ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die - ;; - *) - ${ddest}/bin/java -server -Xshare:dump || die - ;; - esac - - # Remove empty dirs we might have copied. - find "${D}" -type d -empty -exec rmdir -v {} + || die - - set_java_env - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.72.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.72.ebuild index 526e032a10c..c454d1d064f 100644 --- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.72.ebuild +++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.72.ebuild @@ -34,7 +34,7 @@ SRC_URI=" LICENSE="Oracle-BCLA-JavaSE" SLOT="1.8" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="alsa cups +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux" RESTRICT="fetch preserve-libs strip" diff --git a/dev-ml/dose3/dose3-4.2.ebuild b/dev-ml/dose3/dose3-4.2.ebuild index eaff97e57cd..abc3981f60b 100644 --- a/dev-ml/dose3/dose3-4.2.ebuild +++ b/dev-ml/dose3/dose3-4.2.ebuild @@ -19,7 +19,7 @@ IUSE="+ocamlopt +parmap zip bzip2 xml curl rpm4 test" RDEPEND=" >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/cudf:= - dev-ml/extlib:= + >=dev-ml/extlib-1.7.0:= dev-ml/ocaml-re:= dev-ml/cppo:= parmap? ( dev-ml/parmap:= ) diff --git a/dev-python/boto/boto-2.39.0.ebuild b/dev-python/boto/boto-2.39.0.ebuild index 09e8e9d3272..532f9359b21 100644 --- a/dev-python/boto/boto-2.39.0.ebuild +++ b/dev-python/boto/boto-2.39.0.ebuild @@ -17,6 +17,8 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc test" +REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )" + DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/nose[${PYTHON_USEDEP}] ) @@ -25,6 +27,10 @@ DEPEND=" # requires Amazon Web Services keys to pass some tests RESTRICT="test" +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) +} + python_test() { "${PYTHON}" tests/test.py -v || die "Tests fail with ${EPYTHON}" } diff --git a/dev-python/cffi/cffi-1.5.0.ebuild b/dev-python/cffi/cffi-1.5.0.ebuild index 3220cf9234a..c54b5e66ab4 100644 --- a/dev-python/cffi/cffi-1.5.0.ebuild +++ b/dev-python/cffi/cffi-1.5.0.ebuild @@ -23,6 +23,7 @@ RDEPEND=" virtual/libffi dev-python/pycparser[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( dev-python/pytest[${PYTHON_USEDEP}] )" # Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile) diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest index 15077b0a192..ac0de54fa5f 100644 --- a/dev-python/google-apitools/Manifest +++ b/dev-python/google-apitools/Manifest @@ -1,2 +1,3 @@ DIST google-apitools-0.4.11.tar.gz 141425 SHA256 60dae36e70c87909cb8942ebf401bbec50583461c9aa40d24564bc4c3832a550 SHA512 3ee58add383da4ed0dec2e646b13e840c3bb9d4a7b1adf68293e8e22b3db1f7689d19282236995e9374aa160f0569a2b533e737e3ef4f1f4b60d00ff4d4d1bb9 WHIRLPOOL c96200b26eed1ba92411f295a0f34dda995888687c136d7f0744fa09c5ba9bc6d93f168b4e12d905278128f8a28ecf173f968ee69c6636a580439ec3b5a3a223 DIST google-apitools-0.4.12.tar.gz 198590 SHA256 dd69b791b9421d3a9dd782f5a811555dd60ba198a71581186114c3779e6e31d5 SHA512 6cdb55b94ebf9fcd26e0d4b8659ed44809b5fbd9bbb2830f3352219fb7231b79cf2f8668497a85bc8ea29dbf8b110a081b34c4783f71beb2cd707838e1e107dc WHIRLPOOL 273cb43c7c42d3d99fd9f52484d30583723edcc4d511dfe9512dbf2197ada51a483141b66ac3e1349dcb8fdbde3de2a8c036648abc3e48f3f5dd49b54ca6f949 +DIST google-apitools-0.4.15.tar.gz 199795 SHA256 97c1d918243329d6afb26d6395dda58d9363dfd5a52b9093068e7667b7c632d2 SHA512 ace7a8743933010d777811211921ca1fdb6e43cac18decc68097faefc0ee07913928a1480a5cdb49dedf1ae34f1a5b6df67411a41d1e324fefc411fbc6234a33 WHIRLPOOL 2ddcd5a643e4f2df40425cb1ee3f2d5ff76a8e5bbf8eff432ea5611759f07d52f98f8630c7ba0cec3ac60b849351ef0b828dcfa457977eaf49de82d6bce1f234 diff --git a/dev-python/google-apitools/google-apitools-0.4.15.ebuild b/dev-python/google-apitools/google-apitools-0.4.15.ebuild new file mode 100644 index 00000000000..d55b58178d1 --- /dev/null +++ b/dev-python/google-apitools/google-apitools-0.4.15.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="Python library to manipulate Google APIs" +HOMEPAGE="https://github.com/google/apitools" +SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}] + >=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + >=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}] + >=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + >=dev-python/setuptools-18.5[${PYTHON_USEDEP}]" + +S="${WORKDIR}/apitools-${PV}" diff --git a/dev-python/keyring/keyring-7.3.ebuild b/dev-python/keyring/keyring-7.3.ebuild index 19ed821bd13..b65a3c5ee7b 100644 --- a/dev-python/keyring/keyring-7.3.ebuild +++ b/dev-python/keyring/keyring-7.3.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit distutils-r1 diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest index 2975624365a..59f05db5a41 100644 --- a/dev-python/oslo-vmware/Manifest +++ b/dev-python/oslo-vmware/Manifest @@ -1 +1,2 @@ +DIST oslo.vmware-0.11.2.tar.gz 102933 SHA256 036cf0ad6ab0d4defd743678999851d570c2ca1ff34eba916920ce54d9a5d348 SHA512 632635adcc09749d0fe8bd204e1b06374e9790cec4d53cbaa06b2afa6745460cd417d60df26cb1e287d6e9de98eaa09788c6797993a06d8649b765a9298d0f39 WHIRLPOOL dd77312f307e5f65a969bae52e52dbab175e4a25f627d3ccf35435ac64c551093b8b67b707388d46175d93f344e2731ebdfa2ba6062ac3b562a00877cc98b880 DIST oslo.vmware-1.21.0.tar.gz 83619 SHA256 afea2361aa1447efd2bc10d34636beadb718ecb4698d06fc3776ede498bff86a SHA512 2ca607de95d33ec175e09fa07438db8844c10da5929f2fa8d35ef8d63f628508f9c2de62e11ebc496e89c76d93c533413a973ab8b29219431d72770e19dd2d04 WHIRLPOOL 14fc58a01e94468b4eacd78d2d47fff623525edf5a9035957392b4ae5b1179798b3d6c667e87c266d698c861971eee2f24b2b2530ce9b8fc0ccbf2ad59f6c6aa diff --git a/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild b/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild new file mode 100644 index 00000000000..27e11249ebf --- /dev/null +++ b/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_4 ) + +inherit distutils-r1 + +DESCRIPTION="Oslo VMware library for OpenStack projects" +HOMEPAGE="https://pypi.python.org/pypi/oslo.vmware" +SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz" +S="${WORKDIR}/oslo.vmware-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="test" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/pbr-0.8[${PYTHON_USEDEP}] + <dev-python/pbr-1.0[${PYTHON_USEDEP}] + test? ( + >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}] + <dev-python/hacking-0.10[${PYTHON_USEDEP}] + >=dev-python/pylint-1.3.0[${PYTHON_USEDEP}] + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] + >=dev-python/mock-1.0[${PYTHON_USEDEP}] + <dev-python/mock-1.1.0[${PYTHON_USEDEP}] + >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}] + >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] + >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}] + !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}] + >=dev-python/coverage-3.6[${PYTHON_USEDEP}] + >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] + <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] + <dev-python/sphinx-1.3[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + )" +RDEPEND=" + >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}] + <dev-python/stevedore-1.4.0[${PYTHON_USEDEP}] + >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] + >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}] + <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}] + >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}] + <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}] + >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}] + <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}] + >=dev-python/Babel-1.3[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}] + >=dev-python/suds-0.6[${PYTHON_USEDEP}] + >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}] + !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.2.0[${PYTHON_USEDEP}] + !~dev-python/requests-2.4.0[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}] + <dev-python/urllib3-1.11[${PYTHON_USEDEP}] + >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}] + <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}] +" +python_prepare() { + sed -i '/suds-jurko/d' requirements-py3.txt || die +} + +python_test() { + nosetests tests/ || die "test failed under ${EPYTHON}" +} diff --git a/dev-python/pid/pid-2.0.1.ebuild b/dev-python/pid/pid-2.0.1.ebuild index 6e0114e59e2..bbf3d67fecd 100644 --- a/dev-python/pid/pid-2.0.1.ebuild +++ b/dev-python/pid/pid-2.0.1.ebuild @@ -15,11 +15,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="Apache-2.0" KEYWORDS="~amd64" -IUSE="test" +IUSE="" RDEPEND="" DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" + dev-python/nose[${PYTHON_USEDEP}]" python_test() { nosetests || die diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index 3a732fa375d..0c8d1912afa 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,2 +1,2 @@ DIST pip-7.1.2.tar.gz 1049170 SHA256 ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477 SHA512 78082afe6b559bf87f91ae9b6d304cfbfce00206e09be42fdae9d449a55cd8d968df6873e834191d0b0e6baae29e72eb3eee42386ff7c5dc9c29b6c28b754449 WHIRLPOOL 953fdc9104f3ac34c9104ec93948f58c4b0e193f18da60d3247d801c283c574490f8b91146e4278888c0b920090f537095c1a1693ca352d062dd98473390fdc9 -DIST pip-8.0.0.tar.gz 1129857 SHA256 90112b296152f270cb8dddcd19b7b87488d9e002e8cf622e14c4da9c2f6319b1 SHA512 2277dbe74af2dd3a3280b4115ebdbe2de83a5fbfdd3f15e2627441478bd08f21b46771153100ed9934a48a3662846aa84310f722029e6f56fa9a400dbd61e910 WHIRLPOOL 8f70adb37fdabf91db8c5a9d257daa8a0df0e6c6d8f077f19288033a41bca445427173bb32c4b18019096f2191b3b5d2381124c0e3a664da79bb881a0cf60610 +DIST pip-8.0.2.tar.gz 1130183 SHA256 46f4bd0d8dfd51125a554568d646fe4200a3c2c6c36b9f2d06d2212148439521 SHA512 f2660725da4efa156c6c0f6cb9ba3f10e8b6dd2fc9113e9a8754a59f38ee6161e5a648f9dbcf8853ef85a85d3164bcaac3a7032ac2057e92f331a337cacfc5d9 WHIRLPOOL abc88372746193686910ee127ac3f6f4bb7f3a5d7f897f705c2e43ea91d60c55ed26faf5e6acddd1d7e01772cbff4836195dcf22f9fc9dec30ad8c89986db778 diff --git a/dev-python/pip/pip-8.0.0-r1.ebuild b/dev-python/pip/pip-8.0.2.ebuild index 842b1a99090..2dd8aa7ac4c 100644 --- a/dev-python/pip/pip-8.0.0-r1.ebuild +++ b/dev-python/pip/pip-8.0.2.ebuild @@ -23,7 +23,7 @@ VENDOR_DEPEND=" >=dev-python/html5lib-0.9999999[${PYTHON_USEDEP}] >=dev-python/six-1.9[${PYTHON_USEDEP}] >=dev-python/colorama-0.3.6[${PYTHON_USEDEP}] - >=dev-python/requests-2.9.1[${PYTHON_USEDEP}] + >=dev-python/requests-2.9.1-r1[${PYTHON_USEDEP}] >=dev-python/CacheControl-0.11.5[${PYTHON_USEDEP}] >=dev-python/lockfile-0.12.2[${PYTHON_USEDEP}] >=dev-python/progress-1.2[${PYTHON_USEDEP}] @@ -33,7 +33,8 @@ VENDOR_DEPEND=" virtual/python-ipaddress[${PYTHON_USEDEP}] " RDEPEND="${VENDOR_DEPEND} - >=dev-python/setuptools-19.4[${PYTHON_USEDEP}] + >=dev-python/setuptools-19.2[${PYTHON_USEDEP}] + <dev-python/setuptools-19.4[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" @@ -42,7 +43,7 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch - "${FILESDIR}"/${P}-unbundle.patch + "${FILESDIR}"/${PN}-8.0.0-unbundle.patch ) python_prepare_all() { diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest index b374ecb8a06..3b264432b63 100644 --- a/dev-python/regex/Manifest +++ b/dev-python/regex/Manifest @@ -1,2 +1,3 @@ DIST regex-2015.07.12.tar.gz 554160 SHA256 9a39618645ce8c707c2c1346a3eeef0e441a9084df0739a5fcfe32059f68ebe1 SHA512 3b8cfa029744d17f06c659e6357d3a4520817656da6dcfc6952bbdac01fec266e8832fab649000fc7a3dacab508e2ae462728c139cc4cac913c40e2ae34abf54 WHIRLPOOL 86f004c6d8533071ef938ba39cfe34f198dcc56ab75883f8b5f2bc2dfaa40abc46b0ed64aa873821c6cc4e694c424dd8a16d97c35a6a1fafa7d2f84e09c59adf DIST regex-2015.07.19.tar.gz 554541 SHA256 c1dc58206f458749040ba813ef65067d7018908cab4bb16f4f12d9c7631e48b7 SHA512 94845ae133e25bdc2bb6ee6093f38f7a9281a64cdf4e53817c80183a28d7d0e2173f16f048f29ba38b2b277fc974c46a2f7d3b2fe1a346bc5d35c5fa45cdac17 WHIRLPOOL 4b38bd745c43fa2832d93e20fb4066911c6a224a2d1b4c3afaf8f03dcdf6d8d39896b25843671e0ee6916257b428455f24bbd493222e1b7bfa67c0b2ab838d32 +DIST regex-2016.01.10.tar.gz 574017 SHA256 02a77606e3f4a0a16a2727ed8f067681635a56221e8fca863ff64b196d5d79e0 SHA512 4f4700ca746763f857449003d32d56b5aa8069e3b71b160e719633b0cf00f80efc0766d8e1e193977278f91bd3e73c87aab31bee23aec77557ac9b3652ff6a2f WHIRLPOOL 9d493c0695b5920dfa71d94636d9f2952cbd5db97f60ae68c30fdf81fdbdab05c4726a41dae036541de694ec1ca688acdb20eaa48e514865da26c9a9569e30a0 diff --git a/dev-python/regex/regex-2016.01.10.ebuild b/dev-python/regex/regex-2016.01.10.ebuild new file mode 100644 index 00000000000..73727ade69d --- /dev/null +++ b/dev-python/regex/regex-2016.01.10.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_{3,4,5}} pypy ) + +inherit distutils-r1 flag-o-matic + +DESCRIPTION="Alternative regular expression module to replace re" +HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc" + +DOCS=( README docs/UnicodeProperties.txt ) + +python_compile() { + if ! python_is_python3; then + local CFLAGS=${CFLAGS} + append-cflags -fno-strict-aliasing + fi + distutils-r1_python_compile +} + +python_test() { + local msg="tests failed under ${EPYTHON}" + # https://bitbucket.org/mrabarnett/mrab-regex/issue/145/1-fail-in-testsuite-under-pypy + einfo "There is one trivial fail of test test_empty_array under pypy" + + if python_is_python3; then + "${PYTHON}" Python3/test_regex.py || die $msg + else + "${PYTHON}" Python2/test_regex.py || die $msg + fi +} + +python_install_all() { + local DOCS="${DOCS} docs/UnicodeProperties.txt" + use doc && local HTML_DOCS=( docs/Features.html ) + + distutils-r1_python_install_all +} diff --git a/dev-python/requests/requests-2.9.1-r1.ebuild b/dev-python/requests/requests-2.9.1-r2.ebuild index 3228f55e57b..72d76c7eb9c 100644 --- a/dev-python/requests/requests-2.9.1-r1.ebuild +++ b/dev-python/requests/requests-2.9.1-r2.ebuild @@ -25,7 +25,7 @@ RDEPEND=" >=dev-python/py-1.4.30[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] >=dev-python/pyopenssl-0.13[$(python_gen_usedep 'python*' pypy)] - dev-python/urllib3[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.13.1-r1[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest index 219eef6b692..53eecfc25ef 100644 --- a/dev-python/unidecode/Manifest +++ b/dev-python/unidecode/Manifest @@ -1 +1,2 @@ DIST Unidecode-0.04.18.tar.gz 206191 SHA256 f19150c74de2fe6847b13efeeaee402f2bd2c309a446346a8b5baae0315d108a SHA512 4434b147662c605829a599cb227b10599e70b9a40669b6bce490156c6679d22b49e1768667e10851eaf8d6a142a2c22df4800f0382ed74e781c247708021acd7 WHIRLPOOL 84f07583ba19f6c029128699629dc5709343520b94ea0fd3c8924d7e44910481f5b1574449eb78c2fa4dd884de4fa8b646593623dcae28b809f423c343163aa1 +DIST Unidecode-0.04.19.tar.gz 204613 SHA256 51477646a9169469e37e791b13ae65fcc75b7f7f570d0d3e514d077805c02e1e SHA512 a7be95ab22dcc61925da5abb2288cf947e96c61926cd384222451f65947be13d3f5d28bcc4e06f636bebc3dfae01716d455036e15ddb3199f52ca542997f74a1 WHIRLPOOL 14b8f0cfdb42ad10f5aa91f586a9880054f55cbc9d4bff64e62593b57c2265d77131f32ba5f8ebc11c594c79a1c1d8a109fddd2ce6e777e9974d947759ccaeb4 diff --git a/dev-python/unidecode/unidecode-0.04.19.ebuild b/dev-python/unidecode/unidecode-0.04.19.ebuild new file mode 100644 index 00000000000..f4deb316846 --- /dev/null +++ b/dev-python/unidecode/unidecode-0.04.19.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) + +MY_PN=Unidecode +MY_P=${MY_PN}-${PV} + +inherit distutils-r1 + +DESCRIPTION="Module providing ASCII transliterations of Unicode text" +HOMEPAGE="https://pypi.python.org/pypi/Unidecode" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" + +S=${WORKDIR}/${MY_P} + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +python_test() { + esetup.py test +} diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest index 212486143d5..f81a6bbeb07 100644 --- a/dev-python/urllib3/Manifest +++ b/dev-python/urllib3/Manifest @@ -1,3 +1,4 @@ +DIST urllib3-1.10.4.tar.gz 138538 SHA256 52131e6a561466f1206e1a648d9a73dda2a804d0f70e83782bd88494542ded09 SHA512 83118aa5bf23add5bb5dafd98d32459315d971246ac2a49f7f0d0fcad6414099885f6d4fc7847de17e983b949c8a21fa4ed71c0216e578bdfc8eb351672f7c09 WHIRLPOOL 03431b6c575f3399bf8876d7dfad126986864e3a3f09d05e7e682b5b374ed420854c776a3d7bac91538086e43a9b832975aaf0b1b2e3fcde1ba8cfe93417bdc3 DIST urllib3-1.12.tar.gz 151072 SHA256 0ea512776971fe4e76192600fe41e4e7ee96b4b9a5b15aefc1ac31d2a63872c6 SHA512 44f1cf9c5d5538e35d026551a2d1dc7119786c1148b9a769fa9f652f0368e996512962c6245c92d1f4bb1d8e816e2fb0ffebeb0060b01f92b2a5d6e01d15426f WHIRLPOOL d386e4fb47b2ea4d78d2ad690c9252d6be1b3f5a624e20670e22c9b3a28dc910e3d5ecd24ca54d8f8337f8e9a9875208efce06952cd392d9c8254257eadeee70 DIST urllib3-1.13.1.tar.gz 156259 SHA256 6eba1d713f8552e37ac4081c6bdf7be9f5a79f58447aed762bf24cc34c5e3983 SHA512 663c0a10b0e6b8a2c337cf799e45b8d949cbf0f542e22204fe31af193c7275c499ddf0ac3470152cc51bed56a0f5b77f1897140801b732773f606e77e8cea420 WHIRLPOOL d0c3ea06f7a8180eca9b22197ddad6f04ea9b9c5fe254ade00e12fb9a5ffeaa9264a5a160cc49ebd87a1822ba13af22bef357a241b7b76b2281f400f776e309e DIST urllib3-1.14.tar.gz 161497 SHA256 dd4fb13a4ce50b18338c7e4d665b21fd38632c5d4b1d9f1a1379276bd3c08d37 SHA512 8c315b442bc7454e421f2c801cc2bbfc011fb2eb5dcbd2ff7d6078dab0bb5254e3e1489496758cec190ebd0c249962fa1fe24fe6535e844a681350e9d7353562 WHIRLPOOL 3be475d5591328d304bbf48392ab563a7d5013907c96298abaf34b06a7a16fe81d56a03f6a73d50c9679334b140f00789a71a918f2ea1e6951e5351324852f3c diff --git a/dev-python/urllib3/urllib3-1.10.4.ebuild b/dev-python/urllib3/urllib3-1.10.4.ebuild new file mode 100644 index 00000000000..a752de10285 --- /dev/null +++ b/dev-python/urllib3/urllib3-1.10.4.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) + +inherit distutils-r1 + +DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more" +HOMEPAGE="https://github.com/shazow/urllib3" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" +IUSE="doc test" + +RDEPEND="dev-python/six[${PYTHON_USEDEP}] + $(python_gen_cond_dep \ + 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + >=www-servers/tornado-4.1[$(python_gen_usedep 'python*')] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] ) + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + " + +# Testsuite written requiring mock to be installed under all Cpythons + +python_prepare_all() { + # Replace bundled copy of dev-python/six + cat > urllib3/packages/six.py <<-EOF + from __future__ import absolute_import + from six import * + EOF + + sed -i 's:cover-min-percentage = 100::' setup.cfg || die + # Fix tests + sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die + + # Reset source of objects.inv + if use doc; then + local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7) + local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}" + local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html" + local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv" + sed -i "s|'python': ('http://docs.python.org/2.7', None|'${PYTHON_DOC}': ('${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die + fi + + distutils-r1_python_prepare_all +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + # Failures still occur under py2.7. + # https://github.com/shazow/urllib3/issues/621 + + nosetests test || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + + distutils-r1_python_install_all +} diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest index f04db895fbb..274d4c6164f 100644 --- a/dev-python/virtualenv/Manifest +++ b/dev-python/virtualenv/Manifest @@ -1,2 +1,2 @@ DIST virtualenv-13.1.2.tar.gz 1704701 SHA256 438a9933dac2e6ef2e4270fe82435f9c29f933f05e2c5840a7b45e342b6292f8 SHA512 e58f0b1d46174d61b0ef6703020806208f34291c5490fabf29d3b82a03ba89a7caeb377aac44549f6c0ffe2e445786e16dcd67593b7b8d3b1fae0d9e8c8ef124 WHIRLPOOL 03fe0181ebb2d4becb357a740cc3f743526a087e03c03f5e20abac6a54a2701865c89f9f6023ae996d3ca032b08d28e1048747dc8ea1740316f330180f0f5161 -DIST virtualenv-14.0.0.tar.gz 1793952 SHA256 b65ed686c9248426c5ad9b7e0f821c16e5493e363f944895da19a744c5be03fb SHA512 638d118819cfdc86f2d825981ddd9ef5e5f1618062ddbc2f275e66660f88c4800fac55e00a16ca307a3e5b5fceaeccc69f498917e9dd8398bf40de63e6f96445 WHIRLPOOL 5686069cf9add4a87c95cdad1aa5c8d14643df94f368e81abb66163086c009e64ef197887f953c5e6dfbbbe24ff4ceeaad64581bfd45cd571b7fb114b30b1329 +DIST virtualenv-14.0.1.tar.gz 1794063 SHA256 66778f6d27b3864644b923fdbac69d012281821c0c90d2e928a319e9eeef2830 SHA512 594fd00d99808dcc6da573b5b60ffe397bda229517351410aed4342935afcf0ce8d660ef8209fd8a19dd7d880c1afdb7caeb12c638dce80d01b623caa4b5c0fc WHIRLPOOL 1ce84d2d78953897f4fdeea9268849c21da7ca1e25b05b17efa7262a9557c1b89739f81566d7a3f96292837fbd998cce3052954c6acfe3ac1071d0179d57c6b6 diff --git a/dev-python/virtualenv/virtualenv-14.0.0.ebuild b/dev-python/virtualenv/virtualenv-14.0.1.ebuild index 8237a676fb3..8237a676fb3 100644 --- a/dev-python/virtualenv/virtualenv-14.0.0.ebuild +++ b/dev-python/virtualenv/virtualenv-14.0.1.ebuild diff --git a/dev-python/xonsh/Manifest b/dev-python/xonsh/Manifest index 47f23134f66..e3b581b6733 100644 --- a/dev-python/xonsh/Manifest +++ b/dev-python/xonsh/Manifest @@ -1,2 +1,3 @@ DIST xonsh-0.2.3.tar.gz 135218 SHA256 e54f045bbcb2c49f8bf67812bc1c1428628745d0b4dd9880c32b4703e51c4a4d SHA512 78cd577765e3116d0b0060a4db6e3e9aaa5bd870fce2e35241eaa00ca1600039d71b4f0ee011f20c959bf72f33ed09a69b4149c8daf377b9151ae0157259c700 WHIRLPOOL d1660a9f0571c8819560412033399cea4d80ee25707b87d84d852d26a7fcb392e0cf8d57f9084e2a3a36eb2ffffa38ae706b5da540cb2015c816efdd52148caf DIST xonsh-0.2.4.tar.gz 169491 SHA256 6fa02a32bdc1692992258f26f5bc31c5497143c1c8bd0a8fc279da219122f168 SHA512 17ef284ff57df517e5fc932816fb1ea800107f81aa42a5299d7ed6b2cc46eeaf176c9745b0e70524c0b92c582753b8b6dd586288a4db0ac95e3c4d7b20080cea WHIRLPOOL e472b10f73e785563e4ab457e60bf1702654a6fe2e6bdd35f4972a14485e100bcfb35b5ccbd93c6a55b228a9bd432f0c05287bb4b573bf6727d3e9cf6d8ed976 +DIST xonsh-0.2.5.tar.gz 188798 SHA256 a7bdc9d906cb800c271e3808293d27f4513e48e5f6f687241e7f90502c17769f SHA512 b3a3ec39dc9a4df3771bc9d12ce9658cc8740b043b09c7ff5f4b47a3d0d0424e6912c3811c07e7d76c612b09a7aa06dac18323ab8154fdf4b97b84785d9aea55 WHIRLPOOL 4d2467fc0585a889ec352c5c7d997a28d9807886539fdf92780d15af199f76c2f7201b1214fd101eebbd822f636b20aaa10915a203d852802a15bd9f18c85db9 diff --git a/dev-python/xonsh/metadata.xml b/dev-python/xonsh/metadata.xml index fbe9e8a50ba..aaf1facdfe8 100644 --- a/dev-python/xonsh/metadata.xml +++ b/dev-python/xonsh/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>python</herd> diff --git a/dev-python/xonsh/xonsh-0.2.4.ebuild b/dev-python/xonsh/xonsh-0.2.4.ebuild index 0f078e1838e..e69e070c8bf 100644 --- a/dev-python/xonsh/xonsh-0.2.4.ebuild +++ b/dev-python/xonsh/xonsh-0.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -29,11 +29,6 @@ DEPEND="${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )" -_PATCHES=( - "${FILESDIR}"/${P}-kernel-backport.patch - "${FILESDIR}"/${P}-${PN}.bat-backport.patch -) - python_prepare_all() { sed \ -e "/install_kernel_spec/s:prefix=None:prefix=u\"${ED}/usr\":g" \ diff --git a/dev-python/xonsh/xonsh-0.2.5.ebuild b/dev-python/xonsh/xonsh-0.2.5.ebuild new file mode 100644 index 00000000000..ae04e7ed0c4 --- /dev/null +++ b/dev-python/xonsh/xonsh-0.2.5.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python3_{4,5} ) + +inherit distutils-r1 eutils + +DESCRIPTION="An exotic, usable shell" +HOMEPAGE=" + http://xonsh.readthedocs.org/ + https://github.com/scopatz/xonsh + http://pypi.python.org/pypi/xonsh" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + dev-python/ply[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + )" + +python_prepare_all() { + sed \ + -e "/install_kernel_spec/s:prefix=None:prefix=u\"${ED}/usr\":g" \ + -i setup.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + nosetests --verbose || die +} + +pkg_postinst() { + optfeature "Jupyter kernel support" dev-python/jupyter + optfeature "Alternative to readline backend" dev-python/prompt_toolkit +} diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch new file mode 100644 index 00000000000..33002056288 --- /dev/null +++ b/dev-qt/qtmultimedia/files/qtmultimedia-5.5.1-Relax-ALSA-version-checks-for-1.1.x.patch @@ -0,0 +1,118 @@ +From 3b322323d036ae2fc9f685bfc74d1ebcd5532159 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Fri, 27 Nov 2015 14:36:50 +0100 +Subject: [PATCH] alsa: Relax ALSA version checks for 1.1.x to be detected. + +Relax the check for SND_LIB_MINOR and SND_LIB_SUBMINOR so that ALSA +1.1.x is not considered older than 1.0.10. QtMultimedia builds fine with +ALSA 1.1. + +Change-Id: If697c34cc7d9bbe2f2a3413d0c25ac4de4e93b34 +Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com> +--- + config.tests/alsa/alsatest.cpp | 2 +- + src/plugins/alsa/qalsaaudiodeviceinfo.cpp | 8 ++++---- + src/plugins/alsa/qalsaaudioinput.cpp | 4 ++-- + src/plugins/alsa/qalsaaudiooutput.cpp | 4 ++-- + 4 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp +index a9f9c24..1b59cb1 100644 +--- a/config.tests/alsa/alsatest.cpp ++++ b/config.tests/alsa/alsatest.cpp +@@ -32,7 +32,7 @@ + ****************************************************************************/ + + #include <alsa/asoundlib.h> +-#if (!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) ++#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10))) + #error "Alsa version found too old, require >= 1.0.10" + #endif + +diff --git a/src/plugins/alsa/qalsaaudiodeviceinfo.cpp b/src/plugins/alsa/qalsaaudiodeviceinfo.cpp +index be90ca6..3d31087 100644 +--- a/src/plugins/alsa/qalsaaudiodeviceinfo.cpp ++++ b/src/plugins/alsa/qalsaaudiodeviceinfo.cpp +@@ -141,7 +141,7 @@ bool QAlsaAudioDeviceInfo::open() + QList<QByteArray> devices = availableDevices(mode); + + if(dev.compare(QLatin1String("default")) == 0) { +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + if (devices.size() > 0) + dev = QLatin1String(devices.first().constData()); + else +@@ -150,7 +150,7 @@ bool QAlsaAudioDeviceInfo::open() + dev = QLatin1String("hw:0,0"); + #endif + } else { +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + dev = device; + #else + int idx = 0; +@@ -194,7 +194,7 @@ bool QAlsaAudioDeviceInfo::testSettings(const QAudioFormat& format) const + snd_pcm_hw_params_t *params; + QString dev; + +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + dev = device; + if (dev.compare(QLatin1String("default")) == 0) { + QList<QByteArray> devices = availableDevices(QAudio::AudioOutput); +@@ -335,7 +335,7 @@ QList<QByteArray> QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode) + QList<QByteArray> devices; + QByteArray filter; + +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + // Create a list of all current audio devices that support mode + void **hints, **n; + char *name, *descr, *io; +diff --git a/src/plugins/alsa/qalsaaudioinput.cpp b/src/plugins/alsa/qalsaaudioinput.cpp +index 4a8dd80..d6d8adc 100644 +--- a/src/plugins/alsa/qalsaaudioinput.cpp ++++ b/src/plugins/alsa/qalsaaudioinput.cpp +@@ -303,7 +303,7 @@ bool QAlsaAudioInput::open() + QString dev = QString(QLatin1String(m_device.constData())); + QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioInput); + if(dev.compare(QLatin1String("default")) == 0) { +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + if (devices.size() > 0) + dev = QLatin1String(devices.first()); + else +@@ -312,7 +312,7 @@ bool QAlsaAudioInput::open() + dev = QLatin1String("hw:0,0"); + #endif + } else { +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + dev = QLatin1String(m_device); + #else + int idx = 0; +diff --git a/src/plugins/alsa/qalsaaudiooutput.cpp b/src/plugins/alsa/qalsaaudiooutput.cpp +index 7b7da50..f8f0f58 100644 +--- a/src/plugins/alsa/qalsaaudiooutput.cpp ++++ b/src/plugins/alsa/qalsaaudiooutput.cpp +@@ -306,7 +306,7 @@ bool QAlsaAudioOutput::open() + QString dev = QString(QLatin1String(m_device.constData())); + QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioOutput); + if(dev.compare(QLatin1String("default")) == 0) { +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + if (devices.size() > 0) + dev = QLatin1String(devices.first()); + else +@@ -315,7 +315,7 @@ bool QAlsaAudioOutput::open() + dev = QLatin1String("hw:0,0"); + #endif + } else { +-#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14) ++#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14)) + dev = QLatin1String(m_device); + #else + int idx = 0; +-- +2.7.0 + diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index b275b675c4b..536277f05b9 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -3,7 +3,6 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="egl">Enable EGL integration</flag> <flag name="exceptions">Add support for exceptions - like catching them inside the event loop (recommended by upstream)</flag> <flag name="gles2">Enable EGL/GLES2 integration</flag> diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild index 765a5b308bc..cfdd747b1f0 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r1.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild @@ -47,6 +47,11 @@ DEPEND="${RDEPEND} gstreamer? ( x11-proto/videoproto ) " +PATCHES=( + # bug 572426 + "${FILESDIR}/${P}-Relax-ALSA-version-checks-for-1.1.x.patch" +) + src_prepare() { # do not rely on qtbase configuration sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \ diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild deleted file mode 100644 index 1b5123415bb..00000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-5.5.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit qt5-build - -DESCRIPTION="The Multimedia module for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" -fi - -IUSE="alsa egl gstreamer gstreamer010 openal pulseaudio qml widgets" -REQUIRED_USE="?? ( gstreamer gstreamer010 )" - -RDEPEND=" - >=dev-qt/qtcore-${PV}:5 - >=dev-qt/qtgui-${PV}:5 - >=dev-qt/qtnetwork-${PV}:5 - alsa? ( media-libs/alsa-lib ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0 - ) - gstreamer010? ( - dev-libs/glib:2 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-bad:0.10 - media-libs/gst-plugins-base:0.10 - ) - pulseaudio? ( media-sound/pulseaudio ) - qml? ( - >=dev-qt/qtdeclarative-${PV}:5 - egl? ( >=dev-qt/qtgui-${PV}:5[egl,gles2] ) - !egl? ( >=dev-qt/qtgui-${PV}:5[-egl] ) - openal? ( media-libs/openal ) - ) - widgets? ( - >=dev-qt/qtopengl-${PV}:5 - >=dev-qt/qtwidgets-${PV}:5 - ) -" -DEPEND="${RDEPEND} - gstreamer? ( x11-proto/videoproto ) -" - -src_prepare() { - # do not rely on qtbase configuration - sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \ - qtmultimedia.pro || die - - qt_use_compile_test alsa - qt_use_compile_test gstreamer - qt_use_compile_test openal - qt_use_compile_test pulseaudio - - qt_use_disable_mod qml quick \ - src/src.pro \ - src/plugins/plugins.pro - - qt_use_disable_mod widgets widgets \ - src/src.pro \ - src/gsttools/gsttools.pro \ - src/plugins/gstreamer/common.pri - - qt5-build_src_prepare -} - -src_configure() { - local myqmakeargs=( - $(usex gstreamer 'GST_VERSION=1.0' '') - $(usex gstreamer010 'GST_VERSION=0.10' '') - ) - qt5-build_src_configure -} diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest index 4eed8e33478..dd0c933b8d6 100644 --- a/dev-ruby/fast_gettext/Manifest +++ b/dev-ruby/fast_gettext/Manifest @@ -1,3 +1 @@ -DIST fast_gettext-0.9.0.tar.gz 86616 SHA256 773f1112524f1777f4f46ce80c5e1341dd270d232d86808d5ecc27d5b4d83e29 SHA512 901e9725ae537300be078febf4c5c94f466da48b0e4d3611037bfc98b914436a23828708177d6874c7b2ae60245631cd414ee52bd1b9de90c6ff8d1a6dbe37a4 WHIRLPOOL 06f858d501d66cfc609ff2a75010e73b33f706d388286a64ce923a6a87f96ddcc98a6623644b8bac9e57dbe86b7345ddd7aaf601d69ca600e6f8a7c9c8e95114 -DIST fast_gettext-0.9.2.tar.gz 86892 SHA256 7c7de3f9ac19d2e5a81fa15bf0dcd4d54bcb92051e881d83265c6cdadfce239b SHA512 d8bfe755ba6754ff474a6d0e42e9a725aa00f20b381fe5c0a2a2dc3efc5e0bf6096450e0665cd4369717296dc55cd316f836d9cd35b96764eb56e3ca33379c14 WHIRLPOOL 615f5357815d8321d1f099889b352826034af1defbf8a6a4383b9e71b7e37ed06c582e0e957ec4e9a2345b3b84dce9a5432e3d85946f679fa27fcafe04cbce4c DIST fast_gettext-1.0.0.tar.gz 86573 SHA256 8390793a29d291b4efbad01e4c579fcb86200b91e87a72d667fb5e1d451b53a2 SHA512 f9c1656218fbb8f514e10bac6b2656a39013dc0b745e0741cea727280aa0153f3555badc4cbd18fea6bff27e3542c62bb4a7808b0565d6282aa4444ee154cb8e WHIRLPOOL 0d1d1bca6a87364a5a834ca88a1906ef90fbd353890191cd0865103865be396dd7c9ce5c9f8abbbfaa088178ee1a7eecfd57b8a16291214f767b775f7737c81a diff --git a/dev-ruby/fast_gettext/fast_gettext-0.9.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-0.9.0.ebuild deleted file mode 100644 index 07231d74d68..00000000000 --- a/dev-ruby/fast_gettext/fast_gettext-0.9.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# jruby support requires sqlite3 support for jruby. -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md" - -RUBY_FAKEGEM_RECIPE_TEST="rspec" - -inherit ruby-fakegem - -DESCRIPTION="GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!" -HOMEPAGE="https://github.com/grosser/fast_gettext" -SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -ruby_add_bdepend "test? ( dev-ruby/activerecord dev-ruby/protected_attributes dev-ruby/bundler )" - -all_ruby_prepare() { - rm Gemfile.lock || die - - # Remove jeweler and bump from Gemfile since they are not needed for tests. - sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die - - # Avoid unneeded dependency on git and development dependencies. - sed -e '/git ls-files/ s:^:#:' \ - -e '/\(wwtd\|bump\)/ s:^:#:' \ - -i fast_gettext.gemspec || die - - # Don't run a test that requires safe mode which we can't provide - # due to insecure directory settings for the portage dir. This spec - # also calls out to ruby which won't work with different ruby - # implementations. - sed -i -e '/can work in SAFE mode/,/^ end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die - - # Avoid not failing pending specs related to ree18. - sed -i -e '/with i18n loaded/,/^ end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die - - # Avoid RSpec 3 specific syntax - sed -e '/failure_message/ s:^:#:' -i spec/support/be_accessible_matcher.rb || die - -} - -each_ruby_prepare() { - # Make sure the right ruby interpreter is used - sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die -} diff --git a/dev-ruby/fast_gettext/fast_gettext-0.9.2.ebuild b/dev-ruby/fast_gettext/fast_gettext-0.9.2.ebuild deleted file mode 100644 index ef29405f1ba..00000000000 --- a/dev-ruby/fast_gettext/fast_gettext-0.9.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -inherit ruby-fakegem - -DESCRIPTION="GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!" -HOMEPAGE="https://github.com/grosser/fast_gettext" -SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -ruby_add_bdepend "test? ( dev-ruby/activerecord dev-ruby/protected_attributes dev-ruby/bundler )" - -all_ruby_prepare() { - rm Gemfile.lock || die - - # Remove jeweler and bump from Gemfile since they are not needed for tests. - sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die - - # Avoid unneeded dependency on git and development dependencies. - sed -e '/git ls-files/ s:^:#:' \ - -e '/\(wwtd\|bump\)/ s:^:#:' \ - -i fast_gettext.gemspec || die - - # Don't run a test that requires safe mode which we can't provide - # due to insecure directory settings for the portage dir. This spec - # also calls out to ruby which won't work with different ruby - # implementations. - sed -i -e '/can work in SAFE mode/,/^ end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die -} - -each_ruby_prepare() { - # Make sure the right ruby interpreter is used - sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die -} diff --git a/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild index ef29405f1ba..39f0ee6604c 100644 --- a/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild +++ b/dev-ruby/fast_gettext/fast_gettext-1.0.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby20 ruby21" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md" @@ -13,7 +13,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3" inherit ruby-fakegem -DESCRIPTION="GetText but 3.5 x faster, 560 x less memory, simple, clean namespace (7 vs 34) and threadsave!" +DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!" HOMEPAGE="https://github.com/grosser/fast_gettext" SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest index d4e4a57609f..0347de45801 100644 --- a/dev-ruby/gettext_i18n_rails/Manifest +++ b/dev-ruby/gettext_i18n_rails/Manifest @@ -1,2 +1,3 @@ DIST gettext_i18n_rails-1.3.1.tar.gz 20261 SHA256 d50193878e7b8eee61ba48fe33c10f7eed28afdcb7e500dd135743cbc9ffd72f SHA512 761c941aa4d4a746067b84c703b7ca661af3229a2886113a0c5beb1872efd5e74dae7bcf0c6bb476078e636835d19a66e93c8c9c7850024c4ca025e153f1b708 WHIRLPOOL 0b865211641224a5dfc6e76e88297fc2cc8576789a099ca65bc3deefb95318313ec8bae24070fde65c0cd219402cc928265b7ef626435836d3fa8e908ad4ece4 DIST gettext_i18n_rails-1.3.2.tar.gz 20260 SHA256 7c11f3a1d6d9ae394fd77070013a4fa19330bf4b203a7972d651d2ca2b9056de SHA512 04412b5e6b7389b3882d33385fbec22de7c61cd93e4cc7bc09c2bb4afb5d61d08e4c513e17aac18cf250f8efe12c6362633f9722f0e335bb9913484ce7abca15 WHIRLPOOL c96c23242a5ffc03d7e929bf1e05d12a41a8f01957efaebfbad122df842e212b2f6f306125b2047a2366328181fe40959c9fabf3b672bfc8074f8b9f1d6fb785 +DIST gettext_i18n_rails-1.4.0.tar.gz 21787 SHA256 456f80d679437347cd2a9c516b442302dc93d8776d6503512dff03bdbceda54e SHA512 c6455acafbc498ba33703b028b54c30c15ee8454274677eb5dbe402354e178a880d53840d7c7b8f0e1a5a3212184f93043f7df2ab743955c8a869c79a16d4679 WHIRLPOOL ffa186594756a51dadd834e83788e630090bd1a9563e27accf86e5c187908a999d77188963b2b5b2cf9874c2fecf8add7a21b97b453023329d99b3acc529f973 diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.4.0.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.4.0.ebuild new file mode 100644 index 00000000000..994ed31a117 --- /dev/null +++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.4.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="Readme.md" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +inherit ruby-fakegem + +DESCRIPTION="FastGettext / Rails integration" +HOMEPAGE="https://github.com/grosser/gettext_i18n_rails" +SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +ruby_add_bdepend "test? ( dev-ruby/rails:4.1 dev-ruby/activerecord:4.1[sqlite] dev-ruby/temple )" +ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0" + +all_ruby_prepare() { + rm Gemfile Gemfile.lock || die + + # Remove specs for slim and hamlet, template engines we don't package. + rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die + + # Test against Rails 4.1.0 to match keywords. + sed -e '1igem "rails", "~>4.1.0"' -i spec/spec_helper.rb || die +} diff --git a/dev-ruby/protected_attributes/Manifest b/dev-ruby/protected_attributes/Manifest index 89d9a28cd59..8bdd4c80afe 100644 --- a/dev-ruby/protected_attributes/Manifest +++ b/dev-ruby/protected_attributes/Manifest @@ -1,3 +1 @@ -DIST protected_attributes-1.0.9.tar.gz 22212 SHA256 e22ce3bbf9a6edea7c468518fb86aafefb4137f937f62552fe2d56c89fc2e19e SHA512 ed630460df14ea290d9146448908067e0f418568fa31f1f7dbc014954738ca8ee0ff70992c8d77eab9af446a2e1a91e24acb7585d9030a4ab6cae6ede8ee8a4a WHIRLPOOL 7af9a3c1c2c93c0b17443b7fbcbedbd1baa7c54c7541a692353195d3ea457ac530f31f2446835918c2ee0512aa585b3d574a913a9eebd1a39f24c5a988ac3d8c -DIST protected_attributes-1.1.1.tar.gz 23227 SHA256 bb946ebc575a8f9286ba689b641f6f397a79ea308c8008a1a30ee50c6c3b7bbc SHA512 94b21cfc5bbb16ad704e627a89d091d81e5a4c468052de3e6ad80292dab057408b4e6b230e68ef2382a089985faef790568851747e684710ecc5ad4ff6c3f0d3 WHIRLPOOL c5571d93a27301854bf27505ff98dc146a4f91fbb64f5d5ca36588239b535d6ca47f3971242ae2444e496151abd13239560cec2e17296c757549c826d911ba06 DIST protected_attributes-1.1.3.tar.gz 23148 SHA256 0dba89d47e96762b6e2c9cedc1d96a06a16bb307136e23cfc89830602bc97a4b SHA512 e20acd5c392eedc62af18745518249273351104dd0a05e33e459d2ac36706a7c6fdc151d4043370a4527d3e8e96417b26bad2e0f3b21cef3a512bd169d635d45 WHIRLPOOL 311cd7fd9634794d72fae25a903767cbf3894ea07814e8654739e30b3354a49cbe1417dd89462f94f7ed290e7d182132f57aa21106a1e9282be55f5c72508164 diff --git a/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild b/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild deleted file mode 100644 index e217a9ffa03..00000000000 --- a/dev-ruby/protected_attributes/protected_attributes-1.0.9.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_TASK_TEST="test" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -inherit ruby-fakegem - -DESCRIPTION="Protect attributes from mass-assignment in ActiveRecord models" -HOMEPAGE="https://github.com/rails/protected_attributes" -SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SLOT="1" - -LICENSE="MIT" - -KEYWORDS="~amd64 ~x86" -IUSE="test" - -ruby_add_rdepend " - =dev-ruby/activemodel-4* >=dev-ruby/activemodel-4.0.1 -" - -ruby_add_bdepend "test? ( - dev-ruby/bundler - =dev-ruby/actionpack-4* - =dev-ruby/activerecord-4* - =dev-ruby/rails-4* - dev-ruby/mocha - dev-ruby/sqlite3 -)" - -all_ruby_prepare() { - sed -i -e '/github/ s:^:#:' Gemfile || die -} diff --git a/dev-ruby/protected_attributes/protected_attributes-1.1.1.ebuild b/dev-ruby/protected_attributes/protected_attributes-1.1.1.ebuild deleted file mode 100644 index aeb4f5d78f0..00000000000 --- a/dev-ruby/protected_attributes/protected_attributes-1.1.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_TASK_TEST="test" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" - -inherit ruby-fakegem - -DESCRIPTION="Protect attributes from mass-assignment in ActiveRecord models" -HOMEPAGE="https://github.com/rails/protected_attributes" -SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SLOT="1" - -LICENSE="MIT" - -KEYWORDS="~amd64 ~x86" -IUSE="test" - -ruby_add_rdepend " - =dev-ruby/activemodel-4*:* >=dev-ruby/activemodel-4.0.1:* -" - -ruby_add_bdepend "test? ( - dev-ruby/bundler - =dev-ruby/actionpack-4* - =dev-ruby/activerecord-4* - =dev-ruby/rails-4* - dev-ruby/mocha - dev-ruby/sqlite3 -)" - -all_ruby_prepare() { - sed -i -e '/github/ s:^:#:' Gemfile || die -} diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest index 954e56c55ae..a8c93e5fd69 100644 --- a/dev-ruby/ruby_parser/Manifest +++ b/dev-ruby/ruby_parser/Manifest @@ -1,4 +1,2 @@ DIST ruby_parser-3.6.6.gem 250880 SHA256 d3a3ff8e472f85d769e848caa94938e5c4a7b5d9df75384056431bade8bd2cf5 SHA512 c28fea8970c6449a59c1fed1cb2fec3cd167d45c622a7d7de85cf22f24238cd91e3fae4c20ff0de4bd0f4c3afdfd1979e16ee73f60104bcc39469d13650be02a WHIRLPOOL fdf8abbb6eb1e2c421704effd574b5d7baa21059267fad53b1a4f9e80f46c76afe65065e7b5753769c06159a6bd8c84453b9d8d3989f91492fefb15a7b5a6a64 -DIST ruby_parser-3.7.0.gem 310784 SHA256 95d2036b753f399706e3478c1033a81520b27ccf8702e8de076cdfcaff5f1de4 SHA512 bce90b9a266dea59c2c52b80d1524fa6aaf74a6259e7aefe6697081756b8fd6e084ec31042a4b8ca6cf61fbea027fe4255f18d0c3047643a18b03a74b73457d7 WHIRLPOOL 2de7e23ae380e7a2087859cce4d6b97b8399487fc5f504223975f631b8088356a0b3b628d38d6bbecde29a56063cca1c97918a0d7711ddd1482959ffaa0baa35 -DIST ruby_parser-3.7.1.gem 311296 SHA256 7cba241552f03f2db4911013fa40bcd925425f713aa712ebdf34431f1d15ab5a SHA512 34e097c97cf5bd606874a0a1aecb4a5eb4a10f97fd088c21a95b1aee52d9c758a1c7d53601bc711fb5b3d57bf1707e157411eb96d15cccd516c6f5024eca9855 WHIRLPOOL 26178317838ee2bbdd928ea5a97a3c3aaef165b49623395dcff58ac819633b9fc2529a754e821e4e2e5257b34f213f92700f691b0506371e9dc8ab3b7b187633 DIST ruby_parser-3.7.2.gem 311296 SHA256 7f639194041e51680b530480990c0ca3632507e3740a8ef4516592550e3037e6 SHA512 52c026ebdcc687059818d42bb0f4c8e960209deb19f86bd3204c6b0bd3e06ffa01e9d628587f88c866756a81914d5b3cb7df2947433eb39d214a4a144c168442 WHIRLPOOL 63b3189f5ac5153aee8ce7ff1c2ae2533199b59db016a1159e80ec31b23b87e08e97a6bff9112533216f2b07d28ab16e52f462921a0779d45d0cb1c79b1e613f diff --git a/dev-ruby/ruby_parser/ruby_parser-3.7.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.7.0.ebuild deleted file mode 100644 index f1723156e6e..00000000000 --- a/dev-ruby/ruby_parser/ruby_parser-3.7.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_TASK_DOC="docs" -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" - -inherit ruby-fakegem - -DESCRIPTION="A ruby parser written in pure ruby" -HOMEPAGE="https://github.com/seattlerb/ruby_parser" - -LICENSE="MIT" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -ruby_add_rdepend ">=dev-ruby/sexp_processor-4.6.0:4 - !<dev-ruby/ruby_parser-2.3.1-r1" - -ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )" -ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )" - -DEPEND+=" test? ( dev-util/unifdef )" - -all_ruby_prepare() { - # Remove reference to perforce method that is not in a released - # version of hoe-seattlerb. - #sed -i -e '/perforce/d' Rakefile || die - sed -i -e '/license/d' Rakefile || die - sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die -} diff --git a/dev-ruby/ruby_parser/ruby_parser-3.7.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.7.1.ebuild deleted file mode 100644 index f1723156e6e..00000000000 --- a/dev-ruby/ruby_parser/ruby_parser-3.7.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_TASK_DOC="docs" -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" - -inherit ruby-fakegem - -DESCRIPTION="A ruby parser written in pure ruby" -HOMEPAGE="https://github.com/seattlerb/ruby_parser" - -LICENSE="MIT" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -ruby_add_rdepend ">=dev-ruby/sexp_processor-4.6.0:4 - !<dev-ruby/ruby_parser-2.3.1-r1" - -ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )" -ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )" - -DEPEND+=" test? ( dev-util/unifdef )" - -all_ruby_prepare() { - # Remove reference to perforce method that is not in a released - # version of hoe-seattlerb. - #sed -i -e '/perforce/d' Rakefile || die - sed -i -e '/license/d' Rakefile || die - sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die -} diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest index 75e3807437a..fe93bfad73c 100644 --- a/dev-ruby/sexp_processor/Manifest +++ b/dev-ruby/sexp_processor/Manifest @@ -1,4 +1,3 @@ DIST sexp_processor-4.4.4.gem 38912 SHA256 43cab5a67ca409d62411f869ddb7a0a4de0988b489d3f1d610d9b6e521964fd5 SHA512 b17c2a6a5675a5244a935f4d3024bcb6eadb667a189a406b4f890b29361042a5523df55cdb5ee82e60180eacc5999a163f2e88a0b70113aa42aa50cffbdfe1e2 WHIRLPOOL 01d7193d6e3c74d517f108b8aa778fcbd701987d20ee503ae9947ce60a0b3824d1dfae2ca6a0bd4f7b314cfa8c22fb347db0b6fef218833a022f2aec351d37fb -DIST sexp_processor-4.4.5.gem 38912 SHA256 af8713761f1b6604865830c54324e57c33e7cc05107ebdbee4e6d458f8f8fe7c SHA512 6190cc85f7c67ade97725459fd415593fd9f9b405e004b677543c5db40c364d12627587218fe500d46809ccde316dc7d59a647568dfa10bd8eb892af9c20a05e WHIRLPOOL fdea17c49a95e8241b90148710acf7c60f27fb0ddc2fe31a08d095b61fd5c5540dbb88415be47597a94754b89a0023c0273d1f5b7f4280a120cb293d38e9c53b -DIST sexp_processor-4.5.1.gem 38912 SHA256 1456a9be103bf1de0d34ff6980b77a5a72cf3d4b35bbd2182ac62506981a234c SHA512 9cf997a34c57598c7c09392827453cc7c1233fa335261e9f177f0fb70904d7f4a61d8eb819dab040eae8025c1c91fbc4e09f2aae5f02a457ad19f7732e9552c5 WHIRLPOOL cc232f198e018bbd75b8e860ed921b5326d5067dfd1aaacca3613bf787617a99b0c2221da6b072788e453ac2ae93188f8512672d46f89e159642a2bf01343491 DIST sexp_processor-4.6.0.gem 39424 SHA256 e2498f90c75bd4c19d1739afadde8c03af26a881c8bd775f71d2f180de65b43f SHA512 48c96a826472029f22e46138831ee9952250e747b9b5e2637d348ae4cba08d4097c88148457d4215e264c556595da44cb7aad8612642a3e49d68888b6d2e0363 WHIRLPOOL 5fd40d5813d957dd304eb3b697b780db23aab24be096fb25fd4448f6b069424f045e3de20d9e5f315901b1bef039371c797377fb5ac837c21204431ca1c77a18 +DIST sexp_processor-4.6.1.gem 39424 SHA256 e2e96c2ee3ea81e1dc7b4b4abee23b6e552e669cfe456ee69126a29a03373cd7 SHA512 25513e71e30c0ded46201d81e454ab628054c2380c4b9715d6b05cf08703ce3cc31e7d127514f2abc12d875d0d53791740b728922f91b85ba579931799de09d7 WHIRLPOOL 6cd94d615eec3858e2fcb920526438a9d6a6c4509da48369812fb5235e62814be6a7fbe63b9c392287938127f00900ec89638173a5b64b85a1f8bc6ac9e80d8a diff --git a/dev-ruby/sexp_processor/sexp_processor-4.4.5.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.4.5.ebuild deleted file mode 100644 index d188b3c3d71..00000000000 --- a/dev-ruby/sexp_processor/sexp_processor-4.4.5.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -USE_RUBY="ruby19 ruby20" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" - -inherit ruby-fakegem - -DESCRIPTION="Processor for s-expressions created as part of the ParseTree project" -HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/" - -LICENSE="GPL-2" -SLOT="4" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -ruby_add_bdepend " - test? ( - >=dev-ruby/hoe-3.13 - dev-ruby/hoe-seattlerb - >=dev-ruby/minitest-5.5 - )" diff --git a/dev-ruby/sexp_processor/sexp_processor-4.5.1.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.6.1.ebuild index 75b07ad7f55..11ef73a19f3 100644 --- a/dev-ruby/sexp_processor/sexp_processor-4.5.1.ebuild +++ b/dev-ruby/sexp_processor/sexp_processor-4.6.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_DOCDIR="doc" diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild index 024caf3a08c..abf905c3a5e 100644 --- a/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild +++ b/dev-util/desktop-file-utils/desktop-file-utils-0.22.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="emacs" RDEPEND=">=dev-libs/glib-2.12:2 diff --git a/dev-util/monodevelop/files/local-nuget-icons.patch b/dev-util/monodevelop/files/local-nuget-icons.patch new file mode 100644 index 00000000000..561e50f0e2b --- /dev/null +++ b/dev-util/monodevelop/files/local-nuget-icons.patch @@ -0,0 +1,31 @@ +--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs ++++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/ImageLoader.cs +@@ -91,8 +91,7 @@ namespace MonoDevelop.PackageManagement + ImageLoadedEventArgs LoadImage (Uri uri, object state)
+ {
+ try {
+- var httpClient = new HttpClient (uri);
+- Stream stream = httpClient.GetResponse ().GetResponseStream ();
++ Stream stream = GetResponseStream (uri);
+ Image image = Image.FromStream (stream);
+
+ return new ImageLoadedEventArgs (image, uri, state);
+@@ -101,6 +100,17 @@ namespace MonoDevelop.PackageManagement + }
+ }
+
++ static Stream GetResponseStream (Uri uri)
++ {
++ if (uri.IsFile) {
++ var request = WebRequest.Create (uri);
++ return request.GetResponse ().GetResponseStream ();
++ }
++
++ var httpClient = new HttpClient (uri);
++ return httpClient.GetResponse ().GetResponseStream ();
++ }
++
+ void OnLoaded (ITask<ImageLoadedEventArgs> task, Uri uri, object state)
+ {
+ if (task.IsFaulted) {
+ diff --git a/dev-util/monodevelop/monodevelop-5.9.5.9-r1.ebuild b/dev-util/monodevelop/monodevelop-5.9.5.9-r1.ebuild new file mode 100644 index 00000000000..b86abdf4bb4 --- /dev/null +++ b/dev-util/monodevelop/monodevelop-5.9.5.9-r1.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit fdo-mime gnome2-utils dotnet versionator eutils git-r3 + +DESCRIPTION="Integrated Development Environment for .NET" +HOMEPAGE="http://www.monodevelop.com/" +SRC_URI="https://launchpadlibrarian.net/68057829/NUnit-2.5.10.11092.zip + https://www.nuget.org/api/v2/package/NUnit/2.6.3 -> NUnit.2.6.3.zip + https://www.nuget.org/api/v2/package/NUnit.Runners/2.6.3 -> NUnit.Runners.2.6.3.zip + https://www.nuget.org/api/v2/package/System.Web.Mvc.Extensions.Mvc.4/1.0.9 -> System.Web.Mvc.Extensions.Mvc.4.1.0.9.zip + https://www.nuget.org/api/v2/package/Microsoft.AspNet.Mvc/5.2.2 -> Microsoft.AspNet.Mvc.5.2.2.zip + https://www.nuget.org/api/v2/package/Microsoft.AspNet.Razor/3.2.2 -> Microsoft.AspNet.Razor.3.2.2.zip + https://www.nuget.org/api/v2/package/Microsoft.AspNet.WebPages/3.2.2 -> Microsoft.AspNet.WebPages.3.2.2.zip + https://www.nuget.org/api/v2/package/Microsoft.Web.Infrastructure/1.0.0.0 -> Microsoft.Web.Infrastructure.1.0.0.0.zip" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+subversion +git +gnome qtcurve" + +RDEPEND=">=dev-lang/mono-3.2.8 + >=dev-dotnet/nuget-2.8.3 + gnome? ( >=dev-dotnet/gnome-sharp-2.24.2-r1 ) + >=dev-dotnet/gtk-sharp-2.12.21:2 + >=www-servers/xsp-2 + dev-util/ctags + sys-apps/dbus[X] + subversion? ( dev-vcs/subversion ) + !<dev-util/monodevelop-boo-$(get_version_component_range 1-2) + !<dev-util/monodevelop-java-$(get_version_component_range 1-2) + !<dev-util/monodevelop-database-$(get_version_component_range 1-2) + !<dev-util/monodevelop-debugger-gdb-$(get_version_component_range 1-2) + !<dev-util/monodevelop-debugger-mdb-$(get_version_component_range 1-2) + !<dev-util/monodevelop-vala-$(get_version_component_range 1-2)" +DEPEND="${RDEPEND} + dev-util/intltool + virtual/pkgconfig + sys-devel/gettext + x11-misc/shared-mime-info + x11-terms/xterm + app-arch/unzip" +MAKEOPTS="${MAKEOPTS} -j1" #nowarn +S="${WORKDIR}"/${P} +EGIT_REPO_URI="https://github.com/mono/monodevelop.git" +EGIT_COMMIT="${P}" + +src_unpack() { + cd "${T}" + unpack NUnit-2.5.10.11092.zip + + #clone from git + git-r3_fetch + git-r3_checkout "${EGIT_REPO_URI}" "${T}/${P}" + + #extract packages + mkdir -p "${T}"/packages || die + cd "${T}"/packages || die + + for pkg in NUnit.2.6.3 \ + NUnit.Runners.2.6.3 \ + System.Web.Mvc.Extensions.Mvc.4.1.0.9 \ + Microsoft.AspNet.Mvc.5.2.2 \ + Microsoft.AspNet.Razor.3.2.2 \ + Microsoft.AspNet.WebPages.3.2.2 \ + Microsoft.Web.Infrastructure.1.0.0.0 + do + mkdir $pkg || die + cd $pkg || die + unpack $pkg.zip + cd .. || die + done + mkdir -p "${S}" +} + +src_prepare() { + # Remove the git rev-parse (changelog?) + sed -i '/<Exec.*rev-parse/ d' "${T}/${P}/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj" || die + # Set specific_version to prevent binding problem + # when gtk#-3 is installed alongside gtk#-2 + find "${T}/${P}" -name '*.csproj' -exec sed -i 's#<SpecificVersion>.*</SpecificVersion>#<SpecificVersion>True</SpecificVersion>#' {} + || die + + #fix ASP.Net + cd "${T}/${P}/main" + epatch "${FILESDIR}/5.7-downgrade_to_mvc3.patch" + epatch "${FILESDIR}/local-nuget-icons.patch" + + # fix for https://github.com/gentoo/dotnet/issues/42 + epatch "${FILESDIR}/aspnet-template-references-fix.patch" + use gnome || epatch "${FILESDIR}/5.9.5-kill-gnome.patch" + use qtcurve && epatch "${FILESDIR}/kill-qtcurve-warning.patch" + + #prepare dist package + cd "${T}/${P}" + epatch "${FILESDIR}/5.9.5-skip_merged_tar.patch" + ./configure --profile=default || die + make dist || die + + #move it + mv -f "${T}/${P}/tarballs/"monodevelop-*/* "${S}" || die + + #copy missing binaries + mkdir -p "${S}"/external/cecil/Test/libs/nunit-2.5.10/ || die + cp -fR "${T}"/NUnit-2.5.10.11092/bin/net-2.0/framework/* "${S}"/external/cecil/Test/libs/nunit-2.5.10/ || die + mv -f "${T}/packages" "${S}" || die + + default +} + +src_configure() { + # env vars are added as the fix for https://github.com/gentoo/dotnet/issues/29 + MCS=/usr/bin/dmcs CSC=/usr/bin/dmcs GMCS=/usr/bin/dmcs econf \ + --disable-update-mimedb \ + --disable-update-desktopdb \ + --enable-monoextensions \ + --enable-gnomeplatform \ + $(use_enable subversion) \ + $(use_enable git) + # https://github.com/mrward/xdt/issues/4 + # Main.sln file is created on the fly during econf + epatch -p2 "${FILESDIR}/mrward-xdt-issue-4.patch" + # fix of https://github.com/gentoo/dotnet/issues/38 + sed -i -E -e 's#(EXE_PATH=")(.*)(/lib/monodevelop/bin/MonoDevelop.exe")#\1'${EPREFIX}'/usr\3#g' "${S}/monodevelop" || die +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + fdo-mime_mime_database_update + fdo-mime_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + fdo-mime_mime_database_update + fdo-mime_desktop_database_update +} diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest index 47efeea1a13..8455d3a2b17 100644 --- a/dev-util/re2c/Manifest +++ b/dev-util/re2c/Manifest @@ -5,3 +5,4 @@ DIST re2c-0.14.2.tar.gz 2554944 SHA256 a702eb63977af4715555edb41eba3b47bbfdcdb44 DIST re2c-0.14.3.tar.gz 2576859 SHA256 1c6806df599f3aef0804b576cfdf64bdba5ad590626dfca2d44e473460917e84 SHA512 c1fa20c9c1e69d085415dde3177cb03688f8a9314dd4854241812f479a2b1e4306c3abbb8f9f31763918afbd1f7a821e7337551a898f6ae57f814c66e59e2382 WHIRLPOOL dd08d837c93737d9a4dd8fd9f01de721e26b569b2686a2d066636e130f6eb82a8b8b71e8b5d84fcf44993998250effc17c2c3dbc1fd6e1651c5b5ba18a36e8fe DIST re2c-0.15.2.tar.gz 4074407 SHA256 fe708c3477d908f02f2ab1646ac194d88b5dbfd92912b020a2b7a5bdfb778889 SHA512 6e46e45b55665a0898354b2684326ca91ff3fb50d2f52e7a7cba59658876c743cb141c827f3d3c77c1d44089c16a4207cb48e97f5af383ac1c95bc063388ba73 WHIRLPOOL 9f5f5636e19d7e9cb136b9f18a0059569ca6f1562f2c1302bc0212386e61f5be8eb866c4513e91231cfc4bf6ac3eeb24a672cd81675155dce244a48152b7ea3a DIST re2c-0.15.3.tar.gz 4881197 SHA256 f9d2a96c60a8c60d9c6c70e10590cbceaf0776d3115e7b3b35c7d7240cc1613b SHA512 eebe372543b8c8fafa5d1a206c5fc5e92ea36e78da3ac5cd2e52d2710435cc83c8604bfb5397b48abef1d6ba241b9ed8a15119b436236b116bc81579a8dd9247 WHIRLPOOL 3bb18924d008762f49c78c98f7678b6f81295f86e4a69a884c86763a3b7855870adfcafe5912f8cbd81672ca7c38c00ffd51e5d5e8f4935fd0ac842f394128f9 +DIST re2c-0.16.tar.gz 4892417 SHA256 48c12564297641cceb5ff05aead57f28118db6277f31e2262437feba89069e84 SHA512 d4fb8078d9566a1fa177331b649cac79e2e45cc9558a22a2212503f6c77c9e6b4238aa01c85c66b86fa4831cdc669cedf8b430d395be6a0c6cfabfb7c61cf8a3 WHIRLPOOL de28f65acac11ea36aad72eb8ba8f63949dcc10e9712ac84be91a66cd4216c01dee9eb360bf95db1c32de79cf9aa7ad2a1656eb877c52d44dd95a45e2b24253a diff --git a/dev-util/re2c/re2c-0.16.ebuild b/dev-util/re2c/re2c-0.16.ebuild new file mode 100644 index 00000000000..b7e4e5af322 --- /dev/null +++ b/dev-util/re2c/re2c-0.16.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +DESCRIPTION="tool for generating C-based recognizers from regular expressions" +HOMEPAGE="http://re2c.org/" +SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" + +src_prepare() { + epatch_user + export ac_cv_path_BISON="no" +} + +src_install() { + default + + docompress -x /usr/share/doc/${PF}/{examples,paper} + dodoc -r README CHANGELOG examples + docinto paper + dodoc doc/loplas.ps doc/sample.bib +} diff --git a/games-arcade/ninvaders/files/ninvaders-0.1.1-compile.patch b/games-arcade/ninvaders/files/ninvaders-0.1.1-compile.patch new file mode 100644 index 00000000000..c949d432708 --- /dev/null +++ b/games-arcade/ninvaders/files/ninvaders-0.1.1-compile.patch @@ -0,0 +1,11 @@ +--- aliens.c.orig 2016-01-21 13:21:51.730154342 -0500 ++++ aliens.c 2016-01-21 13:22:09.488543075 -0500 +@@ -163,7 +163,7 @@ + aliens.right=-1; + aliens.bottom=-1; + shipnum=0; +- for (k=0;k<11;k++) { ++ for (k=0;k<ALIENS_MAX_NUMBER_X;k++) { + lowest_ship[k]=-1; + } + diff --git a/games-arcade/ninvaders/ninvaders-0.1.1.ebuild b/games-arcade/ninvaders/ninvaders-0.1.1.ebuild index 2a12d90bf76..205ce461939 100644 --- a/games-arcade/ninvaders/ninvaders-0.1.1.ebuild +++ b/games-arcade/ninvaders/ninvaders-0.1.1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -inherit toolchain-funcs games +inherit eutils toolchain-funcs games DESCRIPTION="ASCII space invaders clone" HOMEPAGE="http://ninvaders.sourceforge.net/" @@ -15,7 +15,11 @@ KEYWORDS="amd64 ~ppc x86 ~x86-fbsd" IUSE="" DEPEND="sys-libs/ncurses:0" -RDEPEND="${DEPEND}" +RDEPEND=${DEPEND} + +src_prepare() { + epatch "${FILESDIR}"/${P}-compile.patch +} src_compile() { emake \ diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index a67bc5f4f51..e7c25bdef70 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,2 +1,3 @@ DIST rspamd-1.0.11.tar.xz 1176160 SHA256 b914c77c30dcab863f6c685b4a83a1662ee1b4503654fbf3ee3ae2fbca1ed928 SHA512 79464e8c29bdf5b081744b79fb8eee944bf647abf334cd77686a8fa4d0a3ab7ff4293fc464606d298fb57c8d7fe909e333ae7e58768330e4d65464bf42f76f15 WHIRLPOOL ca1f8338ef6f917622c8a93fa8bf230b2767d750e953d9f790649e660865caaa255c5a8eb35a14cb882acc193a237bf107d79c7c01f3d7ec6520301edc9f2629 DIST rspamd-1.1.0.tar.xz 1291004 SHA256 69db05150b4ba8304d24dd0f96c79b5d3792478373f0d6be6c92b51b1cf60ead SHA512 41a8fb49a10082b1dc97397ebb8ac81dd3f4912e9140dcb7c57c9e15f1e49cf472aa94570a2f802b82e3db8ab8a87dd6a63f7db7249da4d99473700535045256 WHIRLPOOL 3781b7450e0f2cd780e2dac804871d52fed619c5e82faf54d8d9d4230b2baf531eeacea09b43ae36ec09fb7b659ba74116ab59fb86731de9bcfc471a2dbdd7ad +DIST rspamd-1.1.1.tar.xz 1291968 SHA256 3c4bda66b533861a84d82ea26bd7c19ccd1b1befe8b3e33a0fc211c036569a06 SHA512 c971000f9e6c09ae8c4a175fcd96471efa3f5e73689b038a45cc2212dcf296babfd4000fa41f0451b2fdd989e00192cbb234a73cef026c16466bfe78b04b5385 WHIRLPOOL e1ef4042e9a38bcff20a2a3ea0e9fa29fa813adede28867e176d3aeff952fe243fd4a083a60d810fe16c1ad22e6489583b50a38825bc20c338ddf1710f9294da diff --git a/mail-filter/rspamd/rspamd-1.1.1.ebuild b/mail-filter/rspamd/rspamd-1.1.1.ebuild new file mode 100644 index 00000000000..ed352f4c77e --- /dev/null +++ b/mail-filter/rspamd/rspamd-1.1.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils user + +DESCRIPTION="Rapid spam filtering system" +SRC_URI="https://rspamd.com/downloads/${P}.tar.xz" +HOMEPAGE="https://github.com/vstakhov/rspamd" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-libs/openssl:0 + dev-libs/libpcre + dev-lang/luajit:2 + dev-libs/libevent + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/gmime + sys-apps/file + virtual/libiconv" +RDEPEND="${DEPEND}" + +pkg_setup() { + enewgroup rspamd + enewuser rspamd -1 -1 /var/lib/rspamd rspamd +} + +src_configure() { + local mycmakeargs=( + -DCONFDIR=/etc/rspamd + -DRUNDIR=/var/run/rspamd + -DDBDIR=/var/lib/rspamd + -DLOGDIR=/var/log/rspamd + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + newinitd "${FILESDIR}/rspamd.init" rspamd + + dodir /var/lib/rspamd + dodir /var/log/rspamd + + fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd + + insinto /etc/logrotate.d + newins "${FILESDIR}/rspamd.logrotate" rspamd +} diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest index c6009134b1c..9f1359283c6 100644 --- a/mail-mta/postfix/Manifest +++ b/mail-mta/postfix/Manifest @@ -2,5 +2,5 @@ DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb DIST postfix-2.11.7.tar.gz 4031689 SHA256 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 SHA512 a1e146db6d2d71abb1dd7c70cde24e6410b599458ffa8061a0161be9475452034d9dcc7ec3976042b379cd84f5ebdba2f9d8d829637ff376ccaf7e87bcabe7a3 WHIRLPOOL 990cf17bc8d0cb8c8de0aa42f16125b1393feb42ed2eca3cb66ddd4d0b5d9425f619ee22047745fdd2f0069dc321e942ecc326bfbb88519fccf4931f95b1c483 DIST postfix-3.0.2.tar.gz 4239235 SHA256 68256314202f5f0f24022d64f7ac664d28fa1394d07c84a37c3fc7a2d040be80 SHA512 b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4ce731a2ff6a632c3341ace43afe7f1600f2096592535cf9a300322f78c92000e752e0df7d3c39021 WHIRLPOOL 3fd230321577c0226926701a17803b038a281b46abe884899ca38ea18c5fd9c13ef90900e5fdd17db20ecf8dc63b373cb9f378f1402660be2908192900cba47a DIST postfix-3.0.3.tar.gz 4240588 SHA256 401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02 SHA512 b6cd091a8cdda9678fa2979082e47a363dd086e4376effc0a427d1beb5eb35bd7dc28003ad28323c42318d7f630e0d8b105c56fd1a63bd5b5a20501db68ac524 WHIRLPOOL b013164f12e2adde464052f37584320687716f18c65cdd01344848bbcdd5a08be16c741234a063d717474a50be0d14d7b5574ccb69dc56e00f30b619d148c9f9 -DIST postfix-3.1-20160104.tar.gz 4312368 SHA256 f61125163bd80bb51a02979cd0955502601331e547b3dad02d2b4ff06ce0e01b SHA512 6761125cdd4b7f3760db5a7b2ea5e5381cd77cab369db69d66ef607fbda70912ff4de079b57ef0952d335b6f558f8e004c1ed9f4ca100ea7c4708fabe8e6a498 WHIRLPOOL 797cc89e277fe9f9ac4ccc9729d8e4190aeb8973d3a0137d79dfc38e2a0aeb52830a35437cb1d09fbf5b9e8a3f3a7e7cf411380afe31313f1b6fb88d49826789 +DIST postfix-3.1-20160117.tar.gz 4314392 SHA256 91f6572d453000d113d783e0e2d73db6cec53d8ce37e2d3fe441cfdd6621c9b1 SHA512 e712e60758d10edf3bd20d37667664fbb86959238cd7c704c86872dff761c8c52db1e4345a48b9bade19a950eb8fe5c1e71c42d6d37ddf0b70b6bec22a36dc60 WHIRLPOOL 8d1abec5621abece386f718117d4db6e7ff2fa3c41520b5e4cbede70475a719366a4ff53132262d943025c48a2be679279eca2180d0a834a2463953eb9e7e99b DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3 diff --git a/mail-mta/postfix/postfix-3.1_pre20160104.ebuild b/mail-mta/postfix/postfix-3.1_pre20160117.ebuild index 0eec0d7f2db..0eec0d7f2db 100644 --- a/mail-mta/postfix/postfix-3.1_pre20160104.ebuild +++ b/mail-mta/postfix/postfix-3.1_pre20160117.ebuild diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest index d2209e1b373..9a2e90e21a7 100644 --- a/media-gfx/kphotoalbum/Manifest +++ b/media-gfx/kphotoalbum/Manifest @@ -1,2 +1,2 @@ DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 0cdd4e02e9e4f840550a20cc8dca8a017777e4a55db19f0f8b15e903d2c342cd SHA512 57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d WHIRLPOOL 77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe -DIST kphotoalbum-4.6.2.tar.xz 9503920 SHA256 54c256a1943a632f7ff68126dc985e7f434e7b18c762ae40a49181b9d85f34fb SHA512 437fb05a3e2f9f6f2ca97ba3ee17a125185ffe1603f3a37ad1b1bf837c49ee983e7ccf6858ad7243a7cae00eb2175f5a280bfd31cd5ed109ca46fa1ae8170a57 WHIRLPOOL aaab45d3d5f2115206d98cd7db4953df21c3189ffc8f57f3291321f744cdf69fb138ec08f4af0b6b3f2db2b2281e8f468259cf0846784528e6fba64906b93459 +DIST kphotoalbum-4.7.tar.xz 9514404 SHA256 8b33cbe995b652740ee965b907abb96689588c1eac36340d9ace646d3018735d SHA512 b441c5ebad3821dc72601e50bddcb7fe49c1f8cfd08ddc763692b69e3eb8affd2f5146d2cd9eb48d272d1f600ea40ee1d2a5bb7a14b6eaade558852154485100 WHIRLPOOL 037f04dfa31aba059ef76bf45b67d4268c81bd025b2c6e8bfb092aad2e30f7a829522624fb24a1163864c9e63a91f1bfa970a2f5465530c9577c46ae979c14c2 diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.7.ebuild index c94fc2779a2..13c04783177 100644 --- a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild +++ b/media-gfx/kphotoalbum/kphotoalbum-4.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -26,7 +26,7 @@ COMMON_DEPEND=" media-libs/phonon[qt4] virtual/jpeg:0 exif? ( >=media-gfx/exiv2-0.17:= ) - face? ( >=kde-apps/libkface-4.7.0 ) + face? ( >=kde-apps/libkface-4.7.0:4 ) geolocation? ( $(add_kdeapps_dep marble) ) kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) ) map? ( >=kde-apps/libkgeomap-4.7.0:4 ) @@ -40,7 +40,6 @@ RDEPEND="${COMMON_DEPEND} kipi? ( >=media-plugins/kipi-plugins-4.7.0 ) " -PATCHES=( "${FILESDIR}/${P}-bump-min-cmake.patch" ) DOCS=( ChangeLog README ) src_configure() { diff --git a/media-libs/assimp/files/test-cmakelists.patch b/media-libs/assimp/files/test-cmakelists.patch new file mode 100644 index 00000000000..9a3471bbc36 --- /dev/null +++ b/media-libs/assimp/files/test-cmakelists.patch @@ -0,0 +1,35 @@ +--- test/CMakeLists.txt.old 2016-01-21 06:46:12.053363212 +0100 ++++ test/CMakeLists.txt 2016-01-21 06:46:51.126697143 +0100 +@@ -1,7 +1,5 @@ + cmake_minimum_required( VERSION 2.6 ) + +-INCLUDE( AddGTest ) +- + INCLUDE_DIRECTORIES( + ${Assimp_SOURCE_DIR}/include + ${Assimp_SOURCE_DIR}/code +@@ -47,7 +45,7 @@ + + SOURCE_GROUP( tests FILES ${TEST_SRCS} ) + +-if(AddGTest_FOUND) ++if(BUILD_TESTS) + add_executable( unit + unit/CCompilerTest.c + unit/Main.cpp +@@ -56,13 +54,12 @@ + ) + + add_definitions(-DASSIMP_TEST_MODELS_DIR="${CMAKE_CURRENT_LIST_DIR}/models") ++target_link_libraries( unit gtest ) + + SET_PROPERTY( TARGET assimp PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} ) + + add_dependencies( unit gtest ) + target_link_libraries( unit assimp +- debug ${GTEST_DEBUG_LIBRARIES} +- optimized ${GTEST_RELEASE_LIBRARIES} + ) +-endif(AddGTest_FOUND) ++endif(BUILD_TESTS) + add_subdirectory(headercheck) diff --git a/media-libs/jbigkit/jbigkit-2.1.ebuild b/media-libs/jbigkit/jbigkit-2.1.ebuild index db72bc36c39..6a11102a5ce 100644 --- a/media-libs/jbigkit/jbigkit-2.1.ebuild +++ b/media-libs/jbigkit/jbigkit-2.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/2.1" # Since we install libjbig.so and libjbig85.so without version, use ${PV} like 2.1 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt pbmtools/*.txt" diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml index eb040858632..41825e879ad 100644 --- a/media-tv/kodi/metadata.xml +++ b/media-tv/kodi/metadata.xml @@ -2,6 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>xbox</herd> +<herd>video</herd> <use> <flag name='airplay'>enable AirPlay support</flag> <flag name='bluray'>Enable playback of Blu-ray filesystems</flag> diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml index af5099eea16..f753e5f85d0 100644 --- a/media-tv/xbmc/metadata.xml +++ b/media-tv/xbmc/metadata.xml @@ -2,6 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>xbox</herd> +<herd>video</herd> <use> <flag name='airplay'>enable AirPlay support</flag> <flag name='bluray'>Enable playback of Blu-ray filesystems</flag> diff --git a/net-dialup/lrzsz/metadata.xml b/net-dialup/lrzsz/metadata.xml index a46ef861b0c..f7407264c3a 100644 --- a/net-dialup/lrzsz/metadata.xml +++ b/net-dialup/lrzsz/metadata.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>net-dialup</herd> +<herd>embedded</herd> <longdescription>Communication package providing the X, Y, and ZMODEM file transfer protocols</longdescription> </pkgmetadata> diff --git a/net-dialup/mingetty/metadata.xml b/net-dialup/mingetty/metadata.xml index 7cd707c0759..3141de561c6 100644 --- a/net-dialup/mingetty/metadata.xml +++ b/net-dialup/mingetty/metadata.xml @@ -5,6 +5,7 @@ <email>polynomial-c@gentoo.org</email> <name>Lars Wendler</name> </maintainer> + <herd>base-system</herd> <longdescription>The mingetty program is a lightweight, minimalist getty program for use only on virtual consoles. Mingetty is not suitable for serial lines (you should use the mgetty program in that case).</longdescription> diff --git a/net-dialup/minicom/metadata.xml b/net-dialup/minicom/metadata.xml index f5d48b82306..f68afd2b9d1 100644 --- a/net-dialup/minicom/metadata.xml +++ b/net-dialup/minicom/metadata.xml @@ -1,7 +1,7 @@ <?xml version = '1.0' encoding = 'UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>net-dialup</herd> + <herd>embedded</herd> <longdescription lang="en"> Minicom is a menu driven communications program. It emulates ANSI and VT102 terminals. It has a dialing directory and auto zmodem download. diff --git a/net-dialup/picocom/metadata.xml b/net-dialup/picocom/metadata.xml index 112e7d920cf..26e742e2c90 100644 --- a/net-dialup/picocom/metadata.xml +++ b/net-dialup/picocom/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>net-dialup</herd> + <herd>embedded</herd> <maintainer> <email>flameeyes@gentoo.org</email> </maintainer> diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml index a821a831b38..eaaa21ba2c8 100644 --- a/net-dialup/ppp/metadata.xml +++ b/net-dialup/ppp/metadata.xml @@ -5,6 +5,7 @@ <email>polynomial-c@gentoo.org</email> <name>Lars Wendler</name> </maintainer> + <herd>base-system</herd> <longdescription>ppp (Paul's PPP Package) is an open source package which implements the Point-to-Point Protocol</longdescription> <use> diff --git a/net-dialup/rp-pppoe/metadata.xml b/net-dialup/rp-pppoe/metadata.xml index c9169515bdf..a1edcfe784b 100644 --- a/net-dialup/rp-pppoe/metadata.xml +++ b/net-dialup/rp-pppoe/metadata.xml @@ -5,4 +5,5 @@ <email>polynomial-c@gentoo.org</email> <name>Lars Wendler</name> </maintainer> + <herd>base-system</herd> </pkgmetadata> diff --git a/net-dialup/xc/metadata.xml b/net-dialup/xc/metadata.xml index f745bd6e8cd..c9337563bbf 100644 --- a/net-dialup/xc/metadata.xml +++ b/net-dialup/xc/metadata.xml @@ -5,4 +5,5 @@ <email>kumba@gentoo.org</email> <name>Joshua Kinard</name> </maintainer> + <herd>embedded</herd> </pkgmetadata> diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest index 89899661663..4c8eeb4447a 100644 --- a/net-firewall/firehol/Manifest +++ b/net-firewall/firehol/Manifest @@ -1 +1,3 @@ DIST firehol-2.0.3.tar.xz 898248 SHA256 4bcc2d19ee7d41377f19c3bcd3ae882ba10dd3ebed6eac2deedbce202d1a3d72 SHA512 fab1ddea6d60d5cb91eacc73f79549f454abc7d581c696463f4396465257a708af175f18da7aa2c6ddc3dddc68b21528edb043a3fe539d16f5057e4f0c0db0b6 WHIRLPOOL 50556da7e392575ef2e36a489e544295f909c8621be5e7c91ad8b00f99879d1eebe59076948d8e58839869771547e85c425262438eb5f79d4b2bd8f2bb0009f8 +DIST firehol-2.0.4.tar.xz 900876 SHA256 f41ff31920402c80aa823a298cc437e9a0b4d9ff0320f3f75cb55c62407dad4c SHA512 b73053c3fc1cb4e5e83cc2b25a99bf06c14623f9e574af2b11b198ecc2fb84119f0ab60cb3ff96b32601c717118693869eb3fea2b0fdc61bb49f197fb73abcca WHIRLPOOL 05bc39636c7d496e321f191b03efe2f8d1dcd6aec537a41e7ae4bac3ee4386f718728ad965fdacb46f02f949986f6979f17d41dc21f06d7ad62f3e744f0599d1 +DIST firehol-3.0.1.tar.xz 1407436 SHA256 63904b635dbd096035a720f84ad4ff74f32cec75357001638f4748c49cce46c7 SHA512 8c1bdb2a8b1bf551036d0ee58e7538a2e6513427db353af7e4415ed91cab95fe363e348d5ff32a82767b0fa4db69c469d228a05fa70fdfb8a9b81a2e6b78bae4 WHIRLPOOL a0189ef5da2f2ed15a51b32ec0be60a036d9806053b44bbc538e524fe57d28230e8676fb8352ab1b7b36998e6e68806b324768606c21f64c2c39b6698f2e6d58 diff --git a/net-firewall/firehol/firehol-2.0.4.ebuild b/net-firewall/firehol/firehol-2.0.4.ebuild new file mode 100644 index 00000000000..2a0dbba431d --- /dev/null +++ b/net-firewall/firehol/firehol-2.0.4.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils linux-info + +DESCRIPTION="iptables firewall generator" +HOMEPAGE="http://firehol.sourceforge.net/" +SRC_URI="https://firehol.org/download/firehol/releases/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +RDEPEND="net-firewall/iptables + sys-apps/iproute2[-minimal] + virtual/modutils + app-arch/gzip" +DEPEND="${RDEPEND}" + +pkg_setup() { + local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \ + ~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \ + ~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \ + ~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER" + + get_version + if [ ${KV_PATCH} -ge 25 ]; then + CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}" + else + CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}" + fi + linux-info_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-2.0.2-autosave.patch" +} + +src_configure() { + # removing IP6TABLES_CMD has no effect and enable build + # without ipv6 available + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --with-autosave="${EPREFIX}/var/lib/iptables/rules-save" \ + --with-autosave6="${EPREFIX}/var/lib/ip6tables/rules-save" \ + $(use_enable doc) \ + IP6TABLES_CMD=/bin/false \ + IP6TABLES_SAVE_CMD=/bin/false \ + IP6TABLES_RESTORE_CMD=/bin/false +} + +src_install() { + default + + newconfd "${FILESDIR}"/firehol.conf.d firehol + newinitd "${FILESDIR}"/firehol.initrd firehol + newconfd "${FILESDIR}"/fireqos.conf.d fireqos + newinitd "${FILESDIR}"/fireqos.initrd fireqos +} diff --git a/net-firewall/firehol/firehol-3.0.1.ebuild b/net-firewall/firehol/firehol-3.0.1.ebuild new file mode 100644 index 00000000000..0de3c98085d --- /dev/null +++ b/net-firewall/firehol/firehol-3.0.1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils linux-info + +DESCRIPTION="iptables firewall generator" +HOMEPAGE="http://firehol.sourceforge.net/" +SRC_URI="https://firehol.org/download/firehol/releases/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc ipv6" +KEYWORDS="~amd64" + +RDEPEND="net-firewall/iptables + sys-apps/iproute2[-minimal,ipv6?] + net-misc/iputils[ipv6?] + net-misc/iprange + net-analyzer/traceroute + virtual/modutils + app-arch/gzip" +DEPEND="${RDEPEND}" + +pkg_setup() { + local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~NF_NAT ~NF_NAT_FTP ~NF_NAT_IRC \ + ~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG \ + ~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE \ + ~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_STATE ~NETFILTER_XT_MATCH_OWNER" + + get_version + if [ ${KV_PATCH} -ge 25 ]; then + CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}" + else + CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}" + fi + linux-info_pkg_setup +} + +src_configure() { + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --disable-vnetbuild \ + --disable-update-ipsets \ + $(use_enable doc) \ + $(use_enable ipv6) +} + +src_install() { + default + + newconfd "${FILESDIR}"/firehol.conf.d firehol + newinitd "${FILESDIR}"/firehol.initrd firehol + newconfd "${FILESDIR}"/fireqos.conf.d fireqos + newinitd "${FILESDIR}"/fireqos.initrd fireqos +} diff --git a/net-fs/libnfs/metadata.xml b/net-fs/libnfs/metadata.xml index b85299b685b..355d2a63d71 100644 --- a/net-fs/libnfs/metadata.xml +++ b/net-fs/libnfs/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>net-fs</herd> + <herd>base-system</herd> <upstream> <remote-id type="github">sahlberg/libnfs</remote-id> </upstream> diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml index d89ebcfd96a..1edec5a78d9 100644 --- a/net-fs/nfs-utils/metadata.xml +++ b/net-fs/nfs-utils/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>net-fs</herd> + <herd>base-system</herd> <longdescription>NFS client and server daemons</longdescription> <use> <flag name="libmount">Link mount.nfs with libmount</flag> diff --git a/net-fs/nfs4-acl-tools/metadata.xml b/net-fs/nfs4-acl-tools/metadata.xml index ca66751dee2..96a2d586367 100644 --- a/net-fs/nfs4-acl-tools/metadata.xml +++ b/net-fs/nfs4-acl-tools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>net-fs</herd> +<herd>base-system</herd> </pkgmetadata> diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild index 3d12be1e26f..437a5c9f8ce 100644 --- a/net-libs/libbtbb/libbtbb-9999.ebuild +++ b/net-libs/libbtbb/libbtbb-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -29,7 +29,6 @@ RDEPEND=" pcap? ( net-libs/libpcap ) wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= - !>net-analyzer/wireshark-1.98 ) " DEPEND="${RDEPEND} @@ -56,7 +55,11 @@ src_prepare(){ for i in ${plugins} do sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + if has_version '>=net-analyzer/wireshark-2.0'; then + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + else + CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} + fi BUILD_DIR="${WORKDIR}"/${i}_build cmake-utils_src_prepare done @@ -77,7 +80,11 @@ src_configure() { if use wireshark-plugins; then for i in ${plugins} do - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + if has_version '>=net-analyzer/wireshark-2.0'; then + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + else + CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} + fi BUILD_DIR="${WORKDIR}"/${i}_build local mycmakeargs=( -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)" @@ -95,7 +102,11 @@ src_compile(){ if use wireshark-plugins; then for i in ${plugins} do - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + if has_version '>=net-analyzer/wireshark-2.0'; then + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + else + CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} + fi BUILD_DIR="${WORKDIR}"/${i}_build cmake-utils_src_compile done @@ -110,7 +121,11 @@ src_test(){ if use wireshark-plugins; then for i in ${plugins} do - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + if has_version '>=net-analyzer/wireshark-2.0'; then + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + else + CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} + fi BUILD_DIR="${WORKDIR}"/${i}_build cmake-utils_src_test done @@ -125,7 +140,11 @@ src_install(){ if use wireshark-plugins; then for i in ${plugins} do - CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + if has_version '>=net-analyzer/wireshark-2.0'; then + CMAKE_USE_DIR="${S}"/wireshark/plugins/${i} + else + CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i} + fi BUILD_DIR="${WORKDIR}"/${i}_build cmake-utils_src_install done diff --git a/net-libs/libnfsidmap/metadata.xml b/net-libs/libnfsidmap/metadata.xml index ca66751dee2..96a2d586367 100644 --- a/net-libs/libnfsidmap/metadata.xml +++ b/net-libs/libnfsidmap/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>net-fs</herd> +<herd>base-system</herd> </pkgmetadata> diff --git a/net-libs/librpcsecgss/metadata.xml b/net-libs/librpcsecgss/metadata.xml index ca66751dee2..96a2d586367 100644 --- a/net-libs/librpcsecgss/metadata.xml +++ b/net-libs/librpcsecgss/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>net-fs</herd> +<herd>base-system</herd> </pkgmetadata> diff --git a/net-libs/libtirpc/metadata.xml b/net-libs/libtirpc/metadata.xml index 5f43a51c7b3..7c7aaf810f7 100644 --- a/net-libs/libtirpc/metadata.xml +++ b/net-libs/libtirpc/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>net-fs</herd> + <herd>base-system</herd> <upstream> <remote-id type="sourceforge">libtirpc</remote-id> </upstream> diff --git a/net-libs/rpc2/metadata.xml b/net-libs/rpc2/metadata.xml index ca66751dee2..96a2d586367 100644 --- a/net-libs/rpc2/metadata.xml +++ b/net-libs/rpc2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>net-fs</herd> +<herd>base-system</herd> </pkgmetadata> diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 541f2004c29..cd0cc0c3134 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -1,2 +1,2 @@ -DIST chrony-2.1.1.tar.gz 391037 SHA256 b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4 SHA512 bbb6d4b3436b7c3c7d45628500678ce31291aaa7f59df0f616268fcdb9285f21a79b085d232773ce732eea82f28fa87f4c56ac5b6a7388275c67889daf641499 WHIRLPOOL a431253f173fb8c52f417c0a074c66e3125bb46247b3a177d6ad4c96d953a4557fb159e5940f03d39a83ad1b5a92dd73f84333e3d2274a42a5e93337ca2f6d7e +DIST chrony-2.2.1.tar.gz 340514 SHA256 4776fa8e80d698723e9a88eb882170951f6c45860545d84ae9f9d8b9bbd73796 SHA512 caa18a22e7e64186f24f474e02862296bfa74c99671bc98e926caf27b88ce3580282543594602e76ad4be9b7f9623350888def893a7c1d96a7370d13a636442f WHIRLPOOL 77500bc25496dc15f17bce60023b86330205945999011b243272db26a924ac67193da70089c59e19bea7666c05059c8c4c1975ca19057775ec2dd8e468ab8dce DIST chrony-2.2.tar.gz 340285 SHA256 d3fd820fa63badf54ee0e48a649b94ea739df3aac5efa104bd90f89795aa2485 SHA512 40e5f3b803016a8ce2a3450f24e07e02b54c8b0134c005342e52e1f122592af646186ca231644801bdb7bbb00c576347da34e162d33920ef71f4018204e8a866 WHIRLPOOL 0f517914935b150bce9a42507f1c4b04ec50d9406d1ac504b396abbe0646a3bce21299cb6b946159e7369800bbcd106257bf2c02e544fffd19d8211f232ed469 diff --git a/net-misc/chrony/chrony-2.1.1.ebuild b/net-misc/chrony/chrony-2.1.1.ebuild deleted file mode 100644 index ac2cc6a2ac1..00000000000 --- a/net-misc/chrony/chrony-2.1.1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils systemd toolchain-funcs - -DESCRIPTION="NTP client and server programs" -HOMEPAGE="http://chrony.tuxfamily.org/" -SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86" -IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns" -REQUIRED_USE=" - ?? ( libedit readline ) -" - -CDEPEND=" - caps? ( sys-libs/libcap ) - libedit? ( dev-libs/libedit ) - readline? ( >=sys-libs/readline-4.1-r4:= ) -" -DEPEND=" - ${CDEPEND} - sys-apps/texinfo -" -RDEPEND=" - ${CDEPEND} - selinux? ( sec-policy/selinux-chronyd ) -" - -RESTRICT=test - -S="${WORKDIR}/${P/_/-}" - -src_prepare() { - sed -i \ - -e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \ - -e 's:/var/run:/run:g' \ - conf.c chrony.texi.in chrony.txt examples/* FAQ || die -} - -src_configure() { - tc-export CC - - local CHRONY_EDITLINE - # ./configure legend: - # --disable-readline : disable line editing entirely - # --without-readline : do not use sys-libs/readline (enabled by default) - # --without-editline : do not use dev-libs/libedit (enabled by default) - if ! use readline && ! use libedit; then - CHRONY_EDITLINE='--disable-readline' - else - CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" - CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" - fi - - # not an autotools generated script - local CHRONY_CONFIGURE=" - ./configure \ - $(usex caps '' --disable-linuxcaps) \ - $(usex cmdmon '' --disable-cmdmon) \ - $(usex ipv6 '' --disable-ipv6) \ - $(usex ntp '' --disable-ntp) \ - $(usex phc '' --disable-phc) \ - $(usex pps '' --disable-pps) \ - $(usex rtc '' --disable-rtc) \ - $(usex refclock '' --disable-refclock) \ - $(usex adns '' --disable-asyncdns) \ - ${CHRONY_EDITLINE} \ - ${EXTRA_ECONF} \ - --docdir=/usr/share/doc/${PF} \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --sysconfdir=/etc/chrony \ - --disable-sechash \ - --without-nss \ - --without-tomcrypt - " - - # print the ./configure call to aid in future debugging - einfo ${CHRONY_CONFIGURE} - bash ${CHRONY_CONFIGURE} || die -} - -src_compile() { - emake all docs -} - -src_install() { - default - rm "${D}"/usr/share/doc/${PF}/COPYING || die - doinfo chrony.info* - - newinitd "${FILESDIR}"/chronyd.init chronyd - newconfd "${FILESDIR}"/chronyd.conf chronyd - - insinto /etc/${PN} - newins examples/chrony.conf.example3 chrony.conf - newins examples/chrony.keys.example chrony.keys - - dodoc examples/*.example* - - keepdir /var/{lib,log}/chrony - - insinto /etc/logrotate.d - newins "${FILESDIR}"/chrony.logrotate chrony - - systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service - systemd_enable_ntpunit 50-chrony chronyd.service -} diff --git a/net-misc/chrony/chrony-2.2-r1.ebuild b/net-misc/chrony/chrony-2.2.1.ebuild index 04ce021eb38..57ce62bbd51 100644 --- a/net-misc/chrony/chrony-2.2-r1.ebuild +++ b/net-misc/chrony/chrony-2.2.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86" IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns" REQUIRED_USE=" ?? ( libedit readline ) diff --git a/net-misc/chrony/files/chrony.logrotate b/net-misc/chrony/files/chrony.logrotate deleted file mode 100644 index b788874c52c..00000000000 --- a/net-misc/chrony/files/chrony.logrotate +++ /dev/null @@ -1,11 +0,0 @@ -/var/log/chrony/*.log { - missingok - sharedscripts - postrotate - PASSWORD=`awk '$1 ~ /^1$/ {print $2; exit}' /etc/chrony/chrony.keys` - cat << EOF | /usr/bin/chronyc | sed '/^200 OK$/d' - password $PASSWORD - cyclelogs -EOF - endscript -} diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest index f0e809e39b7..7e0c6ce89a2 100644 --- a/net-misc/geoipupdate/Manifest +++ b/net-misc/geoipupdate/Manifest @@ -1 +1,2 @@ DIST geoipupdate-2.2.1.tar.gz 340884 SHA256 9547c42cc8620b2c3040fd8df95e8ee45c8b6ebcca7737d641f9526104d5f446 SHA512 5d28803353badd4d00a9174202912524f31e057ef4f5381360c16909fbccce3033f5ad7ec9c55963b70c0bbdb74589932bde36ea9b34f2a0632c504c1718dd85 WHIRLPOOL d5255654481a237175948817f88a80eb71aad4e65050e84db9c4056bd0883c4fc8b0bd2ebc8343b3ab37a7b4358dd6d4f5fae57c742711eba1156e78c5c8be38 +DIST geoipupdate-2.2.2.tar.gz 341268 SHA256 156ab7604255a9c62c4a442c76d48d024ac813c6542639bffa93b28e2a781621 SHA512 598e3536ce544042e11de2a4d09b6ac57357cad5a36938401185cd181d73381a6e6c38b485684f9abe096d1b279a784b2e968ac67a8084715682871c7d575415 WHIRLPOOL 477f1117ebc2b708f2235ad057f31f9885d68d51ce39fd188a230aa258bae5fef02fe4b39e1b295bbf08a0484aaa18818e794c023fdf94e26e82bcbd32abb703 diff --git a/net-misc/geoipupdate/geoipupdate-2.2.2.ebuild b/net-misc/geoipupdate/geoipupdate-2.2.2.ebuild new file mode 100644 index 00000000000..78a4fc3f095 --- /dev/null +++ b/net-misc/geoipupdate/geoipupdate-2.2.2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases" +HOMEPAGE="https://github.com/maxmind/geoipupdate" +SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd" +IUSE="" + +DEPEND=" + net-misc/curl + sys-libs/zlib +" +RDEPEND=" + ${DEPEND} + !<dev-libs/geoip-1.6.0 +" + +src_install() { + default + keepdir /usr/share/GeoIP +} diff --git a/net-misc/iprange/Manifest b/net-misc/iprange/Manifest new file mode 100644 index 00000000000..97e3c935ce1 --- /dev/null +++ b/net-misc/iprange/Manifest @@ -0,0 +1 @@ +DIST iprange-1.0.2.tar.xz 104396 SHA256 5a136728d7ed27b94fd0c5e6307b7bae9ab3795f4006cbfab353ea2a77503d2e SHA512 da27976b5fb9dec3a88cf608683ad29a0796c08150e163d7a02815b35a5e16c96c592bbf876c60f105b8f6efc76f1a1d7d84a0cdd20b50a04e4407b743843696 WHIRLPOOL 39cb49d5013792de4029a65c94d4c643a96743bfba4b5305a1e8bc9499138bee5562a7c76226579f4e15d3f982d94085163a4efa5eb424117f4d0bd73c7b6bc2 diff --git a/net-misc/iprange/iprange-1.0.2.ebuild b/net-misc/iprange/iprange-1.0.2.ebuild new file mode 100644 index 00000000000..9e1aef20086 --- /dev/null +++ b/net-misc/iprange/iprange-1.0.2.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="iprange utility" +HOMEPAGE="https://firehol.org" +SRC_URI=""https://firehol.org/download/iprange/releases/v${PV}/${P}.tar.xz + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" diff --git a/net-misc/iprange/metadata.xml b/net-misc/iprange/metadata.xml new file mode 100644 index 00000000000..f3ea32c4175 --- /dev/null +++ b/net-misc/iprange/metadata.xml @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>alonbl@gentoo.org</email> + </maintainer> +</pkgmetadata> diff --git a/net-misc/ntp/ntp-4.2.8_p6.ebuild b/net-misc/ntp/ntp-4.2.8_p6.ebuild index fe48104d9fb..20ad3503b69 100644 --- a/net-misc/ntp/ntp-4.2.8_p6.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p6.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar LICENSE="HPND BSD ISC" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest index e385a2203fb..b3bac275364 100644 --- a/net-misc/olsrd/Manifest +++ b/net-misc/olsrd/Manifest @@ -1 +1,2 @@ DIST olsrd-0.6.4.tar.bz2 5469577 SHA256 f8ab1bbdf2e424573a5bff9f2bf6e308c1307556e95c1de72b011949db20945f SHA512 a64b27f6f8ab772e79402ea0ea9e90ea1f980f9bd1fdbb608b41c91f2f942a546757f3a17fd71bd6f4b3dba69d7e96b7b0e028e4b4dcd39c3c22cf0f802cdbcd WHIRLPOOL 0c42e12e7e89719b8e9f7a4b931a71e0aa797bf2ba8507fa1f4dd3b6ede9cbe34ef8f3b3d819646959e54cde8cd61f165daab6b4b6f1e29560899f4bd24f9967 +DIST olsrd-0.9.0.2.tar.bz2 5439596 SHA256 cc464b29c7740354d815d5faa753fd27c0677d71e8eb42e78abc382996892845 SHA512 a0fc1fd21c7cc7a374bc24379b13b29525e584fa4f116c5d8e14449c3e614de4cb153bba653de48e99a278a6abe3285b059101b1ba96882bd94983dc2b907058 WHIRLPOOL 55a05cd332396ba70fd2e7e86a3ad791e02285074b5f32dc75ffb8ad1af1183534248760e52c31878cfac627988a67edab37711ce6435da6179272db9ae5af89 diff --git a/net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch b/net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch new file mode 100644 index 00000000000..0571340e4d0 --- /dev/null +++ b/net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch @@ -0,0 +1,29 @@ +--- a/gui/linux-gtk/Makefile ++++ b/gui/linux-gtk/Makefile +@@ -2,14 +2,14 @@ + include $(TOPDIR)/Makefile.inc + + # hardening flags: -fPIE -Wl,-z,now -pie +-CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -fPIE -Wno-strict-prototypes \ ++CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 gdk-pixbuf-2.0 gtk+-2.0) -fPIE -Wno-strict-prototypes \ + -Wno-cast-qual +-CPPFLAGS += $(shell pkg-config --cflags gtk+-2.0) ++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 gdk-pixbuf-2.0 gtk+-2.0) + LDFLAGS += -pie + #LDFLAGS += -Wl,--warn-common + + +-LIBS := $(shell pkg-config --libs gtk+-2.0) -lm ++LIBS := $(shell $(PKG_CONFIG) --libs glib-2.0 gdk-pixbuf-2.0 gtk+-2.0) -lm + + # 32/64 cross compilation + ifdef M32 +@@ -30,7 +30,7 @@ + ifeq ($(VERBOSE),0) + @echo "[LD] $@" + endif +- $(MAKECMDPREFIX)$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ++ $(MAKECMDPREFIX)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + .PHONY: clean install + diff --git a/net-misc/olsrd/olsrd-0.9.0.2.ebuild b/net-misc/olsrd/olsrd-0.9.0.2.ebuild new file mode 100644 index 00000000000..bddb54b7055 --- /dev/null +++ b/net-misc/olsrd/olsrd-0.9.0.2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils multilib toolchain-funcs versionator + +DESCRIPTION="An implementation of the Optimized Link State Routing protocol" +HOMEPAGE="http://www.olsr.org/" +SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.tar.bz2" + +SLOT="0" +LICENSE="BSD LGPL-2.1" +KEYWORDS="~amd64 ~x86" +IUSE="gtk" +DEPEND=" + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch + + # fix parallel make + # respect AR + # verbose build + # fix default prefix, bug #453440 + sed -i \ + -e '/@echo "\[/d' \ + -e 's|$(MAKECMD)|$(MAKE)|g' \ + -e 's|@$(CC)|$(CC)|g' \ + -e 's|@ar |$(AR) |g' \ + -e '/^prefix/s:/usr/local:/usr:' \ + $( find . -name 'Makefile*' ) || die + + # respect LDFLAGS + sed -i \ + -e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \ + lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die +} + +src_compile() { + tc-export PKG_CONFIG + emake \ + CC="$(tc-getCC)" \ + VERBOSE=1 \ + LIBDIR="/usr/$(get_libdir)/${PN}" \ + OLSRD_LDFLAGS="${LDFLAGS}" \ + OS=linux \ + build_all + if use gtk; then + emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)" + fi +} + +src_install() { + emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ + DESTDIR="${D}" STRIP=true install_all + if use gtk; then + emake -C gui/linux-gtk \ + LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install + fi + + doinitd "${FILESDIR}/${PN}" + + dodoc CHANGELOG \ + valgrind-howto.txt files/olsrd.conf.default.rfc \ + files/olsrd.conf.default.lq \ + lib/arprefresh/README_ARPREFRESH \ + lib/bmf/README_BMF \ + lib/dot_draw/README_DOT_DRAW \ + lib/dyn_gw/README_DYN_GW \ + lib/dyn_gw_plain/README_DYN_GW_PLAIN \ + lib/httpinfo/README_HTTPINFO \ + lib/mini/README_MINI \ + lib/nameservice/README_NAMESERVICE \ + lib/pgraph/README_PGRAPH \ + lib/quagga/README_QUAGGA \ + lib/secure/README_SECURE \ + lib/txtinfo/README_TXTINFO \ + lib/watchdog/README_WATCHDOG +} diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml index cf1698e95ba..3008482e3f8 100644 --- a/net-nds/openldap/metadata.xml +++ b/net-nds/openldap/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name='experimental'>Enable experimental backend options</flag> + <flag name='kinit'>Enable support for kerberos init</flag> <flag name='odbc'>Enable ODBC and SQL backend options</flag> <flag name='overlays'>Enable contributed OpenLDAP overlays</flag> <flag name='smbkrb5passwd'>Enable overlay for syncing ldap, unix and diff --git a/net-nds/openldap/openldap-2.4.43-r1.ebuild b/net-nds/openldap/openldap-2.4.43-r1.ebuild new file mode 100644 index 00000000000..cea4ffd45ce --- /dev/null +++ b/net-nds/openldap/openldap-2.4.43-r1.ebuild @@ -0,0 +1,821 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit db-use eutils flag-o-matic multilib multilib-minimal ssl-cert versionator toolchain-funcs autotools user systemd + +BIS_PN=rfc2307bis.schema +BIS_PV=20140524 +BIS_P="${BIS_PN}-${BIS_PV}" + +DESCRIPTION="LDAP suite of application and development tools" +HOMEPAGE="http://www.OpenLDAP.org/" + +# mirrors are mostly not working, using canonical URI +SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz + mirror://gentoo/${BIS_P}" + +LICENSE="OPENLDAP GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" + +IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal" +IUSE_BACKEND="+berkdb" +IUSE_OVERLAY="overlays perl" +IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs" +IUSE_CONTRIB="smbkrb5passwd kerberos kinit" +IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" +IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" + +REQUIRED_USE="cxx? ( sasl ) + ?? ( gnutls libressl )" + +# always list newer first +# Do not add any AGPL-3 BDB here! +# See bug 525110, comment 15. +BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4' +BDB_PKGS='' +for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done + +# openssl is needed to generate lanman-passwords required by samba +CDEPEND="icu? ( dev-libs/icu:= ) + ssl? ( + !gnutls? ( + !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] ) + ) + gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) + >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) ) + sasl? ( dev-libs/cyrus-sasl:= ) + !minimal? ( + sys-devel/libtool + sys-libs/e2fsprogs-libs + >=dev-db/lmdb-0.9.14 + tcpd? ( sys-apps/tcp-wrappers ) + odbc? ( !iodbc? ( dev-db/unixODBC ) + iodbc? ( dev-db/libiodbc ) ) + slp? ( net-libs/openslp ) + perl? ( dev-lang/perl[-build(-)] ) + samba? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + berkdb? ( + <sys-libs/db-6.0:= + || ( ${BDB_PKGS} ) + ) + smbkrb5passwd? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + kerberos? ( app-crypt/heimdal ) + ) + kerberos? ( + virtual/krb5 + kinit? ( !app-crypt/heimdal ) + ) + cxx? ( dev-libs/cyrus-sasl:= ) + ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" +DEPEND="${CDEPEND} + sys-apps/groff" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-ldap ) +" +# for tracking versions +OPENLDAP_VERSIONTAG=".version-tag" +OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data" + +MULTILIB_WRAPPED_HEADERS=( + # USE=cxx + /usr/include/LDAPAsynConnection.h + /usr/include/LDAPAttrType.h + /usr/include/LDAPAttribute.h + /usr/include/LDAPAttributeList.h + /usr/include/LDAPConnection.h + /usr/include/LDAPConstraints.h + /usr/include/LDAPControl.h + /usr/include/LDAPControlSet.h + /usr/include/LDAPEntry.h + /usr/include/LDAPEntryList.h + /usr/include/LDAPException.h + /usr/include/LDAPExtResult.h + /usr/include/LDAPMessage.h + /usr/include/LDAPMessageQueue.h + /usr/include/LDAPModList.h + /usr/include/LDAPModification.h + /usr/include/LDAPObjClass.h + /usr/include/LDAPRebind.h + /usr/include/LDAPRebindAuth.h + /usr/include/LDAPReferenceList.h + /usr/include/LDAPResult.h + /usr/include/LDAPSaslBindResult.h + /usr/include/LDAPSchema.h + /usr/include/LDAPSearchReference.h + /usr/include/LDAPSearchResult.h + /usr/include/LDAPSearchResults.h + /usr/include/LDAPUrl.h + /usr/include/LDAPUrlList.h + /usr/include/LdifReader.h + /usr/include/LdifWriter.h + /usr/include/SaslInteraction.h + /usr/include/SaslInteractionHandler.h + /usr/include/StringList.h + /usr/include/TlsOptions.h +) + +openldap_filecount() { + local dir="$1" + find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l +} + +openldap_find_versiontags() { + # scan for all datadirs + openldap_datadirs="" + if [ -f "${EROOT}"/etc/openldap/slapd.conf ]; then + openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${EROOT}/etc/openldap/slapd.conf)" + fi + openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}" + + einfo + einfo "Scanning datadir(s) from slapd.conf and" + einfo "the default installdir for Versiontags" + einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)" + einfo + + # scan datadirs if we have a version tag + openldap_found_tag=0 + have_files=0 + for each in ${openldap_datadirs}; do + CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"` + CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG} + if [ -d ${CURRENT_TAGDIR} ] && [ ${openldap_found_tag} == 0 ] ; then + einfo "- Checking ${each}..." + if [ -r ${CURRENT_TAG} ] ; then + # yey, we have one :) + einfo " Found Versiontag in ${each}" + source ${CURRENT_TAG} + if [ "${OLDPF}" == "" ] ; then + eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}" + eerror "Please delete it" + eerror + die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}" + fi + + OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}` + + [ $(openldap_filecount ${CURRENT_TAGDIR}) -gt 0 ] && have_files=1 + + # are we on the same branch? + if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then + ewarn " Versiontag doesn't match current major release!" + if [[ "${have_files}" == "1" ]] ; then + eerror " Versiontag says other major and you (probably) have datafiles!" + echo + openldap_upgrade_howto + else + einfo " No real problem, seems there's no database." + fi + else + einfo " Versiontag is fine here :)" + fi + else + einfo " Non-tagged dir ${each}" + [ $(openldap_filecount ${each}) -gt 0 ] && have_files=1 + if [[ "${have_files}" == "1" ]] ; then + einfo " EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files" + echo + + eerror + eerror "Your OpenLDAP Installation has a non tagged datadir that" + eerror "possibly contains a database at ${CURRENT_TAGDIR}" + eerror + eerror "Please export data if any entered and empty or remove" + eerror "the directory, installation has been stopped so you" + eerror "can take required action" + eerror + eerror "For a HOWTO on exporting the data, see instructions in the ebuild" + eerror + openldap_upgrade_howto + die "Please move the datadir ${CURRENT_TAGDIR} away" + fi + fi + einfo + fi + done + [ "${have_files}" == "1" ] && einfo "DB files present" || einfo "No DB files present" + + # Now we must check for the major version of sys-libs/db linked against. + SLAPD_PATH=${EROOT}/usr/$(get_libdir)/openldap/slapd + if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then + OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \ + | awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')" + if use berkdb; then + # find which one would be used + for bdb_slot in $BDB_SLOTS ; do + NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")" + [[ -n "$NEWVER" ]] && break + done + fi + local fail=0 + if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then + : + # Nothing wrong here. + elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then + eerror " Your existing version of OpenLDAP was not built against" + eerror " any version of sys-libs/db, but the new one will build" + eerror " against ${NEWVER} and your database may be inaccessible." + echo + fail=1 + elif [ -n "${OLDVER}" -a -z "${NEWVER}" ]; then + eerror " Your existing version of OpenLDAP was built against" + eerror " sys-libs/db:${OLDVER}, but the new one will not be" + eerror " built against any version and your database may be" + eerror " inaccessible." + echo + fail=1 + elif [ "${OLDVER}" != "${NEWVER}" ]; then + eerror " Your existing version of OpenLDAP was built against" + eerror " sys-libs/db:${OLDVER}, but the new one will build against" + eerror " ${NEWVER} and your database would be inaccessible." + echo + fail=1 + fi + [ "${fail}" == "1" ] && openldap_upgrade_howto + fi + + echo + einfo + einfo "All datadirs are fine, proceeding with merge now..." + einfo +} + +openldap_upgrade_howto() { + eerror + eerror "A (possible old) installation of OpenLDAP was detected," + eerror "installation will not proceed for now." + eerror + eerror "As major version upgrades can corrupt your database," + eerror "you need to dump your database and re-create it afterwards." + eerror + eerror "Additionally, rebuilding against different major versions of the" + eerror "sys-libs/db libraries will cause your database to be inaccessible." + eerror "" + d="$(date -u +%s)" + l="/root/ldapdump.${d}" + i="${l}.raw" + eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop" + eerror " 2. slapcat -l ${i}" + eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}" + eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/" + eerror " 5. emerge --update \=net-nds/${PF}" + eerror " 6. etc-update, and ensure that you apply the changes" + eerror " 7. slapadd -l ${l}" + eerror " 8. chown ldap:ldap /var/lib/openldap-data/*" + eerror " 9. /etc/init.d/slapd start" + eerror "10. check that your data is intact." + eerror "11. set up the new replication system." + eerror + if [ "${FORCE_UPGRADE}" != "1" ]; then + die "You need to upgrade your database first" + else + eerror "You have the magical FORCE_UPGRADE=1 in place." + eerror "Don't say you weren't warned about data loss." + fi +} + +pkg_setup() { + if ! use sasl && use cxx ; then + die "To build the ldapc++ library you must emerge openldap with sasl support" + fi + # Bug #322787 + if use minimal && ! has_version "net-nds/openldap" ; then + einfo "No datadir scan needed, openldap not installed" + elif use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then + einfo "Skipping scan for previous datadirs as requested by minimal useflag" + else + openldap_find_versiontags + fi + + enewgroup ldap 439 + enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap +} + +src_prepare() { + # ensure correct SLAPI path by default + sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \ + "${S}"/include/ldap_defaults.h + + epatch "${FILESDIR}"/${PN}-2.4.17-gcc44.patch + + epatch \ + "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \ + "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch + + # bug #116045 - still present in 2.4.28 + epatch "${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch + # bug #408077 - samba4 + epatch "${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch + + # bug #189817 + epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch + + # bug #233633 + epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch + + # bug #281495 + epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch + + # bug #294350 + epatch "${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch + + # unbreak /bin/sh -> dash + epatch "${FILESDIR}"/${PN}-2.4.28-fix-dash.patch + + # bug #420959 + epatch "${FILESDIR}"/${PN}-2.4.31-gcc47.patch + + # unbundle lmdb + epatch "${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch + rm -rf "${S}"/libraries/liblmdb + + cd "${S}"/build || die + einfo "Making sure upstream build strip does not do stripping too early" + sed -i.orig \ + -e '/^STRIP/s,-s,,g' \ + top.mk || die "Failed to block stripping" + + # wrong assumption that /bin/sh is /bin/bash + sed -i \ + -e 's|/bin/sh|/bin/bash|g' \ + "${S}"/tests/scripts/* || die "sed failed" + + cd "${S}" || die + + AT_NOEAUTOMAKE=yes eautoreconf +} + +build_contrib_module() { + # <dir> <sources> <outputname> + cd "${S}/contrib/slapd-modules/$1" || die + einfo "Compiling contrib-module: $3" + # Make sure it's uppercase + local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')" + "${lt}" --mode=compile --tag=CC \ + "${CC}" \ + -D${define_name}=SLAPD_MOD_DYNAMIC \ + -I"${BUILD_DIR}"/include \ + -I../../../include -I../../../servers/slapd ${CFLAGS} \ + -o ${2%.c}.lo -c $2 || die "compiling $3 failed" + einfo "Linking contrib-module: $3" + "${lt}" --mode=link --tag=CC \ + "${CC}" -module \ + ${CFLAGS} \ + ${LDFLAGS} \ + -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ + -o $3.la ${2%.c}.lo || die "linking $3 failed" +} + +src_configure() { + # Bug 408001 + use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync + + # connectionless ldap per bug #342439 + append-cppflags -DLDAP_CONNECTIONLESS + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myconf=() + + use debug && myconf+=( $(use_enable debug) ) + + # ICU usage is not configurable + export ac_cv_header_unicode_utypes_h="$(multilib_is_native_abi && use icu && echo yes || echo no)" + + if ! use minimal && multilib_is_native_abi; then + local CPPFLAGS=${CPPFLAGS} + + # re-enable serverside overlay chains per bug #296567 + # see ldap docs chaper 12.3.1 for details + myconf+=( --enable-ldap ) + + # backends + myconf+=( --enable-slapd ) + if use berkdb ; then + einfo "Using Berkeley DB for local backend" + myconf+=( --enable-bdb --enable-hdb ) + DBINCLUDE=$(db_includedir $BDB_SLOTS) + einfo "Using $DBINCLUDE for sys-libs/db version" + # We need to include the slotted db.h dir for FreeBSD + append-cppflags -I${DBINCLUDE} + else + myconf+=( --disable-bdb --disable-hdb ) + fi + for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do + myconf+=( --enable-${backend}=mod ) + done + + myconf+=( $(use_enable perl perl mod) ) + + myconf+=( $(use_enable odbc sql mod) ) + if use odbc ; then + local odbc_lib="unixodbc" + if use iodbc ; then + odbc_lib="iodbc" + append-cppflags -I"${EPREFIX}"/usr/include/iodbc + fi + myconf+=( --with-odbc=${odbc_lib} ) + fi + + # slapd options + myconf+=( + $(use_enable crypt) + $(use_enable slp) + $(use_enable samba lmpasswd) + $(use_enable syslog) + ) + if use experimental ; then + myconf+=( + --enable-dynacl + --enable-aci=mod + ) + fi + for option in aci cleartext modules rewrite rlookups slapi; do + myconf+=( --enable-${option} ) + done + + # slapd overlay options + # Compile-in the syncprov, the others as module + myconf+=( --enable-syncprov=yes ) + use overlays && myconf+=( --enable-overlays=mod ) + + else + myconf+=( + --disable-backends + --disable-slapd + --disable-bdb + --disable-hdb + --disable-mdb + --disable-overlays + --disable-syslog + ) + fi + + # basic functionality stuff + myconf+=( + $(use_enable ipv6) + $(multilib_native_use_with sasl cyrus-sasl) + $(multilib_native_use_enable sasl spasswd) + $(use_enable tcpd wrappers) + ) + + local ssl_lib="no" + if use ssl || ( ! use minimal && use samba ) ; then + ssl_lib="openssl" + use gnutls && ssl_lib="gnutls" + fi + + myconf+=( --with-tls=${ssl_lib} ) + + for basicflag in dynamic local proctitle shared; do + myconf+=( --enable-${basicflag} ) + done + + tc-export AR CC CXX + ECONF_SOURCE=${S} \ + STRIP=/bin/true \ + econf \ + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \ + $(use_enable static-libs static) \ + "${myconf[@]}" + emake depend +} + +src_configure_cxx() { + # This needs the libraries built by the first build run. + # So we have to run it AFTER the main build, not just after the main + # configure. + local myconf_ldapcpp=( + --with-ldap-includes="${S}"/include + ) + + mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die + cd "${BUILD_DIR}/contrib/ldapc++" || die + + local LDFLAGS=${LDFLAGS} CPPFLAGS=${CPPFLAGS} + append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \ + -L"${BUILD_DIR}"/libraries/libldap/.libs + append-cppflags -I"${BUILD_DIR}"/include + ECONF_SOURCE=${S}/contrib/ldapc++ \ + econf "${myconf_ldapcpp[@]}" \ + CC="${CC}" \ + CXX="${CXX}" +} + +multilib_src_compile() { + tc-export AR CC CXX + emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/bash + local lt="${BUILD_DIR}/libtool" + export echo="echo" + + if ! use minimal && multilib_is_native_abi ; then + if use cxx ; then + einfo "Building contrib library: ldapc++" + src_configure_cxx + cd "${BUILD_DIR}/contrib/ldapc++" || die + emake \ + CC="${CC}" CXX="${CXX}" + fi + + if use smbkrb5passwd ; then + einfo "Building contrib-module: smbk5pwd" + cd "${S}/contrib/slapd-modules/smbk5pwd" || die + + MY_DEFS="-DDO_SHADOW" + if use samba ; then + MY_DEFS="${MY_DEFS} -DDO_SAMBA" + MY_KRB5_INC="" + fi + if use kerberos ; then + MY_DEFS="${MY_DEFS} -DDO_KRB5" + MY_KRB5_INC="$(krb5-config --cflags)" + fi + + emake \ + DEFS="${MY_DEFS}" \ + KRB5_INC="${MY_KRB5_INC}" \ + LDAP_BUILD="${BUILD_DIR}" \ + CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" + fi + + if use overlays ; then + einfo "Building contrib-module: samba4" + cd "${S}/contrib/slapd-modules/samba4" || die + + emake \ + LDAP_BUILD="${BUILD_DIR}" \ + CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" + fi + + if use kerberos ; then + if use kinit ; then + build_contrib_module "kinit" "kinit.c" "kinit" + fi + cd "${S}/contrib/slapd-modules/passwd" || die + einfo "Compiling contrib-module: pw-kerberos" + "${lt}" --mode=compile --tag=CC \ + "${CC}" \ + -I"${BUILD_DIR}"/include \ + -I../../../include \ + ${CFLAGS} \ + $(krb5-config --cflags) \ + -DHAVE_KRB5 \ + -o kerberos.lo \ + -c kerberos.c || die "compiling pw-kerberos failed" + einfo "Linking contrib-module: pw-kerberos" + "${lt}" --mode=link --tag=CC \ + "${CC}" -module \ + ${CFLAGS} \ + ${LDFLAGS} \ + -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ + -o pw-kerberos.la \ + kerberos.lo || die "linking pw-kerberos failed" + fi + # We could build pw-radius if GNURadius would install radlib.h + cd "${S}/contrib/slapd-modules/passwd" || die + einfo "Compiling contrib-module: pw-netscape" + "${lt}" --mode=compile --tag=CC \ + "${CC}" \ + -I"${BUILD_DIR}"/include \ + -I../../../include \ + ${CFLAGS} \ + -o netscape.lo \ + -c netscape.c || die "compiling pw-netscape failed" + einfo "Linking contrib-module: pw-netscape" + "${lt}" --mode=link --tag=CC \ + "${CC}" -module \ + ${CFLAGS} \ + ${LDFLAGS} \ + -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \ + -o pw-netscape.la \ + netscape.lo || die "linking pw-netscape failed" + + #build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only + #build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos + build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay" + build_contrib_module "allop" "allop.c" "overlay-allop" + build_contrib_module "allowed" "allowed.c" "allowed" + build_contrib_module "autogroup" "autogroup.c" "autogroup" + build_contrib_module "cloak" "cloak.c" "cloak" + # build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand + build_contrib_module "denyop" "denyop.c" "denyop-overlay" + build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin" + build_contrib_module "dupent" "dupent.c" "dupent" + build_contrib_module "lastbind" "lastbind.c" "lastbind" + # lastmod may not play well with other overlays + build_contrib_module "lastmod" "lastmod.c" "lastmod" + build_contrib_module "noopsrch" "noopsrch.c" "noopsrch" + build_contrib_module "nops" "nops.c" "nops-overlay" + #build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER + build_contrib_module "trace" "trace.c" "trace" + # build slapi-plugins + cd "${S}/contrib/slapi-plugins/addrdnvalues" || die + einfo "Building contrib-module: addrdnvalues plugin" + "${CC}" -shared \ + -I"${BUILD_DIR}"/include \ + -I../../../include \ + ${CFLAGS} \ + -fPIC \ + ${LDFLAGS} \ + -o libaddrdnvalues-plugin.so \ + addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed" + + fi +} + +multilib_src_test() { + if multilib_is_native_abi; then + cd tests || die + emake tests || die "make tests failed" + fi +} + +multilib_src_install() { + local lt="${BUILD_DIR}/libtool" + emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install + use static-libs || prune_libtool_files --all + + if ! use minimal && multilib_is_native_abi; then + # openldap modules go here + # TODO: write some code to populate slapd.conf with moduleload statements + keepdir /usr/$(get_libdir)/openldap/openldap/ + + # initial data storage dir + keepdir /var/lib/openldap-data + use prefix || fowners ldap:ldap /var/lib/openldap-data + fperms 0700 /var/lib/openldap-data + + echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" + echo "# do NOT delete this. it is used" >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" + echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}" + + # use our config + rm "${ED}"etc/openldap/slapd.conf + insinto /etc/openldap + newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf + configfile="${ED}"etc/openldap/slapd.conf + + # populate with built backends + ebegin "populate config with built backends" + for x in "${ED}"usr/$(get_libdir)/openldap/openldap/back_*.so; do + einfo "Adding $(basename ${x})" + sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" + done + sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}" + use prefix || fowners root:ldap /etc/openldap/slapd.conf + fperms 0640 /etc/openldap/slapd.conf + cp "${configfile}" "${configfile}".default + eend + + # install our own init scripts and systemd unit files + einfo "Install init scripts" + newinitd "${FILESDIR}"/slapd-initd-2.4.40-r2 slapd + newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd + einfo "Install systemd service" + systemd_dounit "${FILESDIR}"/slapd.service + systemd_install_serviced "${FILESDIR}"/slapd.service.conf + systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf + + if [[ $(get_libdir) != lib ]]; then + sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \ + "${ED}"/etc/init.d/slapd \ + "${ED}"/usr/lib/systemd/system/slapd.service || die + fi + # If built without SLP, we don't need to be before avahi + use slp \ + || sed -i \ + -e '/before/{s/avahi-daemon//g}' \ + "${ED}"etc/init.d/slapd + + if use cxx ; then + einfo "Install the ldapc++ library" + cd "${BUILD_DIR}/contrib/ldapc++" || die + emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install + cd "${S}"/contrib/ldapc++ || die + newdoc README ldapc++-README + fi + + if use smbkrb5passwd ; then + einfo "Install the smbk5pwd module" + cd "${S}/contrib/slapd-modules/smbk5pwd" || die + emake DESTDIR="${D}" \ + LDAP_BUILD="${BUILD_DIR}" \ + libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install + newdoc README smbk5pwd-README + fi + + if use overlays ; then + einfo "Install the samba4 module" + cd "${S}/contrib/slapd-modules/samba4" || die + emake DESTDIR="${D}" \ + LDAP_BUILD="${BUILD_DIR}" \ + libexecdir="/usr/$(get_libdir)/openldap" install + newdoc README samba4-README + fi + + einfo "Installing contrib modules" + cd "${S}/contrib/slapd-modules" || die + for l in */*.la; do + "${lt}" --mode=install cp ${l} \ + "${ED}"usr/$(get_libdir)/openldap/openldap || \ + die "installing ${l} failed" + done + + dodoc "${FILESDIR}"/DB_CONFIG.fast.example + docinto contrib + doman */*.5 + #newdoc acl/README* + newdoc addpartial/README addpartial-README + newdoc allop/README allop-README + newdoc allowed/README allowed-README + newdoc autogroup/README autogroup-README + newdoc dsaschema/README dsaschema-README + newdoc passwd/README passwd-README + cd "${S}/contrib/slapi-plugins" || die + insinto /usr/$(get_libdir)/openldap/openldap + doins */*.so + docinto contrib + newdoc addrdnvalues/README addrdnvalues-README + + insinto /etc/openldap/schema + newins "${DISTDIR}"/${BIS_P} ${BIS_PN} + + docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample* + docinto back-shell ; dodoc "${S}"/servers/slapd/back-shell/searchexample* + docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm + + dosbin "${S}"/contrib/slapd-tools/statslog + newdoc "${S}"/contrib/slapd-tools/README README.statslog + fi +} + +multilib_src_install_all() { + dodoc ANNOUNCEMENT CHANGES COPYRIGHT README + docinto rfc ; dodoc doc/rfc/*.txt +} + +pkg_preinst() { + # keep old libs if any + preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0) + # bug 440470, only display the getting started help there was no openldap before, + # or we are going to a non-minimal build + ! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]' + OPENLDAP_PRINT_MESSAGES=$((! $?)) +} + +pkg_postinst() { + if ! use minimal ; then + # You cannot build SSL certificates during src_install that will make + # binary packages containing your SSL key, which is both a security risk + # and a misconfiguration if multiple machines use the same key and cert. + if use ssl; then + install_cert /etc/openldap/ssl/ldap + use prefix || chown ldap:ldap "${EROOT}"etc/openldap/ssl/ldap.* + ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" + ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]" + ewarn "add 'TLS_REQCERT allow' if you want to use them." + fi + + if use prefix; then + # Warn about prefix issues with slapd + eerror "slapd might NOT be usable on Prefix systems as it requires root privileges" + eerror "to start up, and requires that certain files directories be owned by" + eerror "ldap:ldap. As Prefix does not support changing ownership of files and" + eerror "directories, you will have to manually fix this yourself." + fi + + # These lines force the permissions of various content to be correct + use prefix || chown ldap:ldap "${EROOT}"var/run/openldap + chmod 0755 "${EROOT}"var/run/openldap + use prefix || chown root:ldap "${EROOT}"etc/openldap/slapd.conf{,.default} + chmod 0640 "${EROOT}"etc/openldap/slapd.conf{,.default} + use prefix || chown ldap:ldap "${EROOT}"var/lib/openldap-data + fi + + if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then + elog "Getting started using OpenLDAP? There is some documentation available:" + elog "Gentoo Guide to OpenLDAP Authentication" + elog "(https://www.gentoo.org/doc/en/ldap-howto.xml)" + elog "---" + elog "An example file for tuning BDB backends with openldap is" + elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/" + fi + + preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0) +} diff --git a/net-p2p/amule/amule-2.3.1-r1.ebuild b/net-p2p/amule/amule-2.3.1-r1.ebuild index 99b75d04444..565019e13b0 100644 --- a/net-p2p/amule/amule-2.3.1-r1.ebuild +++ b/net-p2p/amule/amule-2.3.1-r1.ebuild @@ -3,9 +3,8 @@ # $Id$ EAPI=5 -WX_GTK_VER="3.0" -inherit eutils flag-o-matic wxwidgets user +inherit eutils wxwidgets user MY_P=${PN/m/M}-${PV} S="${WORKDIR}"/${MY_P} @@ -19,19 +18,17 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" IUSE="daemon debug geoip nls remote stats unicode upnp +X" -RDEPEND=" - >=dev-libs/crypto++-5 +DEPEND=">=dev-libs/crypto++-5 + sys-libs/binutils-libs:0= >=sys-libs/zlib-1.2.1 - stats? ( >=media-libs/gd-2.0.26[jpeg] ) + >=x11-libs/wxGTK-2.8.12:2.8[X?] + stats? ( >=media-libs/gd-2.0.26:=[jpeg] ) geoip? ( dev-libs/geoip ) upnp? ( >=net-libs/libupnp-1.6.6 ) remote? ( >=media-libs/libpng-1.2.0:0= - unicode? ( >=media-libs/gd-2.0.26 ) ) - X? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) - !X? ( x11-libs/wxGTK:${WX_GTK_VER} ) - !net-p2p/imule -" -DEPEND="${RDEPEND}" + unicode? ( >=media-libs/gd-2.0.26:= ) ) + !net-p2p/imule" +RDEPEND="${DEPEND}" pkg_setup() { if use stats && ! use X; then @@ -52,15 +49,13 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-2.2.6-fallocate.diff # Bug 412371 epatch "${FILESDIR}"/${PN}-2.3.1-gcc47.patch - - # https://bugs.gentoo.org/show_bug.cgi?id=465084 - epatch "${FILESDIR}"/${PN}-2.3.1-wx3.0.patch - epatch "${FILESDIR}"/${PN}-2.3.1-build.patch } src_configure() { local myconf + WX_GTK_VER="2.8" + if use X; then einfo "wxGTK with X support will be used" need-wxwidgets unicode @@ -84,10 +79,10 @@ src_configure() { fi econf \ - --with-wx-config=${WX_CONFIG} \ + --with-denoise-level=0 \ + --with-wx-config="${WX_CONFIG}" \ --enable-amulecmd \ $(use_enable debug) \ - $(use_enable !debug optimize) \ $(use_enable daemon amule-daemon) \ $(use_enable geoip) \ $(use_enable nls) \ @@ -99,7 +94,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install + default if use daemon; then newconfd "${FILESDIR}"/amuled.confd amuled diff --git a/net-p2p/amule/files/amuled.initd b/net-p2p/amule/files/amuled.initd index 9b83458b380..082e2ffe15f 100644 --- a/net-p2p/amule/files/amuled.initd +++ b/net-p2p/amule/files/amuled.initd @@ -22,12 +22,13 @@ start() { fi ebegin "Starting aMule Daemon" - env HOME="${AMULEHOME}" start-stop-daemon --start \ + start-stop-daemon --start \ --quiet --background \ --make-pidfile --pidfile /var/run/amuled.pid \ - -c ${AMULEUSER} \ - -x /usr/bin/amuled >${LOG} - + --env HOME="${AMULEHOME}" \ + --user ${AMULEUSER} \ + --exec /usr/bin/amuled >${LOG} + sleep 2 if ! pgrep -u ${AMULEUSER} amuled > /dev/null; then eerror "aMule daemon can't be started! Check logfile: ${LOG}" @@ -37,7 +38,7 @@ start() { stop() { ebegin "Stopping aMule daemon -- please wait" - start-stop-daemon --oknodo --stop --pidfile /var/run/amuled.pid &>/dev/null + start-stop-daemon --stop --pidfile /var/run/amuled.pid 2>&1 >/dev/null eend $? } diff --git a/net-p2p/amule/files/amuleweb.initd b/net-p2p/amule/files/amuleweb.initd index 0484780093a..05e7d9f192b 100644 --- a/net-p2p/amule/files/amuleweb.initd +++ b/net-p2p/amule/files/amuleweb.initd @@ -26,12 +26,13 @@ start() { OPTIONS="-h ${AMULEHOST} -p ${AMULEPORT} -P ${AMULEPWD} -A ${WEBPWD} -t ${TEMPLATE} -q" ebegin "Starting aMule WebServer" - env HOME="${AMULEHOME}" start-stop-daemon --start \ - --quiet -b \ + start-stop-daemon --start \ + --quiet --background \ --make-pidfile --pidfile /var/run/amuleweb.pid \ - -c ${AMULEUSER} \ - -x /usr/bin/amuleweb -- ${OPTIONS} &>${LOG} - + --env HOME="${AMULEHOME}" \ + --user ${AMULEUSER} \ + --exec /usr/bin/amuleweb -- ${OPTIONS} 2>&1 >${LOG} + sleep 1 if ! pgrep -u ${AMULEUSER} amuleweb > /dev/null; then eerror "aMule daemon can't be started! Check logfile: ${LOG}" @@ -43,7 +44,7 @@ start() { stop() { ebegin "Stopping aMule WebServer" - start-stop-daemon --oknodo --stop --pidfile /var/run/amuleweb.pid &>/dev/null + start-stop-daemon --stop --pidfile /var/run/amuleweb.pid 2>&1 >/dev/null eend $? } diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index f689d3e8c6e..6c0c5e0e886 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -4,3 +4,4 @@ DIST qbittorrent-3.2.0.tar.xz 2595372 SHA256 51781cb121ebeda041fb348e649c4bd9788 DIST qbittorrent-3.2.3.tar.xz 2638708 SHA256 86a79f3772bd06736a4be104180187d76c5c8feb2c1cdf1054135b4ba602a914 SHA512 304635f4942776f6be5987ad6a60e2e0e217c913bbe3637cef2dd0bfc65450b894e88c639c96d856d3e937f40d120acc62c194bcb29ae52070ad51e921edbdf7 WHIRLPOOL 33728a4679ef9731645a937c059633d18ff4673ded258185488bc31aab001fe720ab3e3aef23bd8d36f1cf12e98d96ed7383d5cc5b3ecbfa2b065028ddacc4ce DIST qbittorrent-3.2.4.tar.xz 2664248 SHA256 7fc128e2809c3be4ea543cfaeefd922e0327cc430330eaad0d3ec7616df51871 SHA512 c86098d791b64bd5f0ef6b465cf3eb6f1016402b33b18ba927279f521d768aa973d3f233794adb63820c5bca7e67672bf3c64fe65a7e5bf513219f860d2b2141 WHIRLPOOL c5690fdf01a8841978404e61369a16da13dd27c151618cadbb4e16add7d5377d980d9a94cea68f82005c88bd4b637a23f0ea6fb2615c3921302c5847e0763272 DIST qbittorrent-3.2.5.tar.xz 2665980 SHA256 98f69c7324276c7c144738eb36b21a2d28d7f01a327104568f020887626e822b SHA512 a98c1cf8607558990d0698c50d35cd217bceeb4deffe69c590f902b1a9dabc5431496805614dbd3bb734f764c309023ede2f8a5cb014f40796301fa14ba63e90 WHIRLPOOL 6539bde802919351836d1bb2d880d5b28d51c97b109674f2ae3e54c9aa9ab52c5e58436371a34b7388d119d041cf9b2a597656e338808243309cbf631e03fe2b +DIST qbittorrent-3.3.2.tar.xz 2782172 SHA256 e9330a63e0939fef79c70d5a66dba616f00206a70386efbb82fb7c620a19af58 SHA512 2c09c1bbf18dfc181998343845e0f8164c29cb97eeccf3a7ab25753e8ccaa11cfb7372cf0ff1fc2a8c232a9ab4381a23c88aef791e37a3a7b4c0b92b537e25e6 WHIRLPOOL a2bf3f6aee46dc5bc58357ea8eb214b9a69116f470faa0a4b5aed9fc0ffdd340712a1424b128ab96273e75d6b1c83707765d01c0089ec550040bb63df236176e diff --git a/net-p2p/qbittorrent/qbittorrent-3.3.2.ebuild b/net-p2p/qbittorrent/qbittorrent-3.3.2.ebuild new file mode 100644 index 00000000000..77648db0367 --- /dev/null +++ b/net-p2p/qbittorrent/qbittorrent-3.3.2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit eutils python-r1 qt4-r2 flag-o-matic + +DESCRIPTION="BitTorrent client in C++ and Qt" +HOMEPAGE="http://www.qbittorrent.org/" + +MY_P=${P/_} +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git" +else + SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" + KEYWORDS="~amd64 ~arm ~ppc64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+dbus debug qt4 +qt5 webui +X" +REQUIRED_USE=" + ^^ ( qt4 qt5 ) + dbus? ( X ) +" + +CDEPEND=" + dev-libs/boost:= + >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt4?,qt5?,X?] + >=net-libs/rb_libtorrent-1.0.6 + sys-libs/zlib + qt4? ( + dev-qt/qtcore:4 + dbus? ( dev-qt/qtdbus:4 ) + X? ( dev-qt/qtgui:4 ) + ) + qt5? ( + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtxml:5 + dbus? ( dev-qt/qtdbus:5 ) + X? ( dev-qt/qtgui:5 + dev-qt/qtwidgets:5 ) + ) +" +DEPEND="${CDEPEND} + qt5? ( dev-qt/linguist-tools:5 ) + virtual/pkgconfig +" +RDEPEND="${CDEPEND} + ${PYTHON_DEPS}" + +S=${WORKDIR}/${MY_P} +DOCS=(AUTHORS Changelog README.md TODO) + +src_prepare() { + epatch_user + qt4-r2_src_prepare +} + +src_configure() { + # See bug 569062 + append-cppflags "-DBOOST_NO_CXX11_REF_QUALIFIERS" + + # Custom configure script, econf fails + local myconf=( + ./configure + --prefix="${EPREFIX}/usr" + --with-qtsingleapplication=system + $(use dbus || echo --disable-qt-dbus) + $(use debug && echo --enable-debug) + $(use qt4 && echo --with-qt4) + $(use webui || echo --disable-webui) + $(use X || echo --disable-gui) + ) + + echo "${myconf[@]}" + "${myconf[@]}" || die "configure failed" + use qt4 && eqmake4 + use qt5 && eqmake5 +} diff --git a/profiles/package.mask b/profiles/package.mask index 43124f94c88..6db5bda73c4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,12 @@ #--- END OF EXAMPLES --- +# Alexis Ballier <aballier@gentoo.org> (22 Jan 2016) +# Breaks some of its revdeps +# https://bugs.gentoo.org/show_bug.cgi?id=572552 +# https://github.com/ros/console_bridge/pull/31 +=dev-libs/console_bridge-0.3.0 + # Michael Sterrett <mr_bones_@gentoo.org> (20 Jan 2016) # Buggy and no updates in 9 years. # Masked for removal on 20160219 diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults index 9d648919dee..32d8a4c3054 100644 --- a/profiles/prefix/make.defaults +++ b/profiles/prefix/make.defaults @@ -10,3 +10,8 @@ USE="readline zlib ncurses ssl" FEATURES="collision-protect" + +# Python 3.5 is unmasked for us, build stuff by default, in particular +# for bug #572502 where the default python is set to 3.5 for it was +# built first. +PYTHON_TARGETS="${PYTHON_TARGETS} python3_5" diff --git a/profiles/prefix/use.stable.mask b/profiles/prefix/use.stable.mask index 545d3461852..2d6679d795e 100644 --- a/profiles/prefix/use.stable.mask +++ b/profiles/prefix/use.stable.mask @@ -5,3 +5,4 @@ # Re-enable python-3.5, we are fully ~arch, so avoid problems with # Portage like bug #572502 -python_targets_python3_5 +-python_single_target_python3_5 diff --git a/sci-biology/gmap/Manifest b/sci-biology/gmap/Manifest index b15b9200188..b31c4412a1c 100644 --- a/sci-biology/gmap/Manifest +++ b/sci-biology/gmap/Manifest @@ -1,2 +1,3 @@ DIST gmap-gsnap-2011-10-07.tar.gz 3404351 SHA256 e508009592d5dd3442345dc5ce6fd9930366e008efa32e4c72dc243a495f3f20 SHA512 6546be4da41c45e41bdab71dcda69cbf172bc186ca64a2543461eb050f383641a13fea0cfcc6bb76b87cc4faa4c593944b029ee1ca2ba68dbaf7d939d0bf02e1 WHIRLPOOL 9f5cd62fb9cbb2cc73d6b971f29d8816e67e1b4b1b9906d8b06ddf99ffd9356bcdf19869066fb14ca5d3ad93a3b70527d05237be2f438da4db86898103bd2bf2 DIST gmap-gsnap-2012-07-20.tar.gz 3623122 SHA256 4cd0c0a313cb7a35b8c7afd45b545e6062b343739f9ef522a09001d448aeb5ec SHA512 bbc22509fc63814a102f96ce0da6a1119c78de7fc2fc4fe17cc4d97881313a77818eaedc51bb6d4ce2426560925fe5ffa121acf972d7b3b097e8d3d65efb7b95 WHIRLPOOL 7318377e4cf80db5c5a9495bf68653fbc48051d6fa5748ed796e18888b6e20215d2714b753358fb4cc97aa9c8e441d53ef616ded6ee0923fe78312e78ee91e82 +DIST gmap-gsnap-2015-12-31.v5.tar.gz 4169874 SHA256 2317ba63578ba87f534689c0bf6930a9b177df4aa8a75b2a82f2118760ff3037 SHA512 d42623c60c298d9d3009893432f3eef8cb764bf7cf26b42e6a95b27a468fffab20c8307597c4c8e1afdd61f35652246568c3162137ce59fc4850aaab1062bb48 WHIRLPOOL 2571b7d6a7bddf11b4cbaec22377af19a84633f7d8fe9de74b4c2fa12e0480a76df9a1f52b44199021aa05f6d846ef98d8fbb6f978e64f5b452bbaaafbdd6974 diff --git a/sci-biology/gmap/gmap-2015.12.31.5.ebuild b/sci-biology/gmap/gmap-2015.12.31.5.ebuild new file mode 100644 index 00000000000..acd893f5f2d --- /dev/null +++ b/sci-biology/gmap/gmap-2015.12.31.5.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit versionator + +MY_BASE_PV="$(replace_all_version_separators '-' $(get_version_component_range 1-3))" +MY_PV="${MY_BASE_PV}.v$(get_version_component_range 4)" + +DESCRIPTION="A Genomic Mapping and Alignment Program for mRNA and EST Sequences" +HOMEPAGE="http://research-pub.gene.com/gmap/" +SRC_URI="http://research-pub.gene.com/gmap/src/gmap-gsnap-${MY_PV}.tar.gz" + +LICENSE="gmap" +SLOT="0" +IUSE="" +KEYWORDS="~amd64 ~x86" + +S="${WORKDIR}/gmap-${MY_BASE_PV}" diff --git a/sci-biology/iedera/files/iedera-1.05-fix-buildsystem.patch b/sci-biology/iedera/files/iedera-1.05-fix-buildsystem.patch new file mode 100644 index 00000000000..f232d7de162 --- /dev/null +++ b/sci-biology/iedera/files/iedera-1.05-fix-buildsystem.patch @@ -0,0 +1,16 @@ +iedera sets default flags that override user {C,CXX,LD}FLAGS + +--- iedera-1.05/configure.ac ++++ iedera-1.05/configure.ac +@@ -4,11 +4,5 @@ + AC_PROG_INSTALL + AC_PROG_CXX + AC_HEADER_STDC +-CFLAGS="$CFLAGS $UNAME_DEFS -O3 -pipe -funroll-loops -Wall" +-CXXFLAGS="$CFLAGS" +-LDFLAGS="$LDFLAGS -lm" +-AC_SUBST(CFLAGS) +-AC_SUBST(CXXFLAGS) +-AC_SUBST(LDFLAGS) + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT diff --git a/sci-biology/iedera/iedera-1.05.ebuild b/sci-biology/iedera/iedera-1.05-r1.ebuild index fb442a6a628..ec52dd3963b 100644 --- a/sci-biology/iedera/iedera-1.05.ebuild +++ b/sci-biology/iedera/iedera-1.05-r1.ebuild @@ -4,6 +4,8 @@ EAPI=6 +inherit autotools + DESCRIPTION="A subset seed design tool for DNA sequence alignment" HOMEPAGE="http://bioinfo.lifl.fr/yass/iedera.php" SRC_URI="http://bioinfo.lifl.fr/yass/files/${P}.tar.gz" @@ -13,10 +15,12 @@ SLOT="0" IUSE="" KEYWORDS="~amd64 ~x86" -DEPEND="" -RDEPEND="" +PATCHES=( + "${FILESDIR}/${P}-fix-buildsystem.patch" +) -src_install() { +src_prepare() { + mv configure.{in,ac} || die default - dodoc AUTHORS README NEWS + eautoreconf } diff --git a/sci-mathematics/jags/Manifest b/sci-mathematics/jags/Manifest index a6e7e9e8665..0fe15b4cabe 100644 --- a/sci-mathematics/jags/Manifest +++ b/sci-mathematics/jags/Manifest @@ -1,2 +1,3 @@ DIST JAGS-3.4.0.tar.gz 1677450 SHA256 2beaa9a2672c2c95efc55ffa4c8b597a872f20232373daebd17ad539d3d7d82b SHA512 7a330ea41eab63b23d8ae3622c6920f0dc3dba653a18256957b9b862bb86b746ff706e9e9bf3f806524250b439161a6df4ad05af682354073f9b0074f9825896 WHIRLPOOL 48f2bf92f80ea0558697701320e142a61b3eb5cfefe234973a6a189096b7887ec5ea829f8f6183bf9ad4a0f6fb07d769c710b721ec1e211772cbeaea0187c8e2 DIST JAGS-4.0.0.tar.gz 1880476 SHA256 a1d572269029d90d4e8b25757fd7ae9678994bd682937ec505ddcf06185d2c4c SHA512 bbe4f4600dff0fc1db6f8548b8d386ea804174d69788646681de6d006a0e0ab018fb01257b5737f871d10c8b59865950fb91b6a9cad5d1e6addc415004c6f82c WHIRLPOOL d1f2ad15834252c63300259c789f69ca0fa008d0c2008d504db2c394642f7a63180baae76bc272a33a92c83addc373fd9ce026063ea74b40397ac902c2272aed +DIST JAGS-4.1.0.tar.gz 1872634 SHA256 45ecf31b5b2127620a79875745b8ea4203ca2430a8b3625f5e80adc897cdf522 SHA512 76b52764e57e6c4450cc52c7c7c3de384f93bd6e57d8b88f1863b7c329bdd2ec39834902c223d433d263bcf29362b958807a9cb96b9066d4f75832b366339fd8 WHIRLPOOL b0187c02a971ccc733c34aa2e4f8e1ed32d1c767d97fb667034cd6035c08f63c2a6c014dcb5d5dd7ed080fdc9fae34be7bf002d0d631a6a454b849cf7c3cec67 diff --git a/sci-mathematics/jags/jags-4.1.0.ebuild b/sci-mathematics/jags/jags-4.1.0.ebuild new file mode 100644 index 00000000000..8e839279ad7 --- /dev/null +++ b/sci-mathematics/jags/jags-4.1.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils toolchain-funcs + +MYP="JAGS-${PV}" + +DESCRIPTION="Just Another Gibbs Sampler for Bayesian MCMC simulation" +HOMEPAGE="http://mcmc-jags.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/mcmc-jags/JAGS/4.x/Source/${MYP}.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc" + +RDEPEND=" + virtual/blas + virtual/lapack" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( + virtual/latex-base + dev-texlive/texlive-latexextra + )" + +S="${WORKDIR}/${MYP}" + +src_configure() { + econf \ + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ + --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" +} + +src_compile() { + emake all $(usex doc docs "") +} + +src_install() { + default + use doc && dodoc doc/manual/*.pdf + prune_libtool_files +} diff --git a/sys-apps/kexec-tools/metadata.xml b/sys-apps/kexec-tools/metadata.xml index dc210dc0850..6aa7d215c33 100644 --- a/sys-apps/kexec-tools/metadata.xml +++ b/sys-apps/kexec-tools/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>kernel-misc</herd> + <herd>base-system</herd> <use> <flag name="lzma">Enables support for LZMA compressed kernel images</flag> <flag name="booke">Include support for Book-E memory management</flag> diff --git a/sys-apps/sandbox/sandbox-2.10-r1.ebuild b/sys-apps/sandbox/sandbox-2.10-r1.ebuild index d6c49902f45..c707305370e 100644 --- a/sys-apps/sandbox/sandbox-2.10-r1.ebuild +++ b/sys-apps/sandbox/sandbox-2.10-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="multilib" DEPEND="app-arch/xz-utils diff --git a/sys-cluster/nova/nova-12.0.1.ebuild b/sys-cluster/nova/nova-12.0.1.ebuild index 2d218b9b61d..9d49c42bd7c 100644 --- a/sys-cluster/nova/nova-12.0.1.ebuild +++ b/sys-cluster/nova/nova-12.0.1.ebuild @@ -221,6 +221,7 @@ RDEPEND=" net-misc/bridge-utils compute? ( app-cdr/cdrkit + sys-fs/dosfstools kvm? ( app-emulation/qemu ) xen? ( app-emulation/xen app-emulation/xen-tools ) diff --git a/sys-cluster/nova/nova-2015.2.9999.ebuild b/sys-cluster/nova/nova-2015.2.9999.ebuild index 0e80b1dda10..2c6ccd07eb5 100644 --- a/sys-cluster/nova/nova-2015.2.9999.ebuild +++ b/sys-cluster/nova/nova-2015.2.9999.ebuild @@ -221,6 +221,7 @@ RDEPEND=" net-misc/bridge-utils compute? ( app-cdr/cdrkit + sys-fs/dosfstools kvm? ( app-emulation/qemu ) xen? ( app-emulation/xen app-emulation/xen-tools ) diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest index fe7be9e6383..9cb6fc4f8fc 100644 --- a/sys-fs/aufs3/Manifest +++ b/sys-fs/aufs3/Manifest @@ -11,3 +11,4 @@ DIST aufs3-standalone-3_p20151102.tar.xz 3139016 SHA256 8d43e3c3c744ddfd250321d7 DIST aufs3-standalone-3_p20151109.tar.xz 3151124 SHA256 1fe9341fe93a469d3a17604c90f949304e035e687f1fc3fac4c9f76d93b9535d SHA512 3f3e018e5236e6e8d67c3d0dd13eb38dd9d72ec32c0e572bb9f3b4fb85b4ee7d9d50a5cf63bb6432c5625e8d98655e3f0c228bd66b79fae680dbe866553cbc40 WHIRLPOOL 28d853afe21c8ce5a1ae9a9b5394db87b823bd791e14c5c5d15f3943ff3c67b0ce2bf28b2287f4ce9fc79feeb44127f9a26ba888a8449859b9414880d6748762 DIST aufs3-standalone-3_p20151116.tar.xz 3164412 SHA256 6702030b4a90b168d8ee227856caeaf999eec91e83bf96517d93cb1242d98ccd SHA512 40bdb947fd3da48d1d245c18cad3a23f61301e596e3b2b9b82b9915c239941af0b55c8491b408c66c07721385de365093601f764b43f096a432d76452f9d76e1 WHIRLPOOL e07ac272cc37eb74776b93030f3a201c8e2e0a7e73777c7e1140a41c83ac58b1e8c77fc4d52dfe9027d10442b5f6a1f11ea1a35a3b36ce8d87bd725f48cb5c3d DIST aufs3-standalone-3_p20151221.tar.xz 3174536 SHA256 2f84b85466244e11607680a9cc905f60c56fa4478c4b310366044999819ff58f SHA512 dadc95eea30c2e13ca0f4c316a5aa2a3ff7f8025eb7123a483713ee844a3f0eabe29ddd4c5497e368ba1b0f01008d3578f745eb0bdf5210fb71d2dd4ef54a711 WHIRLPOOL b6f2bde1de90074a238984d72041e27a6d8c7dfc828c055ebce9325d18c35b212770eae6a2ff619ad2b6e176d2833cdd9a184488fd0eb63acb15e5fece608bd6 +DIST aufs3-standalone-3_p20160118.tar.xz 3174824 SHA256 fc9d23a7769a44f0cf91020a5ca70d0fd25890d420ef8db52061610d5db39ad1 SHA512 91e5ad1bb1263a5a6ac48c2c91db75d79ece809f7571a24d8c324154a43cb202996d3534b7e6cc382b55790453dd5209fe841051e3525734c532f183415211b6 WHIRLPOOL abd6490808cd86fb65e5eb2469611799191eb9f36b75ab0c655c2a4cdd8cbe6b5d7341f6631fd97ba9af9f30cab0edc8934c038dc1fdef79042625761afe3f4d diff --git a/sys-fs/aufs3/aufs3-3_p20160118.ebuild b/sys-fs/aufs3/aufs3-3_p20160118.ebuild new file mode 100644 index 00000000000..e98fe7f05fa --- /dev/null +++ b/sys-fs/aufs3/aufs3-3_p20160118.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs + +AUFS_VERSION="${PV%%_p*}" +# highest branch version +PATCH_MAX_VER=19 +# highest supported version +KERN_MAX_VER=20 +# lowest supported version +KERN_MIN_VER=14 + +DESCRIPTION="An entirely re-designed and re-implemented Unionfs" +HOMEPAGE="http://aufs.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs" + +DEPEND=" + dev-util/patchutils + dev-vcs/git" +RDEPEND=" + sys-fs/aufs-util + !sys-fs/aufs + !sys-fs/aufs2 + !sys-fs/aufs4" + +S="${WORKDIR}"/${PN}-standalone + +MODULE_NAMES="aufs(misc:${S})" + +pkg_setup() { + CONFIG_CHECK+=" !AUFS_FS" + use inotify && CONFIG_CHECK+=" ~FSNOTIFY" + use nfs && CONFIG_CHECK+=" EXPORTFS" + use fuse && CONFIG_CHECK+=" ~FUSE_FS" + use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS" + use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources" + + # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system + [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return + + get_version + kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade." + kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" + + linux-mod_pkg_setup + + if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then + PATCH_BRANCH="x-rcN" + elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then + PATCH_BRANCH="${KV_MINOR}".21+ + elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then + PATCH_BRANCH="${KV_MINOR}".1+ + else + PATCH_BRANCH="${KV_MINOR}" + fi + + case ${KV_EXTRA} in + "") + elog "It seems you are using vanilla-sources with aufs3" + elog "Please use sys-kernel/aufs-sources with USE=vanilla" + elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" + ;; + "-gentoo") + elog "It seems you are using gentoo-sources with aufs3" + elog "Please use sys-kernel/aufs-sources" + elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" + ;; + esac + + pushd "${T}" &> /dev/null + unpack ${A} + cd ${PN}-standalone || die + local module_branch=origin/${PN}.${PATCH_BRANCH} + einfo "Using ${module_branch} as patch source" + git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die + combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch + combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then + if use kernel-patch; then + cd ${KV_DIR} + ewarn "Patching your kernel..." + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null + epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch + ewarn "You need to compile your kernel with the applied patch" + ewarn "to be able to load and use the aufs kernel module" + else + eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" + eerror "Either enable the kernel-patch useflag to do it with this ebuild" + eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand" + die "missing kernel patch, please apply it first" + fi + fi + popd &> /dev/null + export PKG_SETUP_HAS_BEEN_RAN=1 +} + +set_config() { + for option in $*; do + grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" + sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die + done +} + +src_prepare() { + local module_branch=origin/${PN}.${PATCH_BRANCH} + + einfo "Using for module creation branch ${module_branch}" + git checkout -q -b local-gentoo ${module_branch} || die + + # All config options to off + sed "s:= y:=:g" -i config.mk || die + + set_config RDU BRANCH_MAX_127 SBILIST + + use debug && set_config DEBUG + use fuse && set_config BR_FUSE POLL + use hfs && set_config BR_HFSPLUS + use inotify && set_config HNOTIFY HFSNOTIFY + use nfs && set_config EXPORT + use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64 + use ramfs && set_config BR_RAMFS + + if use pax_kernel; then + if kernel_is ge 3 11; then + epatch "${FILESDIR}"/pax-3.11.patch + else + epatch "${FILESDIR}"/pax-3.patch + fi + fi + + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die +} + +src_compile() { + local ARCH=x86 + + emake \ + CC=$(tc-getCC) \ + LD=$(tc-getLD) \ + LDFLAGS="$(raw-ldflags)" \ + ARCH=$(tc-arch-kernel) \ + CONFIG_AUFS_FS=m \ + KDIR="${KV_OUT_DIR}" +} + +src_install() { + linux-mod_src_install + + insinto /usr/share/doc/${PF} + + use doc && doins -r Documentation + + use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch + + dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_pkg_postinst + linux-mod_pkg_postinst +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.3.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.3.1.ebuild index d0c39655d4b..1fdd3ae22f9 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-4.3.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-4.3.1.ebuild @@ -89,6 +89,9 @@ src_install() { $(usex static-libs '' 'libs_static=') $(usex static install-static '') ) + + # Bug 572512 + dodir /sbin emake V=1 DESTDIR="${D}" install "${makeargs[@]}" newbashcomp btrfs-completion btrfs } diff --git a/sys-kernel/linux-headers/linux-headers-4.3.ebuild b/sys-kernel/linux-headers/linux-headers-4.3.ebuild index d04e69fdd73..57aff9d6245 100644 --- a/sys-kernel/linux-headers/linux-headers-4.3.ebuild +++ b/sys-kernel/linux-headers/linux-headers-4.3.ebuild @@ -13,7 +13,7 @@ PATCH_VER="1" SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" DEPEND="app-arch/xz-utils dev-lang/perl" diff --git a/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild b/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild index 722d40c7e4b..2de84125427 100644 --- a/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild +++ b/www-apache/mod_perl/mod_perl-2.0.10_pre201601.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz" LICENSE="GPL-2" SLOT="1" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="debug" # Make sure we always use the latest Apache-Test version or even check the diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 54c850d700b..89878a2a007 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -2,5 +2,5 @@ DIST chromium-47.0.2526.106-lite.tar.xz 414871736 SHA256 e71bfbdb9293a79d5ab8096 DIST chromium-48.0.2564.10.tar.xz 432060420 SHA256 1902d75d49d46c32a8c33f6de53c9253a63a364b85eb4ada1e8a9ba7c0f523d0 SHA512 7753dc19a50c862211c10975b3ad64a0408e3645df7b0ea548f8437c4c5380ad0bb350920eb8c6791e0685ae7ec921c6be720e337a17dffe4b73c56b74a2bc9a WHIRLPOOL a9ccb2872ad639886288581e1c7d9244f16965ef924395531701289cc69c5a9dfdc4a25175151d27b150acc8e4398c8d91ca5f8f3e623c3c85c8b99d913c4f00 DIST chromium-48.0.2564.23.tar.xz 1099898120 SHA256 e9a5eeaedb1975a93d37bc865d3122cf28b7e3a246c06ba19204edaefbce1266 SHA512 72b253f39b561e53c0ef2220402ae15e8d2cdd1af8eab4d5fa8480316919df9059dddf4f4c0d027f78fd0db924b7cbd23d29d406808d18fa047ccddffb6701b3 WHIRLPOOL c133e8e389b560efcc239e2f24bb3befd3fe8731bb2529aeee3f2ae04bf09e5d815ef805750c48dd549fb0b94c1ab77d94b03a0b8245cd537bdb204c79393761 DIST chromium-48.0.2564.41.tar.xz 1470877528 SHA256 b265ecb945fcf27dd9d856e18632ea6fa4f88aed7ed32cb5eefb6515b6dc651a SHA512 5d91c603a99ac092c9cc1d1300c826d0eab62092a961dde8dd2c6bcbb342120ff97aa76231407227563fb65c0791c69274d044ab81e261b66cfce76811b428d5 WHIRLPOOL 584638131774053511974722973f28b75f99ceb8241948af91e3de247ccee631c8dbbedac9bfd66b4f5f505bcef194970c361f60a0c9cae7179ad6af0ea55c35 -DIST chromium-49.0.2612.0.tar.xz 1488847440 SHA256 3859c3b931de3fc5089c9f011624503bd864e24cea07fe630c346192c780de67 SHA512 655a12de47a0515e33fdcfe011df91727fb1b331d3d381663976172a72f22a736a1632aa08f24b6501415ea5b964948b79bc6fec6c3378c5f3f5d56549c11a0b WHIRLPOOL 024f9ae374cca711eee4331523fbec97fc66bda59e76595380ef4b32b0c9add34ba52a620389446892f1911f494e9cc437ea3bd9b1d0e3f89b36aca56d1c856c DIST chromium-49.0.2618.8.tar.xz 450425684 SHA256 36eb7e14c6e0908650d941d4c566c0f574b38645d1fe6c71702862e0aa467ced SHA512 cc920c5d34f68504a585ad5fd1dc6402953f8cf33e35f1bdfb7250078258a172863cff36936f606c638b67a9ec3934509dd9da57c510615ccdaddc5b1feceac4 WHIRLPOOL 5d85d604fc9c2c0431cfed76c1f7c2dd9fc7705f3f66dbabf8f7cb49112cfaae490afd552697731ef03f64973bac27dd301ba5c59e5c45d6827f688dfc07d760 +DIST chromium-49.0.2623.0.tar.xz 452249352 SHA256 1637e2d16c233c75c4c4094bb83af9f8ef5add2d84a1df544ad08f53d7958357 SHA512 3f1ca7cedc121fc09823a9ecd0d8a544a0ce7561e7d9e9c5c97bfab7a0d3157ede0377ace4ae124a755844eae33d551efc07b52cb55e06ffaf54749539f55edc WHIRLPOOL 06c7f034bc007a2fe04bab8323000bcaad058a2395cf7d6affcac682466f8a81e32a5fc231ab8e8851ea4f183dae51eb0842bf352c70fea2b90d2e3d6ffb39ef diff --git a/www-client/chromium/chromium-48.0.2564.41.ebuild b/www-client/chromium/chromium-48.0.2564.41.ebuild index e41f55740f1..7fead7372a9 100644 --- a/www-client/chromium/chromium-48.0.2564.41.ebuild +++ b/www-client/chromium/chromium-48.0.2564.41.ebuild @@ -48,7 +48,7 @@ RDEPEND=" media-libs/libexif:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] ) + system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= diff --git a/www-client/chromium/chromium-49.0.2618.8.ebuild b/www-client/chromium/chromium-49.0.2618.8.ebuild index 77a433be978..7b1f6eb4472 100644 --- a/www-client/chromium/chromium-49.0.2618.8.ebuild +++ b/www-client/chromium/chromium-49.0.2618.8.ebuild @@ -48,7 +48,7 @@ RDEPEND=" media-libs/libexif:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] ) + system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= diff --git a/www-client/chromium/chromium-49.0.2612.0.ebuild b/www-client/chromium/chromium-49.0.2623.0.ebuild index 77a433be978..5adacbffcd5 100644 --- a/www-client/chromium/chromium-49.0.2612.0.ebuild +++ b/www-client/chromium/chromium-49.0.2623.0.ebuild @@ -48,7 +48,7 @@ RDEPEND=" media-libs/libexif:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] ) + system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= @@ -247,6 +247,8 @@ src_prepare() { 'third_party/analytics' \ 'third_party/angle' \ 'third_party/angle/src/third_party/compiler' \ + 'third_party/angle/src/third_party/murmurhash' \ + 'third_party/angle/src/third_party/trace_event' \ 'third_party/boringssl' \ 'third_party/brotli' \ 'third_party/cacheinvalidation' \ diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest index dd5c5d4f940..cb2098230ea 100644 --- a/www-client/google-chrome-beta/Manifest +++ b/www-client/google-chrome-beta/Manifest @@ -1,2 +1,2 @@ -DIST google-chrome-beta_48.0.2564.79-1_amd64.deb 48085212 SHA256 6ac10492d468e60274f4a8a3256a087871600d93667aee1537a809bec7c65eed SHA512 a7bceab46eee22be2bb0c07a548f9827269384b802c0a25f1c5b53e3faa5050bdc6cc49b39fb8d9b474860552bd2dfc0f9f02bfaf690accafa2c8d2b217aad1a WHIRLPOOL 973afe6fd34059aabcfe7aca3dec05f227e1a5ce6684e79498c034c5ca7afbd72a447f19b074b92928e9df52a6c2ca8a0bfdfe52517f35b287d4b8d0743b9ad0 -DIST google-chrome-beta_48.0.2564.79-1_i386.deb 47420828 SHA256 8eadcaf9c96bb051793d9f49253be8e492d167534ccd009bcc10064be9939d62 SHA512 c7b9f90a9985f55576f7ca7485684e6ee94cbbf81140b1eb4c6aec9f47bf3fdae9bba2248562b1340881911918cb85977f0f2076a9067f890c0d0f4e2f7a241d WHIRLPOOL 75cd4cfb3d226c2bbea4d0141bd7d0b4db0850abe68abd3a3267cb63b381c74428592030072b57a3f52cdcc951892b2ea8f9c99c26a3dd18559c7ad27f6e7ccd +DIST google-chrome-beta_48.0.2564.82-1_amd64.deb 48218090 SHA256 0af28401295a4392921642889e602995a9de5cb4080543a5fe03e415a485c324 SHA512 f2dab8648807698c00a9c9b22b66130c2da37ddb5532dff68d1f769cb83ac1ec224519f2f1245562b289c0ad48b14e86a54655cffea05cab12ff8bfc984b8ccf WHIRLPOOL b8d9679940268ff2fd6cd05755075f79b114e33b4d57230cdc806c728fa553c9a8df67a89bfa99c0b7b922e9991e1696c47a3b3c94ff3d1d54149dfbb6512bdc +DIST google-chrome-beta_48.0.2564.82-1_i386.deb 47618876 SHA256 07fcabcf9761fc2f403a8bcbb803685c685120fa4efb2b65e8a3eb56c586022e SHA512 69b59a7d4f4db1ac6a2596f6c3d8eb41320e9b2ad3ca02df9469bf1e63de65c33c1ca539689575aa57306c5b5062cb97bb4b7368b51bfae06baae2140cc1e606 WHIRLPOOL d0ee7bc55dc96639aee497d9db5d34251ebc6c847dde517397e09784b4d563ca09082794b607dec8d4b6040f98e5386b57af26fe37080fe6aa6b811070b61af3 diff --git a/www-client/google-chrome-beta/google-chrome-beta-48.0.2564.79_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-48.0.2564.82_p1.ebuild index 4d0ec1a60d3..4d0ec1a60d3 100644 --- a/www-client/google-chrome-beta/google-chrome-beta-48.0.2564.79_p1.ebuild +++ b/www-client/google-chrome-beta/google-chrome-beta-48.0.2564.82_p1.ebuild diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest index 09eeec0c7d4..9408f1e0f77 100644 --- a/www-client/google-chrome-unstable/Manifest +++ b/www-client/google-chrome-unstable/Manifest @@ -1,2 +1,2 @@ -DIST google-chrome-unstable_49.0.2618.8-1_amd64.deb 48318522 SHA256 562901837a0e8d3fc79809dee5a38d4000ab6397129081029ded175dfbe594aa SHA512 7a5f17b180abb557d64500f0d2042ec7667cc011a72850920af5becf36eea023f912a8ff7fcc7b10d7f83050d4dfdca78b8a869ea5ae896db4dc3edc97dbec34 WHIRLPOOL 2459079c340cc3106ea12f480c4b808c741ecb2db8f67c126c1a689b8d79c12f259102a7a4ea4ba8b87f04aefc5f020256862f86fe38bfc25dd65f31cc671887 -DIST google-chrome-unstable_49.0.2618.8-1_i386.deb 47696436 SHA256 89026fc9b7684140c08e8664fbe58e0e7d249807376f441be0b90dd180c4f0bf SHA512 7fd797b59328744c458b57fdda568eefff38dd41a4568397f74a800d4937f3ccd6380c356f21c0701591c8bf400bf0a012690bb9c1efab7a2dc5a6a334a69f3e WHIRLPOOL 3ca9d6560ae9d5ffa628eff6a92560dd65af3cea670902e74fdff71887218bc88e2732b18a1c83e89011fd7bbafd422101ea1e33718d595693a31f2bdc18170a +DIST google-chrome-unstable_49.0.2623.13-1_amd64.deb 48575324 SHA256 e7e7e902ba9b49f957d8c4e1f187e3347d6ac0bcbea40a2f9cdb4c6a5b0db8db SHA512 bc89e04a618c3c8995ef80e0ef8f63b0bcb86902e162744850f5802e00bf20491ef9a06de2dbee927483a4e09eb3d18e0fd242a2e1494319df3fb8ab6c2a2129 WHIRLPOOL 59742b2e9dd43b3527928315a0c483354f44ce587c26b0975e744282060c727c0a1f4545c7e0e6397a3645ee970bd9b970e1fe6478f15328093fd13fa61c2d03 +DIST google-chrome-unstable_49.0.2623.13-1_i386.deb 47720080 SHA256 007c604bf24cd82041fe57310baf6e8a8bd737e347e0ef54e8d6da1556d1b54d SHA512 04c93e5bed643bc40ca25d29b93d16039d7ffc9731d88974af58c8b7a4f6deca0093fec44710b644128569d8298ab119a6a92c929323ea1e4270fe2a9e3b7cfa WHIRLPOOL 19a129c1cbbebd94e128a9c1d7b70556945df0395c4ee5abebf2d5ec9f7eba92b71fecb3ac606e5c72e76bb3adcf9029b026aca97231e9a90276140f61487153 diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-49.0.2618.8_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-49.0.2623.13_p1.ebuild index 4d0ec1a60d3..4d0ec1a60d3 100644 --- a/www-client/google-chrome-unstable/google-chrome-unstable-49.0.2618.8_p1.ebuild +++ b/www-client/google-chrome-unstable/google-chrome-unstable-49.0.2623.13_p1.ebuild diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index bde15b22e5e..d5b7b4676d2 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -1,2 +1,2 @@ -DIST google-chrome-stable_47.0.2526.111-1_amd64.deb 47331202 SHA256 c0f0f4a42440de8b12eaf27daaea4876c9173f8f36eb589eaa50cd8924c02014 SHA512 00d04288d6deb0a05399290f93ea9943ddcbf47acc33424eab414ef5e27caeb2cb01ea3b3dc3be5a4c2ee9703a13554e767876741e7605cc25906392aa43c789 WHIRLPOOL 471795e9c5716d3dcc46bb18118024e5eb0fd1a352069deec6ecff5cd7dd552defa2a020b90c62a049f106a3678d061570dbd865211a8ff74b81c70da9965daf -DIST google-chrome-stable_47.0.2526.111-1_i386.deb 47199998 SHA256 27192b9f477dc98ba26c088b27081ec836dc4fa922da4e6f03c848ca7ff6d447 SHA512 f50ecd35b8096be30ee6044c24d833c8e6a27b6ec615ca941a7c9a33096ea2c53be0168c9f54c24787483343d3d688f325f4eecf1b049027373ca4688612f84e WHIRLPOOL b3e317b073bf844993ac75e7fa6c8eda44991e8f5c46691274c421e8f6d92d9f96df42a40dfd27c78783927c8bab0068c3ca04c7441b54dfa6f2e54a415136d3 +DIST google-chrome-stable_48.0.2564.82-1_amd64.deb 48216440 SHA256 3a66744087cfbef9453f9ca58815d1df3b604afc8d0ff02b4fcde84169f84637 SHA512 c03c652dc1141dd3043a084033355cb612698fc1333cdd43cf50eb99bdf9902b7f1ab959b80bde57498f170d98f9374a4d71b641f1f7a5d2eaf35dea19cf6579 WHIRLPOOL 1e754365acb9a09292ec25c744db14062b03c287bc417bdde1dc7ce35fc35582e6d1fd772d1fef66d7903974efeaaffcaaae4ec1119d0c9bc98075a4458c912d +DIST google-chrome-stable_48.0.2564.82-1_i386.deb 47583326 SHA256 5d24c5d2e20e7b12bf24da7dc7d3d24b4d280ef2da427218b776af3c2165606a SHA512 36b692ddde17a0222a0a993578a14673672fcb431f0a8a4973eea0e7f10c6bcdc4c346e4db76fb2d17c177a99b480990effe4abc771df865114139b3dc2621dc WHIRLPOOL 17db4d37bb99915fffecbd25f4d61547808edefde1aa191935df29acfe17ee99807655763593eb18ab8228f66edb6354dcddbcbad2773ddf43f78bf5531d00e8 diff --git a/www-client/google-chrome/google-chrome-47.0.2526.111_p1.ebuild b/www-client/google-chrome/google-chrome-48.0.2564.82_p1.ebuild index a5d7f7dcddc..4d0ec1a60d3 100644 --- a/www-client/google-chrome/google-chrome-47.0.2526.111_p1.ebuild +++ b/www-client/google-chrome/google-chrome-48.0.2564.82_p1.ebuild @@ -6,7 +6,7 @@ EAPI="5" CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr - sv sw ta te th tr uk vi zh_CN zh_TW" + sv sw ta te th tr uk vi zh_CN zh_TW fake_bidi" inherit readme.gentoo chromium eutils multilib pax-utils unpacker @@ -36,6 +36,7 @@ KEYWORDS="-* ~amd64 ~x86" IUSE="+plugins" RESTRICT="bindist mirror strip" +DEPEND="app-admin/chrpath" RDEPEND=" app-arch/bzip2 app-misc/ca-certificates @@ -126,6 +127,9 @@ src_install() { newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png done + # Work around RPATH=$ORIGIN QA check + chrpath -d "${CHROME_HOME}/chrome-sandbox" || die + insinto / doins -r opt usr diff --git a/www-client/google-chrome/metadata.xml b/www-client/google-chrome/metadata.xml index b6a2d8a0f04..6c5158d03d7 100644 --- a/www-client/google-chrome/metadata.xml +++ b/www-client/google-chrome/metadata.xml @@ -15,6 +15,7 @@ sophisticated technology to make the web faster, safer, and easier. </longdescription> <use> + <flag name="linguas_fake_bidi">Install fake-bidi translation</flag> <flag name="plugins">Add system plugins path to launcher</flag> </use> </pkgmetadata> diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index a3ae71563cd..223d3bbe758 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -4,3 +4,4 @@ DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1 DIST opera-stable_34.0.2036.25_amd64.deb 44697198 SHA256 ae4933f0df63b920f79ce6063b48ebcd7f3cf2bcdbde13dc410c4fe24bcf1447 SHA512 26a7496c6eb008f22535da6285c6ed86c2f8da1a65148804c9b5deb6acfe63ceb1aa90d952ac4e2cb302ff7f8b3da3a5903572ae9a004ab4cf328ed4fcb8a690 WHIRLPOOL f2a53c69628b736d3a7cfd6c51c1031e2b00e3635c3917e4410dea6ecfd87661123c216aeaaab527ca65b15440e30c042864c0be200e821eea2c9a6e59104cfb DIST opera-stable_34.0.2036.47_amd64.deb 44631166 SHA256 26a2aca99b2c719a3e031f112aaa1c29ebd694ac6870b50fc33e84ca7987a5be SHA512 89b663a26416b01b35af91f8f3b9a50ffcabb715e6c5c4934d59a78a0598a9489948771a3f72cc12ec4c30ba85c7348e5807120013f235f114f0b53a844157ce WHIRLPOOL 2718d38d47a8b0f4a8ea2100dac4ca6560a831a287fd5e5086f9588a0b52c51446f969d1636ce3b390ed1e5f807f79d85bfff5df6a8e31c441b443f32c110473 +DIST opera-stable_34.0.2036.50_amd64.deb 44627688 SHA256 ca32b729d044cb85d657c6ac7e613a4e60f22c1b62ffbe2fb9aa3dde6c4ed041 SHA512 6183e07fb60aaedfa39929f2821f22b880497f61f625297198c205746c7308987a090d2a30452e38dffd8119620f41109c2d019cc0665d245b601cdb21942a5d WHIRLPOOL 967f4c287578c704e1ff4e2a5b743b869ed7618694d0d0ca2ba64800b259e9a30a374ebd72498ed85285b961fe9ccda7f26c62011129dd18a76542c66419beec diff --git a/www-client/opera/opera-34.0.2036.50.ebuild b/www-client/opera/opera-34.0.2036.50.ebuild new file mode 100644 index 00000000000..ec547a8df4c --- /dev/null +++ b/www-client/opera/opera-34.0.2036.50.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CHROMIUM_LANGS=" + af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd + he hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru + sk sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu +" +inherit chromium multilib unpacker + +DESCRIPTION="A fast and secure web browser" +HOMEPAGE="http://www.opera.com/" +LICENSE="OPERA-2014" +SLOT="0" +SRC_URI_BASE="http://get.geo.opera.com/pub/" +SRC_URI=" + amd64? ( "${SRC_URI_BASE}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb" ) +" +KEYWORDS="~amd64" + +RDEPEND=" + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + >=dev-libs/openssl-1.0.1:0 + gnome-base/gconf:2 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + net-misc/curl + net-print/cups + sys-apps/dbus + sys-libs/libcap + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libnotify + x11-libs/pango[X] +" + +QA_PREBUILT="*" +S=${WORKDIR} +OPERA_HOME="usr/$(get_libdir)/${PN}" + +src_unpack() { + unpack_deb ${A} +} + +src_prepare() { + mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die + rm -r usr/lib || die + + rm usr/bin/${PN} || die + + rm usr/share/doc/${PN}-stable/copyright || die + mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die + + pushd "${OPERA_HOME}/localization" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + sed -i \ + -e 's|^TargetEnvironment|X-&|g' \ + usr/share/applications/${PN}.desktop || die +} + +src_install() { + mv * "${D}" || die + dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN} + fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox +} diff --git a/www-misc/urlwatch/urlwatch-2.0-r1.ebuild b/www-misc/urlwatch/urlwatch-2.0-r2.ebuild index 03a7bd57440..c3a7fa94f15 100644 --- a/www-misc/urlwatch/urlwatch-2.0-r1.ebuild +++ b/www-misc/urlwatch/urlwatch-2.0-r2.ebuild @@ -15,11 +15,9 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" -# https://github.com/thp/urlwatch/issues/34 -RESTRICT="test" RDEPEND=" - virtual/python-futures[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/minidb[${PYTHON_USEDEP}] || ( www-client/lynx app-text/html2text ) @@ -33,5 +31,6 @@ DEPEND=" " python_test() { + # https://github.com/thp/urlwatch/issues/34 nosetests test || die "tests failed with ${EPYTHON}" } diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index 26d8236c2ad..e5e64664087 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,6 +1,6 @@ -DIST google-chrome-beta_48.0.2564.79-1_amd64.deb 48085212 SHA256 6ac10492d468e60274f4a8a3256a087871600d93667aee1537a809bec7c65eed SHA512 a7bceab46eee22be2bb0c07a548f9827269384b802c0a25f1c5b53e3faa5050bdc6cc49b39fb8d9b474860552bd2dfc0f9f02bfaf690accafa2c8d2b217aad1a WHIRLPOOL 973afe6fd34059aabcfe7aca3dec05f227e1a5ce6684e79498c034c5ca7afbd72a447f19b074b92928e9df52a6c2ca8a0bfdfe52517f35b287d4b8d0743b9ad0 -DIST google-chrome-beta_48.0.2564.79-1_i386.deb 47420828 SHA256 8eadcaf9c96bb051793d9f49253be8e492d167534ccd009bcc10064be9939d62 SHA512 c7b9f90a9985f55576f7ca7485684e6ee94cbbf81140b1eb4c6aec9f47bf3fdae9bba2248562b1340881911918cb85977f0f2076a9067f890c0d0f4e2f7a241d WHIRLPOOL 75cd4cfb3d226c2bbea4d0141bd7d0b4db0850abe68abd3a3267cb63b381c74428592030072b57a3f52cdcc951892b2ea8f9c99c26a3dd18559c7ad27f6e7ccd -DIST google-chrome-stable_47.0.2526.111-1_amd64.deb 47331202 SHA256 c0f0f4a42440de8b12eaf27daaea4876c9173f8f36eb589eaa50cd8924c02014 SHA512 00d04288d6deb0a05399290f93ea9943ddcbf47acc33424eab414ef5e27caeb2cb01ea3b3dc3be5a4c2ee9703a13554e767876741e7605cc25906392aa43c789 WHIRLPOOL 471795e9c5716d3dcc46bb18118024e5eb0fd1a352069deec6ecff5cd7dd552defa2a020b90c62a049f106a3678d061570dbd865211a8ff74b81c70da9965daf -DIST google-chrome-stable_47.0.2526.111-1_i386.deb 47199998 SHA256 27192b9f477dc98ba26c088b27081ec836dc4fa922da4e6f03c848ca7ff6d447 SHA512 f50ecd35b8096be30ee6044c24d833c8e6a27b6ec615ca941a7c9a33096ea2c53be0168c9f54c24787483343d3d688f325f4eecf1b049027373ca4688612f84e WHIRLPOOL b3e317b073bf844993ac75e7fa6c8eda44991e8f5c46691274c421e8f6d92d9f96df42a40dfd27c78783927c8bab0068c3ca04c7441b54dfa6f2e54a415136d3 -DIST google-chrome-unstable_49.0.2618.8-1_amd64.deb 48318522 SHA256 562901837a0e8d3fc79809dee5a38d4000ab6397129081029ded175dfbe594aa SHA512 7a5f17b180abb557d64500f0d2042ec7667cc011a72850920af5becf36eea023f912a8ff7fcc7b10d7f83050d4dfdca78b8a869ea5ae896db4dc3edc97dbec34 WHIRLPOOL 2459079c340cc3106ea12f480c4b808c741ecb2db8f67c126c1a689b8d79c12f259102a7a4ea4ba8b87f04aefc5f020256862f86fe38bfc25dd65f31cc671887 -DIST google-chrome-unstable_49.0.2618.8-1_i386.deb 47696436 SHA256 89026fc9b7684140c08e8664fbe58e0e7d249807376f441be0b90dd180c4f0bf SHA512 7fd797b59328744c458b57fdda568eefff38dd41a4568397f74a800d4937f3ccd6380c356f21c0701591c8bf400bf0a012690bb9c1efab7a2dc5a6a334a69f3e WHIRLPOOL 3ca9d6560ae9d5ffa628eff6a92560dd65af3cea670902e74fdff71887218bc88e2732b18a1c83e89011fd7bbafd422101ea1e33718d595693a31f2bdc18170a +DIST google-chrome-beta_48.0.2564.82-1_amd64.deb 48218090 SHA256 0af28401295a4392921642889e602995a9de5cb4080543a5fe03e415a485c324 SHA512 f2dab8648807698c00a9c9b22b66130c2da37ddb5532dff68d1f769cb83ac1ec224519f2f1245562b289c0ad48b14e86a54655cffea05cab12ff8bfc984b8ccf WHIRLPOOL b8d9679940268ff2fd6cd05755075f79b114e33b4d57230cdc806c728fa553c9a8df67a89bfa99c0b7b922e9991e1696c47a3b3c94ff3d1d54149dfbb6512bdc +DIST google-chrome-beta_48.0.2564.82-1_i386.deb 47618876 SHA256 07fcabcf9761fc2f403a8bcbb803685c685120fa4efb2b65e8a3eb56c586022e SHA512 69b59a7d4f4db1ac6a2596f6c3d8eb41320e9b2ad3ca02df9469bf1e63de65c33c1ca539689575aa57306c5b5062cb97bb4b7368b51bfae06baae2140cc1e606 WHIRLPOOL d0ee7bc55dc96639aee497d9db5d34251ebc6c847dde517397e09784b4d563ca09082794b607dec8d4b6040f98e5386b57af26fe37080fe6aa6b811070b61af3 +DIST google-chrome-stable_48.0.2564.82-1_amd64.deb 48216440 SHA256 3a66744087cfbef9453f9ca58815d1df3b604afc8d0ff02b4fcde84169f84637 SHA512 c03c652dc1141dd3043a084033355cb612698fc1333cdd43cf50eb99bdf9902b7f1ab959b80bde57498f170d98f9374a4d71b641f1f7a5d2eaf35dea19cf6579 WHIRLPOOL 1e754365acb9a09292ec25c744db14062b03c287bc417bdde1dc7ce35fc35582e6d1fd772d1fef66d7903974efeaaffcaaae4ec1119d0c9bc98075a4458c912d +DIST google-chrome-stable_48.0.2564.82-1_i386.deb 47583326 SHA256 5d24c5d2e20e7b12bf24da7dc7d3d24b4d280ef2da427218b776af3c2165606a SHA512 36b692ddde17a0222a0a993578a14673672fcb431f0a8a4973eea0e7f10c6bcdc4c346e4db76fb2d17c177a99b480990effe4abc771df865114139b3dc2621dc WHIRLPOOL 17db4d37bb99915fffecbd25f4d61547808edefde1aa191935df29acfe17ee99807655763593eb18ab8228f66edb6354dcddbcbad2773ddf43f78bf5531d00e8 +DIST google-chrome-unstable_49.0.2623.13-1_amd64.deb 48575324 SHA256 e7e7e902ba9b49f957d8c4e1f187e3347d6ac0bcbea40a2f9cdb4c6a5b0db8db SHA512 bc89e04a618c3c8995ef80e0ef8f63b0bcb86902e162744850f5802e00bf20491ef9a06de2dbee927483a4e09eb3d18e0fd242a2e1494319df3fb8ab6c2a2129 WHIRLPOOL 59742b2e9dd43b3527928315a0c483354f44ce587c26b0975e744282060c727c0a1f4545c7e0e6397a3645ee970bd9b970e1fe6478f15328093fd13fa61c2d03 +DIST google-chrome-unstable_49.0.2623.13-1_i386.deb 47720080 SHA256 007c604bf24cd82041fe57310baf6e8a8bd737e347e0ef54e8d6da1556d1b54d SHA512 04c93e5bed643bc40ca25d29b93d16039d7ffc9731d88974af58c8b7a4f6deca0093fec44710b644128569d8298ab119a6a92c929323ea1e4270fe2a9e3b7cfa WHIRLPOOL 19a129c1cbbebd94e128a9c1d7b70556945df0395c4ee5abebf2d5ec9f7eba92b71fecb3ac606e5c72e76bb3adcf9029b026aca97231e9a90276140f61487153 diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.79_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.82_beta1.ebuild index 6622518f2d3..6622518f2d3 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.79_beta1.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.82_beta1.ebuild diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.111_p1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.82_p1.ebuild index e859db62528..e859db62528 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.111_p1.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.82_p1.ebuild diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2618.8_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.13_alpha1.ebuild index 6622518f2d3..6622518f2d3 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2618.8_alpha1.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.13_alpha1.ebuild |