diff --git a/app-admin/ansible/ansible-2.3.2.0-r1.ebuild b/app-admin/ansible/ansible-2.3.2.0-r1.ebuild
index 7318f41c29d2..012c08c8ed95 100644
--- a/app-admin/ansible/ansible-2.3.2.0-r1.ebuild
+++ b/app-admin/ansible/ansible-2.3.2.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_5 )
inherit distutils-r1 eutils versionator
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index d6f59323d592..b0d2a5c8be6a 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
inherit distutils-r1 git-r3
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 961633912fe4..2c3bc4882e58 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1 +1,2 @@
DIST entr-3.7.tar.gz 23326 SHA256 94efd50c8f7e9d569060d5deebf366c3565e81e814ab332b973d7298fa8ea22f SHA512 a1687ec2da99f65fba3f668e41345ba76cb8c87cc2343d98c0dcc0ac0dedeb40cd8b5fd9aa3eba1dee8add94585de939864633bf0020cea1043699019dfa15fe WHIRLPOOL 1a9077a3cd8939bcea49c42e2a85eb094840942bdd23f6911c32c9d3184f742d06666e12c3d53c5e99026c82a20612bce8fd9441ccb27eddb68b61196a79fee8
+DIST entr-3.8.tar.gz 24251 SHA256 ebb1e793d948db76481f081011bf1dad8b4449e067f4e5fe68176191f84b26bd SHA512 8530a40eefc78571f3a2ab09f63d25d880167ec2d76e0c32fb25dce40e22b3f9f3b5f27874c1b95480206628e314298f001a4c0b487485ac88f2996002b41a2a WHIRLPOOL 27ccd2d4be2758c765ccf834df45b53db8ca7a0de1c880dee5183f37e6838b1a2764801b33b4ecbb4ec890b97b90c720aba0dbc66d37c4dc943ffb61b21af320
diff --git a/app-admin/entr/entr-3.8.ebuild b/app-admin/entr/entr-3.8.ebuild
new file mode 100644
index 000000000000..3acbed282720
--- /dev/null
+++ b/app-admin/entr/entr-3.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="http://entrproject.org"
+SRC_URI="http://entrproject.org/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ mv eradman-* "${P}" || die
+}
+
+src_configure() {
+ sh configure || die
+ sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 8f7e7b72237c..b19da5722291 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,2 +1,2 @@
DIST sudo-1.8.20p2.tar.gz 2930769 SHA256 bd42ae1059e935f795c69ea97b3de09fe9410a58a74b5d5e6836eb5067a445d9 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda WHIRLPOOL 4e9b6ddaba8cdb4d82358e01252136af56ae50f656f9802285471c7c1e5c831d26aa07cb78205f63ea6098f98846911938681a89256afe5419372039d0e4e792
-DIST sudo-1.8.21rc1.tar.gz 2976277 SHA256 c51c2e784a9471551d41d1cdd6e66cbce844ebbd4293e8b02c34e81901143f17 SHA512 6be684f410da05d40f4dfb9beceb94527f0f16dc3a69430f67ccdd33457451ad7064d0390e4114dcfe97137ce0c1c55a18fcafc46496515ad451259826335b47 WHIRLPOOL c6b166198f343934d03c447763351a0ae24dc138cd95f388f8b944d0a8388251aec5c9038305ea6f617738d048bc2ba6db9878550d5bb8de4ce8e577543fa160
+DIST sudo-1.8.21.tar.gz 2973939 SHA256 126e9214613e842e19a02658f060186fe6a5927948679d64895b17ed933bb523 SHA512 f3e4a39b6d5a58bc94e1d8ce997460fc317abd7ff8dce75c23a37668cba96ff3edbac76580b4d8bfec585013c6ff30b004d9eda6fe775700abe54ba9eaa9f31f WHIRLPOOL 7add1abf9badc68ec7ef10d99cd6c57cd6d279a66e342ad544f511e7f0c8d59bc1ddbf7d5d7cc91b72fe71d23d3f3005e5b60df1d0f6e2bf08c2b12745d093c2
diff --git a/app-admin/sudo/sudo-1.8.21_rc1.ebuild b/app-admin/sudo/sudo-1.8.21.ebuild
similarity index 100%
rename from app-admin/sudo/sudo-1.8.21_rc1.ebuild
rename to app-admin/sudo/sudo-1.8.21.ebuild
diff --git a/app-arch/unrar/unrar-5.5.8.ebuild b/app-arch/unrar/unrar-5.5.8.ebuild
index 5be1286f36bd..fa7e2335bc11 100644
--- a/app-arch/unrar/unrar-5.5.8.ebuild
+++ b/app-arch/unrar/unrar-5.5.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="unRAR"
# subslot = soname version
SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index e2a86394edd5..673f624b1939 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -1,3 +1,4 @@
DIST xarchiver-0.5.4.10.tar.gz 1011648 SHA256 bb452d8ef4eabb52ab1313b3867156ea5030b75f9e59c59c7ef487c8db9dbea4 SHA512 847ac018d0fb8b4531d0751ba5f32e902e8e8bcc66399e1f083e56605e22ccf5f7ac9b883aee7df1ab0d01db98878c6ed784c08051b4ab8f164f959d370844a1 WHIRLPOOL b733cd4fed3d2735b2d84ddd6210fc511574239c8824ad790045e7794a4d4a9ad8185fd04d444646d70a19b26f1584f89b107cf2ae889b5f67b023214e480ddd
+DIST xarchiver-0.5.4.11_p20170629.tar.gz 1052723 SHA256 2dabd6f5d96c5d886d9a5ed7d299cfc43d1fef88be37d1d298a78c4c01a63b45 SHA512 e63e9ddd98c5ec5708b74e993cb1901835c133e220ba95aa5a07cca01660fab5894533c57b39223db6155e2fc0ea014ce6eede853ebaf067de27f1e77c5e023f WHIRLPOOL 3516a976e6d5e161a1313d1e10d207e8344c26a0570fdd1cb1a271410bcf9ad2cab1fbce057f419e5e41833a56ff6995649a67abc47322a20f1de8f8e194035b
DIST xarchiver-0.5.4.8.tar.gz 987648 SHA256 0947dce52538876d31e18ab89270f5eb52fba2c21ce877a4d56cdb5de5048e81 SHA512 d3be46b87c9475bfde2a3449511a08b1abef3d90b0b2c0e1165e093fa54210dbc2182b986a55e12e11bed67b516732f498c8038b360df3f697603befc2a4a8b3 WHIRLPOOL ba602771a06adfda1dc5a8cf1323deb339159b9399a54f4e47d42d0e56601eb93769bb2ac58bcd39f09ceaf7de9f837d4ec91eae150d1a12fda64e509d08a273
DIST xarchiver-0.5.4.tar.bz2 1003045 SHA256 e63fa73979fcc56efe8cca9095fd915d31a1714ce9676246b8626f164e452ef4 SHA512 3b767c2601d94104e2fc72aa8d168afa5a154b5747a9b0518d1c348417e56e4c19d872a0029fb78decc897e0f3bc9573e17d0317b85f584e7275b0e519f5f30d WHIRLPOOL 3f5a277b05147daf29db0be26718ed51fa0bb6d2416ee41cdd8ce6c54bc66064fc5f313af39a32b428997f906c9fd4d1a0b8d60fe5d2d867b1137960b0cbe4d1
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.11_p20170629.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.11_p20170629.ebuild
new file mode 100644
index 000000000000..371df75ee5bb
--- /dev/null
+++ b/app-arch/xarchiver/xarchiver-0.5.4.11_p20170629.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils xdg-utils
+
+MY_COMMIT=79a73d46b782cf8bb93d058d00d2cb81a9b3df8a
+DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
+HOMEPAGE="https://github.com/ib/xarchiver"
+SRC_URI="https://github.com/ib/xarchiver/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2:=
+ x11-libs/gtk+:3="
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ doc? (
+ app-text/docbook-xml-dtd
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxml2
+ dev-libs/libxslt
+ )"
+
+S="${WORKDIR}"/${PN}-${MY_COMMIT}
+
+src_prepare() {
+ sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.am || die
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ $(use_enable doc)
+ )
+ econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+
+ elog "You need external programs for some formats, including:"
+ elog "7zip - app-arch/p7zip"
+ elog "arj - app-arch/unarj app-arch/arj"
+ elog "lha - app-arch/lha"
+ elog "lzop - app-arch/lzop"
+ elog "rar - app-arch/unrar app-arch/rar"
+ elog "zip - app-arch/unzip app-arch/zip"
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/app-backup/fsarchiver/Manifest b/app-backup/fsarchiver/Manifest
index 17b1c93fe18f..4b2a7366d810 100644
--- a/app-backup/fsarchiver/Manifest
+++ b/app-backup/fsarchiver/Manifest
@@ -1,4 +1,2 @@
-DIST fsarchiver-0.6.19.tar.gz 244972 SHA256 9ba4d3262059a0cb108de564340d947a4d75d34ba3b8e35a767d543afbf24dbb SHA512 28c2b7c59fcdedd47c5451867540696e1859d954259670419df01fb94b626f169a2ff97b9eb96caaba69421ff2560cebbd6c7743b2a89172591f0747716a0471 WHIRLPOOL 78200870521adb927b042e3ada778ebb552f84c0164cf628fa5214f84f42a853fe71871d2ee27a6c485fa1db3c229002e52c6f11e58ef9766b38df6723e93f24
-DIST fsarchiver-0.6.24.tar.gz 261942 SHA256 535401b71b905ebf268bf45a24456d50cc5584c77119d93bf692b6a10c51cee3 SHA512 5c6338426f74625b5be3da4c0b5419e55a123dbdf2669198eeae902dff6b136f004f3279e805ec46ec283293088fb25eb1caaa202b853c9e0c254c7786bf12a4 WHIRLPOOL 0a8df7bdddb636d72036ce3a779f5fee7a9204e71471c42a03500e5a21b2b915df809e5b4bb2b94bc9402208fe5e304a21ced303d028564b12fd9696e05f8426
-DIST fsarchiver-0.8.0.tar.gz 264741 SHA256 68e98e51faa44abd593342503073cbce5f8ff74f87ecd45dfa45f68ad5e0a362 SHA512 3007ffa47c6399987f06cd53e30a1bbe9784703b97dd7383c5aa0a505bb64c94c89095f5b821ddebfb1eb76361babf08f0b64ab4a39ce3cc3f2f9a6f02f71fae WHIRLPOOL ab221d38787fdb5e9e0325acc98e5a24acece718719b41465681cdc539f366dd27287fe8677163cb61cb33f8abfb59cdc210ab059ea06622358825bba79b029c
DIST fsarchiver-0.8.1.tar.gz 265048 SHA256 f21dc8f66a67e949c836f3316862db0619f14cf8971ba37342c0ae6e11e625f8 SHA512 17133392b0678b88552ae356bc199a8a5a8a88d3c8878b593b36acdc0f9dc3869f87475cc1a36d0df752e3bc3df8c9c0641954f675aaf60da4f1b0862dec1bc6 WHIRLPOOL 190450d064ed509f731c0104623e237ccca1f04d4cde3cae23d14a34bfc0ae567062bd081cb1523655d82ae62a1add99afa75260db815db96a0a145962bd8154
+DIST fsarchiver-0.8.2.tar.gz 296486 SHA256 e08ef19c6c64f0c756f7506427994a407ed243bd671c5c9cbcdf17349df00ee6 SHA512 e7b5b5dcd44be57d2d8a2639a54d8ef9c8bf9fde39ed3ca317c7cc124e1735a88db4a2be937b890c582eb4881926c8d50cdf940d13c0f97f9b8276f2b0a9319c WHIRLPOOL 8575388e86c13ae90d60eeb109b019c334d76e98b1e2f4ab3d8cd679b688bf18103d3af639da8f6da1b157311e506a74a53c1782a0f49554a6ef3f562195109f
diff --git a/app-backup/fsarchiver/fsarchiver-0.6.19.ebuild b/app-backup/fsarchiver/fsarchiver-0.6.19.ebuild
deleted file mode 100644
index 1a8fba7ed055..000000000000
--- a/app-backup/fsarchiver/fsarchiver-0.6.19.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="Flexible filesystem archiver for backup and deployment tool"
-HOMEPAGE="http://www.fsarchiver.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug lzma lzo static"
-
-DEPEND="dev-libs/libgcrypt:0
- >=sys-fs/e2fsprogs-1.41.4
- lzma? ( >=app-arch/xz-utils-4.999.9_beta )
- lzo? ( >=dev-libs/lzo-2.02 )
- static? ( lzma? ( app-arch/xz-utils[static-libs] ) )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am || die "seding
- failed"
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable lzma) \
- $(use_enable lzo) \
- $(use_enable static) \
- $(use_enable debug devel)
-}
diff --git a/app-backup/fsarchiver/fsarchiver-0.8.0.ebuild b/app-backup/fsarchiver/fsarchiver-0.8.0.ebuild
deleted file mode 100644
index 047364ab3f67..000000000000
--- a/app-backup/fsarchiver/fsarchiver-0.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Flexible filesystem archiver for backup and deployment tool"
-HOMEPAGE="http://www.fsarchiver.org"
-SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug lzma lzo static"
-
-DEPEND="dev-libs/libgcrypt:0=
- >=sys-fs/e2fsprogs-1.41.4
- lzma? ( >=app-arch/xz-utils-4.999.9_beta )
- lzo? ( >=dev-libs/lzo-2.02 )
- static? ( lzma? ( app-arch/xz-utils[static-libs] ) )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am \
- || die "seding failed"
- eautoreconf
-}
-
-src_configure() {
- myeconfargs=(
- $(use_enable lzma)
- $(use_enable lzo)
- $(use_enable static)
- $(use_enable debug devel)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/app-backup/fsarchiver/fsarchiver-0.6.24.ebuild b/app-backup/fsarchiver/fsarchiver-0.8.2.ebuild
similarity index 97%
rename from app-backup/fsarchiver/fsarchiver-0.6.24.ebuild
rename to app-backup/fsarchiver/fsarchiver-0.8.2.ebuild
index 047364ab3f67..325a278172cd 100644
--- a/app-backup/fsarchiver/fsarchiver-0.6.24.ebuild
+++ b/app-backup/fsarchiver/fsarchiver-0.8.2.ebuild
@@ -29,7 +29,7 @@ src_prepare() {
}
src_configure() {
- myeconfargs=(
+ local myeconfargs=(
$(use_enable lzma)
$(use_enable lzo)
$(use_enable static)
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 1700ac97b7a9..5430489e5cc2 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,3 +1,4 @@
DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
DIST certbot-0.16.0.tar.gz 992700 SHA256 9abac759d7d72b520693ff806479e87609059a1546bb6ea26416267ebeedd25b SHA512 4cb6ec06c6ec71cd6886a716100f269de3922f17a582c8c20ec40327b65e1c16347a5b33d44131e56a7667233ebba88ff36a4e854beedd13e848897ba09a7e64 WHIRLPOOL 34dae0b20d472b4020986d0768ea6757c977fa4626666a9f81711007c051e76f9ad60f5a3bc77c768975e71a791f20e5ca2bb6f2fc41d809ebe2541129c975ef
+DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0
diff --git a/app-crypt/acme/acme-0.17.0.ebuild b/app-crypt/acme/acme-0.17.0.ebuild
new file mode 100644
index 000000000000..bf3eed8aaa75
--- /dev/null
+++ b/app-crypt/acme/acme-0.17.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+ S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.10[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
+ >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+
+python_test() {
+ nosetests -w ${PN} || die
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index a8cfdba45264..8a5e0817e457 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1 +1,2 @@
DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
+DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
diff --git a/app-crypt/certbot-apache/certbot-apache-0.17.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.17.0.ebuild
new file mode 100644
index 000000000000..93bc95551953
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-0.17.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+ KEYWORDS="~amd64"
+ S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+ ~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/python-augeas[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}] )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ nosetests || die
+}
diff --git a/app-crypt/certbot-apache/metadata.xml b/app-crypt/certbot-apache/metadata.xml
index 27dafd4e5dc0..264684bb16c6 100644
--- a/app-crypt/certbot-apache/metadata.xml
+++ b/app-crypt/certbot-apache/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ prometheanfire@gentoo.org
+ Matthew Thode
+
certbot/certbot
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index a8cfdba45264..8a5e0817e457 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1 +1,2 @@
DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
+DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.17.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.17.0.ebuild
new file mode 100644
index 000000000000..94d8fd922794
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.17.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+ S=${WORKDIR}/${P}/${PN}
+else
+ SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+ ~app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+ ~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index a8cfdba45264..8a5e0817e457 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1 +1,2 @@
DIST certbot-0.15.0.tar.gz 942788 SHA256 87d306b1c013b472b8f548b38ccc476c125816435bb3b99e932fed09ac777296 SHA512 e884b34985a1128ce94d6b2be77af6ee86ded8b870e066f3f4bc22f78501f3f0a51060edcf75a11cd31dd525388adb8ccc4e2da0068b5b75be131d0fb0ca6844 WHIRLPOOL 01b172e8c7ac5d3678ee608b36d93f23943bf17f1e9c593cc1af3febcf0549b03961e69e537f099643dd9ee268497f76c2c18d8fa7a1d45753bc50e670375317
+DIST certbot-0.17.0.tar.gz 1036099 SHA256 ed4334dce166bf38ecc7218449efda3798d62c7e2934a71702c0dc3d78eccdd1 SHA512 57fa830d19173eacdbb17242a3c446d9414f02e09fab6ccd41c82b15156bc103ec358ff3d515e94881fcf6438f6acfe449eee9bb3108df41f7b8f2395500b549 WHIRLPOOL cbfffc3866ffed3e0c702ac686768e879c7f1306a62dc050aab05e5a207b4f77a4acae9ca8f3ce973a6691d98838a488ab6335aa0692dd2b28a99c8aecff232d
diff --git a/app-crypt/certbot/certbot-0.17.0.ebuild b/app-crypt/certbot/certbot-0.17.0.ebuild
new file mode 100644
index 000000000000..4075ad538f38
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.17.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
+RDEPEND="
+ ${CDEPEND}
+ ~app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ >=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.2[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ >=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="
+ ${CDEPEND}
+ test? (
+ >=dev-python/astroid-1.3.5[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/ipdb[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/pylint-1.4.2[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ )"
+
+python_test() {
+ nosetests -v ${PN} || die
+}
diff --git a/app-emulation/flannel/Manifest b/app-emulation/flannel/Manifest
index 1b8360c7a4e6..530a82a99a6e 100644
--- a/app-emulation/flannel/Manifest
+++ b/app-emulation/flannel/Manifest
@@ -1,26 +1 @@
-DIST ansicolor-a422bbe96644373c5753384a59d678f7d261ff10.tar.gz 7319 SHA256 5a240c42b5dfa34065d0aef36c1735682306d2175bf9ccb89e3b6be0e174df2f SHA512 adaab239eb195bc9b8394fc228b4ea6554c0c7e52a9d0fd8b80a7408302ac4cdcc072b1219e69d9db1c6791680077f6730e8ffe41208006a426247b2d135efea WHIRLPOOL 346cec6eacc39e96d9e98e6be69d4f658bef9c66c1dcfcf83fde997e43ca46ac10d8abcea94180515952799e0be01edea8d8202e17c87a42245c8da701e2fb3d
-DIST beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 SHA256 d80f6864af88af9a4f726d3a0ccaea30a3dd2a7c0ea3a79ab92a9987598bd9f0 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32 WHIRLPOOL 787aad3e28076b51c4904b3aaf8f01a69ce69988dc3e518c97b1a79ec8496f88b4e25ec25e89ae290935c748b3f8033f98906627ebfe2e0f6c9e489f5bffd7d6
-DIST bolt-1.3.0.tar.gz 80322 SHA256 e417fccc1186dcf8807e3b2a7afb31bad31faf2ca383d203002a7d783c872f13 SHA512 51b72f82cf055ab1b47ca51c16c9f3cd1293de4596e1294db83f348d7da62ee2230fc94cb11347483f81783e23e5763424f697a4d028050fb434e0455dd06934 WHIRLPOOL a079999c027ae0cf2031beeb6a6c98917153ed4bf85de306f0192c8ec60ebe8c8bdfcff5f2bb6586f261d4cfce8809cb056225a3ed7256d059adb2ea211cfd6f
-DIST flannel-0.5.5.tar.gz 592235 SHA256 dbbcb08c0e70713b0c920387a9967e5b30ef833c8118c847edbbca4f68ff0562 SHA512 5300583752fbfa0da3c1a066268a7441271c02a0304213cc854c252727b5035db4a51a4747ad54db3c741b6f623363c99920a5bf2292c59dc3dc4d653b366f83 WHIRLPOOL c97b7ece323309343fef40b36a826b420f3be5df61ac7bb9ae4faa48802c395be886b8a6740765779e2023a5bdbffde21dda1934179e4e284204aa821275e645
-DIST flannel-0.6.2.tar.gz 9239397 SHA256 40c315ee78e50b97d2e48e5c32e2d07690b7361fe1ca09efe16d3edda4bc7e33 SHA512 6bee7edfc5ba13ff9b157ca79ea4abf1c2575a4a0c7b92279d297d395dfe411fd5a01c9b94fd182868bbb5a2a77e2e01e8f7e726b04e875e5b46c4ce8ac2c3a5 WHIRLPOOL 3f9cb2824c91b393edb77c5ebcf0dd1717bf7841a803b871dcf7595fdcb839b88af1e2894e809cb920da309afa8075a8d6980d6c15b1b7d9d0b3552eea4fc77a
DIST flannel-0.8.0.tar.gz 8089967 SHA256 8905f1706b649db8c9852ddd0d559ff8c1844886278455b8ff0c22b909b1e059 SHA512 8d3693d95f67ab273c68671d0b2ab76dd3761868bb956cb14c171525bbefab8223d202f2356de249e1add1bbac89f995367a6d5c1b8e1358bebaa317b4f0a2fc WHIRLPOOL c6c2d4cc2f864b2e3271933a99d5ae8b4ef08c12b7e5cca771ca86c4902a4f2469cee990c46b5a40337a89b52c44d17cebcd56be77b502c2fedc371aad299be1
-DIST go-crypto-b2fa06b6af4b7c9bfeb8569ab7b17f04550717bf.tar.gz 1298465 SHA256 423a29190851ee1a1a0b4d7539ff725f7de9f0fb9a3d3d76a491025a6ee7b492 SHA512 8721402dc0a3486cfe9898e83d686307af13995d1edb4b21c58a3c3e3d13abe5fb9860270ca9f721be6147338c2f54d66489d2f5c7cc45dbfa98c7d678d00ce3 WHIRLPOOL c215c893a5cf7ad93d014f544f97c8d14317edc63a0000858058d571848c765caac458c146c1a00077eb149ae54ea3bff4d42de1bcdf005697f7db8af18a4917
-DIST go-semver-0.2.0.tar.gz 8474 SHA256 0f15084aee23324e12e5e4542c9f7b0c809d7207b0e90829d1554b234cd8dd4a SHA512 93cf037a5994fe42d890e26a7547f56593ce4e6b8e149ba4f8437226b0d06a7b948b67c1d5a96d1389baa837cc046220f389a695c999a089b5f30a051bf92a38 WHIRLPOOL 3463ff0f01f86787105fb185cb3fcd4fc578823d010387e09a1b17c8ace1dbea134077b7b29bfe07dae6404425eaff3d3c9919597eb4b40c0adc8321a718d9b4
-DIST go-systemd-13.tar.gz 49200 SHA256 5bad52a1e16b17038f86d336ac3c5aefbde9074f6f0aaa677dc866c0582de783 SHA512 a53e2ed6b418ea04dbf4e0ba36590ea64c3453b09f0bc7431c20970cd25c12797b5ce80c95c69e2ba85e62d5aa804d71217edbefd6c9e847ba1b192432159cd2 WHIRLPOOL abc1fa6760239da574fb9bbc22c0bd9a9233ca11642caf503d4d2c266ee02d436413bfe3d8be40963af8afd6a6b436ce2bb0498bf31cc27632d6f1a4eaa09cf4
-DIST go-text-a8b38433e35b65ba247bb267317037dee1b70cea.tar.gz 4274499 SHA256 95176ca61248a9cad5b15770437bbc32cf0588c3f4c4aa832dc188aae2bca331 SHA512 65a3a39402575dfd5e14da599c4037a82c2fe3a2a488a18a214cfc15eb202db4ad538c533115326eb0969a037936ef05176d28acce1d02caadc2b00233195f23 WHIRLPOOL 7d867805f66d25ce433d297ca6937bebe3ee476f05febb486d3b731b77dd9e920f51cc0e756add8614097096e8af05dac68476f8643def1812fb5d68c2e805c4
-DIST go-tools-0_pre20160220.tar.gz 1827046 SHA256 395190b159e918204f67dee0b8f08f55d14cf59b83aa79cdb69c75de71c8d99a SHA512 95c9deb9b01b2f294818fcc847e457ab313d5831a839bf9cfeb1a00a0efd833de3fdfd3ecfe7ecfa2dd236ffcf963e73205d7b5b25fa41ab51c7601dc632bce1 WHIRLPOOL 48737d871487e693040b448e799d89f8461e6dc60ee12cc21fe874d9897b9721397986aa947af3bcbc2e514422e3c27147a5d2fe21b4fb7593c91e1fb267e424
-DIST go-yaml-v1-9f9df34309c04878acc86042b16630b0f696e1de.tar.gz 60069 SHA256 e2288c906f0ab336623286e32732a3f22aa91d126d226e89579a70761fe59462 SHA512 bdfb36f7dd8923e1a5ccca1d37e8fec835e44c9f6e9538d7ae82b24cd8384903115a0ce8c10e1b60ee252fb2aaf7f6e03daeece3958ba800ccbf66970a556e25 WHIRLPOOL 17fc5dbd5f8d005b653886884fbdf204e8105d2d45a54f5b09da707ff969be4d60a3f69e0791adec6ae1a816eb68a59d4e4d4850e3efe665dcad4d498808bd12
-DIST godbus-4.0.0.tar.gz 46128 SHA256 2b40e749786260a053785be29ff12e6ddd618762ccaafdfbe4a6e07f3d2a6e66 SHA512 908c7a309d160512d54f53bda64123e421aad4771e9c2d5f8cccac63d8ea6026958dc9bc269d923e485318c925a34f168450bb7b5f9e048eddab2d02441dc6c1 WHIRLPOOL c036ebeb90deaed41fc7cd3514872561deab55de4e82dcc2611db4a3f037a7073eedfa02f681d49aadb025be8e495c5bf64ac17e258cf59505ff4834a4064833
-DIST gogo-protobuf-0.3.tar.gz 2116795 SHA256 82222a5ad3bdc53fb60851df05acc16e7578932984c78e32abd05cb610127308 SHA512 57e1b1715d4811800da8cf9f2c72d202deae622d89715d7eff2ff0c406a0ea3778c187443abb17b072ae6fe57382844807f103837032759dab5420c860b99fb8 WHIRLPOOL 2c900a93d698d946949e8ef830c9940ea43c8faaf667eec7ec99ad58f46e5de9e59e43182d675f419196caacb08af2a49e63146998c5ccbef379c3920997511f
-DIST golang_protobuf_extensions-1.0.0.tar.gz 9586 SHA256 65fd58d98a7e79fa491808e9bf8315799eff2dae3d4c203dda25560861294115 SHA512 3113c91a71ca691bc77f922ee5f42b574ad3180b7395de22dfba65ad9022fee7addb059593654082912790cd904c40ee46356ec8ec6ba68a0ef8ec4928ad524f WHIRLPOOL 4c704c72ecbec824b555f0743c60ceae4fe9785592870738abe8d678b04f482e80745845748bcacbb1fd2375b703095ddcfef827909ee8bf885eb4899c7031fb
-DIST google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz 12725 SHA256 d42d402ea1e9006343f8634c5262f21b5d04a996f4175eb881bf98195259c15b SHA512 16b23b56b7e99ef19b1e8251b646f13be1bac0f41df8077d80235434c1c3f187fec3782667eb7ff022442915ffeca1b28ff18b410bd7c6cb9db29a72beb168c9 WHIRLPOOL cecd0059bb70156eb5da511124bd2ab5b0fe3c95b043309597fd940c9cdcc48869db6b2a3e1e0e82147fbd4804ba89416302eaaa971d42032ac50d9d7a8f057c
-DIST grpc-go-1.0.3.tar.gz 219647 SHA256 66907ab449a06b4c99ee4626befa56e7f615984495ea1bcb7497aa41d75209cc SHA512 348c1875b6f44d7debbf0be975c2f7bee1fd0695d5f5695204213f311e76cc390035f640615650e26632b54172cb2a627132c7f8295342ed7edf82ad38dc21a7 WHIRLPOOL 09dc9d4465b34bf70f19b6bdcc5ac4bd02e45fdb098038537866c77b7c3e54b9790b20c394d2a4c06fa15fb25347f6c5dbf5c38c138a97ab6dab3414efa2a3f0
-DIST gucumber-71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc.tar.gz 15171 SHA256 553c8ffe459bb9630bb332ff0e8949c1cfe3110afd1c854d1cd4a49f36102dc5 SHA512 79ef7a44c88f73a16fae1dceb6f585b2dc9cbd9f0ab6fab2bfab29801b99dba37ede7faec44f5a706a3a67a4bf7176d1f3ee66ba9d21b25bceb3c42ab167734a WHIRLPOOL a4de8d4278a08b5066307df0a0f29568d3785fae990bd9ef58e11eae1782e0172bf00abe7743f8cd5c88b37446142bc9e6ec6d7e34b5d8e1d7a2382ebe60d14d
-DIST probing-07dd2e8dfe18522e9c447ba95f2fe95262f63bb2.tar.gz 3392 SHA256 f39628be86bce6366598ffcf26ec19b40766cb3f7b471137f89043ff8a6ed400 SHA512 ff0527ca5802db42a9a7d2a5a47c9b0fa2c05b1ce1c96fa460946e511ed01a3cec8a4d7e1bd7092d49162e0b1b81528056de17d4e4dfe572117ce8a576f55e75 WHIRLPOOL a154180ff95305ab678a9d49c894c35f378858ac65b538592417e6f69e0a8c4a2d238a444ec2aa203270315120267446c7a4833bb1d9dc8f206e0e0533df259a
-DIST prometheus-client_golang-0.8.0.tar.gz 75593 SHA256 88b0040393276116f848de5bdd636717d339667273cfc45a4edda40b5e5682bd SHA512 a8319ff9d727932ee0824e96d41dbc11d63e1106c1494915c74eeffe2c85eec846e3a3a673054d0a23436baf0f019c98b300afbe18a8bba1c9f48c61a95a2ef7 WHIRLPOOL a78564991aa5b47e2b096b413c928e13e794c880849e0cbe40cb33cfc3f0d1544e8987d0378dfb437aad9c884adbd4f60c38df3c89c37ca834052723a8f2824c
-DIST prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz 54855 SHA256 d29d75de6645bd67452df27cda2e4a09848161f9ecacc62b1c1818d0a701cff9 SHA512 9d4d52142888edff091f23496aad70ab2924dff3a27930cb6df81c5452ca897b9d61eff74fbd092372ecb4bb005b4d362ea6b0602e1764ea4f2a30e23048a81d WHIRLPOOL 54a1085567a2081b70f975c9be620f15de025673cb0f5c75163867924f7e48a64b68ae4e7a8c57a0e50b2fbf78806a797a12870e4ab65a767db7532e04e26dfc
-DIST prometheus-common-85637ea67b04b5c3bb25e671dacded2977f8f9f6.tar.gz 58003 SHA256 40c4a038460fc9f8350eb41dd7252d819e14addccfd29f24b29c3cbad7c802ea SHA512 1c734a62b730c7e02e7d67957badf1bedafa7ba0c7ae60f64b8bf8d07b9a77eda871580c2140eab1e73af0170f949238281c554e1146f40ebf13c5d653de883b WHIRLPOOL 7c83d48a4f3dfec618291f3e108e62c003eb11a56e272addfadda9df642449b6e38f28b2803630e40e911a39ea852bd538e9cf76c412f3e820235e99253f19ce
-DIST prometheus-procfs-abf152e5f3e97f2fafac028d2cc06c1feb87ffa5.tar.gz 18528 SHA256 027259e1cbd08c9e6496c344f5ef7d8ca4428e17895584e41634b26134d94a4b SHA512 6935f6befb8fb98104f89a6e345b18801f5339789c0fa202bba535c7a5ac70eb79fa399d85a8133f96af2e67b3e7dac3ad5edc41b5b5e8c0a3abacd8ecb933d6 WHIRLPOOL e2652a8b3bfbeb31e57efec570a96542f6347e9bf74f63d793df04b19d6eb021bc023531883c52d8b8387c517077f24939586a87ec413274664231cdbde26cf3
-DIST speakeasy-675b82c74c0ed12283ee81ba8a534c8982c07b85.tar.gz 6935 SHA256 e43955064b69e3467cbdc47653a3361c80afac23274e3d7fd39bf328bfc0777e SHA512 562ad51d0fe1f90b5f3c3849f3e0f15e4964a4e69ebb1ebb2e93a51c38647833a18d54fa100c96962dcc5d58d61915442d2e05a74edef70d4c8e27fba9b8962d WHIRLPOOL de274371de0b16c689342e7689e62ed925821e052bf54f810d7e1a3c4343dd674d82ec92ea543bfcca8d92228bb4633e04fab45abdbcf2c8a27e55f27087a8f2
-DIST stretchr-testify-1.1.4.tar.gz 83325 SHA256 f7a244ad38ee484296e8969356209e0d9fb35bd790f69fc5e7758b4e2a9e1874 SHA512 cf7195490a409c816c60f063ba71fe1f4933dfa66e7ef640b2d3bbec5d32e8387a604d7eddb1240b50168aed4c5cb7c952a0cd59831e4edc54f5db96d792dbfa WHIRLPOOL 3c705fe5287cb0583dfc2d78726c32d770e48fc4ede7f67dc7e0156f19da6faabbfaed87d9d0283244bd493fcebb4157b8e5a3c1f9e5bbb7d67ac4b36103469d
-DIST urfave-cli-1.18.1.tar.gz 46188 SHA256 0c1e88c6d8f565aaa1c19e5e724136b5049f897369f9918eb4aa14db22c157ad SHA512 48938d02df330e5eacc6fca600892a7b2660fd6f9f0dba69658e6261d57365571952fbc5ca0554aa80260e584b312c603f90f20899d730557fbd4d67fc2d5fd1 WHIRLPOOL 50b8fd6df907dce25366fe41bd142dba244220681969c8ef5a05ceead66ccc701ece783268efff7cfa4f2adaf45347b20c8699d37ccec7a1a297dbfa8e8b20c8
diff --git a/app-emulation/flannel/flannel-0.5.5.ebuild b/app-emulation/flannel/flannel-0.5.5.ebuild
deleted file mode 100644
index 74895217074c..000000000000
--- a/app-emulation/flannel/flannel-0.5.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="An etcd backed network fabric for containers"
-GO_PN="github.com/coreos/flannel"
-HOMEPAGE="https://${GO_PN}"
-SRC_URI="https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.4:="
-RDEPEND=""
-
-src_prepare() {
- local line
- sed -e 's:go build:[[ ${0##*/} == test ]] || \0 -v -x:' -i build || die
- sed -e 's:go test:\0 -v:' -i test || die
-
- # remote_test.go:98: GetNetworkConfig failed: Get http://127.0.0.1:9999/v1/_/config: dial tcp 127.0.0.1:9999: getsockopt: connection refused
- sed -e 's:^func TestRemote:func _TestRemote:' -i remote/remote_test.go || die
-}
-
-src_compile() {
- "${BASH}" -ex ./build || die 'Build failed'
-}
-
-src_test() {
- "${BASH}" -ex ./test || die 'Tests failed'
-}
-
-src_install() {
- dobin bin/*
- exeinto /usr/libexec/flannel
- doexe dist/mk-docker-opts.sh
- insinto /etc/systemd/system/docker.service.d
- newins "${FILESDIR}/flannel-docker.conf" flannel.conf
- systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
- systemd_dounit "${FILESDIR}/flanneld.service"
-}
diff --git a/app-emulation/flannel/flannel-0.6.2.ebuild b/app-emulation/flannel/flannel-0.6.2.ebuild
deleted file mode 100644
index 3c0af6ce510d..000000000000
--- a/app-emulation/flannel/flannel-0.6.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="An etcd backed network fabric for containers"
-EGO_PN="github.com/coreos/flannel/..."
-HOMEPAGE="https://${EGO_PN%/*}"
-SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/golang/tools/archive/ee8cb08bfe4453a27a4bd7c86a917800d339c5ac.tar.gz -> go-tools-0_pre20160220.tar.gz
- https://github.com/golang/crypto/archive/b2fa06b6af4b7c9bfeb8569ab7b17f04550717bf.tar.gz -> go-crypto-b2fa06b6af4b7c9bfeb8569ab7b17f04550717bf.tar.gz
- https://github.com/golang/text/archive/a8b38433e35b65ba247bb267317037dee1b70cea.tar.gz -> go-text-a8b38433e35b65ba247bb267317037dee1b70cea.tar.gz
- https://github.com/gucumber/gucumber/archive/71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc.tar.gz -> gucumber-71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc.tar.gz
- https://github.com/shiena/ansicolor/archive/a422bbe96644373c5753384a59d678f7d261ff10.tar.gz -> ansicolor-a422bbe96644373c5753384a59d678f7d261ff10.tar.gz
- https://github.com/stretchr/testify/archive/v1.1.4.tar.gz -> stretchr-testify-1.1.4.tar.gz
- https://github.com/boltdb/bolt/archive/v1.3.0.tar.gz -> bolt-1.3.0.tar.gz
- https://github.com/coreos/go-semver/archive/v0.2.0.tar.gz -> go-semver-0.2.0.tar.gz
- https://github.com/coreos/go-systemd/archive/v13.tar.gz -> go-systemd-13.tar.gz
- https://github.com/gogo/protobuf/archive/v0.3.tar.gz -> gogo-protobuf-0.3.tar.gz
- https://github.com/google/btree/archive/925471ac9e2131377a91e1595defec898166fe49.tar.gz -> google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz
- https://github.com/prometheus/client_golang/archive/v0.8.0.tar.gz -> prometheus-client_golang-0.8.0.tar.gz
- https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz
- https://github.com/prometheus/common/archive/85637ea67b04b5c3bb25e671dacded2977f8f9f6.tar.gz -> prometheus-common-85637ea67b04b5c3bb25e671dacded2977f8f9f6.tar.gz
- https://github.com/prometheus/procfs/archive/abf152e5f3e97f2fafac028d2cc06c1feb87ffa5.tar.gz -> prometheus-procfs-abf152e5f3e97f2fafac028d2cc06c1feb87ffa5.tar.gz
- https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz
- https://github.com/matttproud/golang_protobuf_extensions/archive/v1.0.0.tar.gz -> golang_protobuf_extensions-1.0.0.tar.gz
- https://github.com/xiang90/probing/archive/07dd2e8dfe18522e9c447ba95f2fe95262f63bb2.tar.gz -> probing-07dd2e8dfe18522e9c447ba95f2fe95262f63bb2.tar.gz
- https://github.com/bgentry/speakeasy/archive/675b82c74c0ed12283ee81ba8a534c8982c07b85.tar.gz -> speakeasy-675b82c74c0ed12283ee81ba8a534c8982c07b85.tar.gz
- https://github.com/grpc/grpc-go/archive/v1.0.3.tar.gz -> grpc-go-1.0.3.tar.gz
- https://github.com/urfave/cli/archive/v1.18.1.tar.gz -> urfave-cli-1.18.1.tar.gz
- https://github.com/godbus/dbus/archive/v4.0.0.tar.gz -> godbus-4.0.0.tar.gz
- https://github.com/go-yaml/yaml/archive/9f9df34309c04878acc86042b16630b0f696e1de.tar.gz -> go-yaml-v1-9f9df34309c04878acc86042b16630b0f696e1de.tar.gz
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.6:="
-RDEPEND=""
-
-get_archive_go_package() {
- local archive=${1} uri x
- for x in ${SRC_URI}; do
- if [[ ${x} == http* ]]; then
- uri=${x}
- elif [[ ${x} == ${archive} ]]; then
- break
- fi
- done
- uri=${uri#https://}
- uri=${uri%/archive/*}
- case ${uri} in
- */golang/crypto|*/golang/net|*/golang/oauth2|*/golang/text|*/golang/tools)
- echo ${uri/github.com\/golang/golang.org\/x}
- ;;
- github.com/grpc/grpc-go)
- echo google.golang.org/grpc
- ;;
- github.com/GoogleCloudPlatform/google-cloud-go)
- echo "google.golang.org/cloud|gcloud-golang"
- ;;
- github.com/go-yaml/yaml)
- echo "gopkg.in/yaml.v1|yaml"
- ;;
- *)
- echo ${uri}
- ;;
- esac
-}
-
-unpack_go_packages() {
- local go_package x
- # Unpack packages to appropriate locations for GOPATH
- for x in ${A}; do
- unpack ${x}
- if [[ ${x} == *.tar.gz ]]; then
- go_package=$(get_archive_go_package ${x})
- x=${go_package##*|}
- go_package=${go_package%|*}
- mkdir -p src/${go_package%/*}
- [[ ${x} == ${go_package} ]] && x=${go_package##*/}
- mv ${x}-* src/${go_package} || die
- fi
- done
-}
-
-src_unpack() {
- mkdir "${S}" || die
- cd "${S}" || die
- unpack_go_packages
-}
-
-src_prepare() {
- eapply_user
- grep -rlZ "github\\.com/lsegal/gucumber" "${S}" | \
- xargs -0 sed -e "s:github\\.com/lsegal/gucumber:github\\.com/gucumber/gucumber:g" -i || die
- grep -rlZ "github\\.com/codegangsta/cli" "${S}" | \
- xargs -0 sed -e "s:github\\.com/codegangsta/cli:github\\.com/urfave/cli:g" -i || die
- local x
- while read x; do
- x=${x#${S}/src/${EGO_PN%/*}/vendor/}
- [[ -d ${S}/src/${x} ]] && continue
- ln -s "${S}/src/${EGO_PN%/*}/vendor/${x}" "${S}/src/${x}" || die
- done < <(find "${S}/src/${EGO_PN%/*}/vendor" -type d -mindepth 1 -maxdepth 3)
- sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
- -i "${S}/src/${EGO_PN%/*}/version/version.go" || die
-}
-
-src_compile() {
- GOPATH="${WORKDIR}/${P}" \
- go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
- [[ -x bin/${PN} ]] || die
-}
-
-src_test() {
- GOPATH="${WORKDIR}/${P}" \
- go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
- newbin "${S}/bin/${PN}" ${PN}d
- cd "${S}/src/${EGO_PN%/*}" || die
- exeinto /usr/libexec/flannel
- doexe dist/mk-docker-opts.sh
- insinto /etc/systemd/system/docker.service.d
- newins "${FILESDIR}/flannel-docker.conf" flannel.conf
- systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
- systemd_dounit "${FILESDIR}/flanneld.service"
- dodoc README.md
-}
diff --git a/app-emulation/flannel/flannel-0.8.0.ebuild b/app-emulation/flannel/flannel-0.8.0.ebuild
deleted file mode 100644
index a63436a1230f..000000000000
--- a/app-emulation/flannel/flannel-0.8.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="An etcd backed network fabric for containers"
-EGO_PN="github.com/coreos/flannel"
-HOMEPAGE="https://github.com/coreos/flannel"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-src_prepare() {
- default
- sed -e "s:^var Version =.*:var Version = \"${PV}\":" \
- -i "${S}/src/${EGO_PN}/version/version.go" || die
-}
-
-src_compile() {
- GOPATH="${WORKDIR}/${P}" \
- go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
- [[ -x bin/${PN} ]] || die
-}
-
-src_test() {
- GOPATH="${WORKDIR}/${P}" \
- go test -v -work -x "${EGO_PN}" || die
-}
-
-src_install() {
- newbin "bin/${PN}" ${PN}d
- cd "src/${EGO_PN}" || die
- exeinto /usr/libexec/flannel
- doexe dist/mk-docker-opts.sh
- insinto /etc/systemd/system/docker.service.d
- newins "${FILESDIR}/flannel-docker.conf" flannel.conf
- systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf
- systemd_dounit "${FILESDIR}/flanneld.service"
- dodoc README.md
-}
diff --git a/app-misc/detachtty/detachtty-9-r1.ebuild b/app-misc/detachtty/detachtty-9-r1.ebuild
index 875d21851737..4872c27d12f6 100644
--- a/app-misc/detachtty/detachtty-9-r1.ebuild
+++ b/app-misc/detachtty/detachtty-9-r1.ebuild
@@ -24,6 +24,6 @@ src_compile() {
src_install() {
dobin "${PN}" attachtty
doman "${PN}.1"
- dosym /usr/share/man/man1/detachtty.1 /usr/share/man/man1/attachtty.1
+ dosym detachtty.1 /usr/share/man/man1/attachtty.1
einstalldocs
}
diff --git a/app-misc/detachtty/detachtty-9.ebuild b/app-misc/detachtty/detachtty-9.ebuild
index a284ddd85122..b24b044ecb56 100644
--- a/app-misc/detachtty/detachtty-9.ebuild
+++ b/app-misc/detachtty/detachtty-9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit toolchain-funcs
@@ -21,6 +21,6 @@ src_compile() {
src_install() {
dobin detachtty attachtty || die
doman detachtty.1 || die
- dosym /usr/share/man/man1/detachtty.1 /usr/share/man/man1/attachtty.1
+ dosym detachtty.1 /usr/share/man/man1/attachtty.1
dodoc INSTALL README || die
}
diff --git a/app-misc/misterhouse/misterhouse-2.103-r1.ebuild b/app-misc/misterhouse/misterhouse-2.103-r1.ebuild
index e422ecc34c1c..ad9caf8d4b4e 100644
--- a/app-misc/misterhouse/misterhouse-2.103-r1.ebuild
+++ b/app-misc/misterhouse/misterhouse-2.103-r1.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
DESCRIPTION="Mister House, an open source home automation program with X10 support"
@@ -34,7 +34,7 @@ src_install() {
for a in "${S}"/docs/*; do
dodoc ${a}
done
- dosym /usr/share/doc/${PF} /opt/misterhouse/docs
+ dosym ../../usr/share/doc/${PF} /opt/misterhouse/docs
cp -r "${S}/lib" "${D}/opt/misterhouse"
cp -r "${S}/sounds" "${D}/opt/misterhouse"
cp -r "${S}/web" "${D}/opt/misterhouse"
diff --git a/app-misc/misterhouse/misterhouse-2.105-r1.ebuild b/app-misc/misterhouse/misterhouse-2.105-r1.ebuild
index d7762dc8b97f..bd19df19011e 100644
--- a/app-misc/misterhouse/misterhouse-2.105-r1.ebuild
+++ b/app-misc/misterhouse/misterhouse-2.105-r1.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="5"
@@ -36,7 +36,7 @@ src_install() {
for a in "${S}"/docs/*; do
dodoc ${a} || die
done
- dosym /usr/share/doc/${PF} /opt/misterhouse/docs
+ dosym ../../usr/share/doc/${PF} /opt/misterhouse/docs
cp -r "${S}/lib" "${D}/opt/misterhouse" || die
cp -r "${S}/sounds" "${D}/opt/misterhouse" || die
cp -r "${S}/web" "${D}/opt/misterhouse" || die
diff --git a/app-misc/razertool/razertool-0.0.7-r4.ebuild b/app-misc/razertool/razertool-0.0.7-r4.ebuild
index 37c939c3b6a7..916571dbd9e0 100644
--- a/app-misc/razertool/razertool-0.0.7-r4.ebuild
+++ b/app-misc/razertool/razertool-0.0.7-r4.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
@@ -51,7 +51,7 @@ src_install() {
newins razertool.rules.example 90-razertool.rules
# Icon and desktop entry
- dosym /usr/share/${PN}/pixmaps/${PN}-icon.png /usr/share/pixmaps/${PN}-icon.png
+ dosym ../razertool/pixmaps/razertool-icon.png /usr/share/pixmaps/razertool-icon.png
make_desktop_entry "razertool-gtk" "RazerTool" ${PN}-icon "GTK;Settings;HardwareSettings"
}
diff --git a/app-misc/rox-filer/rox-filer-2.11.ebuild b/app-misc/rox-filer/rox-filer-2.11.ebuild
index 3aefe90bbb29..98807eb99883 100644
--- a/app-misc/rox-filer/rox-filer-2.11.ebuild
+++ b/app-misc/rox-filer/rox-filer-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -49,21 +49,21 @@ src_install() {
newbin ROX-Filer rox
- dosym /usr/share/rox/ROX/MIME/text-x-{diff,patch}.png
- dosym /usr/share/rox/ROX/MIME/application-x-font-{afm,type1}.png
- dosym /usr/share/rox/ROX/MIME/application-xml{,-dtd}.png
- dosym /usr/share/rox/ROX/MIME/application-xml{,-external-parsed-entity}.png
- dosym /usr/share/rox/ROX/MIME/application-{,rdf+}xml.png
- dosym /usr/share/rox/ROX/MIME/application-x{ml,-xbel}.png
- dosym /usr/share/rox/ROX/MIME/application-{x-shell,java}script.png
- dosym /usr/share/rox/ROX/MIME/application-x-{bzip,xz}-compressed-tar.png
- dosym /usr/share/rox/ROX/MIME/application-x-{bzip,lzma}-compressed-tar.png
- dosym /usr/share/rox/ROX/MIME/application-x-{bzip-compressed-tar,lzo}.png
- dosym /usr/share/rox/ROX/MIME/application-x-{bzip,xz}.png
- dosym /usr/share/rox/ROX/MIME/application-x-{gzip,lzma}.png
- dosym /usr/share/rox/ROX/MIME/application-{msword,rtf}.png
+ dosym text-x-diff.png /usr/share/rox/ROX/MIME/text-x-patch.png
+ dosym application-x-font-afm.png /usr/share/rox/ROX/MIME/application-x-font-type1.png
+ dosym application-xml.png /usr/share/rox/ROX/MIME/application-xml-dtd.png
+ dosym application-xml.png /usr/share/rox/ROX/MIME/application-xml-external-parsed-entity.png
+ dosym application-xml.png /usr/share/rox/ROX/MIME/application-rdf+xml.png
+ dosym application-xml.png /usr/share/rox/ROX/MIME/application-x-xbel.png
+ dosym application-x-shellscript.png /usr/share/rox/ROX/MIME/application-javascript.png
+ dosym application-x-bzip-compressed-tar.png /usr/share/rox/ROX/MIME/application-x-xz-compressed-tar.png
+ dosym application-x-bzip-compressed-tar.png /usr/share/rox/ROX/MIME/application-x-lzma-compressed-tar.png
+ dosym application-x-bzip-compressed-tar.png /usr/share/rox/ROX/MIME/application-x-lzo.png
+ dosym application-x-bzip.png /usr/share/rox/ROX/MIME/application-x-xz.png
+ dosym application-x-gzip.png /usr/share/rox/ROX/MIME/application-x-lzma.png
+ dosym application-msword.png /usr/share/rox/ROX/MIME/application-rtf.png
- dosym /usr/share/rox/.DirIcon /usr/share/pixmaps/rox.png
+ dosym ../rox/.DirIcon /usr/share/pixmaps/rox.png
insinto /usr/share/applications
doins "${FILESDIR}"/rox.desktop
diff --git a/app-misc/taskd/taskd-1.1.0-r1.ebuild b/app-misc/taskd/taskd-1.1.0-r1.ebuild
index 8630f97efa79..4744a209730c 100644
--- a/app-misc/taskd/taskd-1.1.0-r1.ebuild
+++ b/app-misc/taskd/taskd-1.1.0-r1.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=5
@@ -57,7 +57,7 @@ src_install() {
insinto /etc/taskd
doins "${FILESDIR}"/config
- dosym /etc/taskd/config /var/lib/taskd/config
+ dosym ../../../etc/taskd/config /var/lib/taskd/config
insinto /etc/logrotate.d
newins "${FILESDIR}"/taskd.logrotate taskd
diff --git a/app-misc/tracker/tracker-1.10.5.ebuild b/app-misc/tracker/tracker-1.10.5.ebuild
index 2f4122fd7877..37233ae3d743 100644
--- a/app-misc/tracker/tracker-1.10.5.ebuild
+++ b/app-misc/tracker/tracker-1.10.5.ebuild
@@ -218,12 +218,12 @@ src_install() {
# Manually symlink extensions for {firefox,thunderbird}-bin
if use firefox-bookmarks; then
- dosym /usr/share/xul-ext/trackerfox \
+ dosym ../../../share/xul-ext/trackerfox \
/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
fi
if use thunderbird; then
- dosym /usr/share/xul-ext/trackerbird \
+ dosym ../../../share/xul-ext/trackerbird \
/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
fi
}
diff --git a/app-misc/tracker/tracker-1.12.2.ebuild b/app-misc/tracker/tracker-1.12.2.ebuild
index e404e8c72d2e..1bd0a077315c 100644
--- a/app-misc/tracker/tracker-1.12.2.ebuild
+++ b/app-misc/tracker/tracker-1.12.2.ebuild
@@ -219,12 +219,12 @@ src_install() {
# Manually symlink extensions for {firefox,thunderbird}-bin
if use firefox-bookmarks; then
- dosym /usr/share/xul-ext/trackerfox \
+ dosym ../../../share/xul-ext/trackerfox \
/usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org
fi
if use thunderbird; then
- dosym /usr/share/xul-ext/trackerbird \
+ dosym ../../../share/xul-ext/trackerbird \
/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
fi
}
diff --git a/app-office/lyx/lyx-2.0.8.1-r1.ebuild b/app-office/lyx/lyx-2.0.8.1-r1.ebuild
index 1078ff7ee99a..96bc6149e56a 100644
--- a/app-office/lyx/lyx-2.0.8.1-r1.ebuild
+++ b/app-office/lyx/lyx-2.0.8.1-r1.ebuild
@@ -136,8 +136,8 @@ src_install() {
python_fix_shebang "${ED}"/usr/share/${PN}
if use hunspell ; then
- dosym /usr/share/myspell /usr/share/lyx/dicts
- dosym /usr/share/myspell /usr/share/lyx/thes
+ dosym ../myspell /usr/share/lyx/dicts
+ dosym ../myspell /usr/share/lyx/thes
fi
}
diff --git a/app-office/lyx/lyx-2.1.5-r1.ebuild b/app-office/lyx/lyx-2.1.5-r1.ebuild
index 807a748fa5c5..249843210ca6 100644
--- a/app-office/lyx/lyx-2.1.5-r1.ebuild
+++ b/app-office/lyx/lyx-2.1.5-r1.ebuild
@@ -135,8 +135,8 @@ src_install() {
python_fix_shebang "${ED}"/usr/share/${PN}
if use hunspell ; then
- dosym /usr/share/myspell /usr/share/lyx/dicts
- dosym /usr/share/myspell /usr/share/lyx/thes
+ dosym ../myspell /usr/share/lyx/dicts
+ dosym ../myspell /usr/share/lyx/thes
fi
}
diff --git a/app-office/lyx/lyx-2.2.2-r1.ebuild b/app-office/lyx/lyx-2.2.2-r1.ebuild
index 7bfab99130be..e3060f8aa90d 100644
--- a/app-office/lyx/lyx-2.2.2-r1.ebuild
+++ b/app-office/lyx/lyx-2.2.2-r1.ebuild
@@ -149,8 +149,8 @@ src_install() {
python_fix_shebang "${ED}"/usr/share/${PN}
if use hunspell ; then
- dosym /usr/share/myspell /usr/share/lyx/dicts
- dosym /usr/share/myspell /usr/share/lyx/thes
+ dosym ../myspell /usr/share/lyx/dicts
+ dosym ../myspell /usr/share/lyx/thes
fi
}
diff --git a/app-office/lyx/lyx-2.2.3-r1.ebuild b/app-office/lyx/lyx-2.2.3-r1.ebuild
index 89e6a668851e..0ccfcdc78f22 100644
--- a/app-office/lyx/lyx-2.2.3-r1.ebuild
+++ b/app-office/lyx/lyx-2.2.3-r1.ebuild
@@ -153,8 +153,8 @@ src_install() {
python_fix_shebang "${ED}"/usr/share/${PN}
if use hunspell ; then
- dosym /usr/share/myspell /usr/share/lyx/dicts
- dosym /usr/share/myspell /usr/share/lyx/thes
+ dosym ../myspell /usr/share/lyx/dicts
+ dosym ../myspell /usr/share/lyx/thes
fi
}
diff --git a/app-office/lyx/lyx-2.2.3.ebuild b/app-office/lyx/lyx-2.2.3.ebuild
index 7bfab99130be..e3060f8aa90d 100644
--- a/app-office/lyx/lyx-2.2.3.ebuild
+++ b/app-office/lyx/lyx-2.2.3.ebuild
@@ -149,8 +149,8 @@ src_install() {
python_fix_shebang "${ED}"/usr/share/${PN}
if use hunspell ; then
- dosym /usr/share/myspell /usr/share/lyx/dicts
- dosym /usr/share/myspell /usr/share/lyx/thes
+ dosym ../myspell /usr/share/lyx/dicts
+ dosym ../myspell /usr/share/lyx/thes
fi
}
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 3c14d44fe7b0..4d31199ef777 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="tk?"
CMAKE_MAKEFILE_GENERATOR=ninja
CMAKE_MIN_VERSION=3.2.0
-inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1
+inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1 subversion
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="http://www.scribus.net/"
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index 483c9e73288e..d7dff16c2f5b 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,3 +1,2 @@
-DIST smart-live-rebuild-1.3.3.tar.bz2 16270 SHA256 7ec74e796695dfb8ee34c3172b6abe20d77d5523679cc3890f02e06384eb716a SHA512 e06105e7cca91151e37b501de258ddce15ccd3afb356391485bbbe37021cea6fe6a04140b29526547cf52503fc9272c15e621b84deba2e04cde07539b61268f2 WHIRLPOOL 6bdb5415b477b334d47c9046816251f7f7bae1731d49b93e7b67baee12aaa7355d3a6602a5fc804b6372bc777eceaf4e225e252c6c1d0e23d1277564c16967d6
DIST smart-live-rebuild-1.3.4.1.tar.bz2 15980 SHA256 dd1e780937322a4cdee5a8f9af48d24283bda203e40167d02c7bb18924a4335f SHA512 65b864532e662d0fa032962673c2c2d6c1e21c557c82e295591086aea22de90ca9fed0e90bb0da0f6926ab19176a04ab41ee80c88dd8c5c05c3751c30ca39a92 WHIRLPOOL 329ea91bba103c6b2728905dac33532030d2c0ae802deb19056b1719bec6d85bd9b9a039cad4b3add92620c003cc573c797080cb2e02f09e670a0475439904be
-DIST smart-live-rebuild-1.3.4.tar.bz2 16022 SHA256 1d949b91a925faaae70b46c88b5af8d4b72a1a435abd85845dd8adadae5f3d92 SHA512 4dc50b226b8bd2dc2ce8f7d41eccff2d788cc5c4caa779d22a40d53a491726153419c6678e3bac764238cf9e7adf0dc4c1631a4e11df9b88deb0f9dc7c0e7cd7 WHIRLPOOL 39d8732aee4b09b464e45e990e26ce49989280e0734f27fccdbb5044b0a1d983a9e1cf25529a650feb7faab13ec63c1c116e535897c6c2845af0efcc1a8f079b
+DIST smart-live-rebuild-1.3.5.tar.bz2 16004 SHA256 f7d304bb00ec32ab48bb3062a89896dbd0df344e010e91ea40417d162f5ad881 SHA512 46933334c8c46a056c837e60a5d8aed30a35b1ddd20d7c0f03e813f6cac11cc2dc9469674b1e9c23d94c9ebc474e5eacc7aa0e8f82492554a7f49b438ed740d2 WHIRLPOOL d9a5ab93057cc3070f46fec49eee0c71237481a8e3dc84a9de40df5eb78d2fe3617b5fd1f82c04b24e9bfaef81de0883d0c8696c00ff8e7a685f175e30783370
diff --git a/app-portage/smart-live-rebuild/metadata.xml b/app-portage/smart-live-rebuild/metadata.xml
index f34634610ebe..fd31fc1dbcf4 100644
--- a/app-portage/smart-live-rebuild/metadata.xml
+++ b/app-portage/smart-live-rebuild/metadata.xml
@@ -16,7 +16,7 @@
mgorny@gentoo.org
Michał Górny
- https://bitbucket.org/mgorny/smart-live-rebuild/issues/
- mgorny/smart-live-rebuild
+ https://github.com/mgorny/smart-live-rebuild/issues/
+ mgorny/smart-live-rebuild
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.3.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.3.ebuild
deleted file mode 100644
index 8984f16d38e5..000000000000
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://bitbucket.org/mgorny/smart-live-rebuild/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
-
-python_test() {
- "${PYTHON}" setup.py test || die
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /etc/portage
- newins smart-live-rebuild.conf{.example,}
- insinto /usr/share/portage/config/sets
- newins sets.conf.example ${PN}.conf
-}
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild
index 2d74dea7c0ec..d6076ad37afd 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.1.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://bitbucket.org/mgorny/smart-live-rebuild/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI="https://github.com/mgorny/smart-live-rebuild/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.5.ebuild
similarity index 55%
rename from app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.ebuild
rename to app-portage/smart-live-rebuild/smart-live-rebuild-1.3.5.ebuild
index 3b275c131e81..19a3369a8d7a 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.4.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.5.ebuild
@@ -1,22 +1,25 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://bitbucket.org/mgorny/smart-live-rebuild/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI="https://github.com/mgorny/smart-live-rebuild/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 arm ~mips ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
+# Tests need to be fixed
+RESTRICT=test
+
python_test() {
esetup.py test
}
@@ -27,5 +30,5 @@ python_install_all() {
insinto /etc/portage
newins smart-live-rebuild.conf{.example,}
insinto /usr/share/portage/config/sets
- newins sets.conf.example ${PN}.conf
+ newins sets.conf.example smart-live-rebuild.conf
}
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
index 6764d0245429..c8a7533d0933 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-9999.ebuild
@@ -1,32 +1,23 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
-
-#if LIVE
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-inherit git-r3
-#endif
+EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
+inherit distutils-r1 git-r3
DESCRIPTION="Check live packages for updates and emerge them as necessary"
-HOMEPAGE="https://bitbucket.org/mgorny/smart-live-rebuild/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/smart-live-rebuild/"
+SRC_URI=""
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
+KEYWORDS=""
IUSE=""
RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
-
python_test() {
esetup.py test
}
@@ -37,5 +28,5 @@ python_install_all() {
insinto /etc/portage
newins smart-live-rebuild.conf{.example,}
insinto /usr/share/portage/config/sets
- newins sets.conf.example ${PN}.conf
+ newins sets.conf.example smart-live-rebuild.conf
}
diff --git a/app-shells/tcsh/tcsh-6.20.00.ebuild b/app-shells/tcsh/tcsh-6.20.00.ebuild
index 7f54dbfaf363..f78c18beaf4d 100644
--- a/app-shells/tcsh/tcsh-6.20.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.20.00.ebuild
@@ -97,5 +97,5 @@ src_install() {
"${CONFDIR}"/csh.login
# bug #119703: add csh -> tcsh symlink
- dosym /bin/tcsh /bin/csh
+ dosym tcsh /bin/csh
}
diff --git a/app-text/fbreader/fbreader-0.99.4-r2.ebuild b/app-text/fbreader/fbreader-0.99.4-r2.ebuild
index 5a44b67d2de6..347957b53029 100644
--- a/app-text/fbreader/fbreader-0.99.4-r2.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r2.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=5
@@ -84,5 +84,5 @@ src_compile() {
src_install() {
default
- dosym /usr/bin/FBReader /usr/bin/fbreader
+ dosym FBReader /usr/bin/fbreader
}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.20-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.20-r1.ebuild
index 9e2f17bfe1a8..0d941e885432 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.20-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.20-r1.ebuild
@@ -237,7 +237,7 @@ src_install() {
done
# install the CMaps from poppler-data properly, bug #409361
- dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
+ dosym ../../../poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
use static-libs || prune_libtool_files --all
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.20-r2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.20-r2.ebuild
index 72d273933d4a..d2d44e823199 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.20-r2.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.20-r2.ebuild
@@ -236,7 +236,7 @@ src_install() {
done
# install the CMaps from poppler-data properly, bug #409361
- dosym "${EPREFIX}/usr/share/poppler/cMaps" "/usr/share/ghostscript/${PVM}/Resource/CMap"
+ dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
use static-libs || find "${ED}" -name '*.la' -delete
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
index 5231afd45b42..a13f502767ae 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
@@ -196,7 +196,7 @@ src_install() {
done
# install the CMaps from poppler-data properly, bug #409361
- dosym "${EPREFIX}/usr/share/poppler/cMaps" "/usr/share/ghostscript/${PVM}/Resource/CMap"
+ dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
use static-libs || find "${ED}" -name '*.la' -delete
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 278dbc7fed62..4fbbec07c4f4 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,3 +1,4 @@
DIST qpdf-5.1.1.tar.gz 7662701 SHA256 95d355d8fa5e1c677e04d884161de94f5438bf3bdc1638498796b042bad4a726 SHA512 236132290694730d7de08635560435d34ae44f4edbc1b887e494f2ee183271331827226e7e29e539d25d5a2ca1dd5815a387c46edc0b6fd898436bbb674d9993 WHIRLPOOL 66eee10dc5163f1e53afcbd02b71bab73598c28ebb9b005c26af4e58396fd693af7ed76a17fd0c29819b0fa08a71ea0158c76bfa0b0d452a78bb357277644459
DIST qpdf-5.1.3.tar.gz 7681578 SHA256 d5164bdad3afc381568dbe8e1509a4a6a911d4d077f1fc20b9866ef8fad901d3 SHA512 676cc6db27dcbcdece21cb427c6aae14646389f4000ff111feee8fdbbb03fe715035e5236a08db4137f275a09ed0dda5c80afbdc5093fe7f56b69a0e335ab73a WHIRLPOOL 96cf06c0da63f9f3f5bccd422875c23e473443a4552de3c23ab9971104876fb5463cb6b7db86faee3aac04bddd9b59391093a7d5840cad801093162561ba459d
DIST qpdf-6.0.0.tar.gz 8344860 SHA256 a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233 SHA512 303e3cc77ddb87b9494e26c35e0b45b42f73692054c56a00f2e4f1922633c6ebb45c8684992cd9bf32f03366fcc4cd7e7ec6fb9432d2dbba6e0b24395909b5bf WHIRLPOOL f9fae783c16a93826f825a8efe1a116cbde00fb19b8b56dbfcad7878557c106c8f7a58945af3002f2a72aa032247008013edce8943a45cca8c186b68bf2b5cd3
+DIST qpdf-7.0.b1.tar.gz 5788093 SHA256 823ebfefee19b8e4c131866a5e5f403422a95e8a7f75df188ee1a20584cf408e SHA512 1df7f7a242ae6e4f7ad9b7b4a465103c880f6df073032591d4b9a684c8505f5b671ba58f489740eac63e4cab01e8540ba3c66dddc66c303e6e47a641fcd5b866 WHIRLPOOL d24f3def935ecb04eb0d04f5c2fc3b35a69d2b144082a0c7cff8aab16191f6b37829fb79aea3561e01d4d7a201d2b5e1288ea91933bc59b1d94b74db0e8e849a
diff --git a/app-text/qpdf/qpdf-7.0_beta1.ebuild b/app-text/qpdf/qpdf-7.0_beta1.ebuild
new file mode 100644
index 000000000000..56151cae0568
--- /dev/null
+++ b/app-text/qpdf/qpdf-7.0_beta1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_beta/.b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${MY_P}.tar.gz"
+
+LICENSE="Artistic-2"
+
+# subslot = libqpdf soname version
+SLOT="0/18"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples perl static-libs test"
+
+CDEPEND="
+ sys-libs/zlib
+"
+DEPEND="${CDEPEND}
+ test? (
+ sys-apps/diffutils
+ media-libs/tiff
+ app-text/ghostscript-gpl[tiff]
+ )
+"
+# Only need perl for the installed tools.
+RDEPEND="${CDEPEND}
+ perl? ( >=dev-lang/perl-5.8 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ CONFIG_SHELL=/bin/bash econf \
+ $(use_enable static-libs static) \
+ $(use_enable test test-compare-images)
+}
+
+src_install() {
+ default
+
+ if ! use perl ; then
+ rm "${ED}"/usr/bin/fix-qdf || die
+ rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
+ fi
+
+ if use examples ; then
+ dobin examples/build/.libs/*
+ fi
+
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/t1utils/t1utils-1.41.ebuild b/app-text/t1utils/t1utils-1.41-r1.ebuild
similarity index 84%
rename from app-text/t1utils/t1utils-1.41.ebuild
rename to app-text/t1utils/t1utils-1.41-r1.ebuild
index 2023fde00df1..810aff2d6510 100644
--- a/app-text/t1utils/t1utils-1.41.ebuild
+++ b/app-text/t1utils/t1utils-1.41-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-IUSE=""
+EAPI=6
DESCRIPTION="Type 1 Font utilities"
SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
@@ -9,12 +9,10 @@ HOMEPAGE="http://www.lcdf.org/type/#t1utils"
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 ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
LICENSE="BSD"
+IUSE=""
DEPEND=""
RDEPEND="${DEPEND}
!=media-libs/gst-plugins-good-${PV}:1.0
>=media-plugins/gst-plugins-jpeg-${PV}:1.0 )
"
-# dev-cpp/mm-common"
-# eautoreconf needs mm-common
+# eautoreconf:
+# dev-cpp/mm-common
# Installs reference docs into /usr/share/doc/gstreamermm-1.0/
# but that's okay, because the rest of dev-cpp/*mm stuff does the same
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 4c63de425362..7888be36d69e 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -3,3 +3,4 @@ DIST etcd-3.0.17.tar.gz 2208002 SHA256 c56c68a8cd5d120a51432f3a79a2c19082a682449
DIST etcd-3.1.10.tar.gz 2532936 SHA256 22b25185571cf72409d35e28b9f15ea12cef02cffb552bc4efb7b74ffb62c0e7 SHA512 feb0745c2377248f9ad62359fbd6c2f0b3afbd94f89919963edf56965c98b5666f7b24fcf698599b35483b89b773dcbd647696eabc0436db6a88c68dbfc6dd6b WHIRLPOOL 0c922f1114753e126063689ebe722db59dace7715f7631ec6ca2f92438c405d9184bdebe277f2b808f5194bf2cf42904180bc7b80da051941ee3db2620b82ab7
DIST etcd-3.2.4.tar.gz 2882024 SHA256 e0ba8e9a0f0cc9631eadfcd4def78649d22e76e2f5b3d21b378466b306708d8b SHA512 57fed2229a3d8a395bd5f797a51e2489d8e10f86ae68925e176c3ce3b2068d3c895d280cf5b51ab84b5973970536eeb645a584d729c7ec29b890aacab4c36d2c WHIRLPOOL 8d88d9cdf90c0622566e09a831b4a739e26c7f72dfa7fb8095ed5317034d3f981e677e5f5d809a7c3bfa68892cc69d590d08a6bd341fb2c097797488ef7a2686
DIST etcd-3.2.5.tar.gz 2887261 SHA256 dcb183ebc4a09aec24d33179253f930ef35e23ad51ed1324c14e55b049edf3f9 SHA512 189d254603672479b03bf1392694ddcbec876143b6c0726ec7b31f594e6939c0010d04d3ce706992f736983df9463bd920ba5b7157c2207f956f676fc913b489 WHIRLPOOL 4fa40cfb41dc0118f5b6153f34548824e281e80b06c3444b361216c3210249e4e2e5270b979a8db7827eacb2a0c9782d0dc88b3c3097fcda5ba033fe6fce2a20
+DIST etcd-3.2.6.tar.gz 2886557 SHA256 23ab4016bf0a057d36461cee001dc5b38d0d757fa5d9e8226833687dab06faa2 SHA512 3e26bc12cafbead201b41d7f25e247f24b3480ebcc76e94f2ae4e12e573a973b60e28f36fa012d1f7bc21edc670fd8910b33cd7e9f30c3a809a6f186af3ffc9d WHIRLPOOL 203833459801b18bd000bc1420f3ab14a7de601b3c18798c2537b75a510e720e5408424388bb7d643014a0de9870213533661bfad487ae30846969fdfa8efdf8
diff --git a/dev-db/etcd/etcd-3.2.6.ebuild b/dev-db/etcd/etcd-3.2.6.ebuild
new file mode 100644
index 000000000000..9de03c3233bf
--- /dev/null
+++ b/dev-db/etcd/etcd-3.2.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/coreos/etcd"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/coreos/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.8:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+ default
+ sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
+ -i "${S}"/src/${EGO_PN}/build || die
+}
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_compile() {
+ export GOPATH=${S}
+ pushd src/${EGO_PN} || die
+ ./build || die
+ popd || die
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ insinto /etc/${PN}
+ doins "${FILESDIR}/${PN}.conf"
+ dobin bin/*
+ dodoc README.md
+ use doc && dodoc -r Documentation
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ dodir /var/lib/${PN}
+ fowners ${PN}:${PN} /var/lib/${PN}
+ fperms 755 /var/lib/${PN}
+ dodir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ fperms 755 /var/log/${PN}
+ popd || die
+}
+
+src_test() {
+ pushd src/${EGO_PN} || die
+ ./test || die
+ popd || die
+}
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 45050af13fbf..b7da0dc71d94 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,3 +1,4 @@
DIST mysql-connector-c++-1.1.3.tar.gz 496226 SHA256 4b1516f183f29c011c1677d5a9b174d0f5c3b761d2e8056e79690c55c01ea690 SHA512 c03a4ae25e9d189a5114ab630bef6edaefd1aee809dbb1ec26b765f5e84b93fbe17e5f7357a4fe2a95c179cd2028b676151df4baf4e3da7515543ecc0834afd7 WHIRLPOOL 5f04231cec63de16c2a076143b2e0409544ebdf600d7423f63c8c2db45f1b63048e1da108a9f374dda6b6ff0d4c13b509190390e797f4674e14284acbaa9e2e5
DIST mysql-connector-c++-1.1.6.tar.gz 522236 SHA256 ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447 SHA512 e940b6ee090f792bad8acbbfa3dacd46310ac40c7993c4097eeebb6be4b792d3f1856574e603a71e2795773db97169f47c9ed76a127654472370c726bcb291c7 WHIRLPOOL b3027423cf2e250f1fd7340b58ff5ff55ce771c91cc435e37cddd156f681621206438b6329a49df760dce660ef983b3cf3e5060af527668de64ed06e69830d12
DIST mysql-connector-c++-1.1.8.tar.gz 528954 SHA256 85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963 SHA512 c3ab5c1e805598d557a449c44f77ce44cc110e5b529075e38b4f775d3726ebd16a2155f61e47a378a375a9d9362d1520334ea25376636151ddd087291aafd85d WHIRLPOOL 6cb88c3b28a8b0bf072b97c55c8b24de016e8bc5f4d66dce7597cfee2f6c2e83fc88f5d1203df60b3425af5881834635ab3f2053bea6a4c16c7eb73be1f3950c
+DIST mysql-connector-c++-1.1.9.tar.gz 508255 SHA256 3e31847a69a4e5c113b7c483731317ec4533858e3195d3a85026a0e2f509d2e4 SHA512 ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646 WHIRLPOOL b8dbd1f12a6efac5e337c85ff9f32b53a0185af9ae4fd281d4c2e3f68749dabf0e361f775f3bbea44699b8d686a277ea123cb22b6b11ff6222d84b5e111bb74d
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch
index a2a33e0c76db..35ed218e18dc 100644
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch
@@ -5,7 +5,7 @@ diff -aurN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
proxy->get_character_set_info(&cs);
*(static_cast(optionValue)) = cs.mbmaxlen;
/* mysql_get_option() was added in mysql 5.7.3 version */
-+#ifndef MARIADB_BASE_VERSION
++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
} else if ( proxy->get_server_version() >= 50703 ) {
try {
if (GET_CONN_OPTION(optionName, optionValue, intOptions)) {
@@ -21,7 +21,7 @@ diff -aurN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
MY_CHARSET_INFO cs;
proxy->get_character_set_info(&cs);
return cs.dir ? sql::SQLString(cs.dir) : "";
-+#ifndef MARIADB_BASE_VERSION
++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
} else if ( proxy->get_server_version() >= 50703 ) {
const char* optionValue= NULL;
if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) {
@@ -39,7 +39,7 @@ diff -aurN a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmy
LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg)
{
-#if MYSQL_VERSION_ID >= 50703
-+#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION )
++#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
if (::mysql_get_option(mysql, option, arg)) {
throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()");
} else {
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
new file mode 100644
index 000000000000..1120d852cbed
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
+URI_DIR="Connector-C++"
+SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug examples gcov static-libs"
+
+DEPEND="virtual/libmysqlclient:=
+ dev-libs/boost:=
+ dev-libs/openssl:0=
+ !
+
+ mgorny@gentoo.org
+ Michał Górny
+
gnome@gentoo.org
Gentoo GNOME Desktop
diff --git a/dev-libs/libgit2/metadata.xml b/dev-libs/libgit2/metadata.xml
index ce551cf8d150..341b4d4cf6d8 100644
--- a/dev-libs/libgit2/metadata.xml
+++ b/dev-libs/libgit2/metadata.xml
@@ -1,6 +1,10 @@
+
+ mgorny@gentoo.org
+ Michał Górny
+
gnome@gentoo.org
Gentoo GNOME Desktop
diff --git a/dev-libs/libmspack/files/libmspack-0.5_alpha-CVE-2017-6419.patch b/dev-libs/libmspack/files/libmspack-0.5_alpha-CVE-2017-6419.patch
new file mode 100644
index 000000000000..1b81fdcbfcd4
--- /dev/null
+++ b/dev-libs/libmspack/files/libmspack-0.5_alpha-CVE-2017-6419.patch
@@ -0,0 +1,41 @@
+From a83773682e856ad6529ba6db8d1792e6d515d7f1 Mon Sep 17 00:00:00 2001
+From: Mickey Sola
+Date: Wed, 29 Mar 2017 14:55:26 -0400
+Subject: [PATCH] fixing potential OOB window write when unpacking chm files
+
+---
+ libclamav/libmspack-0.5alpha/mspack/lzxd.c | 11 +++++++++--
+ libclamav/libmspack.c | 6 +++++-
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/libclamav/libmspack-0.5alpha/mspack/lzxd.c b/libclamav/libmspack-0.5alpha/mspack/lzxd.c
+index 2281e7b9d..45105a583 100644
+--- a/mspack/lzxd.c
++++ b/mspack/lzxd.c
+@@ -766,8 +766,13 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
+ case LZX_BLOCKTYPE_UNCOMPRESSED:
+ /* as this_run is limited not to wrap a frame, this also means it
+ * won't wrap the window (as the window is a multiple of 32k) */
++ if (window_posn + this_run > lzx->window_size) {
++ D(("match ran over window boundary"))
++ return lzx->error = MSPACK_ERR_DECRUNCH;
++ }
+ rundest = &window[window_posn];
+ window_posn += this_run;
++
+ while (this_run > 0) {
+ if ((i = i_end - i_ptr) == 0) {
+ READ_IF_NEEDED;
+@@ -888,8 +893,10 @@ void lzxd_free(struct lzxd_stream *lzx) {
+ struct mspack_system *sys;
+ if (lzx) {
+ sys = lzx->sys;
+- sys->free(lzx->inbuf);
+- sys->free(lzx->window);
++ if(lzx->inbuf)
++ sys->free(lzx->inbuf);
++ if(lzx->window)
++ sys->free(lzx->window);
+ sys->free(lzx);
+ }
+ }
diff --git a/dev-libs/libmspack/libmspack-0.5_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.5_alpha-r1.ebuild
new file mode 100644
index 000000000000..f8c7bd3ce1d1
--- /dev/null
+++ b/dev-libs/libmspack/libmspack-0.5_alpha-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+MY_PV="${PV/_alpha/alpha}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A library for Microsoft compression formats"
+HOMEPAGE="https://www.cabextract.org.uk/libmspack/"
+SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=(
+ "${FILESDIR}/${P}-CVE-2017-6419.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable debug) \
+ $(use_enable static-libs static)
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ default
+ cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die
+ fi
+}
+
+multilib_src_install_all() {
+ DOCS=(AUTHORS ChangeLog NEWS README TODO)
+ prune_libtool_files --all
+ use doc && HTML_DOCS=(doc/*)
+ default_src_install
+ if use doc; then
+ rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+ fi
+}
diff --git a/dev-libs/libpcre/libpcre-8.41.ebuild b/dev-libs/libpcre/libpcre-8.41.ebuild
index 6cbba141eb19..ff518d13da4a 100644
--- a/dev-libs/libpcre/libpcre-8.41.ebuild
+++ b/dev-libs/libpcre/libpcre-8.41.ebuild
@@ -18,7 +18,7 @@ fi
LICENSE="BSD"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
diff --git a/dev-libs/libpcre2/libpcre2-10.30.ebuild b/dev-libs/libpcre2/libpcre2-10.30.ebuild
index 2e243619cc6d..fc1254b5bbd2 100644
--- a/dev-libs/libpcre2/libpcre2-10.30.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.30.ebuild
@@ -18,7 +18,7 @@ fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="?? ( libedit readline )"
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch b/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch
index a996bf64a18d..a231269b4b8a 100644
--- a/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch
@@ -25,7 +25,7 @@ do not build test programs as we don't install them
#testOOM_LDADD= $(LDADDS)
-runtests:
-+runtests: check_PROGRAMS
++runtests: $(check_PROGRAMS)
[ -d test ] || $(LN_S) $(srcdir)/test .
[ -d result ] || $(LN_S) $(srcdir)/result .
$(CHECKER) ./runtest$(EXEEXT) && $(CHECKER) ./testrecurse$(EXEEXT) &&$(CHECKER) ./testapi$(EXEEXT) && $(CHECKER) ./testchar$(EXEEXT)&& $(CHECKER) ./testdict$(EXEEXT) && $(CHECKER) ./runxmlconf$(EXEEXT)
diff --git a/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-0663.patch b/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-0663.patch
new file mode 100644
index 000000000000..517e178a533e
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-0663.patch
@@ -0,0 +1,43 @@
+From d815758b6a8c9dee8155268e49b5ef3b80135a14 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer
+Date: Tue, 6 Jun 2017 12:56:28 +0200
+Subject: [PATCH 1/3] Fix type confusion in xmlValidateOneNamespace
+
+Comment out code that casts xmlNsPtr to xmlAttrPtr. ID types on
+namespace declarations make no practical sense anyway.
+
+Fixes bug 780228.
+
+Found with libFuzzer and ASan.
+---
+ valid.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/valid.c b/valid.c
+index 8075d3a0..c51ea290 100644
+--- a/valid.c
++++ b/valid.c
+@@ -4627,6 +4627,12 @@ xmlNodePtr elem, const xmlChar *prefix, xmlNsPtr ns, const xmlChar *value) {
+ }
+ }
+
++ /*
++ * Casting ns to xmlAttrPtr is wrong. We'd need separate functions
++ * xmlAddID and xmlAddRef for namespace declarations, but it makes
++ * no practical sense to use ID types anyway.
++ */
++#if 0
+ /* Validity Constraint: ID uniqueness */
+ if (attrDecl->atype == XML_ATTRIBUTE_ID) {
+ if (xmlAddID(ctxt, doc, value, (xmlAttrPtr) ns) == NULL)
+@@ -4638,6 +4644,7 @@ xmlNodePtr elem, const xmlChar *prefix, xmlNsPtr ns, const xmlChar *value) {
+ if (xmlAddRef(ctxt, doc, value, (xmlAttrPtr) ns) == NULL)
+ ret = 0;
+ }
++#endif
+
+ /* Validity Constraint: Notation Attributes */
+ if (attrDecl->atype == XML_ATTRIBUTE_NOTATION) {
+--
+2.14.1
+
diff --git a/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-7376.patch b/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-7376.patch
new file mode 100644
index 000000000000..14ec773608b6
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.4-CVE-2017-7376.patch
@@ -0,0 +1,31 @@
+From 43cd3b6222bda2332e963eb1c9ead78f29912b0a Mon Sep 17 00:00:00 2001
+From: Daniel Veillard
+Date: Fri, 7 Apr 2017 17:13:28 +0200
+Subject: [PATCH 2/3] Increase buffer space for port in HTTP redirect support
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=780690
+
+nanohttp.c: the code wrongly assumed a short int port value.
+---
+ nanohttp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nanohttp.c b/nanohttp.c
+index 26e4290e..9c17530e 100644
+--- a/nanohttp.c
++++ b/nanohttp.c
+@@ -1423,9 +1423,9 @@ retry:
+ if (ctxt->port != 80) {
+ /* reserve space for ':xxxxx', incl. potential proxy */
+ if (proxy)
+- blen += 12;
++ blen += 17;
+ else
+- blen += 6;
++ blen += 11;
+ }
+ bp = (char*)xmlMallocAtomic(blen);
+ if ( bp == NULL ) {
+--
+2.14.1
+
diff --git a/dev-libs/libxml2/files/libxml2-2.9.4-fix-root-node-cmp.patch b/dev-libs/libxml2/files/libxml2-2.9.4-fix-root-node-cmp.patch
new file mode 100644
index 000000000000..224d60ff052f
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.4-fix-root-node-cmp.patch
@@ -0,0 +1,34 @@
+From a1fb9a4f511d89f0738b62cabd6d92bfd9eb94a9 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer
+Date: Tue, 28 Jun 2016 14:19:58 +0200
+Subject: [PATCH 3/3] Fix comparison with root node in xmlXPathCmpNodes
+
+This change has already been made in xmlXPathCmpNodesExt but not in
+xmlXPathCmpNodes.
+---
+ xpath.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xpath.c b/xpath.c
+index 67afbca5..5a01b1b3 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -3342,13 +3342,13 @@ xmlXPathCmpNodes(xmlNodePtr node1, xmlNodePtr node2) {
+ * compute depth to root
+ */
+ for (depth2 = 0, cur = node2;cur->parent != NULL;cur = cur->parent) {
+- if (cur == node1)
++ if (cur->parent == node1)
+ return(1);
+ depth2++;
+ }
+ root = cur;
+ for (depth1 = 0, cur = node1;cur->parent != NULL;cur = cur->parent) {
+- if (cur == node2)
++ if (cur->parent == node2)
+ return(-1);
+ depth1++;
+ }
+--
+2.14.1
+
diff --git a/dev-libs/libxml2/libxml2-2.9.4-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.4-r3.ebuild
new file mode 100644
index 000000000000..4c2fa243d2a9
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.4-r3.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="xml"
+
+inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
+
+DESCRIPTION="Version 2 of the library to manipulate XML files"
+HOMEPAGE="http://www.xmlsoft.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug examples icu ipv6 lzma python readline static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20080827.tar.gz"
+
+SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+ test? (
+ ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+ ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+ http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
+
+RDEPEND="
+ >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+ icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+ python? ( ${PYTHON_DEPS} )
+ readline? ( sys-libs/readline:= )
+"
+DEPEND="${EDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
+"
+
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/xml2-config
+)
+
+src_unpack() {
+ # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
+ # as they are needed as tarballs in ${S}/xstc instead and not unpacked
+ unpack ${P/_rc/-rc}.tar.gz
+ cd "${S}" || die
+
+ if use test; then
+ cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+ "${DISTDIR}/${XSTS_TARBALL_2}" \
+ "${S}"/xstc/ \
+ || die "Failed to install test tarballs"
+ unpack ${XMLCONF_TARBALL}
+ fi
+}
+
+src_prepare() {
+ default
+
+ DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
+
+ # Patches needed for prefix support
+ eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
+
+ eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+ # Fix build for Windows platform
+ # https://bugzilla.gnome.org/show_bug.cgi?id=760456
+ eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
+
+ # Disable programs that we don't actually install.
+ # https://bugzilla.gnome.org/show_bug.cgi?id=760457
+ eapply "${FILESDIR}"/${PN}-2.9.2-disable-tests.patch
+
+ # Fix python detection, bug #567066
+ # https://bugzilla.gnome.org/show_bug.cgi?id=760458
+ eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+
+ # Apply round of security patches wrt bugs
+ # 589816, 597112, 597114, 597116. This will be included
+ # in the next upstream release
+ eapply "${FILESDIR}"/${PN}-2.9.4-CVE-2016-4658.patch
+ eapply "${FILESDIR}"/${PN}-2.9.4-CVE-2016-5131.patch
+ eapply "${FILESDIR}"/${PN}-2.9.4-nullptrderef.patch
+ eapply "${FILESDIR}"/${PN}-2.9.4-nullptrderef2.patch
+
+ # Apply round of security patches wrt bugs:
+ # 599192, 586886, 618604, 622914, 605208, 623206
+ # This will be included in the next upstream release
+ eapply "${FILESDIR}"/${P}-CVE-2017-5969.patch
+ eapply "${FILESDIR}"/${P}-osd-validation.patch
+ eapply "${FILESDIR}"/${P}-CVE-2017-9049-9050.patch
+ eapply "${FILESDIR}"/${P}-CVE-2017-9047-9048.patch
+ eapply "${FILESDIR}"/${P}-heap-buffer-overflow.patch
+ eapply "${FILESDIR}"/${P}-CVE-2016-9318.patch
+ eapply "${FILESDIR}"/${P}-CVE-2017-7375.patch
+ eapply "${FILESDIR}"/${P}-CVE-2017-0663.patch
+
+ # More patche stolen from Debian patch stack
+ eapply "${FILESDIR}"/${P}-CVE-2017-7376.patch
+ eapply "${FILESDIR}"/${P}-fix-root-node-cmp.patch
+
+ # After all the patching this test still fails:
+ rm "${S}"/test/errors10/781205.xml || die
+
+ # Avoid final linking arguments for python modules
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+ fi
+
+ # Please do not remove, as else we get references to PORTAGE_TMPDIR
+ # in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+ # We now need to run eautoreconf at the end to prevent maintainer mode.
+# elibtoolize
+# epunt_cxx # if we don't eautoreconf
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # filter seemingly problematic CFLAGS (#26320)
+ filter-flags -fprefetch-loop-arrays -funroll-loops
+
+ # USE zlib support breaks gnome2
+ # (libgnomeprint for instance fails to compile with
+ # fresh install, and existing) - (22 Dec 2002).
+
+ # The meaning of the 'debug' USE flag does not apply to the --with-debug
+ # switch (enabling the libxml2 debug module). See bug #100898.
+
+ # --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+ libxml2_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --with-html-subdir=${PF}/html \
+ $(use_with debug run-debug) \
+ $(use_with icu) \
+ $(use_with lzma) \
+ $(use_enable ipv6) \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_with readline) \
+ $(multilib_native_use_with readline history) \
+ "$@"
+ }
+
+ libxml2_py_configure() {
+ mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
+ run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130
+ }
+
+ libxml2_configure --without-python # build python bindings separately
+
+ if multilib_is_native_abi && use python; then
+ python_foreach_impl libxml2_py_configure
+ fi
+}
+
+multilib_src_compile() {
+ default
+ if multilib_is_native_abi && use python; then
+ local native_builddir=${BUILD_DIR}
+ python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
+ fi
+}
+
+multilib_src_test() {
+ emake check
+ multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" \
+ EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
+
+ if multilib_is_native_abi && use python; then
+ python_foreach_impl libxml2_py_emake \
+ DESTDIR="${D}" \
+ docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+ exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+ install
+ python_foreach_impl python_optimize
+ fi
+}
+
+multilib_src_install_all() {
+ # on windows, xmllint is installed by interix libxml2 in parent prefix.
+ # this is the version to use. the native winnt version does not support
+ # symlinks, which makes repoman fail if the portage tree is linked in
+ # from another location (which is my default). -- mduft
+ if [[ ${CHOST} == *-winnt* ]]; then
+ rm -rf "${ED}"/usr/bin/xmllint
+ rm -rf "${ED}"/usr/bin/xmlcatalog
+ fi
+
+ rm -rf "${ED}"/usr/share/doc/${P}
+ einstalldocs
+
+ if ! use examples; then
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples
+ rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+ fi
+
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+ # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+ if [[ "${ROOT}" != "/" ]]; then
+ elog "Skipping XML catalog creation for stage building (bug #208887)."
+ else
+ # need an XML catalog, so no-one writes to a non-existent one
+ CATALOG="${EROOT}etc/xml/catalog"
+
+ # we dont want to clobber an existing catalog though,
+ # only ensure that one is there
+ #
+ if [[ ! -e ${CATALOG} ]]; then
+ [[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
+ "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+ einfo "Created XML catalog in ${CATALOG}"
+ fi
+ fi
+}
+
+libxml2_py_emake() {
+ pushd "${BUILD_DIR}/python" > /dev/null || die
+ emake "$@"
+ popd > /dev/null
+}
diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch
new file mode 100644
index 000000000000..b7586e45a568
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch
@@ -0,0 +1,37 @@
+From 2217022b7d1142738656d891e00b3d2d9179b796 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner
+Date: Mon, 14 Aug 2017 10:55:44 +0200
+Subject: [PATCH] Fix double free().
+
+Found by Brian 'geeknik' Carpenter using AFL.
+---
+ THANKS | 1 +
+ lib/zip_dirent.c | 3 ---
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/THANKS b/THANKS
+index be0cca9..a80ee1d 100644
+--- a/THANKS
++++ b/THANKS
+@@ -12,6 +12,7 @@ BALATON Zoltan
+ Benjamin Gilbert
+ Boaz Stolk
+ Bogdan
++Brian 'geeknik' Carpenter
+ Chris Nehren
+ Coverity
+ Dane Springmeyer
+diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c
+index a369900..e5a7cc9 100644
+--- a/lib/zip_dirent.c
++++ b/lib/zip_dirent.c
+@@ -579,9 +579,6 @@ _zip_dirent_read(zip_dirent_t *zde, zip_source_t *src, zip_buffer_t *buffer, boo
+ }
+
+ if (!_zip_dirent_process_winzip_aes(zde, error)) {
+- if (!from_buffer) {
+- _zip_buffer_free(buffer);
+- }
+ return -1;
+ }
+
\ No newline at end of file
diff --git a/dev-libs/libzip/libzip-1.2.0-r1.ebuild b/dev-libs/libzip/libzip-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..61f933dcd36c
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.2.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="http://www.nih.at/libzip/"
+SRC_URI="http://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="static-libs"
+
+RDEPEND="
+ sys-libs/zlib
+ elibc_musl? ( sys-libs/fts-standalone )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS.md API-CHANGES THANKS )
+
+PATCHES=(
+ "${FILESDIR}/${P}-headers.patch"
+ "${FILESDIR}/${P}-fts.patch"
+ "${FILESDIR}/${P}-CVE-2017-12858.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_install() {
+ default
+ use static-libs || rm "${ED%/}"/usr/$(get_libdir)/libzip.a || die
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild
index 5d6d2183e515..6d3ed3621f87 100644
--- a/dev-libs/rapidjson/rapidjson-9999.ebuild
+++ b/dev-libs/rapidjson/rapidjson-9999.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/miloyip/rapidjson.git"
+ EGIT_SUBMODULES=()
inherit git-r3
else
SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-lisp/cl-ppcre/Manifest b/dev-lisp/cl-ppcre/Manifest
index 973944e32653..f1163a14c50b 100644
--- a/dev-lisp/cl-ppcre/Manifest
+++ b/dev-lisp/cl-ppcre/Manifest
@@ -1,8 +1,2 @@
DIST cl-ppcre-2.0.11.tar.gz 158418 SHA256 ed8571915216788dc4f6cdb44e49b0e0782e203ed547fe2e58cd5b0e5c57edc4 SHA512 c693c568065c0571e5509599018e58951425a857cec3793312af0d22e248e32233f924eafc8ba67fbedad38cb3f4efa11343b785b073eaac53c31871422488b1 WHIRLPOOL 85e0bda97b1bea3da32fbe9a56dd45eb6926fccb7546ee41528a4c6b7b079a94f0d30c59d98cd0288ea26efe6b004b6856cabaaeb3cb93e441cdebc5d588bdf7
-DIST cl-ppcre_1.2.10.orig.tar.gz 166264 SHA256 08e160776b63a5f01dec5ed54e77a949f895cf4dc82f750f0be0a0bc0a9e320e SHA512 8406f7525852cd12f879dcfe5b12f5afac1e8f9fdd8979ca4a888c5c7dffda9a306333e166706103c21359dad733d59f4c08c9bd96855b2a320c63d5c65df404 WHIRLPOOL add9e1cf190d7e972c268b12b1e0151cdd7991dd3a409c71aa1d770f55c7735839a99c1f4c836d6456bdc1a24829f154ed891190aec9722ff50d971ac55cbf65
-DIST cl-ppcre_1.2.11.orig.tar.gz 166306 SHA256 d2150b624894848b83110771978b0335d7b51bd55b0da26407bfefb2c9317be3 SHA512 b738e6299c6eb10bfec02d54c4223af093365f1a890f8337069cd84acb745cf6fe022e9d228722630d9c966fef45ad5578323f11d116dc1055a4f38d9d32798b WHIRLPOOL b61f193729f452013ae289858e8174b580ca0096925fa4563ca437dc26c81726ad18fbe23b7497f992d43b7bc0a1594166d0f8409e1cdbbf0f62426d6c94a3e5
-DIST cl-ppcre_1.2.12.orig.tar.gz 166425 SHA256 3c790d617b3427b96fea67c928d1b07f3f08cc3da98cf6f8f41d0c5d5e684a8d SHA512 df2967e4f2c13d3ff49f362b5b2771a372c611eb1cfd3a59b72968984eb488a52b2bc0200d5bf9da224374099655c9907c6425dfd1dd052cdfdd5b8c0aa5140e WHIRLPOOL f5cd96e487c7496878fd76e34570c00332c79cb698f633ace9f6ebe8f29a3329875c29aa7512c2044cadda54a2b9ea5751331ae85e478b17f91c703d2c866b8b
-DIST cl-ppcre_1.2.13.orig.tar.gz 166573 SHA256 b60e317e8f6bba23026a9653a8ba2749d5f447f337038ef4a206afa9f7275956 SHA512 830a2f10bc17bf69d65136511fc2370fb36928e37c09f4105d02df55a742250dfb8ee96403431492966f0a741726cffd463e23fc96eea154eb560a4651cc7d10 WHIRLPOOL 69255e4f770a239693ff4ae79aeda2f4cb03a8a64883cf8b89bd2333f28fb7df9862bcd689c95f86079e648efb39673b4bba52ec96b20b2219d69034948431bc
-DIST cl-ppcre_1.2.14.orig.tar.gz 167789 SHA256 8dc66d59fb7a2111544d1688fccd4b0e33820ce501fa3410a3c0c61158d1816e SHA512 5cc78d53d46fe4598b3f95a4ff857fca8c2c5cf792d25417963e4f7f0fadeca852553c005dfc85945c27267ee10d75a8c314fd2eddf2627b66985e1b744f5262 WHIRLPOOL 88c262179a2211a5db61402c194568768d98750384566620ae2f29be6432e1e857c78252cb9552706d0ae3db2bfa79dbd02aa103930caf40e8370515b74be888
-DIST cl-ppcre_1.2.15.orig.tar.gz 167881 SHA256 9a10c4760686e91ca6372f81dcef36cb21c0710ae8fcecf0b00c5f0819822dd1 SHA512 9e6b595844eded339d7f97d6a2a57dbfd4dd529d21944072408c17c1a9e2cfaa8fb6fbc50dcafd319e9584e95c1e0910cbad86fa199fc836e3ad56f1338e9752 WHIRLPOOL 82017d6752ef0c3367fa23875d692d32c54354ff47e5ed2981bdb49e20cd443c856cd93e5b7f9ed71f56bcabffab1f71a8fc605e7bb5f66afc9c66bf1a496183
DIST cl-ppcre_1.2.16.orig.tar.gz 168039 SHA256 fc9f0a72d1efb59dd91f79ab449ca6eec16bdf8a4b46903d24a10ee93be96e8f SHA512 b25b0bd526b8e41d6c96c59d5991a21538d10bbb935452de2bc16a461af5e838da54cfccb79183b4693e64b26d083a703189e44b72c1a0b9ef46dfecd32dacfa WHIRLPOOL 56de74b73a2c5aee9d7c7c4ae00d9072fc320e87ca64ec3cf2a590a4dc263e91a07d619cebaabb3c1ffb2cd9fd5eb48d96a3c618782e8adac9c82b20728d36fc
diff --git a/dev-lisp/cl-ppcre/cl-ppcre-1.2.10.ebuild b/dev-lisp/cl-ppcre/cl-ppcre-1.2.10.ebuild
deleted file mode 100644
index c54ce103fbc3..000000000000
--- a/dev-lisp/cl-ppcre/cl-ppcre-1.2.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit common-lisp
-
-DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp"
-HOMEPAGE="http://weitz.de/cl-ppcre/
- http://www.cliki.net/cl-ppcre"
-SRC_URI="mirror://gentoo/${PN}_${PV}.orig.tar.gz"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
- virtual/commonlisp"
-SLOT="0"
-
-CLPACKAGE=cl-ppcre
-
-src_install() {
- common-lisp-install *.lisp *.asd
- common-lisp-system-symlink
- dodoc CHANGELOG README doc/benchmarks.2002-12-22.txt
- dohtml doc/index.html
-}
diff --git a/dev-lisp/cl-ppcre/cl-ppcre-1.2.11.ebuild b/dev-lisp/cl-ppcre/cl-ppcre-1.2.11.ebuild
deleted file mode 100644
index c54ce103fbc3..000000000000
--- a/dev-lisp/cl-ppcre/cl-ppcre-1.2.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit common-lisp
-
-DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp"
-HOMEPAGE="http://weitz.de/cl-ppcre/
- http://www.cliki.net/cl-ppcre"
-SRC_URI="mirror://gentoo/${PN}_${PV}.orig.tar.gz"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
- virtual/commonlisp"
-SLOT="0"
-
-CLPACKAGE=cl-ppcre
-
-src_install() {
- common-lisp-install *.lisp *.asd
- common-lisp-system-symlink
- dodoc CHANGELOG README doc/benchmarks.2002-12-22.txt
- dohtml doc/index.html
-}
diff --git a/dev-lisp/cl-ppcre/cl-ppcre-1.2.12.ebuild b/dev-lisp/cl-ppcre/cl-ppcre-1.2.12.ebuild
deleted file mode 100644
index c54ce103fbc3..000000000000
--- a/dev-lisp/cl-ppcre/cl-ppcre-1.2.12.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit common-lisp
-
-DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp"
-HOMEPAGE="http://weitz.de/cl-ppcre/
- http://www.cliki.net/cl-ppcre"
-SRC_URI="mirror://gentoo/${PN}_${PV}.orig.tar.gz"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
- virtual/commonlisp"
-SLOT="0"
-
-CLPACKAGE=cl-ppcre
-
-src_install() {
- common-lisp-install *.lisp *.asd
- common-lisp-system-symlink
- dodoc CHANGELOG README doc/benchmarks.2002-12-22.txt
- dohtml doc/index.html
-}
diff --git a/dev-lisp/cl-ppcre/cl-ppcre-1.2.13.ebuild b/dev-lisp/cl-ppcre/cl-ppcre-1.2.13.ebuild
deleted file mode 100644
index beeca320acc9..000000000000
--- a/dev-lisp/cl-ppcre/cl-ppcre-1.2.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit common-lisp
-
-DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp"
-HOMEPAGE="http://weitz.de/cl-ppcre/
- http://www.cliki.net/cl-ppcre"
-SRC_URI="mirror://gentoo/${PN}_${PV}.orig.tar.gz"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
- virtual/commonlisp"
-SLOT="0"
-
-CLPACKAGE=cl-ppcre
-
-src_install() {
- common-lisp-install *.lisp *.asd
- common-lisp-system-symlink
- dodoc CHANGELOG README doc/benchmarks.2002-12-22.txt
- dohtml doc/index.html
-}
diff --git a/dev-lisp/cl-ppcre/cl-ppcre-1.2.14.ebuild b/dev-lisp/cl-ppcre/cl-ppcre-1.2.14.ebuild
deleted file mode 100644
index beeca320acc9..000000000000
--- a/dev-lisp/cl-ppcre/cl-ppcre-1.2.14.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit common-lisp
-
-DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp"
-HOMEPAGE="http://weitz.de/cl-ppcre/
- http://www.cliki.net/cl-ppcre"
-SRC_URI="mirror://gentoo/${PN}_${PV}.orig.tar.gz"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
- virtual/commonlisp"
-SLOT="0"
-
-CLPACKAGE=cl-ppcre
-
-src_install() {
- common-lisp-install *.lisp *.asd
- common-lisp-system-symlink
- dodoc CHANGELOG README doc/benchmarks.2002-12-22.txt
- dohtml doc/index.html
-}
diff --git a/dev-lisp/cl-ppcre/cl-ppcre-1.2.15.ebuild b/dev-lisp/cl-ppcre/cl-ppcre-1.2.15.ebuild
deleted file mode 100644
index beeca320acc9..000000000000
--- a/dev-lisp/cl-ppcre/cl-ppcre-1.2.15.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit common-lisp
-
-DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp"
-HOMEPAGE="http://weitz.de/cl-ppcre/
- http://www.cliki.net/cl-ppcre"
-SRC_URI="mirror://gentoo/${PN}_${PV}.orig.tar.gz"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-DEPEND="dev-lisp/common-lisp-controller
- virtual/commonlisp"
-SLOT="0"
-
-CLPACKAGE=cl-ppcre
-
-src_install() {
- common-lisp-install *.lisp *.asd
- common-lisp-system-symlink
- dodoc CHANGELOG README doc/benchmarks.2002-12-22.txt
- dohtml doc/index.html
-}
diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest
index 44638dffc9b8..79d68cbaf665 100644
--- a/dev-ml/ocaml-migrate-parsetree/Manifest
+++ b/dev-ml/ocaml-migrate-parsetree/Manifest
@@ -1 +1,2 @@
DIST ocaml-migrate-parsetree-1.0.3.tar.gz 208080 SHA256 5f33bf9d522508930728963dabfa625350fa86a5632bb0b443ecc5bb0b64f852 SHA512 ba797ecb8635988e23d0ff17c1261b7bf5b99fc1238de7ea4adadb429b36d52f5d37b3f8958a6dd41595a99ab42ab43a75c8d22e8972ce1565ce830f4f92f7df WHIRLPOOL 7103b97dfb436eaffa7d55bc618aa976973287baad30b86106c674ff57a83b7ab5243cb55e6b40892688d869615ca4a5609a2f05740f4171d3b1a09a051c941e
+DIST ocaml-migrate-parsetree-1.0.4.tar.gz 208259 SHA256 8e8f9da003fe3fc0de84aab9aafcbe308516fb07bb89ad0579cef6ef25716e49 SHA512 1176e14c218c39289bdc660d75666d9d1485235c3f0a0818e39930b85e445163f3fd9cf689478a61028f963a76e49f8a1c12cc566214c99f54beea3612d64528 WHIRLPOOL e7ba8d4b8f4f5e4d224a894bf7a7abcffbc35d3dff1162a7f4a5ad657371814ca0c222bfbbc47f65ec585f24f73697c57dc1e2f7c1e8405e326ec72081696fe9
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.4.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.4.ebuild
new file mode 100644
index 000000000000..da28219a5424
--- /dev/null
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib opam
+
+DESCRIPTION="Convert OCaml parsetrees between different major versions"
+HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree"
+SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-ml/result:="
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/jbuilder"
diff --git a/dev-ml/ppx_derivers/Manifest b/dev-ml/ppx_derivers/Manifest
new file mode 100644
index 000000000000..bba96ecf1138
--- /dev/null
+++ b/dev-ml/ppx_derivers/Manifest
@@ -0,0 +1 @@
+DIST ppx_derivers-1.0.tar.gz 1467 SHA256 b03c9a2cd9d3d250761d60790808d31097e4e6d5d84aa67d720a75d5b6137456 SHA512 2e2437094362088f9a1601ca3c2f0b82ec079b9a34e502234aef36158ea7a3f2236f1d2526df1a75bcb851346ebaaf717eaf72253935f7ea4024d3dc20512e85 WHIRLPOOL 9be5c7465334920f559e2c9867a9ff1b919a8dde5275620196c38a4383adddfefbbf9a66e93e9036f9f1100b2af88e97bca5198c0ccac8c3b1433d2ff683e402
diff --git a/dev-ml/ppx_derivers/metadata.xml b/dev-ml/ppx_derivers/metadata.xml
new file mode 100644
index 000000000000..4dc57e2bec09
--- /dev/null
+++ b/dev-ml/ppx_derivers/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ml@gentoo.org
+ Gentoo ML Project
+
+
+ diml/ppx_derivers
+
+
diff --git a/dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild b/dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild
new file mode 100644
index 000000000000..8d755701193d
--- /dev/null
+++ b/dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Shared [@@deriving] plugin registry"
+HOMEPAGE="https://github.com/diml/ppx_derivers"
+SRC_URI="https://github.com/diml/ppx_derivers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-ml/jbuilder"
diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
index 8f32cd8fde9d..ade8b609d2e9 100644
--- a/dev-ml/ppx_deriving/Manifest
+++ b/dev-ml/ppx_deriving/Manifest
@@ -1 +1,2 @@
DIST ppx_deriving-4.1.tar.gz 46502 SHA256 74831b9688140f27304c55e82f930d47107f4587f4e7cbb88ddfc820c23321bb SHA512 5191565254edd036ebe4d1eae1c660bcac293c000ce1f3eb12aeb1fb05b82d93bb28ddb88ab31967f98827838ce1c57e6f83f767f4dfe41eb265bad6dfaa5e8a WHIRLPOOL ca7860a918384de36fd3b3f6c259117f654357dd78193fe23d1d3324b61e08df8792984cb93801a92e80100140f0fdae999040cf0965237c9faba4d3f0a46ee0
+DIST ppx_deriving-4.2.tar.gz 48327 SHA256 488618f652bd30baa9f6d42d9e4168c97b8e71c60e7d54b5018a0da097db016f SHA512 084526157d6f4b41f7ad73157c5edb54d5bb9130d706525031670d8495ede8af5545302f442c2d2c506772201b79ccc93bdc7fead9455d3a59977ddfa9c3284d WHIRLPOOL 305f3283d965d0cdf4eb7abc0b63e6a960785a629569e97d8654d0aee9915b20471f127bf950191d459dcda209b0c33991a899a60e95b195e0044c3e21dc8406
diff --git a/dev-ml/ppx_deriving/metadata.xml b/dev-ml/ppx_deriving/metadata.xml
index a41135f4b01a..fb70b500f326 100644
--- a/dev-ml/ppx_deriving/metadata.xml
+++ b/dev-ml/ppx_deriving/metadata.xml
@@ -6,6 +6,6 @@
Gentoo ML Project
- whitequark/ppx_deriving
+ ocaml-ppx/ppx_deriving
diff --git a/dev-ml/ppx_deriving/ppx_deriving-4.2.ebuild b/dev-ml/ppx_deriving/ppx_deriving-4.2.ebuild
new file mode 100644
index 000000000000..3d965d24df9b
--- /dev/null
+++ b/dev-ml/ppx_deriving/ppx_deriving-4.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit findlib eutils opam
+
+DESCRIPTION="Type-driven code generation for OCaml"
+HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving"
+SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc +ocamlopt test"
+
+DEPEND="
+ dev-ml/ppx_tools:=
+ dev-ml/ocaml-migrate-parsetree:=
+ dev-ml/ppx_derivers:=
+ dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ dev-ml/cppo
+ test? ( dev-ml/ounit )"
+
+src_compile() {
+ cp pkg/META.in pkg/META || die
+ ocaml pkg/build.ml \
+ native=$(usex ocamlopt true false) \
+ native-dynlink=$(usex ocamlopt true false) \
+ || die
+ use doc && emake doc
+}
+
+src_test() {
+ ocamlbuild -j 0 -use-ocamlfind -classic-display \
+ src_test/test_ppx_deriving.byte -- || die
+ if use ocamlopt; then
+ ocamlbuild -j 0 -use-ocamlfind -classic-display \
+ src_test/test_ppx_deriving.native -- || die
+ fi
+}
+
+src_install() {
+ opam_src_install
+
+ use doc && dohtml api.docdir/*
+}
diff --git a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild b/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
index 2727e47d66ae..8ca00bf3d01a 100644
--- a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
+++ b/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipdb/ipdb-0.10.2.ebuild b/dev-python/ipdb/ipdb-0.10.2.ebuild
index 804871d1f173..dfa3021163fc 100644
--- a/dev-python/ipdb/ipdb-0.10.2.ebuild
+++ b/dev-python/ipdb/ipdb-0.10.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
IUSE=""
RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
index 825584707ea3..bed5f49b3dc4 100644
--- a/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
diff --git a/dev-python/paramiko/paramiko-2.2.1.ebuild b/dev-python/paramiko/paramiko-2.2.1.ebuild
index f98630ff30ad..8c53c62b398d 100644
--- a/dev-python/paramiko/paramiko-2.2.1.ebuild
+++ b/dev-python/paramiko/paramiko-2.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~x86"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-python/prov/Manifest b/dev-python/prov/Manifest
index 63592313f749..c71b4687cffa 100644
--- a/dev-python/prov/Manifest
+++ b/dev-python/prov/Manifest
@@ -1 +1,2 @@
DIST prov-1.5.0.tar.gz 125045 SHA256 96a74efa1b3324961ff66246539ed7bdc06245dcbeef538688c755a0ad5777ee SHA512 d08b924385f587814f6094679649e746bc687e136ddebe1194c5d97921a081b960a5531f13cb8f83d167dbd1cf7114d2e55478431feaf52e547db24a181a2ad2 WHIRLPOOL 1e10dd7066c6b0ce09b5d46330ccdb245c1344dcc650a84d09f5fbca081ed5cb1f328058a250d27b92112929771d90c5ffa5ecd0174942dc7fa04298a0d593b8
+DIST prov-1.5.1.tar.gz 123725 SHA256 7a2d72b0df43cd9c6e374d815c8ce3cd5ca371d54f98f837853ac9fcc98aee4c SHA512 71ff149f7a015a36299413b7fc98e0965684aaa0ece86ff865be1c1ef404a3b24489144d9f8299dd48c2f13b377d16679b26fe93e3463455192a054897af52f7 WHIRLPOOL fe1396f98e4022a66825a3414725ba7e4a2adc31eca68f55f6575d1b2e89ddc9d40c2b9f476a2460ae23daa6f96874bbe3357bafbe351c748216d08c34ca4354
diff --git a/dev-python/prov/prov-1.5.1.ebuild b/dev-python/prov/prov-1.5.1.ebuild
new file mode 100644
index 000000000000..1e40c222e242
--- /dev/null
+++ b/dev-python/prov/prov-1.5.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="W3C provenance data dodel library"
+HOMEPAGE="https://pypi.python.org/pypi/prov"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-python/pydot[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+ dev-python/rdflib[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10[${PYTHON_USEDEP}]
+"
+DEPEND="
+ test? ( ${RDEPEND} )
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+ ${EPYTHON} -m unittest discover || die
+}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 57099fbe3abb..2c744d8c47a0 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,2 +1,3 @@
DIST pygit2-0.25.0.tar.gz 472116 SHA256 de0ed85fd840dfeb32bcaa94c643307551dc0d967c3714e49087e7edc0cdc571 SHA512 44f94869718111acbd4ad41bc4c37ac66557e979241dd5a7bb080cf091fec3fc3d5aa53a8a84eb37b2e6f89518b2ac69d058e1970b7cf98c35b8375807fd8f86 WHIRLPOOL 71d8eb87ef9cd2a1d77ecc1258d5d02f2d0075144fc81556e8a2c0b599202cf17b06c548767b956748feaa13d3ece0d3a664cfe95ab93004e345890805c58175
DIST pygit2-0.25.1.tar.gz 456580 SHA256 e8696033052fa0221114ee7f632d38777cc29e58230cd6a05de5725cd31b4a6a SHA512 19908c874d5c2469609a54893f37367480d27ff03583c38b474ebb125dc9db95dc60776a120bb05662938d6eb62d4bcef24f684688e97e3453ccc27e015736cd WHIRLPOOL 648aabcecde66fd5b1d3cf840c51693c237e75f9da7bb793e4e9c18537cb12e4b35d5dced17389bb24440a4c72f37175e1a0a5e44a9c69811c54cf60d11f7d3f
+DIST pygit2-0.26.0.tar.gz 457263 SHA256 a7f06d61f25ab644c39e0e9bd4846a6cc4af81ae27f889473e6f0e9511226cb1 SHA512 e8626712a3b75aced14997dda0155f5c7be9a7e0e43aeb2c767c848fcbe711780137f663cc9ad5268cd85e2c61fd40be6853573f68b457cd5d46d6c32a644076 WHIRLPOOL 909d3d4f06c04107309b53653f5395f76de61195269ba753b7658725a27235ede94df48b74b547a2bafef7e20f8916c01f6d7d7f2e434965621364d51f4e32fa
diff --git a/dev-python/pygit2/metadata.xml b/dev-python/pygit2/metadata.xml
index fe01f6ff3cc1..667874d35015 100644
--- a/dev-python/pygit2/metadata.xml
+++ b/dev-python/pygit2/metadata.xml
@@ -1,6 +1,10 @@
+
+ mgorny@gentoo.org
+ Michał Górny
+
python@gentoo.org
Python
diff --git a/dev-python/pygit2/pygit2-0.26.0.ebuild b/dev-python/pygit2/pygit2-0.26.0.ebuild
new file mode 100644
index 000000000000..a88aff4993c4
--- /dev/null
+++ b/dev-python/pygit2/pygit2-0.26.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 versionator
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ =dev-libs/libgit2-$(get_version_component_range 1-2)*
+ >=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/pynacl/pynacl-1.1.2.ebuild b/dev-python/pynacl/pynacl-1.1.2.ebuild
index b983334ede44..b1cc04d4a129 100644
--- a/dev-python/pynacl/pynacl-1.1.2.ebuild
+++ b/dev-python/pynacl/pynacl-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~ia64 ~x86"
IUSE="test"
RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-ros/dynamic_reconfigure/Manifest b/dev-ros/dynamic_reconfigure/Manifest
index a305d0a86020..6e9b3f7aad80 100644
--- a/dev-ros/dynamic_reconfigure/Manifest
+++ b/dev-ros/dynamic_reconfigure/Manifest
@@ -1,3 +1,2 @@
-DIST dynamic_reconfigure-1.5.46.tar.gz 35500 SHA256 c3d782715f16c0ec3335e23d27ddb62f12eec3492e865003168c74bd212a6fbb SHA512 9f69ecb0d8bfda8d3f8512009743343c51598c4c886a12eec771ed5e48dacbd363e661c50118e279628a4b198966823c9a9fc8f5fcfa84e7fc307d180a2c1ec6 WHIRLPOOL f7333c92fc3e8fdf0119c4af83c22dca9b98158862be4da084ac439c8a2b7c9e6e3cd99352a40b86a4aee27f28d7a87f79e3102f401cee19ca2f0783abf3c8b7
-DIST dynamic_reconfigure-1.5.47.tar.gz 38650 SHA256 d0c64e0cea268a532c3f5f14d8c9bfc7ad405b47683fa8e7054264d979d4ffd4 SHA512 46a3a8e930a32e02113594777f36beb225028aef17decc6a45413e80a47bafea34587bbf017a1c7bcfcb697332cddf7fd38908d20951831865f36f71a1548727 WHIRLPOOL 5f1632716af160d19141ce4aa4360744d59e533e783bd286cd86e729aa0294f2d46543efb1847dd6a88958b34b5287f62e56af9f20b9b098e147dda6725ae8cd
DIST dynamic_reconfigure-1.5.48.tar.gz 38764 SHA256 351b778ea8478faad7287e2c70219deb13114b4983cd09d6d5faa4825706664a SHA512 f4bdc00b580c56feaf3e076540d669923e1330c862fef3518774f43c57212dcbf28bb848f61e7196294d4e7439b4d06c33351aa8d133b71042b739ac59e105a6 WHIRLPOOL 67ecd130d57e598685e3ea8bde2fe0a4e2279a189b79e993369fc4223475038fa0e5d96c78d5e3b8f3ef5b017360e56bfe706f3d01825a17fe9d6027b9c30b9f
+DIST dynamic_reconfigure-1.5.49.tar.gz 38883 SHA256 873c29fcd1d4731c4d76f29513a7fca87f9262ad9aca064e22423a92294a6121 SHA512 c8cba24424142333df4d66c013915526573c791a4ef97e51baffe8040293dce67d313c57036807c308fe4ca17af92f277e467cde6494f166f6e4ec4aa34050cf WHIRLPOOL 388d3c3187790aa7e9f20535d3297a6dc315dd7f5040cc2ddc036c772d442304bb782ffd682f77edd3d1c519f4e1fae454c23dfae3f163f6d423f041982b0d62
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.47.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.47.ebuild
deleted file mode 100644
index 9650a1395bcb..000000000000
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.47.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/dynamic_reconfigure"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a means to change node parameters at any time without having to restart the node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=[threads]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/roscpp
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.46.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.49.ebuild
similarity index 100%
rename from dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.46.ebuild
rename to dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.49.ebuild
diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest
index 1e9b7818899d..abffa2803f34 100644
--- a/dev-ros/pluginlib/Manifest
+++ b/dev-ros/pluginlib/Manifest
@@ -1,2 +1,2 @@
-DIST pluginlib-1.10.4.tar.gz 21420 SHA256 9a8a81d39472bda8cc8a9b189b9dc8f602b13b97a132a153144785d9fc5b68b2 SHA512 df469c6f536a062cadc5a4b38006bb407c10ab2bb4da19769ccfc46e466f1fa37216154a90fd41442ac35519eba420ad08f81bf9474511d1c5b4aca219a8b9de WHIRLPOOL b374959761d7fce017678c33fb8a44bbb960ff8002011573245f30f685dc2f48937cfda15fc515e71da1f8174b73c9cb3a66924e02d5e80f053563599dc355c4
DIST pluginlib-1.10.5.tar.gz 21470 SHA256 53a0ccb7a4654d464271189fc44ba23d6be8d3ecdfb40506b9d9fb4a87f19d6c SHA512 619c552c7f6d59f02f580204477e789e2adf15ea53dfdf1d3fe3fc6e65e34dbfe1d7e7ae60b833bbf589c2afd49dc09187222e989de902758475509b8cf7cd88 WHIRLPOOL c441fbee18fa152d900e0b49198cc2b0f75a85f801bc756bc1d56f4153360e2ddfc3c63223a57fbc7ee299aef4313bd55c147fe614d6fcca708f7302ac9c52fd
+DIST pluginlib-1.11.0.tar.gz 21555 SHA256 f5acf838cdf15538505b670dfdf93a0c5e453d222464d729d71a22513a60e2ca SHA512 2ef27759a6fb3db0354ffd28f2de5781405d4515dad028cbba6e108aa2eb79da56bbcb8ad4dab5686a9dc59d031bfd06ca713382e99258ecdf78fc45a877e588 WHIRLPOOL 71fa457e3bd0c93f2ea68729086b6f9b1b2653f126bdec3f461ad26cb37237c27397cca8d1c5dcf74e96b72988c025738d20ef303ac6d12ae7fc17d4b3bb8a02
diff --git a/dev-ros/pluginlib/pluginlib-1.10.4-r1.ebuild b/dev-ros/pluginlib/pluginlib-1.11.0.ebuild
similarity index 90%
rename from dev-ros/pluginlib/pluginlib-1.10.4-r1.ebuild
rename to dev-ros/pluginlib/pluginlib-1.11.0.ebuild
index 639878ba7446..4194e2cd13c4 100644
--- a/dev-ros/pluginlib/pluginlib-1.10.4-r1.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.11.0.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=5
@@ -19,7 +19,7 @@ RDEPEND="
dev-ros/rosconsole
dev-ros/roslib[${PYTHON_USEDEP}]
dev-libs/boost:=
- dev-libs/tinyxml
+ dev-libs/tinyxml2:=
dev-ros/cmake_modules
"
DEPEND="${RDEPEND}
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild
index 639878ba7446..4194e2cd13c4 100644
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild
+++ b/dev-ros/pluginlib/pluginlib-9999.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=5
@@ -19,7 +19,7 @@ RDEPEND="
dev-ros/rosconsole
dev-ros/roslib[${PYTHON_USEDEP}]
dev-libs/boost:=
- dev-libs/tinyxml
+ dev-libs/tinyxml2:=
dev-ros/cmake_modules
"
DEPEND="${RDEPEND}
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 1a66ab9d117d..6ada24aa9bea 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,3 +1,2 @@
-DIST rviz-1.12.10.tar.gz 4550251 SHA256 973cb40552b6d98b29ec0ea7e9f3795e95a377f7334e8f6f7206ce78f905af54 SHA512 7f1e103af5cce463170483174cf73fc448074ce40c4f3d18984c2a2a168cc9fb8073d8bbd84a5cb118053e5b26527e5fdf7a8b640a4a59a8435183e042c3978d WHIRLPOOL d53eec9ad326aa2c29946605689fba64591b2b85a745306f5432372a20e660089c70a25720c788d89bd1b913e182cf5341601035ee1c9fac581b306b6944fbbd
DIST rviz-1.12.11.tar.gz 4550851 SHA256 d32f394347511b2ec61ebf3b4cec5b68550d77def9370c8488e6e87f72db4237 SHA512 0eb5c35b658a56b6f17c741ec8b704aa9651c45a01707aff00dca51b3eebd15827c4fbef60cb2f75028c920a9d6ed4779eb6a9645a9a43a12f5e568a43300793 WHIRLPOOL 1fa24ffa8cafe00033c536daaf944b2a6093a2bb300cee5d5d1fce992bc579f89652c583701324e5401ee77214f6b22c661f77243ac01c577d0c4fe04ff60024
-DIST rviz-1.12.8.tar.gz 4550556 SHA256 7017acb62f0f4b536c53d08323e87768e27075267147a219e9e2bff8983d0c47 SHA512 6efe4cf18d05ddcb59868b0ea27b89e70e7836ae7bdc982311dec40a71822973c42d5e8a70e0591924ffbd9583816fe007ff81f5994a9a6ba47ea69de855604a WHIRLPOOL 9ad3640a34e137a10a5c13a6f92acce6754c81b3d37dd49b020d06ffa6cffc2e6bf6698d634a434dcabf0423a23d4bd2b5e54dc15157568b28e9a0e302151852
+DIST rviz-1.12.13.tar.gz 5086771 SHA256 9a819114b96946cecd37f46ef74dbfaf768f38f30d88f49ba950d4b931f56cf9 SHA512 f9f76308f2c7f973e95a6b410850f55489ed65027004fe080e8f39be79d4cc142657825ae93b0f06ef299ae75fb42a018add6afa8e7f132f89418b21eadd1980 WHIRLPOOL a5579c0699e3a84dd027704b6899d92e4298c27b862ef19199720b323625d42f07248b0a8bc1cd25a7c17468aa26fc690975e8c465bc9aa5b1283d0497badc7f
diff --git a/dev-ros/rviz/rviz-1.12.10.ebuild b/dev-ros/rviz/rviz-1.12.13.ebuild
similarity index 100%
rename from dev-ros/rviz/rviz-1.12.10.ebuild
rename to dev-ros/rviz/rviz-1.12.13.ebuild
diff --git a/dev-ros/rviz/rviz-1.12.8.ebuild b/dev-ros/rviz/rviz-1.12.8.ebuild
deleted file mode 100644
index 9ada9a6fdae4..000000000000
--- a/dev-ros/rviz/rviz-1.12.8.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/rviz"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="3D visualization tool for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-libs/boost:=[threads]
- media-libs/assimp
- dev-games/ogre
- virtual/opengl
- dev-qt/qtwidgets:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-cpp/eigen:3
- dev-cpp/yaml-cpp
- dev-libs/urdfdom:=
-
- dev-ros/angles
- dev-ros/image_geometry
- dev-ros/image_transport
- dev-ros/interactive_markers
- dev-ros/laser_geometry
- dev-ros/message_filters
- dev-ros/pluginlib
- >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
- dev-ros/resource_retriever
- dev-ros/rosbag[${PYTHON_USEDEP}]
- dev-ros/rosconsole
- dev-ros/roscpp
- dev-ros/roslib[${PYTHON_USEDEP}]
- dev-ros/rospy[${PYTHON_USEDEP}]
- dev-ros/tf
- dev-ros/urdf
- dev-ros/media_export
-
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
- dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-ros/cmake_modules
- virtual/pkgconfig
- test? (
- dev-ros/rostest[${PYTHON_USEDEP}]
- dev-cpp/gtest
- )"
-
-src_configure() {
- local mycatkincmakeargs=( "-DUseQt5=ON" )
- ros-catkin_src_configure
-}
diff --git a/dev-ruby/rinku/Manifest b/dev-ruby/rinku/Manifest
index 6ecd8c4ffb19..03bf8f149893 100644
--- a/dev-ruby/rinku/Manifest
+++ b/dev-ruby/rinku/Manifest
@@ -1,3 +1,2 @@
-DIST rinku-1.7.3.gem 16384 SHA256 eb5cec33af86da3002e66470d9a741a0726d6864a69b580abc798931b4b706ca SHA512 6cd56d21f9366ca1550d62b864f3160f8426412caefb47343152c856a122e729c6e38d339075bdda8614e36c3c5f498001c0e943db455e55ee401e9cdf320c94 WHIRLPOOL 8c9b365dace46b58f4e8b3c70a5b98cb90aa383c1e40cea0c0919f58c4a7ea94cfb44b07415fd9044a09a76e8a70d03fc10b13556f0e89fbea4b81c3ecad02bb
-DIST rinku-2.0.0.gem 20992 SHA256 3e695aaf9f24baba3af45823b5c427b58a624582132f18482320e2737f9f8a85 SHA512 c21c19bc364039ddc44a82e352427dcba4cb6a42249ad66707cad4addcb756f62fe0da44d76d35b4d80d1af540517d5de358ef2c5594b0739915bad8ce368f9d WHIRLPOOL f6620bebf5b9fe46a47671f31b171e679c57fcf7e9060880e7e3fa5a30101db3ade78f0dc576e08ba73ca28d3ff9b9212867cadaf7c80cf69e6c50471c2f024f
DIST rinku-2.0.2.gem 20992 SHA256 def469eafd8f5e22c38993caad89ab52a1cc86c6dd87442ff87a6ca8716ef7e9 SHA512 1f2e048d491cfe01133b2c3bc1d95e80231370e39005b1ff7077e7feecdae62de4c80b000caf78ac89d2b30881ab5d8aba0f15583b2f5a7a43d42451ee3dc752 WHIRLPOOL 662f06b1e3375663bd7f3ebce1727563120cd1efcfc8d33a35b0cff9c4e66297d97c70031cab28cb5ed912bbf69361095de58fc9d7f43654943466d1c25a01c5
+DIST rinku-2.0.3.gem 21504 SHA256 9975af4e3379600fc3b46b961d4380e2cd2047a28fe7425ed9cb9e601e8926ac SHA512 7a17fc2be0e5d69e7c2448337de42c3725090a00e44dafe49a1bb721995299712e31afa5de5c397641238926f1a3c067b65caaf1bd8799211415fb95e942588e WHIRLPOOL 59dba658238c818c115903404d038a5fb61e611f4daa8f7e26da087341928e57b4e6ff89d024891b0351b3e754bb07799edfb5492208fa7271059f74c407caa2
diff --git a/dev-ruby/rinku/rinku-2.0.0.ebuild b/dev-ruby/rinku/rinku-2.0.0.ebuild
deleted file mode 100644
index 14ec382d8668..000000000000
--- a/dev-ruby/rinku/rinku-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby library that does autolinking"
-HOMEPAGE="https://github.com/vmg/rinku"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-each_ruby_configure() {
- ${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/${PN}
- cp ext/${PN}/${PN}$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib test/autolink_test.rb || die
-}
diff --git a/dev-ruby/rinku/rinku-1.7.3.ebuild b/dev-ruby/rinku/rinku-2.0.3.ebuild
similarity index 86%
rename from dev-ruby/rinku/rinku-1.7.3.ebuild
rename to dev-ruby/rinku/rinku-2.0.3.ebuild
index 14ec382d8668..a98662646a90 100644
--- a/dev-ruby/rinku/rinku-1.7.3.ebuild
+++ b/dev-ruby/rinku/rinku-2.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="README.markdown"
diff --git a/dev-ruby/rjb/Manifest b/dev-ruby/rjb/Manifest
index 55f129973437..02cdd6ff3445 100644
--- a/dev-ruby/rjb/Manifest
+++ b/dev-ruby/rjb/Manifest
@@ -1,2 +1 @@
-DIST rjb-1.5.4.gem 73216 SHA256 81df90c028dccd758e8b38c8b7d80620d23ebb5c355233b82c4cacfe85cb4851 SHA512 add7268f3320e4627b8b92103f420cd5be03319c54cdf0478980631ab57523ed9dd190f7a535b5bc9892d42b049712c18b406bacb36212f8cfb6ce5f3c74766d WHIRLPOOL bc0feabe46b63b4a1ccd0e2f88c72e24068737ba96ed3e52482921318e5fed8453a798bca5e5001eb815c4e74d3870f70343ce792764bef03f43350062214103
DIST rjb-1.5.5.gem 73216 SHA256 8a81557cccf06e06435202cedffe3dcda780a9abe3b803a1057c48165746f2de SHA512 a1a8f6e6b75555ce228fe8d58b467f783e55ddb12371485d45ad32597ea7ec60d30e3870671455e4e22fd680b5aa21bd952b8abfa36531c030747573e5d43cea WHIRLPOOL cb146672bc02838fa8ef3f14f972abc0566bbdf25543fddd82569c67bc3835c4b681258b7303392a53315f73b6cfadac7ee40cb69281096ea47310af2b2b8b6e
diff --git a/dev-ruby/rjb/rjb-1.5.4.ebuild b/dev-ruby/rjb/rjb-1.5.4.ebuild
deleted file mode 100644
index 236720589df5..000000000000
--- a/dev-ruby/rjb/rjb-1.5.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="readme.txt ChangeLog"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit java-pkg-2 ruby-ng ruby-fakegem
-
-DESCRIPTION="Rjb is a Ruby-Java software bridge"
-HOMEPAGE="https://github.com/arton/rjb"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples hardened"
-
-DEPEND=">=virtual/jdk-1.5
- hardened? ( sys-apps/paxctl )"
-RDEPEND="virtual/jre"
-
-pkg_setup() {
- ruby-ng_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-all_ruby_prepare() {
- # The console is not available for testing.
- sed -i -e '/test_noarg_sinvoke/,/end/ s:^:#:' test/test.rb || die
-
- # Avoid encoding tests since not all locales may be available.
- sed -i -e '/test_kjconv/,/^ end/ s:^:#:' test/test.rb || die
-}
-
-each_ruby_prepare() {
- #dev-lang/ruby might need the "hardened" flag to enforce the following:
- if use hardened; then
- paxctl -v /usr/bin/ruby 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! rjb will only work if ruby is MPROTECT disabled\n please disable it if required using paxctl -m /usr/bin/ruby'
- fi
- # force compilation of class file for our JVM
- rm -rf data
-}
-
-each_ruby_configure() {
- ${RUBY} -C ext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
- emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflags="${LDFLAGS}"
-}
-
-each_ruby_install() {
- each_fakegem_install
-
- # currently no elegant way to do this (bug #352765)
- ruby_fakegem_newins ext/rjbcore.so lib/rjbcore.so
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r samples
- fi
-}
-
-each_ruby_test() {
- if use hardened; then
- paxctl -v ${RUBY} 2>/dev/null | grep MPROTECT | grep -q disabled
- if [ $? = 0 ]; then
- ${RUBY} -C test -I../lib:.:../ext test.rb || die
- else
- ewarn "${RUBY} has MPROTECT enabled, rjb will not work until it is disabled, skipping tests."
- fi
- else
- ${RUBY} -C test -I../lib:.:../ext test.rb || die
- fi
-}
diff --git a/dev-ruby/rjb/rjb-1.5.5.ebuild b/dev-ruby/rjb/rjb-1.5.5.ebuild
index 8b7c9108b158..524297c5ca03 100644
--- a/dev-ruby/rjb/rjb-1.5.5.ebuild
+++ b/dev-ruby/rjb/rjb-1.5.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
RUBY_FAKEGEM_EXTRADOC="readme.txt ChangeLog"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/rkelly-remix/Manifest b/dev-ruby/rkelly-remix/Manifest
index f68ed1dfdd57..cb63f82283c3 100644
--- a/dev-ruby/rkelly-remix/Manifest
+++ b/dev-ruby/rkelly-remix/Manifest
@@ -1,2 +1 @@
-DIST rkelly-remix-0.0.6.gem 69120 SHA256 3fdcaee584b2d1050cf207b4fbddad5637d3502d1ceb23f733a95bb48bb61ac6 SHA512 11c30cb4ba0edcb0470ceeeacadeb6cc02f4408a8fc4bcbdb47fcb1c46665c0ac800e16cadf172d64483ba13e2ae2a8c032b138391e3b6495f3c199a0967fa93 WHIRLPOOL d6bf1e8c0260ba48b57f4232d4b85330e3b306442ef742643ed0b302108744677a00a94a8eeb42e3196f1faf4a9fc5c6095a18b69c002a3eb029954d0eb2ef47
DIST rkelly-remix-0.0.7.gem 69632 SHA256 72f870b39931daa49ac1c78ceadeeeaebf0eee7395597afc28c99d6e1395f0bc SHA512 5450b4b52b912b6626fcac3e3428dd2b4520dcb62b402e36579c9b34e8a027853e53a0860f33b4efc995517d70a3fab4f75f28ce7ab0b2b0c9e09e72ddd7cd54 WHIRLPOOL 9ab7d4f8f8fa58855b1f4ee754ef753407f1e966f7bada8a8304b4e049ffdfe87a9adb92e89321468792c6ae0a35a41987bcd1ce039c86220792774b44c558f0
diff --git a/dev-ruby/rkelly-remix/rkelly-remix-0.0.6.ebuild b/dev-ruby/rkelly-remix/rkelly-remix-0.0.6.ebuild
deleted file mode 100644
index d58196e21ebc..000000000000
--- a/dev-ruby/rkelly-remix/rkelly-remix-0.0.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RKelly Remix is a fork of the RKelly JavaScript parser"
-HOMEPAGE="https://github.com/nene/rkelly-remix"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/hoe dev-ruby/rdoc )"
-
-each_ruby_test() {
- ${RUBY} -S testrb -Ilib:. test/test_*.rb test/*/test_*.rb || die
-}
diff --git a/dev-ruby/rkelly-remix/rkelly-remix-0.0.7.ebuild b/dev-ruby/rkelly-remix/rkelly-remix-0.0.7.ebuild
index 207e3fbc60ca..d28d09a4102a 100644
--- a/dev-ruby/rkelly-remix/rkelly-remix-0.0.7.ebuild
+++ b/dev-ruby/rkelly-remix/rkelly-remix-0.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -20,5 +20,5 @@ IUSE="doc"
ruby_add_bdepend "doc? ( dev-ruby/hoe dev-ruby/rdoc )"
each_ruby_test() {
- ${RUBY} -S testrb -Ilib:. test/test_*.rb test/*/test_*.rb || die
+ ${RUBY} -S testrb-2 -Ilib:. test/test_*.rb test/*/test_*.rb || die
}
diff --git a/dev-ruby/roadie-rails/Manifest b/dev-ruby/roadie-rails/Manifest
index 5be712bf6f6f..9b205a4d0ba0 100644
--- a/dev-ruby/roadie-rails/Manifest
+++ b/dev-ruby/roadie-rails/Manifest
@@ -1,2 +1 @@
-DIST roadie-rails-1.1.1.tar.gz 48436 SHA256 3d005164235c9a38d38ab441afa645ab69b74bbb1428143bedda5d24e200117b SHA512 66f0da2a57a26342bc061cdbbedebf70a63f20cc4a5fa1ed8bedd6f9359d6e0690db3692bcd7b562976d75b4ffbec368fab5cbd09101cc833cd83d98859038c0 WHIRLPOOL 06333746c172e9723961ea067e1ecf370226a4276ab273f403edd2dc042aea7a2cf30d678c4610cfa6c5f7732bac6627f1e81fc0f463ef973ab2db1dd35710b3
DIST roadie-rails-1.2.1.tar.gz 42998 SHA256 25a3696df5e2b3c549bf29968de2288ff49edc0f25d9133b206aa4315b5c684c SHA512 9c51f03aadd8a1fb3b07b1d8fb5f069b3a5d84e9bbf0b04cb21ca28e5f43e4943ce941ad55045ccf46f077f3dfd179a742ef73d84132a3aafb20f4c9be4e6f4a WHIRLPOOL 96876dd45d15ed2f396488bda2e52d7d7503f01d880803c56e2e665bed4017a280034e2dad13cfb4c8ddc4c117057228e8db868190a60f13a120309760ecbed5
diff --git a/dev-ruby/roadie-rails/roadie-rails-1.1.1.ebuild b/dev-ruby/roadie-rails/roadie-rails-1.1.1.ebuild
deleted file mode 100644
index 391eb6bded30..000000000000
--- a/dev-ruby/roadie-rails/roadie-rails-1.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hooks Roadie into your Rails application to help with email generation"
-HOMEPAGE="https://github.com/Mange/roadie-rails"
-SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-ruby_add_rdepend ">=dev-ruby/roadie-3.1
- >=dev-ruby/railties-3.0"
-ruby_add_bdepend ">=dev-ruby/rails-3.0
- test? ( dev-ruby/rspec-rails
- dev-ruby/rspec-collection_matchers )"
-
-all_ruby_prepare() {
- sed -i -e "/[Bb]undler/d" -e "s/bundle exec//" Rakefile || die
-}
diff --git a/dev-ruby/rqrcode/Manifest b/dev-ruby/rqrcode/Manifest
index 88be43f1b6f7..2000a0beb1c2 100644
--- a/dev-ruby/rqrcode/Manifest
+++ b/dev-ruby/rqrcode/Manifest
@@ -1,2 +1 @@
DIST rqrcode-0.10.1.gem 27136 SHA256 0a4ca43374b65e980287104a85805df00d9ecea1e3eda9f41503e8d7bcb53740 SHA512 5b2d6e63bc069a1cf436d2df159bef673ef621a73d72c52bbdec1c2d820f4553172d5c3499b9347e0939d422bffa8f39ecaae123ce0be360d25ab6c08a6eb583 WHIRLPOOL 0a5a66eac0029215a9ee6d9419d265c20006b083d26f3a443fa8fcf293df014689dde5111acf498d62f477768d34c4ecb4f5017234b75f5ad231a15341798fc2
-DIST rqrcode-0.9.0.gem 27136 SHA256 31b84b2203fb3892f5d9d86ae5ccb67420031d7cb06c3739214e88afc6968130 SHA512 80ce9fcfac53bc23818fe6bf49dec088df298e1c8232245cea1f423e0a78b4e19342aab39a80165ca3ff41076eba2ab80b2ddd5564283d748950305f6d545b2f WHIRLPOOL 65d076daab72dff9714581790190a2dd3ea963f33f1eb2d31933c73341b89d93062220f9488338c22c76ad96922cc534b95155574e34eb65ac8db06007af8d5f
diff --git a/dev-ruby/rqrcode/rqrcode-0.9.0.ebuild b/dev-ruby/rqrcode/rqrcode-0.9.0.ebuild
deleted file mode 100644
index c606879ebf82..000000000000
--- a/dev-ruby/rqrcode/rqrcode-0.9.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://whomwah.github.com/rqrcode/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/chunky_png:0"
-
-all_ruby_prepare() {
- sed -i -e '/[bB]undler/s:^:#:' Rakefile || die
- sed -i -e '1igem "minitest"' test/test_helper.rb || die
-}
diff --git a/dev-ruby/rr/rr-1.2.1.ebuild b/dev-ruby/rr/rr-1.2.1.ebuild
index 7e7bd031d312..6d4a2d9175bc 100644
--- a/dev-ruby/rr/rr-1.2.1.ebuild
+++ b/dev-ruby/rr/rr-1.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? (
diff --git a/dev-ruby/rspec-retry/Manifest b/dev-ruby/rspec-retry/Manifest
index ed63f7ed362d..0f8f89f4d0a5 100644
--- a/dev-ruby/rspec-retry/Manifest
+++ b/dev-ruby/rspec-retry/Manifest
@@ -1 +1,2 @@
DIST rspec-retry-0.5.4.gem 12288 SHA256 c3fa7339684d3068d6cad921152ae6f8bc09bb8d0e8db99a206d0a851ab164ec SHA512 e23ea3c172255d0cc880c3bf5d38bef870ce13c5d52105c987d78bf1850adeb8346d6850f94a213de8dfe767289839dedd9a0851ed1d3f90a9c9d3a0b6b825b0 WHIRLPOOL e287e2ccd445357a3bc9ccba0b398a6b94a27b88be9a1c0f17bbaf17a355db52751866065afba9366d647133258ede989f2bcef62b0dd3b71a35b25ad0144129
+DIST rspec-retry-0.5.5.gem 12800 SHA256 269a2ab2f3bfadc4558993ddd721369e90bf3861baff0a57d6833f91ca0c5817 SHA512 dd8a63e0e511b0c655a93c02f96bcd3e1eed8697a500d744a70afe9cf9ea55ea7c7a089d8240622be0bd44c4c9baaa889c3469e9228468bc35676da6fbc38a08 WHIRLPOOL 66997954eb01cec416a714caf388e04c59a4982140897fed30866bc3d6d2f38ce78428496dc8df63361a261693dd8451e69f4607a6d4227ee7d855c3e808f2e6
diff --git a/dev-ruby/rspec-retry/rspec-retry-0.5.5.ebuild b/dev-ruby/rspec-retry/rspec-retry-0.5.5.ebuild
new file mode 100644
index 000000000000..13590e2a5a74
--- /dev/null
+++ b/dev-ruby/rspec-retry/rspec-retry-0.5.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Retry intermittently failing rspec examples"
+HOMEPAGE="https://github.com/NoRedInk/rspec-retry"
+IUSE=""
+SLOT="0"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+ruby_add_rdepend ">=dev-ruby/rspec-core-3.3:3"
+
+all_ruby_prepare() {
+ sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rspectacular/Manifest b/dev-ruby/rspectacular/Manifest
index e5669d250ad3..db5b0489b9e8 100644
--- a/dev-ruby/rspectacular/Manifest
+++ b/dev-ruby/rspectacular/Manifest
@@ -1,2 +1 @@
-DIST rspectacular-0.70.0.gem 15872 SHA256 51784e8125d45e69c26f47e668a1f3c045df87c42ebb258e23c3c7bc7207caa9 SHA512 9fe4874b096123374e414d34eae2ee41a6ef4424682ac6dfcac46aef10b6e6839088b6851be7f53b03386f4fbc122542070630f82dbcc2aafec555c569750353 WHIRLPOOL 408a27efedf4209a64026f9217731162473c8ef2d6e48f37e5e31103845b8e88bbf02cd68a5ea4fe6db2dd02199a9833a6d86ee3cd7974f00bcd7aa19905f13d
DIST rspectacular-0.70.7.gem 16384 SHA256 c2dc854ad3c4ed8a745971003df5e9db4aaefb7fe9251b664510c6ea59e10fd4 SHA512 dab67e89dd88cfb8741be10c385d58b3437245c623700f0d651dd4e96bcf28f063a9dd952098eb574bbadaeb077ebe7e0f9db7d6e83648c1de9a4f0c390fe567 WHIRLPOOL 47c7b60a7f7863919df8bac084c7779e79d906e25c05622dc6fd9ca7dba9802fad8d99f30ee7f199e6ae901622788490ce9da3ec180a8f7026b45e290ccbf86b
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.0.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.0.ebuild
deleted file mode 100644
index 46b76fc1ffb8..000000000000
--- a/dev-ruby/rspectacular/rspectacular-0.70.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec support and matchers"
-HOMEPAGE="https://github.com/thekompanee/rspectacular"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2"
diff --git a/dev-ruby/ruby-beautify/ruby-beautify-0.97.4.ebuild b/dev-ruby/ruby-beautify/ruby-beautify-0.97.4.ebuild
index d0ae1773c638..2621bd49560f 100644
--- a/dev-ruby/ruby-beautify/ruby-beautify-0.97.4.ebuild
+++ b/dev-ruby/ruby-beautify/ruby-beautify-0.97.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby22 ruby23 ruby24"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/ruby-filemagic/Manifest b/dev-ruby/ruby-filemagic/Manifest
index 3ae2bde35fed..35de3b4995f4 100644
--- a/dev-ruby/ruby-filemagic/Manifest
+++ b/dev-ruby/ruby-filemagic/Manifest
@@ -1,2 +1 @@
-DIST ruby-filemagic-0.7.1.gem 229376 SHA256 811de93cdc7d13dbd84d5fd3a35d699092e71a768af366637951ca109cbc7eed SHA512 9a05699fd299c20a52443d4a0213761229fa600157731712c8322e25e18cfc1f467075b8cb5e8c1790caeae9778e83cae83bb1c63475ea220a9b2d9ed896cd46 WHIRLPOOL 82d41b0264f16a2acc402ea297bc6db5ab489bdcc9a50933e916b26bf6103f483220e485ff0b102ed4b33a55898dd874a87be630884b847019d51c12ee208c41
DIST ruby-filemagic-0.7.2.gem 19456 SHA256 f59d5b2ddf4c6f3867bc4f339f54489f3e3464c239233938b3808b2efe7a1802 SHA512 b68324dfb0cd2e55cd200696fabe87c0aa68a11922789ae40abc999db7d200810cffa2c414c07bc96e2fee54aab775f01752f951b3a3273289594201ca547494 WHIRLPOOL 14d4ffe47db108382b04cc82b07c5c656bb838fcb9d28fca64846debd317919d37bcec1cd0eebcd3f8c040276fffe3beec4e49ba0f0a75d27e9dd8f266c6e696
diff --git a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.1.ebuild b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.1.ebuild
deleted file mode 100644
index 708d91cf6220..000000000000
--- a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby binding to libmagic"
-HOMEPAGE="https://github.com/blackwinter/ruby-filemagic"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-DEPEND="${DEPEND} sys-apps/file"
-RDEPEND="${RDEPEND} sys-apps/file"
-
-each_ruby_configure() {
- ${RUBY} -Cext/filemagic extconf.rb || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/filemagic
- mv ext/filemagic/ruby_filemagic$(get_modname) lib/filemagic/ || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ctest -I../lib filemagic_test.rb || die
-}
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.4-r2.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.4-r2.ebuild
deleted file mode 100644
index 92ac63723c24..000000000000
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.4-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse YAML safely, alternative implementation of YAML.load"
-HOMEPAGE="https://dtao.github.com/safe_yaml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/hashie
- dev-ruby/heredoc_unindent
- dev-ruby/rspec:3 )"
-
-each_ruby_test() {
- # Run specs with monkeypatch
- ${RUBY} -S rspec-3 --tag ~libraries || die
-
- # Running specs without monkeypatch
- ${RUBY} -S rspec-3 --tag libraries || die
-}
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.4-r3.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.4-r3.ebuild
index 066dc4ea6f6c..8a3f89f187a0 100644
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.4-r3.ebuild
+++ b/dev-ruby/safe_yaml/safe_yaml-1.0.4-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://dtao.github.com/safe_yaml"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
ruby_add_bdepend "test? ( dev-ruby/hashie
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild
deleted file mode 100644
index dfc58366fda3..000000000000
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse YAML safely, alternative implementation of YAML.load"
-HOMEPAGE="https://dtao.github.com/safe_yaml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/hashie
- dev-ruby/heredoc_unindent
- dev-ruby/rspec:2 )"
-
-each_ruby_test() {
- # Run specs with monkeypatch
- ${RUBY} -S rspec-2 --tag ~libraries || die
-
- # Running specs without monkeypatch
- ${RUBY} -S rspec-2 --tag libraries || die
-}
diff --git a/dev-ruby/sass-rails/Manifest b/dev-ruby/sass-rails/Manifest
index 4e83fdda60d9..9db5e55f3610 100644
--- a/dev-ruby/sass-rails/Manifest
+++ b/dev-ruby/sass-rails/Manifest
@@ -1,4 +1,2 @@
DIST sass-rails-4.0.5.gem 92672 SHA256 8b93da41049d32f14625abd6a0514d34286b87e9123093db054eddbe644487db SHA512 71515d2c16886d64af4c00bd78094691579bfbb3660ff9ba4d9f2807bcbedf104da2f7a321a3cc558f0e2420f702eb2bd2379cce30f1d21d8b09ab5fbc8347c5 WHIRLPOOL 9a39907a182ba20c7a14963dc00d6455babc63c1a3c5a202c6475f5e7b0dbec86663309f416b21d393e904da704f84f15634cda9521d5fbfbb03bb5bf10338a1
-DIST sass-rails-5.0.4.tar.gz 89426 SHA256 cc4533ad0f4a20eebbacf714d7a22f79be03421699810c2951c6a52534395b5c SHA512 99266e49a8b1cc16fd22f10113717f1208d7d696b40c940ef97bd05999f9cab3e28826a998ce08a14e72f1af5ab9c901501242f56366b87606f2c861217ce75f WHIRLPOOL baf80ebfd2f4c158253cfcd81ec7080ed51f85f304b4233c717c60782f46d854fc0daf1414c01eae71ace8ef20d162a961c5216bc878d726d6cd7873219fae2b
-DIST sass-rails-5.0.5.tar.gz 89688 SHA256 26ddcc586f43d713b14baee027c3f4d430e830ffb2c2582fc7208047a9c28eb2 SHA512 28ba55fc2a4bae0dbf9cf0e51d945e3373a4e1457287d51f98e32c06591c72f6557e49a58370fecdf01f45bd04a39a014a49cc2259488301793792e14653787e WHIRLPOOL d6d7a6dd631be765b365278486ad33ad5586a30da23efd4784c63e3aead2228d668e81587702708706eccbef1cbeea618f3d94cd25a2ddae77a550bc1bba207a
DIST sass-rails-5.0.6.tar.gz 89862 SHA256 65e679876056ffdc3d25c5d3f3bce44a5b4ab246a82d101b8b7b9f463ca0b321 SHA512 97b48e3b928c4323007b7df7f6e51d5a1c1f16c5f9276786bdb6b3a4f293ec73c4c18037cd3cd5d0bbdfa3ec92f44a8793606aba9cd23f5518b637cdee58c915 WHIRLPOOL 0ffcfdace2a6573a4ce300f320046a834431bb243619f6a2e3d6807b8f5b883d5ef3c6f7f09374a06313ed99544f3437a57e614f8facf8b61a18fbb12203b2cf
diff --git a/dev-ruby/sass-rails/sass-rails-5.0.4-r1.ebuild b/dev-ruby/sass-rails/sass-rails-5.0.4-r1.ebuild
deleted file mode 100644
index 8f54a156f820..000000000000
--- a/dev-ruby/sass-rails/sass-rails-5.0.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Official Ruby-on-Rails Integration with Sass"
-HOMEPAGE="https://github.com/rails/sass-rails"
-SRC_URI="https://github.com/rails/sass-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
-
-IUSE=""
-
-# Restrict tests for now since it is hard to set up the right
-# environment with the correct ruby interpreter and Rails test
-# application.
-RESTRICT="test"
-
-#ruby_add_bdepend "test? ( dev-ruby/sfl dev-ruby/bundler )"
-
-ruby_add_rdepend ">=dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
- =dev-ruby/railties-4*:*
- >=dev-ruby/sprockets-rails-2.0:* =dev-ruby/sprockets-2.8:* =dev-ruby/tilt-1.1:* =dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
- =dev-ruby/railties-4*:* =dev-ruby/sprockets-rails-2.0:* =dev-ruby/sprockets-2.8:* =dev-ruby/tilt-1.1:* =dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
- =dev-ruby/railties-4*:* =dev-ruby/sprockets-rails-2.0:* =dev-ruby/sprockets-2.8:* =dev-ruby/tilt-1.1:* =dev-ruby/sass-3.1:* =dev-ruby/sass-3*:*
- =dev-ruby/railties-4*:* =dev-ruby/sprockets-rails-2.0:* =dev-ruby/sprockets-2.8:* =dev-ruby/tilt-1.1:* =dev-ruby/yard-0.5.3 )"
-
-ruby_add_rdepend ">=dev-ruby/listen-1.3.1:1 !!=dev-ruby/yard-0.5.3 )"
-
-ruby_add_rdepend ">=dev-ruby/listen-1.3.1:1 !!=dev-ruby/shoulda-context-1.0.1
- >=dev-ruby/shoulda-matchers-1.4.1:0"
-
-all_ruby_prepare() {
- sed -e '/git ls-files/d' -i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/shoulda/shoulda-3.5.0-r3.ebuild b/dev-ruby/shoulda/shoulda-3.5.0-r3.ebuild
index 081bc6cbe811..6d227d944f45 100644
--- a/dev-ruby/shoulda/shoulda-3.5.0-r3.ebuild
+++ b/dev-ruby/shoulda/shoulda-3.5.0-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64"
IUSE=""
# This now more or less a meta-gem and it only contains features for
diff --git a/dev-util/monkeystudio/monkeystudio-1.9.0.4-r2.ebuild b/dev-util/monkeystudio/monkeystudio-1.9.0.4-r2.ebuild
index 00d02015f7f0..a6256c77b8ae 100644
--- a/dev-util/monkeystudio/monkeystudio-1.9.0.4-r2.ebuild
+++ b/dev-util/monkeystudio/monkeystudio-1.9.0.4-r2.ebuild
@@ -9,7 +9,7 @@ inherit qt4-r2
MY_P="mks_${PV}-src"
DESCRIPTION="A cross platform Qt 4 IDE"
-HOMEPAGE="http://www.monkeystudio.org"
+HOMEPAGE="https://monkeystudio.pasnox.com/"
SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.gz"
LICENSE="GPL-2 LGPL-3"
diff --git a/dev-vcs/gitg/metadata.xml b/dev-vcs/gitg/metadata.xml
index 2d98495dcf91..0c98618eff71 100644
--- a/dev-vcs/gitg/metadata.xml
+++ b/dev-vcs/gitg/metadata.xml
@@ -9,6 +9,10 @@
gnome@gentoo.org
Gentoo GNOME Desktop
+
+ mgorny@gentoo.org
+ Michał Górny
+
GTK+ based frontend for GIT
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 2b4d4310ea71..e8679802abc2 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,6 +1,6 @@
DIST firefox-45.0-patches-12.tar.xz 22040 SHA256 563d7bbe67aa4379ab0a9b460aa397aa2a8e9d1cadcf776490beb7349230c6c1 SHA512 be9981818e549d79f8557427dd506b9c473922c0043384563c1fd92e4c6c96c91afb8bb01d4499a3a61b463ecf2875bc776fef0f279c0f2fc3625602cb47880b WHIRLPOOL 4f100eadb5aae49731344d526ba482c97dfecebfd20de533e4986e3a0463ebe31853bf1f9faf914a6fcfab82936a52cbda2add84c019fd6ab15ea086115e5bef
DIST firefox-52.2-patches-01.tar.xz 10400 SHA256 18dbd0d6bbab50918ef3341b739710d45a45efb4aa6cee86b4b8a620cc590b93 SHA512 85cc57e27c46c3243deedcc21d248babbd9ac6c144332ac70dd6e00161fb46584d090683bc1e066c0e9136d6ede5a4e30ccb68d83cad448f6b0d8223c726dafc WHIRLPOOL 65d351f5919b897af516754df0df57b65789d8030280a35d9ab1c2e7790b2713aaac8ad1caaa1ee42007aed17f971355d7f478d134930d0e1a6148a254dd9bba
-DIST firefox-52.2-patches-02.tar.xz 12584 SHA256 3714ebf55a11cec435a42dad0e351a6648f345cda947cfdcce5d163e86af9c27 SHA512 e16d014c60f9c665e5bf1a5e9b7940b101a38f6af26970bd7c71cf0764a11d65816ad2fef2050fd6fc7b10835161d1babcb64c1b10eba1b0c7b3310fc40b57ef WHIRLPOOL 487a383e3db49c57e40c31524faf4d94fcd925b0680eb2ba5e2456a545c494625048f8894e48d4271ef7452ab538a249ac11d826fcf09b8e210fa831580a3b6b
+DIST firefox-52.2-patches-03.tar.xz 13148 SHA256 e2ab0acf173ef06874c6204a7ea77d11404dc70deca5d9edcee2e3a092ff4e60 SHA512 420dbeded3ff2f81250554416115a674ece1847db4449af9d09fa3ea5861037da9bd8525ce5bceede2abab1b58e06485e95417644c0ba8332eb076fbfed7cecd WHIRLPOOL be22652ab1fad0c55d3f3876d50f624d18b6472e7c292e96b5cb1f0e3672ef58fd41afbffd5ead912be1c15031595563eeacc2bea19673785fdde039f799e968
DIST gdata-provider-2.6-r1.tar.xz 83836 SHA256 e181d5fe69e66f34719295790301e0d265c855be5f30df516c52dd3708d82158 SHA512 e5fcf60c221590d1d904ce8c6a74da7208b118c2872a26267f4ee6d3e68eea466d44b979b7259a012a21e48eb5b470d52cc9e58584226fe04ce88ff698da495b WHIRLPOOL 0e85fbb321edec0397b42808fd6320e245de35ddd1cf772545c432dbf26d8c28b042ba2c61bbde2abdbf4d5cca076436e6d678d6d636d3bcc562470d485df6c1
DIST gdata-provider-3.3.tar.xz 85628 SHA256 1a1751a5dd3d941bb28051c1d3af5d96c6c06b00c1b2d6b2442e312ec14644bd SHA512 ae0c0e6fd42d6e7088256ca8a4be5b0bac84b2f331b51afdc982354caef60b6ba631d4f76bfba7523000b49235c8f8c63704d90acf24b34b14696b709be9342b WHIRLPOOL 2b77c9343437633dc8b26365b6f172999364b81b4928744e0eba0d0de50179fbd845085cc4fbf95a0c068a9b76bd2280db8f9f349ded680686ab6cac949bbcc6
DIST lightning-4.7.8.tar.xz 1951252 SHA256 b31acd34aa38eff8b8043922794f9ef6e2dc67740e7689462991bf9517f15756 SHA512 37decaf4010e48cf242e76c5d73caf96f7b1e34c67fd465fb8b33055a6986d5fa7b1557862526224ab4ac421df3441e974d297ec4a9454dd63a039683ec46fe6 WHIRLPOOL 7494f30e08e74097179de6f44502b91efb2b65cd9bad4f3961678496c1fa376e0f5a77dbff670d66225e49a7ad11f24d8097498678fb128409e9295fc9323292
diff --git a/mail-client/thunderbird/thunderbird-52.3.0.ebuild b/mail-client/thunderbird/thunderbird-52.3.0.ebuild
index a059a25c534c..c96cdb11c742 100644
--- a/mail-client/thunderbird/thunderbird-52.3.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-52.3.0.ebuild
@@ -17,7 +17,7 @@ uk vi zh-CN zh-TW )
MOZ_PV="${PV/_beta/b}"
# Patches
-PATCHFF="firefox-52.2-patches-02"
+PATCHFF="firefox-52.2-patches-03"
MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
diff --git a/mail-filter/spamassassin/files/spamassassin.service-r2 b/mail-filter/spamassassin/files/spamassassin.service-r3
similarity index 66%
rename from mail-filter/spamassassin/files/spamassassin.service-r2
rename to mail-filter/spamassassin/files/spamassassin.service-r3
index 803205717846..6bc74c46cc5f 100644
--- a/mail-filter/spamassassin/files/spamassassin.service-r2
+++ b/mail-filter/spamassassin/files/spamassassin.service-r3
@@ -3,10 +3,8 @@ Description=Spamassassin daemon
After=network.target
[Service]
-ExecStart=/usr/sbin/spamd $SPAMD_OPTS
+ExecStart=/usr/sbin/spamd --username=spamd --groupname=spamd $SPAMD_OPTS
ExecReload=/bin/kill -HUP $MAINPID
-User=spamd
-Group=spamd
[Install]
WantedBy=multi-user.target
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r13.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r13.ebuild
deleted file mode 100644
index dc35e32ce580..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r13.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions systemd toolchain-funcs user
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="dev-lang/perl:=
- dev-perl/HTML-Parser
- dev-perl/Net-DNS
- dev-perl/NetAddr-IP
- virtual/perl-Archive-Tar
- virtual/perl-Digest-SHA
- virtual/perl-IO-Zlib
- virtual/perl-Time-HiRes
- ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
- dev-perl/Digest-SHA1
- dev-perl/Encode-Detect
- dev-perl/Geo-IP
- dev-perl/HTTP-Date
- dev-perl/Mail-DKIM
- dev-perl/Mail-SPF
- dev-perl/Net-Patricia
- dev-perl/Net-CIDR-Lite
- dev-util/re2c
- || ( net-misc/wget[ssl] net-misc/curl[ssl] )
- virtual/perl-MIME-Base64
- virtual/perl-Pod-Parser
- berkdb? ( virtual/perl-DB_File )
- ipv6? ( dev-perl/IO-Socket-INET6 )
- ldap? ( dev-perl/perl-ldap )
- mysql? (
- dev-perl/DBI
- dev-perl/DBD-mysql
- )
- postgres? (
- dev-perl/DBI
- dev-perl/DBD-Pg
- )
- sqlite? (
- dev-perl/DBI
- dev-perl/DBD-SQLite
- )
- ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
- test? (
- ${OPTDEPEND}
- virtual/perl-Test-Harness
- )"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/spamassassin-3.4.1-bug_7199.patch"
- "${FILESDIR}/spamassassin-3.4.1-bug_7223.patch"
- "${FILESDIR}/spamassassin-3.4.1-bug_7231.patch"
- "${FILESDIR}/spamassassin-3.4.1-bug_7265.patch"
- "${FILESDIR}/spamassassin-3.4.1-bug_7231-extra.patch"
- "${FILESDIR}/spamassassin-3.4.1-bug_7404.patch"
- "${FILESDIR}/spamassassin-3.4.1-perl526.patch"
-)
-
-src_prepare() {
- default
-
- # The sa_compile test does some weird stuff like hopping around in
- # the directory tree and calling "make" to create a dist tarball
- # from ${S}. It fails, and is more trouble than it's worth...
- perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
-
- # The spamc tests (which need the networked spamd daemon) fail for
- # irrelevant reasons. It's too hard to disable them (unlike the
- # spamd tests themselves -- see src_test), so use a crude
- # workaround.
- perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
-}
-
-src_configure() {
- # This is how and where the perl-module eclass disables the
- # MakeMaker interactive prompt.
- export PERL_MM_USE_DEFAULT=1
-
- # Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
- # (just to be sure, nobody knows how it could happen in the first place).
- #
- # We also set the path to the perl executable explictly. This will be
- # used to create the initial shebang line in the scripts (bug 62276).
- perl Makefile.PL \
- PREFIX="${EPREFIX}/usr" \
- INSTALLDIRS=vendor \
- SYSCONFDIR="${EPREFIX}/etc" \
- DATADIR="${EPREFIX}/usr/share/spamassassin" \
- PERL_BIN="${EPREFIX}/usr/bin/perl" \
- ENABLE_SSL="$(usex ssl)" \
- DESTDIR="${D}" \
- || die 'failed to create a Makefile using Makefile.PL'
-
- # Now configure spamc.
- emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
- emake
- use qmail && emake spamc/qmail-spamc
-}
-
-src_install () {
- emake install
- einstalldocs
-
- # Create the stub dir used by sa-update and friends
- keepdir /var/lib/spamassassin
-
- # Move spamd to sbin where it belongs.
- dodir /usr/sbin
- mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd || die "move spamd failed"
-
- if use qmail; then
- dobin spamc/qmail-spamc
- fi
-
- ln -s mail/spamassassin "${ED}"/etc/spamassassin || die
-
- # Disable plugin by default
- sed -i -e 's/^loadplugin/\#loadplugin/g' \
- "${ED}/etc/mail/spamassassin/init.pre" \
- || die "failed to disable plugins by default"
-
- # Add the init and config scripts.
- newinitd "${FILESDIR}/3.4.1-spamd.init-r1" spamd
- newconfd "${FILESDIR}/3.4.1-spamd.conf" spamd
-
- systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
- systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-
- use postgres && dodoc sql/*_pg.sql
- use mysql && dodoc sql/*_mysql.sql
-
- dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
- sql/README.awl procmailrc.example sample-nonspam.txt \
- sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
- spamd-apache2/README.apache
-
- # Rename some files so that they don't clash with others.
- newdoc spamd/README README.spamd
- newdoc sql/README README.sql
- newdoc ldap/README README.ldap
-
- if use qmail; then
- dodoc spamc/README.qmail
- fi
-
- insinto /etc/mail/spamassassin/
- insopts -m0400
- newins "${FILESDIR}"/secrets.cf secrets.cf.example
-
- # Create the directory where sa-update stores its GPG key (if you
- # choose to import one). If this directory does not exist, the
- # import will fail. This is bug 396307. We expect that the import
- # will be performed as root, and making the directory accessible
- # only to root prevents a warning on the command-line.
- diropts -m0700
- dodir /etc/mail/spamassassin/sa-update-keys
-
- if use cron; then
- # Install the cron job if they want it.
- exeinto /etc/cron.daily
- newexe "${FILESDIR}/update-spamassassin-rules.cron" \
- update-spamassassin-rules
- fi
-
- # Remove perllocal.pod to avoid file collisions (bug #603338).
- perl_delete_localpod || die "failed to remove perllocal.pod"
-
- # The perl-module eclass calls three other functions to clean
- # up in src_install. The first fixes references to ${D} in the
- # packlist, and is useful to us, too. The other two functions,
- # perl_delete_emptybsdir and perl_remove_temppath, don't seem
- # to be needed: there are no empty directories, *.bs files, or
- # ${D} paths remaining in our installed image.
- perl_fix_packlist || die "failed to fix paths in packlist"
-}
-
-src_test() {
- # Trick the test suite into skipping the spamd tests. Setting
- # SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
- # set in SATest.pm.
- export SPAMD_HOST=disabled
- default
-}
-
-pkg_preinst() {
- # The spamd daemon runs as this user. Use a real home directory so
- # that it can hold SA configuration.
- enewuser spamd -1 -1 /home/spamd
-}
-
-pkg_postinst() {
- elog
- elog 'No rules are installed by default. You will need to run sa-update'
- elog 'at least once, and most likely configure SpamAssassin before it'
- elog 'will work.'
-
- if ! use cron; then
- elog
- elog 'You should consider a cron job for sa-update. One is provided'
- elog 'for daily updates if you enable the "cron" USE flag.'
- fi
- elog
- elog 'Configuration and update help can be found on the wiki:'
- elog
- elog ' https://wiki.gentoo.org/wiki/SpamAssassin'
- elog
-}
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
similarity index 99%
rename from mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild
rename to mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
index 47d77f361f73..3273f6b1706b 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r15.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.1-r16.ebuild
@@ -158,7 +158,7 @@ src_install () {
newinitd "${FILESDIR}/3.4.1-spamd.init-r1" spamd
newconfd "${FILESDIR}/3.4.1-spamd.conf" spamd
- systemd_newunit "${FILESDIR}/${PN}.service-r2" "${PN}.service"
+ systemd_newunit "${FILESDIR}/${PN}.service-r3" "${PN}.service"
systemd_install_serviced "${FILESDIR}/${PN}.service.conf-r1" \
"${PN}.service"
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 527eb9c07aa1..42d30a9cd1c4 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,2 +1,3 @@
DIST ristretto-0.8.0.tar.bz2 541473 SHA256 71625324cecda7199acbc95a3ea5132d0dcbf808771e7a209ea2b9503ae4f328 SHA512 067d3e7b5ec4fe3537cc796b94e8b999fc99efdb58c52a2a71160405626a3784caa877724e756b363012dce4719ee534f4ce0c92f2f6f2adaf937da8d5abab99 WHIRLPOOL 85b7dbbf7009b5a100f8fa5302f683df2832d448c5580e94ae8e48cd74ec600b9964b101f774cb9610f63786ffe7f11a779a5a4c333ba4778c058ac2f70d35c9
DIST ristretto-0.8.2.tar.bz2 559444 SHA256 f8f3b77ca6fc77ddf8cff1bb52e5c5802c462663f72f324393b3a0360f6901b8 SHA512 bceef420ebb6e5ab89f339cb4d173bbdd3abc09df5f7dd4551e5c8484e226af6a4ef7b131888926027bae901fd05278cf29de296588723142bd6d0bd8afc312e WHIRLPOOL 85da22ada74afe3fff268d316823979c1992d8e705a97a9d92bb6bcf7fea9b25d69ba59cf399a45d775561ec28758b7ee5012ab238e76d4e169eac1eb32fada9
+DIST ristretto-0.8.2git-rd21ed3c.tar.bz2 584418 SHA256 9de0e922372c63c7ba3b108cd2d777feab3c1b551b8e646b42dbbd73ca84ceca SHA512 17fe6b5c24d4f4f3b6d28e1c435afbb0140e81a77f2b1c628ab7e05ed380a55a902368dabbb8e92647f08bb8853df8099b8de779d94dc91d3426cc7e33cbcbe3 WHIRLPOOL 93c3e5d23ec35f91253f40f84b862e81f54aebb4821b00bea50e8bc51e70b79c8b0151c2cfc3cd650cbfbbd04d730822314fa8a40da327aeadc31aae7e27a823
diff --git a/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild b/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild
new file mode 100644
index 000000000000..bce668dc9152
--- /dev/null
+++ b/media-gfx/ristretto/ristretto-0.8.2_p20170821.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+MY_P=${P%_p*}git-rd21ed3c
+DESCRIPTION="A fast and lightweight picture viewer for Xfce"
+HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/dbus-glib-0.98:0=
+ >=dev-libs/glib-2.24:2=
+ media-libs/libexif:0=
+ x11-libs/cairo:0=
+ >=x11-libs/gtk+-2.20:2=
+ x11-libs/libX11:0=
+ >=xfce-base/libxfce4ui-4.10:0=
+ >=xfce-base/libxfce4util-4.10:0=
+ >=xfce-base/xfconf-4.10:0="
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 55f0b976d115..457d293d6a0a 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,2 +1,3 @@
DIST Image-ExifTool-10.59.tar.gz 4263896 SHA256 c2a7906edc2c62171bfd1afcf5123f7e720fd33867eee3e40b5251c1304952f3 SHA512 b68abe8b76694e9e26e188e61e1d0f94f4e694a3239718fc31d183b6734314692418b7842056be6bf020c2c8e7ecc3a69eb0cf12b6af7da1562caccc9ad892fd WHIRLPOOL c3c97eacbb3d54f81c8ad25c68edf5ca4b0985009f41dee261de71d35e957132575849f88d2bea09c5b2f1cdc63ed0e3e07892fb3bd7d27724792fe5bf8ff838
DIST Image-ExifTool-10.60.tar.gz 4265747 SHA256 df0988f60e1a6c086799e1f2ecd419e8abbad4dfb5dfa66c6080c78a5cb7acfa SHA512 c3c113fd5771faca61663a6ed217a4d373271c3ec909e0fc871ad8320a8d4c9ef87d6a43cfcf6b3a9219ddcbdafad3bf78bb697440d96c425ff605b1809ee9c4 WHIRLPOOL e61040b317cd16fac878bf6c56a0db2fc8aa7fb70f2f84162475e1747aeefa3ce690ab9f11c4261a86f088db257edfa6efdc2b6b6f09caf5c518104f75d07169
+DIST Image-ExifTool-10.61.tar.gz 4270638 SHA256 a8f2b535c070f17ae6113bc1dd2e9db5a663621f1726b45f57511e374b5190eb SHA512 2d528045f24501985c326a9abf58dc1e77b9ecbef4253e1fcb456fa3c76cbe0a6ff6c6b42fc0095401bf15ac2ad90e02ae4b22cac43aae740b2d5d484c3b85c5 WHIRLPOOL 3623dbdda5a2742f7ba1268814b4a0374dd24802237a278760d5da734d21c6c40352a6bc250831bc0d9b4eae02d353a5539a1d90aa87a76e1943a97d44e3a175
diff --git a/media-libs/exiftool/exiftool-10.61.ebuild b/media-libs/exiftool/exiftool-10.61.ebuild
new file mode 100644
index 000000000000..88f3bab6f236
--- /dev/null
+++ b/media-libs/exiftool/exiftool-10.61.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+ perl-module_src_install
+ use doc && dodoc -r html/
+}
diff --git a/media-libs/exiftool/metadata.xml b/media-libs/exiftool/metadata.xml
index 0137eae1b982..4241e2937c4a 100644
--- a/media-libs/exiftool/metadata.xml
+++ b/media-libs/exiftool/metadata.xml
@@ -9,15 +9,16 @@
perl@gentoo.org
Gentoo Perl Project
- ExifTool is a platform-independent Perl library plus a
- command-line application for reading, writing and editing meta
- information in image, audio and video files. ExifTool supports
- many different types of metadata including EXIF, GPS, IPTC, XMP,
- JFIF, GeoTIFF, ICC Profile, Photoshop IRB, FlashPix, AFCP and
- ID3, as well as the maker notes of many digital cameras by
- Canon, Casio, FujiFilm, HP, JVC/Victor, Kodak, Leaf,
- Minolta/Konica- Minolta, Nikon, Olympus/Epson, Panasonic/Leica,
- Pentax/Asahi, Ricoh, Sanyo, Sigma/Foveon and Sony.
+
+ ExifTool is a platform-independent Perl library plus a command-line
+ application for reading, writing and editing meta information in image,
+ audio and video files. ExifTool supports many different types of
+ metadata including EXIF, GPS, IPTC, XMP, JFIF, GeoTIFF, ICC Profile,
+ Photoshop IRB, FlashPix, AFCP and ID3, as well as the maker notes of
+ many digital cameras by Canon, Casio, FujiFilm, HP, JVC/Victor, Kodak,
+ Leaf, Minolta/Konica- Minolta, Nikon, Olympus/Epson, Panasonic/Leica,
+ Pentax/Asahi, Ricoh, Sanyo, Sigma/Foveon and Sony.
+
Image-ExifTool
File::RandomAccess
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 623e819b6283..181474f299a5 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,4 +1,4 @@
DIST harfbuzz-1.4.5.tar.bz2 1474461 SHA256 d0e05438165884f21658154c709075feaf98c93ee5c694b951533ac425a9a711 SHA512 dd505ef950ef1d702a820987d8e93097e4c4fd9f725d18e69dd756ea21d4d5624eb2edfc8563f89947e3913bf5efa1834092e06ea02821744b0b588ce2ceb00e WHIRLPOOL a81252744980fb53816df7ce7ed810e0202551976a90493da4e382dc19947bd715d83fcdbc31f39312d9e91b53443667faabe178ad59edb5d06df2ed1569ce06
DIST harfbuzz-1.4.6.tar.bz2 1475086 SHA256 21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293 SHA512 aade3902adadf3a8339ba1d05279e639da7cb53981adc64e2a2d32a5d49335a6a9782a62cdf80beca569ec8a639792bf0368c0b6ecad08f35bc85878678aa096 WHIRLPOOL 0ac9d9856f1ff145eaf993a01834198b5b7a07666b7cf995d60c10ee36715cf0055c42b9b0484091a6c89dfa561f674c0ec721d35ed382548d06011b30ee7877
-DIST harfbuzz-1.4.7.tar.bz2 1592693 SHA256 b85f6627425d54f32118308e053b939c63a388de9bf455b3830f68cad406bc6d SHA512 18fcd50c72ee4e9409ebb396b05508b8e03d2c8be47905d0d6e40b68c0978dbba71894f9bfb6fed834ce5a95e8dadd83db307a8ff9dafc0905cef519173e7eb4 WHIRLPOOL 827898f6e3d764dd3fb2b0cf9250c1a13035ed4ca0b39070044e990a38167491b45c32aa5b0cceafc140655d675fa6763d2e1c41fe19dbbaf835a279131535f6
DIST harfbuzz-1.4.8.tar.bz2 1587622 SHA256 ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131 SHA512 056a2c02f803439b39086e3ea988e424f5512b3213844f9008c62f5448a8ccdba525f532e7ed54641820a4ef6dc5bc4d13d4f7bfb39ff904f5939c855d294152 WHIRLPOOL c5b17719b0a362d775cbebf081bb6bd946c3a3401a7ed292ae0bc021abe2b4a18a5fab3adc8e65793ead45d665b2b45b04ffaf8ea2924c4325b6fd39d1b1abf6
+DIST harfbuzz-1.5.0.tar.bz2 1614725 SHA256 c088ec363be8d03f7708feb76dd22d5f102678e67d6ce63b02496ca0beb64ac1 SHA512 cde892cb7f1b0efecc6911d5793b21869f9ff4f4d012fe740c01815adad6faef405dbddc759a99ca1793a6f749206b0d44493a1f9547d6572de0426771a646b3 WHIRLPOOL 32f49789337c79c26448268a160df5405e14bc0d6cd16c4feb27816bc9869c2c4c18d8e09d3548239502d8a55db362a0b2fb28f438fd8dacc07523f017bc3009
diff --git a/media-libs/harfbuzz/harfbuzz-1.4.7.ebuild b/media-libs/harfbuzz/harfbuzz-1.5.0.ebuild
similarity index 96%
rename from media-libs/harfbuzz/harfbuzz-1.4.7.ebuild
rename to media-libs/harfbuzz/harfbuzz-1.5.0.ebuild
index a12012706f51..da388e5fba70 100644
--- a/media-libs/harfbuzz/harfbuzz-1.4.7.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.5.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
[[ ${PV} == 9999 ]] && inherit git-r3 autotools
PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
DESCRIPTION="An OpenType text shaping engine"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/harfbuzz/release/${P}.tar.bz2"
+[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index b6539bdf637c..d3faeb68792d 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,3 +1,4 @@
DIST libmpdclient-2.10.tar.xz 261792 SHA256 4f08cde82dae70895f8e4532a6e9b54b201efd5591c6b5d6834895807ed2ff82 SHA512 f54fc3501643ece4eee2f63ddbf5f3d676f3843be0859f482d70cc142b6d9dfbdebd511ccc52a9c058a644e3b80c93a680e1de19f6f3ebfc46cb197f0ddddb5b WHIRLPOOL b97f9024f1c18233019d94501e0f60055a03001e5342884a275768ac297ad11a6ab865e0849f6c274067f7952ed22c2f7bb14f6349b94df5643150a883c47840
DIST libmpdclient-2.11.tar.xz 274836 SHA256 15fe693893c0d7ea3f4c35c4016fbd0332836164178b20983eec9b470846baf6 SHA512 0503db31262acfb871578278d6526e12ee2ffbbe414425ab5ebac61f27da8ad4503d948b4d192421d301bd0a29b9b460f195e82a44608f984697a8aa47b2eb9b WHIRLPOOL b2480e9cc02f49b76abd0fd385f748ce6b9cfa901f6b338d2f10a18ccc82c9587edb1cf2bc7dd582deaf123725fba296d8716bf25b2ffd313b3f28fa2343497d
+DIST libmpdclient-2.13.tar.xz 56964 SHA256 5115bd52bc20a707c1ecc7587e6389c17305348e2132a66cf767c62fc55ed45d SHA512 a2aa4e1e4fcb4ab390a0a38e745e59a9764c40bfcd07d449fdc7fef7b0c5fc0c2e795ef545b6fa6d62c00861d306cab41ea43011510ad1e3a60603873a3c1b28 WHIRLPOOL c227976788e9bd8f41d0fa87d41d4072af4048eaf57360e2318765f2bb2e52d069c9b9e7f2bb27d2787bbed44d1c15ce0de01a977712de52ca8a131cf734742d
DIST libmpdclient-2.9.tar.xz 253992 SHA256 7cc97ba560e91addafe5975f7e7da04b95d6710750e47b3367fa0d8c3b7699ca SHA512 7e6af51e31a3319e6681dfe5199fda1b2c1482f6aa6854af7c7f02c999fbbeae4f369c9b157abf95402c7f022d155109454b243549185ba791df5b2457baaba4 WHIRLPOOL d4d78a83bfa300be8df37e321c3b8ed535bd7342acc1ec371a2aa59a76efde79a9c4531bc8052c5d0c2c423d808f23b2e5d3b92ccf5c9dec4f2a120b615a4992
diff --git a/media-libs/libmpdclient/libmpdclient-2.13.ebuild b/media-libs/libmpdclient/libmpdclient-2.13.ebuild
new file mode 100644
index 000000000000..bc62fa25d5da
--- /dev/null
+++ b/media-libs/libmpdclient/libmpdclient-2.13.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=""
+DEPEND="
+ doc? ( app-doc/doxygen )
+ test? ( dev-libs/check )
+"
+
+src_prepare() {
+ default
+
+ sed -i "s:@top_srcdir@:.:" doc/doxygen.conf.in || die
+
+ # meson doesn't support setting docdir
+ sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+ -e "/^install_data(/s/'COPYING', //" \
+ -i meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddocumentation=$(usex doc true false)
+ -Dtest=$(usex test true false)
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ use examples && dodoc src/example.c
+ use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html
+}
diff --git a/media-libs/openjpeg/openjpeg-2.2.0.ebuild b/media-libs/openjpeg/openjpeg-2.2.0.ebuild
index 552411b6ce07..c4ca345cbdb1 100644
--- a/media-libs/openjpeg/openjpeg-2.2.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2"
SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RDEPEND="media-libs/lcms:2=
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 15dd425d174b..5b58a72d80fd 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,5 +1,6 @@
DIST mpd-0.19.19.tar.xz 707356 SHA256 bc856cda4136403446d53d11576f86990b61d1fe4668f6008e9eae47450d4e1d SHA512 949bfab2aa5dffb4089ce2023accc934648091d36768f8e4c75f62b4038e21db1e2ef3bb07a0f1cf6a91d0532cac8e7146be948d84dc4d7cdc5b252b7d815b64 WHIRLPOOL 1b2c68d998a26de41bca25cbeab0c6478406c831ac4322162d2c258622224137a1a2dcd88b690ee1869c7f2652201fd534ee773a6e51f6e61bdb5926783f4d75
DIST mpd-0.19.21.tar.xz 708512 SHA256 8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730 SHA512 a65690012a74def273ffb4e87465d8f3f7f2ce6f6e9117e35aa0891cd638f904df0ef4c4923c39e9a0c3e1d93d09aab713979adf5c191b54fa7e8b5b81abd232 WHIRLPOOL 397bc2158591137ab8a30e3377458dcef0ea600e218723831977ea7ec9f5b14ae1221b2b7456daa9e249b3aa95c61f7a1f0742656ace42c837e28892dd3d7604
+DIST mpd-0.20.10.tar.xz 778828 SHA256 52fbc1125cdba41ba999add2820d45f3ce7cf493006bb04d8f0b2937204d3121 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c WHIRLPOOL f0e2ab6b76848c88f57e13b16258c9d4810e9642f54c3f8d3378fedf484b97ed62c4afad6f217235de4e282d0b2ff99ffc40eac19774b72c1a2291f4f7e54e21
DIST mpd-0.20.4.tar.xz 770132 SHA256 712b25351c12616630c580204e1c3dcba3ae2993a56cff1c346c87e334d69728 SHA512 d0c01ae6a3fd59e5ccdc24225bd9bb9e63620f1a395d317573499cc045de81f2abd803ca87eb1b2ca1d26d25167aaa6f5523e96f9512619272b857190efa0a72 WHIRLPOOL 9446b7096c6d2eb41a9421ad8e58e7a70a66e7abb381e75edabf0718c0098646e82ca16d7157e6c453836825eb03a2eca09ff7f80e95918718e42da85ae30c9e
DIST mpd-0.20.6.tar.xz 772140 SHA256 f4055e1189e5cc00e83706b2e0b5ead924ced0303e073d7802ee9f9a8eba4b47 SHA512 3377e095eaf8cd3ae14e4218fd85d1bcd79d29899ad4c61f5cd2a0b714c5e8aa22aa3b8bd54477195b93ddd44b8e82f8c6428c8f36174c98cba631554224dcfe WHIRLPOOL e3509fb61bed5e766d17ed66178d049bd13b3b088046e7c4d2400d5aebc2d82936ef60297e99db6b386bd474c40caecc3c6d5fd6f703810f3438dce8febfe41f
DIST mpd-0.20.8.tar.xz 773128 SHA256 7d177f29663c4a0997413401e52bbf11d2bb472773bbcf9294f839c4b8751e35 SHA512 063feafae7137ea5b61498132b4fcc2e04e23bb9d6fa849a0c6d90c40ecc0a841617dec0f53021bfc5add559b59388d20ef211e1bc88fcaca46b5ecbf1bb8960 WHIRLPOOL 2dcc30e9eebdb466486cf6aff93796b2837ede92c5a01f20643ba64af86b9583b1702ac578653d897be3a9cfee2bb5b817584804a2d5192b31920dcdd7a47d62
diff --git a/media-sound/mpd/mpd-0.20.10.ebuild b/media-sound/mpd/mpd-0.20.10.ebuild
new file mode 100644
index 000000000000..7e3851e85edd
--- /dev/null
+++ b/media-sound/mpd/mpd-0.20.10.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
+ +fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
+ lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
+ mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
+ samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
+ unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+ modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+ || ( ${OUTPUT_PLUGINS} )
+ || ( ${DECODER_PLUGINS} )
+ network? ( || ( ${ENCODER_PLUGINS} ) )
+ recorder? ( || ( ${ENCODER_PLUGINS} ) )
+ opus? ( ogg )
+ upnp? ( expat )
+"
+
+CDEPEND="!=media-libs/game-music-emu-0.6.0_pre20120802 )
+ icu? ( dev-libs/icu:= )
+ id3tag? ( media-libs/libid3tag )
+ jack? ( virtual/jack )
+ lame? ( network? ( media-sound/lame ) )
+ libmpdclient? ( media-libs/libmpdclient )
+ libsamplerate? ( media-libs/libsamplerate )
+ mad? ( media-libs/libmad )
+ mikmod? ( media-libs/libmikmod:0 )
+ mms? ( media-libs/libmms )
+ modplug? ( media-libs/libmodplug )
+ mpg123? ( >=media-sound/mpg123-1.12.2 )
+ musepack? ( media-sound/musepack-tools )
+ network? (
+ >=media-libs/libshout-2
+ !lame? ( !vorbis? ( media-libs/libvorbis ) )
+ )
+ nfs? ( net-fs/libnfs )
+ ogg? ( media-libs/libogg )
+ openal? ( media-libs/openal )
+ opus? ( media-libs/opus )
+ pulseaudio? ( media-sound/pulseaudio )
+ samba? ( >=net-fs/samba-4.0.25 )
+ sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
+ sndfile? ( media-libs/libsndfile )
+ soundcloud? ( >=dev-libs/yajl-2:= )
+ libsoxr? ( media-libs/soxr )
+ sqlite? ( dev-db/sqlite:3 )
+ systemd? ( sys-apps/systemd )
+ tcpd? ( sys-apps/tcp-wrappers )
+ twolame? ( media-sound/twolame )
+ upnp? ( net-libs/libupnp:= )
+ vorbis? ( media-libs/libvorbis )
+ wavpack? ( media-sound/wavpack )
+ wildmidi? ( media-sound/wildmidi )
+ zeroconf? ( net-dns/avahi[dbus] )
+ zip? ( dev-libs/zziplib )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${CDEPEND}
+ dev-libs/boost
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-mpd )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+ use network || ewarn "Icecast and Shoutcast streaming needs networking."
+ use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+ enewuser mpd "" "" "/var/lib/mpd" audio
+
+ if use eventfd; then
+ CONFIG_CHECK+=" ~EVENTFD"
+ ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+ fi
+ if use signalfd; then
+ CONFIG_CHECK+=" ~SIGNALFD"
+ ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+ fi
+ if use inotify; then
+ CONFIG_CHECK+=" ~INOTIFY_USER"
+ ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+ fi
+ if use eventfd || use signalfd || use inotify; then
+ linux-info_pkg_setup
+ fi
+
+ elog "If you will be starting mpd via /etc/init.d/mpd, please make
+ sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+ cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-database --disable-roar --disable-documentation
+ --enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+ --disable-solaris-output --enable-tcp --enable-un --disable-werror
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ )
+
+ if use network; then
+ myeconfargs+=(
+ --enable-shout
+ $(use_enable vorbis vorbis-encoder)
+ --enable-httpd-output
+ $(use_enable lame lame-encoder)
+ $(use_enable twolame twolame-encoder)
+ $(use_enable audiofile wave-encoder)
+ )
+ else
+ myeconfargs+=(
+ --disable-shout
+ --disable-vorbis-encoder
+ --disable-httpd-output
+ --disable-lame-encoder
+ --disable-twolame-encoder
+ --disable-wave-encoder
+ )
+ fi
+
+ if use samba || use upnp; then
+ myeconfargs+=( --enable-neighbor-plugins )
+ fi
+
+ append-lfs-flags
+ append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+ myeconfargs+=(
+ $(use_enable eventfd)
+ $(use_enable signalfd)
+ $(use_enable libmpdclient)
+ $(use_enable expat)
+ $(use_enable upnp)
+ $(use_enable adplug)
+ $(use_enable alsa)
+ $(use_enable ao)
+ $(use_enable audiofile)
+ $(use_enable zlib)
+ $(use_enable bzip2)
+ $(use_enable cdio cdio-paranoia)
+ $(use_enable curl)
+ $(use_enable samba smbclient)
+ $(use_enable nfs)
+ $(use_enable debug)
+ $(use_enable ffmpeg)
+ $(use_enable fifo)
+ $(use_enable flac)
+ $(use_enable fluidsynth)
+ $(use_enable gme)
+ $(use_enable id3tag id3)
+ $(use_enable inotify)
+ $(use_enable ipv6)
+ $(use_enable cdio iso9660)
+ $(use_enable jack)
+ $(use_enable soundcloud)
+ $(use_enable tcpd libwrap)
+ $(use_enable libsamplerate lsr)
+ $(use_enable libsoxr soxr)
+ $(use_enable mad)
+ $(use_enable mikmod)
+ $(use_enable mms)
+ $(use_enable modplug)
+ $(use_enable musepack mpc)
+ $(use_enable mpg123)
+ $(use_enable openal)
+ $(use_enable opus)
+ $(use_enable oss)
+ $(use_enable pipe pipe-output)
+ $(use_enable pulseaudio pulse)
+ $(use_enable recorder recorder-output)
+ $(use_enable sid sidplay)
+ $(use_enable sndfile sndfile)
+ $(use_enable sqlite)
+ $(use_enable systemd systemd_daemon)
+ $(use_enable vorbis)
+ $(use_enable wavpack)
+ $(use_enable wildmidi)
+ $(use_enable zip zzip)
+ $(use_enable icu)
+ $(use_enable faad aac)
+ $(use_with zeroconf zeroconf avahi)
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+ --with-systemduserunitdir=$(systemd_get_userunitdir)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ insinto /etc
+ newins doc/mpdconf.dist mpd.conf
+
+ newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
+
+ if use unicode; then
+ sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+ "${ED}"/etc/mpd.conf || die "sed failed"
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}-0.20.4.logrotate ${PN}
+
+ use prefix || diropts -m0755 -o mpd -g audio
+ dodir /var/lib/mpd
+ keepdir /var/lib/mpd
+ dodir /var/lib/mpd/music
+ keepdir /var/lib/mpd/music
+ dodir /var/lib/mpd/playlists
+ keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+ # also change the homedir if the user has existed before
+ usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mumble/mumble-1.2.19.ebuild b/media-sound/mumble/mumble-1.2.19.ebuild
index b27c4b19f7b0..52c0b1ed4388 100644
--- a/media-sound/mumble/mumble-1.2.19.ebuild
+++ b/media-sound/mumble/mumble-1.2.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
LICENSE="BSD MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf"
RDEPEND=">=dev-libs/boost-1.41.0
diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
new file mode 100644
index 000000000000..13ae3a45a589
--- /dev/null
+++ b/media-video/rtmpdump/rtmpdump-2.4_p20161210-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="RTMP client intended to stream audio or video flash content"
+HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+# the library is LGPL-2.1, the command is GPL-2
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls polarssl ssl libressl"
+
+DEPEND="ssl? (
+ gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP},nettle(+)] )
+ polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[${MULTILIB_USEDEP}] ) )
+ !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl ) ) )
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ if ! use ssl && { use gnutls || use polarssl; }; then
+ ewarn "USE='gnutls polarssl' are ignored without USE='ssl'."
+ ewarn "Please review the local USE flags for this package."
+ fi
+}
+
+src_unpack() {
+ mkdir -p "${S}" || die "Can't create source directory"
+ cd "${S}" || die
+ unpack ${A}
+}
+
+src_prepare() {
+ # fix #571106 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+ # fix Makefile ( bug #298535 , bug #318353 and bug #324513 )
+ sed -i 's/\$(MAKEFLAGS)//g' Makefile \
+ || die "failed to fix Makefile"
+ sed -i -e 's:OPT=:&-fPIC :' \
+ -e 's:OPT:OPTS:' \
+ -e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
+ || die "failed to fix Makefile"
+ eapply_user
+ multilib_copy_sources
+}
+
+multilib_src_compile() {
+ if use ssl ; then
+ if use gnutls ; then
+ crypto="GNUTLS"
+ elif use polarssl ; then
+ crypto="POLARSSL"
+ else
+ crypto="OPENSSL"
+ fi
+ fi
+ #fix multilib-script support. Bug #327449
+ sed -i "/^libdir/s:lib$:$(get_libdir):" librtmp/Makefile || die
+ if ! multilib_is_native_abi; then
+ cd librtmp || die
+ fi
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
+ OPT="${CFLAGS}" XLDFLAGS="${LDFLAGS}" CRYPTO="${crypto}" SYS=posix
+}
+
+multilib_src_install() {
+ mkdir -p "${ED}"/usr/$(get_libdir) || die
+ if multilib_is_native_abi; then
+ dodoc README ChangeLog rtmpdump.1.html rtmpgw.8.html
+ else
+ cd librtmp || die
+ fi
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
+ CRYPTO="${crypto}" install
+}
diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild
index b4c247a6697e..80f3d75437d5 100644
--- a/media-video/rtmpdump/rtmpdump-9999.ebuild
+++ b/media-video/rtmpdump/rtmpdump-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI="6"
-inherit git-2 multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit git-r3 multilib toolchain-funcs multilib-minimal flag-o-matic
DESCRIPTION="RTMP client intended to stream audio or video flash content"
HOMEPAGE="http://rtmpdump.mplayerhq.hu/"
@@ -40,6 +40,7 @@ src_prepare() {
-e 's:OPT:OPTS:' \
-e 's:CFLAGS=.*:& $(OPT):' librtmp/Makefile \
|| die "failed to fix Makefile"
+ eapply_user
multilib_copy_sources
}
@@ -69,6 +70,6 @@ multilib_src_install() {
else
cd librtmp || die
fi
- emake DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man" \
+ emake DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir='$(prefix)/share/man' \
CRYPTO="${crypto}" install
}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index cbc196eef91f..99203f03c6ec 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 24 Aug 2017 05:39:05 +0000
+Fri, 25 Aug 2017 05:39:15 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index da6e70ab5e19..81fcabd86004 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 24 Aug 2017 05:39:06 +0000
+Fri, 25 Aug 2017 05:39:16 +0000
diff --git a/metadata/md5-cache/app-admin/ansible-2.3.2.0-r1 b/metadata/md5-cache/app-admin/ansible-2.3.2.0-r1
index 0b19eef3442b..1f9f0358e942 100644
--- a/metadata/md5-cache/app-admin/ansible-2.3.2.0-r1
+++ b/metadata/md5-cache/app-admin/ansible-2.3.2.0-r1
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] =dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] =dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
DESCRIPTION=Model-driven deployment, config management, and command execution framework
EAPI=6
HOMEPAGE=http://ansible.com/
-IUSE=test python_targets_python2_7
+IUSE=test python_targets_python2_7 python_targets_python3_5
KEYWORDS=amd64 x86 ~x64-macos
LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
RESTRICT=test
SLOT=0
SRC_URI=http://releases.ansible.com/ansible/ansible-2.3.2.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/ansible/ansible-2.3.2.0-pycryptodome.patch
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=54f43feabd9b61413454686ed6df86d5
+_md5_=7341755ede0bafadeb1c387e9528ff89
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index c32972a7de87..ab4753becce1 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] test? ( =dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] app-text/asciidoc net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytest-mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( =dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
DESCRIPTION=Model-driven deployment, config management, and command execution framework
EAPI=6
HOMEPAGE=https://www.ansible.com/
-IUSE=test python_targets_python2_7 python_targets_python3_5
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
LICENSE=GPL-3
-RDEPEND==dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] app-text/asciidoc net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RDEPEND==dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 git-r3 cbafa3261c37c7e3af44bb16a34ea390 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f8ba52b5e7c437aea302df44967b9bda
+_md5_=51ccbde9e4208454e6eceb03c31cd672
diff --git a/metadata/md5-cache/app-admin/entr-3.8 b/metadata/md5-cache/app-admin/entr-3.8
new file mode 100644
index 000000000000..42af11a535f3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/entr-3.8
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure unpack
+DESCRIPTION=Run arbitrary commands when files change
+EAPI=6
+HOMEPAGE=http://entrproject.org
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=ISC
+SLOT=0
+SRC_URI=http://entrproject.org/code/entr-3.8.tar.gz
+_md5_=0dfcf4b881c6b6aa525e2c70cf944bae
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.21_rc1 b/metadata/md5-cache/app-admin/sudo-1.8.21
similarity index 84%
rename from metadata/md5-cache/app-admin/sudo-1.8.21_rc1
rename to metadata/md5-cache/app-admin/sudo-1.8.21
index fbc6ba3004f1..2b79db7c98de 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.21_rc1
+++ b/metadata/md5-cache/app-admin/sudo-1.8.21
@@ -4,10 +4,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
EAPI=6
HOMEPAGE=http://www.sudo.ws/
IUSE=gcrypt ldap nls pam offensive openssl selinux skey +sendmail
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris
LICENSE=ISC BSD
RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
SLOT=0
-SRC_URI=http://www.sudo.ws/sudo/dist/beta/sudo-1.8.21rc1.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.8.21rc1.tar.gz
+SRC_URI=http://www.sudo.ws/sudo/dist/sudo-1.8.21.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.21.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 toolchain-funcs 185a06792159ca143528e7010368e8af
_md5_=db9f97ff8299acf6ed40835ed26ea35f
diff --git a/metadata/md5-cache/app-arch/unrar-5.5.8 b/metadata/md5-cache/app-arch/unrar-5.5.8
index c68f64fbd569..027e54212858 100644
--- a/metadata/md5-cache/app-arch/unrar-5.5.8
+++ b/metadata/md5-cache/app-arch/unrar-5.5.8
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=Uncompress rar files
EAPI=6
HOMEPAGE=http://www.rarlab.com/rar_add.htm
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=unRAR
RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
SLOT=0/5
SRC_URI=http://www.rarlab.com/rar/unrarsrc-5.5.8.tar.gz -> unrar-5.5.8.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=fad50ea0ed1157d7e65f09fcea3fe568
+_md5_=d5015f2ca05717dd9a437b0d531aa7ed
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4.11_p20170629 b/metadata/md5-cache/app-arch/xarchiver-0.5.4.11_p20170629
new file mode 100644
index 000000000000..bf5679514e8b
--- /dev/null
+++ b/metadata/md5-cache/app-arch/xarchiver-0.5.4.11_p20170629
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm prepare
+DEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3= dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( app-text/docbook-xml-dtd app-text/docbook-xsl-stylesheets dev-libs/libxml2 dev-libs/libxslt ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=A GTK+ archive manager that can be used with Thunar
+EAPI=6
+HOMEPAGE=https://github.com/ib/xarchiver
+IUSE=doc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3=
+SLOT=0
+SRC_URI=https://github.com/ib/xarchiver/archive/79a73d46b782cf8bb93d058d00d2cb81a9b3df8a.tar.gz -> xarchiver-0.5.4.11_p20170629.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a4e95720f419daf3ea92f832b52d442c
diff --git a/metadata/md5-cache/app-backup/fsarchiver-0.6.19 b/metadata/md5-cache/app-backup/fsarchiver-0.6.19
deleted file mode 100644
index 48632bc5f34c..000000000000
--- a/metadata/md5-cache/app-backup/fsarchiver-0.6.19
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/libgcrypt:0 >=sys-fs/e2fsprogs-1.41.4 lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lzma? ( app-arch/xz-utils[static-libs] ) ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Flexible filesystem archiver for backup and deployment tool
-EAPI=5
-HOMEPAGE=http://www.fsarchiver.org
-IUSE=debug lzma lzo static
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libgcrypt:0 >=sys-fs/e2fsprogs-1.41.4 lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lzma? ( app-arch/xz-utils[static-libs] ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/fsarchiver/fsarchiver-0.6.19.tar.gz
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=b9c3660a716f83a8950f09e93f669fb6
diff --git a/metadata/md5-cache/app-backup/fsarchiver-0.6.24 b/metadata/md5-cache/app-backup/fsarchiver-0.6.24
deleted file mode 100644
index ed7a8ff97e6c..000000000000
--- a/metadata/md5-cache/app-backup/fsarchiver-0.6.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/libgcrypt:0= >=sys-fs/e2fsprogs-1.41.4 lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lzma? ( app-arch/xz-utils[static-libs] ) ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Flexible filesystem archiver for backup and deployment tool
-EAPI=6
-HOMEPAGE=http://www.fsarchiver.org
-IUSE=debug lzma lzo static
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libgcrypt:0= >=sys-fs/e2fsprogs-1.41.4 lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lzma? ( app-arch/xz-utils[static-libs] ) )
-SLOT=0
-SRC_URI=https://github.com/fdupoux/fsarchiver/releases/download/0.6.24/fsarchiver-0.6.24.tar.gz
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=ee3503aaef7fa7e75fd838dce39eb6fd
diff --git a/metadata/md5-cache/app-backup/fsarchiver-0.8.0 b/metadata/md5-cache/app-backup/fsarchiver-0.8.2
similarity index 93%
rename from metadata/md5-cache/app-backup/fsarchiver-0.8.0
rename to metadata/md5-cache/app-backup/fsarchiver-0.8.2
index 6d4491a40faa..5ec3772598c3 100644
--- a/metadata/md5-cache/app-backup/fsarchiver-0.8.0
+++ b/metadata/md5-cache/app-backup/fsarchiver-0.8.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/libgcrypt:0= >=sys-fs/e2fsprogs-1.41.4 lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lzma? ( app-arch/xz-utils[static-libs] ) )
SLOT=0
-SRC_URI=https://github.com/fdupoux/fsarchiver/releases/download/0.8.0/fsarchiver-0.8.0.tar.gz
+SRC_URI=https://github.com/fdupoux/fsarchiver/releases/download/0.8.2/fsarchiver-0.8.2.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=ee3503aaef7fa7e75fd838dce39eb6fd
+_md5_=d89b8ff4901332bcb2e50b41ca145c7b
diff --git a/metadata/md5-cache/app-crypt/acme-0.17.0 b/metadata/md5-cache/app-crypt/acme-0.17.0
new file mode 100644
index 000000000000..0989898966cc
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-0.17.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.17.0.tar.gz -> certbot-0.17.0.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e7196895044977f88fab841eaeaa57a6
diff --git a/metadata/md5-cache/app-crypt/certbot-0.17.0 b/metadata/md5-cache/app-crypt/certbot-0.17.0
new file mode 100644
index 000000000000..86ab31c9295c
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-0.17.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/astroid-1.3.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipdb[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pylint-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wheel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~app-crypt/acme-0.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/configargparse-0.9.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/parsedatetime-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.17.0.tar.gz -> certbot-0.17.0.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b26aef92fb82253979d7af9ed7170f66
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-0.17.0 b/metadata/md5-cache/app-crypt/certbot-apache-0.17.0
new file mode 100644
index 000000000000..ecc46f15c4dc
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-apache-0.17.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( ~app-crypt/certbot-0.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~app-crypt/acme-0.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=~app-crypt/certbot-0.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~app-crypt/acme-0.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-augeas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-component[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.17.0.tar.gz -> certbot-0.17.0.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=150d5fac2a9713548c787f3cd125ab7f
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-0.17.0 b/metadata/md5-cache/app-crypt/certbot-nginx-0.17.0
new file mode 100644
index 000000000000..3cd62d99e2da
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-0.17.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
+EAPI=6
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~app-crypt/certbot-0.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~app-crypt/acme-0.17.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyparsing-1.5.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.17.0.tar.gz -> certbot-0.17.0.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1aa6e8a2c0328caae73db6c2c5955c62
diff --git a/metadata/md5-cache/app-emulation/flannel-0.5.5 b/metadata/md5-cache/app-emulation/flannel-0.5.5
deleted file mode 100644
index 7432b3525569..000000000000
--- a/metadata/md5-cache/app-emulation/flannel-0.5.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/go-1.4:= virtual/pkgconfig
-DESCRIPTION=An etcd backed network fabric for containers
-EAPI=5
-HOMEPAGE=https://github.com/coreos/flannel
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/coreos/flannel/archive/v0.5.5.tar.gz -> flannel-0.5.5.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
-_md5_=3014ed20ea19e93ea73b139cdb1cdbe0
diff --git a/metadata/md5-cache/app-emulation/flannel-0.6.2 b/metadata/md5-cache/app-emulation/flannel-0.6.2
deleted file mode 100644
index 54fa179b161b..000000000000
--- a/metadata/md5-cache/app-emulation/flannel-0.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.6:= virtual/pkgconfig
-DESCRIPTION=An etcd backed network fabric for containers
-EAPI=6
-HOMEPAGE=https://github.com/coreos/flannel
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/coreos/flannel/archive/v0.6.2.tar.gz -> flannel-0.6.2.tar.gz https://github.com/golang/tools/archive/ee8cb08bfe4453a27a4bd7c86a917800d339c5ac.tar.gz -> go-tools-0_pre20160220.tar.gz https://github.com/golang/crypto/archive/b2fa06b6af4b7c9bfeb8569ab7b17f04550717bf.tar.gz -> go-crypto-b2fa06b6af4b7c9bfeb8569ab7b17f04550717bf.tar.gz https://github.com/golang/text/archive/a8b38433e35b65ba247bb267317037dee1b70cea.tar.gz -> go-text-a8b38433e35b65ba247bb267317037dee1b70cea.tar.gz https://github.com/gucumber/gucumber/archive/71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc.tar.gz -> gucumber-71608e2f6e76fd4da5b09a376aeec7a5c0b5edbc.tar.gz https://github.com/shiena/ansicolor/archive/a422bbe96644373c5753384a59d678f7d261ff10.tar.gz -> ansicolor-a422bbe96644373c5753384a59d678f7d261ff10.tar.gz https://github.com/stretchr/testify/archive/v1.1.4.tar.gz -> stretchr-testify-1.1.4.tar.gz https://github.com/boltdb/bolt/archive/v1.3.0.tar.gz -> bolt-1.3.0.tar.gz https://github.com/coreos/go-semver/archive/v0.2.0.tar.gz -> go-semver-0.2.0.tar.gz https://github.com/coreos/go-systemd/archive/v13.tar.gz -> go-systemd-13.tar.gz https://github.com/gogo/protobuf/archive/v0.3.tar.gz -> gogo-protobuf-0.3.tar.gz https://github.com/google/btree/archive/925471ac9e2131377a91e1595defec898166fe49.tar.gz -> google-btree-925471ac9e2131377a91e1595defec898166fe49.tar.gz https://github.com/prometheus/client_golang/archive/v0.8.0.tar.gz -> prometheus-client_golang-0.8.0.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/85637ea67b04b5c3bb25e671dacded2977f8f9f6.tar.gz -> prometheus-common-85637ea67b04b5c3bb25e671dacded2977f8f9f6.tar.gz https://github.com/prometheus/procfs/archive/abf152e5f3e97f2fafac028d2cc06c1feb87ffa5.tar.gz -> prometheus-procfs-abf152e5f3e97f2fafac028d2cc06c1feb87ffa5.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/v1.0.0.tar.gz -> golang_protobuf_extensions-1.0.0.tar.gz https://github.com/xiang90/probing/archive/07dd2e8dfe18522e9c447ba95f2fe95262f63bb2.tar.gz -> probing-07dd2e8dfe18522e9c447ba95f2fe95262f63bb2.tar.gz https://github.com/bgentry/speakeasy/archive/675b82c74c0ed12283ee81ba8a534c8982c07b85.tar.gz -> speakeasy-675b82c74c0ed12283ee81ba8a534c8982c07b85.tar.gz https://github.com/grpc/grpc-go/archive/v1.0.3.tar.gz -> grpc-go-1.0.3.tar.gz https://github.com/urfave/cli/archive/v1.18.1.tar.gz -> urfave-cli-1.18.1.tar.gz https://github.com/godbus/dbus/archive/v4.0.0.tar.gz -> godbus-4.0.0.tar.gz https://github.com/go-yaml/yaml/archive/9f9df34309c04878acc86042b16630b0f696e1de.tar.gz -> go-yaml-v1-9f9df34309c04878acc86042b16630b0f696e1de.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
-_md5_=98f0a0acc76366c119883aacaf185250
diff --git a/metadata/md5-cache/app-emulation/flannel-0.8.0 b/metadata/md5-cache/app-emulation/flannel-0.8.0
deleted file mode 100644
index df71473946c7..000000000000
--- a/metadata/md5-cache/app-emulation/flannel-0.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.8 virtual/pkgconfig
-DESCRIPTION=An etcd backed network fabric for containers
-EAPI=6
-HOMEPAGE=https://github.com/coreos/flannel
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/coreos/flannel/archive/v0.8.0.tar.gz -> flannel-0.8.0.tar.gz
-_eclasses_=golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-vcs-snapshot 913580335becddd3ebecefe852e47536 multilib 97f470f374f2e94ccab04a2fb21d811e systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
-_md5_=13778155ef8b68332587aa1df81e5c62
diff --git a/metadata/md5-cache/app-misc/detachtty-9 b/metadata/md5-cache/app-misc/detachtty-9
index 08a60cdbc72a..a99697e05bb1 100644
--- a/metadata/md5-cache/app-misc/detachtty-9
+++ b/metadata/md5-cache/app-misc/detachtty-9
@@ -7,4 +7,4 @@ LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://debian/pool/main/d/detachtty/detachtty_9.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=ddf495414c2d4395c4da183abf0f7d84
+_md5_=bc4223ce62b31e34d696117437dcab4b
diff --git a/metadata/md5-cache/app-misc/detachtty-9-r1 b/metadata/md5-cache/app-misc/detachtty-9-r1
index bd30a6ed73d8..1328058258d6 100644
--- a/metadata/md5-cache/app-misc/detachtty-9-r1
+++ b/metadata/md5-cache/app-misc/detachtty-9-r1
@@ -7,4 +7,4 @@ LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://debian/pool/main/d/detachtty/detachtty_9.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=04ad23a82afd136e0900aea864691759
+_md5_=9a5b112b0f53ee99274e5e7b096de1fe
diff --git a/metadata/md5-cache/app-misc/misterhouse-2.103-r1 b/metadata/md5-cache/app-misc/misterhouse-2.103-r1
index 782123765161..644f8de1fb37 100644
--- a/metadata/md5-cache/app-misc/misterhouse-2.103-r1
+++ b/metadata/md5-cache/app-misc/misterhouse-2.103-r1
@@ -8,4 +8,4 @@ LICENSE=GPL-1
RDEPEND=dev-lang/perl tk? ( dev-perl/Tk dev-perl/Tk-CursorControl ) mysql? ( dev-perl/DBD-mysql ) || ( app-accessibility/festival app-accessibility/flite ) dev-perl/GD virtual/perl-DB_File dev-perl/TermReadKey virtual/perl-Time-HiRes dev-perl/Audio-Mixer dev-perl/Text-LevenshteinXS
SLOT=0
SRC_URI=mirror://sourceforge/misterhouse/misterhouse-2.103.tar.gz
-_md5_=4b1867ed91f40bca811f9818d8fb7fae
+_md5_=d4b2a3305410c8aaa15fbdac1a279df1
diff --git a/metadata/md5-cache/app-misc/misterhouse-2.105-r1 b/metadata/md5-cache/app-misc/misterhouse-2.105-r1
index 0d3038bbc879..73b0192eab5c 100644
--- a/metadata/md5-cache/app-misc/misterhouse-2.105-r1
+++ b/metadata/md5-cache/app-misc/misterhouse-2.105-r1
@@ -8,4 +8,4 @@ LICENSE=GPL-1
RDEPEND=dev-lang/perl tk? ( dev-perl/Tk dev-perl/Tk-CursorControl ) mysql? ( dev-perl/DBD-mysql ) || ( app-accessibility/festival app-accessibility/flite ) dev-perl/GD virtual/perl-DB_File dev-perl/TermReadKey virtual/perl-Time-HiRes dev-perl/Audio-Mixer dev-perl/Text-LevenshteinXS
SLOT=0
SRC_URI=mirror://sourceforge/misterhouse/misterhouse-2.105.tar.gz
-_md5_=9efcdc5d12e1f5647b284fe65385a665
+_md5_=cefb17b884d4317765d2026a5faff443
diff --git a/metadata/md5-cache/app-misc/razertool-0.0.7-r4 b/metadata/md5-cache/app-misc/razertool-0.0.7-r4
index 489ca8d1afd9..25e4ec4bae10 100644
--- a/metadata/md5-cache/app-misc/razertool-0.0.7-r4
+++ b/metadata/md5-cache/app-misc/razertool-0.0.7-r4
@@ -10,4 +10,4 @@ RDEPEND=virtual/libusb:0 gtk? ( dev-libs/atk dev-libs/glib:2 >=gnome-base/librsv
SLOT=0
SRC_URI=mirror://sourceforge/razertool/razertool_0.0.7.orig.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=4790305ba2862c2f1cce569ea38d5dc1
+_md5_=3812aa2eacc348ef60d693a8184439c6
diff --git a/metadata/md5-cache/app-misc/rox-filer-2.11 b/metadata/md5-cache/app-misc/rox-filer-2.11
index d3a369c4206e..4eb115d70aa7 100644
--- a/metadata/md5-cache/app-misc/rox-filer-2.11
+++ b/metadata/md5-cache/app-misc/rox-filer-2.11
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl dev-libs/libxml2:2 gnome-base/libglade:2.0 x11-libs/gtk+:2
SLOT=0
SRC_URI=mirror://sourceforge/rox/rox-filer-2.11.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af virtualx 171580f737f5aaf18fcb456548588066
-_md5_=004db950e982fafce2f3cc22eb602235
+_md5_=5f820861c42c6aa9c95c34244f440c50
diff --git a/metadata/md5-cache/app-misc/taskd-1.1.0-r1 b/metadata/md5-cache/app-misc/taskd-1.1.0-r1
index 118001e47a5e..4985da93b4de 100644
--- a/metadata/md5-cache/app-misc/taskd-1.1.0-r1
+++ b/metadata/md5-cache/app-misc/taskd-1.1.0-r1
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/readline:0 net-libs/gnutls sys-apps/util-linux
SLOT=0
SRC_URI=http://taskwarrior.org/download/taskd-1.1.0.tar.gz
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=94a984c0afba468c568e585036c98b19
+_md5_=706bb74d3f4ca7f410b7f8d01ea4cddb
diff --git a/metadata/md5-cache/app-misc/tracker-1.10.5 b/metadata/md5-cache/app-misc/tracker-1.10.5
index 584e04ff1128..806feb59a964 100644
--- a/metadata/md5-cache/app-misc/tracker-1.10.5
+++ b/metadata/md5-cache/app-misc/tracker-1.10.5
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !
SLOT=0/100
SRC_URI=mirror://gnome/sources/tracker/1.10/tracker-1.10.5.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af vala 103e6885c83965507391cdc5b6fa0e67 versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c3dcc5bca69088af66605ee886cb6bb0
+_md5_=1849666a5e8502debbea545048caec66
diff --git a/metadata/md5-cache/app-misc/tracker-1.12.2 b/metadata/md5-cache/app-misc/tracker-1.12.2
index a070f281a645..ad3ce42c2c75 100644
--- a/metadata/md5-cache/app-misc/tracker-1.12.2
+++ b/metadata/md5-cache/app-misc/tracker-1.12.2
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( gstreamer ffmpeg ) cue? ( gstreamer ) upnp-av? ( gstreamer ) !
SLOT=0/100
SRC_URI=mirror://gnome/sources/tracker/1.12/tracker-1.12.2.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af vala 103e6885c83965507391cdc5b6fa0e67 versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=88fa144b0601124622d384a80bb64404
+_md5_=e75af1383ae950cbd81c545dbe1c52c4
diff --git a/metadata/md5-cache/app-office/lyx-2.0.8.1-r1 b/metadata/md5-cache/app-office/lyx-2.0.8.1-r1
index 8ba87035b311..77c03fcc103e 100644
--- a/metadata/md5-cache/app-office/lyx-2.0.8.1-r1
+++ b/metadata/md5-cache/app-office/lyx-2.0.8.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-2.0.8.1.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/2.0.8.1/lyx-2.0.8.1.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b font 82836641e7d4639329d8c195234ad0e3 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6ea79cff6a41da7f7d19ad523c91eac8
+_md5_=ba5086acfed18cec54cb47b8158b2c37
diff --git a/metadata/md5-cache/app-office/lyx-2.1.5-r1 b/metadata/md5-cache/app-office/lyx-2.1.5-r1
index e5a22005deae..7dd56b7dcc74 100644
--- a/metadata/md5-cache/app-office/lyx-2.1.5-r1
+++ b/metadata/md5-cache/app-office/lyx-2.1.5-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/lyx-2.1.5.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.1/lyx-2.1.5/lyx-2.1.5.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b font 82836641e7d4639329d8c195234ad0e3 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a89993d5df7e8de499646486ec73027
+_md5_=8e2dfa3078ed60ed79f36977fe7a7b29
diff --git a/metadata/md5-cache/app-office/lyx-2.2.2-r1 b/metadata/md5-cache/app-office/lyx-2.2.2-r1
index 23d5be783d9c..a94555a277f2 100644
--- a/metadata/md5-cache/app-office/lyx-2.2.2-r1
+++ b/metadata/md5-cache/app-office/lyx-2.2.2-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7 qt4? ( !qt5 ) qt5? ( !qt4 )
SLOT=0
SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-2.2.2.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/lyx-2.2.2/lyx-2.2.2.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b font 82836641e7d4639329d8c195234ad0e3 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4432d96eb0b58dcde6782a9853df88c3
+_md5_=01aeff67fd044a394db4034a9f0988dd
diff --git a/metadata/md5-cache/app-office/lyx-2.2.3 b/metadata/md5-cache/app-office/lyx-2.2.3
index cd8b5aff3cab..b25c5f06be9e 100644
--- a/metadata/md5-cache/app-office/lyx-2.2.3
+++ b/metadata/md5-cache/app-office/lyx-2.2.3
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7 qt4? ( !qt5 ) qt5? ( !qt4 )
SLOT=0
SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-2.2.3.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/lyx-2.2.3/lyx-2.2.3.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b font 82836641e7d4639329d8c195234ad0e3 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4432d96eb0b58dcde6782a9853df88c3
+_md5_=01aeff67fd044a394db4034a9f0988dd
diff --git a/metadata/md5-cache/app-office/lyx-2.2.3-r1 b/metadata/md5-cache/app-office/lyx-2.2.3-r1
index e8ff017e2cc9..29ea643126e1 100644
--- a/metadata/md5-cache/app-office/lyx-2.2.3-r1
+++ b/metadata/md5-cache/app-office/lyx-2.2.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-2.2.3.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/lyx-2.2.3/lyx-2.2.3.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b font 82836641e7d4639329d8c195234ad0e3 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65de12f8f1d0d0e9f75b23b1e01ee7b3
+_md5_=5d1059f98bc8258a9b37344442352516
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index ca81ab773109..e83ca895c3a1 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.2.0 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.2.0 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
DESCRIPTION=Desktop publishing (DTP) and layout program
EAPI=6
HOMEPAGE=http://www.scribus.net/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/libmspub app-text/poppler:= dev-libs/hyphen dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libcdr media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tk? ( dev-python/pillow[tk?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) app-text/ghostscript-gpl
REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
SLOT=0
-_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c86b6c8acff74c1b7b426ab3597624bd
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 21ef5adf81836863efa968f2a25cff64 flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d subversion a5d5826a85609611f098c0553eb24cc1 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=87952793cda70a1f0798e4193b843f1c
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.3 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.3
deleted file mode 100644
index 81b094a87d65..000000000000
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Check live packages for updates and emerge them as necessary
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/smart-live-rebuild/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 arm ~mips x86 ~x86-fbsd
-LICENSE=BSD-2
-RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.bitbucket.org/mgorny/smart-live-rebuild/downloads/smart-live-rebuild-1.3.3.tar.bz2
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=334f16aad22d76de6f590c37e5e6ba0d
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.4 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.4
deleted file mode 100644
index 0bd48b628514..000000000000
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Check live packages for updates and emerge them as necessary
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/smart-live-rebuild/
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 arm ~mips ~x86 ~x86-fbsd
-LICENSE=BSD-2
-RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://www.bitbucket.org/mgorny/smart-live-rebuild/downloads/smart-live-rebuild-1.3.4.tar.bz2
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=12087f4ca51527865bd4139822333c1e
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.4.1 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.4.1
index d507cfd7336d..87dfd6fc818f 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.4.1
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.4.1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Check live packages for updates and emerge them as necessary
EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/smart-live-rebuild/
+HOMEPAGE=https://github.com/mgorny/smart-live-rebuild/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=amd64 arm ~mips x86 ~x86-fbsd
LICENSE=BSD-2
RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
-SRC_URI=https://www.bitbucket.org/mgorny/smart-live-rebuild/downloads/smart-live-rebuild-1.3.4.1.tar.bz2
+SRC_URI=https://github.com/mgorny/smart-live-rebuild/releases/download/v1.3.4.1/smart-live-rebuild-1.3.4.1.tar.bz2
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c27bae7c31ac612fef35ceeb2f5a784f
+_md5_=5ba49aeb755aa447c561f76805207021
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.5 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.5
new file mode 100644
index 000000000000..286d9353c5aa
--- /dev/null
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Check live packages for updates and emerge them as necessary
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/smart-live-rebuild/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~mips ~x86 ~x86-fbsd
+LICENSE=BSD-2
+RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mgorny/smart-live-rebuild/releases/download/v1.3.5/smart-live-rebuild-1.3.5.tar.bz2
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=54c03f4e6b195678be3ded5035e1d3fb
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-9999 b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
index 63bd2d12a8e2..9e84d5b84254 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-9999
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
DESCRIPTION=Check live packages for updates and emerge them as necessary
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/smart-live-rebuild/
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/smart-live-rebuild/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
LICENSE=BSD-2
RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
-_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca2ac2cb24b56d52ff108b7b9701d5a2
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 git-r3 cbafa3261c37c7e3af44bb16a34ea390 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8e6e0e2af5b2d3f67694d074372f4f5a
diff --git a/metadata/md5-cache/app-shells/tcsh-6.20.00 b/metadata/md5-cache/app-shells/tcsh-6.20.00
index 759c02bfd08f..4e6d1ed33830 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.20.00
+++ b/metadata/md5-cache/app-shells/tcsh-6.20.00
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=ftp://ftp.astron.com/pub/tcsh/tcsh-6.20.00.tar.gz https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e prefix df8265631f8bf5f5df387e9b987121f9 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=0e0e7aba1940218d9af59cbae4cc3aef
+_md5_=e0f6811a5b8a17bf2904b45cd509d2b4
diff --git a/metadata/md5-cache/app-text/fbreader-0.99.4-r2 b/metadata/md5-cache/app-text/fbreader-0.99.4-r2
index 44167187067b..159e6f49fe9d 100644
--- a/metadata/md5-cache/app-text/fbreader-0.99.4-r2
+++ b/metadata/md5-cache/app-text/fbreader-0.99.4-r2
@@ -10,4 +10,4 @@ RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/liblinebreak dev-libs/fribidi dev
SLOT=0
SRC_URI=http://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=397f8327b82c4b9ed6454fb840cf9620
+_md5_=879236d4f36273cbf084db586f026745
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.20-r1 b/metadata/md5-cache/app-text/ghostscript-gpl-9.20-r1
index 98627db825bc..636ea7559343 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.20-r1
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.20-r1
@@ -10,4 +10,4 @@ RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= m
SLOT=0
SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/ghostscript-9.20.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/ghostscript-gpl-9.20-patchset-2.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=863c17e149d088933a57cb3b5c9dc782
+_md5_=5a996b42efde260bc9994d0e168f766c
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.20-r2 b/metadata/md5-cache/app-text/ghostscript-gpl-9.20-r2
index af3af28169d8..ddd966c2e976 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.20-r2
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.20-r2
@@ -10,4 +10,4 @@ RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= m
SLOT=0
SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/ghostscript-9.20.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/ghostscript-gpl-9.20-patchset-2.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6bf0b48480e472fb65aed71ea9ac2990
+_md5_=382a075db0ebba03bd7a34e523f3caa4
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.21 b/metadata/md5-cache/app-text/ghostscript-gpl-9.21
index 167e466c0ee9..a581bfd6fc20 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-9.21
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.21
@@ -10,4 +10,4 @@ RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= m
SLOT=0
SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/ghostscript-9.21.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/ghostscript-gpl-9.21-patchset-1.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9f6c26b1ba13027e6411f62968032390
+_md5_=7ce3f1cc1099a93df9525f2670a8dafe
diff --git a/metadata/md5-cache/app-text/qpdf-7.0_beta1 b/metadata/md5-cache/app-text/qpdf-7.0_beta1
new file mode 100644
index 000000000000..5525b41cb4aa
--- /dev/null
+++ b/metadata/md5-cache/app-text/qpdf-7.0_beta1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/zlib test? ( sys-apps/diffutils media-libs/tiff app-text/ghostscript-gpl[tiff] )
+DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
+EAPI=6
+HOMEPAGE=http://qpdf.sourceforge.net/
+IUSE=doc examples perl static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
+LICENSE=Artistic-2
+RDEPEND=sys-libs/zlib perl? ( >=dev-lang/perl-5.8 )
+SLOT=0/18
+SRC_URI=mirror://sourceforge/qpdf/qpdf-7.0.b1.tar.gz
+_md5_=710102cc1da778be6174f1b4d5205be8
diff --git a/metadata/md5-cache/app-text/t1utils-1.41 b/metadata/md5-cache/app-text/t1utils-1.41-r1
similarity index 85%
rename from metadata/md5-cache/app-text/t1utils-1.41
rename to metadata/md5-cache/app-text/t1utils-1.41-r1
index 3848ab5b693b..f5c71339750e 100644
--- a/metadata/md5-cache/app-text/t1utils-1.41
+++ b/metadata/md5-cache/app-text/t1utils-1.41-r1
@@ -1,10 +1,10 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=-
DESCRIPTION=Type 1 Font utilities
-EAPI=0
+EAPI=6
HOMEPAGE=http://www.lcdf.org/type/#t1utils
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 ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=!=media-libs/gstreamer-1.8.0:1.0 >=media-libs/gst-plugins-base-1.8.0:1.0 >=dev-cpp/glibmm-2.47.6:2 >=dev-cpp/libxmlpp-2.14:2.6 >=dev-libs/libsigc++-2:2 virtual/pkgconfig doc? ( app-doc/doxygen dev-libs/libxslt media-gfx/graphviz ) test? ( dev-cpp/gtest >=media-libs/gst-plugins-base-1.8.0:1.0[X,ogg,theora,vorbis] >=media-libs/gst-plugins-good-1.8.0:1.0 >=media-plugins/gst-plugins-jpeg-1.8.0:1.0 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=media-libs/gstreamer-1.8.0:1.0 >=media-libs/gst-plugins-base-1.8.0:1.0 >=dev-cpp/glibmm-2.47.6:2 >=dev-cpp/libxmlpp-2.14:2.6 >=dev-libs/libsigc++-2:2 dev-cpp/mm-common virtual/pkgconfig doc? ( app-doc/doxygen dev-libs/libxslt media-gfx/graphviz ) test? ( dev-cpp/gtest >=media-libs/gst-plugins-base-1.8.0:1.0[X,ogg,theora,vorbis] >=media-libs/gst-plugins-good-1.8.0:1.0 >=media-plugins/gst-plugins-jpeg-1.8.0:1.0 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=C++ interface for GStreamer
EAPI=6
HOMEPAGE=https://gstreamer.freedesktop.org/bindings/cplusplus.html
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/gstreamer-1.8.0:1.0 >=media-libs/gst-plugins-base-1.8.0:1.0
SLOT=1.0/1
SRC_URI=mirror://gnome/sources/gstreamermm/1.8/gstreamermm-1.8.0.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4ee660a4cae0c2027832154057dce230
+_md5_=c33e2120c8afcea47ce898b591434ba9
diff --git a/metadata/md5-cache/dev-db/etcd-3.2.6 b/metadata/md5-cache/dev-db/etcd-3.2.6
new file mode 100644
index 000000000000..cd34d50ef60b
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.2.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.8:= virtual/pkgconfig >=dev-lang/go-1.8
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=6
+HOMEPAGE=https://github.com/coreos/etcd
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcdctl
+SLOT=0
+SRC_URI=https://github.com/coreos/etcd/archive/v3.2.6.tar.gz -> etcd-3.2.6.tar.gz
+_eclasses_=golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-vcs-snapshot 913580335becddd3ebecefe852e47536 multilib 97f470f374f2e94ccab04a2fb21d811e systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
+_md5_=7da325ad0619a60a490d2a687ea8bb78
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
new file mode 100644
index 000000000000..72c47e3c9f58
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !=dev-util/cmake-3.7.2
+DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
+EAPI=6
+HOMEPAGE=http://dev.mysql.com/downloads/connector/cpp/
+IUSE=debug examples gcov static-libs
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !=dev-libs/libgit2-0.26.0:0/26[ssh?] >=dev-libs/glib-2.44.0:2 python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0/26[ssh?] python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Git library for GLib
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
IUSE=python +ssh +vala python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/libgit2-0.26.0:0/26[ssh?] >=dev-libs/glib-2.44.0:2 python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+RDEPEND=>=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libgit2-0.26.0:0/26[ssh?] python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
SLOT=0
SRC_URI=mirror://gnome/sources/libgit2-glib/0.26/libgit2-glib-0.26.0.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 64c50579ea42fbcc77a7e220a8ae8e94 gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af vala 103e6885c83965507391cdc5b6fa0e67 versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=85a9aadc132d06bb6c3039152bfab18b
+_md5_=c8442e918bcce4a837430f5a1d048af1
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.5_alpha-r1 b/metadata/md5-cache/dev-libs/libmspack-0.5_alpha-r1
new file mode 100644
index 000000000000..b81893a2efc0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmspack-0.5_alpha-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=A library for Microsoft compression formats
+EAPI=6
+HOMEPAGE=https://www.cabextract.org.uk/libmspack/
+IUSE=debug doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.5alpha.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=d3119dc46ac0e54b06d38b6b9e17f8af
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.41 b/metadata/md5-cache/dev-libs/libpcre-8.41
index 56c6776a06e5..90e490ef8002 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.41
+++ b/metadata/md5-cache/dev-libs/libpcre-8.41
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
EAPI=5
HOMEPAGE=http://www.pcre.org/
IUSE=bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
SLOT=3
SRC_URI=mirror://sourceforge/pcre/pcre-8.41.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.41.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=9ed57da9c56399b4d2dd2e627bf9993d
+_md5_=747a7bb892e446d4d8baeb7f0de00345
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.30 b/metadata/md5-cache/dev-libs/libpcre2-10.30
index dbf2c7974c70..a2f68becefb7 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.30
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.30
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
EAPI=6
HOMEPAGE=http://www.pcre.org/
IUSE=bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
REQUIRED_USE=?? ( libedit readline )
SLOT=0
SRC_URI=mirror://sourceforge/pcre/pcre2-10.30.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.30.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=ad86797c46848440ffddbc049e0cd702
+_md5_=8c67d3d7a4e4d891c13392006a814b61
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.4-r3 b/metadata/md5-cache/dev-libs/libxml2-2.9.4-r3
new file mode 100644
index 000000000000..ca78ea5fe15f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.4-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=dev-util/gtk-doc-am virtual/pkgconfig hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Version 2 of the library to manipulate XML files
+EAPI=6
+HOMEPAGE=http://www.xmlsoft.org/
+IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
+SLOT=2
+SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 prefix df8265631f8bf5f5df387e9b987121f9 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=9f9d196c40d9388b147aa9d4e03c35fc
diff --git a/metadata/md5-cache/dev-libs/libzip-1.2.0-r1 b/metadata/md5-cache/dev-libs/libzip-1.2.0-r1
new file mode 100644
index 000000000000..d6b861f27700
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzip-1.2.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Library for manipulating zip archives
+EAPI=6
+HOMEPAGE=http://www.nih.at/libzip/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=BSD
+RDEPEND=sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone )
+SLOT=0/5
+SRC_URI=http://www.nih.at/libzip/libzip-1.2.0.tar.xz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=bcefdd8827421991c58c83d6c7fae884
diff --git a/metadata/md5-cache/dev-libs/rapidjson-9999 b/metadata/md5-cache/dev-libs/rapidjson-9999
index 384cb321cea6..864be0b4529e 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-9999
+++ b/metadata/md5-cache/dev-libs/rapidjson-9999
@@ -7,4 +7,4 @@ IUSE=doc examples test
LICENSE=MIT
SLOT=0
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cbee6d9d80313ef9d341a8b4f481b067
+_md5_=9ad095dfbe9ff197f5634321730491b6
diff --git a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.10 b/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.10
deleted file mode 100644
index 15aadfeda739..000000000000
--- a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=dev-lisp/common-lisp-controller virtual/commonlisp dev-lisp/common-lisp-controller
-DESCRIPTION=CL-PPCRE is a portable regular expression library for Common Lisp
-EAPI=0
-HOMEPAGE=http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre
-KEYWORDS=~amd64 ~ppc ~sparc x86
-LICENSE=BSD
-RDEPEND=dev-lisp/common-lisp-controller virtual/commonlisp
-SLOT=0
-SRC_URI=mirror://gentoo/cl-ppcre_1.2.10.orig.tar.gz
-_eclasses_=common-lisp e0f344f4c23788d1a46fc2143b183b0d common-lisp-common 3dbf57c1ebb52444d95e020652e1e579 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=601ca1c24d0456541068d78299bba6a7
diff --git a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.11 b/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.11
deleted file mode 100644
index deb2cc7d434f..000000000000
--- a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=dev-lisp/common-lisp-controller virtual/commonlisp dev-lisp/common-lisp-controller
-DESCRIPTION=CL-PPCRE is a portable regular expression library for Common Lisp
-EAPI=0
-HOMEPAGE=http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre
-KEYWORDS=~amd64 ~ppc ~sparc x86
-LICENSE=BSD
-RDEPEND=dev-lisp/common-lisp-controller virtual/commonlisp
-SLOT=0
-SRC_URI=mirror://gentoo/cl-ppcre_1.2.11.orig.tar.gz
-_eclasses_=common-lisp e0f344f4c23788d1a46fc2143b183b0d common-lisp-common 3dbf57c1ebb52444d95e020652e1e579 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=601ca1c24d0456541068d78299bba6a7
diff --git a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.12 b/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.12
deleted file mode 100644
index ddb9e2cbc2d4..000000000000
--- a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=dev-lisp/common-lisp-controller virtual/commonlisp dev-lisp/common-lisp-controller
-DESCRIPTION=CL-PPCRE is a portable regular expression library for Common Lisp
-EAPI=0
-HOMEPAGE=http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre
-KEYWORDS=~amd64 ~ppc ~sparc x86
-LICENSE=BSD
-RDEPEND=dev-lisp/common-lisp-controller virtual/commonlisp
-SLOT=0
-SRC_URI=mirror://gentoo/cl-ppcre_1.2.12.orig.tar.gz
-_eclasses_=common-lisp e0f344f4c23788d1a46fc2143b183b0d common-lisp-common 3dbf57c1ebb52444d95e020652e1e579 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=601ca1c24d0456541068d78299bba6a7
diff --git a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.13 b/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.13
deleted file mode 100644
index 767bce71d86e..000000000000
--- a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=dev-lisp/common-lisp-controller virtual/commonlisp dev-lisp/common-lisp-controller
-DESCRIPTION=CL-PPCRE is a portable regular expression library for Common Lisp
-EAPI=0
-HOMEPAGE=http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-lisp/common-lisp-controller virtual/commonlisp
-SLOT=0
-SRC_URI=mirror://gentoo/cl-ppcre_1.2.13.orig.tar.gz
-_eclasses_=common-lisp e0f344f4c23788d1a46fc2143b183b0d common-lisp-common 3dbf57c1ebb52444d95e020652e1e579 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=3a3a975dca9d8dacc12922d6c76a1de8
diff --git a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.14 b/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.14
deleted file mode 100644
index 3f12175ac0f2..000000000000
--- a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=dev-lisp/common-lisp-controller virtual/commonlisp dev-lisp/common-lisp-controller
-DESCRIPTION=CL-PPCRE is a portable regular expression library for Common Lisp
-EAPI=0
-HOMEPAGE=http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-lisp/common-lisp-controller virtual/commonlisp
-SLOT=0
-SRC_URI=mirror://gentoo/cl-ppcre_1.2.14.orig.tar.gz
-_eclasses_=common-lisp e0f344f4c23788d1a46fc2143b183b0d common-lisp-common 3dbf57c1ebb52444d95e020652e1e579 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=3a3a975dca9d8dacc12922d6c76a1de8
diff --git a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.15 b/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.15
deleted file mode 100644
index 3131d6b7609c..000000000000
--- a/metadata/md5-cache/dev-lisp/cl-ppcre-1.2.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=dev-lisp/common-lisp-controller virtual/commonlisp dev-lisp/common-lisp-controller
-DESCRIPTION=CL-PPCRE is a portable regular expression library for Common Lisp
-EAPI=0
-HOMEPAGE=http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-lisp/common-lisp-controller virtual/commonlisp
-SLOT=0
-SRC_URI=mirror://gentoo/cl-ppcre_1.2.15.orig.tar.gz
-_eclasses_=common-lisp e0f344f4c23788d1a46fc2143b183b0d common-lisp-common 3dbf57c1ebb52444d95e020652e1e579 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=3a3a975dca9d8dacc12922d6c76a1de8
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.4 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.4
new file mode 100644
index 000000000000..4099eb4cf7d4
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=dev-ml/result:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DESCRIPTION=Convert OCaml parsetrees between different major versions
+EAPI=6
+HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
+SLOT=0/1.0.4
+SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.0.4.tar.gz -> ocaml-migrate-parsetree-1.0.4.tar.gz
+_eclasses_=findlib 45d6030075064a68da8d7143726a1150 opam 24b4a2529c1fd12f1304856d6c5a690d
+_md5_=a7fc26cc5faf6788d179572ea4635368
diff --git a/metadata/md5-cache/dev-ml/ppx_derivers-1.0 b/metadata/md5-cache/dev-ml/ppx_derivers-1.0
new file mode 100644
index 000000000000..0c724a44d84c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_derivers-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DESCRIPTION=Shared [@@deriving] plugin registry
+EAPI=6
+HOMEPAGE=https://github.com/diml/ppx_derivers
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-lang/ocaml-4:=
+SLOT=0/1.0
+SRC_URI=https://github.com/diml/ppx_derivers/archive/1.0.tar.gz -> ppx_derivers-1.0.tar.gz
+_eclasses_=opam 24b4a2529c1fd12f1304856d6c5a690d
+_md5_=0644d12d706503fb85005ed6a5ef296f
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving-4.2 b/metadata/md5-cache/dev-ml/ppx_deriving-4.2
new file mode 100644
index 000000000000..2fd90de5d1d6
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_deriving-4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/result:= dev-ml/cppo test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DESCRIPTION=Type-driven code generation for OCaml
+EAPI=5
+HOMEPAGE=https://github.com/ocaml-ppx/ppx_deriving
+IUSE=doc +ocamlopt test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/result:= >=dev-lang/ocaml-4:=
+SLOT=0/4.2
+SRC_URI=https://github.com/ocaml-ppx/ppx_deriving/archive/v4.2.tar.gz -> ppx_deriving-4.2.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea findlib 45d6030075064a68da8d7143726a1150 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e opam 24b4a2529c1fd12f1304856d6c5a690d toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=94b15fc3164ce427b89814bb413a90e1
diff --git a/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1 b/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1
index 90b41f4ce4b0..d06648c1b9f2 100644
--- a/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/backports-shutil_get_terminal_size-1.0.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A backport of the get_terminal_size function from Python 3.3's shuti
EAPI=5
HOMEPAGE=https://pypi.python.org/pypi/backports.shutil_get_terminal_size/ https://github.com/chrippa/backports.shutil_get_terminal_size
IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=dev-python/backports[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/b/backports.shutil_get_terminal_size/backports.shutil_get_terminal_size-1.0.0.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=16f79017b78c57be62e2097c77511d3f
+_md5_=3412e4298a2f086a190ecd063dd810a8
diff --git a/metadata/md5-cache/dev-python/ipdb-0.10.2 b/metadata/md5-cache/dev-python/ipdb-0.10.2
index 679bb6c5ad5a..307f95864069 100644
--- a/metadata/md5-cache/dev-python/ipdb-0.10.2
+++ b/metadata/md5-cache/dev-python/ipdb-0.10.2
@@ -4,11 +4,11 @@ DESCRIPTION=IPython-enabled pdb
EAPI=5
HOMEPAGE=https://pypi.python.org/pypi/ipdb
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ppc64 ~x86
LICENSE=GPL-2
RDEPEND=dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/i/ipdb/ipdb-0.10.2.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ea8fb239fc3e403d162998b7f7155c83
+_md5_=f9a5d259ff45b398b8599ce4a560aac4
diff --git a/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1 b/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1
index e326aa5b4753..effaa14c1b56 100644
--- a/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1
+++ b/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Utilities for writing pandoc filters in python
EAPI=6
HOMEPAGE=https://github.com/jgm/pandocfilters
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/pandocfilters/pandocfilters-1.4.2.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=95473b4d0235511973816ecdfc5517cf
+_md5_=0051224fe126ca4148af34e15ac26323
diff --git a/metadata/md5-cache/dev-python/paramiko-2.2.1 b/metadata/md5-cache/dev-python/paramiko-2.2.1
index e713f71621f1..d29a1f28cfd0 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.2.1
+++ b/metadata/md5-cache/dev-python/paramiko-2.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=SSH2 protocol library
EAPI=6
HOMEPAGE=http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko/
IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ia64 ~x86
LICENSE=LGPL-2.1
RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pynacl-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-0.1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/paramiko/paramiko-2.2.1.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=67cfe8e7cc5dca7c726d9bb507f1d6f9
+_md5_=82ace3a052d4650ccd58935adc3a2dc7
diff --git a/metadata/md5-cache/dev-python/prov-1.5.1 b/metadata/md5-cache/dev-python/prov-1.5.1
new file mode 100644
index 000000000000..aa549d280f94
--- /dev/null
+++ b/metadata/md5-cache/dev-python/prov-1.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pydot[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/rdflib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=W3C provenance data dodel library
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/prov
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pydot[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/networkx-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/rdflib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/prov/prov-1.5.1.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=def3c57ebfbd915671848e700c03f187
diff --git a/metadata/md5-cache/dev-python/pygit2-0.26.0 b/metadata/md5-cache/dev-python/pygit2-0.26.0
new file mode 100644
index 000000000000..57f237fde18e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygit2-0.26.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-libs/libgit2-0.26* >=dev-python/cffi-1.0:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python bindings for libgit2
+EAPI=6
+HOMEPAGE=https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2-with-linking-exception
+RDEPEND==dev-libs/libgit2-0.26* >=dev-python/cffi-1.0:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pygit2/pygit2-0.26.0.tar.gz
+_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d7e29c804cc6a349582f9fb2a5f488da
diff --git a/metadata/md5-cache/dev-python/pynacl-1.1.2 b/metadata/md5-cache/dev-python/pynacl-1.1.2
index 9a3b5914f2ed..14795d531358 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.1.2
+++ b/metadata/md5-cache/dev-python/pynacl-1.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python binding to the Networking and Cryptography (NaCl) library
EAPI=6
HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.python.org/pypi/PyNaCl/
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 ~ia64 ~x86
LICENSE=Apache-2.0
RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/18 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/pyca/pynacl/archive/1.1.2.tar.gz -> pynacl-1.1.2.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e08c4060b722490fe13175020a60d72b
+_md5_=16883763aa414e3b60a5946e386a90c9
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.47 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.47
deleted file mode 100644
index 5c598032d5a2..000000000000
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.47
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Provides a means to change node parameters at any time without having to restart the node
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/dynamic_reconfigure
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.5.47.tar.gz -> dynamic_reconfigure-1.5.47.tar.gz
-_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ros-catkin eff12e024f16913cfb3da0e96a045552 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6952c884de58292b79581b7232d03bda
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.46 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.49
similarity index 98%
rename from metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.46
rename to metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.49
index be0602e1de32..97c142e601ab 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.46
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.49
@@ -9,6 +9,6 @@ LICENSE=BSD
RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
-SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.5.46.tar.gz -> dynamic_reconfigure-1.5.46.tar.gz
+SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.5.49.tar.gz -> dynamic_reconfigure-1.5.49.tar.gz
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ros-catkin eff12e024f16913cfb3da0e96a045552 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=6952c884de58292b79581b7232d03bda
diff --git a/metadata/md5-cache/dev-ros/pluginlib-1.10.4-r1 b/metadata/md5-cache/dev-ros/pluginlib-1.11.0
similarity index 67%
rename from metadata/md5-cache/dev-ros/pluginlib-1.10.4-r1
rename to metadata/md5-cache/dev-ros/pluginlib-1.11.0
index 156d60cfca82..f47b4cbbf057 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-1.10.4-r1
+++ b/metadata/md5-cache/dev-ros/pluginlib-1.11.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=Provides tools for writing and dynamically loading plugins using the ROS build infrastructure
EAPI=5
HOMEPAGE=http://wiki.ros.org/pluginlib
IUSE=python_targets_python2_7 test
KEYWORDS=~amd64 ~arm
LICENSE=BSD
-RDEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/tinyxml2:= dev-ros/cmake_modules python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
-SRC_URI=https://github.com/ros/pluginlib/archive/1.10.4.tar.gz -> pluginlib-1.10.4.tar.gz
+SRC_URI=https://github.com/ros/pluginlib/archive/1.11.0.tar.gz -> pluginlib-1.11.0.tar.gz
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ros-catkin eff12e024f16913cfb3da0e96a045552 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ec4c2b91b2418ae14a33c5e7d934a050
+_md5_=c9e15cad62a3477e7bc33f94936469e2
diff --git a/metadata/md5-cache/dev-ros/pluginlib-9999 b/metadata/md5-cache/dev-ros/pluginlib-9999
index 224863575574..8b86d5a11d80 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/tinyxml2:= dev-ros/cmake_modules test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=Provides tools for writing and dynamically loading plugins using the ROS build infrastructure
EAPI=5
HOMEPAGE=http://wiki.ros.org/pluginlib
IUSE=python_targets_python2_7 test
LICENSE=BSD
-RDEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-libs/tinyxml2:= dev-ros/cmake_modules python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ros-catkin eff12e024f16913cfb3da0e96a045552 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ec4c2b91b2418ae14a33c5e7d934a050
+_md5_=c9e15cad62a3477e7bc33f94936469e2
diff --git a/metadata/md5-cache/dev-ros/rviz-1.12.10 b/metadata/md5-cache/dev-ros/rviz-1.12.13
similarity index 99%
rename from metadata/md5-cache/dev-ros/rviz-1.12.10
rename to metadata/md5-cache/dev-ros/rviz-1.12.13
index be78be68401b..5799448409a5 100644
--- a/metadata/md5-cache/dev-ros/rviz-1.12.10
+++ b/metadata/md5-cache/dev-ros/rviz-1.12.13
@@ -9,6 +9,6 @@ LICENSE=BSD
RDEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp dev-libs/urdfdom:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
-SRC_URI=https://github.com/ros-visualization/rviz/archive/1.12.10.tar.gz -> rviz-1.12.10.tar.gz
+SRC_URI=https://github.com/ros-visualization/rviz/archive/1.12.13.tar.gz -> rviz-1.12.13.tar.gz
_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ros-catkin eff12e024f16913cfb3da0e96a045552 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=05d9a4a6b742636adfd0c7af30c07a7a
diff --git a/metadata/md5-cache/dev-ros/rviz-1.12.8 b/metadata/md5-cache/dev-ros/rviz-1.12.8
deleted file mode 100644
index 47eb55e1cd86..000000000000
--- a/metadata/md5-cache/dev-ros/rviz-1.12.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp dev-libs/urdfdom:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=3D visualization tool for ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/rviz
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp dev-libs/urdfdom:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rviz/archive/1.12.8.tar.gz -> rviz-1.12.8.tar.gz
-_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ros-catkin eff12e024f16913cfb3da0e96a045552 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=05d9a4a6b742636adfd0c7af30c07a7a
diff --git a/metadata/md5-cache/dev-ruby/rinku-1.7.3 b/metadata/md5-cache/dev-ruby/rinku-1.7.3
deleted file mode 100644
index be21a102dd9b..000000000000
--- a/metadata/md5-cache/dev-ruby/rinku-1.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A Ruby library that does autolinking
-EAPI=5
-HOMEPAGE=https://github.com/vmg/rinku
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/rinku-1.7.3.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b7e0d3a5b24b414f3a1d2ffb50cfd03c
diff --git a/metadata/md5-cache/dev-ruby/rinku-2.0.0 b/metadata/md5-cache/dev-ruby/rinku-2.0.0
deleted file mode 100644
index b9abbb93819a..000000000000
--- a/metadata/md5-cache/dev-ruby/rinku-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A Ruby library that does autolinking
-EAPI=5
-HOMEPAGE=https://github.com/vmg/rinku
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/rinku-2.0.0.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b7e0d3a5b24b414f3a1d2ffb50cfd03c
diff --git a/metadata/md5-cache/dev-ruby/rinku-2.0.3 b/metadata/md5-cache/dev-ruby/rinku-2.0.3
new file mode 100644
index 000000000000..58d0e3abecbd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rinku-2.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A Ruby library that does autolinking
+EAPI=6
+HOMEPAGE=https://github.com/vmg/rinku
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=ISC
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/rinku-2.0.3.gem
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=da86d1106ff770100d5ceccaaf25e5c2
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.5.4 b/metadata/md5-cache/dev-ruby/rjb-1.5.4
deleted file mode 100644
index 6cec335deec7..000000000000
--- a/metadata/md5-cache/dev-ruby/rjb-1.5.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.5 hardened? ( sys-apps/paxctl ) >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Rjb is a Ruby-Java software bridge
-EAPI=5
-HOMEPAGE=https://github.com/arton/rjb
-IUSE=examples hardened elibc_FreeBSD elibc_FreeBSD ruby_targets_ruby22 elibc_FreeBSD ruby_targets_ruby22 doc test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/jre >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ) || ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/rjb-1.5.4.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8531e5c508ff17b5b8f3d470508b78fb
diff --git a/metadata/md5-cache/dev-ruby/rjb-1.5.5 b/metadata/md5-cache/dev-ruby/rjb-1.5.5
index 42a6975770f8..af0bc41b33a8 100644
--- a/metadata/md5-cache/dev-ruby/rjb-1.5.5
+++ b/metadata/md5-cache/dev-ruby/rjb-1.5.5
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=virtual/jdk-1.5 hardened? ( sys-apps/paxctl ) >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=>=virtual/jdk-1.5 hardened? ( sys-apps/paxctl ) >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=Rjb is a Ruby-Java software bridge
EAPI=5
HOMEPAGE=https://github.com/arton/rjb
-IUSE=examples hardened elibc_FreeBSD elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test
+IUSE=examples hardened elibc_FreeBSD elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
-RDEPEND=virtual/jre >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ) || ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=virtual/jre >=dev-java/java-config-2.2.0-r3 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ) || ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/rjb-1.5.5.gem
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=34c7260275daab5255ce4bfc2e2159a6
+_md5_=6f87b80c42d75a08fdaa09d189c94c2c
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
deleted file mode 100644
index 9d175081ab4b..000000000000
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=RKelly Remix is a fork of the RKelly JavaScript parser
-EAPI=5
-HOMEPAGE=https://github.com/nene/rkelly-remix
-IUSE=doc elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/rkelly-remix-0.0.6.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9b6369b1bade7561d47df3f792e2598e
diff --git a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7 b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
index 60a77a4db9fb..83eb98a22802 100644
--- a/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
+++ b/metadata/md5-cache/dev-ruby/rkelly-remix-0.0.7
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/hoe[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/hoe[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/hoe[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=RKelly Remix is a fork of the RKelly JavaScript parser
EAPI=5
HOMEPAGE=https://github.com/nene/rkelly-remix
-IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~amd64 ~arm ~x86
LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/rkelly-remix-0.0.7.gem
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=163c95e9a793ac205aad39b4cb1fa6ab
+_md5_=08f4e160253018d9cd12b0663edabb19
diff --git a/metadata/md5-cache/dev-ruby/roadie-rails-1.1.1 b/metadata/md5-cache/dev-ruby/roadie-rails-1.1.1
deleted file mode 100644
index 8edc987dbe5c..000000000000
--- a/metadata/md5-cache/dev-ruby/roadie-rails-1.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( >=dev-ruby/rails-3.0[ruby_targets_ruby22] test? ( dev-ruby/rspec-rails[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Hooks Roadie into your Rails application to help with email generation
-EAPI=5
-HOMEPAGE=https://github.com/Mange/roadie-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/roadie-3.1[ruby_targets_ruby22] >=dev-ruby/railties-3.0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/Mange/roadie-rails/archive/v1.1.1.tar.gz -> roadie-rails-1.1.1.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=74a9c19ad73f780d75819677d8a09196
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-0.9.0 b/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
deleted file mode 100644
index d8cb16474c95..000000000000
--- a/metadata/md5-cache/dev-ruby/rqrcode-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/chunky_png:0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Library for encoding QR Codes
-EAPI=5
-HOMEPAGE=https://whomwah.github.com/rqrcode/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/chunky_png:0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/rqrcode-0.9.0.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=156a6755f87ea98e8cc2e89ad983afde
diff --git a/metadata/md5-cache/dev-ruby/rr-1.2.1 b/metadata/md5-cache/dev-ruby/rr-1.2.1
index d39b7a71ad7b..76b86cd003e8 100644
--- a/metadata/md5-cache/dev-ruby/rr-1.2.1
+++ b/metadata/md5-cache/dev-ruby/rr-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=A double framework featuring a selection of double techniques and a
EAPI=6
HOMEPAGE=https://rr.github.io/rr
IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=https://github.com/rr/rr/archive/v1.2.1.tar.gz -> rr-1.2.1.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ad9f0ce024c42a1a968d28bc72fc31a9
+_md5_=4b13f165347a2e4298c11dafadc462ac
diff --git a/metadata/md5-cache/dev-ruby/rspec-retry-0.5.5 b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.5
new file mode 100644
index 000000000000..c67bca80f939
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-retry-0.5.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Retry intermittently failing rspec examples
+EAPI=6
+HOMEPAGE=https://github.com/NoRedInk/rspec-retry
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rspec-core-3.3:3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/rspec-retry-0.5.5.gem
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0ac088d78aa846cb4610e14fc046a633
diff --git a/metadata/md5-cache/dev-ruby/rspectacular-0.70.0 b/metadata/md5-cache/dev-ruby/rspectacular-0.70.0
deleted file mode 100644
index 029bd2c087ef..000000000000
--- a/metadata/md5-cache/dev-ruby/rspectacular-0.70.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=RSpec support and matchers
-EAPI=5
-HOMEPAGE=https://github.com/thekompanee/rspectacular
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] dev-ruby/fuubar:2[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/rspectacular-0.70.0.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b0bc6d510544fa26790a42636cf314ea
diff --git a/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4 b/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
index 4577759a497a..3ae3bf0c6f57 100644
--- a/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
+++ b/metadata/md5-cache/dev-ruby/ruby-beautify-0.97.4
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=a cli tool (and module) to beautify ruby code
EAPI=5
HOMEPAGE=https://github.com/erniebrodeur/ruby-beautify
-IUSE=elibc_FreeBSD ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86
LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/ruby-beautify-0.97.4.gem
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9c079c0e4b68a5cbc73e2fbf18f4f3b2
+_md5_=d39f7025f286b290228d9544832baadd
diff --git a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1 b/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1
deleted file mode 100644
index c6fca5fb3362..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-filemagic-0.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-apps/file ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Ruby binding to libmagic
-EAPI=5
-HOMEPAGE=https://github.com/blackwinter/ruby-filemagic
-IUSE=elibc_FreeBSD ruby_targets_ruby22 test
-KEYWORDS=~amd64 ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=Ruby
-RDEPEND=sys-apps/file ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/ruby-filemagic-0.7.1.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e82846b72cf90451bcc47765c96f60fb
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
deleted file mode 100644
index 12757c9b799d..000000000000
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/hashie[ruby_targets_ruby22] dev-ruby/heredoc_unindent[ruby_targets_ruby22] dev-ruby/rspec:2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Parse YAML safely, alternative implementation of YAML.load
-EAPI=5
-HOMEPAGE=https://dtao.github.com/safe_yaml
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/safe_yaml-1.0.4.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5b8722ae1bbc8b20ec21a9da25a055a3
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2
deleted file mode 100644
index 706200a46fa6..000000000000
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/hashie[ruby_targets_ruby22] dev-ruby/heredoc_unindent[ruby_targets_ruby22] dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Parse YAML safely, alternative implementation of YAML.load
-EAPI=5
-HOMEPAGE=https://dtao.github.com/safe_yaml
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 doc test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/safe_yaml-1.0.4.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f7c45e4f9dd4d2bdb129604d07b136a2
diff --git a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3 b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3
index c159c4d4138f..f0342248a3a5 100644
--- a/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3
+++ b/metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Parse YAML safely, alternative implementation of YAML.load
EAPI=5
HOMEPAGE=https://dtao.github.com/safe_yaml
IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/safe_yaml-1.0.4.gem
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=61905230cff0f19245a8332ecf2ac17a
+_md5_=1df8e902b8e7ce6e95a4e33bc788ce04
diff --git a/metadata/md5-cache/dev-ruby/sass-3.4.15 b/metadata/md5-cache/dev-ruby/sass-3.4.15
deleted file mode 100644
index 0ae02dd3d2c2..000000000000
--- a/metadata/md5-cache/dev-ruby/sass-3.4.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!=dev-ruby/yard-0.5.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( >=dev-ruby/yard-0.5.3[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!=dev-ruby/listen-1.3.1:1[ruby_targets_ruby22] !!=dev-ruby/listen-1.3.1:1[ruby_targets_ruby23] !!=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] =dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] =dev-ruby/tilt-1.1:*[ruby_targets_ruby22] =dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] >=dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] =dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] =dev-ruby/tilt-1.1:*[ruby_targets_ruby22] sass-rails-5.0.4.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b7e1eb0c75eefae2773a4b415356d22c
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5
deleted file mode 100644
index a3c7d18587fa..000000000000
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] =dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] =dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] =dev-ruby/tilt-1.1:*[ruby_targets_ruby22] =dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] =dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] =dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] =dev-ruby/tilt-1.1:*[ruby_targets_ruby22] sass-rails-5.0.5.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3bb4e79c908ac798bd84f63b25d22330
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r1 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r1
deleted file mode 100644
index 9572e5a7534c..000000000000
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] =dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] =dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] =dev-ruby/tilt-1.1:*[ruby_targets_ruby22] =dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] =dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] =dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] =dev-ruby/tilt-1.1:*[ruby_targets_ruby22] sass-rails-5.0.5.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=dbd16df933ab1feba044c2fab5d6e735
diff --git a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r2 b/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r2
deleted file mode 100644
index cb6293fe6f02..000000000000
--- a/metadata/md5-cache/dev-ruby/sass-rails-5.0.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] =dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] =dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] =dev-ruby/tilt-1.1:*[ruby_targets_ruby22] =dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] =dev-ruby/railties-4*:*[ruby_targets_ruby23] =dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] =dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] =dev-ruby/tilt-1.1:*[ruby_targets_ruby23] =dev-ruby/sass-3.1:*[ruby_targets_ruby22] =dev-ruby/sass-3*:*[ruby_targets_ruby22] =dev-ruby/railties-4*:*[ruby_targets_ruby22] =dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby22] =dev-ruby/sprockets-2.8:*[ruby_targets_ruby22] =dev-ruby/tilt-1.1:*[ruby_targets_ruby22] =dev-ruby/sass-3.1:*[ruby_targets_ruby23] =dev-ruby/sass-3*:*[ruby_targets_ruby23] =dev-ruby/railties-4*:*[ruby_targets_ruby23] =dev-ruby/sprockets-rails-2.0:*[ruby_targets_ruby23] =dev-ruby/sprockets-2.8:*[ruby_targets_ruby23] =dev-ruby/tilt-1.1:*[ruby_targets_ruby23] sass-rails-5.0.5.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c5113d995fd40701af7be747f65b3e28
diff --git a/metadata/md5-cache/dev-ruby/session-3.2.0 b/metadata/md5-cache/dev-ruby/session-3.2.0
index 43114edadcd3..59c8db43ab10 100644
--- a/metadata/md5-cache/dev-ruby/session-3.2.0
+++ b/metadata/md5-cache/dev-ruby/session-3.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=A set of classes to drive external programs via pipe
EAPI=5
HOMEPAGE=http://codeforpeople.com/lib/ruby/session/
IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=Ruby
RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/session-3.2.0.gem
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b9413d808e60ea72669f2a441220b132
+_md5_=0f5cbf07e600ba25d2f289f5896407d2
diff --git a/metadata/md5-cache/dev-ruby/shotgun-0.9.1 b/metadata/md5-cache/dev-ruby/shotgun-0.9.1
deleted file mode 100644
index d8751acd85e0..000000000000
--- a/metadata/md5-cache/dev-ruby/shotgun-0.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rack[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Forking implementation of rackup
-EAPI=5
-HOMEPAGE=https://github.com/rtomayko/shotgun
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/rack[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/shotgun-0.9.1.gem
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0c4a4c116848d4d08ced74a3910cda9f
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2 b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
deleted file mode 100644
index 5caa8c3e665c..000000000000
--- a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby22] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Making tests easy on the fingers and eyes
-EAPI=5
-HOMEPAGE=http://thoughtbot.com/projects/shoulda
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby22] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby22] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 )
-RESTRICT=test
-SLOT=3
-SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.5.0.tar.gz -> shoulda-3.5.0.tar.gz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=982751ef6d528f98feb82435aedde0b0
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3 b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3
index fb0f5ac01e52..e2e957114b19 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Making tests easy on the fingers and eyes
EAPI=5
HOMEPAGE=http://thoughtbot.com/projects/shoulda
IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64
LICENSE=MIT
RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby22] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby23] >=dev-ruby/shoulda-matchers-1.4.1:0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=3
SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.5.0.tar.gz -> shoulda-3.5.0.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-fakegem bafb56b9a7b7e84fd091508783628e78 ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=215faf756ec96a78188cc407168212d7
+_md5_=29363939339d2fe31a8975540fd5fb96
diff --git a/metadata/md5-cache/dev-util/monkeystudio-1.9.0.4-r2 b/metadata/md5-cache/dev-util/monkeystudio-1.9.0.4-r2
index 62f498a4ae5c..f3c849034f1b 100644
--- a/metadata/md5-cache/dev-util/monkeystudio-1.9.0.4-r2
+++ b/metadata/md5-cache/dev-util/monkeystudio-1.9.0.4-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare unpack
DEPEND=dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/qtsql:4 x11-libs/qscintilla:=[qt4(-)] doc? ( >=app-doc/doxygen-1.5.8 )
DESCRIPTION=A cross platform Qt 4 IDE
EAPI=5
-HOMEPAGE=http://www.monkeystudio.org
+HOMEPAGE=https://monkeystudio.pasnox.com/
IUSE=doc linguas_be linguas_es linguas_fr linguas_ru
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-3
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qthelp:4 dev-qt/
SLOT=0
SRC_URI=https://monkeystudio.googlecode.com/files/mks_1.9.0.4-src.tar.gz
_eclasses_=base df2aa567b3f0595aae0d0923889f7631 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c qt4-r2 b7985a3197fbc3a22d059f19904e735b toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=8b8c719dd02e47df9dfc20285e276169
+_md5_=e96d79f4a36b401ed337839d202a8de0
diff --git a/metadata/md5-cache/mail-client/thunderbird-52.3.0 b/metadata/md5-cache/mail-client/thunderbird-52.3.0
index fb44908551b9..f6ac8099574d 100644
--- a/metadata/md5-cache/mail-client/thunderbird-52.3.0
+++ b/metadata/md5-cache/mail-client/thunderbird-52.3.0
@@ -9,6 +9,6 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
RDEPEND=>=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 crypt? ( >=x11-plugins/enigmail-1.9.7 ) selinux? ( sec-policy/selinux-thunderbird ) >=app-text/hunspell-1.5.4:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.28:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.9-r1 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
RESTRICT=!bindist? ( bindist )
SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ar.xpi -> thunderbird-52.3.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ast.xpi -> thunderbird-52.3.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/be.xpi -> thunderbird-52.3.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/bg.xpi -> thunderbird-52.3.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.3.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/br.xpi -> thunderbird-52.3.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ca.xpi -> thunderbird-52.3.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/cs.xpi -> thunderbird-52.3.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/cy.xpi -> thunderbird-52.3.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/da.xpi -> thunderbird-52.3.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/de.xpi -> thunderbird-52.3.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/el.xpi -> thunderbird-52.3.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.3.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.3.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.3.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/et.xpi -> thunderbird-52.3.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/eu.xpi -> thunderbird-52.3.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/fi.xpi -> thunderbird-52.3.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/fr.xpi -> thunderbird-52.3.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.3.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.3.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/gd.xpi -> thunderbird-52.3.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/gl.xpi -> thunderbird-52.3.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/he.xpi -> thunderbird-52.3.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/hr.xpi -> thunderbird-52.3.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.3.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/hu.xpi -> thunderbird-52.3.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.3.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/id.xpi -> thunderbird-52.3.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/is.xpi -> thunderbird-52.3.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/it.xpi -> thunderbird-52.3.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ja.xpi -> thunderbird-52.3.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ko.xpi -> thunderbird-52.3.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/lt.xpi -> thunderbird-52.3.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.3.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/nl.xpi -> thunderbird-52.3.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.3.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.3.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/pl.xpi -> thunderbird-52.3.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.3.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.3.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/rm.xpi -> thunderbird-52.3.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ro.xpi -> thunderbird-52.3.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ru.xpi -> thunderbird-52.3.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/si.xpi -> thunderbird-52.3.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/sk.xpi -> thunderbird-52.3.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/sl.xpi -> thunderbird-52.3.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/sq.xpi -> thunderbird-52.3.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/sr.xpi -> thunderbird-52.3.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.3.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.3.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/tr.xpi -> thunderbird-52.3.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/uk.xpi -> thunderbird-52.3.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/vi.xpi -> thunderbird-52.3.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.3.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.3.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/source/thunderbird-52.3.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.3.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.2-patches-02.tar.xz
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ar.xpi -> thunderbird-52.3.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ast.xpi -> thunderbird-52.3.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/be.xpi -> thunderbird-52.3.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/bg.xpi -> thunderbird-52.3.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-52.3.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/br.xpi -> thunderbird-52.3.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ca.xpi -> thunderbird-52.3.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/cs.xpi -> thunderbird-52.3.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/cy.xpi -> thunderbird-52.3.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/da.xpi -> thunderbird-52.3.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/de.xpi -> thunderbird-52.3.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/el.xpi -> thunderbird-52.3.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/en-GB.xpi -> thunderbird-52.3.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/es-AR.xpi -> thunderbird-52.3.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/es-ES.xpi -> thunderbird-52.3.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/et.xpi -> thunderbird-52.3.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/eu.xpi -> thunderbird-52.3.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/fi.xpi -> thunderbird-52.3.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/fr.xpi -> thunderbird-52.3.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-52.3.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-52.3.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/gd.xpi -> thunderbird-52.3.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/gl.xpi -> thunderbird-52.3.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/he.xpi -> thunderbird-52.3.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/hr.xpi -> thunderbird-52.3.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/hsb.xpi -> thunderbird-52.3.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/hu.xpi -> thunderbird-52.3.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-52.3.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/id.xpi -> thunderbird-52.3.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/is.xpi -> thunderbird-52.3.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/it.xpi -> thunderbird-52.3.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ja.xpi -> thunderbird-52.3.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ko.xpi -> thunderbird-52.3.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/lt.xpi -> thunderbird-52.3.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-52.3.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/nl.xpi -> thunderbird-52.3.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-52.3.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-52.3.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/pl.xpi -> thunderbird-52.3.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-52.3.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-52.3.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/rm.xpi -> thunderbird-52.3.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ro.xpi -> thunderbird-52.3.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ru.xpi -> thunderbird-52.3.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/si.xpi -> thunderbird-52.3.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/sk.xpi -> thunderbird-52.3.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/sl.xpi -> thunderbird-52.3.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/sq.xpi -> thunderbird-52.3.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/sr.xpi -> thunderbird-52.3.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-52.3.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-52.3.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/tr.xpi -> thunderbird-52.3.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/uk.xpi -> thunderbird-52.3.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/vi.xpi -> thunderbird-52.3.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-52.3.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-52.3.0-zh-TW.xpi ) https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/source/thunderbird-52.3.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/lightning-5.4.3.tar.xz lightning? ( https://dev.gentoo.org/~axs/distfiles/gdata-provider-3.3.tar.xz ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.2-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.2-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.2-patches-03.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e makeedit 5b9d1905404073cf12f3bf4d694cf387 mozconfig-v6.53 b49f773e76bcda0fd5c0133cfdd52b3c mozcoreconf-v5 dfc58397c1e9ecd4420428e695cf8dc8 mozextension e5d920147bfccf4930062e462e2a417d mozlinguas-v2 e3c0b93bb284269205def793bf37bef5 multilib 97f470f374f2e94ccab04a2fb21d811e nsplugins 2049586e425364a1c5bdb004205d1758 pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43c4cd45a82bc38cea2273fe87df07ef
+_md5_=63bc07746f668f51bff3ac718913f3ce
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r15 b/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r15
deleted file mode 100644
index 1f47e1973dba..000000000000
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) test? ( app-crypt/gnupg dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-Test-Harness ) virtual/pkgconfig
-DESCRIPTION=An extensible mail filter which can identify and tag spam
-EAPI=6
-HOMEPAGE=http://spamassassin.apache.org/
-IUSE=berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) app-crypt/gnupg dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
-SLOT=0
-SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.1.tar.bz2
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e perl-functions 01e8c68d5a528bbcda4d3c60205983df systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
-_md5_=591a12eebd71260603fd96e5e801add6
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r13 b/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r16
similarity index 98%
rename from metadata/md5-cache/mail-filter/spamassassin-3.4.1-r13
rename to metadata/md5-cache/mail-filter/spamassassin-3.4.1-r16
index 5b8da9f563fd..c2f4e00f8d83 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r13
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r16
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-I
SLOT=0
SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.1.tar.bz2
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e perl-functions 01e8c68d5a528bbcda4d3c60205983df systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
-_md5_=e703b81ef7b78e4b1cf6ada1f8a567ac
+_md5_=aff2753ccaae0a5e0572d9a61bfecbda
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.8.2_p20170821 b/metadata/md5-cache/media-gfx/ristretto-0.8.2_p20170821
new file mode 100644
index 000000000000..b08111e84611
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ristretto-0.8.2_p20170821
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst postrm
+DEPEND=>=dev-libs/dbus-glib-0.98:0= >=dev-libs/glib-2.24:2= media-libs/libexif:0= x11-libs/cairo:0= >=x11-libs/gtk+-2.20:2= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.10:0= dev-util/intltool virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=A fast and lightweight picture viewer for Xfce
+EAPI=6
+HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/dbus-glib-0.98:0= >=dev-libs/glib-2.24:2= media-libs/libexif:0= x11-libs/cairo:0= >=x11-libs/gtk+-2.20:2= x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.10:0= >=xfce-base/libxfce4util-4.10:0= >=xfce-base/xfconf-4.10:0=
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/ristretto-0.8.2git-rd21ed3c.tar.bz2
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=75fbbb3eaabfea22214945bffbcbf7f2
diff --git a/metadata/md5-cache/media-libs/exiftool-10.61 b/metadata/md5-cache/media-libs/exiftool-10.61
new file mode 100644
index 000000000000..28f9974e48af
--- /dev/null
+++ b/metadata/md5-cache/media-libs/exiftool-10.61
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Read and write meta information in image, audio and video files
+EAPI=6
+HOMEPAGE=http://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.61.tar.gz
+_eclasses_=multiprocessing 284a473719153462f3e974d86c8cb81c perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=fb338cf167975131487f302e50360ea7
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.4.7 b/metadata/md5-cache/media-libs/harfbuzz-1.5.0
similarity index 98%
rename from metadata/md5-cache/media-libs/harfbuzz-1.4.7
rename to metadata/md5-cache/media-libs/harfbuzz-1.5.0
index e6a7d9a505e9..cd78bae8d70b 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-1.4.7
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.5.0
@@ -9,6 +9,6 @@ LICENSE=Old-MIT ISC icu
RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
REQUIRED_USE=introspection? ( glib )
SLOT=0/0.9.18
-SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.4.7.tar.bz2
+SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.5.0.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd4d85e791e9d33288445d2565c8c0aa
+_md5_=5cc780beff71e41ce61a0069dffea159
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.13 b/metadata/md5-cache/media-libs/libmpdclient-2.13
new file mode 100644
index 000000000000..6bcd7ccd97b7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmpdclient-2.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-doc/doxygen ) test? ( dev-libs/check ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DESCRIPTION=A library for interfacing Music Player Daemon (media-sound/mpd)
+EAPI=6
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient
+IUSE=doc examples test
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.13.tar.xz
+_eclasses_=meson 9ec586ad8a687a72b7d58f7e353e83d9 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=1220fbbae41d7f7f33b557de988e3601
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.2.0 b/metadata/md5-cache/media-libs/openjpeg-2.2.0
index f6b0e162eda0..044bce6f0128 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.2.0
+++ b/metadata/md5-cache/media-libs/openjpeg-2.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=An open-source JPEG 2000 library
EAPI=6
HOMEPAGE=http://www.openjpeg.org
IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD-2
RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
SLOT=2/7
SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.2.0.tar.gz -> openjpeg-2.2.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/40f427cb5e8d6b186fa497618532656331d09d0c.tar.gz -> openjpeg-data_20170809.tar.gz )
_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7bc8af410188577c13c7c12ec8598e5d
+_md5_=058287e19b9885d7256ca3a813ffa423
diff --git a/metadata/md5-cache/media-sound/mpd-0.20.10 b/metadata/md5-cache/media-sound/mpd-0.20.10
new file mode 100644
index 000000000000..1150b66079bc
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpd-0.20.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=!=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.0.25 ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) libsoxr? ( media-libs/soxr ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp:= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib ) dev-libs/boost virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=The Music Player Daemon (mpd)
+EAPI=6
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
+IUSE=adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad +fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack wildmidi zeroconf zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos
+LICENSE=GPL-2
+RDEPEND=!=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) nfs? ( net-fs/libnfs ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.0.25 ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) libsoxr? ( media-libs/soxr ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) upnp? ( net-libs/libupnp:= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-mpd )
+REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( adplug audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) opus? ( ogg ) upnp? ( expat )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/mpd/0.20/mpd-0.20.10.tar.xz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7 versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=8ea2719a80b483fee96af939493eaf4d
diff --git a/metadata/md5-cache/media-sound/mumble-1.2.19 b/metadata/md5-cache/media-sound/mumble-1.2.19
index 26179265fa81..f4a52e038715 100644
--- a/metadata/md5-cache/media-sound/mumble-1.2.19
+++ b/metadata/md5-cache/media-sound/mumble-1.2.19
@@ -4,10 +4,10 @@ DESCRIPTION=Mumble is an open source, low-latency, high quality voice chat softw
EAPI=6
HOMEPAGE=https://wiki.mumble.info
IUSE=+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=BSD MIT
RDEPEND=>=dev-libs/boost-1.41.0 !libressl? ( >=dev-libs/openssl-1.0.0b:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/protobuf-2.2.0:= >=media-libs/libsndfile-1.0.20[-minimal] >=media-libs/opus-1.0.1 || ( ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) =net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,nettle(+)] ) polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl ) ) ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=RTMP client intended to stream audio or video flash content
+EAPI=6
+HOMEPAGE=http://rtmpdump.mplayerhq.hu/
+IUSE=gnutls polarssl ssl libressl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,nettle(+)] ) polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl ) ) ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~hwoarang/distfiles/rtmpdump-2.4_p20161210.tar.gz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=4c7dcf9a8780847d6a11bb6407c1a19d
diff --git a/metadata/md5-cache/media-video/rtmpdump-9999 b/metadata/md5-cache/media-video/rtmpdump-9999
index cb3351ad658e..baf709fd6567 100644
--- a/metadata/md5-cache/media-video/rtmpdump-9999
+++ b/metadata/md5-cache/media-video/rtmpdump-9999
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,nettle(+)] ) polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl ) ) ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-vcs/git
+DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,nettle(+)] ) polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl ) ) ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-vcs/git-1.8.2.1
DESCRIPTION=RTMP client intended to stream audio or video flash content
-EAPI=4
+EAPI=6
HOMEPAGE=http://rtmpdump.mplayerhq.hu/
IUSE=gnutls polarssl ssl libressl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
LICENSE=GPL-2 LGPL-2.1
RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,nettle(+)] ) polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !gnutls? ( !polarssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl ) ) ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-2 195a672bfaf52d868442171c9469bbb6 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=ca57607919441fedaa4587b15999627d
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=e905591c3135f6d1d28d484efe9a8cc8
diff --git a/metadata/md5-cache/net-analyzer/nrpe-3.2.0-r1 b/metadata/md5-cache/net-analyzer/nrpe-3.2.0-r2
similarity index 91%
rename from metadata/md5-cache/net-analyzer/nrpe-3.2.0-r1
rename to metadata/md5-cache/net-analyzer/nrpe-3.2.0-r2
index 555840ca29bc..818dde3a1f16 100644
--- a/metadata/md5-cache/net-analyzer/nrpe-3.2.0-r1
+++ b/metadata/md5-cache/net-analyzer/nrpe-3.2.0-r2
@@ -3,11 +3,11 @@ DEPEND=sys-apps/tcp-wrappers ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig
DESCRIPTION=Nagios Remote Plugin Executor
EAPI=6
HOMEPAGE=https://github.com/NagiosEnterprises/nrpe
-IUSE=selinux ssl
+IUSE=command-args selinux ssl
KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2+
RDEPEND=sys-apps/tcp-wrappers ssl? ( dev-libs/openssl:0 ) || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) selinux? ( sec-policy/selinux-nagios )
SLOT=0
SRC_URI=https://github.com/NagiosEnterprises/nrpe/releases/download/nrpe-3.2.0/nrpe-3.2.0.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af user e4b567c44272a719fabf53f0f885d3f7
-_md5_=b44cb3ba17ea03e97ba2b1c3643dcd28
+_md5_=83089d1141d2843ea29c25e635169874
diff --git a/metadata/md5-cache/net-analyzer/yersinia-0.8.2 b/metadata/md5-cache/net-analyzer/yersinia-0.8.2
new file mode 100644
index 000000000000..9c754bb65de8
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/yersinia-0.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure prepare
+DEPEND=virtual/pkgconfig ncurses? ( >=sys-libs/ncurses-5.5:= ) gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf =x11-libs/gtk+-2* ) >=net-libs/libnet-1.1.2 >=net-libs/libpcap-0.9.4 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A framework for layer 2 attacks
+EAPI=6
+HOMEPAGE=http://www.yersinia.net/
+IUSE=gtk ncurses
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ncurses? ( >=sys-libs/ncurses-5.5:= ) gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf =x11-libs/gtk+-2* ) >=net-libs/libnet-1.1.2 >=net-libs/libpcap-0.9.4
+SLOT=0
+SRC_URI=https://github.com/tomac/yersinia/archive/v0.8.2.tar.gz -> yersinia-0.8.2.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=c67030d80963b7cdcfee5c6add368406
diff --git a/metadata/md5-cache/net-firewall/ipset-6.15 b/metadata/md5-cache/net-firewall/ipset-6.15
index 4c2dd5044eb5..322b06dbac40 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.15
+++ b/metadata/md5-cache/net-firewall/ipset-6.15
@@ -10,4 +10,4 @@ RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl kernel_linux? ( virtual/mo
SLOT=0
SRC_URI=http://ipset.netfilter.org/ipset-6.15.tar.bz2
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=63ce0369d15b268fae112d7adbd58326
+_md5_=2c001a240e08ecb4494bd9defaf424fa
diff --git a/metadata/md5-cache/net-firewall/ipset-6.16 b/metadata/md5-cache/net-firewall/ipset-6.16
index fe0d0198481a..eeee8463b8c0 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.16
+++ b/metadata/md5-cache/net-firewall/ipset-6.16
@@ -10,4 +10,4 @@ RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl kernel_linux? ( virtual/mo
SLOT=0
SRC_URI=http://ipset.netfilter.org/ipset-6.16.tar.bz2
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=72a0a2fe114670ed98431606bcb5fd6a
+_md5_=d943fd546284ce5c45a307f0730c19f5
diff --git a/metadata/md5-cache/net-firewall/ipset-6.16.1 b/metadata/md5-cache/net-firewall/ipset-6.16.1
index 2864c8e86fb7..5c0726e5b31b 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.16.1
+++ b/metadata/md5-cache/net-firewall/ipset-6.16.1
@@ -10,4 +10,4 @@ RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl kernel_linux? ( virtual/mo
SLOT=0
SRC_URI=http://ipset.netfilter.org/ipset-6.16.1.tar.bz2
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=72a0a2fe114670ed98431606bcb5fd6a
+_md5_=d943fd546284ce5c45a307f0730c19f5
diff --git a/metadata/md5-cache/net-firewall/ipset-6.17 b/metadata/md5-cache/net-firewall/ipset-6.17
index 6b6ee940f9cd..bde3f6ceb2b8 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.17
+++ b/metadata/md5-cache/net-firewall/ipset-6.17
@@ -10,4 +10,4 @@ RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl kernel_linux? ( virtual/mo
SLOT=0
SRC_URI=http://ipset.netfilter.org/ipset-6.17.tar.bz2
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0a63385f2ec13adb2eb3d28cf461c349
+_md5_=de705d3c0c13989a62dcceab167b050e
diff --git a/metadata/md5-cache/net-firewall/ipset-6.19 b/metadata/md5-cache/net-firewall/ipset-6.19
index 069eaae0942d..cc1b47f62bed 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.19
+++ b/metadata/md5-cache/net-firewall/ipset-6.19
@@ -10,4 +10,4 @@ RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl kernel_linux? ( virtual/mo
SLOT=0
SRC_URI=http://ipset.netfilter.org/ipset-6.19.tar.bz2
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=72a0a2fe114670ed98431606bcb5fd6a
+_md5_=d943fd546284ce5c45a307f0730c19f5
diff --git a/metadata/md5-cache/net-firewall/ipset-6.20.1 b/metadata/md5-cache/net-firewall/ipset-6.20.1
index e676b95e9ed0..ce82e843d2ad 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.20.1
+++ b/metadata/md5-cache/net-firewall/ipset-6.20.1
@@ -10,4 +10,4 @@ RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? (
SLOT=0
SRC_URI=http://ipset.netfilter.org/ipset-6.20.1.tar.bz2
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6e08c5f8c20a011a4ef64650e9041d8c
+_md5_=30142d2fb963c709d52f482dd967c48a
diff --git a/metadata/md5-cache/net-firewall/ipset-6.21.1 b/metadata/md5-cache/net-firewall/ipset-6.21.1
index 7f86cd761332..da5a1eed8657 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.21.1
+++ b/metadata/md5-cache/net-firewall/ipset-6.21.1
@@ -10,4 +10,4 @@ RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? (
SLOT=0
SRC_URI=http://ipset.netfilter.org/ipset-6.21.1.tar.bz2
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cca02f9ce2e30edd0ace267c1f282407
+_md5_=d234094d41b7dcbde5b2014a4d4c4463
diff --git a/metadata/md5-cache/net-firewall/ipset-6.24 b/metadata/md5-cache/net-firewall/ipset-6.24
index 0db24cf3ac96..53d82ee8f884 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.24
+++ b/metadata/md5-cache/net-firewall/ipset-6.24
@@ -10,4 +10,4 @@ RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? (
SLOT=0
SRC_URI=http://ipset.netfilter.org/ipset-6.24.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7e9c481ad72bb40fc10c9fc1048175a3
+_md5_=e6780146821d2579a3aec161a6b6b0b3
diff --git a/metadata/md5-cache/net-firewall/ipset-6.29 b/metadata/md5-cache/net-firewall/ipset-6.29
index b09a3e823e96..c8fd148ade34 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.29
+++ b/metadata/md5-cache/net-firewall/ipset-6.29
@@ -10,4 +10,4 @@ RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? (
SLOT=0
SRC_URI=http://ipset.netfilter.org/ipset-6.29.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cebf87d34fde62cf7035064a7878fbe2
+_md5_=8dc43623d679d0c3e219a7bf579998d3
diff --git a/metadata/md5-cache/net-firewall/ipset-6.30 b/metadata/md5-cache/net-firewall/ipset-6.30
index 010859841703..655549c9b860 100644
--- a/metadata/md5-cache/net-firewall/ipset-6.30
+++ b/metadata/md5-cache/net-firewall/ipset-6.30
@@ -10,4 +10,4 @@ RDEPEND=>=net-firewall/iptables-1.4.7 net-libs/libmnl modules? ( kernel_linux? (
SLOT=0
SRC_URI=http://ipset.netfilter.org/ipset-6.30.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ad4403cbc6c0436a338a50fa6b3a6fc3
+_md5_=a3c8fcf6aef68a603e1855c31a146a0f
diff --git a/metadata/md5-cache/net-fs/btfs-2.16 b/metadata/md5-cache/net-fs/btfs-2.16
new file mode 100644
index 000000000000..f007cbcd52ea
--- /dev/null
+++ b/metadata/md5-cache/net-fs/btfs-2.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=sys-fs/fuse-2.8.0 >=net-misc/curl-7.22.0 dev-libs/boost:= >=net-libs/libtorrent-rasterbar-0.16.0:= virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=a bittorrent filesystem based on FUSE
+EAPI=6
+HOMEPAGE=https://github.com/johang/btfs
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=sys-fs/fuse-2.8.0 >=net-misc/curl-7.22.0 dev-libs/boost:= >=net-libs/libtorrent-rasterbar-0.16.0:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/johang/btfs/archive/v2.16.tar.gz -> btfs-2.16.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 libtool 0081a71a261724730ec4c248494f044d multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=d08f9d65d8ba61508598ad19213ecde0
diff --git a/metadata/md5-cache/net-fs/samba-4.5.10 b/metadata/md5-cache/net-fs/samba-4.5.10-r1
similarity index 100%
rename from metadata/md5-cache/net-fs/samba-4.5.10
rename to metadata/md5-cache/net-fs/samba-4.5.10-r1
diff --git a/metadata/md5-cache/net-fs/samba-4.5.12 b/metadata/md5-cache/net-fs/samba-4.5.12-r1
similarity index 100%
rename from metadata/md5-cache/net-fs/samba-4.5.12
rename to metadata/md5-cache/net-fs/samba-4.5.12-r1
diff --git a/metadata/md5-cache/net-fs/samba-4.7.0_rc3 b/metadata/md5-cache/net-fs/samba-4.7.0_rc4
similarity index 99%
rename from metadata/md5-cache/net-fs/samba-4.7.0_rc3
rename to metadata/md5-cache/net-fs/samba-4.7.0_rc4
index 43e5c4638cf6..367856fa244b 100644
--- a/metadata/md5-cache/net-fs/samba-4.7.0_rc3
+++ b/metadata/md5-cache/net-fs/samba-4.7.0_rc4
@@ -9,6 +9,6 @@ RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
REQUIRED_USE=addc? ( python gnutls !system-mitkrb5 ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
RESTRICT=test
SLOT=0
-SRC_URI=mirror://samba/rc/samba-4.7.0rc3.tar.gz
+SRC_URI=mirror://samba/rc/samba-4.7.0rc4.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 284a473719153462f3e974d86c8cb81c python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 waf-utils d1ea2758053cbb7c5b38b8f88654468d
_md5_=63727750e3eced33058cae7b55197310
diff --git a/metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r1 b/metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r1
new file mode 100644
index 000000000000..aa02b4c421cf
--- /dev/null
+++ b/metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A log analyzer for amavisd-new
+EAPI=6
+HOMEPAGE=http://logreporters.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=mirror://sourceforge/logreporters/amavis-logwatch-1.51.03.tgz
+_md5_=2ce4cba1e982ba5394e5cb70a2feb311
diff --git a/metadata/md5-cache/net-mail/postfix-logwatch-1.40.03-r1 b/metadata/md5-cache/net-mail/postfix-logwatch-1.40.03-r1
new file mode 100644
index 000000000000..ae3d6fad72af
--- /dev/null
+++ b/metadata/md5-cache/net-mail/postfix-logwatch-1.40.03-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A log analyzer for postfix
+EAPI=6
+HOMEPAGE=http://logreporters.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=mirror://sourceforge/logreporters/postfix-logwatch-1.40.03.tgz
+_md5_=144960bdebb218cda5e01045d50fd054
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.7.2-r1 b/metadata/md5-cache/net-misc/openvswitch-2.7.2-r1
new file mode 100644
index 000000000000..95ad0badc51d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/openvswitch-2.7.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
+DEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/ovs-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] || ( dev-python/twisted[conch,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] debug? ( dev-lang/perl ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DESCRIPTION=Production quality, multilayer virtual switch
+EAPI=6
+HOMEPAGE=http://openvswitch.org
+IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 GPL-2
+RDEPEND=|| ( >=sys-apps/openrc-0.10.5 sys-apps/systemd ) ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/ovs-2.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] || ( dev-python/twisted[conch,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=http://openvswitch.org/releases/openvswitch-2.7.2.tar.gz
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0452fa6285411c7dffd51d176188df60
diff --git a/metadata/md5-cache/net-misc/whois-5.2.16 b/metadata/md5-cache/net-misc/whois-5.2.18
similarity index 59%
rename from metadata/md5-cache/net-misc/whois-5.2.16
rename to metadata/md5-cache/net-misc/whois-5.2.18
index 0869723e0680..5d07ed16de32 100644
--- a/metadata/md5-cache/net-misc/whois-5.2.16
+++ b/metadata/md5-cache/net-misc/whois-5.2.18
@@ -1,7 +1,7 @@
DEFINED_PHASES=compile configure install prepare
DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl ) app-arch/xz-utils >=dev-lang/perl-5 nls? ( sys-devel/gettext )
DESCRIPTION=improved Whois Client
-EAPI=5
+EAPI=6
HOMEPAGE=http://www.linux.it/~md/software/
IUSE=iconv idn nls
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn ) nls? ( virtual/libintl )
RESTRICT=test
SLOT=0
-SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.16.tar.xz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=f3c1294e4675565afa0229e8256c9907
+SRC_URI=mirror://debian/pool/main/w/whois/whois_5.2.18.tar.xz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=80451e39f9fdd3596272e1dff7b10915
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.08.13 b/metadata/md5-cache/net-misc/youtube-dl-2017.08.23
similarity index 77%
rename from metadata/md5-cache/net-misc/youtube-dl-2017.08.13
rename to metadata/md5-cache/net-misc/youtube-dl-2017.08.23
index 0a3ade38381c..41e41abd56f7 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2017.08.13
+++ b/metadata/md5-cache/net-misc/youtube-dl-2017.08.23
@@ -1,7 +1,7 @@
DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=5
+EAPI=6
HOMEPAGE=https://rg3.github.com/youtube-dl/
IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
@@ -9,6 +9,6 @@ LICENSE=public-domain
RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2017.08.13/youtube-dl-2017.08.13.tar.gz
-_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=15b1b8d636e9847a9304a0f8b82f5bcd
+SRC_URI=http://youtube-dl.org/downloads/2017.08.23/youtube-dl-2017.08.23.tar.gz
+_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 distutils-r1 372bbe39047c0a2550319a3a82f3e063 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f26d4f62a286cb185ccde00c8ef8632a
diff --git a/metadata/md5-cache/net-misc/youtube-dl-99999999 b/metadata/md5-cache/net-misc/youtube-dl-99999999
index 924f611f0cda..db5d17b28b3d 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-99999999
+++ b/metadata/md5-cache/net-misc/youtube-dl-99999999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=5
+EAPI=6
HOMEPAGE=https://rg3.github.com/youtube-dl/
IUSE=offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
LICENSE=public-domain
RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
-_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea git-r3 cbafa3261c37c7e3af44bb16a34ea390 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=54877ac5add25452ad0ba7c9e97a94de
+_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 distutils-r1 372bbe39047c0a2550319a3a82f3e063 git-r3 cbafa3261c37c7e3af44bb16a34ea390 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cda8803b52c41ac6d547f15c86630659
diff --git a/metadata/md5-cache/net-news/newsbeuter-2.9-r2 b/metadata/md5-cache/net-news/newsbeuter-2.9-r3
similarity index 95%
rename from metadata/md5-cache/net-news/newsbeuter-2.9-r2
rename to metadata/md5-cache/net-news/newsbeuter-2.9-r3
index 6d57ac554aeb..17212cdb6d95 100644
--- a/metadata/md5-cache/net-news/newsbeuter-2.9-r2
+++ b/metadata/md5-cache/net-news/newsbeuter-2.9-r3
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://www.newsbeuter.org/downloads/newsbeuter-2.9.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=dd9b5ad718ed86fdf4f46b70f554337f
+_md5_=b1ebe60775e5a3fe343e19a2c1c25d80
diff --git a/metadata/md5-cache/net-print/cups-filters-1.14.1 b/metadata/md5-cache/net-print/cups-filters-1.14.1
deleted file mode 100644
index 099b19002957..000000000000
--- a/metadata/md5-cache/net-print/cups-filters-1.14.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen virtual/pkgconfig
-DESCRIPTION=Cups PDF filters
-EAPI=6
-HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_job_format
-IUSE=dbus +foomatic ipp_autosetup jpeg ldap pdf perl png +postscript static-libs tiff zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
-LICENSE=MIT GPL-2
-RDEPEND=postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
-SLOT=0
-SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.14.1.tar.xz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=20336125c71e6764d806bfe8d0a1ce8f
diff --git a/metadata/md5-cache/net-print/cups-filters-1.16.2 b/metadata/md5-cache/net-print/cups-filters-1.16.4
similarity index 99%
rename from metadata/md5-cache/net-print/cups-filters-1.16.2
rename to metadata/md5-cache/net-print/cups-filters-1.16.4
index 8313c29f3323..12fcc6b3070b 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.16.2
+++ b/metadata/md5-cache/net-print/cups-filters-1.16.4
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
LICENSE=MIT GPL-2
RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
SLOT=0
-SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.16.2.tar.xz
+SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.16.4.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af
_md5_=30c29f2b9804343b9a91358a6b4a1d17
diff --git a/metadata/md5-cache/net-print/cups-filters-1.17.0 b/metadata/md5-cache/net-print/cups-filters-1.17.0
new file mode 100644
index 000000000000..a0155c256c93
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-filters-1.17.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen virtual/pkgconfig
+DESCRIPTION=Cups PDF filters
+EAPI=6
+HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_job_format
+IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs tiff zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
+LICENSE=MIT GPL-2
+RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
+SLOT=0
+SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.17.0.tar.xz
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=d0106d89e6112c6cfcadb08bb553849a
diff --git a/metadata/md5-cache/net-print/cups-filters-9999 b/metadata/md5-cache/net-print/cups-filters-9999
index 0d569449a4b7..5b3f086485e9 100644
--- a/metadata/md5-cache/net-print/cups-filters-9999
+++ b/metadata/md5-cache/net-print/cups-filters-9999
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen virtual/pkgconfig >=dev-vcs/bzr-2.0.1 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen virtual/pkgconfig >=dev-vcs/bzr-2.0.1 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Cups PDF filters
EAPI=6
HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_job_format
-IUSE=dbus +foomatic ipp_autosetup jpeg ldap pdf perl png +postscript static-libs tiff zeroconf
+IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs tiff zeroconf
LICENSE=MIT GPL-2
-RDEPEND=postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
+RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
SLOT=0
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bzr d240aafae63ed6fd5011daef0e096f35 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=20336125c71e6764d806bfe8d0a1ce8f
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 bzr d240aafae63ed6fd5011daef0e096f35 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 systemd 15a3154d9241313a8b9b625618ce981b toolchain-funcs 185a06792159ca143528e7010368e8af
+_md5_=d0106d89e6112c6cfcadb08bb553849a
diff --git a/metadata/md5-cache/net-voip/telepathy-haze-0.8.0-r2 b/metadata/md5-cache/net-voip/telepathy-haze-0.8.0-r2
index 84ed7d0a5143..3aa892b1edf1 100644
--- a/metadata/md5-cache/net-voip/telepathy-haze-0.8.0-r2
+++ b/metadata/md5-cache/net-voip/telepathy-haze-0.8.0-r2
@@ -10,4 +10,4 @@ RDEPEND=>=net-im/pidgin-2.7[dbus] >=net-libs/telepathy-glib-0.15.1 >=dev-libs/gl
SLOT=0
SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze-0.8.0.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=d2ce2f22732e211495cafb453a52b943
+_md5_=746028406b03d15536966a32a2ae8448
diff --git a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r1 b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r1
index 9ec24265dc26..32143de501d6 100644
--- a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r1
+++ b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/dbus-glib-0.61 dev-libs/libxml2 >=dev-libs/glib-2.28:2 >=sys-
SLOT=0
SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-0.8.1.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=70ad1801ee69babcf931f24100077698
+_md5_=67fbe1b3ca0a8bf37524618d6f46b7c1
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.8 b/metadata/md5-cache/sys-apps/portage-2.3.8
index 735961c4092a..3c97945b80ed 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.8
+++ b/metadata/md5-cache/sys-apps/portage-2.3.8
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
SLOT=0
SRC_URI=mirror://gentoo/portage-2.3.8.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.8.tar.bz2
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ddb0372a00cb1a32481aaa5d721c74a6
+_md5_=e1ec7598e680c3b1f409631562a3e2cf
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 246df2599075..21786f68e912 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -10,4 +10,4 @@ RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.
REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 git-r3 cbafa3261c37c7e3af44bb16a34ea390 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cde4baa6106d50f9c5db558ab6559e34
+_md5_=0ee4975c93fd8cde0e7cccd23b68453c
diff --git a/metadata/md5-cache/sys-cluster/legion-17.08.0 b/metadata/md5-cache/sys-cluster/legion-17.08.0
new file mode 100644
index 000000000000..260061b01113
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/legion-17.08.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 ) hwloc? ( sys-apps/hwloc ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A data-centric parallel programming system
+EAPI=6
+HOMEPAGE=http://legion.stanford.edu/
+IUSE=gasnet +hwloc test
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/StanfordLegion/legion/archive/legion-17.08.0.tar.gz
+_eclasses_=cmake-utils 026933aff3889190eeb565b642cfe252 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=88621e70b3d650da3a05a54d748f14b6
diff --git a/metadata/md5-cache/sys-cluster/zetcd-0.0.2 b/metadata/md5-cache/sys-cluster/zetcd-0.0.2
deleted file mode 100644
index 1d036081bf1c..000000000000
--- a/metadata/md5-cache/sys-cluster/zetcd-0.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=A ZooKeeper personality for etcd
-EAPI=6
-HOMEPAGE=https://github.com/coreos/zetcd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/coreos/zetcd/archive/v0.0.2.tar.gz -> zetcd-0.0.2.tar.gz https://github.com/coreos/etcd/archive/fa4903c83c72f2857b8ed795a3c86f140b89d52c.tar.gz -> github.com-coreos-etcd-fa4903c83c72f2857b8ed795a3c86f140b89d52c.tar.gz
-_eclasses_=golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536 user e4b567c44272a719fabf53f0f885d3f7
-_md5_=bbc72cd570b6140aebdc18df022c35c1
diff --git a/metadata/md5-cache/sys-cluster/zetcd-0.0.3 b/metadata/md5-cache/sys-cluster/zetcd-0.0.3
deleted file mode 100644
index 33691e7fc82d..000000000000
--- a/metadata/md5-cache/sys-cluster/zetcd-0.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup test unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=A ZooKeeper personality for etcd
-EAPI=6
-HOMEPAGE=https://github.com/coreos/zetcd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/coreos/zetcd/archive/v0.0.3.tar.gz -> zetcd-0.0.3.tar.gz https://github.com/coreos/etcd/archive/fa4903c83c72f2857b8ed795a3c86f140b89d52c.tar.gz -> github.com-coreos-etcd-fa4903c83c72f2857b8ed795a3c86f140b89d52c.tar.gz
-_eclasses_=golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536 user e4b567c44272a719fabf53f0f885d3f7
-_md5_=bbc72cd570b6140aebdc18df022c35c1
diff --git a/metadata/md5-cache/sys-cluster/zetcd-0.0.4 b/metadata/md5-cache/sys-cluster/zetcd-0.0.4
new file mode 100644
index 000000000000..a20d4db37708
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/zetcd-0.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install setup test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=A ZooKeeper personality for etcd
+EAPI=6
+HOMEPAGE=https://github.com/coreos/zetcd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/coreos/zetcd/archive/v0.0.4.tar.gz -> zetcd-0.0.4.tar.gz https://github.com/coreos/etcd/archive/714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz -> github.com-coreos-etcd-714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz https://github.com/grpc/grpc-go/archive/777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz -> github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/go-genproto/archive/ee236bd376b077c7a89f260c026c4735b195e459.tar.gz -> github.com-google-go-genproto-ee236bd376b077c7a89f260c026c4735b195e459.tar.gz
+_eclasses_=golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536 user e4b567c44272a719fabf53f0f885d3f7
+_md5_=c3dd77f41b8f3fefaabf253ce9656d62
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r3 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r3
index 9747123151e5..f6cca87033d8 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-5.4.0-r3
@@ -10,6 +10,6 @@ PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 )
RESTRICT=strip
SLOT=5.4.0
-SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.3.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.4.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee prefix df8265631f8bf5f5df387e9b987121f9 toolchain 3a6569a1bc025127eac42ff1197e3807 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c7f763d4612d085b897136f8b4d30d97
+_md5_=3b7240392be611778d6d4add6331eabf
diff --git a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4 b/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
deleted file mode 100644
index 761329206f96..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-5.4.0-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=4
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=regression-test vanilla altivec debug nopie nossp doc gcj awt hardened multilib objc objc-gc libssp objc++ fixed-point go graphite cilk +vtv jit mpx +nls +nptl +cxx +fortran +openmp +sanitize
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-1.7
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 )
-RESTRICT=strip
-SLOT=5.4.0
-SRC_URI=mirror://gnu/gcc/gcc-5.4.0/gcc-5.4.0.tar.bz2 mirror://gentoo/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-patches-1.4.tar.bz2 mirror://gentoo/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.4.0-piepatches-v0.6.5.tar.bz2 mirror://gentoo/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.3-specs-0.2.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.3-specs-0.2.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee prefix df8265631f8bf5f5df387e9b987121f9 toolchain 3a6569a1bc025127eac42ff1197e3807 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ded4208eafa30c55578f9868e68b60ec
diff --git a/metadata/md5-cache/sys-devel/gcc-7.2.0 b/metadata/md5-cache/sys-devel/gcc-7.2.0
new file mode 100644
index 000000000000..2e1051e88ffd
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-7.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 >=sys-apps/sed-4 sys-devel/gnuconfig >=app-portage/elt-patches-20170422 sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 ) >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( awt? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=5
+HOMEPAGE=https://gcc.gnu.org/
+IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc objc-gc libssp objc++ fixed-point go graphite cilk +vtv jit mpx +pie +ssp +pch +nls +nptl +cxx +fortran +openmp +sanitize
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
+RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14 )
+RESTRICT=strip
+SLOT=7.2.0
+SRC_URI=mirror://gnu/gcc/gcc-7.2.0/gcc-7.2.0.tar.xz mirror://gentoo/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.1.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee prefix df8265631f8bf5f5df387e9b987121f9 toolchain 3a6569a1bc025127eac42ff1197e3807 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=cdc342cec11a70d6d23b870af0cf7d37
diff --git a/metadata/md5-cache/www-apache/passenger-5.1.8 b/metadata/md5-cache/www-apache/passenger-5.1.8
new file mode 100644
index 000000000000..3cdf1f14f822
--- /dev/null
+++ b/metadata/md5-cache/www-apache/passenger-5.1.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
+EAPI=6
+HOMEPAGE=https://www.phusionpassenger.com/
+IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.1.8.tar.gz
+_eclasses_=apache-module bd30ba4d834196e81cf2b76c52d26b93 depend.apache 0917334d570e07f9743a04ff85b3bf1b epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b java-utils-2 1971a6927fcd7ec839f7e12b28a24bdd ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e ruby-ng dbd648644c9f5bec523dc17dc34d8671 ruby-utils 453e0fe0dd06baac93b584c91528cc62 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=4263b8f34ddf91d329c2752b64abb972
diff --git a/metadata/md5-cache/www-apps/dokuwiki-20160626b b/metadata/md5-cache/www-apps/dokuwiki-20160626e
similarity index 82%
rename from metadata/md5-cache/www-apps/dokuwiki-20160626b
rename to metadata/md5-cache/www-apps/dokuwiki-20160626e
index 6d62fe95c5bc..d14b98be68d8 100644
--- a/metadata/md5-cache/www-apps/dokuwiki-20160626b
+++ b/metadata/md5-cache/www-apps/dokuwiki-20160626e
@@ -2,12 +2,12 @@ DEFINED_PHASES=install postinst prepare prerm setup
DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
DESCRIPTION=DokuWiki is a simple to use Wiki aimed at a small company's documentation needs.
EAPI=5
-HOMEPAGE=https://www.dokuwiki.org/DokuWiki
+HOMEPAGE=http://wiki.splitbrain.org/wiki:dokuwiki
IUSE=gd vhosts
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/php-5.3[xml] virtual/httpd-php:* gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) ) >=app-admin/webapp-config-1.50.15
-SLOT=20160626b
-SRC_URI=http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2016-06-26b.tgz
+SLOT=20160626e
+SRC_URI=http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2016-06-26e.tgz
_eclasses_=webapp a76ebd3cb5649737496e8238992dd7ca
-_md5_=ac0007ed1179154879b39b489126c2a1
+_md5_=9680dd79095b4800056b95b6c3ec24e2
diff --git a/metadata/md5-cache/www-apps/dokuwiki-20170219b b/metadata/md5-cache/www-apps/dokuwiki-20170219e
similarity index 82%
rename from metadata/md5-cache/www-apps/dokuwiki-20170219b
rename to metadata/md5-cache/www-apps/dokuwiki-20170219e
index 613a7b6e6c95..5bfc11882418 100644
--- a/metadata/md5-cache/www-apps/dokuwiki-20170219b
+++ b/metadata/md5-cache/www-apps/dokuwiki-20170219e
@@ -2,12 +2,12 @@ DEFINED_PHASES=install postinst prepare prerm setup
DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
DESCRIPTION=DokuWiki is a simple to use Wiki aimed at a small company's documentation needs.
EAPI=5
-HOMEPAGE=https://www.dokuwiki.org/DokuWiki
+HOMEPAGE=http://wiki.splitbrain.org/wiki:dokuwiki
IUSE=gd vhosts
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/php-5.3[xml] virtual/httpd-php:* gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) ) >=app-admin/webapp-config-1.50.15
-SLOT=20170219b
-SRC_URI=http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2017-02-19b.tgz
+SLOT=20170219e
+SRC_URI=http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2017-02-19e.tgz
_eclasses_=webapp a76ebd3cb5649737496e8238992dd7ca
-_md5_=ac0007ed1179154879b39b489126c2a1
+_md5_=9680dd79095b4800056b95b6c3ec24e2
diff --git a/metadata/md5-cache/www-client/firefox-52.3.0 b/metadata/md5-cache/www-client/firefox-52.3.0
index 0bc66dd37fb7..1e661f3f46bc 100644
--- a/metadata/md5-cache/www-client/firefox-52.3.0
+++ b/metadata/md5-cache/www-client/firefox-52.3.0
@@ -9,6 +9,6 @@ LICENSE=MPL-2.0 GPL-2 LGPL-2.1
RDEPEND=jack? ( virtual/jack ) >=dev-libs/nss-3.28.3 >=dev-libs/nspr-4.13.1 selinux? ( sec-policy/selinux-mozilla ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
RESTRICT=!bindist? ( bindist )
SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ach.xpi -> firefox-52.3.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/af.xpi -> firefox-52.3.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/an.xpi -> firefox-52.3.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ar.xpi -> firefox-52.3.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/as.xpi -> firefox-52.3.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ast.xpi -> firefox-52.3.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/az.xpi -> firefox-52.3.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/bg.xpi -> firefox-52.3.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.3.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.3.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/br.xpi -> firefox-52.3.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/bs.xpi -> firefox-52.3.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ca.xpi -> firefox-52.3.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/cak.xpi -> firefox-52.3.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/cs.xpi -> firefox-52.3.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/cy.xpi -> firefox-52.3.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/da.xpi -> firefox-52.3.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/de.xpi -> firefox-52.3.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/dsb.xpi -> firefox-52.3.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/el.xpi -> firefox-52.3.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.3.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.3.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/eo.xpi -> firefox-52.3.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.3.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.3.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.3.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.3.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/et.xpi -> firefox-52.3.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/eu.xpi -> firefox-52.3.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/fa.xpi -> firefox-52.3.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ff.xpi -> firefox-52.3.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/fi.xpi -> firefox-52.3.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/fr.xpi -> firefox-52.3.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.3.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.3.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/gd.xpi -> firefox-52.3.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/gl.xpi -> firefox-52.3.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/gn.xpi -> firefox-52.3.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.3.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/he.xpi -> firefox-52.3.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.3.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/hr.xpi -> firefox-52.3.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.3.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/hu.xpi -> firefox-52.3.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.3.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/id.xpi -> firefox-52.3.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/is.xpi -> firefox-52.3.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/it.xpi -> firefox-52.3.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ja.xpi -> firefox-52.3.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ka.xpi -> firefox-52.3.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/kab.xpi -> firefox-52.3.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/kk.xpi -> firefox-52.3.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/km.xpi -> firefox-52.3.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/kn.xpi -> firefox-52.3.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ko.xpi -> firefox-52.3.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/lij.xpi -> firefox-52.3.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/lt.xpi -> firefox-52.3.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/lv.xpi -> firefox-52.3.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/mai.xpi -> firefox-52.3.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/mk.xpi -> firefox-52.3.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ml.xpi -> firefox-52.3.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/mr.xpi -> firefox-52.3.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ms.xpi -> firefox-52.3.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.3.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/nl.xpi -> firefox-52.3.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.3.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/or.xpi -> firefox-52.3.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.3.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/pl.xpi -> firefox-52.3.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.3.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.3.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/rm.xpi -> firefox-52.3.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ro.xpi -> firefox-52.3.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ru.xpi -> firefox-52.3.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/si.xpi -> firefox-52.3.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/sk.xpi -> firefox-52.3.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/sl.xpi -> firefox-52.3.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/son.xpi -> firefox-52.3.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/sq.xpi -> firefox-52.3.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/sr.xpi -> firefox-52.3.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.3.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ta.xpi -> firefox-52.3.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/te.xpi -> firefox-52.3.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/th.xpi -> firefox-52.3.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/tr.xpi -> firefox-52.3.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/uk.xpi -> firefox-52.3.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/uz.xpi -> firefox-52.3.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/vi.xpi -> firefox-52.3.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/xh.xpi -> firefox-52.3.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.3.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.3.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/source/firefox-52.3.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.2-patches-02.tar.xz
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ach.xpi -> firefox-52.3.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/af.xpi -> firefox-52.3.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/an.xpi -> firefox-52.3.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ar.xpi -> firefox-52.3.0esr-ar.xpi ) l10n_as? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/as.xpi -> firefox-52.3.0esr-as.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ast.xpi -> firefox-52.3.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/az.xpi -> firefox-52.3.0esr-az.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/bg.xpi -> firefox-52.3.0esr-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/bn-BD.xpi -> firefox-52.3.0esr-bn-BD.xpi ) l10n_bn-IN? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/bn-IN.xpi -> firefox-52.3.0esr-bn-IN.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/br.xpi -> firefox-52.3.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/bs.xpi -> firefox-52.3.0esr-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ca.xpi -> firefox-52.3.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/cak.xpi -> firefox-52.3.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/cs.xpi -> firefox-52.3.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/cy.xpi -> firefox-52.3.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/da.xpi -> firefox-52.3.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/de.xpi -> firefox-52.3.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/dsb.xpi -> firefox-52.3.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/el.xpi -> firefox-52.3.0esr-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/en-GB.xpi -> firefox-52.3.0esr-en-GB.xpi ) l10n_en-ZA? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/en-ZA.xpi -> firefox-52.3.0esr-en-ZA.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/eo.xpi -> firefox-52.3.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/es-AR.xpi -> firefox-52.3.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/es-CL.xpi -> firefox-52.3.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/es-ES.xpi -> firefox-52.3.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/es-MX.xpi -> firefox-52.3.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/et.xpi -> firefox-52.3.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/eu.xpi -> firefox-52.3.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/fa.xpi -> firefox-52.3.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ff.xpi -> firefox-52.3.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/fi.xpi -> firefox-52.3.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/fr.xpi -> firefox-52.3.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-52.3.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-52.3.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/gd.xpi -> firefox-52.3.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/gl.xpi -> firefox-52.3.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/gn.xpi -> firefox-52.3.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-52.3.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/he.xpi -> firefox-52.3.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-52.3.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/hr.xpi -> firefox-52.3.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/hsb.xpi -> firefox-52.3.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/hu.xpi -> firefox-52.3.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-52.3.0esr-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/id.xpi -> firefox-52.3.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/is.xpi -> firefox-52.3.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/it.xpi -> firefox-52.3.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ja.xpi -> firefox-52.3.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ka.xpi -> firefox-52.3.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/kab.xpi -> firefox-52.3.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/kk.xpi -> firefox-52.3.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/km.xpi -> firefox-52.3.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/kn.xpi -> firefox-52.3.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ko.xpi -> firefox-52.3.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/lij.xpi -> firefox-52.3.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/lt.xpi -> firefox-52.3.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/lv.xpi -> firefox-52.3.0esr-lv.xpi ) l10n_mai? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/mai.xpi -> firefox-52.3.0esr-mai.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/mk.xpi -> firefox-52.3.0esr-mk.xpi ) l10n_ml? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ml.xpi -> firefox-52.3.0esr-ml.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/mr.xpi -> firefox-52.3.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ms.xpi -> firefox-52.3.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-52.3.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/nl.xpi -> firefox-52.3.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-52.3.0esr-nn-NO.xpi ) l10n_or? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/or.xpi -> firefox-52.3.0esr-or.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-52.3.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/pl.xpi -> firefox-52.3.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-52.3.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-52.3.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/rm.xpi -> firefox-52.3.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ro.xpi -> firefox-52.3.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ru.xpi -> firefox-52.3.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/si.xpi -> firefox-52.3.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/sk.xpi -> firefox-52.3.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/sl.xpi -> firefox-52.3.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/son.xpi -> firefox-52.3.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/sq.xpi -> firefox-52.3.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/sr.xpi -> firefox-52.3.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-52.3.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/ta.xpi -> firefox-52.3.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/te.xpi -> firefox-52.3.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/th.xpi -> firefox-52.3.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/tr.xpi -> firefox-52.3.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/uk.xpi -> firefox-52.3.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/uz.xpi -> firefox-52.3.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/vi.xpi -> firefox-52.3.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/xh.xpi -> firefox-52.3.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-52.3.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-52.3.0esr-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/52.3.0esr/source/firefox-52.3.0esr.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.2-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.2-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.2-patches-03.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b gnome2-utils 8a5e0bf2b8031478ecfeaec753ef4560 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e mozconfig-v6.52 685c728a1304947d8bc52ee65ceeffae mozcoreconf-v5 dfc58397c1e9ecd4420428e695cf8dc8 mozextension e5d920147bfccf4930062e462e2a417d mozlinguas-v2 e3c0b93bb284269205def793bf37bef5 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 virtualx 171580f737f5aaf18fcb456548588066 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5463aaf3f5f642a70bce661e5e291568
+_md5_=bd7c98d987becf442a142182e67ddccd
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.3.0_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.3.0_p0
index 683c46278aa6..59f045f18a78 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.3.0_p0
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.3.0_p0
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=MPL-2.0 GPL-2 LGPL-2.1
RDEPEND=>=dev-libs/nss-3.28.1 >=dev-libs/nspr-4.13 crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt5] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) x11-plugins/enigmail ) jack? ( virtual/jack ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/source/thunderbird-52.3.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/seamonkey-2.49-l10n-sources-20170727.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.2-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.3.0/source/thunderbird-52.3.0.source.tar.xz https://dev.gentoo.org/~axs/distfiles/seamonkey-2.49-l10n-sources-20170727.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.2-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.2-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.2-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 check-reqs bd050ce908e4637604ee604ed4b78e8f epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e mozconfig-v6.52 685c728a1304947d8bc52ee65ceeffae mozcoreconf-v5 dfc58397c1e9ecd4420428e695cf8dc8 mozextension e5d920147bfccf4930062e462e2a417d mozlinguas-v2 e3c0b93bb284269205def793bf37bef5 multilib 97f470f374f2e94ccab04a2fb21d811e nsplugins 2049586e425364a1c5bdb004205d1758 pax-utils 4f95120230a315c8caaabeb2307b7eee python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=75b979993b9e9d40b9aedd65e9a4ea3f
+_md5_=6a2fe12412969d83de793339aef1f08e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.12.933.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.12.941.3_p1
similarity index 93%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-1.12.933.3_p1
rename to metadata/md5-cache/www-client/vivaldi-snapshot-1.12.941.3_p1
index 9c071c7ea738..e6d8e08674d8 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-1.12.933.3_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-1.12.941.3_p1
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.1:0 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
RESTRICT=bindist mirror
SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.12.933.3-1_amd64.deb -> vivaldi-snapshot-1.12.933.3_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.12.933.3-1_i386.deb -> vivaldi-snapshot-1.12.933.3_p1-i386.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.12.941.3-1_amd64.deb -> vivaldi-snapshot-1.12.941.3_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.12.941.3-1_i386.deb -> vivaldi-snapshot-1.12.941.3_p1-i386.deb )
_eclasses_=chromium-2 fcd0e1c5eaae64392927ca67cdb13e0c epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=cd51ae0622dba5ae242b35d07ae4755f
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.83 b/metadata/md5-cache/x11-libs/libdrm-2.4.83
new file mode 100644
index 000000000000..5aef0af25afd
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.83
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/libpthread-stubs-0.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) valgrind? ( dev-util/valgrind ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=X.Org libdrm library
+EAPI=5
+HOMEPAGE=https://dri.freedesktop.org/
+IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.83.tar.bz2
+_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af xorg-2 234cf45e2565fab7c0dff5bd8d1f9177
+_md5_=e2ca4f07ee1e2974ba15709f35f72a4c
diff --git a/metadata/md5-cache/x11-misc/dunst-1.1.0 b/metadata/md5-cache/x11-misc/dunst-1.1.0
index 2171432982c3..e2773739747c 100644
--- a/metadata/md5-cache/x11-misc/dunst-1.1.0
+++ b/metadata/md5-cache/x11-misc/dunst-1.1.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/cairo[X,glib] x11-libs/pango[X] dunstify? ( x11-libs/libnotify ) dev-lang/perl virtual/pkgconfig
+DEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/gtk+:2= x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/pango[X] dunstify? ( x11-libs/libnotify ) dev-lang/perl virtual/pkgconfig
DESCRIPTION=customizable and lightweight notification-daemon
EAPI=5
HOMEPAGE=http://www.knopwob.org/dunst/
IUSE=dunstify
KEYWORDS=amd64 ~arm x86
LICENSE=BSD
-RDEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/cairo[X,glib] x11-libs/pango[X] dunstify? ( x11-libs/libnotify )
+RDEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/gtk+:2= x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/pango[X] dunstify? ( x11-libs/libnotify )
SLOT=0
SRC_URI=http://www.knopwob.org/public/dunst-release/dunst-1.1.0.tar.bz2
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=824831749a537a49dc662a8fbf0b8adb
+_md5_=fbc29e16bf42a86dd68beed28f551fc8
diff --git a/metadata/md5-cache/x11-misc/dunst-1.2.0 b/metadata/md5-cache/x11-misc/dunst-1.2.0
index a39d0d6e5447..aef8aa44e193 100644
--- a/metadata/md5-cache/x11-misc/dunst-1.2.0
+++ b/metadata/md5-cache/x11-misc/dunst-1.2.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/pango[X] dunstify? ( x11-libs/libnotify ) dev-lang/perl virtual/pkgconfig
+DEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/gtk+:2= x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/pango[X] dunstify? ( x11-libs/libnotify ) dev-lang/perl virtual/pkgconfig
DESCRIPTION=customizable and lightweight notification-daemon
EAPI=6
HOMEPAGE=http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst
IUSE=dunstify
KEYWORDS=~amd64 ~x86
LICENSE=BSD
-RDEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/pango[X] dunstify? ( x11-libs/libnotify )
+RDEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/gtk+:2= x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/pango[X] dunstify? ( x11-libs/libnotify )
SLOT=0
SRC_URI=https://github.com/dunst-project/dunst/archive/v1.2.0.tar.gz -> dunst-1.2.0.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=70cfbddb13cc8933f97d2821ea7564c7
+_md5_=f9bf31ec53f3c185cc41ec2e9892a1c1
diff --git a/metadata/md5-cache/x11-wm/stumpwm-9999 b/metadata/md5-cache/x11-wm/stumpwm-9999
deleted file mode 100644
index 6adf18ca61a5..000000000000
--- a/metadata/md5-cache/x11-wm/stumpwm-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-lisp/common-lisp-controller virtual/commonlisp dev-lisp/cl-ppcre doc? ( virtual/texi2dvi ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
-DESCRIPTION=Stumpwm is a Window Manager written entirely in Common Lisp.
-EAPI=5
-HOMEPAGE=https://stumpwm.github.io/
-IUSE=doc clisp emacs +sbcl
-LICENSE=GPL-2
-PDEPEND=virtual/commonlisp
-RDEPEND=dev-lisp/common-lisp-controller virtual/commonlisp dev-lisp/cl-ppcre doc? ( virtual/texi2dvi ) emacs? ( app-emacs/slime ) !clisp? ( !sbcl? ( !amd64? ( dev-lisp/cmucl ) ) ) clisp? ( >=dev-lisp/clisp-2.38-r2[X,-new-clx] ) sbcl? ( >=dev-lisp/sbcl-1.1.15 dev-lisp/clx )
-RESTRICT=mirror
-SLOT=0
-_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 common-lisp-3 aae227dd64002603622f1dcc63c9744c epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea git-2 195a672bfaf52d868442171c9469bbb6 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af2d2687c552b2cb5c96549d5297acba
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index da6e70ab5e19..81fcabd86004 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 24 Aug 2017 05:39:06 +0000
+Fri, 25 Aug 2017 05:39:16 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 6000666e8ec1..f69d00e1b935 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -1831,18 +1831,32 @@
alicef@gentoo.org
Alice Ferrazzi
+ Member
+
+
+ blueknight@gentoo.org
+ Yury German
+ Member
+
+
+ bman@gentoo.org
+ Aaron Bauman
+ Member
k_f@gentoo.org
Kristian Fiskerstrand
+ Member
whissi@gentoo.org
Thomas Deutschmann
+ Member
zx2c4@gentoo.org
Jason A. Donenfeld
+ Member
@@ -3930,6 +3944,11 @@ developers and volunteer mentors.
Treecleaner
https://wiki.gentoo.org/wiki/Project:Treecleaner
The Tree Cleaning Team is primarily concerned with removing unmaintained and broken packages from the tree.
+
+ bman@gentoo.org
+ Aaron Bauman
+ Member
+
hwoarang@gentoo.org
Markos Chandras
diff --git a/metadata/timestamp b/metadata/timestamp
index 4d3fc267ac65..a6b7ad59dcff 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Aug 24 05:39:05 UTC 2017
+Fri Aug 25 05:39:15 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 056926e53b0a..17c3b79d1fca 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 24 Aug 2017 06:00:01 +0000
+Fri, 25 Aug 2017 06:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c31454c8693f..d417a847127d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-aab9730e3b8bec487676634893e3646694dcd214 1503543638 2017-08-24T03:00:38+00:00
+995572603cf4aad90fa5524503e0e5377d5e09bf 1503636289 2017-08-25T04:44:49+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index cd50f8e0432c..5a1ad056529e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1503552901 Thu 24 Aug 2017 05:35:01 AM UTC
+1503639301 Fri 25 Aug 2017 05:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index cbc196eef91f..99203f03c6ec 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 24 Aug 2017 05:39:05 +0000
+Fri, 25 Aug 2017 05:39:15 +0000
diff --git a/net-analyzer/nrpe/nrpe-3.2.0-r1.ebuild b/net-analyzer/nrpe/nrpe-3.2.0-r2.ebuild
similarity index 85%
rename from net-analyzer/nrpe/nrpe-3.2.0-r1.ebuild
rename to net-analyzer/nrpe/nrpe-3.2.0-r2.ebuild
index 08d233c3de60..ca614e36b646 100644
--- a/net-analyzer/nrpe/nrpe-3.2.0-r1.ebuild
+++ b/net-analyzer/nrpe/nrpe-3.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="selinux ssl"
+IUSE="command-args selinux ssl"
DEPEND="sys-apps/tcp-wrappers
ssl? ( dev-libs/openssl:0 )"
@@ -32,6 +32,7 @@ src_configure() {
--with-nrpe-user=nagios \
--with-nrpe-group=nagios \
--with-piddir=/run \
+ $(use_enable command-args) \
$(use_enable ssl)
}
@@ -61,4 +62,12 @@ pkg_postinst(){
elog 'Some users have reported incompatibilities between nrpe-2.x and'
elog 'nrpe-3.x. We recommend that you use the same major version for'
elog 'both your server and clients.'
+
+ if use command-args ; then
+ ewarn ''
+ ewarn 'You have enabled command-args for NRPE. That lets clients'
+ ewarn 'supply arguments to the commands that are run, and IS A'
+ ewarn 'SECURITY RISK!'
+ ewarn''
+ fi
}
diff --git a/net-analyzer/yersinia/Manifest b/net-analyzer/yersinia/Manifest
index d1a86e20572a..ee8e8e0fff45 100644
--- a/net-analyzer/yersinia/Manifest
+++ b/net-analyzer/yersinia/Manifest
@@ -1 +1,2 @@
DIST yersinia-0.7.3.tar.gz 378124 SHA256 042abc466c5b470b97079e0049b4029a8cbb75d583cfbfb756fca76e460d40b4 SHA512 60a1b58e6d76448e9332656645b468a6aa66afa0f45ea4b70a929651194a294b9b559bbe5fbacaeb475126e7ac248cd97c29f3177e5080286b2f551f1400d339 WHIRLPOOL bf554765fb4d8a5a2c4bef78841c58c8712cd3b44c3d325e0b92b51ff4ff629a377ce78471df45d1307341ff9fd3099945d5359a86df47aebafeca7b447a2c8b
+DIST yersinia-0.8.2.tar.gz 387889 SHA256 964f528dbffd904376ab7986e69b1e8639591c929e2f39186ac9ebf2d3bc761f SHA512 2c7c89f19b6791150c472a6066b6ffaf9ac5b3d1a3d2e6a27f91293bba9a0f72d147266731e5e2670e4bf7e67ccf04b6e353071ca42d3d281b25126c9bfcb1dd WHIRLPOOL 4c2d075fadebb3e6da9751f0d502dcbdbba997a48ed9616b56fc34a5fd2ea7a41aa9ef293cc88316963344254e72650188568c337535c3129d6445a716e24678
diff --git a/net-analyzer/yersinia/yersinia-0.8.2.ebuild b/net-analyzer/yersinia/yersinia-0.8.2.ebuild
new file mode 100644
index 000000000000..4ec918539c0f
--- /dev/null
+++ b/net-analyzer/yersinia/yersinia-0.8.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A framework for layer 2 attacks"
+HOMEPAGE="http://www.yersinia.net/"
+SRC_URI="https://github.com/tomac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk ncurses"
+
+RDEPEND="
+ ncurses? ( >=sys-libs/ncurses-5.5:= )
+ gtk? (
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf
+ =x11-libs/gtk+-2*
+ )
+ >=net-libs/libnet-1.1.2
+ >=net-libs/libpcap-0.9.4
+"
+DEPEND="
+ virtual/pkgconfig
+ ${RDEPEND}
+"
+DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch
+ "${FILESDIR}"/${PN}-0.7.3-tinfo.patch
+)
+
+src_prepare() {
+ default
+
+ if ! use gtk; then
+ #bug #514802
+ sed -i -e '/AM_GLIB_GNU_GETTEXT/d' configure.in || die
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-admin \
+ --with-pcap-includes=/usr/include \
+ $(use_with ncurses) \
+ $(use_enable gtk)
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}"
+}
diff --git a/net-firewall/ipset/ipset-6.15.ebuild b/net-firewall/ipset/ipset-6.15.ebuild
index fc774b259435..fda7f2ff30db 100644
--- a/net-firewall/ipset/ipset-6.15.ebuild
+++ b/net-firewall/ipset/ipset-6.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
DOCS=( ChangeLog INSTALL README UPGRADE )
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
BUILD_TARGETS="modules"
diff --git a/net-firewall/ipset/ipset-6.16.1.ebuild b/net-firewall/ipset/ipset-6.16.1.ebuild
index 75525521716f..735cbce7981a 100644
--- a/net-firewall/ipset/ipset-6.16.1.ebuild
+++ b/net-firewall/ipset/ipset-6.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
DOCS=( ChangeLog INSTALL README UPGRADE )
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
BUILD_TARGETS="modules"
diff --git a/net-firewall/ipset/ipset-6.16.ebuild b/net-firewall/ipset/ipset-6.16.ebuild
index 75525521716f..735cbce7981a 100644
--- a/net-firewall/ipset/ipset-6.16.ebuild
+++ b/net-firewall/ipset/ipset-6.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
DOCS=( ChangeLog INSTALL README UPGRADE )
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
BUILD_TARGETS="modules"
diff --git a/net-firewall/ipset/ipset-6.17.ebuild b/net-firewall/ipset/ipset-6.17.ebuild
index ef6cc77f1515..e841595369ff 100644
--- a/net-firewall/ipset/ipset-6.17.ebuild
+++ b/net-firewall/ipset/ipset-6.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
DOCS=( ChangeLog INSTALL README UPGRADE )
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
BUILD_TARGETS="modules"
diff --git a/net-firewall/ipset/ipset-6.19.ebuild b/net-firewall/ipset/ipset-6.19.ebuild
index 75525521716f..735cbce7981a 100644
--- a/net-firewall/ipset/ipset-6.19.ebuild
+++ b/net-firewall/ipset/ipset-6.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
DOCS=( ChangeLog INSTALL README UPGRADE )
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
BUILD_TARGETS="modules"
diff --git a/net-firewall/ipset/ipset-6.20.1.ebuild b/net-firewall/ipset/ipset-6.20.1.ebuild
index 87ee185a7cc2..6bd830949e02 100644
--- a/net-firewall/ipset/ipset-6.20.1.ebuild
+++ b/net-firewall/ipset/ipset-6.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
DOCS=( ChangeLog INSTALL README UPGRADE )
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
BUILD_TARGETS="modules"
diff --git a/net-firewall/ipset/ipset-6.21.1.ebuild b/net-firewall/ipset/ipset-6.21.1.ebuild
index d88a56d899d4..70888cbc868d 100644
--- a/net-firewall/ipset/ipset-6.21.1.ebuild
+++ b/net-firewall/ipset/ipset-6.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
DOCS=( ChangeLog INSTALL README UPGRADE )
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
BUILD_TARGETS="modules"
diff --git a/net-firewall/ipset/ipset-6.24.ebuild b/net-firewall/ipset/ipset-6.24.ebuild
index 38cbe667b2cb..0795c0f13b41 100644
--- a/net-firewall/ipset/ipset-6.24.ebuild
+++ b/net-firewall/ipset/ipset-6.24.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="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
DOCS=( ChangeLog INSTALL README UPGRADE )
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
BUILD_TARGETS="modules"
diff --git a/net-firewall/ipset/ipset-6.29.ebuild b/net-firewall/ipset/ipset-6.29.ebuild
index eb12c9f4d615..bdac66a1547a 100644
--- a/net-firewall/ipset/ipset-6.29.ebuild
+++ b/net-firewall/ipset/ipset-6.29.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="5"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
DOCS=( ChangeLog INSTALL README UPGRADE )
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
BUILD_TARGETS="modules"
diff --git a/net-firewall/ipset/ipset-6.30.ebuild b/net-firewall/ipset/ipset-6.30.ebuild
index 5c1428b1fc6c..292b40eb05d7 100644
--- a/net-firewall/ipset/ipset-6.30.ebuild
+++ b/net-firewall/ipset/ipset-6.30.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"
@@ -19,7 +19,7 @@ DEPEND="${RDEPEND}"
DOCS=( ChangeLog INSTALL README UPGRADE )
-# configurable from outside, e.g. /etc/make.conf
+# configurable from outside, e.g. /etc/portage/make.conf
IP_NF_SET_MAX=${IP_NF_SET_MAX:-256}
BUILD_TARGETS="modules"
diff --git a/net-fs/btfs/Manifest b/net-fs/btfs/Manifest
index 59f3c885b233..76ad73cdce87 100644
--- a/net-fs/btfs/Manifest
+++ b/net-fs/btfs/Manifest
@@ -1,2 +1,3 @@
DIST btfs-2.13.tar.gz 21887 SHA256 494c3e16261e3c7535efa86493e09270dde29cd7121e97c29d226c239cbeabd6 SHA512 847ed68b9effab92da87a94fdefe1ac6953d97069707fc1b61276f3e341b13fedf22a4131bf8273562866877976a2e7a389e30e722ca67f16165193793d47636 WHIRLPOOL 63abb124462660bf14d6fdbf16744cb0e8617bdde72e63ac4d418641f6d236ac27fb75b9c7f883c88fae64cd47e1850690d27a012f1e943af27dd2cb7b99b1c9
DIST btfs-2.15.tar.gz 22832 SHA256 7cb562504cb4a45db64f4524d55d080c84514c3cff46838ad1c1807785edc692 SHA512 c95ce2161d5493a3145b5381af83f4c1990f6036a554c5571efdb490d6bac217163b52369cce0c50885eaad0a0a8139e798d25eb55722438535c0241546e50fc WHIRLPOOL 7ba09585939dfeb14bd3272624613c780f0bd813f3a3642aef59c28585ea8f9abfc34569540ef03f9b2a29c06a039bf9975e6877014e91c13426e4a319d828bf
+DIST btfs-2.16.tar.gz 24004 SHA256 673013ba648285f380848ae2e2f8a06800f781a0680582c0d550cc0c563cc08b SHA512 c073b24dc1cd595db32f80732156ba904683289106557e3df47fa46328c55ffd7a92153946381bb0a06abe2eef96d6690608712852516ca54164ca058451b517 WHIRLPOOL e9c3d35008239e9e5936b89c2b6bdb14ed84e17b6f837b8947b04097ae05f0e8d0f6479756f687e566516564f2093ec0ed8d35c4248f44026b1576c51f2fef89
diff --git a/net-fs/btfs/btfs-2.16.ebuild b/net-fs/btfs/btfs-2.16.ebuild
new file mode 100644
index 000000000000..62a37b110eb3
--- /dev/null
+++ b/net-fs/btfs/btfs-2.16.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools python-r1
+
+DESCRIPTION="a bittorrent filesystem based on FUSE"
+HOMEPAGE="https://github.com/johang/btfs"
+SRC_URI="https://github.com/johang/btfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND=">=sys-fs/fuse-2.8.0
+ >=net-misc/curl-7.22.0
+ dev-libs/boost:=
+ >=net-libs/libtorrent-rasterbar-0.16.0:="
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ ${PYTHON_DEPS}"
+
+src_prepare() {
+ default
+
+ # don't install btplay via make
+ sed -i '/^SUBDIRS =/s/scripts//' Makefile.am || die
+
+ eautoreconf
+}
+
+src_install() {
+ default
+ python_foreach_impl python_doscript scripts/btplay
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 54da080958ed..5cbaff0221ea 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -6,6 +6,6 @@ DIST samba-4.6.0-disable-python-patches.tar.xz 7544 SHA256 508adeea65604ef8f4da0
DIST samba-4.6.6.tar.gz 21120791 SHA256 fc31c809f7d85ae30f2b7dcddcb8404201b626047458cb5f2b743d4f6f3f1a8e SHA512 e06bdc83f44c449212f2e45a902e2ca547505a75e970166259b91d2093fb442cdfd456e724d0e842b674b4b8d5bdbe9072996d768c08ebd979a44b2494a59799 WHIRLPOOL eee4bc7e6d5a102b4ab7146354afd7501bc4ad6a3af1aa63ffecf7eb54dc04f113248048157ca9e8c9cd3c21a0931b0fae1d8dc7232e29a92ebbf5d6cccd4c55
DIST samba-4.6.7-disable-python-patches.tar.xz 8896 SHA256 33702adba80e9886625fda8cba46d4017ae603f5d9cf9d3dc78e5ef30ff6f5eb SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb WHIRLPOOL 1cb176480b8583369e1085c8e122958112c0d13aa8ba78cd57dfd04b17c7d8f0a0664a43d277deba86775f1944eab052f4fb9459f64506215ae25184c86cbe40
DIST samba-4.6.7.tar.gz 21137329 SHA256 9ef24393de08390f236cabccd6a420b5cea304e959cbf1a99ff317325db3ddfa SHA512 394c28204bae4134e6a9d2e5b8f087a425dc4ac4ceecd8b29315acff1a92349d40ef0b6a9cc34f5ad18ff5ec9979199837c87f687858cb4e6687968284303aa5 WHIRLPOOL 14282c4a88a22f932099ef47dc50f57c5fef87d6909d529d3eb837b6e958f490a5fd64ce1a5dfdd36eab5ac82b41583736953be2be279f70f0491c61fd1d0d92
-DIST samba-4.7.0rc3.tar.gz 16789893 SHA256 b162e861889d92024a9083a5ef63d22a06f5065c3d48ee8f5e103f886428b89e SHA512 f943f41e45bda040e8b7e4c4ed170fcad10694d46a530ff4d3e049f3b7d9566ffd92dfb7654df9a9ad2ba65e813dc2a186624a241f6b1d774108c7541009bded WHIRLPOOL 9bea73b5f6db8f3d453b24c0dfebb5396b28efc811f3dfe54ca8914764624be61f7f6fdcb9f8b0d3c8463fc7a39cb6e6eadefa08e900db8f025c63ae38705fde
+DIST samba-4.7.0rc4.tar.gz 16798872 SHA256 21ce59c08d10b4d721d02883bfbce54fbced12c89ed0bbd2373ff2ee13e9b4d4 SHA512 147849eca582ada987ea21810288ffd6dfaacb01d519a7f9599a9d9ff4c184fb6653b822136418a96cd9a46373b7ef902efe8ee532cd6c8a2ee24530e2674d79 WHIRLPOOL 54984e0d9e76be63a774b4fd679d74ee8f1b5a820a92ffa1acf6c8101114dddaeae75402ee947d17ced28d9cce3807cdf799e8afdc967b21b986c652c52e4ecb
DIST samba-disable-python-patches-4.2.12.tar.xz 6052 SHA256 8903eacbabdfaf7b64cbde03d7c367d1efdc92e54090f0f4b9ed5d2a462b1c18 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 WHIRLPOOL ad63db55d5dc96f56e6c9b30c2092e2f6e206b0ed5d13c249879d10753c8db2f475c5d4e651e2fc042ad992b648d3b4465f1b28c6b4bbf821cf503d27f741f7e
DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 SHA256 fa0d776e04e3222c0dc4761e376717f4154937cdcb85f4117b8978dfb770a78e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927 WHIRLPOOL 6d55710895435ad012e23f8c252e5276966241014710349ca7fa9cf037e8742030b8e053f7cb71309a0a45f48d2235d55393243bf4d19476a22dd39bb1b7748d
diff --git a/net-fs/samba/samba-4.5.10.ebuild b/net-fs/samba/samba-4.5.10-r1.ebuild
similarity index 100%
rename from net-fs/samba/samba-4.5.10.ebuild
rename to net-fs/samba/samba-4.5.10-r1.ebuild
diff --git a/net-fs/samba/samba-4.5.12.ebuild b/net-fs/samba/samba-4.5.12-r1.ebuild
similarity index 100%
rename from net-fs/samba/samba-4.5.12.ebuild
rename to net-fs/samba/samba-4.5.12-r1.ebuild
diff --git a/net-fs/samba/samba-4.7.0_rc3.ebuild b/net-fs/samba/samba-4.7.0_rc4.ebuild
similarity index 100%
rename from net-fs/samba/samba-4.7.0_rc3.ebuild
rename to net-fs/samba/samba-4.7.0_rc4.ebuild
diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml
index f8a86aedae41..e9e734ab02f9 100644
--- a/net-libs/libssh2/metadata.xml
+++ b/net-libs/libssh2/metadata.xml
@@ -4,6 +4,10 @@
netmon@gentoo.org
+
+ mgorny@gentoo.org
+ Michał Górny
+
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r1.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r1.ebuild
new file mode 100644
index 000000000000..891d142b26f3
--- /dev/null
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A log analyzer for amavisd-new"
+HOMEPAGE="http://logreporters.sourceforge.net/"
+SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+PATCHES=(
+ "${FILESDIR}/unescaped-left-brace.patch"
+ "${FILESDIR}/redundant-argument-to-sprintf.patch"
+ "${FILESDIR}/ignore-amavis-startup-notifications.patch"
+ "${FILESDIR}/ignore-utf8smtp-lines.patch"
+)
+
+src_prepare() {
+ default
+ # Replace the default config file location with ours.
+ local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+ local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+ sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+ || die 'failed to update the default config location'
+}
+
+src_compile() {
+ # The default make target just outputs instructions. We don't want
+ # the user to see these, so we avoid the default emake.
+ :
+}
+
+src_install() {
+ dodoc Bugs Changes README
+ doman ${PN}.1
+ dobin ${PN}
+ insinto /etc
+ doins ${PN}.conf
+}
diff --git a/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch b/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch
new file mode 100644
index 000000000000..4dd019186e41
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/ignore-amavis-startup-notifications.patch
@@ -0,0 +1,31 @@
+From 15bf4096ea496a28210e2f4c1f34ab28b413566a Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Thu, 24 Aug 2017 08:52:18 -0400
+Subject: [PATCH 3/4] Ignore amavisd-new "starting child processes"
+ notifications.
+
+Newer versions of amavisd-new log the following constantly:
+
+ sd_notify (no socket): STATUS=Starting child process(es), ready for work.
+
+It's of no use to us, so add it to the global "ignore" list.
+---
+ amavis-logwatch | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index 1aab787..06b60c8 100644
+--- a/amavis-logwatch
++++ b/amavis-logwatch
+@@ -2044,6 +2044,8 @@ sub create_ignore_list() {
+ # unanchored
+ push @ignore_list_final, qr/\bRUSAGE\b/;
+ push @ignore_list_final, qr/: Sending .* to UNIX socket/;
++
++ push @ignore_list_final, qr/sd_notify \(no socket\): STATUS=Starting child process\(es\), ready for work./
+ }
+
+ # Notes:
+--
+2.13.0
+
diff --git a/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch b/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch
new file mode 100644
index 000000000000..83fd4cb80a42
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/ignore-utf8smtp-lines.patch
@@ -0,0 +1,32 @@
+From a8dac25fe398e42abdb89b85b1435d52386827b4 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Thu, 24 Aug 2017 09:05:04 -0400
+Subject: [PATCH 4/4] Ignore UTF8SMTP lines.
+
+Lines that look like,
+
+ UTF8SMTP :10024 /var/...: ->
+ BODY=8BITMIME SMTPUTF8 Received: from mx.example.com ([127.0.0.1]) by...
+
+were previously unmatched because of the relatively-new "UTF8SMTP".
+Similar lines that have "ESMTP" instead of "UTF8SMTP" are already
+ignored, so it makes sense to ignore the "UTF8SMTP" lines too.
+---
+ amavis-logwatch | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index 06b60c8..deb9146 100644
+--- a/amavis-logwatch
++++ b/amavis-logwatch
+@@ -2132,6 +2132,7 @@ while (<>) {
+ or ($p1 =~ /^SpamControl/)
+ or ($p1 =~ /^Perl/)
+ or ($p1 =~ /^ESMTP/)
++ or ($p1 =~ /^UTF8SMTP/)
+ or ($p1 =~ /^(?:\(!+\))?(\S+ )?(?:FWD|SEND) from /) # log level 4
+ or ($p1 =~ /^(?:\(!+\))?(\S+ )?(?:ESMTP|FWD|SEND) via /) # log level 4
+ or ($p1 =~ /^tempdir being removed/)
+--
+2.13.0
+
diff --git a/net-mail/amavis-logwatch/files/redundant-argument-to-sprintf.patch b/net-mail/amavis-logwatch/files/redundant-argument-to-sprintf.patch
new file mode 100644
index 000000000000..91f456afdd11
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/redundant-argument-to-sprintf.patch
@@ -0,0 +1,48 @@
+From 02cf771776d2f1ad9d7872f3959e41a548adfab9 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Thu, 24 Aug 2017 08:20:59 -0400
+Subject: [PATCH 2/4] Fix redundant argument to sprintf warning.
+
+Perl 5.22 now warns about redundant (i.e. extra) arguments to the
+sprintf function. If your format string only has two place-holders but
+you pass three place-fillers, you get warned:
+
+ Redundant argument in sprintf at ./amavis-logwatch line 1338...
+
+The issue there was that the format string passed to sprintf was
+constructed dynamically; sometimes it would contain two place-holders,
+and sometimes three. Three place-fillers were always passed, so when
+only two place-holders were used, the warning would be thrown. This was
+fixed by testing whether or not there are two or three place-holders,
+and passing the appropriate number of place-fillers.
+---
+ amavis-logwatch | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index 8972497..1aab787 100644
+--- a/amavis-logwatch
++++ b/amavis-logwatch
+@@ -1334,8 +1334,17 @@ sub print_summary_report (\@) {
+ $$divisor == $Totals{$keyname} ? 100.00 : $Totals{$keyname} * 100 / $$divisor;
+ }
+ else {
+- push @{$lines[$cur_level]},
+- sprintf "$fmt %-23s $extra\n", $total, $desc, commify ($Totals{$keyname});
++ my $new_line;
++ if ($extra eq '') {
++ $new_line = sprintf("$fmt %-23s \n", $total, $desc);
++ }
++ else {
++ $new_line = sprintf("$fmt %-23s $extra\n",
++ $total,
++ $desc,
++ commify ($Totals{$keyname}));
++ }
++ push @{$lines[$cur_level]}, $new_line
+ }
+ }
+ }
+--
+2.13.0
+
diff --git a/net-mail/amavis-logwatch/files/unescaped-left-brace.patch b/net-mail/amavis-logwatch/files/unescaped-left-brace.patch
new file mode 100644
index 000000000000..2cb293b89e8b
--- /dev/null
+++ b/net-mail/amavis-logwatch/files/unescaped-left-brace.patch
@@ -0,0 +1,38 @@
+From 79f37650aa72fe3feeed682ee2b79686ee2b6547 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Thu, 24 Aug 2017 08:16:05 -0400
+Subject: [PATCH 1/4] Fix unescaped left brace warning in monster regex.
+
+New versions of Perl are starting to complain about unescaped braces
+in regular expressions, and supposedly the warning will become a fatal
+error in Perl 5.30. This particular warning is,
+
+ Unescaped left brace in regex is deprecated, passed through in regex;
+ marked by <-- HERE in m/^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)
+ |BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?:
+ { <-- HERE [^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]),
+ (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/ at
+ /usr/bin/amavis-logwatch line 2286.
+
+and it was fixed by going to line 2286 and putting a backslash before
+the left brace.
+---
+ amavis-logwatch | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/amavis-logwatch b/amavis-logwatch
+index 4ad07f6..8972497 100644
+--- a/amavis-logwatch
++++ b/amavis-logwatch
+@@ -2283,7 +2283,7 @@ while (<>) {
+ #XXX elsif (($action, $key, $ip, $from, $to) = ( $p1 =~ /^(?:Virus found - quarantined|(?:(Passed|Blocked) )?INFECTED) \(([^\)]+)\),[A-Z .]*(?: \[($re_IP)\])?(?: \[$re_IP\])* [<(]([^>)]*)[>)] -> [(<]([^(<]+)[(>]/o ))
+
+ # the first IP is the envelope sender.
+- if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: {[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) {
++ if ($p1 !~ /^(CLEAN|SPAM(?:MY)?|INFECTED \(.*?\)|BANNED \(.*?\)|BAD-HEADER(?:-\d)?|UNCHECKED|MTA-BLOCKED|OVERSIZED|OTHER|TEMPFAIL)(?: \{[^}]+})?, ([^[]+ )?(?:([^<]+) )?[<(](.*?)[>)] -> ([(<].*?[)>]), (?:.*Hits: ([-+.\d]+))(?:.* size: (\d+))?(?:.* autolearn=(\w+))?/) {
+ inc_unmatched('passblock');
+ next;
+ }
+--
+2.13.0
+
diff --git a/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch b/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch
new file mode 100644
index 000000000000..ee0e79bd41d9
--- /dev/null
+++ b/net-mail/postfix-logwatch/files/redundant-argument-to-sprintf.patch
@@ -0,0 +1,48 @@
+From 6afb8e258a5a2a0e7c72c4c25927dde9d1e2ad89 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Thu, 24 Aug 2017 07:34:36 -0400
+Subject: [PATCH 2/2] Fix redundant argument to sprintf warning.
+
+Perl 5.22 now warns about redundant (i.e. extra) arguments to the
+sprintf function. If your format string only has two place-holders but
+you pass three place-fillers, you get warned:
+
+ Redundant argument in sprintf at ./postfix-logwatch line 1382...
+
+The issue there was that the format string passed to sprintf was
+constructed dynamically; sometimes it would contain two place-holders,
+and sometimes three. Three place-fillers were always passed, so when
+only two place-holders were used, the warning would be thrown. This was
+fixed by testing whether or not there are two or three place-holders,
+and passing the appropriate number of place-fillers.
+---
+ postfix-logwatch | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/postfix-logwatch b/postfix-logwatch
+index 1e58a95..92ed621 100644
+--- a/postfix-logwatch
++++ b/postfix-logwatch
+@@ -1378,8 +1378,17 @@ sub print_summary_report (\@) {
+ $$divisor == $Totals{$keyname} ? 100.00 : $Totals{$keyname} * 100 / $$divisor;
+ }
+ else {
+- push @{$lines[$cur_level]},
+- sprintf "$fmt %-23s $extra\n", $total, $desc, commify ($Totals{$keyname});
++ my $new_line;
++ if ($extra eq '') {
++ $new_line = sprintf("$fmt %-23s \n", $total, $desc);
++ }
++ else {
++ $new_line = sprintf("$fmt %-23s $extra\n",
++ $total,
++ $desc,
++ commify ($Totals{$keyname}));
++ }
++ push @{$lines[$cur_level]}, $new_line
+ }
+ }
+ }
+--
+2.13.0
+
diff --git a/net-mail/postfix-logwatch/files/unescaped-left-brace.patch b/net-mail/postfix-logwatch/files/unescaped-left-brace.patch
new file mode 100644
index 000000000000..65139a3aff14
--- /dev/null
+++ b/net-mail/postfix-logwatch/files/unescaped-left-brace.patch
@@ -0,0 +1,37 @@
+From 84f9fb47783e63757f27e5990ee606ff01e079a9 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Thu, 24 Aug 2017 07:09:28 -0400
+Subject: [PATCH 1/2] Fix unescaped left brace warning for "Config: {".
+
+New versions of Perl are starting to complain about unescaped braces
+in regular expressions, and supposedly the warning will become a fatal
+error in Perl 5.30. This particular warning is,
+
+ Unescaped left brace in regex is deprecated, passed through in regex;
+ marked by <-- HERE in m/^Config: { <-- HERE / at ./postfix-logwatch
+ line 1850.
+
+and it was fixed by going to line 1850 and putting a backslash before
+the left brace.
+
+Bug: https://sourceforge.net/p/logreporters/bugs/4/
+---
+ postfix-logwatch | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/postfix-logwatch b/postfix-logwatch
+index 3e4a673..1e58a95 100644
+--- a/postfix-logwatch
++++ b/postfix-logwatch
+@@ -1847,7 +1847,7 @@ sub postfix_policy_spf($) {
+ # KeyboardInterrupt
+ $line =~ /^Read line: "/ or
+ $line =~ /^Found the end of entry$/ or
+- $line =~ /^Config: {/ or
++ $line =~ /^Config: \{/ or
+ $line =~ /^spfcheck: pyspf result/ or
+ $line =~ /^Starting$/ or
+ $line =~ /^Normal exit$/ or
+--
+2.13.0
+
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r1.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r1.ebuild
new file mode 100644
index 000000000000..170469880538
--- /dev/null
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A log analyzer for postfix"
+HOMEPAGE="http://logreporters.sourceforge.net/"
+SRC_URI="mirror://sourceforge/logreporters/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+PATCHES=(
+ "${FILESDIR}/unescaped-left-brace.patch"
+ "${FILESDIR}/redundant-argument-to-sprintf.patch"
+)
+
+src_prepare() {
+ default
+ # Replace the default config file location with ours.
+ local cfg_default='/usr/local/etc/${progname_prefix}-logwatch.conf'
+ local cfg_gentoo='/etc/${progname_prefix}-logwatch.conf';
+ sed -i "s~${cfg_default}~${cfg_gentoo}~" ${PN} \
+ || die 'failed to update the default config location'
+}
+
+src_compile() {
+ # The default make target just outputs instructions. We don't want
+ # the user to see these, so we avoid the default emake.
+ :
+}
+
+src_install() {
+ dodoc Bugs Changes README ${PN}.conf-topn
+ doman ${PN}.1
+ dobin ${PN}
+ insinto /etc
+ doins ${PN}.conf
+}
diff --git a/net-misc/openvswitch/files/CVE-2017-9214.patch b/net-misc/openvswitch/files/CVE-2017-9214.patch
deleted file mode 100644
index 33686df3acfa..000000000000
--- a/net-misc/openvswitch/files/CVE-2017-9214.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix buffer overrread in ofputil_pull_queue_get_config_reply10()
-
-msg->size isn't the relevant measurement here because we're only supposed
-to read 'len' bytes. Reading more than that causes 'len' to underflow to a
-large number at the end of the loop.
-
-Reported-by: Bhargava Shastry
-Signed-off-by: Ben Pfaff
----
- lib/ofp-util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/ofp-util.c b/lib/ofp-util.c
-index bdf89b6c3017..f05ca398c13e 100644
---- a/lib/ofp-util.c
-+++ b/lib/ofp-util.c
-@@ -2610,7 +2610,7 @@ ofputil_pull_queue_get_config_reply10(struct ofpbuf *msg,
-
- hdr = ofpbuf_at_assert(msg, 0, sizeof *hdr);
- prop_len = ntohs(hdr->len);
-- if (prop_len < sizeof *hdr || prop_len > msg->size || prop_len % 8) {
-+ if (prop_len < sizeof *hdr || prop_len > len || prop_len % 8) {
- return OFPERR_OFPBRC_BAD_LEN;
- }
-
---
-2.10.2
diff --git a/net-misc/openvswitch/files/atomic-test.patch b/net-misc/openvswitch/files/atomic-test.patch
deleted file mode 100644
index 14de564de9cb..000000000000
--- a/net-misc/openvswitch/files/atomic-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Link atomic test with -latomic for powerpc.
-Author: Adam Conrad
-
---- openvswitch-2.0.0.orig/tests/automake.mk
-+++ openvswitch-2.0.0/tests/automake.mk
-@@ -181,7 +181,7 @@ tests_test_aes128_LDADD = lib/libopenvsw
-
- noinst_PROGRAMS += tests/test-atomic
- tests_test_atomic_SOURCES = tests/test-atomic.c
--tests_test_atomic_LDADD = lib/libopenvswitch.a $(SSL_LIBS)
-+tests_test_atomic_LDADD = lib/libopenvswitch.a $(SSL_LIBS) -latomic
-
- noinst_PROGRAMS += tests/test-bundle
- tests_test_bundle_SOURCES = tests/test-bundle.c
diff --git a/net-misc/openvswitch/files/configure.patch b/net-misc/openvswitch/files/configure.patch
deleted file mode 100644
index 47f5614d8eda..000000000000
--- a/net-misc/openvswitch/files/configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.orig 2014-01-27 21:55:14.116272645 +0200
-+++ configure 2014-01-27 21:55:40.687273108 +0200
-@@ -7949,10 +7949,10 @@
- $as_echo "$kversion" >&6; }
-
- if test "$version" -ge 3; then
-- if test "$version" = 3 && test "$patchlevel" -le 10; then
-+ if test "$version" = 3 && test "$patchlevel" -le 12; then
- : # Linux 3.x
- else
-- as_fn_error $? "Linux kernel in $KBUILD is version $kversion, but version newer than 3.10.x is not supported" "$LINENO" 5
-+ as_fn_error $? "Linux kernel in $KBUILD is version $kversion, but version newer than 3.12.x is not supported" "$LINENO" 5
- fi
- else
- if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then
diff --git a/net-misc/openvswitch/files/doc-fix.patch b/net-misc/openvswitch/files/doc-fix.patch
deleted file mode 100644
index 1d6df01147ef..000000000000
--- a/net-misc/openvswitch/files/doc-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-We might want to backport this if there are any releases with the Sphinx
-docs present.
----
- Documentation/conf.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/Documentation/conf.py b/Documentation/conf.py
-index 49514ec..97f402e 100644
---- a/Documentation/conf.py
-+++ b/Documentation/conf.py
-@@ -145,8 +145,6 @@ linkcheck_anchors = False
- #
- if use_ovs_theme:
- html_theme = 'ovs'
--else:
-- html_theme = 'default'
diff --git a/net-misc/openvswitch/files/kernel-3.11-support.patch b/net-misc/openvswitch/files/kernel-3.11-support.patch
deleted file mode 100644
index 7ee53d83500f..000000000000
--- a/net-misc/openvswitch/files/kernel-3.11-support.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -134,10 +134,10 @@ AC_DEFUN([OVS_CHECK_LINUX], [
- AC_MSG_RESULT([$kversion])
-
- if test "$version" -ge 3; then
-- if test "$version" = 3 && test "$patchlevel" -le 10; then
-+ if test "$version" = 3 && test "$patchlevel" -le 11; then
- : # Linux 3.x
- else
-- AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.10.x is not supported])
-+ AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.11.x is not supported])
- fi
- else
- if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then
---- a/datapath/dp_notify.c
-+++ b/datapath/dp_notify.c
-@@ -79,7 +79,7 @@ static int dp_device_event(struct notifi
- void *ptr)
- {
- struct ovs_net *ovs_net;
-- struct net_device *dev = ptr;
-+ struct net_device *dev = netdev_notifier_info_to_dev(ptr);
- struct vport *vport = NULL;
-
- if (!ovs_is_internal_dev(dev))
---- a/datapath/linux/compat/include/linux/netdevice.h
-+++ b/datapath/linux/compat/include/linux/netdevice.h
-@@ -120,4 +120,11 @@ static inline void netdev_upper_dev_unli
- }
- #endif
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
-+static inline struct net_device *netdev_notifier_info_to_dev(void *info)
-+{
-+ return info;
-+}
-+#endif
-+
- #endif
---- a/datapath/linux/compat/include/net/gre.h
-+++ b/datapath/linux/compat/include/net/gre.h
-@@ -74,12 +74,17 @@ static inline __be16 tnl_flags_to_gre_fl
- #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) */
-
- #define MAX_GRE_PROTO_PRIORITY 255
-+#define gre_cisco_protocol rpl_gre_cisco_protocol
-+
- struct gre_cisco_protocol {
- int (*handler)(struct sk_buff *skb, const struct tnl_ptk_info *tpi);
- u8 priority;
- };
-
-+#define gre_cisco_register rpl_gre_cisco_register
- int gre_cisco_register(struct gre_cisco_protocol *proto);
-+
-+#define gre_cisco_unregister rpl_gre_cisco_unregister
- int gre_cisco_unregister(struct gre_cisco_protocol *proto);
-
- #define gre_build_header rpl_gre_build_header
-@@ -89,6 +94,7 @@ void gre_build_header(struct sk_buff *sk
- #define gre_handle_offloads rpl_gre_handle_offloads
- struct sk_buff *gre_handle_offloads(struct sk_buff *skb, bool gre_csum);
-
-+#define ip_gre_calc_hlen rpl_ip_gre_calc_hlen
- static inline int ip_gre_calc_hlen(__be16 o_flags)
- {
- int addend = 4;
diff --git a/net-misc/openvswitch/files/kernel-3.12-support.patch b/net-misc/openvswitch/files/kernel-3.12-support.patch
deleted file mode 100644
index 85f19ecc2ab2..000000000000
--- a/net-misc/openvswitch/files/kernel-3.12-support.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Enable support for 3.12 kernel
-Author: James Page
-Forwarded: no
-
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -134,10 +134,10 @@ AC_DEFUN([OVS_CHECK_LINUX], [
- AC_MSG_RESULT([$kversion])
-
- if test "$version" -ge 3; then
-- if test "$version" = 3 && test "$patchlevel" -le 11; then
-+ if test "$version" = 3 && test "$patchlevel" -le 12; then
- : # Linux 3.x
- else
-- AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.11.x is not supported])
-+ AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.12.x is not supported])
- fi
- else
- if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then
diff --git a/net-misc/openvswitch/files/ovs-controller-r1 b/net-misc/openvswitch/files/ovs-controller-r1
deleted file mode 100644
index b48d29757477..000000000000
--- a/net-misc/openvswitch/files/ovs-controller-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Open vSwitch OpenFlow controller"
-
-command="/usr/bin/ovs-controller"
-command_args="
- --pidfile
- --detach
- --monitor
- ${OPTIONS} ${METHODS}"
-pidfile="/var/run/openvswitch/ovs-controller.pid"
-
-depend() {
- need net
- use logger
-}
-
-start_pre() {
- checkpath -d "/var/run/openvswitch" -m 0750
-}
diff --git a/net-misc/openvswitch/files/ovs-controller.service b/net-misc/openvswitch/files/ovs-controller.service
deleted file mode 100644
index 723c5caa1f6e..000000000000
--- a/net-misc/openvswitch/files/ovs-controller.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Open vSwitch OpenFlow controller
-Requires=network.target
-
-[Service]
-ExecStart=/usr/bin/ovs-controller --monitor ptcp:
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/openvswitch/files/ovs-controller_conf b/net-misc/openvswitch/files/ovs-controller_conf
deleted file mode 100644
index 1756c9b98bc4..000000000000
--- a/net-misc/openvswitch/files/ovs-controller_conf
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# Space separated list of methods to listen for OpenFlow connections from switches
-# The default ist "ptcp:" which starts ovs-controller listening on port 6633 on all interfaces.
-METHODS="ptcp:"
-
-# Additional options
-# OPTIONS=""
diff --git a/net-misc/openvswitch/files/prevent-traceback.patch b/net-misc/openvswitch/files/prevent-traceback.patch
deleted file mode 100644
index 858f24c2f595..000000000000
--- a/net-misc/openvswitch/files/prevent-traceback.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-commit d4d1107c3a49a4dadf6dc8ac55d6fefa25a8e06a
-Author: Alexei Starovoitov
-Date: Wed Oct 16 15:28:23 2013 -0700
-
- cherry-pick 8e04c6e10c28e42c715eb9fef749554c123bddbc
-
-diff --git a/AUTHORS b/AUTHORS
-index 2d29e66..7a62704 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -2,6 +2,8 @@ The following people, in alphabetical order, have either authored or
- signed off on commits in the Open vSwitch version control repository.
-
- Aaron Rosen arosen@clemson.edu
-+Alexandru Copot alex.mihai.c@gmail.com
-+Alexei Starovoitov ast@plumgrid.com
- Alexey I. Froloff raorn@altlinux.org
- Alex Wang alexw@nicira.com
- Andrew Evans aevans@nicira.com
-diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
-index 847f611..a973623 100644
---- a/datapath/dp_notify.c
-+++ b/datapath/dp_notify.c
-@@ -66,8 +66,7 @@ void ovs_dp_notify_wq(struct work_struct *work)
- continue;
-
- netdev_vport = netdev_vport_priv(vport);
-- if (netdev_vport->dev->reg_state == NETREG_UNREGISTERED ||
-- netdev_vport->dev->reg_state == NETREG_UNREGISTERING)
-+ if (!(ovs_netdev_get_vport(netdev_vport->dev)))
- dp_detach_port_notify(vport);
- }
- }
-@@ -89,6 +88,10 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event,
- return NOTIFY_DONE;
-
- if (event == NETDEV_UNREGISTER) {
-+ /* upper_dev_unlink and decrement promisc immediately */
-+ ovs_netdev_detach_dev(vport);
-+
-+ /* schedule vport destroy, dev_put and genl notification */
- ovs_net = net_generic(dev_net(dev), ovs_net_id);
- queue_work(&ovs_net->dp_notify_work);
- }
-diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h
-index 4e2b7f5..908ed86 100644
---- a/datapath/linux/compat/include/linux/netdevice.h
-+++ b/datapath/linux/compat/include/linux/netdevice.h
-@@ -118,6 +118,11 @@ static inline void netdev_upper_dev_unlink(struct net_device *dev,
- struct net_device *upper_dev)
- {
- }
-+
-+static inline struct net_device *netdev_master_upper_dev_get(struct net_device *dev)
-+{
-+ return NULL;
-+}
- #endif
-
- #endif
-diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
-index 215a47e..0c9f603 100644
---- a/datapath/vport-netdev.c
-+++ b/datapath/vport-netdev.c
-@@ -201,16 +201,27 @@ static void free_port_rcu(struct rcu_head *rcu)
- ovs_vport_free(vport_from_priv(netdev_vport));
- }
-
--static void netdev_destroy(struct vport *vport)
-+void ovs_netdev_detach_dev(struct vport *vport)
- {
- struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-
-- netdev_exit();
-- rtnl_lock();
-+ ASSERT_RTNL();
- netdev_vport->dev->priv_flags &= ~IFF_OVS_DATAPATH;
- netdev_rx_handler_unregister(netdev_vport->dev);
-- netdev_upper_dev_unlink(netdev_vport->dev, get_dpdev(vport->dp));
-+ netdev_upper_dev_unlink(netdev_vport->dev,
-+ netdev_master_upper_dev_get(netdev_vport->dev));
- dev_set_promiscuity(netdev_vport->dev, -1);
-+}
-+
-+static void netdev_destroy(struct vport *vport)
-+{
-+ struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-+
-+ netdev_exit();
-+
-+ rtnl_lock();
-+ if (ovs_netdev_get_vport(netdev_vport->dev))
-+ ovs_netdev_detach_dev(vport);
- rtnl_unlock();
-
- call_rcu(&netdev_vport->rcu, free_port_rcu);
-diff --git a/datapath/vport-netdev.h b/datapath/vport-netdev.h
-index dd298b5..8df01c1 100644
---- a/datapath/vport-netdev.h
-+++ b/datapath/vport-netdev.h
-@@ -39,5 +39,6 @@ netdev_vport_priv(const struct vport *vport)
- }
-
- const char *ovs_netdev_get_name(const struct vport *);
-+void ovs_netdev_detach_dev(struct vport *);
-
- #endif /* vport_netdev.h */
diff --git a/net-misc/openvswitch/files/xcp-interface-reconfigure.patch b/net-misc/openvswitch/files/xcp-interface-reconfigure.patch
deleted file mode 100644
index 8f685b8157f5..000000000000
--- a/net-misc/openvswitch/files/xcp-interface-reconfigure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Use xcp-xapi interface-reconfigure if found
- Ubuntu/Debian provide the XCP interface-reconfigure hook in
- a FHS compliant location; use this if found.
-Author: James Page
-Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/openvswitch/+bug/1195053
-Forwarded: no
-
---- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
-+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
-@@ -43,6 +43,10 @@ def delete_cacert():
- def update(session, args):
- # Refresh bridge network UUIDs in case this host joined or left a pool.
- script = "/opt/xensource/libexec/interface-reconfigure"
-+ # NOTE(jamespage): Override with distro xcp xapi locations
-+ # if present
-+ if os.path.exists('/usr/lib/xcp/lib/interface-reconfigure'):
-+ script = '/usr/lib/xcp/lib/interface-reconfigure'
- try:
- retval = subprocess.call([script, "rewrite"])
- if retval != 0:
diff --git a/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild
new file mode 100644
index 000000000000..dfe3a852b32a
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.7.2-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools eutils linux-info linux-mod python-r1 systemd
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="http://openvswitch.org"
+SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ || (
+ >=sys-apps/openrc-0.10.5
+ sys-apps/systemd
+ )
+ ssl? ( dev-libs/openssl:0= )
+ ${PYTHON_DEPS}
+ ~dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
+ || (
+ dev-python/twisted[conch,${PYTHON_USEDEP}]
+ dev-python/twisted-web[${PYTHON_USEDEP}]
+ )
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+ if use modules ; then
+ CONFIG_CHECK+=" ~!OPENVSWITCH"
+ kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+ kernel_is le 4 9 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+ linux-mod_pkg_setup
+ else
+ CONFIG_CHECK+=" ~OPENVSWITCH"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # Never build kernelmodules, doing this manually
+ sed -i \
+ -e '/^SUBDIRS/d' \
+ datapath/Makefile.in || die "sed failed"
+ eautoreconf
+ default
+}
+
+src_configure() {
+ set_arch_to_kernel
+ # monitor is statically enabled for bug 596206
+ use monitor || export ovs_cv_python="no"
+ # pyside is staticly disabled
+ export ovs_cv_pyuic4="no"
+
+ local linux_config
+ use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+ econf ${linux_config} \
+ --with-rundir=/var/run/openvswitch \
+ --with-logdir=/var/log/openvswitch \
+ --with-pkidir=/etc/ssl/openvswitch \
+ --with-dbdir=/var/lib/openvswitch \
+ $(use_enable ssl) \
+ $(use_enable !debug ndebug)
+}
+
+src_compile() {
+ default
+
+ use modules && linux-mod_src_compile
+}
+
+src_install() {
+ default
+
+ local SCRIPT
+ if use monitor; then
+ for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+ sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
+ python_foreach_impl python_doscript utilities/"${SCRIPT}"
+ done
+ rm -r "${ED%/}"/usr/share/openvswitch/python || die
+ fi
+
+ keepdir /var/{lib,log}/openvswitch
+ keepdir /etc/ssl/openvswitch
+ fperms 0750 /etc/ssl/openvswitch
+
+ rm -rf "${ED%/}"/var/run || die
+
+ newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+ newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+ newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+ newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+ systemd_dounit "${FILESDIR}/ovsdb-server.service"
+ systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
+ systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+ insinto /etc/logrotate.d
+ newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+ use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+ use modules && linux-mod_pkg_postinst
+
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 1.9.0 ${pv} ; then
+ ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
+ ewarn " /etc/openvswitch"
+ ewarn "to"
+ ewarn " /var/lib/openvswitch"
+ ewarn "Please copy/move the database manually before running the schema upgrade."
+ ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
+ fi
+ done
+
+ elog "Use the following command to create an initial database for ovsdb-server:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ elog "(will create a database in /var/lib/openvswitch/conf.db)"
+ elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+ local db="${EROOT%/}"/var/lib/openvswitch/conf.db
+ if [[ -e "${db}" ]] ; then
+ einfo "Database '${db}' already exists, doing schema migration..."
+ einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+ ovsdb-tool convert "${db}" \
+ "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+ else
+ einfo "Creating new database '${db}'..."
+ ovsdb-tool create "${db}" \
+ "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+ fi
+}
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 61246a0a501a..1178a6bb1690 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,3 +1,3 @@
DIST whois_5.2.12.tar.xz 80428 SHA256 b26d4027b8987d9911466aa06ce2c167a50017cd59a622a429bd506222f6cdf1 SHA512 df40e2e7cbd11d00984f865e122ad4ece882a6a45e2f75ad5ea24ce937b7e9452b01fd886f43bae55fd065a6556cfc4577e7126151b5fd43fa806c4b0c886ced WHIRLPOOL a2c5a3e9f01dd0cbb127269632c60e6c71c981df4d4e53fdf37e2c1932252f3ae2b13961a1c8606b542fd9997bf9fcb62a6cef592a01dbd04ff18c75e3f9b3ec
-DIST whois_5.2.16.tar.xz 82108 SHA256 e9d208b61ccea96b611e522d30fb753dbefed0d44cfabe346e1928690453fc3a SHA512 08e75edbdab2c094150b92570e04de0fc10d42a18643e404262bef4366338bd67a4f23cef248660a4c2a435825cf5ebcc396c71d5702905ca97746686a5c8f06 WHIRLPOOL 2a8db3a9ac764ee31712b312a6c3408932fb98d98404a50bb6f1f7ca4a59e850a8e9434f8cc7372d1e8769d1d0711f82161027d6146eef0ae33f64e329f8be5c
DIST whois_5.2.17.tar.xz 82360 SHA256 257585678f571e18964667b41dc6543fe9da6123ac95743660c9c3ae1eba9664 SHA512 b65de384ac935518bde0cee42f46f4bf99dc94e94e411b103df8eb73291c317409837adba2a358dfebdae6e1c46d85ccfe8debf86233be64eb91ebfe86a29152 WHIRLPOOL 4ed1eca099fd1c4337e555564b37e604b4115ca520b751531470c5e70ab9013a3e43a3db3318307e04b10d357743bd2495cdf2051c159a3a661c36d29f919af2
+DIST whois_5.2.18.tar.xz 82368 SHA256 c35d0d26aff37107c244a8ad54fd42e497ec0b90f76309e9beb7078b827c97d5 SHA512 dcbfbab0da3b9b5876c7c51bc411ac371a5c33012bf1286a3e6ccfb59fb4fba89eab1c4b812766d2f101a93ca3424ef636214c05add59549b9809621dfb03d73 WHIRLPOOL 780401ba9d6494589eea4273041a9ba6cbb6779cc11be2cdf96b39ea338afd60a5f62b185da78f4bc5da29562601b197bb6d39a71fdb69c1e49a416a34de8606
diff --git a/net-misc/whois/whois-5.2.16.ebuild b/net-misc/whois/whois-5.2.18.ebuild
similarity index 93%
rename from net-misc/whois/whois-5.2.16.ebuild
rename to net-misc/whois/whois-5.2.18.ebuild
index e14820d2eff4..68d961e76601 100644
--- a/net-misc/whois/whois-5.2.16.ebuild
+++ b/net-misc/whois/whois-5.2.18.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs
MY_P=${P/-/_}
DESCRIPTION="improved Whois Client"
@@ -23,9 +23,12 @@ DEPEND="${RDEPEND}
>=dev-lang/perl-5
nls? ( sys-devel/gettext )"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.7.2-config-file.patch
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.7.2-config-file.patch
+)
+src_prepare() {
+ default
if use nls ; then
sed -i -e 's:#\(.*pos\):\1:' Makefile || die
else
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index e4001f5121b6..61b07ffdd333 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
-DIST youtube-dl-2017.08.13.tar.gz 2777317 SHA256 212c4e6a622d4e20ea888d1b1539ab063e171bed2a05c9e00db71ed53ab059dd SHA512 0063f25b5ee1d1ff750f160d8e2f8c26658045bab5a8f6246ebb004bdef3ff7767034e71931e2e7fcb3e08426265bb7f852330f27beb84586ddeb7871e2bf747 WHIRLPOOL 71d16e1b7ca0996acca808ed79e6b3c0d02569dbda9d0b4e3c2322ca7fcf5a826c16d700df13c487cebf920b3c1f1487d30d5997b4302a62b58712682c7c4b3d
DIST youtube-dl-2017.08.18.tar.gz 2779312 SHA256 a7f4279b7b8b54f44025fccc22f3e511cae77314f7d37b73334c981946e4c3d6 SHA512 bf403e2f4b7024346219ce01b229ab18329e3faf7aadbd0706e7783072815eaf588812ccbed876212d57192533c09ec8aaceb4a497a411672533b436a9f215f5 WHIRLPOOL a262d999ef27f44b4daeda207b35d2f4952aa04f5b965ada8d47a9b2f64d0f887a5d2276a13db297e9d40957c266556db551ed326beddd5239951cd0262dfc12
+DIST youtube-dl-2017.08.23.tar.gz 2783237 SHA256 90c56ce90cd99cefb83607c37b0b641c7e4e1ef37040ad4187425aebcfc800ef SHA512 d4e1407558ed7dc7369ada2eabbd64f0e74b718abc67f7f4aa1eef8f522880a63b943b70b6af4b18df176db72c9e9552f1e36727312944b62b6d3aae3bc11b4e WHIRLPOOL 32620396ae7e7b620e956539a5afd98223dff176ad6306fc291bc4f4bdace5a309b9b5f7afc1ee5c982d5e62c7d93886073d3c5c29629673f0336c8378216fba
diff --git a/net-misc/youtube-dl/youtube-dl-2017.08.13.ebuild b/net-misc/youtube-dl/youtube-dl-2017.08.23.ebuild
similarity index 97%
rename from net-misc/youtube-dl/youtube-dl-2017.08.13.ebuild
rename to net-misc/youtube-dl/youtube-dl-2017.08.23.ebuild
index 57b578450c4e..fa2e8cbf808f 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.08.13.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.08.23.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1 eutils
+inherit bash-completion-r1 distutils-r1
DESCRIPTION="Download videos from YouTube.com (and more sites...)"
HOMEPAGE="https://rg3.github.com/youtube-dl/"
@@ -67,7 +67,7 @@ python_prepare_all() {
|| die
fi
- epatch_user
+ eapply_user
distutils-r1_python_prepare_all
}
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index 003112d16b16..683bc08f1a19 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
-inherit bash-completion-r1 distutils-r1 eutils git-r3
+inherit bash-completion-r1 distutils-r1 git-r3
DESCRIPTION="Download videos from YouTube.com (and more sites...)"
HOMEPAGE="https://rg3.github.com/youtube-dl/"
@@ -66,7 +66,7 @@ python_prepare_all() {
|| die
fi
- epatch_user
+ eapply_user
distutils-r1_python_prepare_all
}
diff --git a/net-news/newsbeuter/files/newsbeuter-2.9-security-fix.patch b/net-news/newsbeuter/files/newsbeuter-2.9-security-fix.patch
new file mode 100644
index 000000000000..5e7b39a5f20f
--- /dev/null
+++ b/net-news/newsbeuter/files/newsbeuter-2.9-security-fix.patch
@@ -0,0 +1,20 @@
+Newsbeuter didn't properly shell-escape the arguments passed to bookmarking
+command, which allows a remote attacker to perform remote code execution by
+crafting an RSS item whose title and/or URL contain something interpretable by
+the shell (most notably subshell invocations.)
+
+--- a/src/controller.cpp
++++ b/src/controller.cpp
+@@ -1275,9 +1275,10 @@ std::string controller::bookmark(const std::string& url, const std::string& titl
+ std::string bookmark_cmd = cfg.get_configvalue("bookmark-cmd");
+ bool is_interactive = cfg.get_configvalue_as_bool("bookmark-interactive");
+ if (bookmark_cmd.length() > 0) {
+- std::string cmdline = utils::strprintf("%s '%s' %s %s",
++ std::string cmdline = utils::strprintf("%s '%s' '%s' '%s'",
+ bookmark_cmd.c_str(), utils::replace_all(url,"'", "%27").c_str(),
+- stfl::quote(title).c_str(), stfl::quote(description).c_str());
++ utils::replace_all(title,"'", "%27").c_str(),
++ utils::replace_all(description,"'", "%27").c_str());
+
+ LOG(LOG_DEBUG, "controller::bookmark: cmd = %s", cmdline.c_str());
+
diff --git a/net-news/newsbeuter/newsbeuter-2.9-r2.ebuild b/net-news/newsbeuter/newsbeuter-2.9-r3.ebuild
similarity index 97%
rename from net-news/newsbeuter/newsbeuter-2.9-r2.ebuild
rename to net-news/newsbeuter/newsbeuter-2.9-r3.ebuild
index ec8a04001bcd..85de96fbfdf1 100644
--- a/net-news/newsbeuter/newsbeuter-2.9-r2.ebuild
+++ b/net-news/newsbeuter/newsbeuter-2.9-r3.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.9-ncurses6.patch
"${FILESDIR}"/${PN}-2.9-fix-mem-leak.patch
"${FILESDIR}"/${PN}-2.9-fix-segfault.patch
+ "${FILESDIR}"/${PN}-2.9-security-fix.patch
)
src_prepare() {
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index d8a8a7e6ebae..ece445bc67d0 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,6 +1,6 @@
DIST cups-filters-1.13.5.tar.xz 1424764 SHA256 35db1c5821c9ff0e0fedcf87b3ae68a424ad951bd8af421a2a1aac5613e17b8d SHA512 1870b16ad64bc46068c8a74be7a112790a6ffc0be0e14cd858d83013b12e1c51efd905fbc4e189a42558814694348a9ef533b6fe504ef7bce3b4da149e0b3ea6 WHIRLPOOL bcf3cf952d531bce5d7092a74dd9db819a13374155bc306eb88fdc2a22e78fa4918c70159f447f8b2b48eda6da713ab85936474fca63f8eb7c2e4318bb2a5386
-DIST cups-filters-1.14.1.tar.xz 1426140 SHA256 f1393731df54ffdd947621c302a66afa17cd3d6c7e107ee05cc77a7d3194e504 SHA512 fcc5ad217fe4c0d2f9377b065fe007589d605f9358ad274881df25176cc9548aa233ee6b6efad544f2b0ea4687b09c4270c5c9ac5014c5bcacc4bd9807b6be4e WHIRLPOOL 1dc45519d22248f5f4710e3692f84168c37cf33aa69d3ab23db8ea6939ffeeade5d0bd6e28674ad7b02017f761b6a691ac1f4515bda829acbbaae0dbfbb5d70d
DIST cups-filters-1.15.0.tar.xz 1433652 SHA256 a3bd793c55636904f8c3756f8fb64866ec4bb533f933250d6e04ebfdfeaad23c SHA512 4a26e8757949ccf71a0be9223a1e6eb4084142efb84bddccc9fb60ce0fbbfb209638338ad7ac0868d937df612828ecc856ecfa1aeb0c8ce8f1ad582d472e6eef WHIRLPOOL 0aac733eac086b3bdf2a306df06de75ddd8cff24fbc9801d50f30137cd0fe95f07b217e70d4a784b0499e8077576ed226e673ccfcbfd33d91f528d2f5c9f9737
-DIST cups-filters-1.16.2.tar.xz 1439880 SHA256 604e5605803889e421b2a30979bc1acb83a48334036725613cb8352085d3d273 SHA512 51af09b6a14eb550b4cfaa2d593b700f8ffd16c084b2a489d846d49c8f045f1ed45572b01d16a982b7293a5acf4372bbf0f2eda1c17a9f7b19870de95f634d9d WHIRLPOOL 7c835312645ca2cef35ec1d215ea57902d514c49887130f6a490e707a20301d2e566a2d2a280ac36fa6f52b0c8c9c6563743827c3eab448e85a2968d8753afb6
DIST cups-filters-1.16.3.tar.xz 1440860 SHA256 96433f53304e752de9ae3e59a9ba3586e28561d005504cb92ca5b6d0f6990189 SHA512 068e0c908a2c6785b97be9507fd73771795cc5ae2bca43a7c62e2f3d3f7e0aca1b1ebe570d9772a1240c23015f6862592fe4f5639785a56d8dfc1576c8d3f8ac WHIRLPOOL 63ab14a9c76cd26ce99538fb800c01343f08a6ea7fc937219e86f21b10282a6a2b0d800731b043194733b0077470853ed9c682910de9c652b35f060181a48df0
+DIST cups-filters-1.16.4.tar.xz 1440964 SHA256 2642c6a3cbf10a38d91f20b7b292583d19acb64e786eb6513b7b45738a2e5aed SHA512 367c2c1d6755800b88f79808ef0c595aa80b080634299d015828bfb8f0e27085aa052c77e3f3f1645833340caca709bec8e00b46070ff4d13b9994fb1400da60 WHIRLPOOL 30f4e70770c60a743ca845e294e1bf79f3efa83e10f01398a0432461d31e59eac6568e6a302425250bd0417963e63b1ef208e35e5ddcf1a1f4125bdd80480324
+DIST cups-filters-1.17.0.tar.xz 1444020 SHA256 e1f13b0b7336903567265716af6493cc1569d1c8bb79177494c22e2065b1ecd5 SHA512 d40a4a8802cfb9323fa6b0d105c1228b8115738048a9f9c6cf027d635a42652bf583b7eaf5bdda768377aadc2aa645db3d3823ee6009d29f2ebd6690e8928061 WHIRLPOOL 29d827c9ef86e587ececb9057375abdb811509f0d402d7d670de35b47b9267c0f5fe2afd9bacfc3ef1eaf12fe1fef9777333996b6cac9a01c21abde795082678
DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7 WHIRLPOOL 4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd
diff --git a/net-print/cups-filters/cups-filters-1.16.2.ebuild b/net-print/cups-filters/cups-filters-1.16.4.ebuild
similarity index 100%
rename from net-print/cups-filters/cups-filters-1.16.2.ebuild
rename to net-print/cups-filters/cups-filters-1.16.4.ebuild
diff --git a/net-print/cups-filters/cups-filters-1.14.1.ebuild b/net-print/cups-filters/cups-filters-1.17.0.ebuild
similarity index 92%
rename from net-print/cups-filters/cups-filters-1.14.1.ebuild
rename to net-print/cups-filters/cups-filters-1.17.0.ebuild
index a6b05ac76fea..acc59f5802cf 100644
--- a/net-print/cups-filters/cups-filters-1.14.1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.17.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
GENTOO_DEPEND_ON_PERL=no
-inherit perl-module systemd
+inherit perl-module systemd flag-o-matic
if [[ "${PV}" == "9999" ]] ; then
inherit bzr autotools
@@ -19,10 +19,9 @@ HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_jo
LICENSE="MIT GPL-2"
SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pdf perl png +postscript static-libs tiff zeroconf"
+IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs tiff zeroconf"
RDEPEND="
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
>=app-text/qpdf-3.0.2:=
dev-libs/glib:2
@@ -37,9 +36,11 @@ RDEPEND="
foomatic? ( !net-print/foomatic-filters )
jpeg? ( virtual/jpeg:0 )
ldap? ( net-nds/openldap )
+ pclm? ( >=app-text/qpdf-7.0_beta1 )
pdf? ( app-text/mupdf )
perl? ( dev-lang/perl:= )
png? ( media-libs/libpng:0= )
+ postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
tiff? ( media-libs/tiff:0 )
zeroconf? ( net-dns/avahi[dbus] )
"
@@ -50,6 +51,9 @@ DEPEND="${RDEPEND}
src_prepare() {
default
[[ "${PV}" == "9999" ]] && eautoreconf
+
+ # Bug #626800
+ append-cxxflags -std=c++11
}
src_configure() {
@@ -67,6 +71,7 @@ src_configure() {
$(use_enable foomatic)
$(use_enable ipp_autosetup auto-setup-driverless)
$(use_enable ldap)
+ $(use_enable pclm)
$(use_enable pdf mutool)
$(use_enable postscript ghostscript)
$(use_enable postscript ijs)
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index a6b05ac76fea..acc59f5802cf 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
GENTOO_DEPEND_ON_PERL=no
-inherit perl-module systemd
+inherit perl-module systemd flag-o-matic
if [[ "${PV}" == "9999" ]] ; then
inherit bzr autotools
@@ -19,10 +19,9 @@ HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_jo
LICENSE="MIT GPL-2"
SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pdf perl png +postscript static-libs tiff zeroconf"
+IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs tiff zeroconf"
RDEPEND="
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
>=app-text/qpdf-3.0.2:=
dev-libs/glib:2
@@ -37,9 +36,11 @@ RDEPEND="
foomatic? ( !net-print/foomatic-filters )
jpeg? ( virtual/jpeg:0 )
ldap? ( net-nds/openldap )
+ pclm? ( >=app-text/qpdf-7.0_beta1 )
pdf? ( app-text/mupdf )
perl? ( dev-lang/perl:= )
png? ( media-libs/libpng:0= )
+ postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
tiff? ( media-libs/tiff:0 )
zeroconf? ( net-dns/avahi[dbus] )
"
@@ -50,6 +51,9 @@ DEPEND="${RDEPEND}
src_prepare() {
default
[[ "${PV}" == "9999" ]] && eautoreconf
+
+ # Bug #626800
+ append-cxxflags -std=c++11
}
src_configure() {
@@ -67,6 +71,7 @@ src_configure() {
$(use_enable foomatic)
$(use_enable ipp_autosetup auto-setup-driverless)
$(use_enable ldap)
+ $(use_enable pclm)
$(use_enable pdf mutool)
$(use_enable postscript ghostscript)
$(use_enable postscript ijs)
diff --git a/net-print/cups-filters/metadata.xml b/net-print/cups-filters/metadata.xml
index 4f089a034186..8c940c947b64 100644
--- a/net-print/cups-filters/metadata.xml
+++ b/net-print/cups-filters/metadata.xml
@@ -12,5 +12,8 @@
Let cups-browsed automatically set up IPP network printers by default.
+
+ Enable PCLm support
+
diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
index 838d5918129c..73c85e8f10e9 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
@@ -44,9 +44,10 @@ PATCHES=(
)
python_check_deps() {
- use test \
- && { has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
- || has_version "dev-python/twisted-words[${PYTHON_USEDEP}]"; }
+ if use test ; then
+ has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
+ || has_version "dev-python/twisted-words[${PYTHON_USEDEP}]"
+ fi
}
src_prepare() {
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
index f5766fe7ad35..10baef9097d1 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r1.ebuild
@@ -50,9 +50,10 @@ PATCHES=(
)
python_check_deps() {
- use test \
- && { has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
- || has_version "dev-python/twisted-words[${PYTHON_USEDEP}]"; }
+ if use test ; then
+ has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
+ || has_version "dev-python/twisted-words[${PYTHON_USEDEP}]"
+ fi
}
pkg_setup() {
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 362d4af88386..2cd1b62011b3 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# NeddySeagoon 24 Aug 2017
+# Support for g15daemon still needs -9999 packages on all arches
+media-sound/mumble g15
+
# Michał Górny (08 Aug 2017)
# Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
media-libs/mesa vulkan
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 44e3133c3463..584ec600aa35 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
# This file is only for generic masks. For arch-specific masks (i.e.
# mask everywhere, unmask on arch/*) use arch/base.
+# Michael Orlitzky (24 Aug 2017)
+# This is a security risk if not used carefully, bug 628596.
+net-analyzer/nrpe command-args
+
# Michael Orlitzky (18 Aug 2017)
# net-misc/vde is masked, so don't let users try to pull it in.
app-emulation/qemu vde
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index cfa77a451738..5eaefc5dbadb 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6687,6 +6687,7 @@ net-print/cups:lprng-compat - Do not install lp... binaries so cups and lprng ca
net-print/cups:python - Add support for the Python interpeter in the web server CGIs.
net-print/cups-filters:foomatic - Build the included foomatic-rip printer driver. Strongly recommended.
net-print/cups-filters:ipp_autosetup - Let cups-browsed automatically set up IPP network printers by default.
+net-print/cups-filters:pclm - Enable PCLm support
net-print/fax4cups:efax - Install net-misc/efax backend
net-print/fax4cups:hylafax - Install net-misc/hylafax backend
net-print/fax4cups:mgetty-fax - Install net-dialup/mgetty backend
diff --git a/sys-apps/portage/portage-2.3.8.ebuild b/sys-apps/portage/portage-2.3.8.ebuild
index a57253128619..af287ccb8752 100644
--- a/sys-apps/portage/portage-2.3.8.ebuild
+++ b/sys-apps/portage/portage-2.3.8.ebuild
@@ -129,11 +129,14 @@ python_prepare_all() {
-i cnf/make.globals || die "sed failed"
einfo "Adjusting repos.conf ..."
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-i cnf/repos.conf || die "sed failed"
+ if prefix-guest ; then
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+ -i cnf/repos.conf || die "sed failed"
+ fi
einfo "Adding FEATURES=force-prefix to make.globals ..."
echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index ce2b5041babf..04b5b0256145 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -128,11 +128,14 @@ python_prepare_all() {
-i cnf/make.globals || die "sed failed"
einfo "Adjusting repos.conf ..."
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-i cnf/repos.conf || die "sed failed"
+ if prefix-guest ; then
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+ -i cnf/repos.conf || die "sed failed"
+ fi
einfo "Adding FEATURES=force-prefix to make.globals ..."
echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
diff --git a/sys-cluster/legion/Manifest b/sys-cluster/legion/Manifest
index 82c34710b9dd..63e5d6f0b603 100644
--- a/sys-cluster/legion/Manifest
+++ b/sys-cluster/legion/Manifest
@@ -2,3 +2,4 @@ DIST legion-16.08.0.tar.gz 2501054 SHA256 c2a344e54124172b49d97e0e0033021e9ed3d9
DIST legion-16.10.0.tar.gz 2474656 SHA256 92190ae5ff0a1f6356890446e026479ed715230d4761a40d4834af256a722099 SHA512 cfe610fef047def835f95adcc4ae52d7844a4a89a5bdebb2ec40b0e63a66aba9d180bd78e559762b1ac18f84c1ca1142c3e73238dbe4c516672a8843335442a5 WHIRLPOOL 3a0e083b9d8d5c5071f1914e7cc3fda0c7c5bc2f4d187506aee9d3c1def8a046ec7732f2ce105bc3ee93075f35fc2ee7952020e2806e7f43be962018147111fb
DIST legion-17.02.0.tar.gz 2690415 SHA256 c5413fe8990c33a087c9a567671756c8267e050f5285f75ee33b84911b00c355 SHA512 0c6ee53953ec2e5072d39b1c1260a1783393feaf7064f381bb1733cf9cdb1be8fd521a35e0a452ebc9e9509d117fdc6f3e472cdb6c633ba00c987c880a33bc2d WHIRLPOOL 97bb2da8d362414d6e3c65ba2b50bf4e57041e337f6492efb27f5796c3afe0225c6324532e7413e5f9987c8395b05751d6fc0ca7b7983c21b96ef7679fdc57dc
DIST legion-17.05.0.tar.gz 2783482 SHA256 b5f54454b28d3b61dde03711dadc2b969cf5c6412b9c1887893c5af521eba79a SHA512 51532f043eea1467a2b8ff17004f224c763f411eb5940d0a4dc5d8eb6503d758964aba26eb4977c68264c7344fcf269682a428e86a2c1a756f91cc9c50d04677 WHIRLPOOL c178ad310ef79997f4716dc7380892c814a11eadb39cbb88f1dab46df73b7fc6396262ea3a7db330847bd25b217b5f50dc5ea3c9b3e86932e3e3693e5a9eb5cb
+DIST legion-17.08.0.tar.gz 2839522 SHA256 5edfc9ee05b7bd0eb45f698e3cfd66c062d21fe36c3da89d233d93b2d47d9d1e SHA512 5d97157f97e12149e5fdf3a75d2e6e8a41ebf97e09c35501e2c93437bd0a47643d261f68c6b4a83b47e64d706f35914acd3a852eb0c08a11696b05ba9ef7af87 WHIRLPOOL 0602b0876190a1209fd215d9a85d3713ae2dcbae8f4df7b9eb34f40da5c13d2ee446137d22bc89f250bc90e134d84f484ec15106ea3cab1d32740941186a38a8
diff --git a/sys-cluster/legion/legion-17.08.0.ebuild b/sys-cluster/legion/legion-17.08.0.ebuild
new file mode 100644
index 000000000000..4d6ccbc9cb31
--- /dev/null
+++ b/sys-cluster/legion/legion-17.08.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A data-centric parallel programming system"
+HOMEPAGE="http://legion.stanford.edu/"
+if [[ $PV = 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/${PN}-${P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="gasnet +hwloc test"
+
+DEPEND="
+ gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
+ hwloc? ( sys-apps/hwloc )
+ "
+
+src_configure() {
+ mycmakeargs=(
+ -DLegion_USE_HWLOC=$(usex hwloc)
+ -DLegion_USE_GASNet=$(usex gasnet)
+ -DLegion_ENABLE_TESTING=$(usex test)
+ -DBUILD_SHARED_LIBS=ON
+ -DLegion_BUILD_EXAMPLES=ON
+ -DLegion_BUILD_TESTS=ON
+ -DLegion_BUILD_TUTORIAL=ON
+ )
+ cmake-utils_src_configure
+}
diff --git a/sys-cluster/zetcd/Manifest b/sys-cluster/zetcd/Manifest
index 5a1da5191954..eaaf9d325178 100644
--- a/sys-cluster/zetcd/Manifest
+++ b/sys-cluster/zetcd/Manifest
@@ -1,3 +1,5 @@
-DIST github.com-coreos-etcd-fa4903c83c72f2857b8ed795a3c86f140b89d52c.tar.gz 2875420 SHA256 594dafaa35ca0eea2eb6a0892dfaf97f9d0ff8f20fc4973484f5d677b793934f SHA512 f6455b1dec3813dc9d3d613f26ca329cda962f9c669956941419fd9da852466b751322888b55c07655d73766e476dfbea9a2e767155619eb9e97ba847d553280 WHIRLPOOL 293ac623950ff0b8a90c276cacc266a40f7ed767c5e77b8e70e8f325ad8f13dcd4f896395944f223ce3c4081eaa021f6c253964733278a74e8a98327707ee6e6
-DIST zetcd-0.0.2.tar.gz 1775595 SHA256 2f49859e4dd6efe14e28f3190a1882084e79d5a9e998fb12b17ff384ac0b887c SHA512 6cbc81dd260a23f0ca2356e9deb5ccc3d17d8b0d63b5162d1576c4bdc61917450872bc2c14e1a4a1ec88119cea3f140996207987fb4d7bf16516fadd366c40d4 WHIRLPOOL db0b6b58799642e8f960a4283bd49037a04934c5ee3244c323dec89931620b524c67571be94f34692f2c07c27bcd17d5e474388fc5e7d0b8f74f1467c6ef8e8d
-DIST zetcd-0.0.3.tar.gz 1777988 SHA256 d921795b4872016a010786479648513cd0cd2458796f918c9fe5bcb152f6d8e1 SHA512 e636f2327daaeb4739b49472263b3e3df7f8b945cdf41f2c99c20cbf1108510cdb8b903c2b0df3bf09bd896a2df105e30d0133935300395e879865fe74bf17f6 WHIRLPOOL 25965566e0f2b48bb6e71da3b52ec7b6ff993b1c801b52fb690829705048f29c9129bfe24d4bb23125892c21172045d64e8cef333e33225b7cf7e320c3eda0c2
+DIST github.com-coreos-etcd-714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz 2522134 SHA256 abeab9a1b93144e97c2161ccc4a976dca5dcc5c13ddd98cf1d67946edd108d14 SHA512 49fda050ed682177b8b61a6b715fc163df307bccae9801547774593b86afe4fa0d80d49cf19a56f3bd4af162263bb9a7f57952a8c9ed824caac1c39d87f178d1 WHIRLPOOL 41a818bb2f25ea47bd2db0cc6dcf601722e9c269fe7bb070f9ff3938c8b727733fb0e6370ea5c8ab2c6fdfa7b0131d7124c780497262631233981b5931256f23
+DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 SHA256 868e51ac5f618fce24ae295c14be2872defbc1a31c3bdcc622c20f4a50a86aeb SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31 WHIRLPOOL fbb5301c22568e0872a90283aae5f2db744064d7508f8c61f235b47cea7560243279255f7881825223a8b04febabf6d4119db8ca913731dd89d4c30a42047822
+DIST github.com-google-go-genproto-ee236bd376b077c7a89f260c026c4735b195e459.tar.gz 968271 SHA256 2d7dba8b354e4dd88383a925d8d195c00617fe708d30016183dd6c5cd0a8ee5c SHA512 a3a9e923926da62e097ee1775332cc5550334e4f96975f2ac5f0d3bdaa148f6583dcce10db68d1d4606ee471072b3248f40ae276bd9409c0d31a9f9bb3803bc1 WHIRLPOOL f82fc636cf61028ce3791c28b68d885d10851e86744f465ed1466e9d924a15ba22f0b55b90a755e649cf3858caac5e69d6526fa17fbeedb136a7075950a3ced8
+DIST github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz 220340 SHA256 c50b8f8542546791a6946eef488d6767226a8d077fa526fb02b7795de890b0bf SHA512 ca79d38bc7d68f1d98869bee21dcdc563c3fee1a8d28b77d474752376fb91cc7b368466dfac41ddebbec13c1560ac3c22257a52deb6d844add5d208646d2e3f5 WHIRLPOOL 0d64d65d3c54c8559b735beefa31dcbf882a599ac7505b60b8c2aede4c6f8b3d195a420f28cfa18b98f7ad9d07b36bcb0ec46fd4eaff273381b359b1060df8f8
+DIST zetcd-0.0.4.tar.gz 1781564 SHA256 72df949f30e0dcf313cad377caeec9b945a1b9810ff6fdc14a6ab4cd481f8979 SHA512 d01cf89f500c6caf0ca4b60adda82d662d3f8948aeb3963f72872363f31ecd4e99b2b839ad8ae826906b0abdc46fbdacd6f996778d2a51cf2a1ddc6ba09b3fc6 WHIRLPOOL c6095a94beaa8559eed091adf54f23f4334d7b2f6fda8b11aa58dc038e0d2e2b7944378501cb683eae83f5426557b47472b928d981df92d349152bc0c92df2bb
diff --git a/sys-cluster/zetcd/zetcd-0.0.2.ebuild b/sys-cluster/zetcd/zetcd-0.0.2.ebuild
deleted file mode 100644
index 58c794d731ab..000000000000
--- a/sys-cluster/zetcd/zetcd-0.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/coreos/zetcd"
-
-EGO_VENDOR=( "github.com/coreos/etcd fa4903c83c72f2857b8ed795a3c86f140b89d52c" )
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A ZooKeeper personality for etcd"
-HOMEPAGE="https://github.com/coreos/zetcd"
-SRC_URI="${ARCHIVE_URI}
- ${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
- pushd src || die
- GOPATH="${WORKDIR}/${P}" go install ${EGO_PN}/cmd/... || die
- popd || die
-}
-
-src_install() {
- dobin bin/*
- dodoc src/${EGO_PN}/README.md
- keepdir /var/log/zetcd
- fowners -R ${PN}:${PN} /var/log/${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/sys-cluster/zetcd/zetcd-0.0.3.ebuild b/sys-cluster/zetcd/zetcd-0.0.4.ebuild
similarity index 56%
rename from sys-cluster/zetcd/zetcd-0.0.3.ebuild
rename to sys-cluster/zetcd/zetcd-0.0.4.ebuild
index 58c794d731ab..0f92ae748b79 100644
--- a/sys-cluster/zetcd/zetcd-0.0.3.ebuild
+++ b/sys-cluster/zetcd/zetcd-0.0.4.ebuild
@@ -5,7 +5,13 @@ EAPI=6
EGO_PN="github.com/coreos/zetcd"
-EGO_VENDOR=( "github.com/coreos/etcd fa4903c83c72f2857b8ed795a3c86f140b89d52c" )
+EGO_VENDOR=( "github.com/coreos/etcd 714e7ec8db7f8398880197be10771fe89c480ee5"
+ "google.golang.org/grpc 777daa17ff9b5daef1cfdf915088a2ada3332bf0 github.com/grpc/grpc-go"
+ "github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
+ "google.golang.org/genproto ee236bd376b077c7a89f260c026c4735b195e459 github.com/google/go-genproto"
+)
+
+ZETCD_COMMIT="e4352ce3cc940bc5b60bb3dd69c14f16dac2980a"
inherit golang-build golang-vcs-snapshot user
@@ -29,12 +35,14 @@ pkg_setup() {
src_compile() {
pushd src || die
- GOPATH="${WORKDIR}/${P}" go install ${EGO_PN}/cmd/... || die
+ GOPATH="${WORKDIR}/${P}" go build -o ${EGO_PN}/bin/zetcd -v \
+ -ldflags "-X ${EGO_PN}/version.Version=${PV} -X ${EGO_PN}/version.SHA=$ZETCD_COMMIT" \
+ ${EGO_PN}/cmd/zetcd || die
popd || die
}
src_install() {
- dobin bin/*
+ dobin src/${EGO_PN}/bin/*
dodoc src/${EGO_PN}/README.md
keepdir /var/log/zetcd
fowners -R ${PN}:${PN} /var/log/${PN}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e294f99da2ae..57aa70db4d2d 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -46,7 +46,6 @@ DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 SHA256 c67b56f04c653e6a19e36abed8
DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 SHA256 95f290d0b68114d835515afc424d6096476a45665671784aa71a7a506296e465 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db WHIRLPOOL e46b08737cfdc235bfb80117e0389f3969167adf59bcba2a0a1094a20eab2b62f0c952dac44781e43957cb1507cd4e80f37bd8aecbc55dbda6382d93b3a4cf94
DIST gcc-4.9.4.tar.bz2 90097606 SHA256 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe WHIRLPOOL e20045126c21a3edea1fa4a2185ec2bc5feec77ddf967ab9d1e8c33322ad4eafe013bfcaab1ed4e35971d3b70ef373ea3585ebb089c9bbf91bbfca1f1da71236
DIST gcc-5.4.0-patches-1.0.tar.bz2 28227 SHA256 ff600369f150129754108322338c3f4f0064d222843a2d82778537f94a22ecbb SHA512 70cd83b142abaa3c22d67d5d58185da2cfa178737ec963e230cc03ea8dc6dc757665c711fae91af4cd91062d3136c6f31a5ee3c4c7440ed9485c6f3632731940 WHIRLPOOL 84a69d2dde582fd486f6c60f78ce9f8c7cc5b480c2989cc1804617eb6526a4a17d20d2ed010bd9fc78019d69caa665428970234090b21f9d4b97217011d4fcd6
-DIST gcc-5.4.0-patches-1.3.tar.bz2 28942 SHA256 b23d1517b626b48e69ecac87878467044a91cabb256e3185bf8e1e00fcde230f SHA512 f75fcf07ca19e43650e3fe6f9baad74205150c009823465f04505b45876d623a56fd6dfc8e67a35e2df36839750cad2561d0f0581154df0b553d6a608730aaf4 WHIRLPOOL eacfc125cf7c5281101f887b3a617df01e3c32d1f66fe377371c33da2819a404ea3cff603b9f3a0b3a49a5875137842b9e94ab8905a069fa20b6da3e59f56b96
DIST gcc-5.4.0-patches-1.4.tar.bz2 28425 SHA256 039b88a939c3b90777fb94c58980cbcfffcdca4365db044dae0677302a4365d1 SHA512 c4922cf0f83cd3b6ed9c50ffb39847a03beb95031865d36d86ae48fdd912c0bd6842ad71a3b0d18a91786ed58e2e529630c6ccd2a0414a48892415051c70246e WHIRLPOOL 6d0a73cfb4ea387811bcd81b2de98a11e2f656a4df7ee5a887cd15d0a744662d85b22fcff86a6953f7c6bcc6d822333528de91b793191e72fe5ff2354deb7a97
DIST gcc-5.4.0-piepatches-v0.6.5.tar.bz2 14551 SHA256 495eb9110244dac17408cd0eb6977a593577eeb0437e72b60339b8ec394f2fb0 SHA512 4890f0713d261982ab81a20f93c5f65193aa1dfa171e3f9e5867f0b80ec7c1e76c5a997b1a4e6f47f8ce36af54ac91125c5bff8bf6d971b7d77c65a57a40a3c0 WHIRLPOOL 13b74b1ca75cc94f9624fe1b52221a953962c918c2cb932302a3078b6deba4f3e501647ad8a2915edef6301e64c820ed612a6fbb9e1178cf1711fe0045686969
DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 SHA256 a3145faa6c81c0753ba754b735834c38987c356dadaa7c4a625c738e374604b5 SHA512 009f34197e79c5e8c6497a0db01ac45cc657e92e56a663b4f3281661d108b2a129cd977fab5f0064f225d6812ae91e82bab22a2b10ae02c486881eeed85ec7a3 WHIRLPOOL a3598ce0aad7e9110db156005190739abc5b4ceea3c327cb9c747c4cf1b99589c1a9fac170aea346eae030b09ee563f9f990e031ad7dfa1aa19b895898bf2608
@@ -57,4 +56,5 @@ DIST gcc-6.4.0-patches-1.0.tar.bz2 7577 SHA256 9c9b68c28e67be281c9bcec5d944b2a34
DIST gcc-6.4.0.tar.xz 76156220 SHA256 850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 WHIRLPOOL 136b282c6957877d2f463d83740fa65a4e7a346ac94e4baabea25cec41ae307f34409b1e518a22927821d564b8634a48978dc8e1d0b988999e924adcbf3f5cc9
DIST gcc-7.1.0-patches-1.1.tar.bz2 6746 SHA256 39d4a0c659cc361bd3c71fdc9b793bccfa2bce06ede65ac49b805d1e236fcc8e SHA512 1bf95a505dc6c37bf6924bb69fd0670c8f3355b6690c94edf4a4248649accbd426575b40cb7a473dfb0ae09a924b05619e5c633384bae0293edb670cfd0d3a30 WHIRLPOOL 9682649fff62b56683637d25a58d11928342d99e52b2269f42369fd1d691208a7645802cb0d609ac30e20593ecdceb8cb1ab9b216963afe14db1b17ed43d5eb7
DIST gcc-7.1.0.tar.bz2 84303533 SHA256 8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17 SHA512 b5d952be9a10f0e0926bb2868877d10544039d6d2f35ba0a08f51231dd622a007650764a03e173194701467547789ad7d2d9cbc10adcdf118d619cdedbd14aec WHIRLPOOL 1dce5f89d4110bacd7f65140a1dee7b1a4898682e2ae8621832bda6f101354d226743acf77974b5e97d861c6eb6c47637138987dfb6ba222ad81b751e80ff6e6
+DIST gcc-7.2.0.tar.xz 62312628 SHA256 1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a SHA512 f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1 WHIRLPOOL 9503fb08731d94b5d79b182579f41992e9db16dba8a034cbfa8a2703a975185859e79c1e3f6094d14d08c7f5d7135c2ca5ffd8d6f7ae7820c20d4076fe5e9f65
DIST gdc-0.24-src.tar.bz2 1012099 SHA256 cc6a97c76c9e6db31e76ff97014d24b3d43e21f018a3c6218e3fb2a4500fc79a SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686 WHIRLPOOL 22322b0c3e2d67b3b37bd7fa92a29c593688f934d4ffd62b9cc87eb63a44a4f8bbc9d75cadf11209c73bdc9942c9b4430036629d0eefcd04de9055c502b85f12
diff --git a/sys-devel/gcc/gcc-5.4.0-r3.ebuild b/sys-devel/gcc/gcc-5.4.0-r3.ebuild
index d186cd4b430e..588338f8fe1b 100644
--- a/sys-devel/gcc/gcc-5.4.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r3.ebuild
@@ -3,7 +3,7 @@
EAPI="4"
-PATCH_VER="1.3"
+PATCH_VER="1.4"
UCLIBC_VER="1.0"
# Hardened gcc 4 stuff
diff --git a/sys-devel/gcc/gcc-5.4.0-r4.ebuild b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
deleted file mode 100644
index 4dbcada9f7f2..000000000000
--- a/sys-devel/gcc/gcc-5.4.0-r4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-PATCH_VER="1.4"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.5"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-inherit toolchain
-
-# KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- elibc_glibc? ( >=sys-libs/glibc-2.8 )
- >=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
- PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
- if has_version '=glibc-2.12 #362315"
- EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
- fi
- is_crosscompile && EPATCH_EXCLUDE+=" 05_all_gcc-spec-env.patch"
-
- toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-7.2.0.ebuild b/sys-devel/gcc/gcc-7.2.0.ebuild
new file mode 100644
index 000000000000..a0f65c4fe504
--- /dev/null
+++ b/sys-devel/gcc/gcc-7.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PATCH_VER="1.1"
+PATCH_GCC_VER="7.1.0"
+#UCLIBC_VER="1.0"
+
+inherit toolchain
+
+KEYWORDS=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ elibc_glibc? ( >=sys-libs/glibc-2.13 )
+ >=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+ PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
+
+src_prepare() {
+ toolchain_src_prepare
+}
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 112f6045b401..2bdc8e18fa40 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,3 +1,4 @@
DIST passenger-5.1.2.tar.gz 5646103 SHA256 7fb03a54650ef5e508895c9e45bc2d8151f6c4811ea6797e81f017fedddfdbab SHA512 88a77c749857a8538ea268f793d2708fa29b8891d2c3197577155f81cb66aa04919c25e713d4f00692051ad385eebaa94729cd30baa68edcf3d17c23bae0acdd WHIRLPOOL 8f115162e2a7c43af20cef1d689290c8a523cce10f617500eeb50ab6a226c203a404fc7ce53fd0e21e63276aa359c5d64b685318be36f79ce165ff598bac8766
DIST passenger-5.1.6.tar.gz 5215694 SHA256 e897cc5f0ec6446bfdc226404dca4bd29f7418ae92010c389661b9f024a3cf24 SHA512 71d301d2501863951157f55df30ac89f6f9d98e79b554a5ca05ca9a306041ecd8cdc92056220cf6dc9ad02972a102bfc990e3b06f887d27496a8ecbd58e109fa WHIRLPOOL fe6872d0c11803fd0d8875002f37425edc54327709daaa56518ace0ef9f5046836592298ca80ce4929a29e6c0a0adcb237b57a19cd0d73ac096992e742e2a8b5
DIST passenger-5.1.7.tar.gz 5218093 SHA256 2b40a00a3fdc90a6acf784319f60fd53549f036ffc99fcbb23a0658cb7e2b215 SHA512 f1f67f7912dd3d58ee46c32d1d0584eeb90e95fd5a36bddff62c28674560f1495926a867b20d12a3867d1e81f13c480ed596ba81f78f6241c511b12fcac1de4c WHIRLPOOL 12c1acee83255b19964f505c6238432971d7a80d7937fcfac75cd0645b8626d993365472ca7e622b21fc8144f37f1286e1b58fdfa71836bcd791467416013349
+DIST passenger-5.1.8.tar.gz 5234529 SHA256 fef10e4a34c3faa48306c21c0789ee4d4d56fc0e30205cc470a91b486b7a4a7d SHA512 5baf287e1f2a751409bba99671de2c41656033dc29132b2d964457405284105343fde4c2233c921d7e35794a47eedbf33e3840119a908741b1ed9e6fdc99ec2c WHIRLPOOL 6513b71aadddc9ec5ff4b4c617256a62f1c977b7d0f098982808851afc7703bd4ceed843cf309d07b239dbae97ed4beacaa2130a5dd325b17714df59f3b1f9ee
diff --git a/www-apache/passenger/passenger-5.1.8.ebuild b/www-apache/passenger/passenger-5.1.8.ebuild
new file mode 100644
index 000000000000..2649ae2a9bab
--- /dev/null
+++ b/www-apache/passenger/passenger-5.1.8.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+ >=dev-ruby/rack-1.0.0:*
+ >=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+ >=dev-libs/libuv-1.8.0
+ net-misc/curl[ssl]
+ apache2? ( www-servers/apache[apache2_modules_unixd(+)] )"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+want_apache2
+
+pkg_setup() {
+ use debug && append-flags -DPASSENGER_DEBUG
+ depend.apache_pkg_setup
+}
+
+all_ruby_prepare() {
+ epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+ epatch "${FILESDIR}"/${PN}-5.1.1-isnan.patch
+
+ # Change these with sed instead of a patch so that we can easily use
+ # the toolchain-funcs methods.
+ sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+ -e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+ -e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+ # Avoid fixed debugging CFLAGs.
+ sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+ # Use sed here so that we can dynamically set the documentation directory.
+ sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+ -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+ src/ruby_supportlib/phusion_passenger.rb || die
+ sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+ # Don't install a tool that won't work in our setup.
+ sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+ rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+ # Make sure we use the system-provided version where possible
+ rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+ # Avoid building documentation to avoid a dependency on mizuho.
+ #sed -i -e 's/, :doc//' build/packaging.rb || die
+ touch doc/*.html || die
+
+ # Fix hard-coded use of AR
+ sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+}
+
+all_ruby_compile() {
+ if use apache2 ; then
+ V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+ APXS2="${APXS}" \
+ HTTPD="${APACHE_BIN}" \
+ FS_LIBDIR='/usr/'$(get_libdir) \
+ USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+ ruby -S rake apache2 || die "rake failed"
+ fi
+}
+
+each_ruby_compile() {
+ append-flags -fno-strict-aliasing
+
+ V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+ APXS2="${APXS}" \
+ HTTPD="${APACHE_BIN}" \
+ FS_LIBDIR='/usr/'$(get_libdir) \
+ USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+ ${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+ if use apache2 ; then
+ APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+ apache-module_src_install
+
+ # Patch in the correct libdir
+ sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+ fi
+
+ dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+ DISTDIR="${D}" \
+ RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+ RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+ APXS2="${APXS}" \
+ HTTPD="${APACHE_BIN}" \
+ FS_LIBDIR='/usr/'$(get_libdir) \
+ EXTRA_LDFLAGS="${LDFLAGS}" \
+ USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+ ${RUBY} -S rake fakeroot || die "rake failed"
+}
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index e88109f71ada..5b03db3d2218 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,2 +1,2 @@
-DIST dokuwiki-2016-06-26b.tgz 3464109 SHA256 eda6421fbd381d67ac6c31c5649fba7e6526904fc186df18191641e5387d8b4f SHA512 6952e89cec7866897b93af5d2719d34e98927545c9ec73600378599d6a8fb8e11d44adf385b4911b9f666dac3f0c7e76b39e589ff28c93da8c83303390d4ff2b WHIRLPOOL 0d7f036b60676312e1adf689606eb10dfb30f5e509bcad9b333ddb32b5d0b1255f4d8c93e08d7b427393ae4b43ee57a697a310c879ec2b7c26522f46ae5165d8
-DIST dokuwiki-2017-02-19b.tgz 3505444 SHA256 88a4d6c83283a1059e9765477667262f15d443f50e48f583c7dc5d55c2abcdb6 SHA512 207f20fb4b5d72cae2cfd7446b43b549e58fb1a57fe5c6676979dc07ec22370841841eb9b455f2f88aa734425a7735f162708f205535498e331035e7bd1fcbb8 WHIRLPOOL d1d62e93d9f940039f3fd24f9ce6b621eaf7632d56223fa78f3650fc5e10ef8197f43f92e7e4bfd56b227cf0d6884a1f8e5ff5b4cf7a90fcdeca505d4f00c45e
+DIST dokuwiki-2016-06-26e.tgz 3464178 SHA256 af63ccaa54b617a809d78642c7e83fe6581c545b869aab7440d63ab82b0120bd SHA512 b47c3a31b0bc731392703ed8d705717e7d1b75db0c44d822d8791c1e409d5285fe863a3dbd13bc60b73c01ca268f7a73a6a24c90edd211fd5c124d3a8be70039 WHIRLPOOL 028c5ac4c72d0bc29d8d534133e61749683169f1f5a5ad4627fff8cf9bcd9bd5b4cb6e5ac845cd1572f9417fe2c23e2234d484c0920250ffacc830075abfa913
+DIST dokuwiki-2017-02-19e.tgz 3505643 SHA256 93172a28ab88107a8abac1e6a34fa6cef54b6e407cd03a8cc14d2a604a63e888 SHA512 6fadb64f9d8394731f346708849d8828b33f4f775e23bca97896b2e06bbfc3b70a6fc17d63dcef8199fdb0aaf0b8291eb0eebcdff7b81524b2d454229eb20be4 WHIRLPOOL b3eeee3bff1d1ea8bd62432dcd79480b929cdb4a86331aa0179690d6c7602ba8176d79c276316ea4a9b81a645e91e7739d2332dc23ccc249867328556f5540da
diff --git a/www-apps/dokuwiki/dokuwiki-20160626b.ebuild b/www-apps/dokuwiki/dokuwiki-20160626e.ebuild
similarity index 96%
rename from www-apps/dokuwiki/dokuwiki-20160626b.ebuild
rename to www-apps/dokuwiki/dokuwiki-20160626e.ebuild
index bc4d3d6cab96..d6e837cfd1cc 100644
--- a/www-apps/dokuwiki/dokuwiki-20160626b.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20160626e.ebuild
@@ -10,7 +10,7 @@ MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
MY_PV="${MY_BASE_PV}${PV:8:1}"
DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs."
-HOMEPAGE="https://www.dokuwiki.org/DokuWiki"
+HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
LICENSE="GPL-2"
diff --git a/www-apps/dokuwiki/dokuwiki-20170219b.ebuild b/www-apps/dokuwiki/dokuwiki-20170219e.ebuild
similarity index 96%
rename from www-apps/dokuwiki/dokuwiki-20170219b.ebuild
rename to www-apps/dokuwiki/dokuwiki-20170219e.ebuild
index bc4d3d6cab96..d6e837cfd1cc 100644
--- a/www-apps/dokuwiki/dokuwiki-20170219b.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20170219e.ebuild
@@ -10,7 +10,7 @@ MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
MY_PV="${MY_BASE_PV}${PV:8:1}"
DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs."
-HOMEPAGE="https://www.dokuwiki.org/DokuWiki"
+HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
LICENSE="GPL-2"
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 0588faa74ae7..00ed1909012d 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -1,5 +1,5 @@
DIST firefox-52.2-patches-01.tar.xz 10400 SHA256 18dbd0d6bbab50918ef3341b739710d45a45efb4aa6cee86b4b8a620cc590b93 SHA512 85cc57e27c46c3243deedcc21d248babbd9ac6c144332ac70dd6e00161fb46584d090683bc1e066c0e9136d6ede5a4e30ccb68d83cad448f6b0d8223c726dafc WHIRLPOOL 65d351f5919b897af516754df0df57b65789d8030280a35d9ab1c2e7790b2713aaac8ad1caaa1ee42007aed17f971355d7f478d134930d0e1a6148a254dd9bba
-DIST firefox-52.2-patches-02.tar.xz 12584 SHA256 3714ebf55a11cec435a42dad0e351a6648f345cda947cfdcce5d163e86af9c27 SHA512 e16d014c60f9c665e5bf1a5e9b7940b101a38f6af26970bd7c71cf0764a11d65816ad2fef2050fd6fc7b10835161d1babcb64c1b10eba1b0c7b3310fc40b57ef WHIRLPOOL 487a383e3db49c57e40c31524faf4d94fcd925b0680eb2ba5e2456a545c494625048f8894e48d4271ef7452ab538a249ac11d826fcf09b8e210fa831580a3b6b
+DIST firefox-52.2-patches-03.tar.xz 13148 SHA256 e2ab0acf173ef06874c6204a7ea77d11404dc70deca5d9edcee2e3a092ff4e60 SHA512 420dbeded3ff2f81250554416115a674ece1847db4449af9d09fa3ea5861037da9bd8525ce5bceede2abab1b58e06485e95417644c0ba8332eb076fbfed7cecd WHIRLPOOL be22652ab1fad0c55d3f3876d50f624d18b6472e7c292e96b5cb1f0e3672ef58fd41afbffd5ead912be1c15031595563eeacc2bea19673785fdde039f799e968
DIST firefox-52.2.0esr-ach.xpi 427640 SHA256 27118787ecf565c3a07101074f100eddcbc86d0a7dd62fd5f0e52ae4ceff4c7f SHA512 d7101b47d7de77e252edc43cae745be8884ae431caf4c8ea9ebb91af176ef145efc73264a196f967340b7ca6224384c75673b9883b35a1f6734d8f23bca3561a WHIRLPOOL 2f642320c9e83a55fe6b97888fe5156778b08400c23f57040fb30e639b590626c8f1852d4144a48134c05d384abd3708822235102930bcc98c337c5fafdba598
DIST firefox-52.2.0esr-af.xpi 436823 SHA256 61d338f0cb09da9fdcef7addb8122a8eb231185681eb84b33799818ab3372120 SHA512 3177d0592efc8a0cf49bfcf9d5411f97d326fdade7c91387f656b02cb9e691e40924d965126822375ce8f1c117a93d650806d41be91f585907058e4e66cffd78 WHIRLPOOL a0dddb61b1ad750ba1a51966949f9ddf757a5289350842c8cef33096d6fb52b367859582ae77aa233a2926007635b7e5c78e6d906d24941b0ba924c7aecb9853
DIST firefox-52.2.0esr-an.xpi 445142 SHA256 5dd40dd9f0be8485b150af966f193abfc3a301025dcc927fbe28fac384bd8a40 SHA512 09c3241b7720a8e41a457d24b699bcbe38b2b5c491c1d0c856e3484b1e7363c5eb5bec4fb33c2e98f5469399f5f759845c7eb3ddf5af737e04128a42ce1bc090 WHIRLPOOL 1c570bbae63ba30be034a9f86a838d7eaf91971102605d1e190365ed7b044db31aa9387dde990f693ff7975054d5c8240d5688ea86c21fe0d5e38c1d71506983
diff --git a/www-client/firefox/firefox-52.3.0.ebuild b/www-client/firefox/firefox-52.3.0.ebuild
index c8eb336971bd..27a30ba66608 100644
--- a/www-client/firefox/firefox-52.3.0.ebuild
+++ b/www-client/firefox/firefox-52.3.0.ebuild
@@ -24,7 +24,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
fi
# Patch version
-PATCH="${PN}-52.2-patches-02"
+PATCH="${PN}-52.2-patches-03"
MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
MOZCONFIG_OPTIONAL_GTK2ONLY=1
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 28463d232ce3..f5d9aa973380 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -5,6 +5,7 @@ DIST enigmail-1.9.8.1.tar.gz 1776673 SHA256 4bcf2da00d96a67921b24dbec9f43930cba4
DIST firefox-49.0-patches-04.tar.xz 13356 SHA256 4968b4c6a0e326de587af6d389826dd29acd8b8eafc605f7636c637db0a64158 SHA512 3346cbe0146d6b480336c250c34c5be0a37cf9c7222238366794b4a03fb9c636ea22294cb517fc59826a0793a4a5723ff2f4cf85384fc405f1c1f14080458282 WHIRLPOOL b0bbf5f307f3d8467e40d76f58e28e0bbf9bed5398e3f17309b7bbdc310350d1d57b02596471b682b997d77bf89bcc3d748af5e0ff19e81a98ab33dcdf4f5210
DIST firefox-51.0-patches-06.tar.xz 9604 SHA256 cb813576d1e784b72e973fd18d809088c6fd2a0e557c9413cfb7f0ea22b58700 SHA512 5fdc3913e6e4fb1427a051ba12c459bb5330e0712d5775b38281115a78e45e22f200e969ca3e82ac1c1fcfe5d27795d82e16ce15b8c5893bc102892876b2636b WHIRLPOOL bdea0d2f72b96f94bdf2d9487c94cfabcff49a955ca780af74aa0dfc12228d54da73028a6cf6c757133e8a28347d2108aba8cd2b11ab70419b39c067cc48d8ff
DIST firefox-52.2-patches-02.tar.xz 12584 SHA256 3714ebf55a11cec435a42dad0e351a6648f345cda947cfdcce5d163e86af9c27 SHA512 e16d014c60f9c665e5bf1a5e9b7940b101a38f6af26970bd7c71cf0764a11d65816ad2fef2050fd6fc7b10835161d1babcb64c1b10eba1b0c7b3310fc40b57ef WHIRLPOOL 487a383e3db49c57e40c31524faf4d94fcd925b0680eb2ba5e2456a545c494625048f8894e48d4271ef7452ab538a249ac11d826fcf09b8e210fa831580a3b6b
+DIST firefox-52.2-patches-03.tar.xz 13148 SHA256 e2ab0acf173ef06874c6204a7ea77d11404dc70deca5d9edcee2e3a092ff4e60 SHA512 420dbeded3ff2f81250554416115a674ece1847db4449af9d09fa3ea5861037da9bd8525ce5bceede2abab1b58e06485e95417644c0ba8332eb076fbfed7cecd WHIRLPOOL be22652ab1fad0c55d3f3876d50f624d18b6472e7c292e96b5cb1f0e3672ef58fd41afbffd5ead912be1c15031595563eeacc2bea19673785fdde039f799e968
DIST seamonkey-2.46-be.xpi 936650 SHA256 d97376ff92ffcdf04ec08273b60b8750d2c4f65edd71eed734313f72885f45db SHA512 a48caf48c0f705e991c31f6f0191662c99bcf022e9bec59b6caeaf03cec384f5b45c6a03af1103d0889fed2d19e57ff5c61fc67faad9cc1786993d0e9368a954 WHIRLPOOL 5cd5a26c3c7bfc02add5063a18f806ebaf58bde1d621bc3d7185edef776254674aba7c4925ab248158c21c5a90b19d156973f8b4a4ace821df60c9586617f3eb
DIST seamonkey-2.46-ca.xpi 937577 SHA256 11adc88aab13826dbb7dd9374f877b80c87a085d75712c976173f243950292a6 SHA512 cf0d7c4829cae2baa064f8a68bfd827c6d596b9036d50e51f50a7d85faa7b1bd067c7dd84f7062affab6c1282186591c54f1cce60457e76924ae328eabca6505 WHIRLPOOL 80daf65a5d75038683f5a8c18f23c79d4f67c9daa7e7090aba8a9d7e610104dae890f45aa81a49a175542fd9c6fe08422f916e7d7d0854d12db7b346f0473be3
DIST seamonkey-2.46-cs.xpi 936101 SHA256 4fae0f46a8ba83a72e6c7a50b7ba73153f153055b874fa3e857ebf6867a48ff3 SHA512 faa70bfbd6b8ecf3bf31ae7da164922ed4618558c62d8263b5655d285c932f0b3fd2e501397845276c4a2d0e519fcfd6d20bf7f0af5323cf5b1c1de94385766e WHIRLPOOL 4dba7015f5702871bf96b55def971c34c02212279c3f4fc1b75336547f11b03ee9c3d837472ddfbff77878cd96dafb43cafd406c4d9a4492ad4a68c3035e78bf
diff --git a/www-client/seamonkey/seamonkey-2.49.3.0_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.3.0_p0.ebuild
index b91c4f780adb..04fe8f8bca84 100644
--- a/www-client/seamonkey/seamonkey-2.49.3.0_p0.ebuild
+++ b/www-client/seamonkey/seamonkey-2.49.3.0_p0.ebuild
@@ -63,7 +63,7 @@ MOZCONFIG_OPTIONAL_GTK3=1
MOZCONFIG_OPTIONAL_WIFI=1
inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.52 pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2
-PATCHFF="firefox-52.2-patches-02"
+PATCHFF="firefox-52.2-patches-03"
PATCH="${PN}-2.46-patches-01"
DESCRIPTION="Seamonkey Web Browser"
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 236ea33c9d5c..d29ae6ac403e 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,4 +1,4 @@
-DIST vivaldi-snapshot-1.12.933.3_p1-amd64.deb 52677220 SHA256 a70badba8220288b08a2b23eb1f27cc4ef051a7a60e4e9747845078ed93296bc SHA512 a95c384415b1d5e0274e13d38d298db9e13c5d5cef9bd172faa5c9ef89ce15306fbd7c2ee5204645ff33e930ab446bbc4f22adc03cead33900d5ad075afe2512 WHIRLPOOL 6f5c05b90b0b2eb5173e543426843aeb907d113db1f59a34743eae7688107e3aca50f2090888a7ad735eade6497e1e50ca389e8ff410edc5a6cc1249bc02e13e
-DIST vivaldi-snapshot-1.12.933.3_p1-i386.deb 53693420 SHA256 d42c89e915502a1170fc549ac7a65738ad60ba0ef1d343cb1d7592eb8c77dc53 SHA512 c41fc7eccf57acda87c1d0fee60aa680312e4e55260f85b2e2b29f6b13f09778d09ca3c0533cfd4bbb8dbdb66b9ea3fe3e9582b9b4109c3e773db6574885e290 WHIRLPOOL 60ac1f36ebcc7b921e3f97e9a4f17446238b33ebe14ee4a5596470737176e5a3269d28060c2ddfe7bff0e88df8700509363801a4f65a7955541a43a46ee82ef1
DIST vivaldi-snapshot-1.12.936.3_p1-amd64.deb 52653384 SHA256 c4d02329af0ae3cb5c160618809b4dd52367cce657b1ec480b18ed0620562d82 SHA512 fc782bca77dfccab92c9d66981c98da87c4391d52c4e03abb29209d8b7090f44430a3adf2b322cd3d7b4757194ed45f3dc60d4f2854f6394930dd6dc9faab8d8 WHIRLPOOL 27ed98222ecd2b285b9ab62ac8fcab5b03d6b0504f697cf1a728d62463affcfaa09e4a111c046359301ae076cbabca82ba12fb999afdebc99aaea0f84fee5b8d
DIST vivaldi-snapshot-1.12.936.3_p1-i386.deb 53724762 SHA256 94991dade2ef39288956937760204a7b75f84a525ef06073779c0c0a47b4ce5e SHA512 3df17da20080a82132c0d571f1ff831057384ae47f7c710c222bf5ac08e008129a469d0fe583a2b049c7db7dcf80e1434da00258578da651adc48f85b1ff1414 WHIRLPOOL e8d0f40d54be1a9d47da315c197ab04268f28ab4f9a19d58f09180dd5ef9d20f1339cdde946ebbc4fa916a4c334c72a48f0e462b299ad48936044236efa5bd13
+DIST vivaldi-snapshot-1.12.941.3_p1-amd64.deb 52635142 SHA256 e016e15483eb2a122833d3f0fd6af38a32789b0af214a58af586da873f458e96 SHA512 9e6ea47efe326536ffd39b564cd18421fc8e6dbc82f00ecb34d282c275fe076f15d73c7d9f11334b8cdb0b2a028557c1e784e9cb6a6523feed5bb742ad00d52b WHIRLPOOL 4c58afaa230bed0ba6d837585400338391c349f884e48284db27b72f315a81453a0486335a1ea518bb3c01d0349e6a7d099708c40c2f6d79bcb446e957859e15
+DIST vivaldi-snapshot-1.12.941.3_p1-i386.deb 53712710 SHA256 e3f478e841beef62e83dac1c4c08f5e55bf878041ad5a592bb9e1349a89b9e38 SHA512 5f1f107f91e8a62dd6836c94b9a6b5c14bce42f670c2bdcdd74e15a4c129fffea46ac5678703de41ffbed0de847cf15f978aa668257dcf5dc0d9890f3ac0463a WHIRLPOOL 61e966c9de09e7157721c48b353ffc78211c937d0f80bc53b57ff33ae0d037dfb4c66afe129c8ac5e0139ae4478a635f8941e30407434a82c1d9158480369f08
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.12.933.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.12.941.3_p1.ebuild
similarity index 100%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-1.12.933.3_p1.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-1.12.941.3_p1.ebuild
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index b0a7dc30fcf2..fb8d938ee999 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -3,3 +3,4 @@ DIST libdrm-2.4.79.tar.bz2 783711 SHA256 c6aaf319293bce38023e9a637471b0f45c93c80
DIST libdrm-2.4.80.tar.bz2 771243 SHA256 a82a519601e9cdfad795e760807eb07ac8913b225e25fc8fe9bc03e3be6549f1 SHA512 478f64bcc6f4815368ae86d023f11ba6b37595bb9d8baa588b466c6c0e2aae48a50a489137750ed21fbabef5afabf183c78c152eb770bfe316fa7401b191a30b WHIRLPOOL 210f62c21aa27fb93eba3a8303daeab80b9da4b20ec6a70649fbad88f4277559a58018fbb12ff4b92bc6b8dc16b7ccbec1724bfcafe353382673352e9ac6d16d
DIST libdrm-2.4.81.tar.bz2 786276 SHA256 8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae SHA512 5f7a1524acad59890d3f890bed90a660a424e18a88d587ca356223bde4a7446d1c540f97ec11cb10d2e7ed1b4ae86127957634354a1be6d04199295ab24782e5 WHIRLPOOL 2694fe988c7ebf34b30076a10dcb2d5ba8a24ddddb1ad348da69874814d64e78ad48f959275faa02fabd798ae214f386ef8437bdf48d485f77519b8759d695df
DIST libdrm-2.4.82.tar.bz2 754053 SHA256 43fa2dbd422d6d41ac141272cc9855360ce4d08c7cf7f2c7bb55dfe449c4ce1c SHA512 e69fd8c2b392daabbb3a548179e3a21a555d5174c11d76a288eb2a08850849aa867c7777b67798ec00e026e998a3b128c22698f05a7b44eb24cddc5c8a3a02d0 WHIRLPOOL bf600559faf5ffe45b6f0192a561875e5284ea76d7611724c2e7f21e6f8aaa6d2e368546102170cffb713bb37fc4c5f98a08b6828e4f6f48f774d7b9b9d96906
+DIST libdrm-2.4.83.tar.bz2 756342 SHA256 03a52669da60ead62548a35bc430aafb6c2d8dd21ec9dba3a90f96eff5fe36d6 SHA512 8f894ff61939bca03ac857506a84bbbcbe2367e60c91a0f2388bfce5ae81e12ba2f96fe1c962416cf9e2d25ef04b98b5437c7015497789561311a72607b3bfcb WHIRLPOOL 8e585516cc8ce88085489b46916f3108b3481bf71877238290a0c79315020c835fb1af90907c4357656e16fcf26ee48b0febce37a189a522978ed95a05525c5e
diff --git a/x11-libs/libdrm/libdrm-2.4.83.ebuild b/x11-libs/libdrm/libdrm-2.4.83.ebuild
new file mode 100644
index 000000000000..b8477e723d2a
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.83.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+else
+ SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' "${S}"/Makefile.am
+ fi
+ xorg-2_src_prepare
+ epatch_user
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ # Udev is only used by tests now.
+ --disable-udev
+ --disable-cairo-tests
+ $(use_enable video_cards_amdgpu amdgpu)
+ $(use_enable video_cards_exynos exynos-experimental-api)
+ $(use_enable video_cards_freedreno freedreno)
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable video_cards_omap omap-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_tegra tegra-experimental-api)
+ $(use_enable video_cards_vc4 vc4)
+ $(use_enable video_cards_vivante etnaviv-experimental-api)
+ $(use_enable video_cards_vmware vmwgfx)
+ $(use_enable libkms)
+ # valgrind installs its .pc file to the pkgconfig for the primary arch
+ --enable-valgrind=$(usex valgrind auto no)
+ )
+
+ xorg-2_src_configure
+}
diff --git a/x11-misc/dunst/dunst-1.1.0.ebuild b/x11-misc/dunst/dunst-1.1.0.ebuild
index 73327b1333cf..01fcda42db9d 100644
--- a/x11-misc/dunst/dunst-1.1.0.ebuild
+++ b/x11-misc/dunst/dunst-1.1.0.ebuild
@@ -18,10 +18,12 @@ CDEPEND="
dev-libs/glib:2
dev-libs/libxdg-basedir
sys-apps/dbus
+ x11-libs/cairo[X,glib]
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2=
x11-libs/libXScrnSaver
x11-libs/libXft
x11-libs/libXinerama
- x11-libs/cairo[X,glib]
x11-libs/pango[X]
dunstify? ( x11-libs/libnotify )
"
diff --git a/x11-misc/dunst/dunst-1.2.0.ebuild b/x11-misc/dunst/dunst-1.2.0.ebuild
index 3fe1d29fc90a..ebbb3c591cbe 100644
--- a/x11-misc/dunst/dunst-1.2.0.ebuild
+++ b/x11-misc/dunst/dunst-1.2.0.ebuild
@@ -18,6 +18,8 @@ CDEPEND="
dev-libs/libxdg-basedir
sys-apps/dbus
x11-libs/cairo[X,glib]
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2=
x11-libs/libXScrnSaver
x11-libs/libXft
x11-libs/libXinerama
diff --git a/x11-wm/stumpwm/stumpwm-9999.ebuild b/x11-wm/stumpwm/stumpwm-9999.ebuild
deleted file mode 100644
index cc03cd16e748..000000000000
--- a/x11-wm/stumpwm/stumpwm-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools common-lisp-3 git-2 xdg-utils
-
-DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
-HOMEPAGE="https://stumpwm.github.io/"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc clisp emacs +sbcl"
-
-DEPEND="dev-lisp/common-lisp-controller
- virtual/commonlisp
- dev-lisp/cl-ppcre
- doc? ( virtual/texi2dvi )"
-
-RDEPEND="${DEPEND}
- emacs? ( app-emacs/slime )
- !clisp? ( !sbcl? ( !amd64? ( dev-lisp/cmucl ) ) )
- clisp? ( >=dev-lisp/clisp-2.38-r2[X,-new-clx] )
- sbcl? ( >=dev-lisp/sbcl-1.1.15 dev-lisp/clx )"
-
-do_doc() {
- local pdffile="${PN}.pdf"
-
- dodoc AUTHORS NEWS README.md
- texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die
-}
-
-src_prepare() {
- # Fix ASDF dir
- sed -i -e "/^STUMPWM_ASDF_DIR/s|\`pwd\`|${CLPKGDIR}|" configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- xdg_environment_reset
-}
-
-src_compile() {
- emake -j1
-}
-
-src_install() {
- common-lisp-install-sources *.lisp
- common-lisp-install-asdf
- dobin "${PN}"
- use doc && do_doc
-}