diff options
92 files changed, 1184 insertions, 999 deletions
diff --git a/app-admin/needrestart/files/needrestart-parallelmake.patch b/app-admin/needrestart/files/needrestart-parallelmake.patch deleted file mode 100644 index 0a80de2deaf4..000000000000 --- a/app-admin/needrestart/files/needrestart-parallelmake.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://github.com/liske/needrestart/pull/34 ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index c432772..8cc2fe0 100644 ---- a/Makefile -+++ b/Makefile -@@ -64,5 +64,5 @@ po/needrestart-notify/messages.pot: ex/notify.d/*-* - - - mo-files: -- make -C po/needrestart -- make -C po/needrestart-notify -+ $(MAKE) -C po/needrestart -+ $(MAKE) -C po/needrestart-notify diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild index cf13ad5e5896..4e6d90e26e80 100644 --- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild +++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild @@ -23,7 +23,7 @@ fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc ~x86" +KEYWORDS="~amd64 ppc x86" IUSE="X dga ncurses sdl alsa oss sdl-sound capslib" # Note: opposed to ./configure --help zlib support required! Check diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.1.15.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.1.15.ebuild index 720431f89aa3..3829a224743b 100644 --- a/app-emulation/open-vm-tools/open-vm-tools-10.1.15.ebuild +++ b/app-emulation/open-vm-tools/open-vm-tools-10.1.15.ebuild @@ -83,7 +83,7 @@ src_prepare() { } src_configure() { - append-cflags "$($(tc-getPKG_CONFIG) --cflags libtirpc)" + append-cppflags "$($(tc-getPKG_CONFIG) --cflags libtirpc)" export LIBVMTOOLS_LIBADD="$($(tc-getPKG_CONFIG) --libs libtirpc)" local myeconfargs=( --disable-deploypkg diff --git a/app-emulation/spim/spim-8.0-r2.ebuild b/app-emulation/spim/spim-8.0-r2.ebuild index 186dc730441e..59443a28c924 100644 --- a/app-emulation/spim/spim-8.0-r2.ebuild +++ b/app-emulation/spim/spim-8.0-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="doc X" RDEPEND="X? ( media-fonts/font-adobe-100dpi diff --git a/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild b/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild index ed453c3232f8..6a4e9d905fa9 100644 --- a/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild +++ b/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/miniaudicle.eselect-${PV}.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="" RDEPEND=">=app-admin/eselect-1.2.3" diff --git a/app-misc/recoll/recoll-1.23.3.ebuild b/app-misc/recoll/recoll-1.23.3.ebuild index 46cc6b8c55e3..2405a51ae16f 100644 --- a/app-misc/recoll/recoll-1.23.3.ebuild +++ b/app-misc/recoll/recoll-1.23.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="camelcase doc +inotify qt5 session +spell" REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}" diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest index 6980bbcb182a..fad602ea1020 100644 --- a/dev-ada/aws/Manifest +++ b/dev-ada/aws/Manifest @@ -1,2 +1,2 @@ -DIST aws-gpl-2016-src.tar.gz 15054562 SHA256 310d7a79fba1cf622f6c8d53103226422c788126198911efef09e372d559db32 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b WHIRLPOOL 48428b840149064f96a1656074cfb2f308abdc546ece87d939ab2f95f05e668caafbe9969ab99770909739fe8a4013337cd1ea8b56a7ed06291114c5d812c62f -DIST aws-gpl-2017-src.tar.gz 12298806 SHA256 f7b2720f31c21c46bf4bca79e0921a4e796e6a4108be1bada1775eb2ba7fd935 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35 WHIRLPOOL 41081537d1d017bb19d665c6b134b54b56d4841a98f713a94367c6e57915185f8ed7fe983ef641d79ce0cece09211fbd34220df81953dfee393d70824c5728d0 +DIST aws-gpl-2016-src.tar.gz 15054562 BLAKE2B b9d2c6824cc25a1f73dda4e8cfc957660225e6d52ee5f05e89104bbda9cd30e53879f545ade4c54a65e6aea18b1afa01d98da1328a96406bcdf3436492d67241 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b +DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35 diff --git a/dev-ada/aws/aws-2016.ebuild b/dev-ada/aws/aws-2016.ebuild index 90711d2b8ec5..e0d114382774 100644 --- a/dev-ada/aws/aws-2016.ebuild +++ b/dev-ada/aws/aws-2016.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399112c7a447658d00e1cd -> ${MY_P}. LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="gnat_2016 gnat_2017" +IUSE="+gnat_2016 gnat_2017" RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]" DEPEND="${RDEPEND} diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild index c6f097ad1dce..919248e920a4 100644 --- a/dev-ada/aws/aws-2017.ebuild +++ b/dev-ada/aws/aws-2017.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed001 LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="gnat_2016 gnat_2017" +IUSE="gnat_2016 +gnat_2017" RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]" DEPEND="${RDEPEND} @@ -26,7 +26,7 @@ REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" S="${WORKDIR}"/${MY_P} -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) +PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch ) src_configure() { emake -j1 setup prefix=/usr diff --git a/dev-ada/aws/files/aws-2017-gentoo.patch b/dev-ada/aws/files/aws-2017-gentoo.patch deleted file mode 100644 index b33073afa443..000000000000 --- a/dev-ada/aws/files/aws-2017-gentoo.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- aws-gpl-2016-src/shared.gpr.old 2017-01-30 20:00:39.022743691 +0100 -+++ aws-gpl-2016-src/shared.gpr 2017-01-30 20:01:20.524985069 +0100 -@@ -130,6 +130,7 @@ - package Compiler is - - for Driver ("Makefile") use ""; -+ for Driver ("C") use External ("GCC", "gcc"); - - case Build is - when "Debug" => -@@ -151,11 +151,11 @@ - end case; - - for Switches ("aws-attachments.adb") -- use Common_Options & Debug_Options & ("-gnatVn"); -+ use Common_Options & Debug_Options & ("-gnatVn") & Adaflags; - for Switches ("aws-session.adb") -- use Common_Options & Debug_Options & ("-gnatVn"); -+ use Common_Options & Debug_Options & ("-gnatVn") & Adaflags; - for Switches ("templates_parser.adb") -- use Common_Options & Debug_Options & ("-gnatVn"); -+ use Common_Options & Debug_Options & ("-gnatVn") & Adaflags; - -- Disable validity check on this unit to work-around N728-028 - - -- ADAFLAGS and CFLAGS should come last so that command line ---- aws-gpl-2016-src/include/include.gpr.old 2017-02-17 22:09:14.361695926 +0100 -+++ aws-gpl-2016-src/include/include.gpr 2017-02-17 22:11:36.497215517 +0100 -@@ -54,7 +54,7 @@ - - when "Release" => - for Default_Switches ("Ada") use -- ("-gnat2012", "-O2", "-gnatws", "-gnatn") & Shared.Global_Options; -+ ("-gnat2012", "-O2", "-gnatws", "-gnatn") & Shared.Adaflags & Shared.Global_Options; - end case; - - case Shared.S_Target is diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest index 2669213c4151..4e74a9f5fdd9 100644 --- a/dev-ada/gnatmem/Manifest +++ b/dev-ada/gnatmem/Manifest @@ -1,2 +1,2 @@ -DIST gnatmem-gpl-2016-src.tar.gz 80104 SHA256 bd39c7b18e4f52fdd029b999f7e1af52d01c975063c28ae1ef6875e4fc5e224f SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b WHIRLPOOL 8aee794c18efcbdbb50a4d58b9f247de30dea8d5b0a41034b1e20ad7786eefab5dfd14bf99994340a993d67989eab939ba78097d46933d841686d1bbc68fce0b -DIST gnatmem-gpl-2017-src.tar.gz 80106 SHA256 11a27a66030b1a074875ccdaa0ffb06e86d687e1904ab0f5922e08bb488e5e7c SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897 WHIRLPOOL 6599c8b77e89d7bc1f6b1eea459009aa2626173a7ebe47b65ead3ba76a109699ff8d0f27cfe1cea9fb0a8cb90cf9a897f70cf8af4647f21feec87b422e544c1b +DIST gnatmem-gpl-2016-src.tar.gz 80104 BLAKE2B c7ccdf4a8b2c91117550592763c467a32befc00ad3fa6488963635be283d6e84dd572123d9586166af215dd845aa785f5953dae7fadca6e49fbb6004af0576fa SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b +DIST gnatmem-gpl-2017-src.tar.gz 80106 BLAKE2B 81f5b2fe4cacf383a39230bf3ebbbbfce0cd0a774b0289a78774dacedbfa0f2ca385b5538e1d12a075383158ff3c657d3a645f8f08be62fe6a437c9f7cd4b971 SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897 diff --git a/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch b/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch deleted file mode 100644 index 69530dd24b23..000000000000 --- a/dev-ada/gnatmem/files/gnatmem-2017-gentoo.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- 1/configure.in.old 2016-12-08 20:57:53.942004080 +0100 -+++ 1/configure.in 2016-12-08 21:00:10.393677257 +0100 -@@ -2,23 +2,14 @@ - AC_INIT(gnatmem.gpr.in) - AC_CANONICAL_SYSTEM - AC_PROG_CC(gcc) --AC_CHECK_TOOL(GNATBIND,gnatbind,"no") --if test ${GNATBIND} = "no"; then -- AC_MSG_ERROR(Ada compiler needed,1) --fi -+AC_CONFIG_HEADERS(config.h:config.in) -+AC_DEFINE_UNQUOTED(TARGET, "${target}", [Configured target name.]) - AC_ARG_WITH(binutils-buildtree, - [AC_HELP_STRING( - [--with-binutils-buildtree=<dir>], - [Specifify location of binutils build tree])], - BINUTILS_OBJDIR=$withval, - BINUTILS_OBJDIR=no) --AC_MSG_CHECKING([for binutils build tree validity]) --if test -f "$BINUTILS_OBJDIR/bfd/libbfd.a"; then -- AC_MSG_RESULT(yes) --else -- AC_MSG_RESULT(no) -- AC_MSG_FAILURE([need valid binutils build tree directory (got $BINUTILS_OBJDIR)]) --fi - - AC_ARG_WITH(binutils-sources, - [AC_HELP_STRING( -@@ -26,21 +21,6 @@ - [Specifify location of binutils sources])], - BINUTILS_SRCDIR=$withval, - BINUTILS_SRCDIR=auto) --if test "$BINUTILS_SRCDIR" = "auto"; then -- BINUTILS_SRCDIR=`cat "$BINUTILS_OBJDIR/Makefile" | sed -n -e "/^ *srcdir *=/ s/^ *srcdir *= *// p"` -- case "$BINUTILS_SRC_DIR" in -- /*) ;; -- *) # assume we have relative path -- BINUTILS_SRCDIR="$BINUTILS_OBJDIR/$BINUTILS_SRCDIR";; -- esac --fi --AC_MSG_CHECKING([for binutils source dir validity]) --if test -f "$BINUTILS_SRCDIR/bfd/Makefile.in"; then -- AC_MSG_RESULT(yes) --else -- AC_MSG_RESULT(no) -- AC_MSG_FAILURE([need valid binutils sources directory]) --fi - - AC_SUBST(BINUTILS_OBJDIR) - AC_SUBST(BINUTILS_SRCDIR) ---- gnatmem-gpl-2016-src/gnatmem.gpr.in.old 2017-02-02 22:15:30.247906007 +0100 -+++ gnatmem-gpl-2016-src/gnatmem.gpr.in 2017-02-02 22:17:22.604974363 +0100 -@@ -10,8 +10,10 @@ - for Languages use ("ada", "c"); - - package Compiler is -+ for Driver ("C") use External ("CC", "gcc"); - for Default_Switches ("ada") use ("-O2", "-W", "-Wall", "-gnatpg"); - for Default_Switches ("c") use ("-O2", -+ "-I..", - "-I" & BINUTILS_OBJDIR & "/binutils", - "-I" & BINUTILS_OBJDIR & "/bfd", - "-I" & BINUTILS_SRCDIR & "/include"); -@@ -19,8 +21,8 @@ - - package Linker is - for Default_Switches ("ada") use -- (BINUTILS_OBJDIR & "/bfd/libbfd.a", -- BINUTILS_OBJDIR & "/libiberty/libiberty.a", -+ ("-lbfd", -+ "-liberty", - "@LIBDL@", - "@LIBZ@"); - end Linker; ---- gnatmem-gpl-2015-src/src/libaddr2line.c.old 2017-01-04 21:03:36.185233702 +0100 -+++ gnatmem-gpl-2015-src/src/libaddr2line.c 2017-01-04 21:04:17.680455390 +0100 -@@ -23,9 +23,9 @@ - #include <string.h> - #include <stdlib.h> - --#include "bfd.h" --#include "libiberty.h" --#include "demangle.h" -+#include <bfd.h> -+#include <libiberty/libiberty.h> -+#include <libiberty/demangle.h> - - static asymbol **cur_syms; /* Symbol table. */ - static bfd *cur_bfd; diff --git a/dev-ada/gnatmem/gnatmem-2016.ebuild b/dev-ada/gnatmem/gnatmem-2016.ebuild index 5875024baefd..1b7bae00d069 100644 --- a/dev-ada/gnatmem/gnatmem-2016.ebuild +++ b/dev-ada/gnatmem/gnatmem-2016.ebuild @@ -14,11 +14,13 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/573995c8c7a447658e0affa2 -> ${MYP}.t LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="gnat_2016 gnat_2017" +IUSE="+gnat_2016 gnat_2017" RDEPEND="" DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]" +REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" + S="${WORKDIR}"/${MYP} PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) diff --git a/dev-ada/gnatmem/gnatmem-2017.ebuild b/dev-ada/gnatmem/gnatmem-2017.ebuild index ee97065ed89f..c9a384fa74dc 100644 --- a/dev-ada/gnatmem/gnatmem-2017.ebuild +++ b/dev-ada/gnatmem/gnatmem-2017.ebuild @@ -14,14 +14,16 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 -> ${MYP}.t LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="gnat_2016 gnat_2017" +IUSE="gnat_2016 +gnat_2017" RDEPEND="" DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]" +REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" + S="${WORKDIR}"/${MYP} -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) +PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch ) src_prepare() { default diff --git a/dev-db/pgtap/Manifest b/dev-db/pgtap/Manifest index 98a255d70957..fa112a448a08 100644 --- a/dev-db/pgtap/Manifest +++ b/dev-db/pgtap/Manifest @@ -1,2 +1,3 @@ DIST pgtap-0.93.0.zip 219355 SHA256 d1fa168b5d089d031552103c985d1f4b681659ece2f976d27c070ad26f6c1d4c SHA512 6165f8bd107168a3955c3ec4c63277ce9fce31d7c375fdfe13cb31b7df71cb9aae4b20a1c2d961fba97e3ae207b45b8daf9174f0701a220e52f4ffb53dddea94 WHIRLPOOL 2352e71e004ad9486d6a5ed3b6c5967613caa06ea657af7394ea37249f16f266e611b64d3d2106bc737bf10e9810613b67f9eb79faadc578ca3ff16cd132a263 -DIST pgtap-0.97.0.zip 260089 SHA256 a29f739e5973b19d83e0448f62e5529d11e8c71546d57e80791b172140c9a76a SHA512 8d1a87b6060e28150c580383b0151553dc9c588145a3888d1b2313770283c327bb50820eee3db8cfa5d21e4664272c1538cd3784908fd042c7e788b4558a0df5 WHIRLPOOL 8f3c6114b3dac8c349e72a1608607518a44fa8f6a3ae67fca7213d4d96a63e8c44f6fd4d10ec768376af8f654641094c1e4cc7077fdb159292ac8f7cced1535d +DIST pgtap-0.97.0.zip 260089 BLAKE2B ac04be5e9e317b10ab8e944bdfc33d0444db989def18843adfa6c0238d56d041f40cbba8af62eb9152b19a397f140ff789d81c4723d2aadb39b1836f0de8e52a SHA512 8d1a87b6060e28150c580383b0151553dc9c588145a3888d1b2313770283c327bb50820eee3db8cfa5d21e4664272c1538cd3784908fd042c7e788b4558a0df5 +DIST pgtap-0.98.0.zip 270583 BLAKE2B 25d409f5fc63bc7059e8a4ffd3cb460885648f8569cd10ca05d4c5fbe09af323ecc719d663f81389d45f4a4910ca77beef968e264a0d3f4fabf63fa30b8b98ac SHA512 478841aa9cf378120713b90f33dc16d40fdd030ee1856edd4bfa288a7803cabad09661cf5219925335d9220e12b6202a1fcd8cc0fc55d1974d1e98dc0f6ddac0 diff --git a/dev-db/pgtap/pgtap-0.98.0.ebuild b/dev-db/pgtap/pgtap-0.98.0.ebuild new file mode 100644 index 000000000000..458e0157240b --- /dev/null +++ b/dev-db/pgtap/pgtap-0.98.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +POSTGRES_COMPAT=( 9.{2..6} 10 ) + +inherit postgres-multi + +DESCRIPTION="Unit testing for PostgreSQL" +HOMEPAGE="http://pgtap.org/" +SRC_URI="http://api.pgxn.org/dist/${PN}/${PV}/${P}.zip" + +LICENSE="POSTGRESQL" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="${POSTGRES_DEP} + dev-perl/TAP-Parser-SourceHandler-pgTAP +" +RDEPEND="${DEPEND}" + +src_configure() { + : +} diff --git a/dev-games/irrlicht/irrlicht-1.8.4.ebuild b/dev-games/irrlicht/irrlicht-1.8.4.ebuild index b56191e612b9..6b5499de12e2 100644 --- a/dev-games/irrlicht/irrlicht-1.8.4.ebuild +++ b/dev-games/irrlicht/irrlicht-1.8.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/irrlicht/${P}.zip" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="debug doc static-libs" RDEPEND="virtual/jpeg:0 diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 0d027556b6f0..e9e718b0a838 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -3,4 +3,4 @@ DIST php-7.0.25.tar.xz 11963668 BLAKE2B 8d20ce3574d72c39b4e90b466d7d06800458e9ab DIST php-7.0.26.tar.xz 11966888 BLAKE2B 4d7ceefa2226aa8a7f2a62511504f63d4d22a59fa2953edcca9b086b1ce5ec1a5cb111c37678fc24b32bcd67d53cdd127a728eb4340c24c64f8042e6ee6e2b88 SHA512 314062acb2e1c860ba616dae15254fcb25d73784e976a1a4dd1de200e4a457f4fd167d2e6c8400f37156839e474ff484fddd35d7ea57a9c923b39ad529449c38 DIST php-7.1.11.tar.xz 12169884 BLAKE2B e7ec69cdf5e0e985a9d48b90308e1e4a97967239f9fac3d503fc0639af474bfc933c90861137f31c4b0685e850e5eb5813e755dd4587cb7eea5dddc61105161b SHA512 400bc75d938f49754586d2b14b8f300c5a1e961489c02c968c7560ea0edc3765992580306c6185ecee57734775f8abaf7525a2aaa5110db2d8efacf2701c0101 DIST php-7.1.12.tar.xz 12194772 BLAKE2B de7a81caa66043ed057c217b0059e5e4de9e6adb3ea4491519c88df2e3b282c7082f6ec7f04df9c94a68b6c9d5e88dca340acf9a80a8df242eaae0c20fbeb123 SHA512 75fc376faaf20500cadc0da03baac1676a151a033df4724c2a69dd601969e37c2638d24c27880cf020f53d6a44e17c2a06f621f2fcaa416de6230253e73a6763 -DIST php-7.2.0RC6.tar.xz 12077856 BLAKE2B 0143858ff760cf9b81e05fea753f2021924b3ec8414e4e7a56426beb457698a2789b204f1e6b446ecec4c48f2b7c646575ef59a60d040e242a28ae9bf7e650fc SHA512 7cddd7bce3dddbe478124450f95150012dfa4376ea7a0dde7d2b1caaf9de6b44c39c60db3da6756b25c100f0f852d17cee8e13986d5e9711337388a40a6635e4 +DIST php-7.2.0.tar.xz 12014940 BLAKE2B e34c5bfb076e62afc54c8e35e0e35491b803ec753a1e62a0d8e78dd5bb6c28b95a9434228e211b76913f721bd0d8009527c95d2ab7990780819f5d3b8d822c6f SHA512 828d38727edde0dbc6483add6cdc21d33527b887bffaedad2d7f53e25d58a6f661ac341a23db02741bc37248d161aaffd72026dd8ef85ac851594c127d6c0133 diff --git a/dev-lang/php/php-7.1.11.ebuild b/dev-lang/php/php-7.1.11.ebuild index 36bff5fe6f12..9e74ce04ffa9 100644 --- a/dev-lang/php/php-7.1.11.ebuild +++ b/dev-lang/php/php-7.1.11.ebuild @@ -18,7 +18,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" diff --git a/dev-lang/php/php-7.2.0_rc6.ebuild b/dev-lang/php/php-7.2.0.ebuild index 1d273a120834..19cc9bdf940d 100644 --- a/dev-lang/php/php-7.2.0_rc6.ebuild +++ b/dev-lang/php/php-7.2.0.ebuild @@ -5,11 +5,9 @@ EAPI=6 inherit flag-o-matic versionator systemd -MY_PV="${PV/_rc/RC}" - DESCRIPTION="The PHP language runtime engine" HOMEPAGE="https://secure.php.net/" -SRC_URI="https://downloads.php.net/~pollita/${PN}-${MY_PV}.tar.xz" +SRC_URI="https://secure.php.net/distributions/${P}.tar.xz" LICENSE="PHP-3.01 BSD @@ -22,7 +20,6 @@ LICENSE="PHP-3.01 SLOT="$(get_version_component_range 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -S="${WORKDIR}/${PN}-${MY_PV}" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" diff --git a/dev-libs/libbytesize/libbytesize-1.2.ebuild b/dev-libs/libbytesize/libbytesize-1.2.ebuild index 61b601fbd627..9df86b05fde0 100644 --- a/dev-libs/libbytesize/libbytesize-1.2.ebuild +++ b/dev-libs/libbytesize/libbytesize-1.2.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/rhinstaller/libbytesize" SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="doc test" RDEPEND=" diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild index 686a396d1173..d07e69f1aeff 100644 --- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild +++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://launchpad.net/libdbusmenu-qt/" if [[ ${PV} != 9999* ]] ; then MY_PV=${PV/_pre/+16.04.} SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" fi LICENSE="LGPL-2" diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest index 13f919b1ec7d..043ac0d61c74 100644 --- a/dev-libs/libfilezilla/Manifest +++ b/dev-libs/libfilezilla/Manifest @@ -1,4 +1,4 @@ -DIST libfilezilla-0.10.0.tar.bz2 394078 SHA256 bd10176c44f421a20c92c66d85a7a277dcc0d1c4b57cf20b7b6ba24cb4493382 SHA512 b21efe77e7555fbed29ff798a19c922d12446295467af38683009770d6db753518fb5b2d8f14a77803e2559bc4038e5794c1750544527351f9526170ff591800 WHIRLPOOL b47187271509ec7b72ff84cdd2baf48498b9296086e947414cbc7bf79644259c90cd67c3a5e19cec41d638101e800568b741afc018d4fa14d2085059eaf48d3a -DIST libfilezilla-0.11.0.tar.bz2 395727 SHA256 cc7467241c8905de98773b414ce445d6f9ff3bf3105f2d16cecab76404879ed0 SHA512 aa5356a8fbb9488072c9d32c7ab2de51de426a97cb30ec8b07c9e55bca351f82d8c4879f413aae05d5a2602bb153c0832f6bd7a71b8510a4957bafe9926d1d19 WHIRLPOOL d6b139249d27012b67c7256217d42be97157b33021f7efcb2d2151419613e9a09d90837c4758f2d69ff5c4804a07fa67307249d2f2b24fc3c4cd7a2f1a8d477c +DIST libfilezilla-0.11.0.tar.bz2 395727 BLAKE2B 7a2854f39462041ccd2fa0ad7ac0b15cb3169bb268b2f9ce68abea69490fd509742bfe22de064aed0ec92777b516cb42d23ca899997979713ebb5d9e3f73d7c2 SHA512 aa5356a8fbb9488072c9d32c7ab2de51de426a97cb30ec8b07c9e55bca351f82d8c4879f413aae05d5a2602bb153c0832f6bd7a71b8510a4957bafe9926d1d19 +DIST libfilezilla-0.11.1.tar.bz2 395868 BLAKE2B d7d0004ca2b64fcfb8ba8121fefffb416bca2c4575c7a47ac9f890e352c88d3b35a5b881a3d7ca476a5b202a01a0d8094a1377f31b4b0b46b064c335781884b7 SHA512 a41ad8b2b0de25cba3283a55344a147383860d6ae7df7a0c634b48c07319bcb8057f84611e5cb98696e1f94856f5901f948c2e376fffe7151e145bf18ab82cc4 DIST libfilezilla-0.9.1.tar.bz2 383315 SHA256 18b2391771f330cccab2c55a66197b9098f236e616f26f86326795b900913b1a SHA512 bbcd826675e9c3e2f8cf1cea4da01434a66359ae816efdc5c981fbfebde0b73ce44a6d37546196fc00cb118d9b4d7772b73e30f8d5a78294f97b9899e9ba3393 WHIRLPOOL cbe3c1b30cd4dad6d6806c01921fe4bd15a8797f7dcf92737b34d04e3d35954a584d9155ea8385beecf52b176ac41b114814047f1b570791ff2a4314fa787a58 DIST libfilezilla-0.9.2.tar.bz2 383522 SHA256 c162e8a23555b3bbc707cf240b0b4122ea2975d6d8b10744325b968f656b3be3 SHA512 f825d116e252786801115189f9966ba7ab8663863d921cce530569a172ab33dbc31234d6286b0b3e6edc19ec0a5ba009788382ec5d5359f97a9cb10f30715f88 WHIRLPOOL 16adf902b1a27766f86221e08e3599f84e64da30893ca3f67d3e467ef74c00eaa9db6abaef360a8a4ba4c47ebbfb92239344335a0fedd4cb9263b2542fde8147 diff --git a/dev-libs/libfilezilla/libfilezilla-0.10.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.11.1.ebuild index 31545f46bee8..31545f46bee8 100644 --- a/dev-libs/libfilezilla/libfilezilla-0.10.0.ebuild +++ b/dev-libs/libfilezilla/libfilezilla-0.11.1.ebuild diff --git a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild index ba86bd304ccb..611a3c386e05 100644 --- a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild +++ b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/libsigsegv/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" src_configure () { diff --git a/dev-libs/volume_key/volume_key-0.3.9.ebuild b/dev-libs/volume_key/volume_key-0.3.9.ebuild index 05ac55ccf1e3..f20a2d6f8ba3 100644 --- a/dev-libs/volume_key/volume_key-0.3.9.ebuild +++ b/dev-libs/volume_key/volume_key-0.3.9.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild index debbad654805..3907daf8500f 100644 --- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild +++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" <sys-libs/db-6.3:= diff --git a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild index 3c344a15bc7d..5eaff6b8bb69 100644 --- a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild +++ b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux" IUSE="test" RDEPEND="" diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild index ae0c36e37a15..d1fc72a0f0cf 100644 --- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild +++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild @@ -11,7 +11,7 @@ inherit distutils-r1 DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser" HOMEPAGE="https://bitbucket.org/tiran/defusedxml" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="examples" LICENSE="PSF-2" diff --git a/dev-python/dill/dill-0.2.5.ebuild b/dev-python/dill/dill-0.2.5.ebuild index d13dba401c3d..86628e8b42fd 100644 --- a/dev-python/dill/dill-0.2.5.ebuild +++ b/dev-python/dill/dill-0.2.5.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tgz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux" IUSE="" PATCHES=( diff --git a/dev-python/future/future-0.16.0.ebuild b/dev-python/future/future-0.16.0.ebuild index dcfecd04272e..27f85e700738 100644 --- a/dev-python/future/future-0.16.0.ebuild +++ b/dev-python/future/future-0.16.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86" IUSE="test" DEPEND=" diff --git a/dev-python/ipdb/ipdb-0.10.3.ebuild b/dev-python/ipdb/ipdb-0.10.3.ebuild index c71a75ece88d..54268005b6cf 100644 --- a/dev-python/ipdb/ipdb-0.10.3.ebuild +++ b/dev-python/ipdb/ipdb-0.10.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86" IUSE="" RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]" diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild index 79a73dee4fdf..b3faa887d521 100644 --- a/dev-python/markdown/markdown-2.6.8.ebuild +++ b/dev-python/markdown/markdown-2.6.8.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz" LICENSE="|| ( BSD GPL-2 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc test pygments" DEPEND=" diff --git a/dev-python/more-itertools/more-itertools-3.0.0.ebuild b/dev-python/more-itertools/more-itertools-3.0.0.ebuild index 3c7a53ab430e..2c99e4fdc761 100644 --- a/dev-python/more-itertools/more-itertools-3.0.0.ebuild +++ b/dev-python/more-itertools/more-itertools-3.0.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="doc test" RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]" diff --git a/dev-python/mpmath/mpmath-1.0.0.ebuild b/dev-python/mpmath/mpmath-1.0.0.ebuild index 06c4d2848519..5188ea6aca99 100644 --- a/dev-python/mpmath/mpmath-1.0.0.ebuild +++ b/dev-python/mpmath/mpmath-1.0.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://mpmath.org/files/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="gmp matplotlib test" diff --git a/dev-python/pocketlint/pocketlint-0.15.ebuild b/dev-python/pocketlint/pocketlint-0.15.ebuild index 09a825f63aee..703506549789 100644 --- a/dev-python/pocketlint/pocketlint-0.15.ebuild +++ b/dev-python/pocketlint/pocketlint-0.15.ebuild @@ -13,5 +13,5 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="" diff --git a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild index e8078513f8f9..b0fe54c3d392 100644 --- a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild +++ b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" LICENSE="WTFPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm x86" IUSE="test" RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]" diff --git a/dev-python/pyro/pyro-4.56.ebuild b/dev-python/pyro/pyro-4.56.ebuild index 60026395443a..20fa5b7ebec2 100644 --- a/dev-python/pyro/pyro-4.56.ebuild +++ b/dev-python/pyro/pyro-4.56.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="MIT" SLOT="4" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc x86" IUSE="doc examples test" RDEPEND=" diff --git a/dev-python/python-editor/python-editor-1.0.3.ebuild b/dev-python/python-editor/python-editor-1.0.3.ebuild index 861c2a058204..69eee823a7fe 100644 --- a/dev-python/python-editor/python-editor-1.0.3.ebuild +++ b/dev-python/python-editor/python-editor-1.0.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 x86" IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild index 1347cd05994a..42807c523d02 100644 --- a/dev-python/rdflib/rdflib-4.2.2.ebuild +++ b/dev-python/rdflib/rdflib-4.2.2.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="doc berkdb examples mysql redland sqlite test" RDEPEND=" diff --git a/dev-python/regex/regex-2017.04.05.ebuild b/dev-python/regex/regex-2017.04.05.ebuild index b18fe2176113..21344a7e622f 100644 --- a/dev-python/regex/regex-2017.04.05.ebuild +++ b/dev-python/regex/regex-2017.04.05.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" IUSE="doc" DOCS=( README docs/UnicodeProperties.txt ) diff --git a/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild index 8fca85bbe7a4..01ba330d72c0 100644 --- a/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild +++ b/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" LICENSE="ISC" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="test" DEPEND="test? ( diff --git a/dev-python/selectors34/selectors34-1.2.ebuild b/dev-python/selectors34/selectors34-1.2.ebuild index 67bbcfc2fdc6..1d51c9fcc7de 100644 --- a/dev-python/selectors34/selectors34-1.2.ebuild +++ b/dev-python/selectors34/selectors34-1.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="PSF-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="" diff --git a/dev-python/serpent/serpent-1.19.ebuild b/dev-python/serpent/serpent-1.19.ebuild index 27e5ec56cd3d..ac5161ade565 100644 --- a/dev-python/serpent/serpent-1.19.ebuild +++ b/dev-python/serpent/serpent-1.19.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86" IUSE="" # not bundled diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild index 179b9cf30636..54d2e424ed15 100644 --- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild +++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" LICENSE="W3C" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="" diff --git a/dev-python/sure/sure-1.2.24.ebuild b/dev-python/sure/sure-1.2.24.ebuild index 66ed053658a2..3bedf40c6b13 100644 --- a/dev-python/sure/sure-1.2.24.ebuild +++ b/dev-python/sure/sure-1.2.24.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ppc64 ~x86" +KEYWORDS="~amd64 ppc64 x86" IUSE="test" CDEPEND=" diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild index 594f08dc3b2e..bafc7eadc439 100644 --- a/dev-python/tinycss/tinycss-0.4.ebuild +++ b/dev-python/tinycss/tinycss-0.4.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="test" RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]" diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest index 04f6da34d64d..3d3cefd2317b 100644 --- a/dev-python/ujson/Manifest +++ b/dev-python/ujson/Manifest @@ -1,2 +1,2 @@ DIST ujson-1.33.zip 197034 SHA256 68cf825f227c82e1ac61e423cfcad923ff734c27b5bdd7174495d162c42c602b SHA512 0f1f66212fbf94c03e048ba64c3bd817c50443d1a29b87f6a3a38f697a050f38821be4ba36a3b17a96930c69ee92973ac31bdd41851dea071af14cd4bbaf8480 WHIRLPOOL d3080fcf3e979b43deb8fe099427a8311c55e7e54105626bf12b3b6fe9e8567f70501884bd24b7a26d53ddfcd98f535de4aa708801106aa4a1b76e543217835c -DIST ujson-1.35.tar.gz 192027 SHA256 f66073e5506e91d204ab0c614a148d5aa938bdbf104751be66f8ad7a222f5f86 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7 WHIRLPOOL aff7a034304366e95ec51164de78afbee8daa496022abdae1b9928ea90928758e675027f2202ca77790788a3057c978d9ba9348684bc087843aa2e16932a1144 +DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7 diff --git a/dev-python/ujson/ujson-1.35.ebuild b/dev-python/ujson/ujson-1.35.ebuild index 19d94beed916..d4bc42da494b 100644 --- a/dev-python/ujson/ujson-1.35.ebuild +++ b/dev-python/ujson/ujson-1.35.ebuild @@ -12,12 +12,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm x86" IUSE="test" +RESTRICT="!test? ( test )" DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2) + ) +" PATCHES=( "${FILESDIR}/${P}-sort_keys-segfault.patch" diff --git a/dev-python/waitress/waitress-1.0.2.ebuild b/dev-python/waitress/waitress-1.0.2.ebuild index 7d407a99d663..1c447ec65a0a 100644 --- a/dev-python/waitress/waitress-1.0.2.ebuild +++ b/dev-python/waitress/waitress-1.0.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" IUSE="test" RDEPEND="" diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild index f53458451d05..867250748498 100644 --- a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild +++ b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="MIT" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux" IUSE="test" RDEPEND="" diff --git a/dev-python/xlwt/xlwt-1.2.0.ebuild b/dev-python/xlwt/xlwt-1.2.0.ebuild index f2f6f8804d9c..1142f09ecf41 100644 --- a/dev-python/xlwt/xlwt-1.2.0.ebuild +++ b/dev-python/xlwt/xlwt-1.2.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="doc examples test" DEPEND=" diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass new file mode 100644 index 000000000000..d65b0d0bf074 --- /dev/null +++ b/eclass/desktop.eclass @@ -0,0 +1,395 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: desktop.eclass +# @MAINTAINER: +# base-system@gentoo.org +# @BLURB: support for desktop files, menus, and icons + +if [[ -z ${_DESKTOP_ECLASS} ]]; then +_DESKTOP_ECLASS=1 + +# @FUNCTION: make_desktop_entry +# @USAGE: make_desktop_entry(<command>, [name], [icon], [type], [fields]) +# @DESCRIPTION: +# Make a .desktop file. +# +# @CODE +# binary: what command does the app run with ? +# name: the name that will show up in the menu +# icon: the icon to use in the menu entry +# this can be relative (to /usr/share/pixmaps) or +# a full path to an icon +# type: what kind of application is this? +# for categories: +# https://specifications.freedesktop.org/menu-spec/latest/apa.html +# if unset, function tries to guess from package's category +# fields: extra fields to append to the desktop file; a printf string +# @CODE +make_desktop_entry() { + [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable" + + local exec=${1} + local name=${2:-${PN}} + local icon=${3:-${PN}} + local type=${4} + local fields=${5} + + if [[ -z ${type} ]] ; then + local catmaj=${CATEGORY%%-*} + local catmin=${CATEGORY##*-} + case ${catmaj} in + app) + case ${catmin} in + accessibility) type="Utility;Accessibility";; + admin) type=System;; + antivirus) type=System;; + arch) type="Utility;Archiving";; + backup) type="Utility;Archiving";; + cdr) type="AudioVideo;DiscBurning";; + dicts) type="Office;Dictionary";; + doc) type=Documentation;; + editors) type="Utility;TextEditor";; + emacs) type="Development;TextEditor";; + emulation) type="System;Emulator";; + laptop) type="Settings;HardwareSettings";; + office) type=Office;; + pda) type="Office;PDA";; + vim) type="Development;TextEditor";; + xemacs) type="Development;TextEditor";; + esac + ;; + + dev) + type="Development" + ;; + + games) + case ${catmin} in + action|fps) type=ActionGame;; + arcade) type=ArcadeGame;; + board) type=BoardGame;; + emulation) type=Emulator;; + kids) type=KidsGame;; + puzzle) type=LogicGame;; + roguelike) type=RolePlaying;; + rpg) type=RolePlaying;; + simulation) type=Simulation;; + sports) type=SportsGame;; + strategy) type=StrategyGame;; + esac + type="Game;${type}" + ;; + + gnome) + type="Gnome;GTK" + ;; + + kde) + type="KDE;Qt" + ;; + + mail) + type="Network;Email" + ;; + + media) + case ${catmin} in + gfx) + type=Graphics + ;; + *) + case ${catmin} in + radio) type=Tuner;; + sound) type=Audio;; + tv) type=TV;; + video) type=Video;; + esac + type="AudioVideo;${type}" + ;; + esac + ;; + + net) + case ${catmin} in + dialup) type=Dialup;; + ftp) type=FileTransfer;; + im) type=InstantMessaging;; + irc) type=IRCClient;; + mail) type=Email;; + news) type=News;; + nntp) type=News;; + p2p) type=FileTransfer;; + voip) type=Telephony;; + esac + type="Network;${type}" + ;; + + sci) + case ${catmin} in + astro*) type=Astronomy;; + bio*) type=Biology;; + calc*) type=Calculator;; + chem*) type=Chemistry;; + elec*) type=Electronics;; + geo*) type=Geology;; + math*) type=Math;; + physics) type=Physics;; + visual*) type=DataVisualization;; + esac + type="Education;Science;${type}" + ;; + + sys) + type="System" + ;; + + www) + case ${catmin} in + client) type=WebBrowser;; + esac + type="Network;${type}" + ;; + + *) + type= + ;; + esac + fi + local slot=${SLOT%/*} + if [[ ${slot} == "0" ]] ; then + local desktop_name="${PN}" + else + local desktop_name="${PN}-${slot}" + fi + local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" + #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop + + # Don't append another ";" when a valid category value is provided. + type=${type%;}${type:+;} + + if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then + ewarn "As described in the Icon Theme Specification, icon file extensions are not" + ewarn "allowed in .desktop files if the value is not an absolute path." + icon=${icon%.*} + fi + + cat <<-EOF > "${desktop}" + [Desktop Entry] + Name=${name} + Type=Application + Comment=${DESCRIPTION} + Exec=${exec} + TryExec=${exec%% *} + Icon=${icon} + Categories=${type} + EOF + + if [[ ${fields:-=} != *=* ]] ; then + # 5th arg used to be value to Path= + ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}" + fields="Path=${fields}" + fi + [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}" + + ( + # wrap the env here so that the 'insinto' call + # doesn't corrupt the env of the caller + insinto /usr/share/applications + doins "${desktop}" + ) || die "installing desktop file failed" +} + +# @FUNCTION: make_session_desktop +# @USAGE: <title> <command> [command args...] +# @DESCRIPTION: +# Make a GDM/KDM Session file. The title is the file to execute to start the +# Window Manager. The command is the name of the Window Manager. +# +# You can set the name of the file via the ${wm} variable. +make_session_desktop() { + [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1 + [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1 + + local title=$1 + local command=$2 + local desktop=${T}/${wm:-${PN}}.desktop + shift 2 + + cat <<-EOF > "${desktop}" + [Desktop Entry] + Name=${title} + Comment=This session logs you into ${title} + Exec=${command} $* + TryExec=${command} + Type=XSession + EOF + + ( + # wrap the env here so that the 'insinto' call + # doesn't corrupt the env of the caller + insinto /usr/share/xsessions + doins "${desktop}" + ) +} + +# @FUNCTION: domenu +# @USAGE: <menus> +# @DESCRIPTION: +# Install the list of .desktop menu files into the appropriate directory +# (/usr/share/applications). +domenu() { + ( + # wrap the env here so that the 'insinto' call + # doesn't corrupt the env of the caller + local i j ret=0 + insinto /usr/share/applications + for i in "$@" ; do + if [[ -f ${i} ]] ; then + doins "${i}" + ((ret+=$?)) + elif [[ -d ${i} ]] ; then + for j in "${i}"/*.desktop ; do + doins "${j}" + ((ret+=$?)) + done + else + ((++ret)) + fi + done + exit ${ret} + ) +} + +# @FUNCTION: newmenu +# @USAGE: <menu> <newname> +# @DESCRIPTION: +# Like all other new* functions, install the specified menu as newname. +newmenu() { + ( + # wrap the env here so that the 'insinto' call + # doesn't corrupt the env of the caller + insinto /usr/share/applications + newins "$@" + ) +} + +# @FUNCTION: _iconins +# @INTERNAL +# @DESCRIPTION: +# function for use in doicon and newicon +_iconins() { + ( + # wrap the env here so that the 'insinto' call + # doesn't corrupt the env of the caller + local funcname=$1; shift + local size dir + local context=apps + local theme=hicolor + + while [[ $# -gt 0 ]] ; do + case $1 in + -s|--size) + if [[ ${2%%x*}x${2%%x*} == "$2" ]] ; then + size=${2%%x*} + else + size=${2} + fi + case ${size} in + 16|22|24|32|36|48|64|72|96|128|192|256|512) + size=${size}x${size};; + scalable) + ;; + *) + eerror "${size} is an unsupported icon size!" + exit 1;; + esac + shift 2;; + -t|--theme) + theme=${2} + shift 2;; + -c|--context) + context=${2} + shift 2;; + *) + if [[ -z ${size} ]] ; then + insinto /usr/share/pixmaps + else + insinto /usr/share/icons/${theme}/${size}/${context} + fi + + if [[ ${funcname} == doicon ]] ; then + if [[ -f $1 ]] ; then + doins "${1}" + elif [[ -d $1 ]] ; then + shopt -s nullglob + doins "${1}"/*.{png,svg} + shopt -u nullglob + else + eerror "${1} is not a valid file/directory!" + exit 1 + fi + else + break + fi + shift 1;; + esac + done + if [[ ${funcname} == newicon ]] ; then + newins "$@" + fi + ) || die +} + +# @FUNCTION: doicon +# @USAGE: [options] <icons> +# @DESCRIPTION: +# Install icon into the icon directory /usr/share/icons or into +# /usr/share/pixmaps if "--size" is not set. +# This is useful in conjunction with creating desktop/menu files. +# +# @CODE +# options: +# -s, --size +# !!! must specify to install into /usr/share/icons/... !!! +# size of the icon, like 48 or 48x48 +# supported icon sizes are: +# 16 22 24 32 36 48 64 72 96 128 192 256 512 scalable +# -c, --context +# defaults to "apps" +# -t, --theme +# defaults to "hicolor" +# +# icons: list of icons +# +# example 1: doicon foobar.png fuqbar.svg suckbar.png +# results in: insinto /usr/share/pixmaps +# doins foobar.png fuqbar.svg suckbar.png +# +# example 2: doicon -s 48 foobar.png fuqbar.png blobbar.png +# results in: insinto /usr/share/icons/hicolor/48x48/apps +# doins foobar.png fuqbar.png blobbar.png +# @CODE +doicon() { + _iconins ${FUNCNAME} "$@" +} + +# @FUNCTION: newicon +# @USAGE: [options] <icon> <newname> +# @DESCRIPTION: +# Like doicon, install the specified icon as newname. +# +# @CODE +# example 1: newicon foobar.png NEWNAME.png +# results in: insinto /usr/share/pixmaps +# newins foobar.png NEWNAME.png +# +# example 2: newicon -s 48 foobar.png NEWNAME.png +# results in: insinto /usr/share/icons/hicolor/48x48/apps +# newins foobar.png NEWNAME.png +# @CODE +newicon() { + _iconins ${FUNCNAME} "$@" +} + +fi diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index f35fa5980d7a..7d4193e76b51 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -20,7 +20,7 @@ _EUTILS_ECLASS=1 # implicitly inherited (now split) eclasses case ${EAPI:-0} in 0|1|2|3|4|5|6) - inherit epatch estack ltprune multilib toolchain-funcs + inherit desktop epatch estack ltprune multilib toolchain-funcs ;; esac @@ -115,427 +115,6 @@ edos2unix() { sed -i 's/\r$//' -- "$@" || die } -# @FUNCTION: make_desktop_entry -# @USAGE: make_desktop_entry(<command>, [name], [icon], [type], [fields]) -# @DESCRIPTION: -# Make a .desktop file. -# -# @CODE -# binary: what command does the app run with ? -# name: the name that will show up in the menu -# icon: the icon to use in the menu entry -# this can be relative (to /usr/share/pixmaps) or -# a full path to an icon -# type: what kind of application is this? -# for categories: -# https://specifications.freedesktop.org/menu-spec/latest/apa.html -# if unset, function tries to guess from package's category -# fields: extra fields to append to the desktop file; a printf string -# @CODE -make_desktop_entry() { - [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable" - - local exec=${1} - local name=${2:-${PN}} - local icon=${3:-${PN}} - local type=${4} - local fields=${5} - - if [[ -z ${type} ]] ; then - local catmaj=${CATEGORY%%-*} - local catmin=${CATEGORY##*-} - case ${catmaj} in - app) - case ${catmin} in - accessibility) type="Utility;Accessibility";; - admin) type=System;; - antivirus) type=System;; - arch) type="Utility;Archiving";; - backup) type="Utility;Archiving";; - cdr) type="AudioVideo;DiscBurning";; - dicts) type="Office;Dictionary";; - doc) type=Documentation;; - editors) type="Utility;TextEditor";; - emacs) type="Development;TextEditor";; - emulation) type="System;Emulator";; - laptop) type="Settings;HardwareSettings";; - office) type=Office;; - pda) type="Office;PDA";; - vim) type="Development;TextEditor";; - xemacs) type="Development;TextEditor";; - esac - ;; - - dev) - type="Development" - ;; - - games) - case ${catmin} in - action|fps) type=ActionGame;; - arcade) type=ArcadeGame;; - board) type=BoardGame;; - emulation) type=Emulator;; - kids) type=KidsGame;; - puzzle) type=LogicGame;; - roguelike) type=RolePlaying;; - rpg) type=RolePlaying;; - simulation) type=Simulation;; - sports) type=SportsGame;; - strategy) type=StrategyGame;; - esac - type="Game;${type}" - ;; - - gnome) - type="Gnome;GTK" - ;; - - kde) - type="KDE;Qt" - ;; - - mail) - type="Network;Email" - ;; - - media) - case ${catmin} in - gfx) - type=Graphics - ;; - *) - case ${catmin} in - radio) type=Tuner;; - sound) type=Audio;; - tv) type=TV;; - video) type=Video;; - esac - type="AudioVideo;${type}" - ;; - esac - ;; - - net) - case ${catmin} in - dialup) type=Dialup;; - ftp) type=FileTransfer;; - im) type=InstantMessaging;; - irc) type=IRCClient;; - mail) type=Email;; - news) type=News;; - nntp) type=News;; - p2p) type=FileTransfer;; - voip) type=Telephony;; - esac - type="Network;${type}" - ;; - - sci) - case ${catmin} in - astro*) type=Astronomy;; - bio*) type=Biology;; - calc*) type=Calculator;; - chem*) type=Chemistry;; - elec*) type=Electronics;; - geo*) type=Geology;; - math*) type=Math;; - physics) type=Physics;; - visual*) type=DataVisualization;; - esac - type="Education;Science;${type}" - ;; - - sys) - type="System" - ;; - - www) - case ${catmin} in - client) type=WebBrowser;; - esac - type="Network;${type}" - ;; - - *) - type= - ;; - esac - fi - local slot=${SLOT%/*} - if [[ ${slot} == "0" ]] ; then - local desktop_name="${PN}" - else - local desktop_name="${PN}-${slot}" - fi - local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" - #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop - - # Don't append another ";" when a valid category value is provided. - type=${type%;}${type:+;} - - if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then - ewarn "As described in the Icon Theme Specification, icon file extensions are not" - ewarn "allowed in .desktop files if the value is not an absolute path." - icon=${icon%.*} - fi - - cat <<-EOF > "${desktop}" - [Desktop Entry] - Name=${name} - Type=Application - Comment=${DESCRIPTION} - Exec=${exec} - TryExec=${exec%% *} - Icon=${icon} - Categories=${type} - EOF - - if [[ ${fields:-=} != *=* ]] ; then - # 5th arg used to be value to Path= - ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}" - fields="Path=${fields}" - fi - [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}" - - ( - # wrap the env here so that the 'insinto' call - # doesn't corrupt the env of the caller - insinto /usr/share/applications - doins "${desktop}" - ) || die "installing desktop file failed" -} - -# @FUNCTION: _eutils_eprefix_init -# @INTERNAL -# @DESCRIPTION: -# Initialized prefix variables for EAPI<3. -_eutils_eprefix_init() { - has "${EAPI:-0}" 0 1 2 && : ${ED:=${D}} ${EPREFIX:=} ${EROOT:=${ROOT}} -} - -# @FUNCTION: validate_desktop_entries -# @USAGE: [directories] -# @DESCRIPTION: -# Validate desktop entries using desktop-file-utils -validate_desktop_entries() { - eqawarn "validate_desktop_entries is deprecated and should be not be used." - eqawarn ".desktop file validation is done implicitly by Portage now." - - _eutils_eprefix_init - if [[ -x "${EPREFIX}"/usr/bin/desktop-file-validate ]] ; then - einfo "Checking desktop entry validity" - local directories="" - for d in /usr/share/applications $@ ; do - [[ -d ${ED}${d} ]] && directories="${directories} ${ED}${d}" - done - if [[ -n ${directories} ]] ; then - for FILE in $(find ${directories} -name "*\.desktop" \ - -not -path '*.hidden*' | sort -u 2>/dev/null) - do - local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \ - sed -e "s|error: ||" -e "s|${FILE}:|--|g" ) - [[ -n $temp ]] && elog ${temp/--/${FILE/${ED}/}:} - done - fi - echo "" - else - einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo." - fi -} - -# @FUNCTION: make_session_desktop -# @USAGE: <title> <command> [command args...] -# @DESCRIPTION: -# Make a GDM/KDM Session file. The title is the file to execute to start the -# Window Manager. The command is the name of the Window Manager. -# -# You can set the name of the file via the ${wm} variable. -make_session_desktop() { - [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1 - [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1 - - local title=$1 - local command=$2 - local desktop=${T}/${wm:-${PN}}.desktop - shift 2 - - cat <<-EOF > "${desktop}" - [Desktop Entry] - Name=${title} - Comment=This session logs you into ${title} - Exec=${command} $* - TryExec=${command} - Type=XSession - EOF - - ( - # wrap the env here so that the 'insinto' call - # doesn't corrupt the env of the caller - insinto /usr/share/xsessions - doins "${desktop}" - ) -} - -# @FUNCTION: domenu -# @USAGE: <menus> -# @DESCRIPTION: -# Install the list of .desktop menu files into the appropriate directory -# (/usr/share/applications). -domenu() { - ( - # wrap the env here so that the 'insinto' call - # doesn't corrupt the env of the caller - local i j ret=0 - insinto /usr/share/applications - for i in "$@" ; do - if [[ -f ${i} ]] ; then - doins "${i}" - ((ret+=$?)) - elif [[ -d ${i} ]] ; then - for j in "${i}"/*.desktop ; do - doins "${j}" - ((ret+=$?)) - done - else - ((++ret)) - fi - done - exit ${ret} - ) -} - -# @FUNCTION: newmenu -# @USAGE: <menu> <newname> -# @DESCRIPTION: -# Like all other new* functions, install the specified menu as newname. -newmenu() { - ( - # wrap the env here so that the 'insinto' call - # doesn't corrupt the env of the caller - insinto /usr/share/applications - newins "$@" - ) -} - -# @FUNCTION: _iconins -# @INTERNAL -# @DESCRIPTION: -# function for use in doicon and newicon -_iconins() { - ( - # wrap the env here so that the 'insinto' call - # doesn't corrupt the env of the caller - local funcname=$1; shift - local size dir - local context=apps - local theme=hicolor - - while [[ $# -gt 0 ]] ; do - case $1 in - -s|--size) - if [[ ${2%%x*}x${2%%x*} == "$2" ]] ; then - size=${2%%x*} - else - size=${2} - fi - case ${size} in - 16|22|24|32|36|48|64|72|96|128|192|256|512) - size=${size}x${size};; - scalable) - ;; - *) - eerror "${size} is an unsupported icon size!" - exit 1;; - esac - shift 2;; - -t|--theme) - theme=${2} - shift 2;; - -c|--context) - context=${2} - shift 2;; - *) - if [[ -z ${size} ]] ; then - insinto /usr/share/pixmaps - else - insinto /usr/share/icons/${theme}/${size}/${context} - fi - - if [[ ${funcname} == doicon ]] ; then - if [[ -f $1 ]] ; then - doins "${1}" - elif [[ -d $1 ]] ; then - shopt -s nullglob - doins "${1}"/*.{png,svg} - shopt -u nullglob - else - eerror "${1} is not a valid file/directory!" - exit 1 - fi - else - break - fi - shift 1;; - esac - done - if [[ ${funcname} == newicon ]] ; then - newins "$@" - fi - ) || die -} - -# @FUNCTION: doicon -# @USAGE: [options] <icons> -# @DESCRIPTION: -# Install icon into the icon directory /usr/share/icons or into -# /usr/share/pixmaps if "--size" is not set. -# This is useful in conjunction with creating desktop/menu files. -# -# @CODE -# options: -# -s, --size -# !!! must specify to install into /usr/share/icons/... !!! -# size of the icon, like 48 or 48x48 -# supported icon sizes are: -# 16 22 24 32 36 48 64 72 96 128 192 256 512 scalable -# -c, --context -# defaults to "apps" -# -t, --theme -# defaults to "hicolor" -# -# icons: list of icons -# -# example 1: doicon foobar.png fuqbar.svg suckbar.png -# results in: insinto /usr/share/pixmaps -# doins foobar.png fuqbar.svg suckbar.png -# -# example 2: doicon -s 48 foobar.png fuqbar.png blobbar.png -# results in: insinto /usr/share/icons/hicolor/48x48/apps -# doins foobar.png fuqbar.png blobbar.png -# @CODE -doicon() { - _iconins ${FUNCNAME} "$@" -} - -# @FUNCTION: newicon -# @USAGE: [options] <icon> <newname> -# @DESCRIPTION: -# Like doicon, install the specified icon as newname. -# -# @CODE -# example 1: newicon foobar.png NEWNAME.png -# results in: insinto /usr/share/pixmaps -# newins foobar.png NEWNAME.png -# -# example 2: newicon -s 48 foobar.png NEWNAME.png -# results in: insinto /usr/share/icons/hicolor/48x48/apps -# newins foobar.png NEWNAME.png -# @CODE -newicon() { - _iconins ${FUNCNAME} "$@" -} - # @FUNCTION: strip-linguas # @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>] # @DESCRIPTION: @@ -585,6 +164,14 @@ strip-linguas() { export LINGUAS=${newls:1} } +# @FUNCTION: _eutils_eprefix_init +# @INTERNAL +# @DESCRIPTION: +# Initialized prefix variables for EAPI<3. +_eutils_eprefix_init() { + has "${EAPI:-0}" 0 1 2 && : ${ED:=${D}} ${EPREFIX:=} ${EROOT:=${ROOT}} +} + # @FUNCTION: preserve_old_lib # @USAGE: <libs to preserve> [more libs] # @DESCRIPTION: @@ -869,10 +456,6 @@ optfeature() { fi } -check_license() { - die "you no longer need this as portage supports ACCEPT_LICENSE itself" -} - case ${EAPI:-0} in 0|1|2) diff --git a/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild b/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild index 3935f773006c..de870f58b17f 100644 --- a/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild +++ b/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://kmplayer.kde.org" SRC_URI="mirror://kde/stable/${PN}/${EGIT_BRANCH}/${P}.tar.bz2" LICENSE="GPL-2 FDL-1.2 LGPL-2.1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="cairo npp" CDEPEND=" diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest index a266e7fa908d..92ad5d6b79a8 100644 --- a/net-analyzer/nagios-plugin-check_raid/Manifest +++ b/net-analyzer/nagios-plugin-check_raid/Manifest @@ -1,4 +1,5 @@ -DIST nagios-plugin-check_raid-02b6425dac3db7e98d4c36bf0836357c6b36196c.tar.gz 49866 SHA256 959e269e58795cf89fab61b041511513d1b724855f1d38338f1f5e4e1083a8a7 SHA512 548241cd344c135dd6509e930329a9957184330a6f317f758a35c32fc680d421932e3daa12a8f7c0ec8071f96f9e63619de4dff2ea648652b6c2494e800d7ed4 WHIRLPOOL cd00353df2c133576e36f8fe204e11fb754fed081565d87b305905b0ee2a1e6c652f11a9bb99769e1467e838711583886dfe9ecfeb3c40c566069ce07af84cd0 -DIST nagios-plugin-check_raid-4.0.0.tar.gz 46308 SHA256 eb33c54b6c532076dafe72bc80905c17d1604fc306f5075b6fdc6cf41dcd8ac2 SHA512 0f80321615a29665c32bef8b5426fad5994c28b48446167d81504b8ae5720c28b9eaf449f48147e5fc7b24907560994d61b81bed68f9b8caa9a87b18eddd9ee9 WHIRLPOOL 8af62afd9eff172ab4e24bbde564c52826390ad40130ae091d62c10634e0313cb55f39e163988349015694389c152a6e4930c84ebd230ac3686a59e8b6ca56b9 -DIST nagios-plugin-check_raid-4.0.1.tar.gz 50173 SHA256 270fd6c8189269152255ceb19288736afe4b9398b1a9a94409e2c73f13fa43d3 SHA512 882d76d71231d675caaf75883962c3983acbec194ee437ee7447f75607b1767e3aed3e939bdafb90cfab5d131c40d3e0b1d77b90a4c19a4809f18c9e64c114fd WHIRLPOOL bb9b31925a9977de4393bb4f949ac6ec281144e8d6c25ee33e14002bac546b3f2b89cf3a9c84a208d7505d1e1378bd19805ebd018d639c595c1b6fd7a67f0750 -DIST nagios-plugin-check_raid-5da4400ff978189d6be889f2448099535baa01f4.tar.gz 46422 SHA256 423da601fa7471dda5db839a07a52ce21e33ec00e09ad859f4fac4705f6bad18 SHA512 4c4d372735576cf104886c62c071dc98512687ecc1b2f3d56f614c24b747566ff849119c3e0a71b011db5a32e67f50c9d772c0c68a895320e0a5b63322cf6446 WHIRLPOOL 791836ab95edc679cd2288ba9231c4eccddd1d7a09cca68ce446fde498503942a040d48862f4157ebe1b83f645d31b77f7a7a6785095d3e4a5a7a40f56dd56c4 +DIST nagios-plugin-check_raid-02b6425dac3db7e98d4c36bf0836357c6b36196c.tar.gz 49866 BLAKE2B 067097f4aae85615e85e5481c3c3a5e6f6f3ce61056c61f59e5c6febca3f84e697999dad87626aaae04f853ade9efbd07d17c61c933fafd9252ee8d372a4cfc7 SHA512 548241cd344c135dd6509e930329a9957184330a6f317f758a35c32fc680d421932e3daa12a8f7c0ec8071f96f9e63619de4dff2ea648652b6c2494e800d7ed4 +DIST nagios-plugin-check_raid-4.0.0.tar.gz 46308 BLAKE2B 025f983416ef5b1340fe2c3c1b4aa8784be23201ebdbf2ab9ed7c4e885c91b992d523ab26d7aed42cb9df44f7ab890034a968ee60e7d928311c99021ab10abb4 SHA512 0f80321615a29665c32bef8b5426fad5994c28b48446167d81504b8ae5720c28b9eaf449f48147e5fc7b24907560994d61b81bed68f9b8caa9a87b18eddd9ee9 +DIST nagios-plugin-check_raid-4.0.1.tar.gz 50173 BLAKE2B 35831f0511fc71b883919303f534bb9c4760160031ff62beff6d5eedea44f1f058bd80bfe770585e2f256b1ba8e53e2708808fdc420d3bb8ca95941f73c5ab40 SHA512 882d76d71231d675caaf75883962c3983acbec194ee437ee7447f75607b1767e3aed3e939bdafb90cfab5d131c40d3e0b1d77b90a4c19a4809f18c9e64c114fd +DIST nagios-plugin-check_raid-4.0.2.tar.gz 50680 BLAKE2B f483876d3c7f7ec5d266d1cd22eddb50534505caa90d0715325148f6314e54aa83e4b42ad4ec8d7edcfed6c640af7e6f86f1f93314d92de39b02b67598f82339 SHA512 b02f32c91eb6bf54f4bd66cb57bf3d43b5f89320be095fcf31b224865f04f24c91245be2afee5ff8588757ff75462e62e1d89ef824e6fbe4d3f90d4a015e0ba3 +DIST nagios-plugin-check_raid-5da4400ff978189d6be889f2448099535baa01f4.tar.gz 46422 BLAKE2B a6049f58a4ff50bf86f85c6d8f35ffbc19a1a6ba6dccfb275bc59ea6e15635b8c8c001d5fbda6030f75adea78fb75dbb7e83628c73f9af76291c3547f64a1ee7 SHA512 4c4d372735576cf104886c62c071dc98512687ecc1b2f3d56f614c24b747566ff849119c3e0a71b011db5a32e67f50c9d772c0c68a895320e0a5b63322cf6446 diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild new file mode 100644 index 000000000000..45d59e9956e9 --- /dev/null +++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils perl-module + +DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" +HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" +#COMMIT="" +MY_PV="${COMMIT:-$PV}" +MY_P="${PN}-${MY_PV}" +SRC_URI="${HOMEPAGE}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="3ware aacraid dmraid hpa hpsa i2o megaraid-sas megaraid-scsi mpt mpt-sas2" + +DEPEND="dev-perl/Monitoring-Plugin + dev-perl/Module-Pluggable" +RDEPEND="${DEPEND} + sys-apps/smartmontools + sys-fs/lsscsi + 3ware? ( sys-block/tw_cli ) + aacraid? ( sys-block/arcconf ) + dmraid? ( sys-fs/dmraid ) + hpa? ( sys-block/hpacucli ) + hpsa? ( sys-apps/cciss_vol_status ) + i2o? ( sys-apps/raidutils ) + megaraid-sas? ( sys-block/megacli ) + megaraid-scsi? ( sys-block/megarc ) + mpt-sas2? ( sys-block/sas2ircu ) + mpt? ( sys-block/mpt-status ) + " + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # Upstream has a custom Makefile that is meant to build bundles. + mv -f Makefile Makefile.upstream + sed -i '/CPANfile/d' Makefile.PL + default +} + +src_install() { + default + plugindir="/usr/$(get_libdir)/nagios/plugins" + dodir "$plugindir" + mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}" + dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg +} + +pkg_postinst() { + einfo "The following RAID controllers are supported without special tools:" + einfo "GDT (Intel/ICP) RAID Controller" + einfo "HP MSA (special configuration needed)" + einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:" + einfo "Intel: CmdTool2" + einfo "Areca: areca-cli" + einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10" + einfo "Marvell RAID: mvcli" + einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92" + einfo "Adaptec ServeRAID: aaccli" + einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)" + einfo "Adaptec ServeRAID 7k: ipssend" +} diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest index b72cf6904af4..1dc776ef4be3 100644 --- a/net-dns/nsd/Manifest +++ b/net-dns/nsd/Manifest @@ -1,2 +1,3 @@ DIST nsd-4.1.16.tar.gz 1088633 SHA256 7f8367ad23cc5cddffa885e7e2f549123c8b4123db9726df41d99f255d6baab2 SHA512 51135bbf412cdc5d6d9be02af9fef16513f0529155c102debfd6bd68b025d289c684777a8fca57de86b25f68bc94aef89d2cfefb871b8d63048d262f6c8eb8e3 WHIRLPOOL 030da2551abef8cb29e16574155605eb9377836f1a43422e200ba5bc6ede319893d4293018cf0be242d1ac0cfad4c3b40f566c7ad587792186c64102d8c9785f DIST nsd-4.1.17.tar.gz 1089526 SHA256 107fa506d18ed6fd0a922d1b96774afd9270ec38ec6b17cd7c46fb9433a03a6c SHA512 4cffa261b1832d0daac095e92542359ffd725918f07ec605c78a9346b1cf4a4bc21bdc59ab388eb7324a170bbd8b122cfa75e7448015b38572b47d18add24a8f WHIRLPOOL c8892dca5f5c625d435cfde3f556ccc7518f3e37b7242892f9c101f4ffa5da1a2ea09083a30942bb1dad91ab70b40b2647339b2a4988f08478db9b6dd2b1c3df +DIST nsd-4.1.18.tar.gz 1095673 BLAKE2B e3dc86e64614323dbefb334769a8095dc674f422f8e62c91e2918f4622ceac0ebef7dec42d5a714b15ad2f3af368ba817239a0027d3a685abf603cf00e9fa9d1 SHA512 d9939b8813677127ccd3e87e709b27a8a4f96cc0221ab77563d9349cb6dd56ae39bb7349ede9aed9aaa07de9310bcaeb8be8b17f608e9c4714b4fb084f2e756f diff --git a/net-dns/nsd/nsd-4.1.18.ebuild b/net-dns/nsd/nsd-4.1.18.ebuild new file mode 100644 index 000000000000..4a7e4dbabe2b --- /dev/null +++ b/net-dns/nsd/nsd-4.1.18.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit user systemd + +# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1 +MY_PV="${PV/_rc/rc}" +MY_PV="${MY_PV/_beta/b}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="An authoritative only, high performance, open source name server" +HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" +SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl" + +S="${WORKDIR}/${MY_P}" + +RDEPEND=" + virtual/yacc + libevent? ( dev-libs/libevent ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + munin? ( net-analyzer/munin ) +" +DEPEND=" + ${RDEPEND} + sys-devel/flex +" + +src_prepare() { + # Fix the paths in the munin plugin to match our install + eapply "${FILESDIR}"/nsd_munin_.patch + eapply_user +} + +src_configure() { + local myeconfargs=( + --enable-pie + --enable-relro-now + --enable-largefile + --with-logfile="${EPREFIX}"/var/log/nsd.log + --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid + --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db + --with-xfrdir="${EPREFIX}"/var/db/nsd + --with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state + --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list + --with-zonesdir="${EPREFIX}"/var/lib/nsd + $(use_enable bind8-stats) + $(use_enable bind8-stats zone-stats) + $(use_enable ipv6) + $(use_enable minimal-responses) + $(use_enable mmap) + $(use_enable nsec3) + $(use_enable ratelimit) + $(use_enable root-server) + $(use_enable runtime-checks checking) + $(use_with libevent) + $(use_with ssl) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS} + + newinitd "${FILESDIR}"/nsd.initd-r1 nsd + + # install munin plugin and config + if use munin ; then + exeinto /usr/libexec/munin/plugins + doexe contrib/nsd_munin_ + insinto /etc/munin/plugin-conf.d + newins "${FILESDIR}"/nsd.munin-conf nsd_munin + fi + + systemd_dounit "${FILESDIR}"/nsd.service + + # remove the /run directory that usually resides on tmpfs and is + # being taken care of by the nsd init script anyway (checkpath) + rm -r "${ED%/}"/run || die "Failed to remove /run" +} + +pkg_postinst() { + # Do this in postinst to ensure the uid/gid is consistent for binpkgs + enewgroup nsd + enewuser nsd -1 -1 -1 nsd + + # database directory, writable by nsd for database updates and zone transfers + install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/db/nsd + + # zones directory, writable by nsd for zone file updates (nsd-control write) + install -d -m 750 -o nsd -g nsd "${EROOT%/}"/var/lib/nsd +} diff --git a/net-dns/pdns-recursor/pdns-recursor-4.1.0_rc3-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.1.0_rc3-r1.ebuild index 2e5354ed1161..224ae2f7537a 100644 --- a/net-dns/pdns-recursor/pdns-recursor-4.1.0_rc3-r1.ebuild +++ b/net-dns/pdns-recursor/pdns-recursor-4.1.0_rc3-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="libressl luajit protobuf sodium systemd" +IUSE="libressl luajit protobuf snmp sodium systemd" DEPEND="!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:= ) @@ -21,6 +21,7 @@ DEPEND="!luajit? ( >=dev-lang/lua-5.1:= ) >=dev-libs/boost-1.42:= ) systemd? ( sys-apps/systemd:0= ) + snmp? ( net-analyzer/net-snmp ) sodium? ( dev-libs/libsodium:= ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) @@ -47,7 +48,8 @@ src_configure() { $(use_enable sodium libsodium) \ $(use_with !luajit lua) \ $(use_with luajit luajit) \ - $(use_with protobuf) + $(use_with protobuf) \ + $(use_with snmp net-snmp) } src_install() { diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest index 4c737523b836..5f74be659aa6 100644 --- a/net-dns/pdns/Manifest +++ b/net-dns/pdns/Manifest @@ -1,3 +1,3 @@ DIST pdns-4.0.4.tar.bz2 1320327 BLAKE2B 5c11a0245408f8448b41ed4229718e6f7244e0c8f36b60b07c280f82c7dea0065cce93c3814b3a396666be8d3b012ad4eb646cf55f531d22ce325190e0fd6e22 SHA512 4ef4705cd990b03976775167c7c37850d45907e198549feda5f5701172e008e3f1f74a35a9bebdb24b63dec15ff63cb2cc9dfc8f92e4e1012e0539c5a88b845b DIST pdns-4.0.5.tar.bz2 1323468 BLAKE2B 7e10cc98177bfa4f81888e2598ab4f0ce83ee45e6349372c065940424a74015302da879536dea8346fe7b86f35c0524a5449489bdf71d1a091b7c6a82fac4b6f SHA512 4b0fa932c1d9caf35b988916447aa21c64ebe2a58bdd84417cf09321a21b264cf1057206dc6993a45a3b591eb1dfa49463710c06b6bdfaf6fb17ae6dec6086d9 -DIST pdns-4.1.0-rc3.tar.bz2 1112366 BLAKE2B 8ac9d351ffee81a859b68bc66e989ce4c91804ab134ada3e090aed982df31191f5bfc83f7174873ab34b2a1b6be21f2c938874d94ea0e166b060453b746eec13 SHA512 19485bf95a68cbe2ac4cc826b44c3a8670f66cedc2ab426c589a3f67d96f70bd6dd297bd95301c29cda10ff9a7e429fa702bdc7368ce08862140d7097013ea7f +DIST pdns-4.1.0.tar.bz2 1116905 BLAKE2B 91ec0f0cfa70966ff71dfb6302ed01355120ca1429d3c610c4abfb1b964cff78a6332700991bc259387e9095be03d3850da41750e93bb3ffe3db0e23562d156c SHA512 4b2b42f4893f8aac3cf07a6c8a3c999cb728a5907a710f1a5c9c8d08377ecb63e202e5eececbefc069c8f1d97a29b2aa607da7cf2bcc6335a72222418e409e77 diff --git a/net-dns/pdns/metadata.xml b/net-dns/pdns/metadata.xml index 264c58531540..03c68c6fd102 100644 --- a/net-dns/pdns/metadata.xml +++ b/net-dns/pdns/metadata.xml @@ -18,6 +18,7 @@ standards documents. Furthermore, PowerDNS interfaces with almost any database. <flag name="opendbx">Use a database supported by <pkg>dev-db/opendbx</pkg> as backend.</flag> <flag name="protobuf">Enable support for <pkg>dev-libs/protobuf</pkg>.</flag> <flag name="remote">Use a generic socket or pipe as a backend (via JSON RPC requests).</flag> + <flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag> <flag name="tinydns">Use a TinyDNS CDB database as backend.</flag> <flag name="tools">Build optional tools (dnsscan, dnsscope, etc..).</flag> </use> diff --git a/net-dns/pdns/pdns-4.1.0_rc3-r1.ebuild b/net-dns/pdns/pdns-4.1.0.ebuild index 06d462d4a735..476a969f8a9a 100644 --- a/net-dns/pdns/pdns-4.1.0_rc3-r1.ebuild +++ b/net-dns/pdns/pdns-4.1.0.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" # oracle: dito (need Oracle Client Libraries) # xdb: (almost) dead, surely not supported -IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sqlite systemd tools tinydns test" +IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sodium sqlite systemd tools tinydns test" REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )" @@ -35,6 +35,7 @@ RDEPEND=" sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip ) + sodium? ( dev-libs/libsodium:= ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )" DEPEND="${RDEPEND} @@ -43,10 +44,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${P/_/-} -PATCHES=( - "${FILESDIR}"/CVE-2017-15091-4.0.4.patch -) - src_configure() { local dynmodules="pipe bind" # the default backends, always enabled @@ -76,6 +73,7 @@ src_configure() { $(use_enable test unit-tests) \ $(use_enable tools) \ $(use_enable systemd) \ + $(use_enable sodium libsodium) \ $(use_with lua) \ $(use_with luajit) \ $(use_with protobuf) \ diff --git a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild index fe116123a3ea..2508a0f3c6e2 100644 --- a/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-0.9.7-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm x86" IUSE="debug farstream test" RDEPEND=" diff --git a/net-misc/quagga/quagga-1.2.2.ebuild b/net-misc/quagga/quagga-1.2.2.ebuild index 6d6d1b750fcb..0b061a38a75e 100644 --- a/net-misc/quagga/quagga-1.2.2.ebuild +++ b/net-misc/quagga/quagga-1.2.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc x86" IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra" diff --git a/net-misc/remmina/remmina-1.2.0_rc24.ebuild b/net-misc/remmina/remmina-1.2.0_rc24.ebuild index e0491b743f19..6e63be10d66e 100644 --- a/net-misc/remmina/remmina-1.2.0_rc24.ebuild +++ b/net-misc/remmina/remmina-1.2.0_rc24.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="ayatana crypt rdp gnome-keyring nls spice ssh telepathy vnc zeroconf" CDEPEND=" diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask index 6272cc052145..118c3436da94 100644 --- a/profiles/arch/x86/use.stable.mask +++ b/profiles/arch/x86/use.stable.mask @@ -4,11 +4,6 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask -# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017) -# Mask python targets until dev-lang/python is stable. -python_single_target_python3_6 -python_targets_python3_6 - # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017) # Not yet stable. elogind diff --git a/profiles/base/use.mask b/profiles/base/use.mask index 6d7e7b6148f8..16f1aefe03c2 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -50,10 +50,6 @@ audacious # postgres-9.2 is EOL and masked postgres_targets_postgres9_2 -# Brian Evans <grknight@gentoo.org> (14 Aug 2017) -# php 7.2 beta is masked for initial testing -php_targets_php7-2 - # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017) # Unkeyworded on most arches, unmasked in supported arch profiles. elogind diff --git a/profiles/package.mask b/profiles/package.mask index f6da8a489870..13ff27ebfcb1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -483,11 +483,6 @@ app-xemacs/xemacs-packages-all # See: https://github.com/perl5-dbi/DBD-mysql/issues/117 =dev-perl/DBD-mysql-4.42.0 -# Brian Evans <grknight@gentoo.org> (21 Jul 2017) -# Mask initial beta of PHP 7.2 for further testing ->=dev-lang/php-7.2.0_beta1 -=virtual/httpd-php-7.2 - # Mikhail Pukhlikov <cynede@gentoo.org> (20 Jul 2017) # Old mono/dotnet packages (used on GNOME2 stack) # also some deprecated forks used for monodevelop diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index bbf2cf7cc022..cdaa5f6573f5 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,4 +1,3 @@ DIST openrc-0.28.tar.gz 224228 BLAKE2B 6f4693003aba77148bb5ed3516c1372e3ca67364a25d866fce418ba6a287a8cc0c33534cbe1edcdab32a869f8f8dc72819fb2dffc46375bca1e053fb3acf415b SHA512 a10c293bf4287bcc4ffb9c996cbc1294f979483ea9fb2efb0dd1becee193f49ff114530c078850e8c11cf2c0a812be2e74801352fdbfe313b90cd9af5b8ccf93 DIST openrc-0.32.1.tar.gz 223808 BLAKE2B 4aadd36e371de56d5c2b59597ab04c1b004be73e370fa00560b77ab0587ba49fb4a49608aba4ad85ed7279eadf54e023961e25784e3078edeed4891956995f38 SHA512 9cd48978fcd69a6d80b474a06b56550cc8c538d6d7a1cb6f88b90087593eebb8185ee5192ec05be2f87f61de53dbe6ded9058aee7ae8f806bb0d7d7da70f62d8 -DIST openrc-0.34.10.tar.gz 227909 BLAKE2B 7f9ca169d03c785d7629d227023f947dd3a70a420ff8043ece075924ea5a7d803c78572cef1e5310dbda44c1b905a681301493785137acb9bdbd8a21ccf44093 SHA512 7df66a9e7aeeecb9109e4231e4be4e42cca8e9ad77486cace3a4969af1e4d0bac2522cf832a40990e81e0022598732cd12f07e55f21e576af07144fae538df6f DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be diff --git a/sys-apps/openrc/openrc-0.34.10.ebuild b/sys-apps/openrc/openrc-0.34.10.ebuild deleted file mode 100644 index fd5ba4f6e238..000000000000 --- a/sys-apps/openrc/openrc-0.34.10.ebuild +++ /dev/null @@ -1,329 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic pam toolchain-funcs - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="https://github.com/openrc/openrc/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs - unicode kernel_linux kernel_FreeBSD" - -COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - ncurses? ( sys-libs/ncurses:0= ) - pam? ( - sys-auth/pambase - virtual/pam - ) - audit? ( sys-process/audit ) - kernel_linux? ( - sys-process/psmisc - !<sys-process/procps-3.3.9-r2 - ) - selinux? ( - sys-apps/policycoreutils - >=sys-libs/libselinux-2.6 - ) - !<sys-apps/baselayout-2.1-r1 - !<sys-fs/udev-init-scripts-27" -DEPEND="${COMMON_DEPEND} - virtual/os-headers - ncurses? ( virtual/pkgconfig )" -RDEPEND="${COMMON_DEPEND} - !prefix? ( - kernel_linux? ( - >=sys-apps/sysvinit-2.86-r6[selinux?] - virtual/tmpfiles - ) - kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) - ) - selinux? ( - >=sec-policy/selinux-base-policy-2.20170204-r4 - >=sec-policy/selinux-openrc-2.20170204-r4 - ) -" - -PDEPEND="netifrc? ( net-misc/netifrc )" - -src_prepare() { - default - - sed -i 's:0444:0644:' mk/sys.mk || die - - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die - fi -} - -src_compile() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} - LIBNAME=$(get_libdir) - LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc - MKNET=$(usex newnet) - MKSELINUX=$(usex selinux) - MKAUDIT=$(usex audit) - MKPAM=$(usev pam) - MKSTATICLIBS=$(usex static-libs)" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - export BRANDING="Gentoo ${brand}" - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" - export DEBUG=$(usev debug) - export MKTERMCAP=$(usev ncurses) - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${ED}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} - -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - if ! use kernel_linux; then - keepdir /$(get_libdir)/rc/init.d - fi - keepdir /$(get_libdir)/rc/tmp - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die - rm -rf "${ED}"/etc/runlevels - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # install gentoo pam.d files - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon - newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon - - # install documentation - dodoc ChangeLog *.md - if use newnet; then - dodoc README.newnet - fi -} - -add_boot_init() { - local initd=$1 - local runlevel=${2:-boot} - # if the initscript is not going to be installed and is not - # currently installed, return - [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \ - || return - [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return - - # if runlevels dont exist just yet, then create it but still flag - # to pkg_postinst that it needs real setup #277323 - if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then - mkdir -p "${EROOT}"etc/runlevels/${runlevel} - touch "${EROOT}"etc/runlevels/.add_boot_init.created - fi - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} -} -add_boot_init_mit_config() { - local config=$1 initd=$2 - if [[ -e ${EROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then - add_boot_init ${initd} - fi - fi -} - -pkg_preinst() { - local f LIBDIR=$(get_libdir) - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${EROOT}"etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin - - # termencoding was added in 0.2.1 and needed in boot - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding - - # swapfiles was added in 0.9.9 and needed in boot (february 2012) - has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles - - if ! has_version ">=sys-apps/openrc-0.11"; then - add_boot_init sysfs sysinit - fi - - if ! has_version ">=sys-apps/openrc-0.11.3" ; then - migrate_udev_mount_script - add_boot_init tmpfiles.setup boot - fi - - # these were added in 0.12. - if ! has_version ">=sys-apps/openrc-0.12"; then - add_boot_init loopback - add_boot_init tmpfiles.dev sysinit - - # ensure existing /etc/conf.d/net is not removed - # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier - # this needs to stay in openrc ebuilds for a long time. :( - # Added in 0.12. - if [[ -f "${EROOT}"etc/conf.d/net ]]; then - einfo "Modifying conf.d/net to keep it from being removed" - cat <<-EOF >>"${EROOT}"etc/conf.d/net - -# The network scripts are now part of net-misc/netifrc -# In order to avoid sys-apps/${P} from removing this file, this comment was -# added; you can safely remove this comment. Please see -# /usr/share/doc/netifrc*/README* for more information. -EOF - fi - fi - has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt - - if ! has_version ">=sys-apps/openrc-0.18.3"; then - add_boot_init mtab - if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then - ewarn "${EROOT}etc/mtab will be replaced with a" - ewarn "symbolic link to /proc/self/mounts on the next" - ewarn "reboot." - ewarn "Change the setting in ${EROOT}etc/conf.d/mtab" - ewarn "if you do not want this to happen." - fi - fi -} - -# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev. -migrate_udev_mount_script() { - if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \ - ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then - add_boot_init udev-mount sysinit - fi - return 0 -} - -pkg_postinst() { - local LIBDIR=$(get_libdir) - - # Make our runlevels if they don't exist - if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then - einfo "Copying across default runlevels" - cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc - rm -f "${EROOT}"etc/runlevels/.add_boot_init.created - else - if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${EROOT}"etc/runlevels/sysinit - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \ - "${EROOT}"etc/runlevels/sysinit - fi - if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${EROOT}"etc/runlevels/shutdown - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \ - "${EROOT}"etc/runlevels/shutdown - fi - if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \ - "${EROOT}"etc/runlevels - fi - fi - - if use hppa; then - elog "Setting the console font does not work on all HPPA consoles." - elog "You can still enable it by running:" - elog "# rc-update add consolefont boot" - fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" - elog "files to ${EROOT}etc/local.d" - mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start - mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop - chmod +x "${EROOT}"etc/local.d/*{start,stop} - fi - - if use kernel_linux && [[ "${EROOT}" = "/" ]]; then - if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then - ewarn "The dependency data could not be migrated to /run/openrc." - ewarn "This means you need to reboot your system." - fi - fi - - # update the dependency tree after touching all files #224171 - [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u - - if ! use newnet && ! use netifrc; then - ewarn "You have emerged OpenRc without network support. This" - ewarn "means you need to SET UP a network manager such as" - ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd," - ewarn "net-misc/NetworkManager, or net-vpn/badvpn." - ewarn "Or, you have the option of emerging openrc with the newnet" - ewarn "use flag and configuring /etc/conf.d/network and" - ewarn "/etc/conf.d/staticroute if you only use static interfaces." - ewarn - fi - - if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then - ewarn "Please add the network service to your boot runlevel" - ewarn "as soon as possible. Not doing so could leave you with a system" - ewarn "without networking." - ewarn - fi -} diff --git a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild index 4f16cb8b5d63..bc16de54bae7 100644 --- a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild +++ b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${MY_P}.tar.xz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 x86 ~x86-fbsd" IUSE="debug examples qt4" RDEPEND=" diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest index cf77e929e9bb..8a6626de11b6 100644 --- a/sys-block/fio/Manifest +++ b/sys-block/fio/Manifest @@ -1,2 +1,3 @@ -DIST fio-2.15.tar.bz2 545809 SHA256 60044f92cfbd2f656162864aae309ab88ff5983c2e49f4b9f8271c445852f5bd SHA512 fa3380031e6e0a597eb34e597af91efbc824a3d5753793fdb00cb10e693943e0358afaad9624eb4333e81182c94424a56fbd1d434eeff098dbf2fc4e19167db0 WHIRLPOOL 32215d63a373c88041d90c6d07d87f9b4e6d4070d1b263676a817dc9ddd8cb175cbbc25e8359cec956ea26a39f40c1cb501ba897475f628ce4f6a5502939239e -DIST fio-2.16.tar.bz2 558662 SHA256 7d8dd6897a5fa181b4b707ffb7b87306c23a5a99a3aefa1d6f510150302cb6ec SHA512 f71c8ab8423e82ceae160bae8c17ac1222c1b2dde2ccb1b2aedb2288e0eb60485f8e9f3908640d4f6cebf166a148f4ad64026c035381c5db5141bf3059349d75 WHIRLPOOL cdd11fd09dce3fec04b12f82fef6d53c8ae70623b35a39cbfe50039bf9be5d80e00715c58e9fa6dee67a471327bf6da7f741add880bfefa9eb26f432b265e9ac +DIST fio-2.15.tar.bz2 545809 BLAKE2B 163530097a6ff08016c977a328bc499d052c423890c8e7074bc91fb00b02b3d951dd0369ff772fa5f36a37e0b1b7d6b358c3df99bf70db9bec2bbc7f90eee596 SHA512 fa3380031e6e0a597eb34e597af91efbc824a3d5753793fdb00cb10e693943e0358afaad9624eb4333e81182c94424a56fbd1d434eeff098dbf2fc4e19167db0 +DIST fio-2.16.tar.bz2 558662 BLAKE2B cbc6e6000bd497fc92779c34688c0862f3adccd7c399ca5d4e4ce9ee9c40faddfec9b3fcca2fad2cd91ca00eee95c4a108273496c9e63db8017695ecf42d294d SHA512 f71c8ab8423e82ceae160bae8c17ac1222c1b2dde2ccb1b2aedb2288e0eb60485f8e9f3908640d4f6cebf166a148f4ad64026c035381c5db5141bf3059349d75 +DIST fio-3.2.tar.bz2 613565 BLAKE2B e721d698338dd8d2c6215780a2d9a10c643a5912d3c27b3e759b4c14585ae1afe4edab5bdc54df8cf19c6f3727f8f4b19ce9da3298a5f0ef3753a5d8f423f4ef SHA512 97ea5ed6587d1e7382a67ab7ad933b6e332ba84cb648d17dcebad3c95c9eb6b1c04a4537e3470f890607f2921da77fcd4e49079b8b78f2d15e9c199dab850d1e diff --git a/sys-block/fio/fio-3.2.ebuild b/sys-block/fio/fio-3.2.ebuild new file mode 100644 index 000000000000..66cacad7746c --- /dev/null +++ b/sys-block/fio/fio-3.2.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit eutils python-r1 toolchain-funcs + +MY_PV="${PV/_rc/-rc}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Jens Axboe's Flexible IO tester" +HOMEPAGE="http://brick.kernel.dk/snaps/" +SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib" +REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )" + +# GTK+:2 does not offer static libaries. +LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] ) + glusterfs? ( sys-cluster/glusterfs[static-libs(+)] ) + gtk? ( dev-libs/glib:2[static-libs(+)] ) + numa? ( sys-process/numactl[static-libs(+)] ) + rbd? ( sys-cluster/ceph[static-libs(+)] ) + rdma? ( + sys-fabric/libibverbs[static-libs(+)] + sys-fabric/librdmacm[static-libs(+)] + ) + zlib? ( sys-libs/zlib[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + gtk? ( x11-libs/gtk+:2 )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" +RDEPEND+=" + gnuplot? ( + sci-visualization/gnuplot + ${PYTHON_DEPS} + )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/fio-2.2.13-libmtd.patch +) + +src_prepare() { + sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die + + # Many checks don't have configure flags. + sed -i \ + -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ + -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \ + -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \ + configure || die + default +} + +src_configure() { + chmod g-w "${T}" + # not a real configure script + # TODO: pmem + set -- \ + ./configure \ + --disable-optimizations \ + --extra-cflags="${CFLAGS} ${CPPFLAGS}" \ + --cc="$(tc-getCC)" \ + --disable-pmem \ + $(usex glusterfs '' '--disable-gfapi') \ + $(usex gtk '--enable-gfio' '') \ + $(usex numa '' '--disable-numa') \ + $(usex rbd '' '--disable-rbd') \ + $(usex rdma '' '--disable-rdma') \ + $(usex static '--build-static' '') + echo "$@" + "$@" || die 'configure failed' +} + +src_compile() { + emake V=1 OPTFLAGS= +} + +src_install() { + emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man" + + if use gnuplot ; then + python_replicate_script \ + "${ED}/usr/bin/fio2gnuplot" \ + "${ED}/usr/bin/fiologparser_hist.py" \ + "${ED}/usr/bin/fio_latency2csv.py" \ + "${ED}/usr/bin/fiologparser.py" + else + rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die + rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die + rm "${ED}"/usr/share/fio/*.gpm || die + rmdir "${ED}"/usr/share/fio/ 2>/dev/null + fi + + # This tool has security/parallel issues -- it hardcodes /tmp/template.fio. + rm "${ED}"/usr/bin/genfio || die + + dodoc README REPORTING-BUGS HOWTO + docinto examples + dodoc examples/* +} diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest index 6497dd6a5ab0..6d2224b7b518 100644 --- a/sys-cluster/galera/Manifest +++ b/sys-cluster/galera/Manifest @@ -1,2 +1,3 @@ DIST galera-3-25.3.20.tar.gz 3319355 SHA256 aae9b44a7b06c0b0cd9e2f1b9bbaf9ca47c630076a6b7c66e8747e01fd343a64 SHA512 4531073bbd13542cf4b0ed06788ec0b857971bd2e0161b8df2d90072b134d5343216c012d2f712ff336209f6e34920e2aadf7b0f58f91d6ce365fb2b65ed7fbd WHIRLPOOL 9f311742a5d1a8b9550a971441bfb0f84b6876ff5d78740a22a06cf61ebd9a829a83706cb27b198be4e942d28c8a215ed29a3850f4ec72fa86266ccab534825f -DIST galera-3-25.3.21.tar.gz 3317865 SHA256 1035b8a62cd3695ab2af8c8f1be785942d68a07123bb9bc051b51fc4b5735904 SHA512 04f9a879c1c161c84dc74c002467e60739186d49746255f0f60ad090cf9c3ff778610a3cfc58896c73c244355baefdd65109df8538c010d7a749e9ee1e88e033 WHIRLPOOL 5c95658be7895d00c9b9cd4fbc870e439ede7c71f6ba685c60086c071154c1f7f5c0b412fc1ac0a95d5b32d2ffecb981ddbcb3147f15a5ba500bfd2c12ccab36 +DIST galera-3-25.3.21.tar.gz 3317865 BLAKE2B e3f1fec764c171615d0db3a0375bf660185c3271470a0f9114299cc0159bf43cce7bdf4ad85cfb8e7fcd3d50917846ed3ce0726a3a5e371439f5ca0a1b2d63d6 SHA512 04f9a879c1c161c84dc74c002467e60739186d49746255f0f60ad090cf9c3ff778610a3cfc58896c73c244355baefdd65109df8538c010d7a749e9ee1e88e033 +DIST galera-3-25.3.22.tar.gz 3320337 BLAKE2B f55ac3f5dc18bb5aa0cf5f3fd8eee4cc7697324d3c62902303b36311dac06042b5a497be4beba2a202865cdd5866d37ca74239014ec3c3960847fe9bb3bc873f SHA512 4367ed8b36013e2c68c90d91b83a1929aa602bf82447f9d2382a1ad56f287867da543cdd995ed5791a1ba60f891fbc380afe1ecec983c2184f2050a83eed0fed diff --git a/sys-cluster/galera/galera-25.3.22.ebuild b/sys-cluster/galera/galera-25.3.22.ebuild new file mode 100644 index 000000000000..2800a6fdeeb3 --- /dev/null +++ b/sys-cluster/galera/galera-25.3.22.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_P="${PN}-3-${PV}" + +inherit scons-utils toolchain-funcs user flag-o-matic +DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API" +HOMEPAGE="http://galeracluster.com" +SRC_URI="http://releases.galeracluster.com/${PN}-3/source/galera-3-${PV}.tar.gz" +LICENSE="GPL-2 BSD" + +SLOT="0" + +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" +IUSE="cpu_flags_x86_sse4_2 garbd test" + +CDEPEND=" + dev-libs/openssl:0= + >=dev-libs/boost-1.41:0= + " +DEPEND="${DEPEND} + ${CDEPEND} + dev-libs/check + >=sys-devel/gcc-4.4 + >=dev-cpp/asio-1.10.1[ssl] + " +#Run time only +RDEPEND="${CDEPEND}" + +S="${WORKDIR}/${MY_P}" +# Respect {C,LD}FLAGS. +PATCHES=( "${FILESDIR}/galera-3.15-strip-extra-cflags.patch" ) + +pkg_preinst() { + if use garbd ; then + enewgroup garbd + enewuser garbd -1 -1 -1 garbd + fi +} + +src_prepare() { + default + + # Remove bundled dev-cpp/asio + rm -r "${S}/asio" || die + + #Remove optional garbd daemon + if ! use garbd ; then + rm -r "${S}/garb" || die + fi +} + +src_configure() { + tc-export CC CXX + # Uses hardware specific code that seems to depend on SSE4.2 + if use cpu_flags_x86_sse4_2 ; then + append-cflags -msse4.2 + else + append-cflags -DCRC32C_NO_HARDWARE + fi + # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++, + # and -Wold-style-cast + MYSCONS=( + ssl=1 + tests=$(usex test 1 0) + strict_build_flags=0 + system_asio=1 + ) +} + +src_compile() { + escons --warn=no-missing-sconscript "${MYSCONS[@]}" +} + +src_install() { + dodoc scripts/packages/README scripts/packages/README-MySQL + if use garbd ; then + dobin garb/garbd + newconfd "${FILESDIR}/garb.cnf" garbd + newinitd "${FILESDIR}/garb.sh" garbd + doman man/garbd.8 + fi + exeinto /usr/$(get_libdir)/${PN} + doexe libgalera_smm.so +} diff --git a/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild index 6858e19c1868..145cbda2b612 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tg LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" IUSE="systemd rbd" RDEPEND=">=sys-fs/lvm2-2.02.45 diff --git a/sys-fs/udisks/udisks-2.7.4.ebuild b/sys-fs/udisks/udisks-2.7.4.ebuild index da67c255bedb..3b50a7ff88c9 100644 --- a/sys-fs/udisks/udisks-2.7.4.ebuild +++ b/sys-fs/udisks/udisks-2.7.4.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/${PN}/archive/${P}.tar.gz" LICENSE="GPL-2" SLOT="2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd" REQUIRED_USE="?? ( elogind systemd )" diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest index e9ab324aad77..c9083fe60359 100644 --- a/sys-kernel/ck-sources/Manifest +++ b/sys-kernel/ck-sources/Manifest @@ -26,6 +26,9 @@ DIST genpatches-4.14-2.extras.tar.xz 17480 BLAKE2B 16712b535d1548ad14e7c6b21a85f DIST genpatches-4.14-3.base.tar.xz 22980 BLAKE2B 1856fe273ec373a059be489157cc268f079e3b6fa552f948732aca985b6a039aed0bde1a6e7be64b2c964a4c8a8ee00e02a427a56f72d278e757b1ebae0fc477 SHA512 ad4d27211b69a184ec82f34167b38cf16bee96a6242201304c683aec6d29c3a829202f5ea4ef4a73504f5ff90db22f471bdbf8c643ebfd2c1789c510cd6dabb9 DIST genpatches-4.14-3.experimental.tar.xz 5180 BLAKE2B 8641931516f97fb88415f6d1496ec3c68efb75bd188f77746068e35d011f71c3ff7246dd2f427eed905ceb3db06327a31678179457280b2f82e7290d1821e4ab SHA512 cf8feb8cea668f2f94b85e211274a186631193f0f0ee2bc8d5c51e8b7a159d0ff9f79e484ca90163de44c1a024e973b69ac4d6730c7aae15c60bab44854c0db1 DIST genpatches-4.14-3.extras.tar.xz 17480 BLAKE2B 346a3292223a5e046c019a50cce2bf7fbc8f2ab08ac281e0a82e8fec32193750767653f93f2f3e314c749b24ba4da1c4fad0176ade5871b17377b238cf57522e SHA512 1116a712bf223d670eb5eb4f01ed8a916a362d0accb525d2a8fab5b8a4c1c27120a566add7b0ca2658833b4f802db83e094185ecdec4ad2b9d2e07dbfd0bcbd8 +DIST genpatches-4.14-4.base.tar.xz 87480 BLAKE2B 753bc9a5145ae32f1d4562862449f798ac9c78111819c7c279327039f74142fd0ae6955d559801736b6d2a0b074cae56d53226e5745cb8c85e76b0bd42ea0673 SHA512 8c0d8d864dea85f6730cc8c5bb1bcefefc8ef3ee5254ba62f0d4e90c5787ea6423988f4c303e0e32aa41fc9e5d4fc01103136556daa826a57403522066c3c949 +DIST genpatches-4.14-4.experimental.tar.xz 5184 BLAKE2B f1d9938a476a958a5fb42b60589234df5c85211b2ebfe59316dd32036ce2a93fdd405f02976ed8eb9312841a4853bac0baec4df52cfc09278b7cdd1fe76e0718 SHA512 85f3055ce8ee187fc7105bf338dc18fbbf02e9cec27aedec10a6fde4db89dec70e666e63dd24497decfefb4b1f59c74789079614025304df67484d80f81d7ede +DIST genpatches-4.14-4.extras.tar.xz 17488 BLAKE2B ddab5ff81dc6cfe85ce3805846d8d74ce1eb8a2c79b2156e4363fa9592d1a0edec9f9812b9f41bd9ed955ac7030188776a7da5ff4a59408a0d5cf74bf0e629d6 SHA512 7ab148e3db28367ac7d8e56f75e65cafc3b80fd0932018d5ebd1ba1ba1b97521c94e30055fd653803806825bbc8be65e4fff2924907f9144b5ccdb48a53b00c8 DIST genpatches-4.9-63.base.tar.xz 1183404 BLAKE2B 4e49c39b91a86ec1d7cb0bdf24c9cb9c66bbd3fbf9847c1d2246e98618f49f57b4702699fddad6595003b146f35b2b4416ac788410d4dd5076342ae470834c65 SHA512 cb8e7ee1e8cf88e08bad0ec7078667f8cb044a5369a7bda6db68846ac56696d888125527b3dc0d4b5fc90bc072cbd31a75c327c6317036ba697ffa235c1c074e DIST genpatches-4.9-63.experimental.tar.xz 106440 BLAKE2B ece4f2c9cba523a9eb44a59a4ae8f3bbfcba22660f9143fb2ba23ddbafd6468459b1a70cafc373145a33c07d0a881c4d1b4f3a262e3ddd59b39deb17a58d95d3 SHA512 3c03fadd3a532cf0db5e3b7a319f8ffa6a96e3d304f31cf017baba5766da4af619daacb08749ec12bf8d62ce7439d2087de05b07f42ae0a41d81540f130a615a DIST genpatches-4.9-63.extras.tar.xz 17348 BLAKE2B 613eef1455b723fa71d79d9df0c71f29cc7e1507ae0e2ac588e1410576d18d1320107d37c9f462477adb62c6f8c3460b557b11d6235c47d5ef2e85f2bcaa0940 SHA512 26e91da7d56177e7d0ec5c0c58e1acdddb99432978551a60cd48b58800c6f286054fbfabb87cf15b56ac4b7102c12f2c3edc2865f8fecce89e7eb0e7191ef1fa @@ -41,6 +44,9 @@ DIST genpatches-4.9-66.extras.tar.xz 17348 BLAKE2B 979895fd39c5c51a7a6aec2559424 DIST genpatches-4.9-67.base.tar.xz 1234920 BLAKE2B f0d33a73b4565b4dc52443af1197d4707cbc2678c787d52ac08ac355ae0bb95fe8affec304ba68fc72c1ce4e9a9af403770da1b0dc6393e251a722feb1896d67 SHA512 837b32b66b046e7de0927b39fe049f5d556a053cb49c53e1214da31d1e6a18604edd0204ee9d1d7cf873908f06d9808c500f4c8b597f6c974a0a07daa0d9f7f4 DIST genpatches-4.9-67.experimental.tar.xz 106376 BLAKE2B 8dfc71899c2cab0235d1ec697ba8b6b127b9563dec410275e7af97f1bf6a54965e17e11747e8aaebd621194db4c160987279a550a1291da4af3928c4511d3fdc SHA512 7d536a0e5feae1045cf820840b50f0d8ff28c0e255d45c09ff80692c681aa287ccad3fb5336d3597aa99e599c73a750ff408e945366acfb9f1e23dc0b691eed3 DIST genpatches-4.9-67.extras.tar.xz 17352 BLAKE2B c56b8e7483fc9f44fcaf9303136143932f6abaa27e92be5cc4c1bf946b208a56247dc34e205dfb355d6664e5666858213f7b11853660e832f8bee49f5bed3265 SHA512 500793184ddaad5efabf43dabee89fecbadab3a3a2c1d3c6e9ccddf3099f42fab3b3714f711a1ee640aeb0dd1a3b52728a5b11a9f6f8f20bbe83362e82592141 +DIST genpatches-4.9-68.base.tar.xz 1266744 BLAKE2B 287306aeecbab6cf9b9c08440ee333e729d0af555fec354400c54e407a1c3b8a723ea95c28b7d3c13fe37f4c7fb78c273eec8d6a68f31b68ec24ba45a374bef7 SHA512 4ba94ae3f592cdc466ab58e4bba9781fee915df4994beb6c9dec4efd3622b180cf0d145de585ec9a7361ed2ec636910a42b449d937dca50983bd7f13494edd16 +DIST genpatches-4.9-68.experimental.tar.xz 106380 BLAKE2B e360ddf86cc6db981937c188ccd5106754c7533ec01e6e4d4c9dcef72092b11c4d9accf0389414c3f20032977e010d29344f1014f490e9e13cc51b59d1f59d1b SHA512 000567fef478babbe86b706bc9532756bf42f2c2e09aa3f4e39f7fff8d90fd9dfe65929fb1b9473031d6529ce4ea4a9a8dd8bb7dc615a58f5157ccb2ad4b9249 +DIST genpatches-4.9-68.extras.tar.xz 17352 BLAKE2B 215a823f33f6d5cccbfd9597ae123a885abaf1bd2deef215b1f4c76dbd0652c4160152b96b62cfaa7523899f49263a48d49c9bfc43cab3fd44ca3aabadb54605 SHA512 549e8fc65d62b5197ffd047b7c281c183d267a7d93dbe4c46fe19c161fa84db9a00db9e4cf254431303dbfc8652dc360aa53af8057ab5a433fcc98dbc3748c9f DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a diff --git a/sys-kernel/ck-sources/ck-sources-4.14.3.ebuild b/sys-kernel/ck-sources/ck-sources-4.14.3.ebuild new file mode 100644 index 000000000000..2d8eea439843 --- /dev/null +++ b/sys-kernel/ck-sources/ck-sources-4.14.3.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +KEYWORDS="~amd64 ~x86" + +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ + http://kernel.kolivas.org/" + +K_WANT_GENPATCHES="base extras experimental" +K_EXP_GENPATCHES_PULL="1" +K_EXP_GENPATCHES_NOUSE="1" +K_GENPATCHES_VER="4" +K_SECURITY_UNSUPPORTED="1" +K_DEBLOB_AVAILABLE="1" + +PYTHON_COMPAT=( python2_7 ) +inherit python-any-r1 kernel-2 +detect_version +detect_arch + +DEPEND="deblob? ( ${PYTHON_DEPS} )" + +K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}" + +DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}" + +CK_VERSION="1" + +CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz" + +CK_BASE_URL="http://ck.kolivas.org/patches/4.0" +CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}" +CK_URI="${CK_LVER_URL}/${CK_FILE}" + +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}" + +UNIPATCH_LIST="${DISTDIR}/${CK_FILE}" +UNIPATCH_STRICTORDER="yes" + +# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag) +# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental + +K_EXP_GENPATCHES_LIST="5010_*.patch*" + +pkg_setup() { + use deblob && python-any-r1_pkg_setup + kernel-2_pkg_setup +} + +src_prepare() { + +#-- Comment out CK's EXTRAVERSION in Makefile --------------------------------- + + # linux-info eclass cannot handle recursively expanded variables in Makefile #490328 + sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die + + kernel-2_src_prepare +} diff --git a/sys-kernel/ck-sources/ck-sources-4.9.66.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.66.ebuild new file mode 100644 index 000000000000..ec9e41dc089a --- /dev/null +++ b/sys-kernel/ck-sources/ck-sources-4.9.66.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +KEYWORDS="~amd64 ~x86" + +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ + http://kernel.kolivas.org/" + +K_WANT_GENPATCHES="base extras experimental" +K_EXP_GENPATCHES_PULL="1" +K_EXP_GENPATCHES_NOUSE="1" +K_GENPATCHES_VER="68" +K_SECURITY_UNSUPPORTED="1" +K_DEBLOB_AVAILABLE="1" + +PYTHON_COMPAT=( python2_7 ) +inherit python-any-r1 kernel-2 +detect_version +detect_arch + +DEPEND="deblob? ( ${PYTHON_DEPS} )" + +K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}" + +DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}" + +CK_VERSION="1" + +CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz" + +CK_BASE_URL="http://ck.kolivas.org/patches/4.0" +CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}" +CK_URI="${CK_LVER_URL}/${CK_FILE}" + +# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x) +FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc" +FRZR_FILE="${PN}-4.9-freezer-fix.patch" +FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}" + +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}" + +UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${FRZR_FILE}" +UNIPATCH_STRICTORDER="yes" + +# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag) +# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental + +K_EXP_GENPATCHES_LIST="5010_*.patch*" + +pkg_setup() { + use deblob && python-any-r1_pkg_setup + kernel-2_pkg_setup +} + +src_prepare() { + +#-- Comment out CK's EXTRAVERSION in Makefile --------------------------------- + + # linux-info eclass cannot handle recursively expanded variables in Makefile #490328 + sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die + + kernel-2_src_prepare +} diff --git a/sys-libs/libblockdev/libblockdev-2.14.ebuild b/sys-libs/libblockdev/libblockdev-2.14.ebuild index 53c3efbcb20a..1fc331bbae0c 100644 --- a/sys-libs/libblockdev/libblockdev-2.14.ebuild +++ b/sys-libs/libblockdev/libblockdev-2.14.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rhinstaller/libblockdev" SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="bcache +crypt dmraid doc lvm kbd test" CDEPEND=" diff --git a/virtual/httpd-php/httpd-php-7.1.ebuild b/virtual/httpd-php/httpd-php-7.1.ebuild index 9cc4e184dc76..e64f078a23c0 100644 --- a/virtual/httpd-php/httpd-php-7.1.ebuild +++ b/virtual/httpd-php/httpd-php-7.1.ebuild @@ -5,7 +5,7 @@ EAPI="6" DESCRIPTION="Virtual to provide PHP-enabled webservers" SLOT="${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" RDEPEND="|| ( dev-lang/php:${SLOT}[fpm] dev-lang/php:${SLOT}[apache2] diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-64.0.3278.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-64.0.3278.0.ebuild index 15a697bab362..4c187d4a1953 100644 --- a/www-client/google-chrome-unstable/google-chrome-unstable-64.0.3278.0.ebuild +++ b/www-client/google-chrome-unstable/google-chrome-unstable-64.0.3278.0.ebuild @@ -130,7 +130,7 @@ src_install() { local size for size in 16 22 24 32 48 64 128 256 ; do - newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png + newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_dev.png" ${PN}.png done pax-mark m "${CHROME_HOME}/chrome" diff --git a/xfce-extra/eatmonkey/Manifest b/xfce-extra/eatmonkey/Manifest index a33897055f74..08398931cbec 100644 --- a/xfce-extra/eatmonkey/Manifest +++ b/xfce-extra/eatmonkey/Manifest @@ -1 +1 @@ -DIST eatmonkey-0.1.4.tar.bz2 181996 SHA256 b8915a0204d750c939314711cc836f3ad9eb0faddaa2e140ca679d2764a7b3fb SHA512 95bd0bf46588151398fba52b01309f9df1cd8ccce046a2b81f7167adafc4f1cd1b217deb27c0ec91429a6cdcfb807bbaf7e00fcd7b31414316dced7a2c0d4a15 WHIRLPOOL d5f36c3eab5f6193a68a54379b1c3eb31fc74ee1c6e8ed3e4b93ac0f9aa7261cb8ff4f3ab0cfb2ebe6ddabb312457d3d00ab055804e585077c5af254955a76bf +DIST eatmonkey-0.1.4.tar.bz2 181996 BLAKE2B d9272cd62dea09e44c9f8cf20055d68a6f0e0eda29ac89ab450b9b60ed4fa511c6661b2a38811fac86c0203b119c1eb07a886b11ca7ad0f48db6e0fcb6431848 SHA512 95bd0bf46588151398fba52b01309f9df1cd8ccce046a2b81f7167adafc4f1cd1b217deb27c0ec91429a6cdcfb807bbaf7e00fcd7b31414316dced7a2c0d4a15 diff --git a/xfce-extra/eatmonkey/eatmonkey-0.1.4-r1.ebuild b/xfce-extra/eatmonkey/eatmonkey-0.1.4-r1.ebuild new file mode 100644 index 000000000000..c7f2c0b86a33 --- /dev/null +++ b/xfce-extra/eatmonkey/eatmonkey-0.1.4-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome2-utils + +DESCRIPTION="A download manager that works exclusively with aria2" +HOMEPAGE="https://goodies.xfce.org/projects/applications/eatmonkey" +SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +COMMON_DEPEND=">=x11-libs/gtk+-2.12:2 + dev-libs/libunique:1 + >=xfce-base/libxfce4util-4.8 + >=net-libs/libsoup-2.26:2.4" +RDEPEND="${COMMON_DEPEND} + >=net-misc/aria2-1.9.0[bittorrent,xmlrpc] + dev-lang/ruby + dev-ruby/ruby-glib2 + dev-ruby/ruby-gtk2" +DEPEND="${COMMON_DEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS README ) + +src_prepare() { + eapply -p0 "${FILESDIR}"/${P}-syntax.patch + sed -i -e 's:/usr/local:/usr:' src/eat{monkey,manager.rb} || die + default +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/xfce-extra/multiload-nandhp/Manifest b/xfce-extra/multiload-nandhp/Manifest index 9dd787c2daad..a7c0d8a06fe4 100644 --- a/xfce-extra/multiload-nandhp/Manifest +++ b/xfce-extra/multiload-nandhp/Manifest @@ -1 +1 @@ -DIST multiload-nandhp-0.3.tar.gz 34812 SHA256 6ede95477422c94cd12c7999d7f3c4c3a7cf1db70999dd0dc50f3a44762290c7 SHA512 68367d0bca144a9c2c56516254b9f1531aedfbc0c34f924e0264314cd9a1215a13d1b3b6f1d3c1b0781a95abfa0705819e7d886e3c3b84705c3b5b60f7d5806c WHIRLPOOL 74254cc52a1f2ef4c73d1069ca408cf2e374062c254300e2fb9a3bcaafd44e6cc22d2c7d0a53fd70b15b930681df5b908a9e245ad9d6891c526b0267a5348e27 +DIST multiload-nandhp-0.3.tar.gz 34812 BLAKE2B 79ee7b5b2880e2e8242c40128ef320966fa9ec7c904e79efbc497fd421fe531f94c6ccd44be665bae2a092cf70ee8ac745d1e718ae5e6bf60efaae3339329c93 SHA512 68367d0bca144a9c2c56516254b9f1531aedfbc0c34f924e0264314cd9a1215a13d1b3b6f1d3c1b0781a95abfa0705819e7d886e3c3b84705c3b5b60f7d5806c diff --git a/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r1.ebuild b/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r1.ebuild new file mode 100644 index 000000000000..96bdcd770529 --- /dev/null +++ b/xfce-extra/multiload-nandhp/multiload-nandhp-0.3-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools + +MY_PV=version-${PV/./-} + +DESCRIPTION="A port of the GNOME multiload applet for the Xfce panel" +HOMEPAGE="https://github.com/nandhp/multiload-nandhp" +SRC_URI="https://github.com/nandhp/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=x11-libs/gtk+-2.14:2= + x11-libs/cairo:= + >=gnome-base/libgtop-2.11.92:= + >=xfce-base/libxfce4ui-4.10:= + >=xfce-base/libxfce4util-4.10:= + >=xfce-base/xfce4-panel-4.10:=" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +DOCS=( AUTHORS README.md ) + +S=${WORKDIR}/${PN}-${MY_PV} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf --with-xfce4 +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/xfce-extra/thunar-archive-plugin/Manifest b/xfce-extra/thunar-archive-plugin/Manifest index ca50c6791581..329fd8af3672 100644 --- a/xfce-extra/thunar-archive-plugin/Manifest +++ b/xfce-extra/thunar-archive-plugin/Manifest @@ -1 +1 @@ -DIST thunar-archive-plugin-0.3.1.tar.bz2 329005 SHA256 9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c SHA512 51157c2680b3fcc6b541d35fc2943a350a0354d7d5bbb5fbe8a9dcbbeaf4bf4f5fe62521b8e9a73254f70bbefc440357deade8181313da96270c280eb0464e68 WHIRLPOOL 151a505968b871eae82bff1799464e4c6042e99668ec4752ecfa7537ed6968886134941bfcc7741ad56ba8ebb429c021046a968db92b1bba89bf1a1d2bb4a0d1 +DIST thunar-archive-plugin-0.3.1.tar.bz2 329005 BLAKE2B f1cc88acb86565c001734ae2ead50f79cd4e922922292446b3775a7ef5cce250787b202ef6633d453b40bf37f1841d6e1b9ee34350e784587612ea0d4030e6d4 SHA512 51157c2680b3fcc6b541d35fc2943a350a0354d7d5bbb5fbe8a9dcbbeaf4bf4f5fe62521b8e9a73254f70bbefc440357deade8181313da96270c280eb0464e68 diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild new file mode 100644 index 000000000000..b8388f2596f6 --- /dev/null +++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome2-utils + +DESCRIPTION="Archive plug-in for the Thunar filemanager" +HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin" +SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=">=xfce-base/libxfce4util-4.8:= + >=xfce-base/exo-0.6:= + >=xfce-base/thunar-1.2:=" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/0.3.1-add-engrampa-support.patch + "${FILESDIR}"/0.3.1-fix-kde-ark.patch + "${FILESDIR}"/0.3.1-add-support-symlinks.patch + ) +DOCS=( AUTHORS ChangeLog NEWS README THANKS ) + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/xfce-extra/thunar-media-tags-plugin/Manifest b/xfce-extra/thunar-media-tags-plugin/Manifest index 6ce706584dbc..b7375c9fc7f8 100644 --- a/xfce-extra/thunar-media-tags-plugin/Manifest +++ b/xfce-extra/thunar-media-tags-plugin/Manifest @@ -1 +1 @@ -DIST thunar-media-tags-plugin-0.2.1.tar.bz2 324833 SHA256 056d012a10403ee3e2e55b6ff2faecb796821de9ebee000315589b95d95ed253 SHA512 008ba9cf5405fba2582d072c48c915ad0afe2eb6bd193a710caf5f99247285362747265fa93fe28d9cedd75285a8f9593baf675310b5dbada948aefe359e951d WHIRLPOOL d44687e580adb4b9269e7e344469344a1dc8d14f2ff928f4913e9b9c2ea6d39697953391ac342979ec70e1e24cdb943a3170c3453eed15b4704d8d5509b97b10 +DIST thunar-media-tags-plugin-0.2.1.tar.bz2 324833 BLAKE2B 1f985fadaa58ebcf516c6f57f429d3a0c96161572a9829b7240e1f5550ad2cc5ebb121cb985f1680440ab4fc8be68be8f5ee3c5557d8f95aa0c23b3572514ec1 SHA512 008ba9cf5405fba2582d072c48c915ad0afe2eb6bd193a710caf5f99247285362747265fa93fe28d9cedd75285a8f9593baf675310b5dbada948aefe359e951d diff --git a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1-r1.ebuild b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1-r1.ebuild new file mode 100644 index 000000000000..4ee2a8495588 --- /dev/null +++ b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Adds special features for media files to the Thunar File Manager" +HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin" +SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND=">=media-libs/taglib-1.6 + >=x11-libs/gtk+-2.12:2 + >=xfce-base/exo-0.6 + >=xfce-base/thunar-1.2" +DEPEND="${RDEPEND} + dev-util/intltool + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS README TODO ) + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} |