diff --git a/Manifest.files.gz b/Manifest.files.gz
index 4454cf0e8954..267cd5f5b41d 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 8ad2e22d2c05..577798b8db25 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 7182bdd4e643..55ec5e4d5c38 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,5 +1,8 @@
DIST ansible-2.4.3.0.tar.gz 6511115 BLAKE2B d43679c651f6aa5fd86c797a204645a8ee98efbcde9abaa25385aeb6f1d7c8b4ad74185434bfd159dbf673fe9339ef8f915f78238f8b8a5caf924b54cb9bdd52 SHA512 a7cda358c67c519c7e5ba248bf47070f21a27203fb29d70d9d75ecf027ba1275d71c0f96493e047281211d172a3be8273d7e08144446284695fb0bc8b94daa82
DIST ansible-2.4.4.0.tar.gz 6512938 BLAKE2B 51e397d2242209271a8aef211c3bdeb34a15e2061a202415749ecb4232e0521aff304d5585d536b1805f14ff476b0733d559eeabe6e44de7b273b8606b11b805 SHA512 f0dcf92f2c69931fa06e6dd3845c11592d5a7e44f19a99c4d6c361022708560170f2b74ad20eded61fa5812c90eed281b78396aa92e0b33717970afb5966dd72
DIST ansible-2.4.5.0.tar.gz 6515523 BLAKE2B b6d2eeae93ec8b61ca426682d702179d60674cdb95b2cc9fe413f32d429cdbcab804f34a6d0bcd51a6151dcc29297c6aef6025df52b859130b5ef4c552e85d68 SHA512 44d0e05730a9d7b5ee256c8c19a08c007d19d6523319e3c45b65206781d7384386bbde1a0f5b452b29c9b95a236140bf1c011b46f1c15592c47a15deccf8748e
+DIST ansible-2.4.6.0.tar.gz 6516642 BLAKE2B 27c94a9de0ba7e9aa3d519fd18eb7a27e77b6cf8de3b51a74131a96cbd85c625f43d55e7894483cf623b1e62bddfedf448b1051ad7b2bc7f81a338cfca410458 SHA512 3b4d4d8f3b1eb27861e7beac4557b608e3f9a77d4a24d33868c8d1be2b3fd9a57ef98e4685bbfd859d64a2f591487852fb5409ef00006036be4409eaf07d1b5b
DIST ansible-2.5.5.tar.gz 10150862 BLAKE2B 51184d11418c0a534c0176fcc6fde6da3c962e00502b354317b311d20122b28bbafbb8dfdfb7700a0153116c70396a882b538524395af590af16eeac043d0655 SHA512 a3d50539d2a109dc0bbcdb440e0800b917f63141dce935e6426cb6bdc51e3a93e02f05c23714c24ab00b19842a86677b8d2f2455d20ca15410fa8d3c8ba379ca
+DIST ansible-2.5.6.tar.gz 10157989 BLAKE2B 07341ab7a087e3139442d5420b461ca332f3a9e550874a746f43904763660ef12c9a2041bb991eeb315abdc7f6e31e3615d9283f407003eddddf2b661331c59a SHA512 169badaa6a94d1ea2d16cb97c7e5eb0b8c225a455edfa95f3ad9e4ec968d5b9525dec4732b60e5ba5f92412f87d8aacc0b2299f2595f3bb820ad8604be8e76d6
DIST ansible-2.6.0.tar.gz 10721104 BLAKE2B 894700762139339e43cde35d74bfcfda218a1325b45749d8ea94c1a19e210f98e2f0717ff39c54da97f9795380268da040158271f2e26986b5d2fe177e3dfe2e SHA512 0c7353eeb4a65b21439489ef8a101bb0455d24d88904011460548bfba218688b4a1fdc1d61d60d611c2bcce7f1c301c0d6bcb9f3e9db12eaf9c9ef2f96994af9
+DIST ansible-2.6.1.tar.gz 10724749 BLAKE2B af4523ab904660fa3369bdae2839ab4b2f386235be5a004e1f9a9a5f7c555a2e6fe82319abe20ecbf7e74152f8e2ad5060fda2c2af0f5d62fdd9416901c9072c SHA512 1235e12a510317665956bfae9e0d03814083a24ba6e5c98072437e50b4a596437a173b32d9d5af37b4b9e168e35045fdb65e65276fdc830f473ab1f42dcba2d2
diff --git a/app-admin/ansible/ansible-2.4.6.0.ebuild b/app-admin/ansible/ansible-2.4.6.0.ebuild
new file mode 100644
index 000000000000..573d04b35802
--- /dev/null
+++ b/app-admin/ansible/ansible-2.4.6.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doman docs/man/man1/*.1
+ dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.5.6.ebuild b/app-admin/ansible/ansible-2.5.6.ebuild
new file mode 100644
index 000000000000..8f63e8546445
--- /dev/null
+++ b/app-admin/ansible/ansible-2.5.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+ if use doc; then
+ cd docs/docsite || die
+ export CPUS=4
+ emake -f Makefile.sphinx html
+ fi
+}
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+ distutils-r1_python_install_all
+
+ doman docs/man/man1/*.1
+ dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.6.1.ebuild b/app-admin/ansible/ansible-2.6.1.ebuild
new file mode 100644
index 000000000000..8f63e8546445
--- /dev/null
+++ b/app-admin/ansible/ansible-2.6.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+ if use doc; then
+ cd docs/docsite || die
+ export CPUS=4
+ emake -f Makefile.sphinx html
+ fi
+}
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+ distutils-r1_python_install_all
+
+ doman docs/man/man1/*.1
+ dodoc -r examples
+}
diff --git a/app-admin/certmgr/metadata.xml b/app-admin/certmgr/metadata.xml
index 303da7fa2e48..e0546fc77f98 100644
--- a/app-admin/certmgr/metadata.xml
+++ b/app-admin/certmgr/metadata.xml
@@ -1,10 +1,7 @@
-
- mrueg@gentoo.org
- Manuel Rüger
-
+
cloudflare/certmgr
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 5f27fef44bac..44ed3fb9b090 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/zstd/metadata.xml b/app-arch/zstd/metadata.xml
index b9782eebc304..82079cb18aea 100644
--- a/app-arch/zstd/metadata.xml
+++ b/app-arch/zstd/metadata.xml
@@ -5,6 +5,11 @@
patrick@gentoo.org
Patrick Lauer
+
facebook/zstd
diff --git a/app-arch/zstd/zstd-1.3.4-r1.ebuild b/app-arch/zstd/zstd-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..b5e953cdda71
--- /dev/null
+++ b/app-arch/zstd/zstd-1.3.4-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="lz4 static-libs"
+
+RDEPEND="app-arch/xz-utils
+ lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ HAVE_LZ4=$(usex lz4 1 0) \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
+
+ emake -C lib \
+ CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
+
+ emake -C contrib/pzstd \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ AR="$(tc-getAR)" \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+ emake -C contrib/pzstd \
+ DESTDIR="${D}" \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+ einstalldocs
+
+ if ! use static-libs; then
+ rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
+ fi
+}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index f433345eac58..654c59b8643c 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/geekbench/geekbench-4.2.3.ebuild b/app-benchmarks/geekbench/geekbench-4.2.3.ebuild
index f3269b8df107..898a4c3b2fd1 100644
--- a/app-benchmarks/geekbench/geekbench-4.2.3.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.2.3.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windo
HOMEPAGE="https://www.geekbench.com"
SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
LICENSE="geekbench"
SLOT="4"
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index cf52f61dd841..d8ebd4e917a8 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1 @@
-DIST stress-ng-0.09.31.tar.xz 350760 BLAKE2B 5f839b4a4020cb3f1c5cfeafafefc576dd36f4d6c600f4cce917837ddf3f2e70349b0b76037dc2ee0e3d96fca172d65b01629559f705bdbf6f975978a79f58b1 SHA512 01fc32bac51adcbf98907c73bfc0c54ec9d04355d3959e7dcba208dbd85c314310cf6c5b4fe092dad53bfca54d7dfe6d292b75845bc0b0998e43f9907dbc50ac
+DIST stress-ng-0.09.32.tar.xz 352176 BLAKE2B c63315d619e5a712c6196dd83f8edbd2fff1b2cc2d84de67cf201b068b4dfaeaf7e130dd59b938e089298ecdc389bb7af0220076425e4de749837f46502085aa SHA512 1c6ff00b46a9d05050838ea429a67be8ff899fecb13d4a9d010875d6ccc0c218c780a70efc84addc1bf874e663a47b0d1440d1f99a9c40336460c0ae4a5f702d
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.32.ebuild
similarity index 91%
rename from app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild
rename to app-benchmarks/stress-ng/stress-ng-0.09.32.ebuild
index 7652a40c8cfd..728b7fb84338 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.32.ebuild
@@ -25,4 +25,4 @@ RDEPEND="${DEPEND}"
DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.09.31-makefile.patch" )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 2966ae2993bf..db6f229a5ac8 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gnupg/gnupg-2.2.8.ebuild b/app-crypt/gnupg/gnupg-2.2.8.ebuild
index b7e58af2f24b..af6349832c78 100644
--- a/app-crypt/gnupg/gnupg-2.2.8.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
COMMON_DEPEND_LIBS="
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
new file mode 100644
index 000000000000..32b6d5221e59
--- /dev/null
+++ b/app-crypt/jitterentropy/Manifest
@@ -0,0 +1 @@
+DIST jitterentropy-2.1.1.tar.gz 23804 BLAKE2B e208c87b414939485c16c6e94460020164e77089d5ac69f8627f8f1dfb38f211ff985c7fa5d32f647f1b06f065f86dc9070aea9b481e8251ecdecbfb4724ce08 SHA512 fb1b76278e03f425be06c8b66532e3997a07f91645393317f42681b1113bd31dfdf348bd18c92d0dfc153c85b75f8f968fe070e988f1a02e4ef4e09435b6cef8
diff --git a/app-crypt/jitterentropy/files/jitterentropy-2.1.1-destdir-fix.patch b/app-crypt/jitterentropy/files/jitterentropy-2.1.1-destdir-fix.patch
new file mode 100644
index 000000000000..cdcc2a57756f
--- /dev/null
+++ b/app-crypt/jitterentropy/files/jitterentropy-2.1.1-destdir-fix.patch
@@ -0,0 +1,37 @@
+From 4b5dc596547e0833e2cccf65efa46ecbe7d0b99c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?=
+Date: Fri, 6 Jul 2018 14:41:52 -0400
+Subject: [PATCH] Makefile: add support for $(DESTDIR) in install target
+
+Allow install target to install into an arbitrary root instead of '/'
+by prefixing $(PREFIX) with $(DESTDIR).
+---
+ Makefile | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c38b800..2c778f2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -44,11 +44,13 @@ scan: $(OBJS)
+ scan-build --use-analyzer=/usr/bin/clang $(CC) -shared -Wl,-soname,lib$(NAME).so.$(LIBMAJOR) -o lib$(NAME).so.$(LIBVERSION) $(OBJS) $(LDFLAGS)
+
+ install:
+- install -m 644 doc/$(NAME).3 $(PREFIX)/share/man/man3/
+- gzip -9 $(PREFIX)/share/man/man3/$(NAME).3
+- install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(PREFIX)/$(LIBDIR)/
+- $(RM) $(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
+- ln -s lib$(NAME).so.$(LIBVERSION) $(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
++ install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
++ install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
++ gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
++ install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
++ install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
++ $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
++ ln -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/lib$(NAME).so.$(LIBMAJOR)
+
+ clean:
+ @- $(RM) $(NAME)
+--
+2.17.0
+
diff --git a/app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild b/app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild
new file mode 100644
index 000000000000..70e643f40806
--- /dev/null
+++ b/app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Hardware RNG based on CPU timing jitter"
+HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library"
+SRC_URI="https://github.com/gktrk/jitterentropy-library/archive/v2.1.1.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.1-destdir-fix.patch
+)
+
+S="${WORKDIR}/${PN}-library-${PV}"
+
+src_prepare() {
+ default
+
+ # Disable man page compression on install
+ sed -e '/\tgzip.*man/ d' -i Makefile || die
+ # Let the package manager handle stripping
+ sed -e '/\tinstall.*-s / s/-s //g' -i Makefile || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake PREFIX="${EPREFIX}/usr" \
+ LIBDIR="$(get_libdir)" \
+ DESTDIR="${D}" install
+ dosym lib${PN}.so.${PV} "/usr/$(get_libdir)"/lib${PN}.so
+ doheader ${PN}.h ${PN}-base-user.h
+}
diff --git a/app-crypt/jitterentropy/metadata.xml b/app-crypt/jitterentropy/metadata.xml
new file mode 100644
index 000000000000..4cf1945b408e
--- /dev/null
+++ b/app-crypt/jitterentropy/metadata.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ gokturk@gentoo.org
+ Göktürk Yüksek
+
+
+ The Jitter RNG provides a noise source using the CPU execution
+ timing jitter. It does not depend on any system resource other
+ than a high-resolution time stamp. It is a small-scale, yet
+ fast entropy source that is viable in almost all environments
+ and on a lot of CPU architectures.
+
+
+ smuellerDD/jitterentropy-library
+
+
diff --git a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
index fc25bbf62d16..14e2d2ecfa8a 100644
--- a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="+crypt +introspection test vala"
REQUIRED_USE="test? ( introspection )
vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
RDEPEND="
>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index ff71693a2a5e..b0996a5d053b 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,3 +1,5 @@
+DIST gentoo-release-test-sigs-20180706.tar.gz 1437 BLAKE2B 00fb0a491c84853068ea578e68e8ab0a57842f6098c14da7ec44faf20abb23deef480aca958a7e352b9c55a024681eabc0c9aaf400e5dcbf8873277a3a940e38 SHA512 2a7cc2c650693c0e1fdf7083d77bf975e05ece3ab1495ed03362d02e8411481c80a62a9f21b23861bdc602d74c656a618e9a39d2bdef7ccd253ea9f3e4c7531a
DIST gentoo-release.asc.20180323.gz 40546 BLAKE2B 7fed70d734a73368e4772cbca7810e8d61ad3b483e0e0c115072de9f96332b0c8c3c9f091b0ee1cdd056c775db1121deee77d6a629e0b99a4c67d485ccacdfe6 SHA512 31ffdf1e23ea6a36c5f4ab6bd49b9c0323b6b03627a9001589030b2b10e95459b959ee931762bcd43fb94b28eaba5d5ede290b1a41ce3ec0ad1b7b8b0f98d48a
DIST gentoo-release.asc.20180530.gz 47465 BLAKE2B de37e8e84570debd8b39003bc65ada276f730e8a792b8990c87f4ffd7bbefd2cf49e44b53d3554fc6ecc302da65c8fc480821fd6e9f11324d5ed08a5fac861ef SHA512 63fcb06ae84657cde66fa74bd2b499936906d7aef36c46d19439c72a8c0f199cdc273d7e25004c60b23c50684365192b2a304f26c2b173564a216316eb22f66a
DIST gentoo-release.asc.20180703.gz 46676 BLAKE2B 934db8c5896aa9fc268820c3349a60854e0a99586c84dbb16e92528b2fac7c043033f68f790bf737fa6835138bdf4dc7ae0df4d67ed96bd8664b16cd42db50a1 SHA512 85ceed12ca105a8dc9767c61b6ff391ed9d3ec2a116ed39b130aa75fa60998d0c2569677b783937bf4cae1cf91f472c9f16fb87abee051fa26f3c7b96bef0b27
+DIST gentoo-release.asc.20180706.gz 44805 BLAKE2B 1ba26b90e564738a1282c5febe426628144ab70e526397b866f97214254c73bbb517cdaa48ba0e83ca75a7d88cd622375fda0f362c43d13b66720ffb682682d2 SHA512 ba48cb6d7e72c6a720df3ff2430a4b4dd261f947c23762cd0c1255a93391d10becfb491db1bb80b295edd1f8192580315d5c7be3670b8689ef702ed228b05894
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild
new file mode 100644
index 000000000000..a36da1acafbd
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
+ test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-${PV}.tar.gz )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( app-crypt/gnupg )"
+
+S=${WORKDIR}
+
+src_test() {
+ local old_umask=$(umask)
+ umask 077
+
+ local -x GNUPGHOME=${T}/.gnupg
+ mkdir "${GNUPGHOME}" || die
+ einfo "Importing keys ..."
+ gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
+
+ local f
+ for f in gentoo-release-test-sigs*/*.asc; do
+ einfo "Testing ${f##*/} ..."
+ gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
+ done
+
+ umask "${old_umask}"
+}
+
+src_install() {
+ insinto /usr/share/openpgp-keys
+ newins "gentoo-release.asc.${PV}" gentoo-release.asc
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 63a9e370d6b6..c36da354630b 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/root-docs/Manifest b/app-doc/root-docs/Manifest
deleted file mode 100644
index 52210d611777..000000000000
--- a/app-doc/root-docs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST RooFit_Users_Manual_2.91-33.pdf 1330062 BLAKE2B 5c4210a3c388ac3aa8e289c0744de077a61deae9c43cd8f6fd2b6b7cd5d800f6a2c444dabcf326c148491768f816e329c7cbbae116e5faa3d5ea1af63d1f879b SHA512 732d7dea3541b51e5f0b9b5b70dae57e1bdbb2504c4222d5e5095ec0f9b67307011c1f31c2c95be419b53dd8426f52f62f6c9370084208176a2ed3d7f25d783b
-DIST TMVAUsersGuide-v4.2.0.pdf 4099493 BLAKE2B d64e2544dd31d0d096e778bdbda77fce162971988480214df7663c4e51bca70436f03eb410687ac3a675880ac0bc615b0e43901e86c68428f768cf082b1db085 SHA512 a52f36bdf9791c2e1c4b17f08dbcb100927d11c0db1d69ec611437017f80d90be557baf530af10aabc4d07dac626f1736352abd71845dba5e2c0899ff5b126d4
-DIST info.png 2060 BLAKE2B 7a2780a8c63c055d3ef8e346d6d712fe15a210c7ce50d414ac931d21e0f6ca045151e8d3f4f3004971e8f2bf8b2c303a0273a38b6e88e42ab2250069c52fae5c SHA512 81a730eefbe7a7e15d5840491402c7644bf7ed5d5f8f3830ed9457b343cc7882480e993ea84aef93500742cd0fe8469859cd2c925e5582b91ef56406804ae276
-DIST roofit_quickstart_3.00.pdf 501576 BLAKE2B 14b40d639b78040733f608a75970d115ba56e677b4931f2de0c43b47b960d8a5a33d45ebeb0f37dff587e14cb964218564ce9751ecedd079bd55aaa6d9534aec SHA512 e8e1bd3bb3ead0ae3883512d7ff297651b99937fd5df0b61cf559ea5dd6cfbda35dfd8ebc953ed11a12f471849f6e95e05869b58a1e433ea6e5d1d1aa08bbb93
-DIST root-banner.png 132555 BLAKE2B 47c03b7d82ab48cd2b23fa05db624262d11f37a2fc2cfeacddc42ad6368be19860ebca805fe0e438a8552c7f815ab330dd05cc111da7ccfda4f939c9b3c74e2d SHA512 139347f396e88c8062d847d612949204cb80e551a826d926950ca8ab967f0d496487fed17a227fc796ae4db23fca758d91a0af7943142adbed358e98d7667b1f
-DIST root_v5.34.36.source.tar.gz 75427331 BLAKE2B 203af03e1459c7fe079fcb1b30da145b3262f90c074abb7ff8fb3b1b2b90ac24391ce51aa8afbd10e0db8d69549207f15176207bc30a13720e0ae94342a38dfa SHA512 2cc0c8f8b63b2a3ce01c49c41704483548a7324d92c21a63e3e36a00f4d6f5656a7844fdf48cb71a6f2a2c974112527300ffd3bb5502d8365ffaf138e6ae4c7a
diff --git a/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch b/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch
deleted file mode 100644
index e48a4f77568a..000000000000
--- a/app-doc/root-docs/files/root-docs-6.00.01-fillpatterns.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/core/base/doc/macros/fillpatterns.C b/core/base/doc/macros/fillpatterns.C
-index b0a5132..fca81c8 100644
---- a/core/base/doc/macros/fillpatterns.C
-+++ b/core/base/doc/macros/fillpatterns.C
-@@ -20,11 +20,11 @@ TCanvas * fillpatterns()
-
- // Fixed patterns.
- for (i=1; i<=5; i++) {
-- box(j++, 0.01, y-bh, 0.19, y);
-- box(j++, 0.21, y-bh, 0.39, y);
-- box(j++, 0.41, y-bh, 0.59, y);
-- box(j++, 0.61, y-bh, 0.79, y);
-- box(j++, 0.81, y-bh, 0.99, y);
-+ box(j, 0.01, y-bh, 0.19, y); j++;
-+ box(j, 0.21, y-bh, 0.39, y); j++;
-+ box(j, 0.41, y-bh, 0.59, y); j++;
-+ box(j, 0.61, y-bh, 0.79, y); j++;
-+ box(j, 0.81, y-bh, 0.99, y); j++;
- y = y-bh-db;
- }
-
-@@ -55,7 +55,7 @@ TCanvas * fillpatterns()
- return Pat;
- }
-
--box(Int_t pat, Double_t x1, Double_t y1, Double_t x2, Double_t y2)
-+void box(Int_t pat, Double_t x1, Double_t y1, Double_t x2, Double_t y2)
- {
- // Draw an box using the fill pattern "pat" with the "pat" value
- // written on top.
diff --git a/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch b/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch
deleted file mode 100644
index 613468629a53..000000000000
--- a/app-doc/root-docs/files/root-docs-6.00.01-makehtml.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 600e8db..afad025 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1072,16 +1072,7 @@ $(ROOTPCH): $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
-
- ifeq ($(BUILDX11),yes)
- ifeq ($(BUILDASIMAGE),yes)
--html: rootexecs postbin changelog releasenotes
--ifneq ($(USECONFIG),FALSE)
-- @if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
-- || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
-- echo 'ERROR: root.exe has not been installed by this build.'; \
-- echo ' Run "make install" before running "make html".'; \
-- exit 1; \
-- fi
--endif
-- @$(MAKELOGHTML)
-+html: compiledata releasenotes
- @$(MAKEHTML)
- else
- html:
-diff --git a/build/unix/makehtml.sh b/build/unix/makehtml.sh
-index a94e790..8b4589d 100755
---- a/build/unix/makehtml.sh
-+++ b/build/unix/makehtml.sh
-@@ -1,16 +1,16 @@
- #! /bin/sh
-
- dir=`pwd`
--ROOT=$dir/bin/root
-+ROOT=root
- cd tutorials
- # we need tutorials/hsimple.root
- if [ ! -f hsimple.root ]; then
-- $ROOT -n -l -b -q hsimple.C
-+ $ROOT -n -l -b -q hsimple.C && exit 1
- fi
- cd tree
- # we need tutorials/tree/cernstaff.root
- if [ ! -f cernstaff.root ]; then
-- $ROOT -n -l -b -q cernbuild.C
-+ $ROOT -n -l -b -q cernbuild.C || exit 1
- fi
- cd $dir
-
-@@ -20,7 +20,7 @@ echo ""
-
- # To generate the full documentation, we do need to
- # use the graphics engine, so do not use '-b'.
--$ROOT -n -l <
-
-
-
- bircoph@gentoo.org
- Andrew Savchenko
-
-
- sci-physics@gentoo.org
- Gentoo Physics Project
-
-
- This package contains the automatically generated ROOT class
- documentation.
-
-
-
- tmva
-
-
diff --git a/app-doc/root-docs/root-docs-5.34.36.ebuild b/app-doc/root-docs/root-docs-5.34.36.ebuild
deleted file mode 100644
index b9b09c53549b..000000000000
--- a/app-doc/root-docs/root-docs-5.34.36.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROOT_PN="root"
-ROOFIT_DOC_PV=2.91-33
-ROOFIT_QS_DOC_PV=3.00
-TMVA_DOC_PV=4.2.0
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EVCS_OFFLINE=yes # we need exactly the same checkout as root itself
- EGIT_REPO_URI="http://root.cern.ch/git/root.git"
- KEYWORDS=""
-else
- SRC_URI="https://root.cern.ch/download/${ROOT_PN}_v${PV}.source.tar.gz"
- KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
- S="${WORKDIR}/${ROOT_PN}"
-fi
-
-inherit eutils multilib virtualx
-
-DESCRIPTION="Documentation for ROOT Data Analysis Framework"
-HOMEPAGE="https://root.cern.ch"
-SRC_URI="${SRC_URI}
- math? (
- http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v${TMVA_DOC_PV}.pdf
- https://root.cern.ch/download/doc/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf
- http://root.cern.ch/drupal/sites/default/files/roofit_quickstart_${ROOFIT_QS_DOC_PV}.pdf )
- api? (
- ${HOMEPAGE}/sites/all/themes/newsflash/images/blue/root-banner.png
- ${HOMEPAGE}/sites/all/themes/newsflash/images/info.png )"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-IUSE="api +math +metric http"
-
-VIRTUALX_REQUIRED="api"
-
-DEPEND="
- app-text/pandoc
- dev-haskell/pandoc-citeproc[bibutils]
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-latexrecommended
- virtual/pkgconfig
- api? (
- media-fonts/dejavu
- ~sci-physics/root-${PV}[X,graphviz,opengl]
- )"
-RDEPEND=""
-
-DOC_DIR="/usr/share/doc/${ROOT_PN}-${PV}"
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- # we need to force sci-physics/root checkout here
- git-r3_checkout "${EGIT_REPO_URI}" "${WORKDIR}/${P}" "sci-physics/root/0"
- else
- default
- fi
-}
-
-src_prepare() {
- use api && epatch \
- "${FILESDIR}/${PN}-6.00.01-makehtml.patch" \
- "${FILESDIR}/${PN}-6.00.01-fillpatterns.patch"
- # prefixify the configure script
- sed -i \
- -e "s:/usr:${EPREFIX}/usr:g" \
- configure || die "prefixify configure failed"
-}
-
-src_configure() {
- # we need only to setup paths here, html docs doesn't depend on USE flags
- if use api; then
- ./configure \
- --prefix="${EPREFIX}/usr" \
- --etcdir="${EPREFIX}/etc/root" \
- --libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
- --docdir="${EPREFIX}${DOC_DIR}" \
- --tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials" \
- --testdir="${EPREFIX}${DOC_DIR}/examples/tests" \
- --with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \
- --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps" \
- --nohowto
- fi
-}
-
-src_compile() {
- pdf_target=( primer users-guide )
- local pdf_size=pdfa4
- use metric || pdf_size=pdfletter
- use math && pdf_target+=( minuit2 spectrum )
- use http && pdf_target+=( HttpServer JSROOT )
-
- local i
- for (( i=0; i<${#pdf_target[@]}; i++ )); do
- emake -C documentation/"${pdf_target[i]}" "${pdf_size}"
- done
-
- if use api; then
- # video drivers may want to access hardware devices
- cards=$(echo -n /dev/dri/card* /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
- [[ -n "${cards}" ]] && addpredict "${cards}"
-
- ROOTSYS="${S}" Xemake html
- # if root.exe crashes, return code will be 0 due to gdb attach,
- # so we need to check if last html file was generated;
- # this check is volatile and can't catch crash on the last file.
- [[ -f htmldoc/timespec.html ]] || die "html doc generation crashed"
- fi
-}
-
-src_install() {
- insinto "${DOC_DIR}"
-
- local i
- for (( i=0; i<${#pdf_target[@]}; i++ )); do
- doins documentation/"${pdf_target[i]}"/*.pdf
- done
- unset pdf_target
-
- use math && doins \
- "${DISTDIR}/RooFit_Users_Manual_${ROOFIT_DOC_PV}.pdf" \
- "${DISTDIR}/roofit_quickstart_${ROOFIT_QS_DOC_PV}.pdf" \
- "${DISTDIR}/TMVAUsersGuide-v${TMVA_DOC_PV}.pdf"
-
- if use api; then
- # Install offline replacements for online messages
- cp "${DISTDIR}"/{root-banner.png,info.png} htmldoc/ || die "cp failed"
- # too large data to copy
- dodir "${DOC_DIR}/html"
- mv htmldoc/* "${ED}${DOC_DIR}/html/" || die
- docompress -x ${DOC_DIR}/html
- fi
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 97596e1e195c..65ea1385f70e 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/mg/mg-20180408.ebuild b/app-editors/mg/mg-20180408.ebuild
index 963154791f8c..3ba0ac54b0de 100644
--- a/app-editors/mg/mg-20180408.ebuild
+++ b/app-editors/mg/mg-20180408.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="livecd"
RDEPEND="sys-libs/ncurses:0
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index fbf87ac9d4fc..4d4cfcacf6bb 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/org-mode/org-mode-9.1.13.ebuild b/app-emacs/org-mode/org-mode-9.1.13.ebuild
index 13bf39369720..4316aa21b88c 100644
--- a/app-emacs/org-mode/org-mode-9.1.13.ebuild
+++ b/app-emacs/org-mode/org-mode-9.1.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd ~x86-macos"
IUSE="contrib doc odt-schema"
RESTRICT="test"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 1f9ed0a8c499..407b91ed862b 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/hyperd/metadata.xml b/app-emulation/hyperd/metadata.xml
index 8880e0179c0e..2babf919ffdd 100644
--- a/app-emulation/hyperd/metadata.xml
+++ b/app-emulation/hyperd/metadata.xml
@@ -1,10 +1,7 @@
-
- mrueg@gentoo.org
- Manuel Rüger
-
+
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
index 536cf3cafca5..5eda97b53959 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-cloudpinyin"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-cloudpinyin.git"
fi
DESCRIPTION="Internet look-up support for Chinese Pinyin input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-cloudpinyin"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
index 5d4ef1849fb9..14ed5cf98819 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-cloudpinyin"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-cloudpinyin.git"
fi
DESCRIPTION="Internet look-up support for Chinese Pinyin input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-cloudpinyin"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-cloudpinyin/metadata.xml b/app-i18n/fcitx-cloudpinyin/metadata.xml
index a46ab006f456..183e87e5137e 100644
--- a/app-i18n/fcitx-cloudpinyin/metadata.xml
+++ b/app-i18n/fcitx-cloudpinyin/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-cloudpinyin
+ fcitx/fcitx-cloudpinyin
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
index dc64ffa5f61d..33805e7cbebd 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-configtool"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-configtool.git"
fi
DESCRIPTION="GTK+ GUI configuration tool for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-configtool"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
index 42953c81e022..5778190ca4f5 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-configtool"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-configtool.git"
fi
DESCRIPTION="GTK+ GUI configuration tool for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-configtool"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-configtool/metadata.xml b/app-i18n/fcitx-configtool/metadata.xml
index c7779e9268e6..163f08b0b6df 100644
--- a/app-i18n/fcitx-configtool/metadata.xml
+++ b/app-i18n/fcitx-configtool/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-configtool
+ fcitx/fcitx-configtool
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
index a2cfb666d6f5..c933884fa90f 100644
--- a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-hangul"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-hangul.git"
fi
DESCRIPTION="Korean Hangul input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-hangul"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-hangul"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
index e65be6a0ff3f..a9af4dd2d47e 100644
--- a/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-hangul"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-hangul.git"
fi
DESCRIPTION="Korean Hangul input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-hangul"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-hangul"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-hangul/metadata.xml b/app-i18n/fcitx-hangul/metadata.xml
index ef7714e27ba9..c07e8a1bcdb6 100644
--- a/app-i18n/fcitx-hangul/metadata.xml
+++ b/app-i18n/fcitx-hangul/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-hangul
+ fcitx/fcitx-hangul
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
index 58600af4a8a9..cfcd437107b6 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-libpinyin"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-libpinyin.git"
fi
DESCRIPTION="Chinese LibPinyin input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-libpinyin"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI="https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz"
else
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
index aa74feb1b6d3..38b963d8ecc8 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-libpinyin"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-libpinyin.git"
fi
DESCRIPTION="Chinese LibPinyin input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-libpinyin"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI="https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz"
else
diff --git a/app-i18n/fcitx-libpinyin/metadata.xml b/app-i18n/fcitx-libpinyin/metadata.xml
index 2c68bea1e0eb..8cb60642717a 100644
--- a/app-i18n/fcitx-libpinyin/metadata.xml
+++ b/app-i18n/fcitx-libpinyin/metadata.xml
@@ -13,6 +13,6 @@
Install dictionary manager
- fcitx/fcitx-libpinyin
+ fcitx/fcitx-libpinyin
diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
index 4cbd9ea7dee3..65a80442349f 100644
--- a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
+++ b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-m17n"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-m17n.git"
fi
DESCRIPTION="m17n-provided input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-m17n"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-m17n"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
index cf91063156a4..45cd1d24ec28 100644
--- a/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
+++ b/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-m17n"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-m17n.git"
fi
DESCRIPTION="m17n-provided input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-m17n"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-m17n"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-m17n/metadata.xml b/app-i18n/fcitx-m17n/metadata.xml
index fcddb15dd181..0972630f0941 100644
--- a/app-i18n/fcitx-m17n/metadata.xml
+++ b/app-i18n/fcitx-m17n/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-m17n
+ fcitx/fcitx-m17n
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index 619b181fcd6f..5959966f61d1 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,2 +1 @@
-DIST fcitx-qt5-1.2.1.tar.xz 134304 BLAKE2B c158b20bdcb287e9cb52aa74d6a7f66f113a759538b6748b1d38dcbb2213956e88dec54ed29307427d45d84861654bf5e70c9effba70d88738bf0a1a664cc3cd SHA512 0fd726974492e173084e29d3308aa1d97141a1e4034b7192cf505391540533eff473849929e931e4a84589d233fefac70cbd9c122cf6d0d0de412150cad1b1d3
-DIST fcitx-qt5-1.2.2.tar.xz 134216 BLAKE2B 9922dafaa42937737f5ef0018f519e83ed3c3105bef5a30505b323239c999ac8c921435b2bb72b35a73ebf1a9b7787ecd4ad405d8b6311e806e3bcbcbd79ff5e SHA512 902180ff8336c688d5d548a1628dc481f1ce0ea6cc79719ab53337ebfbb745232bfc58cf6e739a60c562d30c3d996eb5e07bd8ef932eade72a79fb35e096e1c3
+DIST fcitx-qt5-1.2.3.tar.xz 134124 BLAKE2B 0c17f9c3b9d9878fe228881c7287375d3b73a8c27f806590747e56b8644a86300e243d62efcb6589d197edd352e2a79d49be704718ff53381e2fb5e2a5a2b1af SHA512 e3e9a76419caca4eeebf3c149a72ee939a25f463d03dd8461caf44cace310278b08e83d460112f240cd54ed05dba3c5e9732198f0c3d0b9d81c3a444c33ab8d3
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild
deleted file mode 100644
index e394e0469210..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
-fi
-
-DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- SRC_URI=""
-else
- SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
-fi
-
-LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE=""
-
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5=
- dev-qt/qtwidgets:5
- virtual/libintl
- x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
- dev-qt/qtconcurrent:5
- kde-frameworks/extra-cmake-modules:5
- virtual/pkgconfig"
-
-DOCS=()
-
-src_prepare() {
- # https://github.com/fcitx/fcitx-qt5/issues/34
- # https://github.com/fcitx/fcitx-qt5/commit/af033e3d5305108eecc568adff7f8b2da5831ed6
- sed -e "/^#include \"batchdialog.h\"$/i\\#include " -i quickphrase-editor/batchdialog.cpp || die
-
- cmake-utils_src_prepare
-}
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
similarity index 86%
rename from app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild
rename to app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
index c353b639401c..2c54b501abd1 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.1.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-qt5.git"
fi
DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
index a0b099a0108e..3d87cd55c432 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-qt5.git"
fi
DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-qt5/metadata.xml b/app-i18n/fcitx-qt5/metadata.xml
index 1a301afceb2d..8410356fbf60 100644
--- a/app-i18n/fcitx-qt5/metadata.xml
+++ b/app-i18n/fcitx-qt5/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-qt5
+ fcitx/fcitx-qt5
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
index 64ed70315c43..675cba41e886 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-rime"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-rime.git"
fi
-DESCRIPTION="Chinese RIME input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime"
+DESCRIPTION="Chinese RIME input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-rime"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
index 74292ea23a01..b40865038567 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-rime"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-rime.git"
fi
-DESCRIPTION="Chinese RIME input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime"
+DESCRIPTION="Chinese RIME input methods for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-rime"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-rime/metadata.xml b/app-i18n/fcitx-rime/metadata.xml
index c809836fd12d..867246b6c0f5 100644
--- a/app-i18n/fcitx-rime/metadata.xml
+++ b/app-i18n/fcitx-rime/metadata.xml
@@ -17,6 +17,6 @@
Install configuration tool
- fcitx/fcitx-rime
+ fcitx/fcitx-rime
diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
index ebfb51385145..aaecf413d372 100644
--- a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-sayura"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-sayura.git"
fi
DESCRIPTION="Sinhala Sayura input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sayura"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sayura"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
index 84cda092656d..96a0b8ba5369 100644
--- a/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-sayura"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-sayura.git"
fi
DESCRIPTION="Sinhala Sayura input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sayura"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sayura"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-sayura/metadata.xml b/app-i18n/fcitx-sayura/metadata.xml
index 98c49b162783..733b3cd2db79 100644
--- a/app-i18n/fcitx-sayura/metadata.xml
+++ b/app-i18n/fcitx-sayura/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-sayura
+ fcitx/fcitx-sayura
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
index a04ee7cc33d3..9eed3f5a70f1 100644
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-sunpinyin"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-sunpinyin.git"
fi
DESCRIPTION="Chinese SunPinyin input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sunpinyin"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
index 20c11e0aec3f..5dcca8662924 100644
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-sunpinyin"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-sunpinyin.git"
fi
DESCRIPTION="Chinese SunPinyin input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sunpinyin"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-sunpinyin/metadata.xml b/app-i18n/fcitx-sunpinyin/metadata.xml
index a29735352546..0b3b9ad6abdd 100644
--- a/app-i18n/fcitx-sunpinyin/metadata.xml
+++ b/app-i18n/fcitx-sunpinyin/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-sunpinyin
+ fcitx/fcitx-sunpinyin
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
index 9ac0a13a2858..a2516d917e26 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-table-extra"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-table-extra.git"
fi
DESCRIPTION="Extra Chinese table input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-table-extra"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-table-extra"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
index e1797eacb82b..9a7d55beda2c 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-table-extra"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-table-extra.git"
fi
DESCRIPTION="Extra Chinese table input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-table-extra"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-table-extra"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-table-extra/metadata.xml b/app-i18n/fcitx-table-extra/metadata.xml
index 461bba458254..4c163079a51f 100644
--- a/app-i18n/fcitx-table-extra/metadata.xml
+++ b/app-i18n/fcitx-table-extra/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-table-extra
+ fcitx/fcitx-table-extra
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
index 90b847f553d4..df756e31e6e0 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-unikey"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-unikey.git"
fi
DESCRIPTION="Vietnamese Unikey input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-unikey"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
index 95c318c72900..f7913c7825a9 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx-unikey"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-unikey.git"
fi
DESCRIPTION="Vietnamese Unikey input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-unikey"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-unikey/metadata.xml b/app-i18n/fcitx-unikey/metadata.xml
index fbe690dbfe44..92ad94a4b881 100644
--- a/app-i18n/fcitx-unikey/metadata.xml
+++ b/app-i18n/fcitx-unikey/metadata.xml
@@ -13,6 +13,6 @@
Install macro editor
- fcitx/fcitx-unikey
+ fcitx/fcitx-unikey
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 799e26377254..cfcbad155f73 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,4 +1,3 @@
-DIST fcitx-4.2.9.5_dict.tar.xz 8736972 BLAKE2B 01255554aa0caf5e4f638121febcf0951549d5752884dd436c90042587048598724b91d4839ff2470e8b9ee119f0abb40650c45fd8253ae1bd74608812c84a1d SHA512 5e2ec5405b01fe85b1659b1db3e15389b0d7e096808db598d0865381bcb8f6de960e8e16d4432c95c586cfc3359d17d4f7bad0cff2fe0146fe00b9fb80491168
DIST fcitx-4.2.9.6_dict.tar.xz 8738408 BLAKE2B 812256657ef8f6648a8a3de4bef4e423288ee3d91d493783eae2cb55b5b5964a791f3317af1aea0d877e01ea06491c34f6c594038d27713be3a6b35c93bc5545 SHA512 dc8308d1a4e9b7595da285ca6521f33027f5b8e6968bc28f751bd4f40116166cabbe1c05e29072afbe88473d2a9d6999124476260785e07f62a243df6e896bb0
DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
diff --git a/app-i18n/fcitx/fcitx-4.2.9.5.ebuild b/app-i18n/fcitx/fcitx-4.2.9.5.ebuild
deleted file mode 100644
index 5fe6492b498a..000000000000
--- a/app-i18n/fcitx/fcitx-4.2.9.5.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/fcitx/fcitx"
-fi
-
-DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
- https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
- https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
- https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
- https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
-else
- SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-fi
-
-LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
-
-RDEPEND="dev-libs/glib:2
- sys-apps/dbus
- sys-apps/util-linux
- virtual/libiconv
- virtual/libintl
- x11-libs/libxkbcommon
- X? (
- x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrender
- xml? (
- x11-libs/libxkbfile
- x11-misc/xkeyboard-config
- )
- )
- cairo? (
- x11-libs/cairo[X]
- x11-libs/libXext
- pango? ( x11-libs/pango )
- !pango? ( media-libs/fontconfig )
- )
- enchant? ( app-text/enchant:0= )
- gtk2? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
- introspection? ( dev-libs/gobject-introspection )
- lua? ( dev-lang/lua:= )
- nls? ( sys-devel/gettext )
- opencc? ( app-i18n/opencc:= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- )
- xml? (
- app-text/iso-codes
- dev-libs/libxml2
- )"
-DEPEND="${RDEPEND}
- kde-frameworks/extra-cmake-modules:5
- virtual/pkgconfig"
-
-DOCS=(AUTHORS ChangeLog THANKS)
-
-src_prepare() {
- if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
- fi
-
- # https://github.com/fcitx/fcitx/issues/250
- sed \
- -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \
- -e "/find_package(XkbFile REQUIRED)/s/^/ /" \
- -e "/find_package(XkbFile REQUIRED)/a\\ find_package(XKeyboardConfig REQUIRED)\n endif(ENABLE_X11)" \
- -e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \
- -i CMakeLists.txt
-
- cmake-utils_src_prepare
- xdg_environment_reset
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- -DSYSCONFDIR="${EPREFIX}/etc"
- -DENABLE_CAIRO=$(usex cairo)
- -DENABLE_DEBUG=$(usex debug)
- -DENABLE_ENCHANT=$(usex enchant)
- -DENABLE_GETTEXT=$(usex nls)
- -DENABLE_GIR=$(usex introspection)
- -DENABLE_GTK2_IM_MODULE=$(usex gtk2)
- -DENABLE_GTK3_IM_MODULE=$(usex gtk3)
- -DENABLE_LIBXML2=$(usex xml)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_OPENCC=$(usex opencc)
- -DENABLE_PANGO=$(usex pango)
- -DENABLE_QT=$(usex qt4)
- -DENABLE_QT_GUI=$(usex qt4)
- -DENABLE_QT_IM_MODULE=$(usex qt4)
- -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
- -DENABLE_STATIC=$(usex static-libs)
- -DENABLE_TABLE=$(usex table)
- -DENABLE_TEST=$(usex test)
- -DENABLE_X11=$(usex X)
- -DENABLE_XDGAUTOSTART=$(usex autostart)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- rm -r "${ED}usr/share/doc/${PN}"
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- use gtk2 && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-
- elog
- elog "Quick Phrase Editor is provided by:"
- elog " app-i18n/fcitx-qt5:4"
- elog
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- use gtk2 && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
index 5fe6492b498a..98e30b8de8fa 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx.git"
fi
DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
@@ -82,7 +82,7 @@ src_prepare() {
ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
fi
- # https://github.com/fcitx/fcitx/issues/250
+ # https://gitlab.com/fcitx/fcitx/issues/250
sed \
-e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \
-e "/find_package(XkbFile REQUIRED)/s/^/ /" \
diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild
index 94eef9789bf6..6a3c3d9e00b8 100644
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/fcitx"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx.git"
fi
DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
@@ -82,7 +82,7 @@ src_prepare() {
ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
fi
- # https://github.com/fcitx/fcitx/issues/250
+ # https://gitlab.com/fcitx/fcitx/issues/250
sed \
-e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \
-e "/find_package(XkbFile REQUIRED)/s/^/ /" \
diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index f6fcd96b889e..7090f71a5172 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -20,6 +20,6 @@
Install table input methods for Simplified Chinese
- fcitx/fcitx
+ fcitx/fcitx
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
index 6f3fe120c1c4..e9d8466014b5 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/kcm-fcitx.git"
fi
DESCRIPTION="KDE configuration module for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/kcm-fcitx"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
index c15c02b02ec1..c0dd64f9323d 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx"
+ EGIT_REPO_URI="https://gitlab.com/fcitx/kcm-fcitx.git"
fi
DESCRIPTION="KDE configuration module for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/kcm-fcitx"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/kcm-fcitx/metadata.xml b/app-i18n/kcm-fcitx/metadata.xml
index 68e0523550ca..0b3021abdac5 100644
--- a/app-i18n/kcm-fcitx/metadata.xml
+++ b/app-i18n/kcm-fcitx/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/kcm-fcitx
+ fcitx/kcm-fcitx
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index 7bc5284670a7..73baeb4cc28b 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -85,8 +85,8 @@ src_unpack() {
if use fcitx4; then
local EGIT_SUBMODULES=()
- git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
- git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
+ git-r3_fetch https://gitlab.com/fcitx/mozc.git refs/heads/fcitx
+ git-r3_checkout https://gitlab.com/fcitx/mozc.git "${WORKDIR}/fcitx-mozc"
fi
else
unpack ${P}.tar.gz
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index d8763dd2dfe0..b51359f01fb3 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -85,8 +85,8 @@ src_unpack() {
if use fcitx4; then
local EGIT_SUBMODULES=()
- git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
- git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
+ git-r3_fetch https://gitlab.com/fcitx/mozc.git refs/heads/fcitx
+ git-r3_checkout https://gitlab.com/fcitx/mozc.git "${WORKDIR}/fcitx-mozc"
fi
else
unpack ${P}.tar.gz
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild
index a84140be2b25..41902e9a643c 100644
--- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild
@@ -173,7 +173,7 @@ src_configure() {
done
local mycmakeargs=(
- -DDICT_LANG="${dict_langs}${dict_langs:-;}"
+ -DDICT_LANG="${dict_langs:-;}"
-DEMBED_SQLITE=OFF
)
diff --git a/app-i18n/tagainijisho/tagainijisho-9999.ebuild b/app-i18n/tagainijisho/tagainijisho-9999.ebuild
index da6473ad98a4..11c02a413f1c 100644
--- a/app-i18n/tagainijisho/tagainijisho-9999.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-9999.ebuild
@@ -173,7 +173,7 @@ src_configure() {
done
local mycmakeargs=(
- -DDICT_LANG="${dict_langs}${dict_langs:-;}"
+ -DDICT_LANG="${dict_langs:-;}"
-DEMBED_SQLITE=OFF
)
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 99d5fe99f488..fe8d58960f04 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 98f36b64b1ab..fa36b63ddf59 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,7 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-5.4.7.2.tar.xz 194486484 BLAKE2B 82c28025f20842dc6a1cf410e84953208ec36462e2018cc07edfcd9d1086c8e83ac93dcf75148df6b670c4b20cd8c1c7904851e3c7eb46c62c521781e013926e SHA512 712c66de9216b5b7fd48310610801b4f1f17465f8ff282cb7e070a50104ccdb4a5a71f6a58eedb828a7a58f7521b5c725745d5e0f6ece62596b7485161cf01f8
DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
+DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
DIST libreoffice-6.0.5.2.tar.xz 204795724 BLAKE2B d027e83dc5f3908af25975354f8d0ef9a4a9a4fb601dada54d04cdc5bc6d0a0dbedda89ac0cf5bbe88da29382431bddfd331e56b63b88e9f5a23b9299c65b61a SHA512 796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6 SHA512 8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
index b1c28905c338..f8ee3a7fc14e 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index b1c28905c338..3df147edf4c0 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
+PATCHSET="${PN}-6.0.5.2-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2949e3a0dc53..0c70a6b9f626 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild b/app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..4b9258115b94
--- /dev/null
+++ b/app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Recodes HTML file using a new character set"
+HOMEPAGE="https://bisqwit.iki.fi/source/htmlrecode.html"
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-ar.patch" )
+
+src_prepare() {
+ touch .depend argh/.depend || die
+ default
+}
+
+src_configure() { :; }
+
+src_compile() {
+ local makeopts=(
+ AR="$(tc-getAR)"
+ CPPDEBUG=
+ CXX="$(tc-getCXX)"
+ CXXFLAGS="${CXXFLAGS}"
+ LDFLAGS="${LDFLAGS}"
+ )
+ emake "${makeopts[@]}" -C argh libargh.a
+ emake "${makeopts[@]}" htmlrecode
+}
+
+src_install() {
+ dobin htmlrecode
+ dodoc README.html
+}
diff --git a/app-text/htmlrecode/htmlrecode-1.3.1.ebuild b/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
index 62baa2ad62e0..1174c57d9c79 100644
--- a/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
+++ b/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -6,8 +6,8 @@ EAPI=4
inherit eutils toolchain-funcs
DESCRIPTION="Recodes HTML file using a new character set"
-HOMEPAGE="http://bisqwit.iki.fi/source/htmlrecode.html"
-SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+HOMEPAGE="https://bisqwit.iki.fi/source/htmlrecode.html"
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
KEYWORDS="~amd64 ~ppc ~x86"
LICENSE="GPL-2"
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index dba3f33812ac..a557c223cc52 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1 +1 @@
-DIST libnumbertext-1.0_beta3_p20180611.tar.gz 403211 BLAKE2B decdee3357aae20ae023e7e73e7321635afa247a574cec7eff079c9f2002c70d76c53afd22ebd9a4f30484cdfbd844028dd1f206fe894b1df0bba760c7037960 SHA512 031464da9e8fd0a6fe60cf22d70207847482c73a447dc49c679791fbbdf448abb40cfa4ba79671cafc70c75ae89a32db3c98ad77785b5a47af37c5658f66bebd
+DIST libnumbertext-1.0.tar.gz 408181 BLAKE2B ceeba0a98c0d6fbfa92ad37347f7b7cb9887ea516126e35212d61e572a382a56c520406409e08024d53f1520219ec7e986324893b1c2b53330a217319d35ffc7 SHA512 b30f3650ba8cbaa771415026f40b7fc2cf5d9cd956a365d6654b1e2996fe61f714adfda845432e41f61f0fa474b1b60d99cc46cd6b7e42e1dccfd53f5017ae63
diff --git a/app-text/libnumbertext/libnumbertext-1.0_beta3_p20180611.ebuild b/app-text/libnumbertext/libnumbertext-1.0.ebuild
similarity index 72%
rename from app-text/libnumbertext/libnumbertext-1.0_beta3_p20180611.ebuild
rename to app-text/libnumbertext/libnumbertext-1.0.ebuild
index 952934d6ba89..ad6d58d47ebb 100644
--- a/app-text/libnumbertext/libnumbertext-1.0_beta3_p20180611.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.ebuild
@@ -3,23 +3,20 @@
EAPI=7
-COMMIT=53ee927a1d431aea09a4f844213d608d8c10defd
inherit autotools
DESCRIPTION="Number to number name and money text conversion libraries"
HOMEPAGE="https://github.com/Numbertext/libnumbertext"
-SRC_URI="https://github.com/Numbertext/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Numbertext/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
+IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
src_prepare() {
default
eautoreconf
diff --git a/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch b/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch
new file mode 100644
index 000000000000..d73ad947c7df
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch
@@ -0,0 +1,42 @@
+--- a/src/initializelinks.c
++++ b/src/initializelinks.c
+@@ -75,7 +75,7 @@
+ * checks if an item belongs to tag table. returns 1 on success and 0 on
+ * failure. It should be optimised...
+ */
+-inline int
++int
+ exists_in_tag_table(char *item)
+ {
+ if (gettagtablepos(item) != -1)
+--- a/src/filehandling_functions.c
++++ b/src/filehandling_functions.c
+@@ -554,7 +554,7 @@
+ return 1;
+ }
+
+-inline void
++void
+ buildcommand(char *dest, char *command, char *filename, const char *tmpfilename)
+ {
+ strcpy(dest, command);
+@@ -564,7 +564,7 @@
+ strcat(dest, tmpfilename);
+ }
+
+-inline void
++void
+ builddircommand(char *dest, char *command, char *filename, const char *tmpfilename)
+ {
+ strcpy(dest, command);
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -193,7 +193,7 @@
+ return value;
+ }
+
+-inline void
++void
+ initlocale()
+ {
+ #ifdef ___DEBUG___
diff --git a/app-text/pinfo/pinfo-0.6.10-r6.ebuild b/app-text/pinfo/pinfo-0.6.10-r6.ebuild
index f18ab4f78a9b..633f0825ca01 100644
--- a/app-text/pinfo/pinfo-0.6.10-r6.ebuild
+++ b/app-text/pinfo/pinfo-0.6.10-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -37,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.6.10-ncurses-check.patch
"${FILESDIR}"/${PN}-0.6.10-libc-basename.patch
"${FILESDIR}"/${PN}-0.6.10-clearfilenameprefix.patch
+ "${FILESDIR}"/${PN}-0.6.10-gcc-7-inline.patch
)
src_prepare() {
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 9f435b61d95b..ce4d090b90cb 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index a4863a34881e..adfbb0304c97 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1 +1,2 @@
DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7
+DIST libadalang-gpl-2018-src.tar.gz 1990774 BLAKE2B ffad46d4988de7fb8c9bf94d24360a726c59e3c70a2318725a59e0b6b62351e8f5d8dd6501964618607122e3c7cb3bda0e1181818c68324d4067d59ac93e2b1c SHA512 b95196323097065be2996ced767f8f89fb77445f99c249d84043c68d926d61c78b310b4fef0699d08f9112dc423596c076f452745469a75a8467c35b5e10ac2c
diff --git a/dev-ada/libadalang/files/libadalang-2018-gentoo.patch b/dev-ada/libadalang/files/libadalang-2018-gentoo.patch
new file mode 100644
index 000000000000..ef92b255cf48
--- /dev/null
+++ b/dev-ada/libadalang/files/libadalang-2018-gentoo.patch
@@ -0,0 +1,21 @@
+--- a/ada/testsuite/testsuite_support/capi_driver.py 2017-07-30 16:01:31.495287196 +0200
++++ b/ada/testsuite/testsuite_support/capi_driver.py 2017-07-30 16:00:08.104464440 +0200
+@@ -72,6 +72,7 @@
+ -- different default standard.
+
+ "-I{support_include_dir}", "-g");
++ for Driver ("C") use External ("GCC", "gcc");
+ end Compiler;
+ end P;
+ '''.format(main_source=compile_units[0],
+--- a/ada/testsuite/tests/c_api/unit_file_providers/test.out 2018-07-05 20:57:15.718357269 +0200
++++ b/ada/testsuite/tests/c_api/unit_file_providers/test.out 2018-07-05 20:58:47.363026320 +0200
+@@ -5,6 +5,8 @@
+ Calling ufp_get_unit_filename (some_field=42, kind=0) with name: "foo"
+ Calling ufp_get_file_from_name (some_field=42, kind=0) with name: "foo"
+ Calling ufp_get_file_from_name (some_field=42, kind=0) with name: "foo"
++Calling ufp_get_unit_filename (some_field=42, kind=0) with name: "foo"
++Calling ufp_get_file_from_name (some_field=42, kind=0) with name: "foo"
+ resolves to:
+
+ Calling ufp_destroy (some_field=42)
diff --git a/dev-ada/libadalang/libadalang-2018.ebuild b/dev-ada/libadalang/libadalang-2018.ebuild
new file mode 100644
index 000000000000..14689aeaafd1
--- /dev/null
+++ b/dev-ada/libadalang/libadalang-2018.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+MYP=${PN}-gpl-${PV}-src
+DESCRIPTION="high performance semantic engine for the Ada programming language"
+HOMEPAGE="https://libre.adacore.com/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18
+ -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnat_2016 gnat_2017 +gnat_2018"
+
+RDEPEND="dev-python/pyyaml
+ || (
+ dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=]
+ dev-ada/gnatcoll-bindings[iconv,shared,gnat_2016=,gnat_2017=,gnat_2018]
+ )
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ >=dev-ada/langkit-2018"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+ ada/manage.py generate || die
+}
+
+src_compile() {
+ ada/manage.py build || die
+}
+
+src_test () {
+ ada/manage.py test | grep FAILED && die
+}
+
+src_install () {
+ ada/manage.py install "${D}"usr
+ python_domodule build/python/libadalang.py
+}
diff --git a/dev-ada/libadalang/metadata.xml b/dev-ada/libadalang/metadata.xml
index 31ddba84751f..7af420635599 100644
--- a/dev-ada/libadalang/metadata.xml
+++ b/dev-ada/libadalang/metadata.xml
@@ -8,6 +8,7 @@
Compile with dev-lang/gnat-gpl-2016
Compile with dev-lang/gnat-gpl-2017
+ Compile with dev-lang/gnat-gpl-2018
Libadalang is a project to build a high performance semantic engine for
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index fb275639810b..80c1ffa05089 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/barman/Manifest b/dev-db/barman/Manifest
index 5f6a31309239..f06974ef2123 100644
--- a/dev-db/barman/Manifest
+++ b/dev-db/barman/Manifest
@@ -1,2 +1,3 @@
DIST barman-2.1.tar.gz 240437 BLAKE2B 6981049812b520c2605c49e5c7baed5cf350eb386114bf80f3ca2d1cd3abdc9b7d55329f4b8de42b6a47acd7d7e7f925b2c3cf7da1e95393ba3d3c7df938f262 SHA512 385e74c8dcd20d6ad46f6a5a0520cfa47a597395acd433a570ca062ee2834a8b75101fc9a04b19dd312373e4a0b017c90826f7fbeb4f32d8c59313d8b79af1e1
DIST barman-2.3.tar.gz 255500 BLAKE2B ae84ceade48faf6c65b1d056a7a5b635e5af53f6fa17d6165676e486286effe144125078f84fe6861d948f5b6d568d547ac3258612c95f5cfd5a5e3160197c5c SHA512 c7885ae4940fc990e3368bc654bfe6924fe36f66e6549d3f263a2f23ead2743b2a9ececf55e393ef3105cdf7fc2f38e491895d8e6135e95372eff9eb0d0bfa69
+DIST barman-2.4.tar.gz 997651 BLAKE2B 34c412752d6f0a8bcaa11e3d4538b6116d980f8c3c04bfd9c6ef997f496c4f9497175349b0d0574673a91c14ffab1469d8a988077c7198a2405af680c8205ca6 SHA512 ef316de7cae7f41d95894892b260e1cc67f62866c6feaf03acd96391ab07d9eb27ea7fd6cb472743cbd56658dde24718ac0892ba2280706098f4bdd14b5674d1
diff --git a/dev-db/barman/barman-2.4.ebuild b/dev-db/barman/barman-2.4.ebuild
new file mode 100644
index 000000000000..f4ffbef2a9cb
--- /dev/null
+++ b/dev-db/barman/barman-2.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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 distutils-r1
+
+DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
+
+HOMEPAGE="http://www.pgbarman.org"
+SRC_URI="http://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="dev-python/argh[${PYTHON_USEDEP}]
+ >=dev-python/psycopg-2[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/argcomplete[${PYTHON_USEDEP}]
+ net-misc/rsync
+ dev-db/postgresql[server]"
+DEPEND=""
diff --git a/dev-db/redis/redis-3.2.12.ebuild b/dev-db/redis/redis-3.2.12.ebuild
index b89599f5b7d5..eea23ad53470 100644
--- a/dev-db/redis/redis-3.2.12.ebuild
+++ b/dev-db/redis/redis-3.2.12.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://redis.io/"
SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="+jemalloc tcmalloc luajit test"
SLOT="0"
diff --git a/dev-db/redis/redis-4.0.10.ebuild b/dev-db/redis/redis-4.0.10.ebuild
index c96e7582d346..0062f6313ebb 100644
--- a/dev-db/redis/redis-4.0.10.ebuild
+++ b/dev-db/redis/redis-4.0.10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="+jemalloc tcmalloc luajit test"
SLOT="0"
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index d4cc5a828c91..6af27445471d 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/parser-combinators/metadata.xml b/dev-haskell/parser-combinators/metadata.xml
index b54bf609fcdc..8f34fbbfb77a 100644
--- a/dev-haskell/parser-combinators/metadata.xml
+++ b/dev-haskell/parser-combinators/metadata.xml
@@ -1,10 +1,7 @@
-
- mrueg@gentoo.org
- Manuel Rüger
-
+
Lightweight package providing commonly useful parser combinators.
diff --git a/dev-haskell/pgp-wordlist/metadata.xml b/dev-haskell/pgp-wordlist/metadata.xml
index 76274aa36600..df062b638c35 100644
--- a/dev-haskell/pgp-wordlist/metadata.xml
+++ b/dev-haskell/pgp-wordlist/metadata.xml
@@ -1,10 +1,7 @@
-
- mrueg@gentoo.org
- Manuel Rüger
-
+
Translate between binary data and a human-readable
collection of words.
diff --git a/dev-haskell/prettyprinter/metadata.xml b/dev-haskell/prettyprinter/metadata.xml
index 030200004841..7759ad5057c1 100644
--- a/dev-haskell/prettyprinter/metadata.xml
+++ b/dev-haskell/prettyprinter/metadata.xml
@@ -1,10 +1,7 @@
-
- mrueg@gentoo.org
- Manuel Rüger
-
+
A prettyprinter/text rendering engine. Easy to use, well-documented, ANSI terminal backend exists, HTML backend is trivial to implement, no name clashes, Text-based, extensible.
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 655d3c96215a..87f5c58ff117 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/dnsjava/Manifest b/dev-java/dnsjava/Manifest
index 0ef6cac488e9..8241ec16e4d7 100644
--- a/dev-java/dnsjava/Manifest
+++ b/dev-java/dnsjava/Manifest
@@ -1,2 +1,3 @@
DIST dnsjava-2.1.6.tar.gz 1087908 BLAKE2B af9edda95d8cdd9c02b39c5a86646efc85cef576361d4ab765ce65d8b6e20621bcbdc9e32327f8ae1a3e2cbb83e60d61736ce9d71ae3bd091b0fca306727e158 SHA512 0d30504190aabbb176cc914834eb26a2f5522741c4473dbbf32f16e1d62fe39cf244a3ddd543b88d3a1e595afa9c6509e42d1418205677aa6523c6d11c49f497
DIST dnsjava-2.1.7.tar.gz 1078980 BLAKE2B 16fd027c6f46463d6b4322bcf88943a3f06186d853a7e5615b8829d93aee897dca489dec00d61af857d58df566905c559e1c8d9922f5592ef2146bc715dc9b0b SHA512 07b11b94833f4a6f5d9bd8e0265444f15704eeba6420b2fa2c4efef46823c2768e8e691d6b101bb6d1ed9ebda1e55dbf518f447d62eb686fdd583c281313afdd
+DIST dnsjava-2.1.8.tar.gz 460532 BLAKE2B 761e99643710aca3aebc50972504284c388685dee12b3fc1fcbe6e4a8698762833dab725ff61395aee2b0292d0f71004eb2247c899c87d01dcc938e4283d31c1 SHA512 d38be6d52b275906b66468cd375ebd46c0d669de2fd06a50253631589a7dd6fbf4e92d4b20778dacd9f19cd489df013e4d42bc16c935581dcaa370ac9ce3c55b
diff --git a/dev-java/dnsjava/dnsjava-2.1.8.ebuild b/dev-java/dnsjava/dnsjava-2.1.8.ebuild
new file mode 100644
index 000000000000..9cb312e010d2
--- /dev/null
+++ b/dev-java/dnsjava/dnsjava-2.1.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An implementation of DNS in Java"
+HOMEPAGE="http://www.dnsjava.org/"
+SRC_URI="http://www.dnsjava.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+ test? (
+ dev-java/junit:0
+ dev-java/ant-junit:0
+ )"
+
+EANT_BUILD_TARGET="jar"
+EANT_DOC_TARGET="docs"
+EANT_TEST_TARGET="run_tests"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_TEST_GENTOO_CLASSPATH="junit"
+EANT_GENTOO_CLASSPATH_EXTRA="${P}.jar"
+
+src_prepare() {
+ default
+ java-pkg_clean
+ #epatch "${FILESDIR}"/*.patch
+}
+
+src_install() {
+ java-pkg_newjar "${P}.jar"
+
+ einstalldocs
+ use doc && java-pkg_dojavadoc doc
+ use source && java-pkg_dosrc org/
+}
+
+src_test() {
+ EANT_ANT_TASKS="ant-junit" java-pkg-2_src_test
+}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index aa6d99043ce0..f6e4af7f6482 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,3 +1,4 @@
DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
+DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
new file mode 100644
index 000000000000..bc88cf88156b
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.6.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
+SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/16"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="~dev-libs/protobuf-${PV}
+ >=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+ !=sys-devel/clang-3.1 )
+ dev-lang/perl"
+
+DOCS=( CREDITS README.markdown )
+
+# Tests are conducted via nqp
+RESTRICT=test
+
+src_configure() {
+ use doc && DOCS+=( docs/* )
+ local myconfigargs=(
+ "--prefix=/usr"
+ "--has-libuv"
+ "--has-libatomic_ops"
+ "--has-libffi"
+ "--libdir=$(get_libdir)"
+ "--compiler=$(usex clang clang gcc)"
+ "$(usex asan --asan)"
+ "$(usex debug --debug --no-debug)"
+ "$(usex optimize --optimize= --no-optimize)"
+ "$(usex static-libs --static)"
+ "$(usex ubsan --ubsan)"
+ )
+ use optimize && filter-flags '-O*'
+
+ perl Configure.pl "${myconfigargs[@]}" || die
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index aa49366d79ea..58aa35b1dfa0 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -4,3 +4,4 @@ DIST nqp-2018.03.tar.gz 3778268 BLAKE2B 16e8e3924daa3aecf9987e9c39173fb32a769cd6
DIST nqp-2018.04.1.tar.gz 3783660 BLAKE2B b596163b4d4a8d4b708d59dba586713e50edf3d5d1dc400960464e9528cefbf9867508712b74ee7014f4ad0badb742ca483816c6efff5909c8c52bf48d5fa85a SHA512 01211c8535873f26f1eb144033bbee318948dfaf2988f9f737002e41ad745294a6fe193e15d997e7d9297fcd2632fc71f9c9a6960c3af7606946c23e49d284de
DIST nqp-2018.04.tar.gz 3782652 BLAKE2B 0d36363956a3b150c5dbd7e9c094281680bfe2b87fa509e5a27ffc8be1df8ab82cd89276d9392c11b0912cf4d00d5a668dd6f497f4cfdf4914c40de2b0443c5c SHA512 5cb749577c5e985174c0721b92a00af7a93a5a7b3833718718b825d71d135ba14150b8a6bb065cf21356a37ea082431eacbff8ca63bce6f0ddeaf200494fe646
DIST nqp-2018.05.tar.gz 3785860 BLAKE2B 058f29acf6a9a2f79677dcca7fd145a8bf4d780eb516a874bf128cca4c8916e7b13868a29189888a22b827656156039a2fadaca26865d8a609559ebab6cec5c7 SHA512 463e795a6893dc418d87a347672781f8424ae3484f2d5ab20fa75a4fb226c239175d10889783e3cbca83c4f8d317406afa858f725dbe7f9869277f9d1cbcd9f0
+DIST nqp-2018.06.tar.gz 3792244 BLAKE2B 95cfa80c83951e91b71e14162c4c5cd78a8f546ba601002836d2b3fe79325aa26b963d0bb58df70935546f6960f3797a3a7762187defcb6b7c5124a7205bb257 SHA512 312f203c51f3d58bbc474cd7263a118f3438efe230a56a30f38a688b4a57aac88a94a0e6630736066255c122bb001d748a76272f7f634be8ddda91cc3340574b
diff --git a/dev-lang/nqp/nqp-2018.06.ebuild b/dev-lang/nqp/nqp-2018.06.ebuild
new file mode 100644
index 000000000000..2600c72c270a
--- /dev/null
+++ b/dev-lang/nqp/nqp-2018.06.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+ inherit vcs-snapshot
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="https://rakudo.org"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+ dev-java/asm:4
+ dev-java/jline:0
+ dev-java/jna:4
+ )
+ moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+ clang? ( sys-devel/clang )
+ java? ( >=virtual/jdk-1.7 )
+ dev-lang/perl"
+
+pkg_pretend() {
+ if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+ ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+ ewarn "already being installed. So if it fails, try uninstalling both"
+ ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+ ewarn "(see Bug #584394)"
+ fi
+}
+
+java_prepare() {
+ # Don't clean stage0 jars.
+ einfo "Cleaning upstream jars"
+ java-pkg_clean 3rdparty/
+
+ # Don't use jars we just deleted.
+ sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+ src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+ MULTIBUILD_VARIANTS=()
+ use moar && MULTIBUILD_VARIANTS+=( moar )
+ use java && MULTIBUILD_VARIANTS+=( jvm )
+
+ multibuild_copy_sources
+
+ # This will pull in conditional java_prepare
+ default
+}
+
+nqp_configure() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ local myconfargs=(
+ "--backend=${MULTIBUILD_VARIANT}"
+ "--prefix=/usr" )
+
+ perl Configure.pl "${myconfargs[@]}" || die
+ popd || die
+}
+
+nqp_compile() {
+ if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+ emake -j1 \
+ -C "${BUILD_DIR}" \
+ THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
+ JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+ elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+ emake -j1 \
+ -C "${BUILD_DIR}"
+ fi
+}
+
+nqp_test() {
+ emake -j1 \
+ -C "${BUILD_DIR}" \
+ test
+}
+
+nqp_install() {
+ # This is the actual reason we need multibuild.eclass.
+ # We need to distinguish the install procedure for MoarVM and JVM backends.
+ case "${MULTIBUILD_VARIANT}" in
+ moar)
+ emake \
+ DESTDIR="${ED}" \
+ -C "${BUILD_DIR}" \
+ install
+ ;;
+ jvm)
+ pushd "${BUILD_DIR}" > /dev/null || die
+ # Set JAVA_PKG_JARDEST early.
+ java-pkg_init_paths_
+
+ # Upstream sets the classpath to this location. Perhaps it's
+ # used to locate the additional libraries?
+ java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+ insinto "${JAVA_PKG_JARDEST}"
+ local jar
+
+ for jar in *.jar; do
+ if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+ # jars for NQP itself.
+ java-pkg_dojar ${jar}
+ else
+ # jars used by NQP.
+ doins ${jar}
+ fi
+ done
+
+ # Upstream uses -Xbootclasspath/a, which is faster due to lack
+ # of verification, but gjl isn't flexible enough yet. :(
+ java-pkg_dolauncher ${PN}-j --main ${PN}
+ dosym ${PN}-j /usr/bin/${PN}
+ dobin tools/jvm/eval-client.pl
+ popd > /dev/null || die
+ ;;
+ *)
+ die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+ ;;
+ esac
+}
+
+src_configure() {
+ multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+ multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+ multibuild_foreach_variant nqp_install
+
+ dodoc CREDITS README.pod
+ use doc && dodoc -r docs/*
+}
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 23cb3bcc92c5..d121f0482a8a 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -7,6 +7,6 @@ DIST perl-5.26.1.tar.xz 11922848 BLAKE2B 8ba5ac50bc6bc3cea1ede7dbd9b41566bd3f62e
DIST perl-5.26.2-patches-1.tar.xz 17100 BLAKE2B 681239e438945285e006ee1d1e2a9eb888fc9b425e6fbd4822e65e1fe1ced2216de76485b9792d3fee28783a588c09e1d34c294ef43d81055c4566af37fe9b6c SHA512 2a274150d2dba406c6efb67ec236f67032a51ff1788b30ea556e74b2f02fab68f5029ebd4b9d4daeb16b3a63fa7aa1744d323bf637a9d21946f19f33b69da245
DIST perl-5.26.2.tar.xz 11931624 BLAKE2B 2d54b155ace7c70a33adbe9911ba5384281aa49a0f6d4f452f4249b4deb58804268b473457470488f7592e041221f552b09156eb55c10078002aae3715446d9a SHA512 fd54c90da250144c81b94587c01c49fa367f84c54406f1d360ddab4a41589a7b19efc1707f95c95d6357fae66fc3f6f00bf69dd7741db114c7034a14f52be65f
DIST perl-5.28.0-RC2-patches-1.tar.xz 16544 BLAKE2B 7c22c1d7edee19d85788c1e0bd090c83c9480aea689ab483dcf982bef989624e4e6b1215c735377ef152ae95a6d59e7f167bf9b3f4def070b4d836a7d993419d SHA512 83b0198f2601ce48c0e8091862c11550e7c2a6bb9fbebef78368a421ec4d8ba8c810205b0f5dee483fb461bf6df55818a95a906f3fc8bc1d9627c8d4f69bc32a
-DIST perl-5.28.0-RC2.tar.xz 12412488 BLAKE2B 6ce7437398e119b10078dc2b138de9e53d80b09544eb6e950e6455f85fb10e6c6b0c075ff7219186b6ef556be919f81a6ed5f05531f835d8d2eca6589a968374 SHA512 d2b8ef4fb5e9563369e08d027b58345573d2ee0bbf0594526a9e82fab6a56206b16e317322650b42cff0299dde0b802d65b1c0b1bf4b854ffb89331bc0cf9a55
+DIST perl-5.28.0.tar.xz 12410536 BLAKE2B 620cca33c6d354b8b200bfff43dd155e6f89b9fe318f530d38c853a2b66fe67cc8410b6e5ab2a793d7ef578f2295a6fc4872483f81b5439d8573d75c5239fcfb SHA512 de701e37371b81cecf06098bb2c09017bde9cebaf9537d58838d0adf605ac2ecf739897b0a73576a7adb74d4cf65591ec4d2ed1f94b7191e695f88cb7e214a39
DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed5768ca8db61b5ac092ad6c0067386597875d6613c75671f026387ba474ce8c28789d6d77b9dcfc4cf4bf7227126 SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0
DIST perl-cross-1.1.9.tar.gz 102939 BLAKE2B 438ea75a14c4d60fdf3cb2f3671c736d229a83af210ba4fe6e79b989c6c4b45500d0221ec65bc71e1d43d234ec1daa20b3a19be6ceb01e638810900dbe3664a7 SHA512 002441012bd31f1ea71341707d91f89b76266c187c9d28f947ed5eddbcc6e3155e8dfd4b1814331561c3557764fea25bf6a938f08bcd4adfb5895361ad5a269a
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index e812d22cee6f..297e1ce4cd6d 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -16,7 +16,7 @@ DIST_AUTHOR=XSAWYERX
# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
PERL_BIN_OLDVERSEN=""
if [[ "${PV##*.}" == "9999" ]]; then
- DIST_VERSION=5.28.0-RC2
+ DIST_VERSION=5.28.0
else
DIST_VERSION="${PV/_rc/-RC}"
fi
@@ -75,7 +75,7 @@ PDEPEND="
S="${WORKDIR}/${MY_P}"
dual_scripts() {
- src_remove_dual perl-core/Archive-Tar 2.260.0 ptar ptardiff ptargrep
+ src_remove_dual perl-core/Archive-Tar 2.280.0 ptar ptardiff ptargrep
src_remove_dual perl-core/CPAN 2.200.0 cpan
src_remove_dual perl-core/Digest-SHA 6.10.0 shasum
src_remove_dual perl-core/Encode 2.970.0 enc2xs piconv
@@ -83,7 +83,7 @@ dual_scripts() {
src_remove_dual perl-core/ExtUtils-ParseXS 3.390.0 xsubpp
src_remove_dual perl-core/IO-Compress 2.74.0 zipdetails
src_remove_dual perl-core/JSON-PP 2.970.10 json_pp
- src_remove_dual perl-core/Module-CoreList 5.201.806.60 corelist
+ src_remove_dual perl-core/Module-CoreList 5.201.806.220 corelist
src_remove_dual perl-core/Pod-Parser 1.630.0 pod2usage podchecker podselect
src_remove_dual perl-core/Pod-Perldoc 3.280.100 perldoc
src_remove_dual perl-core/Test-Harness 3.420.0 prove
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 1b585bf29c6c..6bd4f45d838b 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -9,6 +9,7 @@ DIST Python-3.6.3.tar.xz 16974296 BLAKE2B 8220fc0c2eaa315d3972085b0f531f169adb6c
DIST Python-3.6.4.tar.xz 16992824 BLAKE2B 2347a70bb25468221178b1542ddd4376f136a515f2873ee1f640c4629eb77a9608af0f6be37128ba3e8ad614ebc17e7be20b73384983533aa77bca4403ea7935 SHA512 09ba2103ac517ac4d262f00380c9aac836a53401ce252540c17fd821a3b92e1ddf32528d00772221eb3126b12cb95b62c3ac3e852f4951e6f2eb406c88c848a2
DIST Python-3.6.5.tar.xz 17049912 BLAKE2B f393e9563a18a46c457afcd2e174d9eacda20fe2b0ae5461e11c582fa4d27b85c01bbe7b602f45511b6b44f635c6330205b12fb3e8325ffd07e87b78a8258889 SHA512 6b26fcd296b9bd8e67861eff10d14db7507711ddba947288d16d6def53135c39326b7f969c04bb2b2993f924d9e7ad3f5c5282a3915760bc0885cf0a8ea5eb51
DIST Python-3.6.6.tar.xz 17156744 BLAKE2B fa4333149f84570cc4a0d1ec76c819610888750a51268b9db7d05df7d9c11e5ed72daff5d81b404015d9c678cb034d8a32034262ce73629ee8f96772853a706c SHA512 c71f87c5906e770322a14cacad228655659f782207db826320449d12bf86091c3662f317e1773158dec52f8b052eaedfb4c03b561cc2a6cfcd381597fd2d2b04
+DIST Python-3.7.0.tar.xz 16922100 BLAKE2B cd2afd9ad1847ca793bc64ecb637906c35e0c8da8392d626cce3ebf19be5ccde1e6dcc499b933359cb24dcdbd024b3aaa916f96ed893b1f52d9825e404f27e5f SHA512 8bb11233fb67ee9ab8ed1b72f8fdc62f66e26a6beaaeb92448bce681cf065269833b1658d3ed2459127f25ba43adb0eab73cf27c59834a2a803fb529b4216739
DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
DIST python-gentoo-patches-3.4.5-0.tar.xz 12044 BLAKE2B 7fb3cc7dcd987debd5aa263d8e26b21aad439d8e3177c06c3683406a53bbda9652175673b09b6300f6a5b62148190cd8a75c9b65a5de04d770866733fcc0ebcb SHA512 108a4845667ecdf4001fcbeffab0cfbbac87439a449a7351428b0f3e2f159e3848ee0c0dfa45c9fba893b9f9584b33722fc8bb0bd7485a1d0909c3a35ede6ed8
@@ -17,3 +18,4 @@ DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B 4a7d71feff18c7c8c109bed1
DIST python-gentoo-patches-3.6.2-0.tar.xz 10744 BLAKE2B 3075754627617ac2ceee879eaf1a0e6564505655cdbdff380233a09df701a6188d64fe1f6a8c642b1fb05ef3c460a07042b6a362d655cd02717d6d9ba47983a1 SHA512 2aac1700c541202aa4f43bff4cb521b996d52ab350133318abaddb43f4b6e20548f37de472ace8024ef325ebf63fdfff0d43f8aa1f717d3c56f974b7aa1764e3
DIST python-gentoo-patches-3.6.4.tar.xz 12888 BLAKE2B 7cf49ae22df53e855f2e99df51686b5d4bd0da82ef4c22836e24726ea9ed561808352c0305a5659b052d38b843f1ff61b6466a7bc3673b7e5cfb4d81d22fa4bc SHA512 90a1b685f2539872ffd67f96581f70145b7afaf18af19f4a7f4a61214103d2a10bf0069c1769dac229ae011fceaf8538f041082b33c1671905246d018d184dd7
DIST python-gentoo-patches-3.6.6.tar.xz 13876 BLAKE2B 4be56b54e70c9b83209734097e03a7dbaa8f46ae13e268fc6a7f465ffd052ce03ca9e1fc45f1d432f2de17d4ce16ca8bc684b24344862cd8f52f9d1a90d90b7a SHA512 534b9eaefcbc45908119852a103bf10e400a8628c66aa599812fbceda36810d626d33e6701d1b7866e4df68397f717df6a217cb414049ca6f378eff9f43a27ab
+DIST python-gentoo-patches-3.7.0.tar.xz 12268 BLAKE2B 758b635ff53b6f7bfabb1db632ee2a5c14b163d6d6f14e4e44c31c9ac1591d411f597d42b05707f586f9ff7c3a030703502307bae732bcf003987939eb5b036d SHA512 19dd5bac06bb40622e74e3b16c7fba83f1178417e686eaf61b2b207602c76beebc8c78d675e401ec4d18add1ca033fd47baf2e48e9abb487593b7d821bcaf509
diff --git a/dev-lang/python/python-3.7.0.ebuild b/dev-lang/python/python-3.7.0.ebuild
new file mode 100644
index 000000000000..d1ab60b3112d
--- /dev/null
+++ b/dev-lang/python/python-3.7.0.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="3.7.0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+ https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.7/3.7m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+ app-arch/xz-utils:0=
+ >=sys-libs/zlib-1.1.3:0=
+ virtual/libffi
+ virtual/libintl
+ gdbm? ( sys-libs/gdbm:0=[berkdb] )
+ ncurses? ( >=sys-libs/ncurses-5.2:0= )
+ readline? ( >=sys-libs/readline-4.1:0= )
+ sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tk? (
+ >=dev-lang/tcl-8.0:0=
+ >=dev-lang/tk-8.0:0=
+ dev-tcltk/blt:0=
+ dev-tcltk/tix
+ )
+ xml? ( >=dev-libs/expat-2.1:0= )
+ !!=app-eselect/eselect-python-20140125-r1"
+
+S="${WORKDIR}/${MY_P}"
+PYVER=${SLOT%/*}
+
+src_prepare() {
+ # Ensure that internal copies of expat, libffi and zlib are not used.
+ rm -fr Modules/expat
+ rm -fr Modules/_ctypes/libffi*
+ rm -fr Modules/zlib
+
+ local PATCHES=(
+ "${WORKDIR}/patches"
+ )
+
+ default
+
+ sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+ eautoreconf
+}
+
+src_configure() {
+ local disable
+ # disable automagic bluetooth headers detection
+ use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+ use gdbm || disable+=" gdbm"
+ use ncurses || disable+=" _curses _curses_panel"
+ use readline || disable+=" readline"
+ use sqlite || disable+=" _sqlite3"
+ use ssl || export PYTHON_DISABLE_SSL="1"
+ use tk || disable+=" _tkinter"
+ use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+ export PYTHON_DISABLE_MODULES="${disable}"
+
+ if ! use xml; then
+ ewarn "You have configured Python without XML support."
+ ewarn "This is NOT a recommended configuration as you"
+ ewarn "may face problems parsing any XML documents."
+ fi
+
+ if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+ einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+ fi
+
+ if [[ "$(gcc-major-version)" -ge 4 ]]; then
+ append-flags -fwrapv
+ fi
+
+ filter-flags -malign-double
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=50309
+ if is-flagq -O3; then
+ is-flagq -fstack-protector-all && replace-flags -O3 -O2
+ use hardened && replace-flags -O3 -O2
+ fi
+
+ # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+ tc-export CXX
+
+ # Set LDFLAGS so we link modules with -lpython3.2 correctly.
+ # Needed on FreeBSD unless Python 3.2 is already installed.
+ # Please query BSD team before removing this!
+ append-ldflags "-L."
+
+ local dbmliborder
+ if use gdbm; then
+ dbmliborder+="${dbmliborder:+:}gdbm"
+ fi
+
+ local myeconfargs=(
+ --enable-shared
+ $(use_enable ipv6)
+ --infodir='${prefix}/share/info'
+ --mandir='${prefix}/share/man'
+ --with-computed-gotos
+ --with-dbmliborder="${dbmliborder}"
+ --with-libc=
+ --enable-loadable-sqlite-extensions
+ --without-ensurepip
+ --with-system-expat
+ --with-system-ffi
+ )
+
+ OPT="" econf "${myeconfargs[@]}"
+
+ if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+ eerror "configure has detected that the sem_open function is broken."
+ eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+ die "Broken sem_open function (bug 496328)"
+ fi
+}
+
+src_compile() {
+ # Ensure sed works as expected
+ # https://bugs.gentoo.org/594768
+ local -x LC_ALL=C
+
+ emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+ # Work around bug 329499. See also bug 413751 and 457194.
+ if has_version dev-libs/libffi[pax_kernel]; then
+ pax-mark E python
+ else
+ pax-mark m python
+ fi
+}
+
+src_test() {
+ # Tests will not work when cross compiling.
+ if tc-is-cross-compiler; then
+ elog "Disabling tests due to crosscompiling."
+ return
+ fi
+
+ # Skip failing tests.
+ local skipped_tests="gdb"
+
+ for test in ${skipped_tests}; do
+ mv "${S}"/Lib/test/test_${test}.py "${T}"
+ done
+
+ # bug 660358
+ local -x COLUMNS=80
+
+ local -x PYTHONDONTWRITEBYTECODE=
+
+ emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+ local result=$?
+
+ for test in ${skipped_tests}; do
+ mv "${T}/test_${test}.py" "${S}"/Lib/test
+ done
+
+ elog "The following tests have been skipped:"
+ for test in ${skipped_tests}; do
+ elog "test_${test}.py"
+ done
+
+ elog "If you would like to run them, you may:"
+ elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+ elog "and run the tests separately."
+
+ if [[ ${result} -ne 0 ]]; then
+ die "emake test failed"
+ fi
+}
+
+src_install() {
+ local libdir=${ED%/}/usr/lib/python${PYVER}
+
+ emake DESTDIR="${D}" altinstall
+
+ sed \
+ -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+ -e "s/\(PY_LDFLAGS=\).*/\1/" \
+ -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+ # Fix collisions between different slots of Python.
+ rm -f "${ED%/}/usr/$(get_libdir)/libpython3.so"
+
+ # Cheap hack to get version with ABIFLAGS
+ local abiver=$(cd "${ED%/}/usr/include"; echo python*)
+ if [[ ${abiver} != python${PYVER} ]]; then
+ # Replace python3.X with a symlink to python3.Xm
+ rm "${ED%/}/usr/bin/python${PYVER}" || die
+ dosym "${abiver}" "/usr/bin/python${PYVER}"
+ # Create python3.X-config symlink
+ dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+ # Create python-3.5m.pc symlink
+ dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+ fi
+
+ # python seems to get rebuilt in src_install (bug 569908)
+ # Work around it for now.
+ if has_version dev-libs/libffi[pax_kernel]; then
+ pax-mark E "${ED%/}/usr/bin/${abiver}"
+ else
+ pax-mark m "${ED%/}/usr/bin/${abiver}"
+ fi
+
+ use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+ use tk || rm -r "${ED%/}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+ use threads || rm -r "${libdir}/multiprocessing" || die
+ use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+ dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+ doins -r "${S}"/Tools
+ fi
+ insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+ local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+ emake --no-print-directory -s -f - 2>/dev/null)
+ newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+ sed \
+ -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+ -e "s:@PYDOC@:pydoc${PYVER}:" \
+ -i "${ED%/}/etc/conf.d/pydoc-${PYVER}" "${ED%/}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+ # for python-exec
+ local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
+
+ # if not using a cross-compiler, use the fresh binary
+ if ! tc-is-cross-compiler; then
+ local -x PYTHON=./python
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+ else
+ vars=( PYTHON "${vars[@]}" )
+ fi
+
+ python_export "python${PYVER}" "${vars[@]}"
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ # python-exec wrapping support
+ local pymajor=${PYVER%.*}
+ mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die
+ # python and pythonX
+ ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+ ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die
+ # python-config and pythonX-config
+ # note: we need to create a wrapper rather than symlinking it due
+ # to some random dirname(argv[0]) magic performed by python-config
+ cat > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+ #!/bin/sh
+ exec "${abiver}-config" "\${@}"
+ EOF
+ chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+ ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die
+ # 2to3, pydoc, pyvenv
+ ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die
+ ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die
+ ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die
+ # idle
+ if use tk; then
+ ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die
+ fi
+}
+
+pkg_preinst() {
+ if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+ python_updater_warning="1"
+ fi
+}
+
+eselect_python_update() {
+ if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+ eselect python update
+ fi
+
+ if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+ eselect python update --python${PV%%.*}
+ fi
+}
+
+pkg_postinst() {
+ eselect_python_update
+
+ if [[ "${python_updater_warning}" == "1" ]]; then
+ ewarn "You have just upgraded from an older version of Python."
+ ewarn
+ ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+ fi
+}
+
+pkg_postrm() {
+ eselect_python_update
+}
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index ee0e39008d8f..448e5b9f407d 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -5,3 +5,4 @@ DIST rakudo-2018.03.tar.gz 3492524 BLAKE2B be2d9fbc8789e78025e18da873873d9987298
DIST rakudo-2018.04.1.tar.gz 3511991 BLAKE2B 9d87e10664ebe59e258e12166bf12390c52a09f32e07adabe30454169016f4ea1649cf215bbb0a093dc5cb332cae9c4adc9cdc87f5276a5006cd84d8c9731b04 SHA512 e57d34c08e32e7ace5ab681f4472409bb9a2eb74361784b4ef43aa1a4b6adeed903219a1810063a10b5c0baf113a9cf88b00c989347c0c395a041a018fd9a626
DIST rakudo-2018.04.tar.gz 3512276 BLAKE2B 9d9bb4070a27ce3185c5ebc2627a5f05359d23fc9377954c30edac7f36bbe4089d3b35da0e2ec17a20c155d857219aa962baa058e393bc6690e2ba30731cfa73 SHA512 5a549113583ce94c2606b7aa5fad2089f1ccebd50f503ce0eb24163599ed3aacd26dd876c6ace675798d577b8063ba260c1b4553c382cf4d13041d692a5bdf6a
DIST rakudo-2018.05.tar.gz 3515782 BLAKE2B a39df1867bc099dd46262fd29e9f1a9544e995a6383efc438d3e0dd9a7f6d0782a437cfee2220f268d5ce4dd34e6532317f3ecc0693bc82100e328dd5dd7ccbd SHA512 d3514cd46d46ce44eac0e84292504a62669de5b5b053012a36a4c742059d8c2302752a41cd30c20d1b5f11acfdb09b8d855401b0e971e811216899c8b7dd66fc
+DIST rakudo-2018.06.tar.gz 3520888 BLAKE2B 68d568650aef1dcc4bf84843232db0d8f918684c69d80028acd12846fb913dd9600bed2b42ec55019d752370672de3f2fe81c498ffc892ab03954630a2158ea0 SHA512 574b074b4a2412b4e020906645787b9e57160a9e87c58b73771b1a3732a39a5b961d778d25a8099a8da5e7b3df57b84599df64cd65089a63fe236f3cae06355d
diff --git a/dev-lang/rakudo/rakudo-2018.06.ebuild b/dev-lang/rakudo/rakudo-2018.06.ebuild
new file mode 100644
index 000000000000..5d27b8d2e3cd
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2018.06.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="https://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://rakudo.perl6.org/downloads/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+ clang? ( sys-devel/clang )
+ java? ( >=virtual/jdk-1.7 )
+ >=dev-lang/perl-5.10"
+
+pkg_pretend() {
+ if has_version dev-lang/rakudo; then
+ ewarn "Rakudo is known to fail compilation/installation with Rakudo"
+ ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
+ ewarn "then do a new installation."
+ ewarn "(see Bug #584394)"
+ fi
+}
+
+src_configure() {
+ local backends
+ use moar && backends+="moar,"
+ use java && backends+="jvm"
+
+ local myargs=(
+ "--prefix=/usr"
+ "--sysroot=/"
+ "--sdkroot=/"
+ "--backends=${backends}"
+ )
+
+ perl Configure.pl "${myargs[@]}" || die
+
+ if use java; then
+ NQP=$(java-pkg_getjars --with-dependencies nqp)
+ fi
+}
+
+src_compile() {
+ emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
+}
+
+src_test() {
+ RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index ed181dec4ec0..86c2ecad3b9c 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,7 +1,7 @@
DIST js-1.7.0.tar.gz 1165607 BLAKE2B 61749e10886bbb9e4958a41925fae8dcbd7d943b9bf838878368c30e26ba61f300bc2ec37982653b87fedf76707dda2ffd510282de4bce87d1da11ca42fa108c SHA512 9d9fbd9c1dae969ca19ddb0f977ac56f3e0479ec393b859de252fcdd8b7fc325e80399073540884ed365ce56a3219be34c0db9300d5e50f32969660c90527e51
DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
DIST mozjs-24.2.0.tar.bz2 15624530 BLAKE2B 633f3e42011a8395aa4e60842c2de1cb472692a0d9355c1e2c49e1ef943605cafaea0c836f9044adfceb38d7e04a0941b895474d08097f641bfca4494c5c5fe4 SHA512 49805e256f6fa797505c01b7596d5bb941ed7a2454862c52ed42ad48b5ae4540b777e77ed8da1b98c89f8622ed2c76052187983687008a4ff53594addb328df4
-DIST mozjs-38.2.1.rc0.tar.bz2 25012381 BLAKE2B 314c8efe11d7daf0918d367a249f5dfd466a665002639627cee0c4857f9419b3ab1af6a006c46893ba027c724971658c3b9d32cd155ed0ab13299198a46288c0 SHA512 60262c7619cc418569aec81775a671105acbc5bf372273828868f2fbbbc4ea33f78380f7455710816bfcdae828fb4115a08234d599cb30d0db859fcba17f019d
+DIST mozjs-38.3.0sfink2.tar.bz2 27232902 BLAKE2B 42a039a41b7479a32e22f260cb58f098e1a1d4833f801f193bdd8b75403f94567b9ef2ebe85b2a811fe2f9b27cd934afe1054bd4e7d9aae0b8a80acdec8e42a4 SHA512 debad1fbd21e025c567b083677cfd0a2023ec2aff750241f495ac2977034a7299e068cb3b0b2351c97457119cc8aef563f00416092a70a3a269d20947b700206
DIST mozjs-45.0.2.tar.bz2 97508152 BLAKE2B 89600f7e2a3effe71ad140646110aaf3be91cc5313cf227f1d16e796e249e287cc8dbf2599aa4277f2652a83ec3570f58c1c51ef319632254b9ac5caec46bb9a SHA512 84a3cf12e2603e00bcfe518a1a5000f53b21758c1c6b32a0410e63ab7db8d4452028195b0ba3e56144054b06e90f8e5195b4db94dba711f7c75d11da99c6c61d
DIST mozjs-52.4.0_pre20171003.tar.bz2 30588541 BLAKE2B ca3dace6f22d510d6d9f087f236100cae4b913b8d194fdec77f2a32b82276613417344fc4d899fca0d908ecb981d59f7e5608e7cd62f6f134dbcdf87f89a3276 SHA512 80e006ed7550b64dad7cf78335dd9f2d34f50ad486439887f0088eb3817242d24cf7c1d9325e2dcd4a01fd5c5f54d710873113b97fd914ccd961fa46a71653fa
DIST mozjs17.0.0.tar.gz 6778934 BLAKE2B a37debf5079fc4c27bb9edd3172c6e7914f6128fac6ffa97b49ac266c477d0916b180fb68ecd0916a52f935959a83d73254b0ba72b4898adc5e3b85927d17d2a SHA512 39b68aeb9f712f146778d8b68ee795709a1372c8ab893a222af4eb34882427d6f5cf877e743d6cb2f1b4348c194d8f3774f00cb775b03515b34b49560b748be4
diff --git a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
similarity index 95%
rename from dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
rename to dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
index 4f65d974ce97..f5454e5a3173 100644
--- a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
@@ -6,21 +6,21 @@ WANT_AUTOCONF="2.1"
inherit autotools toolchain-funcs pax-utils mozcoreconf-v4
MY_PN="mozjs"
-MY_P="${MY_PN}-${PV/_/.}"
+MY_P="${MY_PN}-${PV/_/.}sfink2"
DESCRIPTION="Stand-alone JavaScript C library"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-SRC_URI="https://people.mozilla.org/~sstangl/${MY_P}.tar.bz2
+SRC_URI="https://archive.mozilla.org/pub/${PN}/releases/${PV}/${MY_P}.tar.bz2
https://dev.gentoo.org/~axs/distfiles/${PN}-slot38-patches-01.tar.xz"
LICENSE="NPL-1.1"
SLOT="38"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
IUSE="debug +jit minimal static-libs +system-icu test"
RESTRICT="ia64? ( test )"
#S="${WORKDIR}/${MY_P%.rc*}"
-S="${WORKDIR}/${MY_PN}-${SLOT}.0.0"
+S="${WORKDIR}/${MY_P}"
BUILDDIR="${S}/js/src"
RDEPEND=">=dev-libs/nspr-4.10.10
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 161bd90b72ed..ad7131e49d7c 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 658674a41ba7..b0d2cf5f8f79 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,2 +1 @@
-DIST double-conversion-2.0.1.tar.gz 7014148 BLAKE2B df8df63f601076bd827ef95b2a2cde8bec6a85fb6ee81a879556481a168c2a101b3ca130ed6f45ca515281ea139e4a607a03934b05fc0a2fe5bacdf56033f2b3 SHA512 a4773dc95e9267d8426dda976586aa1ba968ead28b118caae9b1b7c123d1eea4aba5b588fde9a109a99a068a79a3a2426f12d6caadea8c548d4250e56eff33a4
DIST double-conversion-3.0.0.tar.gz 7019526 BLAKE2B 631973dadefa8bbf7e4acffd44968dfbf6b7dbeeb045fbbe0df7824a890991f510131647a52646fcd2b069b8b886a7b66a82434b829bdcb58bd8f503fecc7d18 SHA512 5057af6e72f2aaace56ebdd9a0ddfa34318cbdfeabec5c361b60e6c92f160c8999c046c50f8c6f8d590eb8e97aa70bb6e97ba8148f0dc95dbc42f204fcdc1abf
diff --git a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild b/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
deleted file mode 100644
index 15ab24390e36..000000000000
--- a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit scons-utils eutils toolchain-funcs
-
-DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
-HOMEPAGE="https://github.com/google/double-conversion"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-LIBNAME=lib${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-scons.patch
-}
-
-src_compile() {
- sed -i -e "s/g++/$(tc-getCXX)/" SConstruct || die
- escons ${LIBNAME}.so.1
- use static-libs && escons ${LIBNAME}.a
-}
-
-src_test() {
- escons run_tests
- export LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}"
- ./run_tests --list | tr -d '<' | xargs ./run_tests || die
-}
-
-src_install() {
- dolib.so ${LIBNAME}.so*
- use static-libs && dolib.a ${LIBNAME}.a
- insinto /usr/include/double-conversion
- doins src/{double-conversion,utils}.h
- dodoc README Changelog AUTHORS
-}
diff --git a/dev-libs/double-conversion/double-conversion-3.0.0-r1.ebuild b/dev-libs/double-conversion/double-conversion-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..786bdf2fd13a
--- /dev/null
+++ b/dev-libs/double-conversion/double-conversion-3.0.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multibuild
+
+DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
+HOMEPAGE="https://github.com/google/double-conversion"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+ if [[ ${MULTIBUILD_VARIANT} = shared ]]; then
+ mycmakeargs+=( -DBUILD_SHARED_LIBS=ON )
+ fi
+ if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+ mycmakeargs+=( -DBUILD_SHARED_LIBS=OFF )
+ fi
+
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
+}
+
+src_install() {
+ myinstall() {
+ [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_install
+ [[ ${MULTIBUILD_VARIANT} = static-libs ]] && \
+ dolib ${BUILD_DIR}/double-conversion/libdouble-conversion.a
+ }
+
+ multibuild_foreach_variant myinstall
+}
diff --git a/dev-libs/double-conversion/double-conversion-3.0.0.ebuild b/dev-libs/double-conversion/double-conversion-3.0.0.ebuild
index d7e52cc7fc70..dbf24f02e4b7 100644
--- a/dev-libs/double-conversion/double-conversion-3.0.0.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
IUSE="test"
src_configure() {
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index cdd5dd4ec7f6..419fb94e3157 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
IUSE="+cairo examples gtk test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND="
>=dev-libs/glib-2.52.1
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 809dfbed5759..023d1a11b366 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -3,3 +3,4 @@ DIST libfmt-3.0.2.tar.gz 608369 BLAKE2B abc4634a8f3da9eed68e5f52497503a34a25e8cd
DIST libfmt-4.0.0.tar.gz 617818 BLAKE2B 0cbbbb86bb6ff488226786c40cdf919fa2004c25a3da7a11ec69b81b08ca58a6a721c4e11f42a684d790c61b6ba0012d04f3af8b75f38ff2fd80332e80795a82 SHA512 8b9f7ce4720c3caef6de4a75b8d4b0fd7db4f1638edca98d5ea95f4a5157aef8faefbac68438236691bd373111ca089b4d3864f7352f3fba1fe44392e9644f8b
DIST libfmt-4.1.0.tar.gz 620863 BLAKE2B ff3a7db5a1eed3a6fc936be16caf2dd153d9452df16c07d6e0dc718bcfb9f51f52146498cb3f49591f1ad96d36a9561de2a78426d3bb8a0907b772e8be5a6f7f SHA512 8daaa4a61bfe63345a12df0a9bca0b1cd6a162d0f4e97d2d2978ae19a1a1357ec4d4cce948ce726cdbe9403e51ad995950a2a99de28f9b9085c02ce845540b22
DIST libfmt-5.0.0.tar.gz 634165 BLAKE2B 32ef9f655e4864ef6decd6e8545260996834103cc7cbf0df7bce00afe88c15a9821fe2d46d3f6f1e3a729b45916c515e088e3a04a4e46e709e7c74fe3e04f34c SHA512 1ce93648ab7aca6082767ff009d5836e226fa42f183852ca15230f371ef0a34878110ca63d8669a68de7f115c137fdaa11de998986a9440f08d50f0f214ebb90
+DIST libfmt-5.1.0.tar.gz 641502 BLAKE2B 8507e875a78de2e89b7fe2c1c049691bfef6e0a7375ef7958e2191bcc4c60972b54b6ebc213d1465826af8322d8f90b217c1c7e176b29351c733184ff95cca40 SHA512 b759a718353254fa8cd981e483bf01a45af0fc76901216404ace5e47f5d3edf43d42422184e5413c221e49832322fdf60d1860e8ec87349c674511064b31e5d6
diff --git a/dev-libs/libfmt/libfmt-5.1.0.ebuild b/dev-libs/libfmt/libfmt-5.1.0.ebuild
new file mode 100644
index 000000000000..205d52c52e72
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-5.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib versionator
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+LICENSE="BSD-2"
+IUSE="test"
+SLOT="0/$(get_major_version)"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/fmt-${PV}"
+fi
+
+DEPEND=""
+RDEPEND=""
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+ -DFMT_LIB_DIR="$(get_libdir)"
+ -DFMT_TEST=$(usex test)
+ -DBUILD_SHARED_LIBS=ON
+ )
+ cmake-utils_src_configure
+}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
index 980dcda24850..7286569a35b5 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="0/20" # subslot = soname major version
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-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 ~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="doc o-flag-munging static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
index c1cd62c653c8..f8a3e3daaca1 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-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 ~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="common-lisp nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index a388032af6fa..6dc1f8e19a68 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,4 +1,4 @@
DIST libinput-1.10.6.tar.xz 495536 BLAKE2B 3f23808635406eeb66cd6b4ce2a2dbaed69ee0917045f75ad262a59702d72923493b6faa7951ea3f7cc2591d4c9e1fc49cffc53b6dfbcb2aadc7b9f40c20517b SHA512 b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4
DIST libinput-1.10.7.tar.xz 494648 BLAKE2B ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892 SHA512 b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
-DIST libinput-1.11.0.tar.xz 485976 BLAKE2B f0bd88463b6aba7bfcf80d3354e53fe86e367a29055e295621d84175720544af035cc6303a2777d6ac4535d4706c41fa435a3a5a3abd20eb9ad33366dad4eae8 SHA512 382a6c9ec4aaf13ac209ee5a7f507c7a6d2dd399c5104703ac7c6ac62fb3f393de6f4e15d7895b18c8b8d845ce8fc1f551a90aa7532f0de4cc17e57a09cfe857
DIST libinput-1.11.1.tar.xz 485064 BLAKE2B 15ab0fddee37323f3df0b52e297ac5b0995e7db6531854852a21c7182474df0ffb136886e3d305d987dcb4f82e9f1cf3724e2f34448ef40ed1df10bd27cb2218 SHA512 3dd1a318c89d66f5a66016c6dbfa5277b61a8cb5337d99f85b1eeef40ed894bdc04fd4588a97383988daea0f034df5a72bff318325320a01b857db9deb94a2b0
+DIST libinput-1.11.2.tar.xz 485600 BLAKE2B 97b07493693e24be1bde3e7792c83c33b9ed4d64afbbecc1a5b77b4470fe9ff03cfbb2b4dc36f6cc5a9d58003410797979d7fbbb539d921bb9cddb5f8fb1cf0e SHA512 cb6ada877fc3c09f634f3db39d5507e66d4b86c3d632bb8f7498c7b01fdf8372b2053a79b641293900b7fcc0aa4e920f7c830d9c7b2d9ff3cd61c58eb7c20b65
diff --git a/dev-libs/libinput/libinput-1.11.0.ebuild b/dev-libs/libinput/libinput-1.11.2.ebuild
similarity index 100%
rename from dev-libs/libinput/libinput-1.11.0.ebuild
rename to dev-libs/libinput/libinput-1.11.2.ebuild
diff --git a/dev-libs/libressl/libressl-2.6.5.ebuild b/dev-libs/libressl/libressl-2.6.5.ebuild
index eae7a5ae1579..4df602fa9662 100644
--- a/dev-libs/libressl/libressl-2.6.5.ebuild
+++ b/dev-libs/libressl/libressl-2.6.5.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
# we'll try to use the max of either. However, if either change between
# versions, we have to change the subslot to trigger rebuild of consumers.
SLOT="0/44"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
IUSE="+asm static-libs test"
REQUIRED_USE="test? ( static-libs )"
diff --git a/dev-libs/libuv/files/libuv-1.21.0-UV_FS_LCHOWN.patch b/dev-libs/libuv/files/libuv-1.21.0-UV_FS_LCHOWN.patch
new file mode 100644
index 000000000000..edd996b70d8c
--- /dev/null
+++ b/dev-libs/libuv/files/libuv-1.21.0-UV_FS_LCHOWN.patch
@@ -0,0 +1,32 @@
+diff --git a/docs/src/fs.rst b/docs/src/fs.rst
+index a390f1409..f383e5b10 100644
+--- a/docs/src/fs.rst
++++ b/docs/src/fs.rst
+@@ -92,9 +92,9 @@ Data types
+ UV_FS_READLINK,
+ UV_FS_CHOWN,
+ UV_FS_FCHOWN,
+- UV_FS_LCHOWN,
+ UV_FS_REALPATH,
+- UV_FS_COPYFILE
++ UV_FS_COPYFILE,
++ UV_FS_LCHOWN
+ } uv_fs_type;
+
+ .. c:type:: uv_dirent_t
+diff --git a/include/uv.h b/include/uv.h
+index 91451ada7..efb7b61cf 100644
+--- a/include/uv.h
++++ b/include/uv.h
+@@ -1141,9 +1141,9 @@ typedef enum {
+ UV_FS_READLINK,
+ UV_FS_CHOWN,
+ UV_FS_FCHOWN,
+- UV_FS_LCHOWN,
+ UV_FS_REALPATH,
+- UV_FS_COPYFILE
++ UV_FS_COPYFILE,
++ UV_FS_LCHOWN
+ } uv_fs_type;
+
+ /* uv_fs_t is a subclass of uv_req_t. */
diff --git a/dev-libs/libuv/libuv-1.21.0.ebuild b/dev-libs/libuv/libuv-1.21.0-r1.ebuild
similarity index 95%
rename from dev-libs/libuv/libuv-1.21.0.ebuild
rename to dev-libs/libuv/libuv-1.21.0-r1.ebuild
index 1edbef416b0b..5a5b2d1a24a9 100644
--- a/dev-libs/libuv/libuv-1.21.0.ebuild
+++ b/dev-libs/libuv/libuv-1.21.0-r1.ebuild
@@ -17,6 +17,9 @@ RESTRICT="test"
DEPEND="sys-devel/libtool
virtual/pkgconfig[${MULTILIB_USEDEP}]"
+PATCHES=(
+ "${FILESDIR}"/${P}-UV_FS_LCHOWN.patch
+)
src_prepare() {
default
diff --git a/dev-libs/onigmo/metadata.xml b/dev-libs/onigmo/metadata.xml
index 13d462e45dc0..b9924f7d1fec 100644
--- a/dev-libs/onigmo/metadata.xml
+++ b/dev-libs/onigmo/metadata.xml
@@ -1,10 +1,7 @@
-
- mrueg@gentoo.org
- Manuel Rüger
-
+
Reflect ABI of libonigmo.so.
diff --git a/dev-libs/protobuf-c/files/protobuf-c-1.3.0-protobuf-3.6.patch b/dev-libs/protobuf-c/files/protobuf-c-1.3.0-protobuf-3.6.patch
new file mode 100644
index 000000000000..d6d8ffe93255
--- /dev/null
+++ b/dev-libs/protobuf-c/files/protobuf-c-1.3.0-protobuf-3.6.patch
@@ -0,0 +1,202 @@
+https://github.com/protobuf-c/protobuf-c/pull/309
+https://github.com/protobuf-c/protobuf-c/pull/328
+
+--- /protoc-c/c_field.cc
++++ /protoc-c/c_field.cc
+@@ -189,7 +189,7 @@
+ FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor)
+ : descriptor_(descriptor),
+ field_generators_(
+- new scoped_ptr[descriptor->field_count()]) {
++ new std::unique_ptr[descriptor->field_count()]) {
+ // Construct all the FieldGenerators.
+ for (int i = 0; i < descriptor->field_count(); i++) {
+ field_generators_[i].reset(MakeGenerator(descriptor->field(i)));
+--- /protoc-c/c_field.h
++++ /protoc-c/c_field.h
+@@ -117,7 +117,7 @@
+
+ private:
+ const Descriptor* descriptor_;
+- scoped_array > field_generators_;
++ std::unique_ptr[] > field_generators_;
+
+ static FieldGenerator* MakeGenerator(const FieldDescriptor* field);
+
+--- /protoc-c/c_file.cc
++++ /protoc-c/c_file.cc
+@@ -83,13 +83,13 @@
+ const string& dllexport_decl)
+ : file_(file),
+ message_generators_(
+- new scoped_ptr[file->message_type_count()]),
++ new std::unique_ptr[file->message_type_count()]),
+ enum_generators_(
+- new scoped_ptr[file->enum_type_count()]),
++ new std::unique_ptr[file->enum_type_count()]),
+ service_generators_(
+- new scoped_ptr[file->service_count()]),
++ new std::unique_ptr[file->service_count()]),
+ extension_generators_(
+- new scoped_ptr[file->extension_count()]) {
++ new std::unique_ptr[file->extension_count()]) {
+
+ for (int i = 0; i < file->message_type_count(); i++) {
+ message_generators_[i].reset(
+--- /protoc-c/c_file.h
++++ /protoc-c/c_file.h
+@@ -98,13 +98,13 @@
+ private:
+ const FileDescriptor* file_;
+
+- scoped_array > message_generators_;
+- scoped_array > enum_generators_;
+- scoped_array > service_generators_;
+- scoped_array > extension_generators_;
++ std::unique_ptr[] > message_generators_;
++ std::unique_ptr[] > enum_generators_;
++ std::unique_ptr[] > service_generators_;
++ std::unique_ptr[] > extension_generators_;
+
+ // E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}.
+- vector package_parts_;
++ std::vector package_parts_;
+
+ GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator);
+ };
+--- /protoc-c/c_generator.cc
++++ /protoc-c/c_generator.cc
+@@ -80,13 +80,13 @@
+ // "foo=bar,baz,qux=corge"
+ // parses to the pairs:
+ // ("foo", "bar"), ("baz", ""), ("qux", "corge")
+-void ParseOptions(const string& text, vector >* output) {
+- vector parts;
++void ParseOptions(const string& text, std::vector >* output) {
++ std::vector parts;
+ SplitStringUsing(text, ",", &parts);
+
+ for (unsigned i = 0; i < parts.size(); i++) {
+ string::size_type equals_pos = parts[i].find_first_of('=');
+- pair value;
++ std::pair value;
+ if (equals_pos == string::npos) {
+ value.first = parts[i];
+ value.second = "";
+@@ -105,7 +105,7 @@
+ const string& parameter,
+ OutputDirectory* output_directory,
+ string* error) const {
+- vector > options;
++ std::vector > options;
+ ParseOptions(parameter, &options);
+
+ // -----------------------------------------------------------------
+@@ -149,7 +149,7 @@
+
+ // Generate header.
+ {
+- scoped_ptr output(
++ std::unique_ptr output(
+ output_directory->Open(basename + ".h"));
+ io::Printer printer(output.get(), '$');
+ file_generator.GenerateHeader(&printer);
+@@ -157,7 +157,7 @@
+
+ // Generate cc file.
+ {
+- scoped_ptr output(
++ std::unique_ptr output(
+ output_directory->Open(basename + ".c"));
+ io::Printer printer(output.get(), '$');
+ file_generator.GenerateSource(&printer);
+--- /protoc-c/c_helpers.cc
++++ /protoc-c/c_helpers.cc
+@@ -177,7 +177,7 @@
+ }
+
+ string FullNameToLower(const string &full_name) {
+- vector pieces;
++ std::vector pieces;
+ SplitStringUsing(full_name, ".", &pieces);
+ string rv = "";
+ for (unsigned i = 0; i < pieces.size(); i++) {
+@@ -188,7 +188,7 @@
+ return rv;
+ }
+ string FullNameToUpper(const string &full_name) {
+- vector pieces;
++ std::vector pieces;
+ SplitStringUsing(full_name, ".", &pieces);
+ string rv = "";
+ for (unsigned i = 0; i < pieces.size(); i++) {
+@@ -199,7 +199,7 @@
+ return rv;
+ }
+ string FullNameToC(const string &full_name) {
+- vector pieces;
++ std::vector pieces;
+ SplitStringUsing(full_name, ".", &pieces);
+ string rv = "";
+ for (unsigned i = 0; i < pieces.size(); i++) {
+@@ -214,7 +214,7 @@
+ {
+ if (!comment.empty())
+ {
+- vector comment_lines;
++ std::vector comment_lines;
+ SplitStringUsing (comment, "\r\n", &comment_lines);
+ printer->Print ("/*\n");
+ for (int i = 0; i < comment_lines.size(); i++)
+@@ -503,8 +503,8 @@
+
+ void SplitStringUsing(const string& full,
+ const char* delim,
+- vector* result) {
+- std::back_insert_iterator< vector > it(*result);
++ std::vector* result) {
++ std::back_insert_iterator< std::vector > it(*result);
+ SplitStringToIteratorUsing(full, delim, it);
+ }
+
+@@ -559,7 +559,7 @@
+ }
+ string CEscape(const string& src) {
+ const int dest_length = src.size() * 4 + 1; // Maximum possible expansion
+- scoped_array dest(new char[dest_length]);
++ std::unique_ptr dest(new char[dest_length]);
+ const int len = CEscapeInternal(src.data(), src.size(),
+ dest.get(), dest_length, false);
+ GOOGLE_DCHECK_GE(len, 0);
+--- /protoc-c/c_message.cc
++++ /protoc-c/c_message.cc
+@@ -83,11 +83,11 @@
+ : descriptor_(descriptor),
+ dllexport_decl_(dllexport_decl),
+ field_generators_(descriptor),
+- nested_generators_(new scoped_ptr[
++ nested_generators_(new std::unique_ptr[
+ descriptor->nested_type_count()]),
+- enum_generators_(new scoped_ptr[
++ enum_generators_(new std::unique_ptr[
+ descriptor->enum_type_count()]),
+- extension_generators_(new scoped_ptr[
++ extension_generators_(new std::unique_ptr[
+ descriptor->extension_count()]) {
+
+ for (int i = 0; i < descriptor->nested_type_count(); i++) {
+--- /protoc-c/c_message.h
++++ /protoc-c/c_message.h
+@@ -126,9 +126,9 @@
+ const Descriptor* descriptor_;
+ string dllexport_decl_;
+ FieldGeneratorMap field_generators_;
+- scoped_array > nested_generators_;
+- scoped_array > enum_generators_;
+- scoped_array > extension_generators_;
++ std::unique_ptr[] > nested_generators_;
++ std::unique_ptr[] > enum_generators_;
++ std::unique_ptr[] > extension_generators_;
+
+ GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator);
+ };
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
index 1d5c6ad3dce1..bed34d3628b8 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
@@ -9,7 +9,7 @@ MY_PV="${PV/_/-}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="Protocol Buffers implementation in C"
-HOMEPAGE="https://github.com/protobuf-c/protobuf-c/"
+HOMEPAGE="https://github.com/protobuf-c/protobuf-c"
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
LICENSE="BSD-2"
@@ -20,16 +20,18 @@ IUSE="static-libs test"
RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
- test? ( ${AUTOTOOLS_DEPEND} )
virtual/pkgconfig[${MULTILIB_USEDEP}]"
-PATCHES=( "${FILESDIR}"/${PN}-1.3.0-restore-protobuf-2-compatibility.patch )
+PATCHES=(
+ "${FILESDIR}/${P}-restore-protobuf-2-compatibility.patch"
+ "${FILESDIR}/${P}-protobuf-3.6.patch"
+)
S="${WORKDIR}/${MY_P}"
src_prepare() {
default
- if ! use test ; then
+ if ! use test; then
eapply "${FILESDIR}"/${PN}-1.3.0-no-build-tests.patch
fi
@@ -38,5 +40,6 @@ src_prepare() {
multilib_src_configure() {
ECONF_SOURCE="${S}" \
- econf "${myeconfargs[@]}"
+ econf \
+ $(use_enable static-libs static)
}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index aa6d99043ce0..f6e4af7f6482 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,3 +1,4 @@
DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
+DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
diff --git a/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch
new file mode 100644
index 000000000000..834f6b0d1ab5
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch
@@ -0,0 +1,19 @@
+Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings.
+
+--- /src/Makefile.am
++++ /src/Makefile.am
+@@ -717,7 +717,7 @@
+ GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+ protobuf-lite-test test_plugin protobuf-lite-arena-test \
+- no-warning-test $(GZCHECKPROGRAMS)
++ $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+ $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+ $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+@@ -900,4 +900,4 @@
+
+ TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
+ google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \
+- protobuf-lite-arena-test no-warning-test
++ protobuf-lite-arena-test
diff --git a/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
new file mode 100644
index 000000000000..f515b6cd1a47
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
@@ -0,0 +1,233 @@
+https://github.com/google/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
++++ /src/google/protobuf/compiler/command_line_interface.cc
+@@ -931,6 +931,28 @@
+ }
+
+ if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++ bool success = false;
++ int in_fd = STDIN_FILENO;
++ int out_fd = STDOUT_FILENO;
++
++ if (!protobuf_in_path_.empty()) {
++ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++ if (in_fd == -1) {
++ std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
++ return 1;
++ }
++ }
++ if (!protobuf_out_path_.empty()) {
++ out_fd = open(protobuf_out_path_.c_str(),
++ O_WRONLY | O_CREAT | O_TRUNC,
++ 0644);
++ if (out_fd == -1) {
++ std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
++ close(in_fd);
++ return 1;
++ }
++ }
++
+ if (codec_type_.empty()) {
+ // HACK: Define an EmptyMessage type to use for decoding.
+ DescriptorPool pool;
+@@ -939,13 +961,20 @@
+ file.add_message_type()->set_name("EmptyMessage");
+ GOOGLE_CHECK(pool.BuildFile(file) != NULL);
+ codec_type_ = "EmptyMessage";
+- if (!EncodeOrDecode(&pool)) {
+- return 1;
+- }
++ success = EncodeOrDecode(&pool, in_fd, out_fd);
+ } else {
+- if (!EncodeOrDecode(descriptor_pool.get())) {
+- return 1;
+- }
++ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
++ }
++
++ if (in_fd != STDIN_FILENO) {
++ close(in_fd);
++ }
++ if (out_fd != STDOUT_FILENO) {
++ close(out_fd);
++ }
++
++ if (!success) {
++ return 1;
+ }
+ }
+
+@@ -983,6 +1012,11 @@
+ for (int i = 0; i < proto_path_.size(); i++) {
+ source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
+ }
++ if (mode_ == MODE_COMPILE &&
++ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
++ std::cerr << "--protobuf_in and --protobuf_out are only valid with "
++ << "decode operations. Ignoring.";
++ }
+
+ // Map input files to virtual paths if possible.
+ if (!MakeInputsBeProtoPathRelative(source_tree)) {
+@@ -1571,6 +1605,12 @@
+
+ codec_type_ = value;
+
++ } else if (name == "--protobuf_in") {
++ protobuf_in_path_ = value;
++
++ } else if (name == "--protobuf_out") {
++ protobuf_out_path_ = value;
++
+ } else if (name == "--error_format") {
+ if (value == "gcc") {
+ error_format_ = ERROR_FORMAT_GCC;
+@@ -1693,18 +1733,29 @@
+ " --version Show version info and exit.\n"
+ " -h, --help Show this text and exit.\n"
+ " --encode=MESSAGE_TYPE Read a text-format message of the given type\n"
+-" from standard input and write it in binary\n"
+-" to standard output. The message type must\n"
+-" be defined in PROTO_FILES or their imports.\n"
+-" --decode=MESSAGE_TYPE Read a binary message of the given type from\n"
+-" standard input and write it in text format\n"
+-" to standard output. The message type must\n"
++" an write it in binary. The message type must\n"
+ " be defined in PROTO_FILES or their imports.\n"
+-" --decode_raw Read an arbitrary protocol message from\n"
+-" standard input and write the raw tag/value\n"
+-" pairs in text format to standard output. No\n"
++" The input/output protobuf files are specified\n"
++" using the --protobuf_in and --protobuf_out\n"
++" command line flags.\n"
++" --decode=MESSAGE_TYPE Read a binary message of the given type and\n"
++" write it in text format. The message type\n"
++" must be defined in PROTO_FILES or their\n"
++" imports. The input/output protobuf files are\n"
++" specified using the --protobuf_in and \n"
++" --protobuf_out command line flags.\n"
++" --decode_raw Read an arbitrary protocol message and write\n"
++" the raw tag/value pairs in text format. No\n"
+ " PROTO_FILES should be given when using this\n"
+-" flag.\n"
++" flag. The input/output protobuf files are\n"
++" specified using the --protobuf_in and \n"
++" --protobuf_out command line flags.\n"
++" --protobuf_in Absolute path to the protobuf file to read to\n"
++" encode/decode. If omitted, file will be read\n"
++" from STDIN.\n"
++" --protobuf_out Absolute path to the protobuf file to write to\n"
++" after encode/decode operation. If omitted,\n"
++" output is written to STDOUT.\n"
+ " --descriptor_set_in=FILES Specifies a delimited list of FILES\n"
+ " each containing a FileDescriptorSet (a\n"
+ " protocol buffer defined in descriptor.proto).\n"
+@@ -1983,7 +2034,9 @@
+ return true;
+ }
+
+-bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
++bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
++ int in_fd,
++ int out_fd) {
+ // Look up the type.
+ const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
+ if (type == NULL) {
+@@ -1995,15 +2048,15 @@
+ std::unique_ptr message(dynamic_factory.GetPrototype(type)->New());
+
+ if (mode_ == MODE_ENCODE) {
+- SetFdToTextMode(STDIN_FILENO);
+- SetFdToBinaryMode(STDOUT_FILENO);
++ SetFdToTextMode(in_fd);
++ SetFdToBinaryMode(out_fd);
+ } else {
+- SetFdToBinaryMode(STDIN_FILENO);
+- SetFdToTextMode(STDOUT_FILENO);
++ SetFdToBinaryMode(in_fd);
++ SetFdToTextMode(out_fd);
+ }
+
+- io::FileInputStream in(STDIN_FILENO);
+- io::FileOutputStream out(STDOUT_FILENO);
++ io::FileInputStream in(in_fd);
++ io::FileOutputStream out(out_fd);
+
+ if (mode_ == MODE_ENCODE) {
+ // Input is text.
+--- /src/google/protobuf/compiler/command_line_interface.h
++++ /src/google/protobuf/compiler/command_line_interface.h
+@@ -272,7 +272,9 @@
+ GeneratorContext* generator_context, string* error);
+
+ // Implements --encode and --decode.
+- bool EncodeOrDecode(const DescriptorPool* pool);
++ bool EncodeOrDecode(const DescriptorPool* pool,
++ int in_fd,
++ int out_fd);
+
+ // Implements the --descriptor_set_out option.
+ bool WriteDescriptorSet(
+@@ -405,6 +407,13 @@
+ // parsed FileDescriptorSets to be used for loading protos. Otherwise, empty.
+ std::vector descriptor_set_in_names_;
+
++ // When using --encode / --decode / --decode_raw absolute path to the output
++ // file. (Empty string indicates write to STDOUT).
++ string protobuf_out_path_;
++ // When using --encode / --decode / --decode_raw, absolute path to the input
++ // file. (Empty string indicates read from STDIN).
++ string protobuf_in_path_;
++
+ // If --descriptor_set_out was given, this is the filename to which the
+ // FileDescriptorSet should be written. Otherwise, empty.
+ string descriptor_set_out_name_;
+--- /src/google/protobuf/compiler/command_line_interface_unittest.cc
++++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
+@@ -94,7 +94,7 @@
+ virtual void SetUp();
+ virtual void TearDown();
+
+- // Runs the CommandLineInterface with the given command line. The
++ // Run the CommandLineInterface with the given command line. The
+ // command is automatically split on spaces, and the string "$tmpdir"
+ // is replaced with TestTempDir().
+ void Run(const string& command);
+@@ -2337,6 +2337,17 @@
+ EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_));
+ }
+
++ void ExpectBinaryFilesMatch(const string &expected_file,
++ const string &actual_file) {
++ string expected_output, actual_output;
++ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
++ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
++
++ // Don't use EXPECT_EQ because we don't want to print raw binary data to
++ // stdout on failure.
++ EXPECT_TRUE(expected_output == actual_output);
++ }
++
+ private:
+ void WriteUnittestProtoDescriptorSet() {
+ unittest_proto_descriptor_set_filename_ =
+@@ -2427,6 +2438,18 @@
+ "google/protobuf/no_such_file.proto: No such file or directory\n");
+ }
+
++TEST_P(EncodeDecodeTest, RedirectInputOutput) {
++ string out_file = TestTempDir() + "/golden_message_out.pbf";
++ string cmd = "";
++ cmd += "google/protobuf/unittest.proto ";
++ cmd += "--encode=protobuf_unittest.TestAllTypes ";
++ cmd += "--protobuf_in=" + TestSourceDir() +
++ "/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt ";
++ cmd += "--protobuf_out=" + out_file;
++ EXPECT_TRUE(Run(cmd));
++ ExpectBinaryFilesMatch(out_file, TestSourceDir() + "/google/protobuf/testdata/golden_message_oneof_implemented");
++}
++
+ INSTANTIATE_TEST_CASE_P(FileDescriptorSetSource,
+ EncodeDecodeTest,
+ testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
diff --git a/dev-libs/protobuf/files/protobuf-3.6.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.6.0-system_libraries.patch
new file mode 100644
index 000000000000..b1408f050e00
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.6.0-system_libraries.patch
@@ -0,0 +1,121 @@
+--- /Makefile.am
++++ /Makefile.am
+@@ -11,28 +11,10 @@
+ # Always include third_party directories in distributions.
+ DIST_SUBDIRS = src conformance benchmarks third_party/googletest
+
+-# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS
+-# because then "make check" would also build and run all of gmock's own tests,
+-# which takes a lot of time and is generally not useful to us. Also, we don't
+-# want "make install" to recurse into gmock since we don't want to overwrite
+-# the installed version of gmock if there is one.
+ check-local:
+- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
+- @cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
+- @cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
+
+-# We would like to clean gmock when "make clean" is invoked. But we have to
+-# be careful because clean-local is also invoked during "make distclean", but
+-# "make distclean" already recurses into gmock because it's listed among the
+-# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to
+-# cd to the directory again and "make clean" it will fail. So, check that the
+-# Makefile exists before recursing.
+ clean-local:
+- @if test -e third_party/googletest/Makefile; then \
+- echo "Making clean in googletest"; \
+- cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
+- fi; \
+- if test -e conformance/Makefile; then \
++ @if test -e conformance/Makefile; then \
+ echo "Making clean in conformance"; \
+ cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
+ fi; \
+--- /configure.ac
++++ /configure.ac
+@@ -209,12 +209,5 @@
+
+ AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
+
+-# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
+-# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
+-# too.
+-export CFLAGS
+-export CXXFLAGS
+-AC_CONFIG_SUBDIRS([third_party/googletest])
+-
+ AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
+ AC_OUTPUT
+--- /src/Makefile.am
++++ /src/Makefile.am
+@@ -711,19 +711,11 @@
+ google/protobuf/testing/file.cc \
+ google/protobuf/testing/file.h
+
+-GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
+-GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
+-GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
+-GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+ protobuf-lite-test test_plugin protobuf-lite-arena-test \
+ $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
+- -I$(GOOGLEMOCK_SRC_DIR)/include
++ -lgtest -lgmock -lgmock_main
+ # Disable optimization for tests unless the user explicitly asked for it,
+ # since test_util.cc takes forever to compile with optimization (with GCC).
+ # See configure.ac for more info.
+@@ -811,12 +803,8 @@
+ # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
+ protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
+ libprotoc.la \
+- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
+- -I$(GOOGLETEST_SRC_DIR)/include \
+- -DPROTOBUF_TEST_NO_DESCRIPTORS
++ -lgtest -lgmock -lgmock_main
++protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
+ protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lazy_descriptor_test_SOURCES = \
+ google/protobuf/compiler/cpp/cpp_unittest.cc \
+@@ -837,11 +825,7 @@
+ # full runtime and we want to make sure this test builds without full
+ # runtime.
+ protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
+- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
+- -I$(GOOGLETEST_SRC_DIR)/include
++ -lgtest -lgmock -lgmock_main
+ protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lite_test_SOURCES = \
+ google/protobuf/lite_unittest.cc \
+@@ -853,11 +837,7 @@
+ # gtest when building the test internally our memory sanitizer doesn't detect
+ # memory leaks (don't know why).
+ protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
+- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
+- -I$(GOOGLETEST_SRC_DIR)/include
++ -lgtest -lgmock -lgmock_main
+ protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lite_arena_test_SOURCES = \
+ google/protobuf/lite_arena_unittest.cc \
+@@ -867,8 +847,7 @@
+
+ # Test plugin binary.
+ test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
+-test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
++ -lgtest
+ test_plugin_SOURCES = \
+ google/protobuf/compiler/mock_code_generator.cc \
+ google/protobuf/testing/file.cc \
diff --git a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild b/dev-libs/protobuf/protobuf-3.6.0.1.ebuild
new file mode 100644
index 000000000000..3153b8aa572e
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.6.0.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/16"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="emacs examples static-libs test zlib"
+
+RDEPEND="emacs? ( virtual/emacs )
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
+ "${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
+ "${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local options=(
+ $(use_enable static-libs static)
+ $(use_with zlib)
+ )
+
+ if tc-is-cross-compiler; then
+ # Build system uses protoc when building, so protoc copy runnable on host is needed.
+ mkdir -p "${WORKDIR}/build" || die
+ pushd "${WORKDIR}/build" > /dev/null || die
+ ECONF_SOURCE="${S}" econf_build "${options[@]}"
+ options+=(--with-protoc="$(pwd)/src/protoc")
+ popd > /dev/null || die
+ fi
+
+ ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+ multilib-minimal_src_compile
+
+ if use emacs; then
+ elisp-compile editors/protobuf-mode.el
+ fi
+}
+
+multilib_src_compile() {
+ if tc-is-cross-compiler; then
+ emake -C "${WORKDIR}/build/src" protoc
+ fi
+
+ default
+}
+
+multilib_src_test() {
+ emake check
+}
+
+multilib_src_install_all() {
+ find "${D}" -name "*.la" -delete || die
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins editors/proto.vim
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/proto.vim"
+
+ if use emacs; then
+ elisp-install ${PN} editors/protobuf-mode.el*
+ elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+ fi
+
+ if use examples; then
+ DOCS+=(examples)
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index ec9e91e689ed..4bdd9973a38d 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
index 7f628e0c8433..0e2e3cbc4086 100644
--- a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
+++ b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="Convert Pod data to formatted LaTeX"
LICENSE="|| ( GPL-1+ Artistic )"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b08c1453a30a..5c469d915341 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/e4u/Manifest b/dev-python/e4u/Manifest
index c3f34aa14147..6b9e55cf805a 100644
--- a/dev-python/e4u/Manifest
+++ b/dev-python/e4u/Manifest
@@ -1 +1 @@
-DIST e4u-0.1rc4.tar.gz 50266 BLAKE2B 2cb878837ca34c7839e026b1f742ec23d9ee2c046406084ef10fca4c565b4661237ddf9f76620abc8db968dd5c521be4219752ff8ec4017326b57dc5de9b4ef0 SHA512 8ca0a0a160ddd1425be4f8a941d9767edac89edfaf5f5f14af840f3460ad91344186f8111711e0fb7af212d15af1f766d592e887511f820770b9f66818896a1d
+DIST e4u-0.1rc5.tar.gz 51001 BLAKE2B 32f8b1a32d0f1b51eb97169f0375cf725571c2c7df8cab7414483c997bc7e501c19339d2fbe287718cd50afc2451bc9e9a39d2b42b242657d9a52931f89cfa0e SHA512 d19085a767275c91e807517d714955c123e2dbe3c3904240e09ba115298474067f60393ab613af3eb1af8a09964b157acfc6d69dcaccc4493b014a9bc51e3662
diff --git a/dev-python/e4u/e4u-0.1_rc4.ebuild b/dev-python/e4u/e4u-0.1_rc5.ebuild
similarity index 88%
rename from dev-python/e4u/e4u-0.1_rc4.ebuild
rename to dev-python/e4u/e4u-0.1_rc5.ebuild
index 93b757abd30c..b52ae0edf6d2 100644
--- a/dev-python/e4u/e4u-0.1_rc4.ebuild
+++ b/dev-python/e4u/e4u-0.1_rc5.ebuild
@@ -25,7 +25,7 @@ DEPEND="${DEPEND}"
S="${WORKDIR}/${PN}-${MY_PV}"
-PATCHES=( "${FILESDIR}/change-emoji4unicode-url.patch" "${FILESDIR}/initialize-e4u-tests.patch" )
+PATCHES=( "${FILESDIR}"/change-emoji4unicode-url.patch )
python_test() {
esetup.py test
diff --git a/dev-python/e4u/files/change-emoji4unicode-url.patch b/dev-python/e4u/files/change-emoji4unicode-url.patch
index d356e7d68cae..ff9e54bf72a0 100644
--- a/dev-python/e4u/files/change-emoji4unicode-url.patch
+++ b/dev-python/e4u/files/change-emoji4unicode-url.patch
@@ -1,11 +1,11 @@
---- a/e4u/__init__.py 2013-06-13 09:14:06.000000000 +0200
-+++ b/e4u/__init__.py 2018-05-18 15:35:49.000000000 +0200
+--- a/e4u/__init__.py 2018-05-22 08:32:05.000000000 +0200
++++ b/e4u/__init__.py 2018-07-04 19:40:53.000000000 +0200
@@ -11,15 +11,15 @@
_loader = None
-def load(filename=None,
-- url=r"http://emoji4unicode.googlecode.com/svn/trunk/data/emoji4unicode.xml",
+- url=r"https://raw.githubusercontent.com/googlei18n/emoji4unicode/master/data/emoji4unicode.xml",
+def load(filename=r"/usr/share/e4u/emoji4unicode.xml",
+ url=None,
loader_class=None):
@@ -14,19 +14,19 @@
reload(filename, url, loader_class)
-def reload(filename=None,
-- url=r"http://emoji4unicode.googlecode.com/svn/trunk/data/emoji4unicode.xml",
+- url=r"https://raw.githubusercontent.com/googlei18n/emoji4unicode/master/data/emoji4unicode.xml",
+def reload(filename=r"/usr/share/e4u/emoji4unicode.xml",
+ url=None,
loader_class=None):
u"""reload google's `emoji4unicode` project's xml file. must call this method first to use `e4u` library."""
if loader_class is None:
---- a/e4u/loader.py 2013-06-13 09:14:06.000000000 +0200
-+++ b/e4u/loader.py 2018-05-18 15:36:01.000000000 +0200
+--- a/e4u/loader.py 2018-05-22 08:32:05.000000000 +0200
++++ b/e4u/loader.py 2018-07-04 19:43:05.000000000 +0200
@@ -32,7 +32,7 @@
self._translate_dictionaries = create_translate_dictionaries(self.symbols)
-- def load(self, filename=None, url=r"http://emoji4unicode.googlecode.com/svn/trunk/data/emoji4unicode.xml"):
+- def load(self, filename=None, url=r"https://raw.githubusercontent.com/googlei18n/emoji4unicode/master/data/emoji4unicode.xml"):
+ def load(self, filename=r"/usr/share/e4u/emoji4unicode.xml", url=None):
if filename:
xml = open(filename, 'r').read()
diff --git a/dev-python/e4u/files/initialize-e4u-tests.patch b/dev-python/e4u/files/initialize-e4u-tests.patch
deleted file mode 100644
index 4d9a25d5de99..000000000000
--- a/dev-python/e4u/files/initialize-e4u-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/test/test.py 2013-06-13 09:14:06.000000000 +0200
-+++ b/test/test.py 2018-05-16 13:40:22.000000000 +0200
-@@ -7,6 +7,8 @@
- import unittest
- import e4u
-
-+e4u.load(filename=r"./e4u/data/emoji4unicode.xml")
-+
- DISPLAY_INFO = False
-
- class TestCaseAbstract(object):
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 57b1ce543872..a4e53a25ebdb 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1 +1,2 @@
DIST flask-login-0.3.2.tar.gz 38626 BLAKE2B fbcac55e4a8dc5fe78b4b5b3cb8acbe7293bfcc30ce5323ebe992c92407238198d34724179ac12e688875356e54f85f21a2870249ccafb48499df3880a6c2062 SHA512 c42af6ed7902145cc4778815f247ed88de6df7c929abe0a1f22aca0515495a54d298b2af2b74ba7d5e0ce9b453eee4c4ce03802a3e9ab531137e117e9dcdfc1b
+DIST flask-login-0.4.1.tar.gz 43679 BLAKE2B f30df1cc84289bc2dd1e59a30284d7152cee0731daf8b6e58b8203007c0ba74eb512bf9f2e41608d9656138038f5b5c752509ef5a203ef1e8bdba9182912b133 SHA512 c87a2948ac37439ddd76f3f11584bdd5910cb00e96a7400343cf4dadc5a0f9bc84d40bdc068d2e8c05bd5a510046e18473e9ad71502c5039a5f05b371ce9bb4c
diff --git a/dev-python/flask-login/flask-login-0.4.1.ebuild b/dev-python/flask-login/flask-login-0.4.1.ebuild
new file mode 100644
index 000000000000..d888c13afc38
--- /dev/null
+++ b/dev-python/flask-login/flask-login-0.4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Login session support for Flask"
+HOMEPAGE="https://pypi.org/project/Flask-Login/"
+# Should be replaced with the PyPi URI for the next release, if possible
+# See https://github.com/maxcountryman/flask-login/pull/393
+SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/flask-0.10[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${RDEPEND}
+ dev-python/blinker[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/semantic_version[${PYTHON_USEDEP}]
+ )"
+
+python_prepare_all() {
+ sed -i "s/'sphinx.ext.intersphinx', //" docs/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ if use doc; then
+ emake -C docs html
+ HTML_DOCS=( docs/_build/html/. )
+ fi
+}
+
+python_test() {
+ nosetests -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/grafanalib/metadata.xml b/dev-python/grafanalib/metadata.xml
index bd87ee4fb98f..6bcc38bc3a1c 100644
--- a/dev-python/grafanalib/metadata.xml
+++ b/dev-python/grafanalib/metadata.xml
@@ -1,10 +1,7 @@
-
- mrueg@gentoo.org
- Manuel Rüger
-
+
weaveworks/grafanalib
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 73e483f117e1..f0fe182b32f6 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -3,3 +3,4 @@ DIST keyring-11.1.0.tar.gz 25518 BLAKE2B 8b23853a15217a4d51a30d2add4f2e4eaa9af78
DIST keyring-12.2.1.tar.gz 42242 BLAKE2B b821f17a671e89a28bd2953456bd0406e4f7fd142f1abf2e1f752e8f74f072c8fa995b90de62ac34586dd50a4dab47dff3bbb19157d76bb2f93a61e176dc3188 SHA512 8806b4433bc9085ae133300e68bc614281beea70de547f75afafdf6de2ee1b436f3a4cd13d7684cb6e4d5aef0a2eb9119d9cebbaf239a9ee1997ece4a56a7371
DIST keyring-13.0.0.tar.gz 42883 BLAKE2B 73d44b331de7ab15d820f9484089968b3f3c4c79d360c190963d2bb12dfa20d71768a6bae3e44bbb2b728443fd1ecce5b907036457f3f38e08692d3b4a5792f9 SHA512 d06cd64a435a08ec18eea595f2a37769e823e9095cb5585f7b6532804a4cfaae807e7ace4bd4afde7f11480d202b09878480bd7d7de37dc7e6ce2214f0d38991
DIST keyring-13.1.0.tar.gz 42960 BLAKE2B 9d11d91d0f4261cd40761a492e96478c3545de3f867faa31ad1710799238e4c04d51420a9b2ec26e4a99175fb66d1b236208329654b8751337e02bae761da1ee SHA512 06dc9f27692b4ebaa1592d500135d4dad7358ebc53d3b1e1cc733e9aa6610136f9b7224ffd5426324ee5d405fcf0c0b836de776ab304d2395e7491655afd98ca
+DIST keyring-13.2.1.tar.gz 43140 BLAKE2B 74272b93ff80a03615879a5f416ad6be1012f22862972a7f400609ea3fb984c45ed2ccb44eca30d253d0d39e0876f1ce25ab9aa6267a06a7c67a17aac27cd31e SHA512 3c15c3415ba4b657b041d2395536fc92ba656dc71f28669235f13a630946ad1b332d1f5b031a55776ce8a2120d3d2601462708f00ee105f46a27cf043c1bd906
diff --git a/dev-python/keyring/keyring-13.2.1.ebuild b/dev-python/keyring/keyring-13.2.1.ebuild
new file mode 100644
index 000000000000..9b35a1c4afbe
--- /dev/null
+++ b/dev-python/keyring/keyring-13.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+ dev-python/secretstorage[${PYTHON_USEDEP}]
+ dev-python/entrypoints[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pytest-runner[${PYTHON_USEDEP}]
+ >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+ dev-python/pytest-flake8[${PYTHON_USEDEP}]
+ dev-python/collective-checkdocs[${PYTHON_USEDEP}]
+ )"
+RDEPEND=""
+
+src_unpack() {
+ unpack $A
+ # This is an interactive test.
+ rm -f "${S}"/keyring/tests/backends/test_kwallet.py
+}
+
+python_test() {
+ py.test -v -v || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 7c564533ece1..4903dcdf0394 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,6 +1,5 @@
-DIST llvmlite-0.19.0.tar.gz 97109 BLAKE2B c4d22d130d12d7e61e9ddc177e28c6d8c3d0a1bffa0fcd672dd237260d80929c9ae0da428165f379c53276ed464b80f7cb9aec4abc4f66e105c7415db150edb0 SHA512 93551bbab519021abdc66ca099b9090b3af54b048adbce8d16f3700c066bbc4f5c24e5234a8a1ac4bfcdf8bf74d0ac52bb7023251ac948af6ef99fbd5a5324c8
DIST llvmlite-0.20.0.tar.gz 96753 BLAKE2B ec9cfa554f44162c0d6e755628603c9afd85642998f56ed49c2ff29c3ef975ef4ce14c6555382ca282b70d71a1ff7347c0b773b339b14345e10d3b9ac96ac55e SHA512 c2e0918e7acfba68922f60889180ec660da13ea199c9e8dfb3ac075c295baeb8c90784a6acc3c463cdd696f8f61c42226548d38db5bd8c4397a23cfa7c7ff764
DIST llvmlite-0.21.0.tar.gz 96462 BLAKE2B 8458037ca49c2c7035cc65539c1dc933f26c694e07502bfb0f37adfa389c56d715b53310fa977461fa75d7f826384a9c408682bee942e7cda6a299b16192c183 SHA512 25fb0986faf558995e6405a77d675d1dfcda2f79f8e6f5183d66a16f7b1f323df7eefb54455d9a15412c4eb88cd2e160d9f45038b7d97da6fffe78d7adc0e296
DIST llvmlite-0.22.0.gh.tar.gz 156077 BLAKE2B 1b95a0636807fcf38955b32bd5c7c19784df2cc6708f23624c047f0e9caf4eb2fc26c7a1cb778d7cc7e42b8aeaee1ed43c92bcdaf7eb2e798c25f692b96b786a SHA512 633ec4d294dc246ebff5c7931e9bea86efa28323242411f3f54bc34c99085ebaef477b5bfd8224080790a12b188308ff9662c284b360e1a2939f4fe9b84a9458
-DIST llvmlite-0.23.0.gh.tar.gz 167384 BLAKE2B f0f64f389004b8c07b40ad42bfe2aa10b06769c59c6ca84fd89c5c38e0f453bc079d435418fe19bdd5b97b9cac698eae5c537417bee181485390745b8d319fc8 SHA512 e4fa0096d73351a73b0509ca312dd79f8b4a50eeae03d7491761c68738e1c4f8204be1c2eefad71e10edfbcaef062dafa4270029e1b254febc580016aff2d3b9
DIST llvmlite-0.23.2.gh.tar.gz 168206 BLAKE2B 8ed2c2a84cdad80bcdba95e4e2d0f15b8c0a6cab2114b4c5f6eb32a303e29a9185629cf692acaec1455ac059227a755f621147397ece59343347434572186dff SHA512 f5f0a27ff7d523d3ce9c183b60db1106ee89f2650dfaac9e745414dbf91e14cf3ba9056e694148d07f4caab4b9f9fdd1806aa67f580de1b8b317b906d2c4fe65
+DIST llvmlite-0.24.0.gh.tar.gz 169577 BLAKE2B 7fedf8b9ec49f537db27a77c5880fb3bb41d126c615e73a4fd503ff781dcd4745c4f708cccd31d9b5544609ab7821e8ef1299856ef13ec3912ad2341af12a3ce SHA512 14b8918f9f58a88596607e697212aa516a99c65f71257d22f09e6b735f517a38f11142a63bf2e8f117c6ceff97153a5e686fa322d62abd14000db7e9ae136900
diff --git a/dev-python/llvmlite/llvmlite-0.19.0.ebuild b/dev-python/llvmlite/llvmlite-0.19.0.ebuild
deleted file mode 100644
index 1f4d10f64b16..000000000000
--- a/dev-python/llvmlite/llvmlite-0.19.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 distutils-r1 llvm
-
-DESCRIPTION="Python wrapper around the llvm C++ library"
-HOMEPAGE="http://llvmlite.pydata.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-LLVM_MAX_SLOT=4
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- sys-devel/llvm:${LLVM_MAX_SLOT}
- sys-libs/zlib:0=
- virtual/python-enum34[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-PATCHES=(
- "${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
-)
-
-python_prepare_all() {
- # disable -flto, we do not force it against user's wishes
- # add -fPIC, needed to link against shared libraries
- # plus use those vars to force our CXXFLAGS/LDFLAGS in...
- export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
- export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- "${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-python/llvmlite/llvmlite-0.23.0.ebuild b/dev-python/llvmlite/llvmlite-0.24.0.ebuild
similarity index 100%
rename from dev-python/llvmlite/llvmlite-0.23.0.ebuild
rename to dev-python/llvmlite/llvmlite-0.24.0.ebuild
diff --git a/dev-python/numba/numba-0.37.0.ebuild b/dev-python/numba/numba-0.37.0.ebuild
index d716ed6e7c5c..9c836f6b01c9 100644
--- a/dev-python/numba/numba-0.37.0.ebuild
+++ b/dev-python/numba/numba-0.37.0.ebuild
@@ -29,8 +29,8 @@ DEPEND="${RDEPEND}
"
python_test() {
- cd "${BUILD_DIR}"/lib* || die
- ${EPYTHON} -c "import numba; numba.test()" || die
+ cd "${BUILD_DIR}/lib" || die
+ ${EPYTHON} -m numba.runtests -v || die
}
python_install_all() {
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index cc4303542587..f376900e5079 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -4,3 +4,4 @@ DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116
DIST pbr-4.0.2.tar.gz 107720 BLAKE2B 346e74414cb77da61be08eee39148991aff7eaea7bab54407ce9dc48f422c576fd2125c11acb31cdf54cecb059281cf540c4ccfa005056c5c3b276ea2161c873 SHA512 d678c933a1d1b0319358b0d067291d29467582e6abb26e21386b9d98092f561e3b76965e0b18e12e88abab790b737606ae2a37cc11cb0a4a34ff6c1ad99cfdb1
DIST pbr-4.0.3.tar.gz 108684 BLAKE2B e3a9a695b04333a9523c8e749628773cd12f38e87cd6cc670b8ba40b800871004a5cd9d038913e5f483291d180afbeb524535c6c68833ee48adde6ff276783f4 SHA512 9e5c915bd661e3356ad1b92b3d01df3a592a6120c9dc58d3e4bfbc3040f2d69f896244ea8f6c9cffad3e774747d330cd03e928cfc160e5df980c134fe2dee801
DIST pbr-4.0.4.tar.gz 109077 BLAKE2B efe901b074cd6747fe123b6a325cb45e010d774834a875e86647b6a9c3afbaff9e435087e757ae4276c0b18558faeea57c8dec6b2039ab7b0f70424f64d94f57 SHA512 fc849a27c3b5deb89545dd05eb102a14f2c42a0d617f474df46b3292c14ab7e0a4343cd6e1a38eef77815cca49374d58698cb0c2fdd2aa5f2f47e890939adbb3
+DIST pbr-4.1.0.tar.gz 110896 BLAKE2B 140b682fffe5c3d4773a1aec8729cfe980ce5e0de6f0d3bb3f5cbea8f5274d1a77338ea3f24504995cd1dfc51e08a26b686a65b040b2389cc432ae132fb3eef1 SHA512 5f4dcbe3e7a339cdfcab24453fae82e16118be97061c3c5f4f13db76f404f8fcb2c6b3c0351ffa5022c01b15325ddf94aac1ebd06271fe1d4bb21bdf80ae10e6
diff --git a/dev-python/pbr/pbr-4.1.0.ebuild b/dev-python/pbr/pbr-4.1.0.ebuild
new file mode 100644
index 000000000000..229da21adf65
--- /dev/null
+++ b/dev-python/pbr/pbr-4.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+ !~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+PDEPEND=""
+
+# This normally actually belongs here.
+python_prepare_all() {
+ # This test passes when run within the source and doesn't represent a failure, but rather
+ # a gentoo sandbox constraint
+ # Rm tests that rely upon the package being already installed and fail
+ sed -e s':test_console_script_develop:_&:' \
+ -e s':test_console_script_install:_&:' \
+ -e s':test_sdist_extra_files:_&:' \
+ -e s':test_command_hooks:_&:' \
+ -e s':test_sdist_git_extra_files:_&:' \
+ -i pbr/tests/test_core.py || die
+ sed -e s':test_command_hooks:_&:' \
+ -e s':test_global_setup_hooks:_&:' \
+ -i pbr/tests/test_hooks.py || die
+ rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
+ einfo "rogue tests disabled"
+ sed -i '/^hacking/d' test-requirements.txt || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ distutils_install_for_testing
+
+ rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+ testr init || die "testr init failed under ${EPYTHON}"
+ testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index aa6d99043ce0..f6e4af7f6482 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,3 +1,4 @@
DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
+DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
diff --git a/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild
new file mode 100644
index 000000000000..766a0febd0ea
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.6.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 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 distutils-r1
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf"
+SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/16"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+ ~dev-libs/protobuf-${PV}
+ dev-python/namespace-google[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+ !
-
+
+ sir.suriv@gmail.com
+ Diogo Pereira
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
Chromaprint and its associated Acoustid Web service make up a high-quality, open-source acoustic fingerprinting system. This package provides Python bindings for both the fingerprinting algorithm library, which is written in C but portable, and the Web service, which provides fingerprint lookups.
pyacoustid
+ beetbox/pyacoustid
+ https://github.com/beetbox/pyacoustid/issues
diff --git a/dev-python/pyacoustid/pyacoustid-1.1.5.ebuild b/dev-python/pyacoustid/pyacoustid-1.1.5.ebuild
new file mode 100644
index 000000000000..413c07cfff86
--- /dev/null
+++ b/dev-python/pyacoustid/pyacoustid-1.1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Chromaprint and the AcoustID web service"
+HOMEPAGE="https://pypi.org/project/pyacoustid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/audioread[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ media-libs/chromaprint"
+
+src_install() {
+ distutils-r1_src_install
+
+ if use examples ; then
+ docinto examples
+ dodoc aidmatch.py fpcalc.py
+ docompress -x /usr/share/doc/${PF}/examples/
+ fi
+}
diff --git a/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild b/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
index 88c79d2068c9..b1560efd1c2b 100644
--- a/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
index 18a26627cf47..e7fa0e0fe5d5 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
RDEPEND="
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild
index ab5f9388efba..89c171047676 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
IUSE="debug"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/semantic_version/metadata.xml b/dev-python/semantic_version/metadata.xml
index b7eb936c241b..e4397375ebe2 100644
--- a/dev-python/semantic_version/metadata.xml
+++ b/dev-python/semantic_version/metadata.xml
@@ -14,5 +14,7 @@
semantic_version
+ rbarrois/python-semanticversion
+ https://github.com/rbarrois/python-semanticversion/issues
diff --git a/dev-python/semantic_version/semantic_version-2.6.0-r2.ebuild b/dev-python/semantic_version/semantic_version-2.6.0-r2.ebuild
new file mode 100644
index 000000000000..c8ebba6b2e3e
--- /dev/null
+++ b/dev-python/semantic_version/semantic_version-2.6.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library providing a few tools handling SemVer in Python"
+HOMEPAGE="https://pypi.org/project/semantic_version/"
+SRC_URI="https://github.com/rbarrois/python-semanticversion/archive/v${PV}.tar.gz -> ${P}-1.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/python-${P/_/}"
+
+python_compile_all() {
+ if use doc; then
+ sphinx-build docs docs/_build/html || die
+ HTML_DOCS=( docs/_build/html/. )
+ fi
+}
+
+python_test() {
+ # The django test hangs
+ py.test --ignore tests/test_django.py\
+ || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index 7889f85caf86..0365fcc9e171 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,3 +1,3 @@
DIST texttable-0.8.3.tar.gz 8569 BLAKE2B 83b64ba6792b4243bed042f90e643272c045f39eefdd2ea33c9ed506f1cffbb8c683809edfa2061e7f5fc8815c6bbf67de0c8da7a90c6e77fb0d89b57fc41288 SHA512 d9a50f6fd9cd2a6d55afd5e686ac8ff2b2ebcf8c8041209ffae3e3864529c54a384840a65df2b87a942528005ca864d00bb01dfaeb33308843c01db7471931c8
DIST texttable-0.9.1.tar.gz 11074 BLAKE2B 465738a7b980f2a216d63b268044c1a1b8c0deb986fd398f0ba0ae30ab84020ac6f179b5314a2071592c38443f9cb86387b9ed573342533af9e825000472ebe5 SHA512 7ec37336ef4b253879d0232dcdb4500cad33ecce1067dd7ea26c221dc2c003ee56360bdbd1dd1e00133301c51c67fb2fe9b1703628804a65f2a6ab8a1e830e50
-DIST texttable-1.3.1.tar.gz 12234 BLAKE2B 825993e7d0e45858096f22511f14fd2091e8581790a3a13ba693c9c37056ec025e22bd49bb2f9cd23ca7aba590871c5b48e8afd72cc0b49e0cadb528919c9c0b SHA512 8569b3d0195ef5782e7ec5484863185fb68eed6c70c736e2ea3fa99a73cfbf87f75dc25f8358007fc44fff5506db98a521013556ad46290f586efa455ccc6363
+DIST texttable-1.4.0.tar.gz 12274 BLAKE2B 558d905a65a340843a18b9c0987a34b45a53335478bc29275b4150642e8902f77830a63654a177e0017e3c729ea1bcd63d8f2296866773dfbf31cda6bc785ef7 SHA512 41d1b429ee32cd717d273152da0263cfff13d79aae7ecc69bda455c1391ea1e6cf74b412e6043bf3d32d62932b4498a2484deb997ef545fdd6195fd5ebd58fc5
diff --git a/dev-python/texttable/texttable-1.3.1.ebuild b/dev-python/texttable/texttable-1.4.0.ebuild
similarity index 100%
rename from dev-python/texttable/texttable-1.3.1.ebuild
rename to dev-python/texttable/texttable-1.4.0.ebuild
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 5dcc933127d6..c869c3f5f563 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
index 506e3879d340..93dd7e443a41 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
@@ -7,6 +7,7 @@ COMMIT=72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da
CMAKE_MAKEFILE_GENERATOR="ninja"
PYTHON_COMPAT=( python2_7 )
USE_RUBY="ruby23 ruby24 ruby25"
+
inherit check-reqs cmake-utils flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
@@ -24,12 +25,12 @@ REQUIRED_USE="
?? ( gstreamer multimedia )
"
-QT_MIN_VER="5.9.1:5"
# Dependencies found at Source/cmake/OptionsQt.cmake
+QT_MIN_VER="5.9.1:5"
RDEPEND="
dev-db/sqlite:3
dev-libs/icu:=
- dev-libs/libxml2:2
+ dev-libs/libxml2
dev-libs/libxslt
>=dev-qt/qtcore-${QT_MIN_VER}
>=dev-qt/qtgui-${QT_MIN_VER}
@@ -48,7 +49,7 @@ RDEPEND="
multimedia? ( >=dev-qt/qtmultimedia-${QT_MIN_VER}[widgets] )
opengl? (
>=dev-qt/qtgui-${QT_MIN_VER}[gles2=]
- >=dev-qt/qtopengl-${QT_MIN_VER}
+ >=dev-qt/qtopengl-${QT_MIN_VER}[gles2=]
)
orientation? ( >=dev-qt/qtsensors-${QT_MIN_VER} )
printsupport? ( >=dev-qt/qtprintsupport-${QT_MIN_VER} )
@@ -56,15 +57,13 @@ RDEPEND="
>=dev-qt/qtdeclarative-${QT_MIN_VER}
>=dev-qt/qtwebchannel-${QT_MIN_VER}[qml]
)
- webp? ( media-libs/libwebp:0= )
+ webp? ( media-libs/libwebp:= )
X? (
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXrender
)
"
-
-# Need real bison, not yacc
DEPEND="${RDEPEND}
${PYTHON_DEPS}
${RUBY_DEPS}
@@ -75,30 +74,30 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
-CHECKREQS_DISK_BUILD="16G" # Debug build requires much more see bug #417307
-
-S="${WORKDIR}/${COMMIT}"
+S=${WORKDIR}/${COMMIT}
PATCHES=( "${FILESDIR}/${P}-functional.patch" )
+CHECKREQS_DISK_BUILD="16G" # bug 417307
+
_check_reqs() {
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
- check-reqs_pkg_pretend
+ if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then
+ einfo "Checking for sufficient disk space to build ${PN} with debugging flags"
+ check-reqs_$1
fi
}
pkg_pretend() {
- _check_reqs
+ _check_reqs pkg_pretend
}
pkg_setup() {
- _check_reqs
+ _check_reqs pkg_setup
python-any-r1_pkg_setup
}
src_configure() {
- # Respect CC, otherwise fails on prefix #395875
+ # Respect CC, otherwise fails on prefix, bug #395875
tc-export CC
# Multiple rendering bugs on youtube, github, etc without this, bug #547224
@@ -134,7 +133,7 @@ src_install() {
cmake-utils_src_install
# bug 572056
- if [[ ! -f ${D%/}$(qt5_get_libdir)/libQt5WebKit.so ]]; then
+ if [[ ! -f ${ED%/}$(qt5_get_libdir)/libQt5WebKit.so ]]; then
eerror "${CATEGORY}/${PF} could not build due to a broken ruby environment."
die 'Check "eselect ruby" and ensure you have a working ruby in your $PATH'
fi
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 33a4b0c1a059..105b47c47939 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/httpclient/httpclient-2.8.3.ebuild b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
index d95f08b89614..6927280d6904 100644
--- a/dev-ruby/httpclient/httpclient-2.8.3.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.8.3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa 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 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index 615649dd24f9..46d56d3d32ec 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -3,3 +3,4 @@ DIST rack-attack-5.0.1.gem 17408 BLAKE2B 5aaba2c1b4b2c69a02734d082bc18e670c1c7ad
DIST rack-attack-5.2.0.gem 22528 BLAKE2B 474b70dd4a4a949cb295922bdf9d141fd1c8241d9d2179fd43fe38a7d9687c39a712ad7473956302fa8f4f4bcf84cb284475a90e7e264f18f45a1e7228a66659 SHA512 f9d9e07a993e8bd93e7f09110055bb4ba0478019f1d08f44cc9ac497cd0badf1095a512fb5e556dc82ecc8ba3b9ddbe38ae6c8cd3c570bd29237a550788fe0ab
DIST rack-attack-5.3.0.gem 23040 BLAKE2B 415df5f1d4b07de0a4e80f77acf59330e74893b3abc9863638628f36d8b946dd330ae931f672671f4a9fe1fc4b1f6bb12fda2115e3dec9fea58ed04577676c4f SHA512 4749d4a86c6f91618092614dcf99cbf64722d6de9bb1150208fb89ea83862b980581c543a46355b45b553f0132bab26ef0d16ad2e4a35677d734c4a6449a2d4f
DIST rack-attack-5.3.2.gem 23040 BLAKE2B 169f14030860b2727a494cbf4770beb6c9f74cfd1fdb9a70fb95e537eeccb08f158d9de74d81061fde39413f66b805d9ace0a586f7232ef5eee9b75b8ab73e77 SHA512 de79fdf59786ee00077ab97566ee75e38d823d4ea1854ba877fa2fdb92ae659c0c1bb6aa6b47754b6e28f1a7dbd6061e57171b0b1626dff95c17178bf4891390
+DIST rack-attack-5.4.0.gem 23040 BLAKE2B 25432eaf1ac92f3c86be7fae803768a9f8c32a61af5af493c00343c44bb0d13ea3b725c5f3016533dc0d685351917441a3d932097fbeec1f681accc9c9bd38f0 SHA512 87ab81165c655dccef0e33234ded9fd1894788c391620ed565b732a4b16d1fea539a4cfef81a0ba4a3a2edd356bbd9963976b3de7d1257c31da863f3e725962a
diff --git a/dev-ruby/rack-attack/rack-attack-5.4.0.ebuild b/dev-ruby/rack-attack/rack-attack-5.4.0.ebuild
new file mode 100644
index 000000000000..585b3e58c40c
--- /dev/null
+++ b/dev-ruby/rack-attack/rack-attack-5.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Skip integration tests since they require additional unpackaged
+# dependencies and running daemons.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for blocking & throttling abusive clients"
+HOMEPAGE="https://github.com/kickstarter/rack-attack"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rack:*"
+ruby_add_bdepend "test? (
+ dev-ruby/actionpack
+ dev-ruby/activesupport
+ dev-ruby/rack-test
+ dev-ruby/minitest )"
+
+all_ruby_prepare() {
+ sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
+ sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index 734090a5cb04..be3e6ecdce97 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -2,3 +2,4 @@ DIST rack-protection-1.5.3.gem 18432 BLAKE2B 96daf85f6b51b4a8c8992109ccb0821b9f7
DIST rack-protection-2.0.0.gem 15872 BLAKE2B 706fba47a09565bc973a5dbae3369cb26d02839be92347bb153c5f12054ef605e8e025a0666cb0aa44aae316ba494fffdbb7bbc840dfefff9b3e0b0efd39817a SHA512 cce6a8a64c502e4cfec47ae3d76e71aef42b1eec5aa4802a6c443fcb7a8971a99ad9a5b34fea7ae878630faba10d4f5bde4d9a3eb66f63600fcaf02d9ecc0c2e
DIST rack-protection-2.0.1.gem 15872 BLAKE2B bd2b17d21767f4f6772400168ddd53491693780b62359d526739580cca66b5b27d4f4c6f419a6ef695ffbef5ff9045bac683c78117765ff784fda136ec102090 SHA512 6dd525384a0027a1943741881168433c63dc2d18093833dffb3417f3f6ccc46d597435a880d297d07751db1c449f3e37942ae03e33d378dbc74caec38c5cf1df
DIST rack-protection-2.0.2.gem 16896 BLAKE2B b3ed6a399f93c359a305cef0893bb5056ac26e8d5f345761f497b5eb77aecc201cd388bc0fc021ed039f230bc2ca2348f7eec19aaaac3f2662500bd4c6496a93 SHA512 e74be8b079a1c436d80df2e6bf58dcaea089aceb58b8ec6c08d6ac78b5390bdb1b494d9155350dc7e2639e858209aac10757be54085a565b910e5e74ee882235
+DIST rack-protection-2.0.3.gem 16896 BLAKE2B e33cfc8290cf108f986bd625623411f63812aa79bc5354041e3d541a244bdc6f2ba30ebfab77cb2fe15c8a53e21e11adc6a54ab90a687147759d1b14b5e0be73 SHA512 396d1b45783e0b6782b479b6ba77c2eb23c2a6a2b695a631b7a4b9ace661471325d4d321a40ba7c8090964e68b5dd8f9c92c4843464e6d6ff178aecf9996f338
diff --git a/dev-ruby/rack-protection/rack-protection-2.0.3.ebuild b/dev-ruby/rack-protection/rack-protection-2.0.3.ebuild
new file mode 100644
index 000000000000..a874a0ed9292
--- /dev/null
+++ b/dev-ruby/rack-protection/rack-protection-2.0.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# There are no specs in the gem and the source cannot be downloaded separately.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="This gem protects against typical web attacks"
+HOMEPAGE="https://github.com/rkh/rack-protection"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
index fce7f16125a4..cc729f3fa43b 100644
--- a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-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="highlight"
SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
index 9b7d473dd3ec..3f5216d2afe5 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-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=""
SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
index 032e237f57ab..1c003371c059 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-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=""
SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
index 003053c55312..dcc0c476ae98 100644
--- a/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-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? ( >=dev-ruby/rspec-3.5.0:3 dev-ruby/thread_order )"
diff --git a/dev-ruby/rspec/rspec-3.6.0.ebuild b/dev-ruby/rspec/rspec-3.6.0.ebuild
index 72241f191b29..0a98e4a9b93c 100644
--- a/dev-ruby/rspec/rspec-3.6.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/ruby-atk/ruby-atk-3.1.1.ebuild b/dev-ruby/ruby-atk/ruby-atk-3.1.1.ebuild
index fa156ee5c7ee..07d010e4c08a 100644
--- a/dev-ruby/ruby-atk/ruby-atk-3.1.1.ebuild
+++ b/dev-ruby/ruby-atk/ruby-atk-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit ruby-ng-gnome2
DESCRIPTION="Ruby Atk bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
DEPEND+=" dev-libs/atk"
RDEPEND+=" dev-libs/atk"
diff --git a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.1.1.ebuild b/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.1.1.ebuild
index 4facd3817692..f5149217edfb 100644
--- a/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.1.1.ebuild
+++ b/dev-ruby/ruby-clutter-gdk/ruby-clutter-gdk-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit virtualx ruby-ng-gnome2
DESCRIPTION="Ruby binding of GDK specific API of Clutter"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RUBY_S=ruby-gnome2-all-${PV}/clutter-gdk
diff --git a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.1.1.ebuild b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.1.1.ebuild
index 306a93d872ff..c54cfb173f03 100644
--- a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.1.1.ebuild
+++ b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit virtualx ruby-ng-gnome2
DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RUBY_S=ruby-gnome2-all-${PV}/clutter-gstreamer
diff --git a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.1.1.ebuild b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.1.1.ebuild
index 9f7470683a4f..50e64d03c139 100644
--- a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.1.1.ebuild
+++ b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit virtualx ruby-ng-gnome2
DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RUBY_S=ruby-gnome2-all-${PV}/clutter-gtk
diff --git a/dev-ruby/ruby-clutter/ruby-clutter-3.1.1.ebuild b/dev-ruby/ruby-clutter/ruby-clutter-3.1.1.ebuild
index df858f1c571a..13c521df935f 100644
--- a/dev-ruby/ruby-clutter/ruby-clutter-3.1.1.ebuild
+++ b/dev-ruby/ruby-clutter/ruby-clutter-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit virtualx ruby-ng-gnome2
DESCRIPTION="Ruby Clutter bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RUBY_S=ruby-gnome2-all-${PV}/clutter
diff --git a/dev-ruby/ruby-gdk3/ruby-gdk3-3.1.1.ebuild b/dev-ruby/ruby-gdk3/ruby-gdk3-3.1.1.ebuild
index c9b2d5e0cce1..27de5de61545 100644
--- a/dev-ruby/ruby-gdk3/ruby-gdk3-3.1.1.ebuild
+++ b/dev-ruby/ruby-gdk3/ruby-gdk3-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit virtualx ruby-ng-gnome2
DESCRIPTION="Ruby GDK-3.x bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
DEPEND+=" x11-libs/gtk+:3"
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.1.1.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.1.1.ebuild
index 1eac8c87b74a..28469a4ff259 100644
--- a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.1.1.ebuild
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,12 +11,16 @@ inherit ruby-ng-gnome2
RUBY_S=ruby-gnome2-all-${PV}/${RUBY_FAKEGEM_NAME}
DESCRIPTION="Ruby GdkPixbuf2 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RDEPEND+=" x11-libs/gtk+:2"
-ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend "
+ >=dev-ruby/ruby-gio2-${PV}
+ >=dev-ruby/ruby-glib2-${PV}
+ >=dev-ruby/ruby-gobject-introspection-${PV}
+"
each_ruby_configure() {
:
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
index c5875b66e047..1f8784cb92f6 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
@@ -20,7 +20,7 @@ inherit ruby-fakegem
DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
HOMEPAGE="https://ruby-gettext.github.io/"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ppc64 ~sparc x86"
IUSE="doc test"
SLOT="0"
LICENSE="|| ( Ruby LGPL-3+ )"
diff --git a/dev-ruby/ruby-gio2/files/ruby-gio2-3.1.1-schema-path.patch b/dev-ruby/ruby-gio2/files/ruby-gio2-3.1.1-schema-path.patch
new file mode 100644
index 000000000000..437a9b8513ce
--- /dev/null
+++ b/dev-ruby/ruby-gio2/files/ruby-gio2-3.1.1-schema-path.patch
@@ -0,0 +1,28 @@
+From f9bb159674c4eb25f99550fa8594fcbf97ed8cae Mon Sep 17 00:00:00 2001
+From: Kouhei Sutou
+Date: Mon, 30 Jan 2017 23:09:31 +0900
+Subject: [PATCH] gio2 test: fix path
+
+GitHub: fix #990
+
+Reported by Mamoru TASAKA. Thanks!!!
+---
+ gio2/test/test-settings.rb | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/gio2/test/test-settings.rb b/gio2/test/test-settings.rb
+index b16341c84..5a287f1e9 100644
+--- a/gio2/test/test-settings.rb
++++ b/gio2/test/test-settings.rb
+@@ -108,7 +108,10 @@ def need_keyfile_settings_backend
+ need_keyfile_settings_backend
+ keyfile = Tempfile.new(["settings", ".ini"])
+ backend = Gio::keyfile_settings_backend_new(keyfile.path, "/", "keyfile_settings")
+- schema_source = Gio::SettingsSchemaSource.new(fixture_path("schema"), nil, true)
++ schema_dir = fixture_path("schema", "default")
++ schema_source = Gio::SettingsSchemaSource.new(schema_dir,
++ nil,
++ true)
+ schema = schema_source.lookup("jp.ruby-gnome2.test.settings", true)
+ settings = Gio::Settings.new(schema,
+ backend,
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.1.1.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.1.1.ebuild
index c208c5799775..f24512e7bc42 100644
--- a/dev-ruby/ruby-gio2/ruby-gio2-3.1.1.ebuild
+++ b/dev-ruby/ruby-gio2/ruby-gio2-3.1.1.ebuild
@@ -2,18 +2,20 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
inherit ruby-ng-gnome2
DESCRIPTION="Ruby binding of GooCanvas"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}
>=dev-ruby/ruby-gobject-introspection-${PV}"
all_ruby_prepare() {
+ epatch "${FILESDIR}/${P}-schema-path.patch"
+
# Avoid unneeded dependency on test-unit-notify.
sed -i -e '/notify/ s:^:#:' \
test/gio2-test-utils.rb || die
diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.1.1.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.1.1.ebuild
index d283068e3e27..be24c4bb464d 100644
--- a/dev-ruby/ruby-gnome2/ruby-gnome2-3.1.1.ebuild
+++ b/dev-ruby/ruby-gnome2/ruby-gnome2-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.1.1.ebuild b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.1.1.ebuild
index a3145639a8b5..b8e58a60a68a 100644
--- a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.1.1.ebuild
+++ b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit virtualx ruby-ng-gnome2
DESCRIPTION="Ruby GStreamer bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RDEPEND="${RDEPEND}
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-3.1.1.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-3.1.1.ebuild
index b4ad55f0eef8..ee902fbd9151 100644
--- a/dev-ruby/ruby-gtk2/ruby-gtk2-3.1.1.ebuild
+++ b/dev-ruby/ruby-gtk2/ruby-gtk2-3.1.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
inherit virtualx ruby-ng-gnome2
DESCRIPTION="Ruby Gtk2 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
DEPEND+=" x11-libs/gtk+:2
@@ -26,6 +26,9 @@ all_ruby_prepare() {
# Use standard icon
sed -i -e 's/"find"/"call-start"/' test/test_gtk_icon_theme.rb || die
+
+ # Fix search path for gtk-2.0 on Gentoo
+ sed -i -e "/include_paths =/ s:]$:,'/usr/include/gtk-2.0']:" ext/gtk2/extconf.rb || die
}
each_ruby_test() {
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.1.1.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.1.1.ebuild
index 49b6efc8e963..cbfd74a408b4 100644
--- a/dev-ruby/ruby-gtk3/ruby-gtk3-3.1.1.ebuild
+++ b/dev-ruby/ruby-gtk3/ruby-gtk3-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit virtualx ruby-ng-gnome2
DESCRIPTION="Ruby Gtk3 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
DEPEND+=" x11-libs/gtk+:3"
diff --git a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.1.1.ebuild b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.1.1.ebuild
index 40201c2a75cd..c6cff90f34e5 100644
--- a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.1.1.ebuild
+++ b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ inherit virtualx ruby-ng-gnome2
RUBY_S=ruby-gnome2-all-${PV}/gtksourceview2
DESCRIPTION="Ruby bindings for gtksourceview"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RDEPEND+=" x11-libs/gtksourceview:2.0"
diff --git a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.1.1.ebuild b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.1.1.ebuild
index 10d7d38b00ab..156cff9de627 100644
--- a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.1.1.ebuild
+++ b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit virtualx ruby-ng-gnome2
DESCRIPTION="Ruby Gtk3 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
DEPEND+=" x11-libs/gtksourceview:3.0"
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.1.1.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.1.1.ebuild
index 989ff33e2b1b..81807b4fa631 100644
--- a/dev-ruby/ruby-poppler/ruby-poppler-3.1.1.ebuild
+++ b/dev-ruby/ruby-poppler/ruby-poppler-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit ruby-ng-gnome2
DESCRIPTION="Ruby poppler-glib bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RDEPEND+=" app-text/poppler[cairo]"
diff --git a/dev-ruby/ruby-rsvg/ruby-rsvg-3.1.1.ebuild b/dev-ruby/ruby-rsvg/ruby-rsvg-3.1.1.ebuild
index 4360ca337df3..ab407b8657f4 100644
--- a/dev-ruby/ruby-rsvg/ruby-rsvg-3.1.1.ebuild
+++ b/dev-ruby/ruby-rsvg/ruby-rsvg-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ inherit ruby-ng-gnome2
RUBY_S=ruby-gnome2-all-${PV}/rsvg2
DESCRIPTION="Ruby bindings for librsvg"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
RDEPEND+=" >=gnome-base/librsvg-2.16.1"
DEPEND+=" >=gnome-base/librsvg-2.16.1"
diff --git a/dev-ruby/ruby-vte/ruby-vte-3.1.1.ebuild b/dev-ruby/ruby-vte/ruby-vte-3.1.1.ebuild
index 89d6587cf657..99d5680ae462 100644
--- a/dev-ruby/ruby-vte/ruby-vte-3.1.1.ebuild
+++ b/dev-ruby/ruby-vte/ruby-vte-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit ruby-ng-gnome2
DESCRIPTION="Ruby vte bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RDEPEND+=" >=x11-libs/vte-0.12.1:0"
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-3.1.1.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-3.1.1.ebuild
index bdcb0a11580a..3d71fd99c3e8 100644
--- a/dev-ruby/ruby-vte3/ruby-vte3-3.1.1.ebuild
+++ b/dev-ruby/ruby-vte3/ruby-vte3-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit virtualx ruby-ng-gnome2
DESCRIPTION="Ruby VTE bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
DEPEND+=" x11-libs/vte:2.91"
diff --git a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.1.1.ebuild b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.1.1.ebuild
index f8b20f296e06..325d402d6ab5 100644
--- a/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.1.1.ebuild
+++ b/dev-ruby/ruby-webkit2-gtk/ruby-webkit2-gtk-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ USE_RUBY="ruby21 ruby22 ruby23 ruby24"
inherit virtualx ruby-ng-gnome2
DESCRIPTION="Ruby WebKitGtk+ for Gtk 3.0 bindings"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
DEPEND+=" net-libs/webkit-gtk:4"
diff --git a/dev-ruby/source_map/source_map-3.0.1.ebuild b/dev-ruby/source_map/source_map-3.0.1.ebuild
index eb78ac7835ea..32d00981d574 100644
--- a/dev-ruby/source_map/source_map-3.0.1.ebuild
+++ b/dev-ruby/source_map/source_map-3.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_TASK_TEST=""
@@ -20,4 +20,4 @@ KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
-ruby_add_rdepend "dev-ruby/json"
+ruby_add_rdepend "dev-ruby/json:*"
diff --git a/dev-ruby/spy/spy-0.4.5.ebuild b/dev-ruby/spy/spy-0.4.5.ebuild
index 59a323e63e21..ab4d3244e737 100644
--- a/dev-ruby/spy/spy-0.4.5.ebuild
+++ b/dev-ruby/spy/spy-0.4.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_DOC="yard"
RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
diff --git a/dev-ruby/stomp/Manifest b/dev-ruby/stomp/Manifest
index f15d6583ad17..ee75769007f5 100644
--- a/dev-ruby/stomp/Manifest
+++ b/dev-ruby/stomp/Manifest
@@ -1,2 +1 @@
-DIST stomp-1.4.3.gem 91136 BLAKE2B 249752ab204401ab91660461c8e45c3c1677c008cbea1abe027059d8b2dfbac9b8b5c8f3446f23e94b2c90dd4f35b3bf5de9837f3ca251579e94de0fcadda6dd SHA512 b23eb5af9323107fddfb1d8d11c8039f567452674e38c7da5a3709412d56489f462b5d0634459c750525ef9a909c988e44a53aefda7e6b6bb30eee4b90a2b948
DIST stomp-1.4.4.gem 93696 BLAKE2B c1647ba119946ed41d58b1fe08baae5fa54317e3ba4b4b33eef50b7ff588daaf2ecf89a45b21b3eac7969609337fc8b09d73ea7f54f40af6c4b2613cab686df7 SHA512 77c5a53b56177869beb9ff236405479d1fe48ba6841f42eefbd104a5e1b8f82584283c909bb2f6ec5a34ae99c0dfa91079d0716d1bef65db24c5b1414c1ed673
diff --git a/dev-ruby/stomp/stomp-1.4.3.ebuild b/dev-ruby/stomp/stomp-1.4.3.ebuild
deleted file mode 100644
index 0003bf613f06..000000000000
--- a/dev-ruby/stomp/stomp-1.4.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby bindings for the stomp messaging protocol"
-HOMEPAGE="https://github.com/stompgem/stomp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-ruby/stomp/stomp-1.4.4.ebuild b/dev-ruby/stomp/stomp-1.4.4.ebuild
index f1d2c296ef87..cf57278dc9fe 100644
--- a/dev-ruby/stomp/stomp-1.4.4.ebuild
+++ b/dev-ruby/stomp/stomp-1.4.4.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/zentest/zentest-4.11.1.ebuild b/dev-ruby/zentest/zentest-4.11.1.ebuild
index 28301bbd3500..0cfefa53470d 100644
--- a/dev-ruby/zentest/zentest-4.11.1.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::R
HOMEPAGE="https://github.com/seattlerb/zentest"
LICENSE="Ruby"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index aab9c628096e..bdf956ae0661 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/guile-sqlite3/Manifest b/dev-scheme/guile-sqlite3/Manifest
new file mode 100644
index 000000000000..90ac055c1d7a
--- /dev/null
+++ b/dev-scheme/guile-sqlite3/Manifest
@@ -0,0 +1 @@
+DIST guile-sqlite3-0.1.0.tar.gz 23832 BLAKE2B cff04a320ab239bf0d90c01ffc4e557bf5bf2978a433fcca0413b09f3c3b2ee5ed75f3655077dc493ae42a11a8e027f0a17b74c97e3eecadfb67f2e0e7912693 SHA512 8c1f58024c464e5628162e3ba1bf129809403bcc5d2329b55b6628f419ff8d5ead21d87f0bdcbb458ce5798d62184af177616bbfbeb653c34450c716f6b3ab26
diff --git a/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild b/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild
new file mode 100644
index 000000000000..b406491f9454
--- /dev/null
+++ b/dev-scheme/guile-sqlite3/guile-sqlite3-0.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Guile bindings of sqlite3"
+HOMEPAGE="https://notabug.org/civodul/guile-sqlite3.git"
+SRC_URI="https://notabug.org/civodul/guile-sqlite3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+ GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-scheme/guile-2.0.11:=
+ dev-db/sqlite:3=
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ default
+
+ # upstream tag on top of source tree. has no autogenerated files
+ eautoreconf
+}
diff --git a/dev-scheme/guile-sqlite3/metadata.xml b/dev-scheme/guile-sqlite3/metadata.xml
new file mode 100644
index 000000000000..2907abeb0c42
--- /dev/null
+++ b/dev-scheme/guile-sqlite3/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ slyfox@gentoo.org
+
+
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 83df38d4691a..b426d2bcb8da 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/latexdiff/latexdiff-1.2.1.ebuild b/dev-tex/latexdiff/latexdiff-1.2.1.ebuild
index e9db7ad5585a..a8b5b0477763 100644
--- a/dev-tex/latexdiff/latexdiff-1.2.1.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/ftilmann/latexdiff.git"
else
SRC_URI="https://github.com/ftilmann/latexdiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
fi
LICENSE="GPL-3"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3d6c34a32111..fced4f478d4e 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cloc/cloc-1.76.ebuild b/dev-util/cloc/cloc-1.76-r1.ebuild
similarity index 83%
rename from dev-util/cloc/cloc-1.76.ebuild
rename to dev-util/cloc/cloc-1.76-r1.ebuild
index 5fc8eb40d88e..70dda680961e 100644
--- a/dev-util/cloc/cloc-1.76.ebuild
+++ b/dev-util/cloc/cloc-1.76-r1.ebuild
@@ -9,16 +9,17 @@ SRC_URI="https://github.com/AlDanial/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
DEPEND="dev-lang/perl"
RDEPEND="${DEPEND}
dev-perl/Algorithm-Diff
+ dev-perl/Parallel-ForkManager
dev-perl/Regexp-Common
virtual/perl-Digest-MD5
- virtual/perl-Getopt-Long
virtual/perl-File-Spec
- virtual/perl-File-Temp"
+ virtual/perl-File-Temp
+ virtual/perl-Getopt-Long"
src_compile() {
pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 48bce332f28a..dc22d7672f53 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,3 +1,4 @@
DIST debhelper_11.3.2.tar.xz 463864 BLAKE2B cdfce5b74d8af2cedec4f4cdd2bd5dcd21a941c420d6be32a145a5ab83ff9ae9bef7e2061ff011e7ecf941e4d6e017f9bc1413865280f0efac9ae0b00478f142 SHA512 b2172638023540593d8dbf525417c8c07e803919d7c0d481f896cff6d562492d22859deab0522aca91f69bd4b8c3350cbbf508cce6859d5bc04596cee9fd4733
DIST debhelper_11.3.4.tar.xz 467684 BLAKE2B 8c5bef040c231c91cef1958cf797b8ddcbb40cee5303c3d6ebe26945462abd6ccb09dc905c0034ec3c48c8c725a0bfe1ee567e96cc5495a08a630adad1863f32 SHA512 2d24948b05396767ce303f9ae73e0640e48510830f7113f494ee91825c6646b7420a65a195f9a68cd2ed21d47d4ab7bf122fee7d7ecf6d5d928e3c51b1b45d2f
+DIST debhelper_11.3.5.tar.xz 467732 BLAKE2B b5d035b57057f36bbc1e6e09f7a0acc6fab2141e2d99cfcc963101a6f939b6a46fa2a1aff899f4a4f11b064c79221e3b91dff8a3f541988c39d6f221506abbdc SHA512 7c5b37a6c6683964835609ec9a6ea65e5121af017ecaab79a88a55252eee010aae064b2d89f24a957c431ac345cd43376815c9b703d6e43a2a098aff6836864e
DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
diff --git a/dev-util/debhelper/debhelper-11.3.5.ebuild b/dev-util/debhelper/debhelper-11.3.5.ebuild
new file mode 100644
index 000000000000..eb7e5fa626c2
--- /dev/null
+++ b/dev-util/debhelper/debhelper-11.3.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+DH_LANGS=( de es fr )
+IUSE+=" ${DH_LANGS[@]/#/l10n_}"
+
+NLS_DEPEND=$(
+ printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
+)
+
+RDEPEND="
+ >=dev-lang/perl-5.10:=
+ >=app-arch/dpkg-1.17
+ dev-perl/TimeDate
+ virtual/perl-Getopt-Long
+"
+DEPEND="
+ ${RDEPEND}
+ ${NLS_DEPEND}
+ test? (
+ dev-perl/Test-Pod
+ sys-apps/fakeroot
+ )
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+ tc-export CC
+
+ local LANGS="" USE_NLS=no lang
+ for lang in ${DH_LANGS[@]}; do
+ if use l10n_${lang}; then
+ LANGS+=" ${lang}"
+ USE_NLS=yes
+ fi
+ done
+
+ emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+ dodoc doc/* debian/changelog
+ docinto examples
+ dodoc examples/*
+ local lang
+ for manfile in *.1 *.7 ; do
+ for lang in ${DH_LANGS[@]}; do
+ case ${manfile} in
+ *.${lang}.?)
+ use l10n_${lang} \
+ && cp ${manfile} "${T}"/${manfile/.${lang}/} \
+ && doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
+ ;;
+ *)
+ doman ${manfile}
+ ;;
+ esac
+ done
+ done
+}
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index d555fabae493..102d414e64df 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,4 +1,5 @@
DIST debootstrap_1.0.103.tar.gz 73167 BLAKE2B 063e27c1d58826bb7fec7879a5876df33b0da27cdbbdce3aa5ffecbcb70dba2814817e644725a132100cc7c7d182576bb2ba813f96bb4b289d06622d073da9d3 SHA512 4b43db32c46e5b69db9885494bc1f91197a40311c05196bf1c6e17d0a1f0519dbf61c8f5731c8627a708b8dfc8f3ba78e822a21879a5caf0d70046e3b7e60aa2
DIST debootstrap_1.0.104.tar.gz 73264 BLAKE2B 28b4d1d1ad389dfb13f049529e5d14e1d8d82abf58b802ff25787e5c791c5d25aa2fd349f923b4e4d29bcbed78f2d32769189e110b6788acb67fb5499454dc52 SHA512 cfefa225a804e353195dedf5fbf0b005e7ac988f66c934927a312a32e8bbe9fd1083647fbafc5dbb3c7b55613887beb2c6296e3a5b8ed705b9ce18e850ee27a4
+DIST debootstrap_1.0.106.tar.gz 73686 BLAKE2B c6dbaa19ab702e49117b56ed04928f0ba6656ee9af8f206ae376af72baf114b20175b32e1c6d6b2fbc7b851e204445b4758a0edc147b94c687ddb5bca8457252 SHA512 86eee4ea1782cd96f364df748b3c7c62a48728c3371fe708937ebb76d75d0ad967d76af7a7f6cc1eb7a8623bba817137b49ffe145378489126d38021dd2882b2
DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
diff --git a/dev-util/debootstrap/debootstrap-1.0.106.ebuild b/dev-util/debootstrap/debootstrap-1.0.106.ebuild
new file mode 100644
index 000000000000..93ffd5d2d1aa
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.106.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+ mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ app-arch/dpkg
+ net-misc/wget
+ sys-devel/binutils
+"
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+ unpack ${PN}_${PV}.tar.gz
+ cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+ return
+}
+
+src_install() {
+ default
+ doman debootstrap.8
+}
+
+pkg_postinst() {
+ if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+ elog "To check Release files against a keyring (--keyring=K), please"
+ elog "install app-crypt/gnupg"
+ fi
+
+ if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+ elog "To check Release files from Debian or Ubuntu, please install"
+ elog " app-crypt/debian-archive-keyring or"
+ elog " app-crypt/ubuntu-keyring as required"
+ fi
+}
diff --git a/dev-util/goland/metadata.xml b/dev-util/goland/metadata.xml
index 97df2a00971b..6f49eba8f496 100644
--- a/dev-util/goland/metadata.xml
+++ b/dev-util/goland/metadata.xml
@@ -1,8 +1,5 @@
-
- mrueg@gentoo.org
- Manuel Rüger
-
+
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
index 258cf2dda4eb..fcadf76f3a95 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/meld/meld-3.18.2.ebuild b/dev-util/meld/meld-3.18.2.ebuild
index ea18fe9d5a84..4ca5b202b221 100644
--- a/dev-util/meld/meld-3.18.2.ebuild
+++ b/dev-util/meld/meld-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://meldmerge.org/"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index b989ce954170..0d03d3f0b1dd 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,3 +2,4 @@ DIST meson-0.44.1.tar.gz 1136337 BLAKE2B 7391776d2f480f43c6cf0bfae3665c16a61c4a2
DIST meson-0.45.1.tar.gz 1163287 BLAKE2B 820ab763193322c75ebf3a79cd38f49f9fa06f9645f382961eddab9bb088263f5ecc603d3ba6db9e038db1ea150d6897dc202bad24ff985ab1ef2dea3f08b724 SHA512 704731aae28ba5fe4c2040464d42489cfc1946c95c39e28eef170ba5ab929b8672c782ed18798528b59aeb38abd23e4930f38e38f1e8c45f1ccf96071b097731
DIST meson-0.46.0.tar.gz 1200258 BLAKE2B 8f1fdae2456d262abff6078084c8f3ca7a4163e709fe9cdf99fad4b9f42ee42750e66db4dd66728df5c26f2622b9a55388f6c165cbcc022513622df2ebcf7d72 SHA512 f2985bfd19477c2f6cd773d7cd0453084e850c0924e110261dcfe183d1534d9d1098ca032fac050d3913893c94a20a2277daa1c12f0cee4fe368a91d136a0c15
DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236babec51fd5f1e70ba4139f13c4e7b6d2985daccf9ef1bc2e33516b1278ab9c9ea4c7fce775d187450c2498dc76 SHA512 beacd5431f9d6abd85a72b2609cbd913f67829b2eef4712a5b9a151e2d0cad6e2c16b5e42819b93f986705305ed874d26211c315aa930b1695552a9e30de8b98
+DIST meson-0.47.0.tar.gz 1246932 BLAKE2B 0191c383488132393fe3e3fb9e71ca0bb0906b8c856bfa72d6352b890246c14bacfe86f4f75c065b0d7197b30570dc63d53d0e7d6a0f25cafe0e85442e89c971 SHA512 02a9aa481c6cce011be9bd3ada523c45f503c70c1c6c8c826241c16a84c8ccbb06de2caced8c748850c24b7a696705c8c72847f935fd720edbd286235390fd94
diff --git a/dev-util/meson/meson-0.46.0.ebuild b/dev-util/meson/meson-0.46.0.ebuild
index 37aab5a3b433..a02f93d684e4 100644
--- a/dev-util/meson/meson-0.46.0.ebuild
+++ b/dev-util/meson/meson-0.46.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
fi
inherit distutils-r1
diff --git a/dev-util/meson/meson-0.46.1.ebuild b/dev-util/meson/meson-0.46.1.ebuild
index 30c7a1010f92..6f8702115d6c 100644
--- a/dev-util/meson/meson-0.46.1.ebuild
+++ b/dev-util/meson/meson-0.46.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
+ KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
fi
inherit distutils-r1
diff --git a/dev-util/meson/meson-0.47.0.ebuild b/dev-util/meson/meson-0.47.0.ebuild
new file mode 100644
index 000000000000..a02f93d684e4
--- /dev/null
+++ b/dev-util/meson/meson-0.47.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+ ${EPYTHON} run_tests.py || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /usr/share/vim/vimfiles
+ doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+ insinto /usr/share/zsh/site-functions
+ doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 37aab5a3b433..a02f93d684e4 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
fi
inherit distutils-r1
diff --git a/dev-util/uftrace/metadata.xml b/dev-util/uftrace/metadata.xml
index eff57fa098f5..9be2c3f269d6 100644
--- a/dev-util/uftrace/metadata.xml
+++ b/dev-util/uftrace/metadata.xml
@@ -1,10 +1,7 @@
-
- mrueg@gentoo.org
- Manuel Rüger
-
+
namhyung/uftrace
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index a9bc75ea4358..25608badb872 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1 +1,2 @@
DIST vint-0.3.18.tar.gz 95865 BLAKE2B 0f7e61b720aa0998091b9b40118b199392fbf1aeace8801d683e8249179cd3d792e15b42df6d34c567c4df1830629a80e6043e87092f37dc46a0e57c6a56cf53 SHA512 1d3e04527a8f5ffae29395010a88258c1771aff2798143eff6572400eaf96323cad04353a7fcee68d9407afde5808446f515fd3d7e8e62de4bef28edf214ebdd
+DIST vint-0.3.19.tar.gz 96755 BLAKE2B 0b03807a4286b3e030e00c112dd0e879fa39e0d2333d46ea159555de50b30098d9a8b2345da8e18b7e1e5c814f10678df2e64398a615bf381186faa0036939f5 SHA512 b9024ed1cd8a18a916798e691ba0db31985034b2420e33c094459a48254c7c8f6fe89a1a64858a67ff95b0b48e67a780cf975940646af2685d2b95640e8121f9
diff --git a/dev-util/vint/vint-0.3.19.ebuild b/dev-util/vint/vint-0.3.19.ebuild
new file mode 100644
index 000000000000..1e5cc17ad27c
--- /dev/null
+++ b/dev-util/vint/vint-0.3.19.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 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 distutils-r1
+
+DESCRIPTION="Lint tool for Vim script language"
+HOMEPAGE="https://github.com/Kuniwak/vint https://pypi.org/project/vim-vint/"
+SRC_URI="https://github.com/Kuniwak/vint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ >=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
+ >=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ virtual/python-pathlib[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+ >=dev-python/pytest-3.3.2[${PYTHON_USEDEP}]
+ >=dev-python/pytest-cov-2.5.1[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
+ )
+"
+
+python_test() {
+ py.test -v || die "Test suite failed with ${EPYTHON}"
+}
diff --git a/dev-util/wxglade/wxglade-0.8.2.ebuild b/dev-util/wxglade/wxglade-0.8.2.ebuild
index 1d0f48649e1e..6c0263bf8fa1 100644
--- a/dev-util/wxglade/wxglade-0.8.2.ebuild
+++ b/dev-util/wxglade/wxglade-0.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/wxglade/${MY_P}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 18308d96f73e..0493edd4617c 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild b/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild
index b43efdb074f1..ada216280c8b 100644
--- a/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild
+++ b/dev-vcs/cvsgraph/cvsgraph-1.7.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.akhphd.au.dk/~bertho/cvsgraph/release/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="-alpha amd64 -ia64 ~ppc sparc x86"
+KEYWORDS="-alpha amd64 -ia64 ppc sparc x86"
IUSE="gif jpeg nls png truetype zlib"
DEPEND="media-libs/gd
diff --git a/dev-vcs/mr/mr-1.20171231.ebuild b/dev-vcs/mr/mr-1.20171231.ebuild
index b7e2e9ba0b2b..9b432a100b3c 100644
--- a/dev-vcs/mr/mr-1.20171231.ebuild
+++ b/dev-vcs/mr/mr-1.20171231.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 55570a54579e..f8222a5491a8 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/zsnes/files/zsnes-1.51-stack-align-v2.patch b/games-emulation/zsnes/files/zsnes-1.51-stack-align-v2.patch
new file mode 100644
index 000000000000..35613a953596
--- /dev/null
+++ b/games-emulation/zsnes/files/zsnes-1.51-stack-align-v2.patch
@@ -0,0 +1,56 @@
+zsnes call C initialization code from assembler.
+
+Example backtrace:
+
+ Thread 1 "zsnes" received signal SIGSEGV, Segmentation fault.
+ => 0xf7550275 <+37>: vmovdqa (%esp),%xmm1
+ ...
+ #13 0x5699ef82 in InitSound () at linux/audio.c:336
+ #14 0x569a25af in initwinvideo () at linux/sdllink.c:1080
+ #15 0x5699fc13 in initvideo () at linux/sdllink.c:1298
+ #16 0x56f9d5bc in regptwa ()
+ #17 0x56a34b50 in SA1tableG ()
+ #18 0x56f84788 in selcB800 ()
+ ...
+
+Call to 'initwinvideo' (first C function) looks like that:
+ NEWSYM InitPreGame ; Executes before starting/continuing a game
+ mov byte[pressed+1],2
+ pushad
+ call Start60HZ
+ %ifdef __OPENGL__
+ call drawscreenwin
+ %endif
+ call initwinvideo
+
+Note: pushad / call does not 16-byte maintain stack alignment
+and breaks i386 ABI.
+
+We apply realignment attribute to all functions noticed by users.
+Bug: https://bugs.gentoo.org/503138
+--- src/linux/sdllink.c.old
++++ src/linux/sdllink.c
+@@ -773,11 +773,11 @@ BOOL InitInput()
+ {
+ InitJoystickInput();
+ return TRUE;
+ }
+
+-int startgame()
++int __attribute__((force_align_arg_pointer)) startgame()
+ {
+ static bool ranonce = false;
+ int status;
+
+ if (!ranonce)
+--- a/linux/sdllink.c
++++ b/linux/sdllink.c
+@@ -897,7 +897,7 @@ bool OGLModeCheck()
+ return(cvidmode > 4);
+ }
+
+-void initwinvideo(void)
++void __attribute__((force_align_arg_pointer)) initwinvideo(void)
+ {
+ DWORD newmode = 0;
+
diff --git a/games-emulation/zsnes/zsnes-1.51-r7.ebuild b/games-emulation/zsnes/zsnes-1.51-r7.ebuild
new file mode 100644
index 000000000000..9613a4888e85
--- /dev/null
+++ b/games-emulation/zsnes/zsnes-1.51-r7.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
+
+DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
+HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
+SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="ao custom-cflags +debug opengl pax_kernel png"
+
+RDEPEND="
+ media-libs/libsdl[sound,video,abi_x86_32(-)]
+ >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)]
+ ao? ( media-libs/libao[abi_x86_32(-)] )
+ debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] )
+ opengl? ( virtual/opengl[abi_x86_32(-)] )
+ png? ( media-libs/libpng:0=[abi_x86_32(-)] )
+"
+DEPEND="${RDEPEND}
+ dev-lang/nasm
+ debug? ( virtual/pkgconfig )
+"
+
+S="${WORKDIR}/${PN}_${PV//./_}/src"
+
+PATCHES=(
+ # Fixing compilation without libpng installed
+ "${FILESDIR}"/${P}-libpng.patch
+
+ # Fix bug #186111
+ # Fix bug #214697
+ # Fix bug #170108
+ # Fix bug #260247
+ "${FILESDIR}"/${P}-archopt-july-23-update.patch
+ "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-libao-thread.patch
+ "${FILESDIR}"/${P}-depbuild.patch
+ "${FILESDIR}"/${P}-CC-quotes.patch
+
+ # Fix compability with libpng15 wrt #378735
+ "${FILESDIR}"/${P}-libpng15.patch
+
+ # Fix buffer overwrite #257963
+ "${FILESDIR}"/${P}-buffer.patch
+ # Fix gcc47 compile #419635
+ "${FILESDIR}"/${P}-gcc47.patch
+ # Fix stack alignment issue #503138
+ "${FILESDIR}"/${P}-stack-align-v2.patch
+
+ "${FILESDIR}"/${P}-cross-compile.patch
+ "${FILESDIR}"/${P}-arch.patch
+)
+
+src_prepare() {
+ default
+
+ # The sdl detection logic uses AC_PROG_PATH instead of
+ # AC_PROG_TOOL, so force the var to get set the way we
+ # need for things to work correctly.
+ tc-is-cross-compiler && export ac_cv_path_SDL_CONFIG=${CHOST}-sdl-config
+
+ sed -i -e '67i#define OF(x) x' zip/zunzip.h || die
+
+ # Remove hardcoded CFLAGS and LDFLAGS
+ sed -i \
+ -e '/^CFLAGS=.*local/s:-pipe.*:-Wall -I.":' \
+ -e '/^LDFLAGS=.*local/d' \
+ -e '/\w*CFLAGS=.*fomit/s:-O3.*$STRIP::' \
+ -e '/lncurses/s:-lncurses:`pkg-config ncurses --libs`:' \
+ -e '/lcurses/s:-lcurses:`pkg-config ncurses --libs`:' \
+ configure.in || die
+ sed -i \
+ -e 's/configure.in/configure.ac/' \
+ Makefile.in || die
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC
+ export BUILD_CXX=$(tc-getBUILD_CXX)
+ export NFLAGS=-O1
+ use amd64 && multilib_toolchain_setup x86
+ use custom-cflags || strip-flags
+
+ append-cppflags -U_FORTIFY_SOURCE #257963
+
+ econf \
+ $(use_enable ao libao) \
+ $(use_enable debug debugger) \
+ $(use_enable png libpng) \
+ $(use_enable opengl) \
+ --disable-debug \
+ --disable-cpucheck
+}
+
+src_compile() {
+ emake makefile.dep
+ emake
+}
+
+src_install() {
+ dobin zsnes
+ if use pax_kernel; then
+ pax-mark m "${D}""${GAMES_BINDIR}"/zsnes || die
+ fi
+
+ newman linux/zsnes.1 zsnes.6
+
+ dodoc \
+ ../docs/{readme.1st,authors.txt,srcinfo.txt,stdards.txt,support.txt,thanks.txt,todo.txt,README.LINUX} \
+ ../docs/readme.txt/*
+ HTML_DOCS="../docs/readme.htm/*" einstalldocs
+
+ make_desktop_entry zsnes ZSNES
+ newicon icons/48x48x32.png ${PN}.png
+}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 56524cd35ae6..38b6bb941dd3 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/urbanterror-data/Manifest b/games-fps/urbanterror-data/Manifest
index a43a3e00145b..0d0c3b281c1f 100644
--- a/games-fps/urbanterror-data/Manifest
+++ b/games-fps/urbanterror-data/Manifest
@@ -2,3 +2,4 @@ DIST urbanterror-data-4.3.0-to-4.3.1.zip 7495315 BLAKE2B a4562c81169274e6f7685c9
DIST urbanterror-data-4.3.0.zip 1490106979 BLAKE2B 2bee5e869b3929564cdba268765f6fda67ec1e4fb55209cac3f7b51b418bba287ba22112e5cd4db8ff2aae81ac836a31640760b1e4b24440054f2b2ee4d7e3c3 SHA512 2f54b59355f790a65b3dbd205e9e8b30d41856f5010a55e9e1436a6ec78e986ceecf78c8d84fac1060702c38a7df849f78a2832bdccb91ea46444877635b32ea
DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 BLAKE2B d3b21c893dc6f5ce2323ca383ff52c1f6711ba57ab752c30d8fbb76b5d72125427a14fc30127589c5612df34cfda869a0727a838006fd6fc566005a54b7e741d SHA512 cb24939fffef9310c6ca8496d0d4f3be8656685e749ff1d6589fd193990be67ac70494b61ef6a12dd1f6995a78d451b9f09098e03970e82e1e3153ec3f89792c
DIST urbanterror-data-4.3.2-to-4.3.3.zip 10409736 BLAKE2B edc33e959cd16528ef732ae31335412c7c7741ccc5f106d2c0c6236f180cf9fd9b14a23b5e4a60d91aa9b8c4126fae5f110034216d5d2ae63ab784fc16532730 SHA512 f2100bf11b5dc0dac265f43fe6c8aa0a1e604728ce02b5b6ca770c9145d11bf02a7e2118ff818d1fdb2b9693ddb85eb012814f346337ef14c58c3a4f3e3abb90
+DIST urbanterror-data-4.3.3-to-4.3.4.zip 10421275 BLAKE2B 95ad6f395fef538fcb5e0413070fda7752759244d968649b0f59d2d9060cd79645a5485c554f2afc74028b7664dc907183ab99274db96826c00169ef5235c577 SHA512 05e14a1411a606fc7aeec3fa6393227af87afcf1ddd5ed5210c6612a9a1c15e0c4f9e14c40d43c078ac3fdbf519e9e8cb7d7a7983b7fceb39d11222d14ed39d6
diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
similarity index 100%
rename from games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild
rename to games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 66630f2fd9b4..d52c2c83a4bb 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,2 +1 @@
-DIST urbanterror-4.3.3_p20180218.tar.gz 10069644 BLAKE2B ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624 SHA512 e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8
-DIST urbanterror-4.3.3_p20180410.tar.gz 10070300 BLAKE2B c81b93137b7c528354b3d894d45636195947ab4f7e3e8af031e8c164114fa3db16d500046187ce5ad688a6d6c65844b1b1b1282773c2171b38f59c7093d251dd SHA512 ea9021543c91ef7619f1f15febecd36c1e38a382c4959d5916022c108458a17f3649ac74784da0c06ef2ed738390bd247888ca4ba8d033b8c1121ab9540dcb31
+DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218 SHA512 8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef
diff --git a/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild b/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild
deleted file mode 100644
index e211e749ba5a..000000000000
--- a/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
- EGIT_BRANCH="urt"
-else
- COMMIT_ID="d93f05de38a6cae60fbf0f073aace64b3adc7aaf"
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ioq3-${COMMIT_ID}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
-REQUIRED_USE="|| ( client server )
- voip? ( opus )"
-
-DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3-fix-build_system.patch
- "${FILESDIR}"/${PN}-4.3.3_p20180218-fix-loop.patch
-)
-
-RDEPEND="
- client? (
- media-libs/libsdl2:=[X,sound,joystick,opengl,video]
- mumble? ( media-sound/mumble:= )
- openal? ( media-libs/openal:= )
- opus? ( media-libs/opusfile:= )
- vorbis? ( media-libs/libvorbis:= )
- )
- curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.3
- sys-libs/zlib:=[minizip]
- virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use client; then
- if ! use openal && ! use opus && ! use vorbis; then
- ewarn
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
- fi
- fi
-}
-
-src_configure() {
- default
-
- tc-export CC
-}
-
-src_compile() {
- # Workaround for used zlib macro, which got renamed in Gentoo
- # wrt bug #449510
- append-cppflags "-DOF=_Z_OF"
-
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- emake \
- ARCH=${my_arch} \
- DEFAULT_BASEDIR="/usr/share/urbanterror" \
- BUILD_CLIENT=$(usex "client" 1 0) \
- BUILD_SERVER=$(usex "server" 1 0) \
- BUILD_BASEGAME=1 \
- BUILD_MISSIONPACK=0 \
- BUILD_GAME_SO=0 \
- BUILD_GAME_QVM=0 \
- BUILD_STANDALONE=1 \
- SERVERBIN="Quake3-UrT-Ded" \
- CLIENTBIN="Quake3-UrT" \
- USE_RENDERER_DLOPEN=0 \
- USE_YACC=0 \
- BASEGAME="q3ut4"\
- BASEGAME_CFLAGS="${CFLAGS}" \
- USE_OPENAL=$(usex "openal" 1 0) \
- USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
- USE_CURL=$(usex "curl" 1 0) \
- USE_CURL_DLOPEN=$(usex "curl" 1 0) \
- USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
- USE_CODEC_OPUS=$(usex "opus" 1 0) \
- USE_MUMBLE=$(usex "mumble" 1 0) \
- USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
- USE_VOIP=$(usex "mumble" 1 0) \
- USE_INTERNAL_LIBS=0 \
- USE_LOCAL_HEADERS=0 \
- USE_ALTGAMMA=$(usex "altgamma" 1 0) \
- $(usex "debug" "debug" "release")
-}
-
-src_install() {
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- if use client; then
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
- make_desktop_entry ${PN} "UrbanTerror" ${PN}
- fi
-
- if use server && ! use client; then
- # dedicated server only
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
- fi
-
- einstalldocs
-}
-
-pkg_postinst() {
- use client && xdg_desktop_database_update
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # ^this is a new installation, so:
- if use openal; then
- elog ""
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- fi
-
- if use altgamma; then
- elog ""
- elog "You might need to set:"
- elog " seta r_altgamma \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
- elog "Be aware that altgamme works on a global scale, so external"
- elog "applications like redshift can cause trouble. Disabling"
- elog "these while playing is a usable workaround."
- fi
-
- if ! use altgamma; then
- elog ""
- elog "If you are using a modesetting graphics driver you might"
- elog "consider setting USE=\"altgamma\"."
- elog "For details take a look at:"
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
- fi
-
- if ! use client; then
- elog ""
- elog "You disabled client support. You won't be able to connect"
- elog "to any servers and play. If you want to do so, enable"
- elog "USE=\"client\"."
- fi
-
- if use skeetshootmod; then
- elog ""
- elog "You might need to set:"
- elog " seta sv_skeetshoot \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
- fi
- fi
-}
-
-pkg_postrm() {
- use client && xdg_desktop_database_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.3.3_p20180410.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
similarity index 98%
rename from games-fps/urbanterror/urbanterror-4.3.3_p20180410.ebuild
rename to games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
index ebea9db38f90..04d4459533ea 100644
--- a/games-fps/urbanterror/urbanterror-4.3.3_p20180410.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
EGIT_BRANCH="urt"
else
- COMMIT_ID="d6db4589efd1ff2b7a4fa2983e58993d06098327"
+ COMMIT_ID="e8c941ec8b753b9ecb4f8c4fcec07e4fe3babc64"
SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/ioq3-${COMMIT_ID}"
KEYWORDS="~amd64 ~x86"
@@ -41,7 +41,7 @@ RDEPEND="
vorbis? ( media-libs/libvorbis:= )
)
curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.3
+ ~games-fps/urbanterror-data-4.3.4
sys-libs/zlib:=[minizip]
virtual/jpeg:0
"
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index b628e88f4e0e..162b9280ec4a 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/kopete/files/kopete-18.04.2-pipes.patch b/kde-apps/kopete/files/kopete-18.04.2-pipes.patch
new file mode 100644
index 000000000000..d52b71947004
--- /dev/null
+++ b/kde-apps/kopete/files/kopete-18.04.2-pipes.patch
@@ -0,0 +1,33 @@
+From 8084cfa3a0b3342e73fa128f89c7efd6bac79a36 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sat, 7 Jul 2018 11:14:32 +0200
+Subject: [PATCH] Fix pipes plugin build (missing moc include)
+
+---
+ plugins/pipes/pipesplugin.cpp | 2 ++
+ plugins/pipes/pipespreferences.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/plugins/pipes/pipesplugin.cpp b/plugins/pipes/pipesplugin.cpp
+index f86733b5e..27f3e5e68 100644
+--- a/plugins/pipes/pipesplugin.cpp
++++ b/plugins/pipes/pipesplugin.cpp
+@@ -353,3 +353,5 @@ void PipesPlugin::readXml(PipeOptions pipeOptions, Kopete::Message &msg, const Q
+ msg.setHtmlBody(body.text());
+ }
+ }
++
++#include "pipesplugin.moc"
+diff --git a/plugins/pipes/pipespreferences.cpp b/plugins/pipes/pipespreferences.cpp
+index f43b42af7..0ee22216b 100644
+--- a/plugins/pipes/pipespreferences.cpp
++++ b/plugins/pipes/pipespreferences.cpp
+@@ -108,3 +108,5 @@ void PipesPreferences::slotListChanged()
+ mPrefs->pipesList->resizeColumnToContents(PipesDelegate::ContentsColumn);
+ changed();
+ }
++
++#include "pipespreferences.moc"
+--
+2.18.0
+
diff --git a/kde-apps/kopete/kopete-18.04.2.ebuild b/kde-apps/kopete/kopete-18.04.2-r1.ebuild
similarity index 97%
rename from kde-apps/kopete/kopete-18.04.2.ebuild
rename to kde-apps/kopete/kopete-18.04.2-r1.ebuild
index 1c613fd92017..9bbb27070fb0 100644
--- a/kde-apps/kopete/kopete-18.04.2.ebuild
+++ b/kde-apps/kopete/kopete-18.04.2-r1.ebuild
@@ -94,7 +94,7 @@ COMMONDEPEND="
groupwise? ( app-crypt/qca:2[qt5(+)] )
jingle? (
dev-libs/expat
- dev-libs/openssl:0
+ dev-libs/openssl:0=
>=media-libs/mediastreamer-2.3.0
media-libs/speex
net-libs/libsrtp:=
@@ -110,8 +110,8 @@ COMMONDEPEND="
)
xmpp? (
app-crypt/qca:2[qt5(+)]
- net-dns/libidn
- sys-libs/zlib
+ net-dns/libidn:0=
+ sys-libs/zlib:=
)
yahoo? ( media-libs/jasper )
zeroconf? (
@@ -136,6 +136,8 @@ DEPEND="${COMMONDEPEND}
jingle? ( dev-libs/jsoncpp )
"
+PATCHES=( "${FILESDIR}/${P}-pipes.patch" )
+
src_configure() {
local x x2
# Handle common stuff
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index b290a9cba2ac..c6d88cf2f3af 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/kdecoration/kdecoration-5.13.2.ebuild b/kde-plasma/kdecoration/kdecoration-5.13.2-r1.ebuild
similarity index 84%
rename from kde-plasma/kdecoration/kdecoration-5.13.2.ebuild
rename to kde-plasma/kdecoration/kdecoration-5.13.2-r1.ebuild
index fce30fa8c298..bb208109e760 100644
--- a/kde-plasma/kdecoration/kdecoration-5.13.2.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.13.2-r1.ebuild
@@ -12,5 +12,8 @@ LICENSE="|| ( LGPL-2.1 LGPL-3 )"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE=""
-DEPEND="$(add_qt_dep qtgui)"
+DEPEND="
+ $(add_frameworks_dep ki18n)
+ $(add_qt_dep qtgui)
+"
RDEPEND="${DEPEND}"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 0e81b8e6eed9..89a3620aa600 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/hamlib/hamlib-3.2.ebuild b/media-libs/hamlib/hamlib-3.2.ebuild
index eac2786bab63..5b7abf81949d 100644
--- a/media-libs/hamlib/hamlib-3.2.ebuild
+++ b/media-libs/hamlib/hamlib-3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz
LICENSE="LGPL-2 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 x86 ~x86-fbsd"
IUSE="doc perl python tcl"
RESTRICT="test"
diff --git a/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
index 9930ff0404a2..f736d69ecd44 100644
--- a/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.8.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
inherit git-r3 autotools
else
SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
fi
LICENSE="Old-MIT ISC icu"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 8496afe31e22..d821b50113da 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index f260557b6394..0178f3d83f6a 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -1 +1,2 @@
+DIST release_2-3-1.tar.bz2 703327 BLAKE2B 70724894a4abf2f94d682602d722b3d015cefefa7c9daf2dae35fc84bff1d950539c916d6d97e39565e87e8e7d841277ad14e137238026b25f73b1b288fa18f5 SHA512 f943c2aa477ca943b2015eb0b49a650e5c9e5cc124549b68d36b56a0ae6344a8d32ac3c4f213ab3cb91794ae569d3ed14a84168f45bf395e90536992078bce41
DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 BLAKE2B 64567a037dd283d005727b993053609e7c46784de67bcbd9afb4f68edd03cec494e6eca6c497ac578928de92c1d21b2519867c014cfd11ace79e957fc5d487d1 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1
diff --git a/media-plugins/vdr-live/files/confd-2.3 b/media-plugins/vdr-live/files/confd-2.3
new file mode 100644
index 000000000000..cb1dce04dfb5
--- /dev/null
+++ b/media-plugins/vdr-live/files/confd-2.3
@@ -0,0 +1,29 @@
+# configuration of media-plugins/vdr-live
+
+# for people who want more secure
+# with ssl access.
+# on usage, you have to install vdr-live
+# with USE="ssl"
+#
+# SSL ADDRESS --> https://:8443/
+#
+# allowed values: yes no
+# default: no
+#LIVE_USE_SSL="yes"
+
+# default given portnumber
+# only changes needed on problems
+#
+#LIVE_PORT="8008"
+#LIVE_SSL_PORT="8443"
+
+# bind to these IP addresses
+# default, your IP will automaticly detected
+#
+LIVE_BIND_IPS="127.0.0.1"
+
+# for people who have epgimges
+# default: /var/cache/vdr/epgimges
+#
+# set this to your own path, if needed
+#EPGIMAGES_DIR=" "
diff --git a/media-plugins/vdr-live/files/rc-addon-2.3.sh b/media-plugins/vdr-live/files/rc-addon-2.3.sh
new file mode 100644
index 000000000000..1372e09d56f0
--- /dev/null
+++ b/media-plugins/vdr-live/files/rc-addon-2.3.sh
@@ -0,0 +1,30 @@
+#
+# zzam@g.o
+# hd_brummy@g.o
+
+EPGIMAGES_DIR="/var/cache/vdr/epgimages"
+
+plugin_pre_vdr_start() {
+ if [ "${LIVE_USE_SSL:=no}" = "yes" ]; then
+ if [ -n "${LIVE_SSL_PORT}" ]; then
+ add_plugin_param "-s ${LIVE_SSL_PORT}"
+ fi
+
+ add_plugin_param "--cert=/etc/vdr/plugins/live/live.pem"
+ add_plugin_param "--key=/etc/vdr/plugins/live/live-key.pem"
+
+ else
+ if [ -n "${LIVE_PORT}" ]; then
+ add_plugin_param "-p ${LIVE_PORT}"
+ fi
+ fi
+
+ if [ -d ${EPGIMAGES_DIR} ]; then
+ add_plugin_param "--epgimages=${EPGIMAGES_DIR}"
+ fi
+
+ local ip
+ for ip in ${LIVE_BIND_IPS:=`hostname -i`}; do
+ add_plugin_param "-i ${ip}"
+ done
+}
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
index 41c00b51519b..6041faafd99e 100644
--- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit vdr-plugin-2 ssl-cert
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
index 9d7f6bdbaf5d..0dbcc0a04730 100644
--- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit vdr-plugin-2 ssl-cert
diff --git a/media-plugins/vdr-live/vdr-live-2.3.1.ebuild b/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
new file mode 100644
index 000000000000..f46cff93c6de
--- /dev/null
+++ b/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vdr-plugin-2 ssl-cert
+
+MY_P="release_2-3-1"
+
+DESCRIPTION="VDR Plugin: Web Access To Settings"
+HOMEPAGE="http://live.vdr-developer.org"
+SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pcre ssl"
+
+DEPEND="media-video/vdr
+ >=dev-libs/tntnet-2.2.1[ssl=]
+ >=dev-libs/cxxtools-2.2.1
+ pcre? ( >=dev-libs/libpcre-8.12[cxx] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+VDR_CONFD_FILE="${FILESDIR}/confd-2.3"
+VDR_RCADDON_FILE="${FILESDIR}/rc-addon-2.3.sh"
+
+KEEP_I18NOBJECT="yes"
+
+make_live_cert() {
+ # TODO: still true?
+ # ssl-cert eclass creates a "invalid" cert, create our own one
+ local base=$(get_base 1)
+ local keydir="/etc/vdr/plugins/live"
+
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-VDR Plugin Live}"
+ SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+ echo
+ gen_cnf || return 1
+ echo
+ gen_key 1 || return 1
+ gen_csr 1 || return 1
+ gen_crt 1 || return 1
+ echo
+
+ install -d "${ROOT}${keydir}"
+ install -m0400 "${base}.key" "${ROOT}${keydir}/live-key.pem"
+ install -m0444 "${base}.crt" "${ROOT}${keydir}/live.pem"
+ chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live{,-key}.pem
+}
+
+src_prepare() {
+ default
+
+ # remove untranslated language files
+ rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pt_PT,ro_RO,sl_SI,tr_TR}.po
+
+ vdr-plugin-2_src_prepare
+
+ if ! use pcre; then
+ sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
+ fi
+}
+
+src_install() {
+ vdr-plugin-2_src_install
+
+ insinto /usr/share/vdr/plugins/live
+ doins -r live/*
+
+ fowners -R vdr:vdr /usr/share/vdr/plugins/live
+}
+
+pkg_postinst() {
+ vdr-plugin-2_pkg_postinst
+
+ elog "To be able to use all functions of vdr-live"
+ elog "you should emerge and enable"
+ elog "media-plugins/vdr-epgsearch to search the EPG,"
+ elog "media-plugins/vdr-streamdev for Live-TV streaming"
+
+ elog "The default username/password is:"
+ elog "\tadmin:live"
+
+ if use ssl ; then
+ if path_exists -a "${ROOT}"/etc/vdr/plugins/live/live.pem; then
+ einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
+ einfo "emerge --config ${PN}"
+ else
+ einfo "No SSL cert found, creating a default one now"
+ make_live_cert
+ fi
+ fi
+}
+
+pkg_config() {
+ make_live_cert
+}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 46d77437d165..eda987cf62d0 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/fldigi/fldigi-4.0.16.ebuild b/media-radio/fldigi/fldigi-4.0.16.ebuild
index e180da8b5f4f..cfa5be442f1a 100644
--- a/media-radio/fldigi/fldigi-4.0.16.ebuild
+++ b/media-radio/fldigi/fldigi-4.0.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="hamlib nls pulseaudio"
RDEPEND="x11-libs/fltk:1[threads,xft]
diff --git a/media-radio/flrig/flrig-1.3.39.ebuild b/media-radio/flrig/flrig-1.3.39.ebuild
index 19d88bf2c029..c4cebbc77a77 100644
--- a/media-radio/flrig/flrig-1.3.39.ebuild
+++ b/media-radio/flrig/flrig-1.3.39.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="nls"
RDEPEND="x11-libs/libX11
diff --git a/media-radio/gpredict/gpredict-2.2.1.ebuild b/media-radio/gpredict/gpredict-2.2.1.ebuild
index 25ba0fb2210c..3effbee5363c 100644
--- a/media-radio/gpredict/gpredict-2.2.1.ebuild
+++ b/media-radio/gpredict/gpredict-2.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
IUSE=""
RDEPEND="dev-libs/glib:2
diff --git a/media-radio/svxlink/svxlink-17.12.2.ebuild b/media-radio/svxlink/svxlink-17.12.2.ebuild
index 743c6459075e..2c36f3f80d70 100644
--- a/media-radio/svxlink/svxlink-17.12.2.ebuild
+++ b/media-radio/svxlink/svxlink-17.12.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sm0svx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
RDEPEND="dev-lang/tcl:0
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 5c7dc1dedf5e..d8db43755e96 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/kid3/kid3-3.6.1.ebuild b/media-sound/kid3/kid3-3.6.1.ebuild
index 17db2bbd586f..0315d043942a 100644
--- a/media-sound/kid3/kid3-3.6.1.ebuild
+++ b/media-sound/kid3/kid3-3.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
REQUIRED_USE="flac? ( vorbis )"
diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
index 08d1b59c3aec..346ad164820b 100644
--- a/media-sound/pnmixer/Manifest
+++ b/media-sound/pnmixer/Manifest
@@ -1,2 +1,3 @@
DIST pnmixer-0.6_pre20111213.tar.xz 131328 BLAKE2B dabfa6e8270116eb325dc6dfd59c6f650975f1efce27603b0495f11efebd743aaba17ad19efba82d4c1d75753418a89295277853c9095d6a4fffdf6b17c5b9fe SHA512 967a685593256f9f2e8ab2ef955a91a03c3710d96956087ac55301d5232e6f01897efbb064bd6dc1804836af1b66c038cb3d04203043462de5246e4f14dd37c4
DIST pnmixer-0.7.1.tar.gz 237949 BLAKE2B 87b309f3dd844009abe5f5bb2c5ca16ba80069932c2833a9d472130a6f0d7c36a050dc393bca097372c44fca5f90742cfad07c40a6f51ff877080f5eee25b2d2 SHA512 08d83424d921ef6112700fe8c3b55e147ace7767698a9d3ee4bb79ed0e727be7bcc82d55d3debc4b805e75f07c5702443be157e1bccce44d76072c36f8825816
+DIST pnmixer-v0.7.2.tar.gz 237972 BLAKE2B 368d149d9e803b52c7b0edac9ba8996312da7122f10f536095cffcdf31d319159494fa3aab0005e6dedb4e7e0b46d58bc73dd89285c7bddca4750d29539fa489 SHA512 9f43a56d17f4c16465113d4355a546ba71ca4d208e384812cf84625a51bd9bb6fa0e93f3e40fd0a2d157c4ee2b27f64082a47bbd4135c168a95b3fcbeebf6186
diff --git a/media-sound/pnmixer/metadata.xml b/media-sound/pnmixer/metadata.xml
index 0877b41108af..6c7b2a84125f 100644
--- a/media-sound/pnmixer/metadata.xml
+++ b/media-sound/pnmixer/metadata.xml
@@ -1,6 +1,14 @@
+
+ sir.suriv@gmail.com
+ Diogo Pereira
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
PNMixer is a simple mixer application designed to run in your system
tray. It integrates nicely into desktop environments that don't have
diff --git a/media-sound/pnmixer/pnmixer-0.7.2.ebuild b/media-sound/pnmixer/pnmixer-0.7.2.ebuild
new file mode 100644
index 000000000000..346e7d99739f
--- /dev/null
+++ b/media-sound/pnmixer/pnmixer-0.7.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+MY_PV="v${PV}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Volume mixer for the system tray"
+HOMEPAGE="https://github.com/nicklan/pnmixer"
+SRC_URI="https://github.com/nicklan/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc libnotify nls"
+
+RDEPEND="dev-libs/glib:2
+ media-libs/alsa-lib
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ libnotify? ( x11-libs/libnotify )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )
+ nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_LIBNOTIFY="$(usex libnotify)"
+ -DENABLE_NLS="$(usex nls)"
+ -DBUILD_DOCUMENTATION="$(usex doc)"
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ )
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
index adff5a32b850..e2673e617622 100644
--- a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
# +alsa-plugin as discussed in bug #519530
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-sound/sox/sox-14.4.2-r1.ebuild b/media-sound/sox/sox-14.4.2-r1.ebuild
index 233339ff404d..8f7f7227ebc1 100644
--- a/media-sound/sox/sox-14.4.2-r1.ebuild
+++ b/media-sound/sox/sox-14.4.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
RDEPEND="
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch
deleted file mode 100644
index 21ed6492a44d..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-commit 8831bc77d705c03b3f8081de0520dd10afa85c69
-Author: Uli Franke
-Date: Tue Jan 17 23:23:46 2012 +0100
-
- BUG(2509): Avoid unaligned reads in avcodec xform.
-
-diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
-index fe58fc5..1b4a659 100644
---- a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -36,6 +36,9 @@ typedef struct {
- guint buffer_size;
- gboolean no_demuxer;
-
-+ gchar *read_out_buffer;
-+ gint read_out_buffer_size;
-+
- guint channels;
- guint samplerate;
- xmms_sample_format_t sampleformat;
-@@ -107,6 +110,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform)
-
- avcodec_close (data->codecctx);
- av_free (data->codecctx);
-+ av_free (data->read_out_buffer);
-
- g_string_free (data->outbuf, TRUE);
- g_free (data->buffer);
-@@ -132,6 +136,9 @@ xmms_avcodec_init (xmms_xform_t *xform)
- data->buffer_size = AVCODEC_BUFFER_SIZE;
- data->codecctx = NULL;
-
-+ data->read_out_buffer = av_malloc (AVCODEC_MAX_AUDIO_FRAME_SIZE);
-+ data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+
- xmms_xform_private_data_set (xform, data);
-
- avcodec_init ();
-@@ -196,7 +203,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
- } else {
- /* A demuxer plugin forgot to give decoder config? */
- xmms_log_error ("Decoder config data not found!");
-- return FALSE;
-+ goto err;
- }
- }
-
-@@ -220,7 +227,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
-
- /* some codecs need to have something read before they set
- * the samplerate and channels correctly, unfortunately... */
-- if ((ret = xmms_avcodec_read (xform, buf, 42, &error)) > 0) {
-+ if ((ret = xmms_avcodec_read (xform, buf, sizeof (buf), &error)) > 0) {
- g_string_insert_len (data->outbuf, 0, buf, ret);
- } else {
- XMMS_DBG ("First read failed, codec is not working...");
-@@ -251,6 +258,9 @@ err:
- if (data->codecctx) {
- av_free (data->codecctx);
- }
-+ if (data->read_out_buffer) {
-+ av_free (data->read_out_buffer);
-+ }
- g_string_free (data->outbuf, TRUE);
- g_free (data->extradata);
- g_free (data);
-@@ -263,8 +273,7 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len,
- xmms_error_t *error)
- {
- xmms_avcodec_data_t *data;
-- char outbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE];
-- gint outbufsize, bytes_read = 0;
-+ gint bytes_read = 0;
- guint size;
-
- data = xmms_xform_private_data_get (xform);
-@@ -330,9 +339,9 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len,
- packet.data = data->buffer;
- packet.size = data->buffer_length;
-
-- outbufsize = sizeof (outbuf);
-- bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) outbuf,
-- &outbufsize, &packet);
-+ data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+ bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) data->read_out_buffer,
-+ &data->read_out_buffer_size, &packet);
-
- /* The DTS decoder of ffmpeg is buggy and always returns
- * the input buffer length, get frame length from header */
-@@ -354,8 +363,8 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len,
-
- data->buffer_length -= bytes_read;
-
-- if (outbufsize > 0) {
-- g_string_append_len (data->outbuf, outbuf, outbufsize);
-+ if (data->read_out_buffer_size > 0) {
-+ g_string_append_len (data->outbuf, data->read_out_buffer, data->read_out_buffer_size);
- }
-
- size = MIN (data->outbuf->len, len);
-@@ -371,8 +380,7 @@ static gint64
- xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t whence, xmms_error_t *err)
- {
- xmms_avcodec_data_t *data;
-- char outbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE];
-- gint outbufsize, bytes_read = 0;
-+ gint bytes_read = 0;
- gint64 ret = -1;
-
- g_return_val_if_fail (xform, -1);
-@@ -396,9 +404,9 @@ xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t w
- packet.data = data->buffer;
- packet.size = data->buffer_length;
-
-- outbufsize = sizeof (outbuf);
-- bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) outbuf,
-- &outbufsize, &packet);
-+ data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+ bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) data->read_out_buffer,
-+ &data->read_out_buffer_size, &packet);
-
- if (bytes_read < 0 || bytes_read > data->buffer_length) {
- XMMS_DBG ("Error decoding data!");
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p2.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p2.patch
deleted file mode 100644
index 70334587d420..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-audio4-p2.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-commit b614459dc1ea353d6c24b4a77c7f92a5577d5bc3
-Author: Uli Franke
-Date: Thu Jan 19 11:53:57 2012 +0100
-
- BUG(2510): Add more bitrates/samplerates to AAC/ALAC.
-
-diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
-index 1b4a659..b32de4d 100644
---- a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -60,6 +60,7 @@ static gint xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len
- xmms_error_t *error);
- static gint64 xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples,
- xmms_xform_seek_mode_t whence, xmms_error_t *err);
-+static xmms_sample_format_t xmms_avcodec_translate_sample_format (enum AVSampleFormat av_sample_format);
-
- /*
- * Plugin header
-@@ -168,12 +169,12 @@ xmms_avcodec_init (xmms_xform_t *xform)
- data->channels = ret;
- }
-
-- /* bitrate required for WMA files */
-+ /* Required by WMA xform. */
- xmms_xform_auxdata_get_int (xform,
- "bitrate",
- &data->bitrate);
-
-- /* ALAC and MAC require bits per sample field to be 16 */
-+ /* Required by tta and apefile xforms. */
- xmms_xform_auxdata_get_int (xform,
- "samplebits",
- &data->samplebits);
-@@ -238,12 +239,17 @@ xmms_avcodec_init (xmms_xform_t *xform)
-
- data->samplerate = data->codecctx->sample_rate;
- data->channels = data->codecctx->channels;
-+ data->sampleformat = xmms_avcodec_translate_sample_format (data->codecctx->sample_fmt);
-+ if (data->sampleformat == XMMS_SAMPLE_FORMAT_UNKNOWN) {
-+ avcodec_close (data->codecctx);
-+ goto err;
-+ }
-
- xmms_xform_outdata_type_add (xform,
- XMMS_STREAM_TYPE_MIMETYPE,
- "audio/pcm",
- XMMS_STREAM_TYPE_FMT_FORMAT,
-- XMMS_SAMPLE_FORMAT_S16,
-+ data->sampleformat,
- XMMS_STREAM_TYPE_FMT_CHANNELS,
- data->channels,
- XMMS_STREAM_TYPE_FMT_SAMPLERATE,
-@@ -428,3 +434,23 @@ xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t w
-
- return ret;
- }
-+
-+static xmms_sample_format_t
-+xmms_avcodec_translate_sample_format (enum AVSampleFormat av_sample_format)
-+{
-+ switch (av_sample_format) {
-+ case AV_SAMPLE_FMT_U8:
-+ return XMMS_SAMPLE_FORMAT_U8;
-+ case AV_SAMPLE_FMT_S16:
-+ return XMMS_SAMPLE_FORMAT_S16;
-+ case AV_SAMPLE_FMT_S32:
-+ return XMMS_SAMPLE_FORMAT_S32;
-+ case AV_SAMPLE_FMT_FLT:
-+ return XMMS_SAMPLE_FORMAT_FLOAT;
-+ case AV_SAMPLE_FMT_DBL:
-+ return XMMS_SAMPLE_FORMAT_DOUBLE;
-+ default:
-+ XMMS_DBG ("AVSampleFormat (%i) not supported.", av_sample_format);
-+ return XMMS_SAMPLE_FORMAT_UNKNOWN;
-+ }
-+}
-diff --git a/src/plugins/mp4/mp4.c b/src/plugins/mp4/mp4.c
-index 7c915c4..3ee9357 100644
---- a/src/plugins/mp4/mp4.c
-+++ b/src/plugins/mp4/mp4.c
-@@ -186,9 +186,6 @@ xmms_mp4_init (xmms_xform_t *xform)
- xmms_xform_auxdata_set_bin (xform, "decoder_config", tmpbuf, tmpbuflen);
- g_free (tmpbuf);
-
-- /* This is only for ALAC to set 16-bit samples, ignored for AAC */
-- xmms_xform_auxdata_set_int (xform, "samplebits", 16);
--
- xmms_mp4_get_mediainfo (xform);
-
- XMMS_DBG ("MP4 demuxer inited successfully!");
-@@ -288,7 +285,7 @@ xmms_mp4_get_mediainfo (xmms_xform_t *xform)
- data = xmms_xform_private_data_get (xform);
- g_return_if_fail (data);
-
-- if ((temp = mp4ff_get_sample_rate (data->mp4ff, data->track)) >= 0) {
-+ if ((temp = mp4ff_get_sample_rate (data->mp4ff, data->track)) > 0) {
- glong srate = temp;
-
- if ((temp = mp4ff_get_track_duration_use_offsets (data->mp4ff,
-@@ -492,7 +489,7 @@ xmms_mp4_get_track (xmms_xform_t *xform, mp4ff_t *infile)
- case 0x69: /* MPEG-2 audio */
- case 0x6B: /* MPEG-1 audio */
- continue;
-- case 0xff:
-+ case 0xff: /* ALAC */
- chans = mp4ff_get_channel_count (infile, i);
- rate = mp4ff_get_sample_rate (infile, i);
- if (chans <= 0 || rate <= 0) {
-diff --git a/src/plugins/mp4/mp4ff/README.xmms2 b/src/plugins/mp4/mp4ff/README.xmms2
-index c2737c5..8021618 100644
---- a/src/plugins/mp4/mp4ff/README.xmms2
-+++ b/src/plugins/mp4/mp4ff/README.xmms2
-@@ -12,3 +12,4 @@ Changes:
- * Add value_length variable to tag type and use it when adding new item-value pairs,
- necessary for cover art since it's binary data and can't be handled as a string
- * Add support for Apple Lossless audio files
-+ * Add a workaround for supporting higher samplerates.
-diff --git a/src/plugins/mp4/mp4ff/mp4ff.c b/src/plugins/mp4/mp4ff/mp4ff.c
-index ee7f7fb..b6f0a37 100644
---- a/src/plugins/mp4/mp4ff/mp4ff.c
-+++ b/src/plugins/mp4/mp4ff/mp4ff.c
-@@ -32,6 +32,8 @@
- #include
- #include "mp4ffint.h"
-
-+static uint32_t mp4ff_normalize_flawed_sample_rate (uint16_t samplerate);
-+
- mp4ff_t *mp4ff_open_read(mp4ff_callback_t *f)
- {
- mp4ff_t *ff = malloc(sizeof(mp4ff_t));
-@@ -304,12 +306,39 @@ int32_t mp4ff_num_samples(const mp4ff_t *f, const int32_t track)
- return total;
- }
-
-+static uint32_t
-+mp4ff_normalize_flawed_sample_rate (uint16_t samplerate)
-+{
-+ /* A list of common rates can be found at
-+ * https://en.wikipedia.org/wiki/Sampling_rate */
-+ uint32_t rates[] = {8000, 11025, 16000, 22050, 32000, 44056, 44100,
-+ 47250, 48000, 50000, 50400, 88200, 96000, 176400,
-+ 192000, 352800, 384000, 0};
-+ uint32_t* rate;
-+
-+ /* First check standard rates. */
-+ for (rate = rates; *rate; rate++) {
-+ if (*rate == samplerate) {
-+ return *rate;
-+ }
-+ }
-+
-+ /* No standard rates matching - check if sample rate got truncated when
-+ * added to MP4 container */
-+ for (rate = rates; *rate; rate++) {
-+ if ((*rate & 0x0000FFFF) == samplerate) {
-+ return *rate;
-+ }
-+ }
-
-+ /* Failed to find a standard rate - we give up returning the original rate */
-+ return samplerate;
-+}
-
-
- uint32_t mp4ff_get_sample_rate(const mp4ff_t *f, const int32_t track)
- {
-- return f->track[track]->sampleRate;
-+ return mp4ff_normalize_flawed_sample_rate (f->track[track]->sampleRate);
- }
-
- uint32_t mp4ff_get_channel_count(const mp4ff_t * f,const int32_t track)
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p3.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p3.patch
deleted file mode 100644
index a9145c0d3d26..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-audio4-p3.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-commit 4d0682030e20a8ed218f4ff924554f93d276d9ee
-Author: Anthony Garcia
-Date: Thu Apr 22 16:59:37 2010 -0700
-
- OTHER: Cleanup
-
- Re-enabled nellymoser (ffmpeg appears to be okay with it now)
-
- Fixed possible infinite loop in the code that handles the data (if any)
- between the header and tag data.
-
-diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
-index 6c9fea8..5554056 100644
---- a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -90,7 +90,7 @@ xmms_avcodec_plugin_setup (xmms_xform_plugin_t *xform_plugin)
- xmms_magic_add ("A/52 (AC-3) header", "audio/x-ffmpeg-ac3",
- "0 beshort 0x0b77", NULL);
- xmms_magic_add ("DTS header", "audio/x-ffmpeg-dca",
-- "0 belong 0x7ffe8001", NULL);
-+ "0 belong 0x7ffe8001", NULL);
-
- xmms_xform_plugin_indata_add (xform_plugin,
- XMMS_STREAM_TYPE_MIMETYPE,
-@@ -197,7 +197,8 @@ xmms_avcodec_init (xmms_xform_t *xform)
- !strcmp (data->codec_id, "adpcm_swf") ||
- !strcmp (data->codec_id, "pcm_s16le") ||
- !strcmp (data->codec_id, "ac3") ||
-- !strcmp (data->codec_id, "dca")) {
-+ !strcmp (data->codec_id, "dca") ||
-+ !strcmp (data->codec_id, "nellymoser")) {
- /* number 1024 taken from libavformat raw.c RAW_PACKET_SIZE */
- data->extradata = g_malloc0 (1024);
- data->extradata_size = 1024;
-diff --git a/src/plugins/flv/flv.c b/src/plugins/flv/flv.c
-index 440010c..266fea6 100644
---- a/src/plugins/flv/flv.c
-+++ b/src/plugins/flv/flv.c
-@@ -25,29 +25,41 @@
- * and other info, then data
- */
- #define FLV_TAG_SIZE 11
--/* random constant */
- #define FLV_CHUNK_SIZE 4096
-
--/* let libavcodec take care of swapping sample bytes */
--static const gchar *mime_pcm_s16le = "audio/x-ffmpeg-pcm_s16le";
--static const gchar *fmt_mime[11] = {
-- /* Supported when samples are 8 bit
-- * (otherwise there's no way of knowing endianness)
-- */
-- "audio/pcm",
-- "audio/x-ffmpeg-adpcm_swf",
-- "audio/mpeg",
-- /* if bps is 8 bit u8
-- * if bps is 16 bit sle16
-- */
-- "audio/pcm",
-- /* libavcodec can't handle nelly without dying yet */
-- /*"audio/x-ffmpeg-nellymoser",
-- "audio/x-ffmpeg-nellymoser",
-- "audio/x-ffmpeg-nellymoser",*/
-- "", "", "",
-- "", "", "",
-- "audio/aac"
-+typedef enum {
-+ /* Only u8 bit samples since
-+ there's no way to determine endianness
-+ */
-+ CODEC_PCM_HOST,
-+ CODEC_ADPCM,
-+ CODEC_MP3,
-+ /* 8 bps: unsigned
-+ 16 bps: signed
-+ */
-+ CODEC_PCM_LE,
-+ CODEC_NELLYMOSER_16K,
-+ CODEC_NELLYMOSER_8K,
-+ /* Uses the sample rate in
-+ the tag as normal
-+ */
-+ CODEC_NELLYMOSER,
-+ CODEC_AAC = 10
-+} xmms_flv_codec_id;
-+
-+struct xmms_flv_codec_table {
-+ xmms_flv_codec_id id;
-+ const gchar *mime;
-+} static flv_codecs[] = {
-+ {CODEC_PCM_HOST, "audio/pcm"},
-+ {CODEC_ADPCM, "audio/x-ffmpeg-adpcm_swf"},
-+ {CODEC_MP3, "audio/mpeg"},
-+ /* Will be audio/x-ffmpeg-pcm_s16le if bps is 16 */
-+ {CODEC_PCM_LE, "audio/pcm"},
-+ {CODEC_NELLYMOSER_16K, "audio/x-ffmpeg-nellymoser"},
-+ {CODEC_NELLYMOSER_8K, "audio/x-ffmpeg-nellymoser"},
-+ {CODEC_NELLYMOSER, "audio/x-ffmpeg-nellymoser"},
-+ {CODEC_AAC, "audio/aac"}
- };
-
- typedef struct {
-@@ -111,23 +123,26 @@ static gboolean
- xmms_flv_init (xmms_xform_t *xform)
- {
- xmms_sample_format_t bps;
-- gint readret;
-+ gint readret, i;
- guint8 channels, flags, format;
-- guint8 header[FLV_TAG_SIZE + 5];
-- const gchar *mime;
-+ guint8 header[FLV_TAG_SIZE + 1];
- guint32 dataoffset, samplerate;
- xmms_error_t err;
- xmms_flv_data_t *flvdata;
-+ struct xmms_flv_codec_table *codec = NULL;
-+
-+ flvdata = g_new0 (xmms_flv_data_t, 1);
-+ xmms_xform_private_data_set (xform, flvdata);
-
- readret = xmms_xform_read (xform, header, FLV_HDR_SIZE, &err);
- if (readret != FLV_HDR_SIZE) {
- xmms_log_error ("Header read error");
-- return FALSE;
-+ goto init_err;
- }
-
- if ((header[4] & HAS_AUDIO) != HAS_AUDIO) {
- xmms_log_error ("FLV has no audio stream");
-- return FALSE;
-+ goto init_err;
- }
-
- dataoffset = get_be32 (&header[5]) - FLV_HDR_SIZE;
-@@ -140,7 +155,7 @@ xmms_flv_init (xmms_xform_t *xform)
- dataoffset : FLV_HDR_SIZE, &err);
- if (readret <= 0) {
- xmms_log_error ("Error reading header:tag body gap");
-- return FALSE;
-+ goto init_err;
- }
-
- dataoffset -= readret;
-@@ -148,86 +163,99 @@ xmms_flv_init (xmms_xform_t *xform)
-
- if (next_audio_tag (xform) <= 0) {
- xmms_log_error ("Can't find first audio tag");
-- return FALSE;
-+ goto init_err;
- }
-
-- if (xmms_xform_peek (xform, header, FLV_TAG_SIZE + 5, &err) < FLV_TAG_SIZE + 5) {
-+ if (xmms_xform_read (xform, header, FLV_TAG_SIZE + 1, &err) < FLV_TAG_SIZE + 1) {
- xmms_log_error ("Can't read first audio tag");
-- return FALSE;
-+ goto init_err;
- }
-
-- flags = header[FLV_TAG_SIZE + 4];
-+ flags = header[11];
- XMMS_DBG ("Audio flags: %X", flags);
-
-- switch (flags&12) {
-- case 0: samplerate = 5512; break;
-- case 4: samplerate = 11025; break;
-- case 8: samplerate = 22050; break;
-- case 12: samplerate = 44100; break;
-- default: samplerate = 8000; break;
-+ format = flags >> 4;
-+ for (i = 0; i < G_N_ELEMENTS (flv_codecs); i++) {
-+ if (flv_codecs[i].id == format) {
-+ codec = &flv_codecs[i];
-+ break;
-+ }
- }
-
-- if (flags&2) {
-- bps = XMMS_SAMPLE_FORMAT_S16;
-+ if (flags & 1) {
-+ channels = 2;
- } else {
-- bps = XMMS_SAMPLE_FORMAT_U8;
-+ channels = 1;
- }
-
-- if (flags&1) {
-- channels = 2;
-+ if (flags & 2) {
-+ bps = XMMS_SAMPLE_FORMAT_S16;
- } else {
-- channels = 1;
-+ bps = XMMS_SAMPLE_FORMAT_U8;
- }
-
-- format = flags >> 4;
-- mime = (format <= 10)? fmt_mime[format] : NULL;
-- switch (format) {
-- case 0:
-- /* If the flv has an HE PCM audio stream, the
-- * samples must be unsigned and 8 bits long
-- */
-- if (bps != XMMS_SAMPLE_FORMAT_U8) {
-- xmms_log_error ("Only u8 HE PCM is supported");
-- return FALSE;
-- }
-- break;
-- case 3:
-- if (bps == XMMS_SAMPLE_FORMAT_S16) {
-- mime = mime_pcm_s16le;
-- }
-- break;
-+ switch ((flags & 12) >> 2) {
-+ case 0: samplerate = 5512; break;
-+ case 1: samplerate = 11025; break;
-+ case 2: samplerate = 22050; break;
-+ case 3: samplerate = 44100; break;
-+ default: samplerate = 8000; break;
- }
-
-- if (mime && *mime) {
-- flvdata = g_new0 (xmms_flv_data_t, 1);
-+ if (codec) {
-+ switch (codec->id) {
-+ case CODEC_PCM_HOST:
-+ if (bps != XMMS_SAMPLE_FORMAT_U8) {
-+ xmms_log_error ("Only u8 HE PCM is supported");
-+ goto init_err;
-+ }
-+ break;
-+ case CODEC_PCM_LE:
-+ if (bps == XMMS_SAMPLE_FORMAT_S16) {
-+ codec->mime = "audio/x-ffmpeg-pcm_s16le";
-+ }
-+ break;
-+ case CODEC_NELLYMOSER_16K:
-+ samplerate = 16000;
-+ break;
-+ case CODEC_NELLYMOSER_8K:
-+ samplerate = 8000;
-+ break;
-+ default:
-+ break;
-+ }
-+
- flvdata->format = format;
-+ flvdata->last_datasize = get_be24 (&header[1]) - 1;
-
- XMMS_DBG ("Rate: %d, bps: %d, channels: %d", samplerate,
- bps, channels);
-
-- xmms_xform_private_data_set (xform, flvdata);
- xmms_xform_outdata_type_add (xform,
- XMMS_STREAM_TYPE_MIMETYPE,
-- mime,
-- XMMS_STREAM_TYPE_FMT_SAMPLERATE,
-- samplerate,
-- XMMS_STREAM_TYPE_FMT_FORMAT,
-- bps,
-- XMMS_STREAM_TYPE_FMT_CHANNELS,
-- channels,
-- XMMS_STREAM_TYPE_END);
-+ codec->mime,
-+ XMMS_STREAM_TYPE_FMT_SAMPLERATE,
-+ samplerate,
-+ XMMS_STREAM_TYPE_FMT_FORMAT,
-+ bps,
-+ XMMS_STREAM_TYPE_FMT_CHANNELS,
-+ channels,
-+ XMMS_STREAM_TYPE_END);
- return TRUE;
- } else {
- xmms_log_error ("Unsupported audio format");
-- return FALSE;
- }
-+
-+init_err:
-+ g_free (flvdata);
-+ return FALSE;
- }
-
- static gint
- xmms_flv_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len, xmms_error_t *err)
- {
-- gint ret = 0, thismuch = FLV_TAG_SIZE + 5;
-- guint8 header[FLV_TAG_SIZE + 6], gap = 1;
-+ gint ret = 0, thismuch = FLV_TAG_SIZE + 1;
-+ guint8 header[FLV_TAG_SIZE + 1];
- xmms_flv_data_t *data = NULL;
-
- data = xmms_xform_private_data_get (xform);
-@@ -236,12 +264,8 @@ xmms_flv_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len, xmms_error_t *
- xmms_xform_auxdata_barrier (xform);
- ret = next_audio_tag (xform);
- if (ret > 0) {
-- if (data->format == 10) {
-- thismuch++;
-- gap++;
-- }
- if (xmms_xform_read (xform, header, thismuch, err) == thismuch) {
-- data->last_datasize = get_be24 (&header[5]) - gap;
-+ data->last_datasize = get_be24 (&header[1]) - 1;
- } else {
- xmms_log_error ("Need %d bytes", thismuch);
- return -1;
-@@ -280,40 +304,51 @@ xmms_flv_destroy (xmms_xform_t *xform)
- static gint
- next_audio_tag (xmms_xform_t *xform)
- {
-- guint8 header[FLV_TAG_SIZE + 4];
-+ guint8 header[FLV_TAG_SIZE];
- guint8 dumb[FLV_CHUNK_SIZE];
- gint ret = 0;
- xmms_error_t err;
-- guint32 datasize = 0;
-+ xmms_flv_data_t *data;
-+
-+ data = xmms_xform_private_data_get (xform);
-
- do {
-- /* there's a last 4 bytes at the end of an FLV giving the final
-- * tag's size, this isn't an error
-- */
-- ret = xmms_xform_peek (xform, header, FLV_TAG_SIZE + 4, &err);
-- if ((ret < FLV_TAG_SIZE) && (ret > -1)) {
-- ret = 0;
-- break;
-- } else if (ret == -1) {
-- xmms_log_error ("%s", xmms_error_message_get (&err));
-- break;
-- }
-+ /* If > 0 assume we're in the middle of a tag's data */
-+ if (!data->last_datasize) {
-+ /* There are 4 bytes before an actual tag giving
-+ the previous tag's size. The first size in an
-+ flv is always 0.
-+ */
-+ if (xmms_xform_read (xform, header, 4, &err) != 4) {
-+ xmms_log_error ("Couldn't read last tag size");
-+ return -1;
-+ }
-
-- if (header[4] == 8) {
-- /* woo audio tag! */
-- break;
-- }
-+ ret = xmms_xform_peek (xform, header, FLV_TAG_SIZE, &err);
-+ if ((ret < FLV_TAG_SIZE) && (ret > -1)) {
-+ return 0;
-+ } else if (ret == -1) {
-+ xmms_log_error ("%s", xmms_error_message_get (&err));
-+ return ret;
-+ }
-+
-+ if (header[0] == 8) {
-+ /* woo audio tag! */
-+ break;
-+ }
-
-- ret = xmms_xform_read (xform, header, FLV_TAG_SIZE + 4, &err);
-- if (ret <= 0) { return ret; }
-+ if ((ret = xmms_xform_read (xform, header, FLV_TAG_SIZE, &err)) <= 0) {
-+ return ret;
-+ }
-
-- datasize = get_be24 (&header[5]);
-+ data->last_datasize = get_be24 (&header[1]);
-+ }
-
-- while (datasize) {
-+ while (data->last_datasize) {
- ret = xmms_xform_read (xform, dumb,
-- (datasize < FLV_CHUNK_SIZE) ?
-- datasize : FLV_CHUNK_SIZE,
-- &err);
-+ (data->last_datasize < FLV_CHUNK_SIZE) ?
-+ data->last_datasize : FLV_CHUNK_SIZE,
-+ &err);
- if (ret == 0) {
- xmms_log_error ("Data field short!");
- break;
-@@ -323,7 +358,7 @@ next_audio_tag (xmms_xform_t *xform)
- break;
- }
-
-- datasize -= ret;
-+ data->last_datasize -= ret;
- }
-
- } while (ret);
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p4.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p4.patch
deleted file mode 100644
index 552f202df19d..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-audio4-p4.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-commit 4198d9bf5dff517740ed51b22313367f156107e1
-Author: Erik Massop
-Date: Sun Dec 22 17:19:30 2013 +0100
-
- OTHER: Split xmms_avcodec_read, remove some duplicate code
-
-diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
-index 5b9b606..eed7964 100644
---- a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -57,6 +57,9 @@ typedef struct {
- static gboolean xmms_avcodec_plugin_setup (xmms_xform_plugin_t *xform_plugin);
- static gboolean xmms_avcodec_init (xmms_xform_t *xform);
- static void xmms_avcodec_destroy (xmms_xform_t *xform);
-+static gint xmms_avcodec_internal_read_some (xmms_xform_t *xform, xmms_avcodec_data_t *data, xmms_error_t *error);
-+static gint xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data);
-+static void xmms_avcodec_internal_append (xmms_avcodec_data_t *data);
- static gint xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len,
- xmms_error_t *error);
- static gint64 xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples,
-@@ -281,101 +284,24 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len,
- xmms_error_t *error)
- {
- xmms_avcodec_data_t *data;
-- gint bytes_read = 0;
- guint size;
-
- data = xmms_xform_private_data_get (xform);
- g_return_val_if_fail (data, -1);
-
-- size = MIN (data->outbuf->len, len);
-- while (size == 0) {
-- AVPacket packet;
-- av_init_packet (&packet);
-+ while (0 == (size = MIN (data->outbuf->len, len))) {
-+ gint res;
-
- if (data->no_demuxer || data->buffer_length == 0) {
-- gint read_total;
--
-- bytes_read = xmms_xform_read (xform,
-- (gchar *) (data->buffer + data->buffer_length),
-- data->buffer_size - data->buffer_length,
-- error);
--
-- if (bytes_read < 0) {
-- XMMS_DBG ("Error while reading data");
-- return bytes_read;
-- } else if (bytes_read == 0) {
-- XMMS_DBG ("EOF");
-- return 0;
-- }
--
-- read_total = bytes_read;
--
-- /* If we have a demuxer plugin, make sure we read the whole packet */
-- while (read_total == data->buffer_size && !data->no_demuxer) {
-- /* multiply the buffer size and try to read again */
-- data->buffer = g_realloc (data->buffer, data->buffer_size * 2);
-- bytes_read = xmms_xform_read (xform,
-- (gchar *) data->buffer +
-- data->buffer_size,
-- data->buffer_size,
-- error);
-- data->buffer_size *= 2;
--
-- if (bytes_read < 0) {
-- XMMS_DBG ("Error while reading data");
-- return bytes_read;
-- }
--
-- read_total += bytes_read;
--
-- if (read_total < data->buffer_size) {
-- /* finally double the buffer size for performance reasons, the
-- * hotspot handling likes to fit two frames in the buffer */
-- data->buffer = g_realloc (data->buffer, data->buffer_size * 2);
-- data->buffer_size *= 2;
-- XMMS_DBG ("Reallocated avcodec internal buffer to be %d bytes",
-- data->buffer_size);
--
-- break;
-- }
-- }
--
-- /* Update the buffer length */
-- data->buffer_length += read_total;
-- }
--
-- packet.data = data->buffer;
-- packet.size = data->buffer_length;
--
-- data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-- bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) data->read_out_buffer,
-- &data->read_out_buffer_size, &packet);
-+ gint bytes_read;
-
-- /* The DTS decoder of ffmpeg is buggy and always returns
-- * the input buffer length, get frame length from header */
-- if (!strcmp (data->codec_id, "dca") && bytes_read > 0) {
-- bytes_read = ((int)data->buffer[5] << 12) |
-- ((int)data->buffer[6] << 4) |
-- ((int)data->buffer[7] >> 4);
-- bytes_read = (bytes_read & 0x3fff) + 1;
-+ bytes_read = xmms_avcodec_internal_read_some (xform, data, error);
-+ if (bytes_read <= 0) { return bytes_read; }
- }
-
-- if (bytes_read < 0 || bytes_read > data->buffer_length) {
-- XMMS_DBG ("Error decoding data!");
-- return -1;
-- } else if (bytes_read != data->buffer_length) {
-- g_memmove (data->buffer,
-- data->buffer + bytes_read,
-- data->buffer_length - bytes_read);
-- }
--
-- data->buffer_length -= bytes_read;
--
-- if (data->read_out_buffer_size > 0) {
-- g_string_append_len (data->outbuf, data->read_out_buffer, data->read_out_buffer_size);
-- }
--
-- size = MIN (data->outbuf->len, len);
-+ res = xmms_avcodec_internal_decode_some (data);
-+ if (res < 0) { return res; }
-+ if (res > 0) { xmms_avcodec_internal_append (data); }
- }
-
- memcpy (buf, data->outbuf->str, size);
-@@ -388,7 +314,6 @@ static gint64
- xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t whence, xmms_error_t *err)
- {
- xmms_avcodec_data_t *data;
-- gint bytes_read = 0;
- gint64 ret = -1;
-
- g_return_val_if_fail (xform, -1);
-@@ -406,23 +331,11 @@ xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t w
-
- /* The buggy ape decoder doesn't flush buffers, so we need to finish decoding
- * the frame before seeking to avoid segfaults... this hack sucks */
-+ /* FIXME: Is ^^^ still true? */
- while (data->buffer_length > 0) {
-- AVPacket packet;
-- av_init_packet (&packet);
-- packet.data = data->buffer;
-- packet.size = data->buffer_length;
--
-- data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-- bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) data->read_out_buffer,
-- &data->read_out_buffer_size, &packet);
--
-- if (bytes_read < 0 || bytes_read > data->buffer_length) {
-- XMMS_DBG ("Error decoding data!");
-+ if (xmms_avcodec_internal_decode_some (data) < 0) {
- return -1;
- }
--
-- data->buffer_length -= bytes_read;
-- g_memmove (data->buffer, data->buffer + bytes_read, data->buffer_length);
- }
-
- ret = xmms_xform_seek (xform, samples, whence, err);
-@@ -456,3 +369,131 @@ xmms_avcodec_translate_sample_format (enum AVSampleFormat av_sample_format)
- return XMMS_SAMPLE_FORMAT_UNKNOWN;
- }
- }
-+
-+/*
-+Read some data from our source of data to data->buffer, updating buffer_length
-+and buffer_size as needed.
-+
-+Returns: on error: negative
-+ on EOF: zero
-+ otherwise: number of bytes read.
-+*/
-+static gint
-+xmms_avcodec_internal_read_some (xmms_xform_t *xform,
-+ xmms_avcodec_data_t *data,
-+ xmms_error_t *error)
-+{
-+ gint bytes_read, read_total;
-+
-+ bytes_read = xmms_xform_read (xform,
-+ (gchar *) (data->buffer + data->buffer_length),
-+ data->buffer_size - data->buffer_length,
-+ error);
-+
-+ if (bytes_read < 0) {
-+ XMMS_DBG ("Error while reading data");
-+ return bytes_read;
-+ } else if (bytes_read == 0) {
-+ XMMS_DBG ("EOF");
-+ return 0;
-+ }
-+
-+ read_total = bytes_read;
-+
-+ /* If we have a demuxer plugin, make sure we read the whole packet */
-+ while (read_total == data->buffer_size && !data->no_demuxer) {
-+ /* multiply the buffer size and try to read again */
-+ data->buffer = g_realloc (data->buffer, data->buffer_size * 2);
-+ bytes_read = xmms_xform_read (xform,
-+ (gchar *) data->buffer +
-+ data->buffer_size,
-+ data->buffer_size,
-+ error);
-+ data->buffer_size *= 2;
-+
-+ if (bytes_read < 0) {
-+ XMMS_DBG ("Error while reading data");
-+ return bytes_read;
-+ }
-+
-+ read_total += bytes_read;
-+
-+ if (read_total < data->buffer_size) {
-+ /* finally double the buffer size for performance reasons, the
-+ * hotspot handling likes to fit two frames in the buffer */
-+ data->buffer = g_realloc (data->buffer, data->buffer_size * 2);
-+ data->buffer_size *= 2;
-+ XMMS_DBG ("Reallocated avcodec internal buffer to be %d bytes",
-+ data->buffer_size);
-+
-+ break;
-+ }
-+ }
-+
-+ /* Update the buffer length */
-+ data->buffer_length += read_total;
-+
-+ return read_total;
-+}
-+
-+/*
-+Decode some data from data->buffer[0..data->buffer_length-1] to
-+data->read_out_buffer. Number of bytes in data->read_out_buffer
-+is stored in data->read_out_buffer_size.
-+
-+Returns: on error: negative
-+ on no new data produced: zero
-+ otherwise: positive
-+
-+FIXME: data->buffer should be at least data->buffer_length +
-+FF_INPUT_BUFFER_PADDING_SIZE long.
-+*/
-+static gint
-+xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
-+{
-+ gint bytes_read = 0;
-+ AVPacket packet;
-+
-+ av_init_packet (&packet);
-+ packet.data = data->buffer;
-+ packet.size = data->buffer_length;
-+
-+ data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+ bytes_read = avcodec_decode_audio3 (data->codecctx,
-+ (short *) data->read_out_buffer,
-+ &data->read_out_buffer_size, &packet);
-+
-+ /* The DTS decoder of ffmpeg is buggy and always returns
-+ * the input buffer length, get frame length from header */
-+ /* FIXME: Is ^^^^ still true? */
-+ if (!strcmp (data->codec_id, "dca") && bytes_read > 0) {
-+ bytes_read = ((int)data->buffer[5] << 12) |
-+ ((int)data->buffer[6] << 4) |
-+ ((int)data->buffer[7] >> 4);
-+ bytes_read = (bytes_read & 0x3fff) + 1;
-+ }
-+
-+ if (bytes_read < 0 || bytes_read > data->buffer_length) {
-+ XMMS_DBG ("Error decoding data!");
-+ return -1;
-+ }
-+
-+ if (bytes_read < data->buffer_length) {
-+ data->buffer_length -= bytes_read;
-+ g_memmove (data->buffer,
-+ data->buffer + bytes_read,
-+ data->buffer_length);
-+ } else {
-+ data->buffer_length = 0;
-+ }
-+
-+ return data->read_out_buffer_size;
-+}
-+
-+static void
-+xmms_avcodec_internal_append (xmms_avcodec_data_t *data)
-+{
-+ g_string_append_len (data->outbuf,
-+ (gchar *) data->read_out_buffer,
-+ data->read_out_buffer_size);
-+}
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p5.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p5.patch
deleted file mode 100644
index 8ed5bb4a24a5..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-audio4-p5.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-commit d44312fb14bde0ab47ee6de1b3fe7435d4a97c99
-Author: Erik Massop
-Date: Sun Dec 22 20:01:18 2013 +0100
-
- BUG(2572): Use avcodec_decode_audio4
-
-diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
-index 266a607..a41a675 100644
---- a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -37,8 +37,7 @@ typedef struct {
- guint buffer_size;
- gboolean no_demuxer;
-
-- gchar *read_out_buffer;
-- gint read_out_buffer_size;
-+ AVFrame *read_out_frame;
-
- guint channels;
- guint samplerate;
-@@ -125,7 +124,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform)
-
- avcodec_close (data->codecctx);
- av_free (data->codecctx);
-- av_free (data->read_out_buffer);
-+ avcodec_free_frame (&data->read_out_frame);
-
- g_string_free (data->outbuf, TRUE);
- g_free (data->buffer);
-@@ -151,8 +150,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
- data->buffer_size = AVCODEC_BUFFER_SIZE;
- data->codecctx = NULL;
-
-- data->read_out_buffer = av_malloc (AVCODEC_MAX_AUDIO_FRAME_SIZE);
-- data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+ data->read_out_frame = avcodec_alloc_frame ();
-
- xmms_xform_private_data_set (xform, data);
-
-@@ -233,6 +231,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
- data->codecctx->extradata_size = data->extradata_size;
- data->codecctx->codec_id = codec->id;
- data->codecctx->codec_type = codec->type;
-+ data->codecctx->refcounted_frames = 0;
-
- if (avcodec_open2 (data->codecctx, codec, NULL) < 0) {
- XMMS_DBG ("Opening decoder '%s' failed", codec->name);
-@@ -279,8 +278,8 @@ err:
- if (data->codecctx) {
- av_free (data->codecctx);
- }
-- if (data->read_out_buffer) {
-- av_free (data->read_out_buffer);
-+ if (data->read_out_frame) {
-+ avcodec_free_frame (&data->read_out_frame);
- }
- g_string_free (data->outbuf, TRUE);
- g_free (data->extradata);
-@@ -365,17 +364,23 @@ xmms_avcodec_translate_sample_format (enum AVSampleFormat av_sample_format)
- {
- switch (av_sample_format) {
- case AV_SAMPLE_FMT_U8:
-+ case AV_SAMPLE_FMT_U8P:
- return XMMS_SAMPLE_FORMAT_U8;
- case AV_SAMPLE_FMT_S16:
-+ case AV_SAMPLE_FMT_S16P:
- return XMMS_SAMPLE_FORMAT_S16;
- case AV_SAMPLE_FMT_S32:
-+ case AV_SAMPLE_FMT_S32P:
- return XMMS_SAMPLE_FORMAT_S32;
- case AV_SAMPLE_FMT_FLT:
-+ case AV_SAMPLE_FMT_FLTP:
- return XMMS_SAMPLE_FORMAT_FLOAT;
- case AV_SAMPLE_FMT_DBL:
-+ case AV_SAMPLE_FMT_DBLP:
- return XMMS_SAMPLE_FORMAT_DOUBLE;
- default:
-- XMMS_DBG ("AVSampleFormat (%i) not supported.", av_sample_format);
-+ XMMS_DBG ("AVSampleFormat (%i: %s) not supported.", av_sample_format,
-+ av_get_sample_fmt_name (av_sample_format));
- return XMMS_SAMPLE_FORMAT_UNKNOWN;
- }
- }
-@@ -448,8 +453,7 @@ xmms_avcodec_internal_read_some (xmms_xform_t *xform,
-
- /*
- Decode some data from data->buffer[0..data->buffer_length-1] to
--data->read_out_buffer. Number of bytes in data->read_out_buffer
--is stored in data->read_out_buffer_size.
-+data->read_out_frame
-
- Returns: on error: negative
- on no new data produced: zero
-@@ -461,6 +465,7 @@ FF_INPUT_BUFFER_PADDING_SIZE long.
- static gint
- xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
- {
-+ int got_frame = 0;
- gint bytes_read = 0;
- AVPacket packet;
-
-@@ -468,10 +473,10 @@ xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
- packet.data = data->buffer;
- packet.size = data->buffer_length;
-
-- data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-- bytes_read = avcodec_decode_audio3 (data->codecctx,
-- (short *) data->read_out_buffer,
-- &data->read_out_buffer_size, &packet);
-+ avcodec_get_frame_defaults (data->read_out_frame);
-+
-+ bytes_read = avcodec_decode_audio4 (
-+ data->codecctx, data->read_out_frame, &got_frame, &packet);
-
- /* The DTS decoder of ffmpeg is buggy and always returns
- * the input buffer length, get frame length from header */
-@@ -497,13 +502,33 @@ xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
- data->buffer_length = 0;
- }
-
-- return data->read_out_buffer_size;
-+ return got_frame ? 1 : 0;
- }
-
- static void
- xmms_avcodec_internal_append (xmms_avcodec_data_t *data)
- {
-- g_string_append_len (data->outbuf,
-- (gchar *) data->read_out_buffer,
-- data->read_out_buffer_size);
-+ enum AVSampleFormat fmt = (enum AVSampleFormat) data->read_out_frame->format;
-+ int samples = data->read_out_frame->nb_samples;
-+ int channels = data->codecctx->channels;
-+ int bps = av_get_bytes_per_sample (fmt);
-+
-+ if (av_sample_fmt_is_planar (fmt)) {
-+ /* Convert from planar to packed format */
-+ gint i, j;
-+
-+ for (i = 0; i < samples; i++) {
-+ for (j = 0; j < channels; j++) {
-+ g_string_append_len (
-+ data->outbuf,
-+ (gchar *) (data->read_out_frame->extended_data[j] + i*bps),
-+ bps
-+ );
-+ }
-+ }
-+ } else {
-+ g_string_append_len (data->outbuf,
-+ (gchar *) data->read_out_frame->extended_data[0],
-+ samples * channels * bps);
-+ }
- }
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p6.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p6.patch
deleted file mode 100644
index b1bc1c5d609b..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-audio4-p6.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-commit fc66249e69f53eef709c5210546fdd92e1c89554
-Author: Erik Massop
-Date: Sun Dec 22 23:04:08 2013 +0100
-
- OTHER: Some compatibility with different avcodec versions
-
-diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
-index a41a675..023833d 100644
---- a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -124,7 +124,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform)
-
- avcodec_close (data->codecctx);
- av_free (data->codecctx);
-- avcodec_free_frame (&data->read_out_frame);
-+ av_frame_free (&data->read_out_frame);
-
- g_string_free (data->outbuf, TRUE);
- g_free (data->buffer);
-@@ -150,7 +150,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
- data->buffer_size = AVCODEC_BUFFER_SIZE;
- data->codecctx = NULL;
-
-- data->read_out_frame = avcodec_alloc_frame ();
-+ data->read_out_frame = av_frame_alloc ();
-
- xmms_xform_private_data_set (xform, data);
-
-@@ -231,7 +231,6 @@ xmms_avcodec_init (xmms_xform_t *xform)
- data->codecctx->extradata_size = data->extradata_size;
- data->codecctx->codec_id = codec->id;
- data->codecctx->codec_type = codec->type;
-- data->codecctx->refcounted_frames = 0;
-
- if (avcodec_open2 (data->codecctx, codec, NULL) < 0) {
- XMMS_DBG ("Opening decoder '%s' failed", codec->name);
-@@ -473,7 +472,8 @@ xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
- packet.data = data->buffer;
- packet.size = data->buffer_length;
-
-- avcodec_get_frame_defaults (data->read_out_frame);
-+ /* clear buffers and reset fields to defaults */
-+ av_frame_unref (data->read_out_frame);
-
- bytes_read = avcodec_decode_audio4 (
- data->codecctx, data->read_out_frame, &got_frame, &packet);
-diff --git a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
-index 73ac2ab..e74b3f8 100644
---- a/src/plugins/avcodec/avcodec_compat.h
-+++ b/src/plugins/avcodec/avcodec_compat.h
-@@ -83,3 +83,17 @@ typedef struct AVPacket {
- # define avcodec_open2(avctx, codec, options) \
- avcodec_open(avctx, codec)
- #endif
-+
-+/* Map avcodec_free_frame to av_freep if the former doesn't exist.
-+ * (This is in versions earlier than 54.28.0 (libav) or 54.59.100 (ffmpeg)) */
-+#if ! HAVE_AVCODEC_FREE_FRAME
-+# define avcodec_free_frame av_freep
-+#endif
-+
-+/* Map av_frame_alloc, av_frame_unref, av_frame_free into their
-+ * deprecated versions in versions earlier than 55.28.1 */
-+#if LIBAVCODEC_VERSION_INT < 0x371c01
-+# define av_frame_alloc avcodec_alloc_frame
-+# define av_frame_unref avcodec_get_frame_defaults
-+# define av_frame_free avcodec_free_frame
-+#endif
-diff --git a/src/plugins/avcodec/wscript b/src/plugins/avcodec/wscript
-index 03ba7d8..d367816 100644
---- a/src/plugins/avcodec/wscript
-+++ b/src/plugins/avcodec/wscript
-@@ -1,10 +1,33 @@
- from waftools.plugin import plugin
-
-+## Code fragments for configuration
-+avcodec_free_frame_fragment = """
-+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
-+# include "libavcodec/avcodec.h"
-+#else
-+# include "avcodec.h"
-+#endif
-+int main(void) {
-+ AVFrame *frame;
-+
-+ avcodec_free_frame (&frame);
-+
-+ return 0;
-+}
-+"""
-+
- def plugin_configure(conf):
- conf.check_cfg(package="libavcodec", uselib_store="avcodec",
- args="--cflags --libs")
- conf.check_cc(header_name="avcodec.h", uselib="avcodec", type="cshlib", mandatory=False)
- conf.check_cc(header_name="libavcodec/avcodec.h", uselib="avcodec", type="cshlib", mandatory=False)
-
-+ # non-mandatory function avcodec_free_frame since
-+ # * ffmpeg: commit 46a3595, lavc 54.59.100, release 1.0
-+ # * libav: commit a42aada, lavc 54.28.0, release 9
-+ conf.check_cc(fragment=avcodec_free_frame_fragment, uselib="avcodec",
-+ uselib_store="avcodec_free_frame",
-+ msg="Checking for function avcodec_free_frame", mandatory=False)
-+
- configure, build = plugin('avcodec', configure=plugin_configure,
- libs=["avcodec"])
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p7.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p7.patch
deleted file mode 100644
index 2d4bafd95a7d..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-audio4-p7.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-commit f460440b3f2a9db1a9deef3faf7dae6e626dd7b5
-Author: Erik Massop
-Date: Sun Dec 22 23:34:12 2013 +0100
-
- OTHER: Require avcodec_decode_audio4
-
- This was introduced in versions 53.40.0 (ffmpeg) and 53.25.0 (libav) of
- avcodec. Hence we drop compatibility for earlier versions.
-
-diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
-index 023833d..6d0b667 100644
---- a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -154,7 +154,6 @@ xmms_avcodec_init (xmms_xform_t *xform)
-
- xmms_xform_private_data_set (xform, data);
-
-- avcodec_init ();
- avcodec_register_all ();
-
- mimetype = xmms_xform_indata_get_str (xform,
-@@ -225,7 +224,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
- data->codecctx->sample_rate = data->samplerate;
- data->codecctx->channels = data->channels;
- data->codecctx->bit_rate = data->bitrate;
-- CONTEXT_BPS (data->codecctx) = data->samplebits;
-+ data->codecctx->bits_per_coded_sample = data->samplebits;
- data->codecctx->block_align = data->block_align;
- data->codecctx->extradata = data->extradata;
- data->codecctx->extradata_size = data->extradata_size;
-diff --git a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
-index e74b3f8..b50fa4b 100644
---- a/src/plugins/avcodec/avcodec_compat.h
-+++ b/src/plugins/avcodec/avcodec_compat.h
-@@ -21,69 +21,6 @@
- # include "avcodec.h"
- #endif
-
--/* Map avcodec_decode_audio2 into the deprecated version
-- * avcodec_decode_audio in versions earlier than 51.28 */
--#if LIBAVCODEC_VERSION_INT < 0x331c00
--# define avcodec_decode_audio2 avcodec_decode_audio
--#endif
--
--/* Handle API change that happened in libavcodec 52.00 */
--#if LIBAVCODEC_VERSION_INT < 0x340000
--# define CONTEXT_BPS(codecctx) (codecctx)->bits_per_sample
--#else
--# define CONTEXT_BPS(codecctx) (codecctx)->bits_per_coded_sample
--#endif
--
--/* Before 52.23 AVPacket was defined in avformat.h which we
-- * do not want to depend on, so we define part of it manually
-- * on versions smaller than 52.23 (this makes me cry) */
--#if LIBAVCODEC_VERSION_INT < 0x341700
--typedef struct AVPacket {
-- uint8_t *data;
-- int size;
--} AVPacket;
--#endif
--
--/* Same thing as above for av_init_packet and version 52.25 */
--#if LIBAVCODEC_VERSION_INT < 0x341900
--# define av_init_packet(pkt) do { \
-- (pkt)->data = NULL; \
-- (pkt)->size = 0; \
-- } while(0)
--#endif
--
--/* Map avcodec_decode_audio3 into the deprecated version
-- * avcodec_decode_audio2 in versions earlier than 52.26 */
--#if LIBAVCODEC_VERSION_INT < 0x341a00
--# define avcodec_decode_audio3(avctx, samples, frame_size_ptr, avpkt) \
-- avcodec_decode_audio2(avctx, samples, frame_size_ptr, \
-- (avpkt)->data, (avpkt)->size)
--#endif
--
--/* Handle API change that happened in libavcodec 52.64 */
--#if LIBAVCODEC_VERSION_INT < 0x344000
--# define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
--#endif
--
--/* Calling avcodec_init is not necessary after 53.04 (ffmpeg 0.9) */
--#if LIBAVCODEC_VERSION_INT >= 0x350400
--# define avcodec_init()
--#endif
--
--/* Map avcodec_alloc_context3 into the deprecated version
-- * avcodec_alloc_context in versions earlier than 53.04 (ffmpeg 0.9) */
--#if LIBAVCODEC_VERSION_INT < 0x350400
--# define avcodec_alloc_context3(codec) \
-- avcodec_alloc_context()
--#endif
--
--/* Map avcodec_open2 into the deprecated version
-- * avcodec_open in versions earlier than 53.04 (ffmpeg 0.9) */
--#if LIBAVCODEC_VERSION_INT < 0x350400
--# define avcodec_open2(avctx, codec, options) \
-- avcodec_open(avctx, codec)
--#endif
--
- /* Map avcodec_free_frame to av_freep if the former doesn't exist.
- * (This is in versions earlier than 54.28.0 (libav) or 54.59.100 (ffmpeg)) */
- #if ! HAVE_AVCODEC_FREE_FRAME
-diff --git a/src/plugins/avcodec/wscript b/src/plugins/avcodec/wscript
-index d367816..00b182b 100644
---- a/src/plugins/avcodec/wscript
-+++ b/src/plugins/avcodec/wscript
-@@ -1,6 +1,24 @@
- from waftools.plugin import plugin
-
- ## Code fragments for configuration
-+avcodec_decode_audio4_fragment = """
-+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
-+# include "libavcodec/avcodec.h"
-+#else
-+# include "avcodec.h"
-+#endif
-+int main(void) {
-+ AVCodecContext *ctx;
-+ AVFrame *frame;
-+ int got_frame;
-+ AVPacket *pkt;
-+
-+ avcodec_decode_audio4 (ctx, frame, &got_frame, pkt);
-+
-+ return 0;
-+}
-+"""
-+
- avcodec_free_frame_fragment = """
- #ifdef HAVE_LIBAVCODEC_AVCODEC_H
- # include "libavcodec/avcodec.h"
-@@ -22,6 +40,13 @@ def plugin_configure(conf):
- conf.check_cc(header_name="avcodec.h", uselib="avcodec", type="cshlib", mandatory=False)
- conf.check_cc(header_name="libavcodec/avcodec.h", uselib="avcodec", type="cshlib", mandatory=False)
-
-+ # mandatory function avcodec_decode_audio4 available since
-+ # * ffmpeg: commit e4de716, lavc 53.40.0, release 0.9
-+ # * libav: commit 0eea212, lavc 53.25.0, release 0.8
-+ conf.check_cc(fragment=avcodec_decode_audio4_fragment, uselib="avcodec",
-+ uselib_store="avcodec_decode_audio4",
-+ msg="Checking for function avcodec_decode_audio4", mandatory=True)
-+
- # non-mandatory function avcodec_free_frame since
- # * ffmpeg: commit 46a3595, lavc 54.59.100, release 1.0
- # * libav: commit a42aada, lavc 54.28.0, release 9
diff --git a/media-sound/xmms2/files/xmms2-0.8-cpython.patch b/media-sound/xmms2/files/xmms2-0.8-cpython.patch
deleted file mode 100644
index 58227ba5db85..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-cpython.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/src/clients/lib/python/cython_include/cxmmsclient.pxd b/src/clients/lib/python/cython_include/cxmmsclient.pxd
-index 66390a7..629bc7f 100644
---- a/src/clients/lib/python/cython_include/cxmmsclient.pxd
-+++ b/src/clients/lib/python/cython_include/cxmmsclient.pxd
-@@ -30,3 +30,3 @@ cdef extern from "xmmsc/xmmsc_idnumbers.h":
-
-- ctypedef enum xmmsc_collection_changed_actions_t:
-+ ctypedef enum xmms_collection_changed_actions_t:
- XMMS_COLLECTION_CHANGED_ADD
diff --git a/media-sound/xmms2/files/xmms2-0.8-cython-0.19.1.patch b/media-sound/xmms2/files/xmms2-0.8-cython-0.19.1.patch
deleted file mode 100644
index 1d6e59f6c830..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-cython-0.19.1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6d6d7a7ee38c8e3f57242f2510e06a03f4e7e249 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich
-Date: Mon, 5 Aug 2013 22:29:46 +0300
-Subject: [PATCH] unbreak xmms2 building on cython-0.19.1
-
-Error compiling Cython file:
-------------------------------------------------------------
-...
- def medialib_path_import(self, path, cb = None, encoded=False):
- """
- @deprecated
- Use medialib_import_path(path, ...) instead
- """
- return self.medialib_import_path(self, path, cb=cb, encoded=encoded)
- ^
-
-Reported-by: ChunFeng
-Signed-off-by: Sergei Trofimovich
----
- src/clients/lib/python/xmmsapi.pyx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/clients/lib/python/xmmsapi.pyx b/src/clients/lib/python/xmmsapi.pyx
-index 501a068..863db88 100644
---- a/src/clients/lib/python/xmmsapi.pyx
-+++ b/src/clients/lib/python/xmmsapi.pyx
-@@ -1364,7 +1364,7 @@ cdef class XmmsApi(XmmsCore):
- @deprecated
- Use medialib_import_path(path, ...) instead
- """
-- return self.medialib_import_path(self, path, cb=cb, encoded=encoded)
-+ return self.medialib_import_path(path, cb=cb, encoded=encoded)
-
- @deprecated
- def medialib_path_import_encoded(self, path, cb = None):
-@@ -1372,7 +1372,7 @@ cdef class XmmsApi(XmmsCore):
- @deprecated
- Use medialib_import_path(path, ..., encoded=True) instead
- """
-- return self.medialib_import_path(self, path, cb=cb, encoded=True)
-+ return self.medialib_import_path(path, cb=cb, encoded=True)
-
- cpdef XmmsResult medialib_property_set(self, int id, key, value, source=None, cb=None):
- """
---
-1.8.3.2
-
diff --git a/media-sound/xmms2/files/xmms2-0.8-ffmpeg-0.11.patch b/media-sound/xmms2/files/xmms2-0.8-ffmpeg-0.11.patch
deleted file mode 100644
index bac2fba7e9fd..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-ffmpeg-0.11.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit 8743e0c3a4f06053d89b74e40a362ba4949ed53c
-Author: Juho Vähä-Herttua
-Date: Fri Jun 8 09:30:47 2012 +0300
-
- OTHER: Quick fix to make XMMS2 compile on ffmpeg 0.11
-
-diff --git a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
-index df87b27..f1b1af7 100644
---- a/src/plugins/avcodec/avcodec_compat.h
-+++ b/src/plugins/avcodec/avcodec_compat.h
-@@ -65,3 +65,7 @@ typedef struct AVPacket {
- # define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
- #endif
-
-+/* Calling avcodec_init is not necessary after 53.04 (ffmpeg 0.9) */
-+#if LIBAVCODEC_VERSION_INT >= 0x350400
-+# define avcodec_init()
-+#endif
diff --git a/media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch b/media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch
deleted file mode 100644
index db55bc8a6933..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit 4781c507be338fe151e08af7d13267a24cbd7572
-Author: Juho Vähä-Herttua
-Date: Fri Jun 8 09:47:03 2012 +0300
-
- OTHER: Fix some deprecated warnings in libavcodec
-
-diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
-index 242e333..c846d64 100644
---- a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -208,7 +208,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
- }
- }
-
-- data->codecctx = avcodec_alloc_context ();
-+ data->codecctx = avcodec_alloc_context3 (codec);
- data->codecctx->sample_rate = data->samplerate;
- data->codecctx->channels = data->channels;
- data->codecctx->bit_rate = data->bitrate;
-@@ -219,7 +219,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
- data->codecctx->codec_id = codec->id;
- data->codecctx->codec_type = codec->type;
-
-- if (avcodec_open (data->codecctx, codec) < 0) {
-+ if (avcodec_open2 (data->codecctx, codec, NULL) < 0) {
- XMMS_DBG ("Opening decoder '%s' failed", codec->name);
- goto err;
- } else {
-diff --git a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
-index f1b1af7..bc770f2 100644
---- a/src/plugins/avcodec/avcodec_compat.h
-+++ b/src/plugins/avcodec/avcodec_compat.h
-@@ -69,3 +69,17 @@ typedef struct AVPacket {
- #if LIBAVCODEC_VERSION_INT >= 0x350400
- # define avcodec_init()
- #endif
-+
-+/* Map avcodec_alloc_context3 into the deprecated version
-+ * avcodec_alloc_context in versions earlier than 53.04 (ffmpeg 0.9) */
-+#if LIBAVCODEC_VERSION_INT < 0x350400
-+# define avcodec_alloc_context3(codec) \
-+ avcodec_alloc_context()
-+#endif
-+
-+/* Map avcodec_open2 into the deprecated version
-+ * avcodec_open in versions earlier than 53.04 (ffmpeg 0.9) */
-+#if LIBAVCODEC_VERSION_INT < 0x350400
-+# define avcodec_open2(avctx, codec, options) \
-+ avcodec_open(avctx, codec)
-+#endif
diff --git a/media-sound/xmms2/files/xmms2-0.8-libav-9.patch b/media-sound/xmms2/files/xmms2-0.8-libav-9.patch
deleted file mode 100644
index 9c13ec41e025..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-libav-9.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit d61dbc522f4024debb1f99de758de9e5cc7c0936
-Author: Diego Biurrun
-Date: Sun Nov 25 17:33:02 2012 +0100
-
- OTHER: Support for newer libavcodec versions
-
- Add missing #include
-
-diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
-index c846d64..114d7df 100644
---- a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -23,6 +23,7 @@
- #include
- #include
- #include
-+#include
-
- #include "avcodec_compat.h"
-
diff --git a/media-sound/xmms2/files/xmms2-0.8-memset.patch b/media-sound/xmms2/files/xmms2-0.8-memset.patch
deleted file mode 100644
index 6f8377d9f928..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-memset.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 00f4736bbb8ebc88a08e24e98d384b43d5afbbe4
-Author: Raphaël Bois
-Date: Sun Feb 12 16:39:46 2012 +0100
-
- OTHER: fix erroneous sizeof usage
-
-diff --git a/src/plugins/daap/daap_md5.c b/src/plugins/daap/daap_md5.c
-index d4d8d74..69c84a5 100644
---- a/src/plugins/daap/daap_md5.c
-+++ b/src/plugins/daap/daap_md5.c
-@@ -191,7 +191,7 @@ OpenDaap_MD5Final (MD5_CTX *ctx,
- MD5Transform (ctx->buf, (guint32 *) ctx->in, ctx->version);
- byteReverse ((unsigned char *) ctx->buf, 4);
- memcpy (digest, ctx->buf, 16);
-- memset (ctx, 0, sizeof (ctx)); /* In case it's sensitive */
-+ memset (ctx, 0, sizeof (*ctx)); /* In case it's sensitive */
-
- return;
- }
diff --git a/media-sound/xmms2/files/xmms2-0.8-modpug.patch b/media-sound/xmms2/files/xmms2-0.8-modpug.patch
deleted file mode 100644
index ce401279c14c..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-modpug.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/plugins/modplug/modplug.c 2011-10-20 20:26:08.000000000 +0000
-+++ b/src/plugins/modplug/modplug.c 2015-01-08 19:52:43.889787624 +0000
-@@ -9,7 +9,7 @@
- #include "xmms/xmms_sample.h"
- #include "xmms/xmms_medialib.h"
- #include "xmms/xmms_log.h"
--#include
-+#include
-
- #include
- #include
diff --git a/media-sound/xmms2/files/xmms2-0.8-samba-4.patch b/media-sound/xmms2/files/xmms2-0.8-samba-4.patch
deleted file mode 100644
index 937f3d75bea9..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-samba-4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 86ea5e2d2ac2d8c8c1aee484e8c264440fafcb6a
-Author: Daniel P. Chokola
-Date: Wed Jan 1 14:57:35 2014 -0500
-
- BUG(2573): Samba 4.0 uses pkg-config. Find libsmbclient.h properly.
-
-diff --git a/src/plugins/samba/wscript b/src/plugins/samba/wscript
-index 8398169..77d7cda 100644
---- a/src/plugins/samba/wscript
-+++ b/src/plugins/samba/wscript
-@@ -1,8 +1,17 @@
- from waftools.plugin import plugin
-+from waflib import Errors
-
- def plugin_configure(conf):
-- conf.check_cc(header_name="libsmbclient.h")
-- conf.check(lib="smbclient", uselib_store="smbclient")
-+ try:
-+ conf.check_cfg(package="smbclient", uselib_store="smbclient",
-+ args="--cflags --libs")
-+ except Errors.ConfigurationError:
-+ conf.check_cc(header_name="libsmbclient.h",
-+ uselib="smbclient",
-+ type="cshlib")
-+ conf.check(lib="smbclient", uselib_store="smbclient",
-+ uselib="smbclient",
-+ type="cshlib")
-
- configure, build = plugin("samba", configure=plugin_configure,
- libs=["smbclient"])
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 7919d09bbf3e..93767418e2f4 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 554523916aee..50e6c8b36d35 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -296,7 +296,7 @@ src_install() {
pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
- rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+ rm "${ED%/}"/usr/share/doc/*/{LICENSE.md,copying.txt}* || die
newicon media/icon48x48.png kodi.png
diff --git a/media-tv/plex-media-server/plex-media-server-1.13.2.ebuild b/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
similarity index 90%
rename from media-tv/plex-media-server/plex-media-server-1.13.2.ebuild
rename to media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
index 63a8831254d1..62c09b5f2ab2 100644
--- a/media-tv/plex-media-server/plex-media-server-1.13.2.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
@@ -135,7 +135,13 @@ _handle_multilib() {
# so it doesn't try to rebuild libraries that can't be rebuilt.
_mask_plex_libraries_revdep() {
dodir /etc/revdep-rebuild/
- echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/$(get_libdir)/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
+
+ # Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib.
+ # Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely
+ # on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir).
+ # Thus we will match upstream's directory automatically. If upstream switches their location,
+ # then so should we.
+ echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
}
# Remove execstack flags from some libraries/executables
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 17474436ff3b..5e939ae77496 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8f2f35c33ba6..a7975ada2715 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Jul 2018 05:08:29 +0000
+Sat, 07 Jul 2018 11:38:26 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 792c3a7d8e9b..a7975ada2715 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Jul 2018 05:08:30 +0000
+Sat, 07 Jul 2018 11:38:26 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e79dae1a8ed1..46c117e4f2df 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 2b83eb656c8e..6ad9cd7ada3f 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/ansible-2.4.6.0 b/metadata/md5-cache/app-admin/ansible-2.4.6.0
new file mode 100644
index 000000000000..46b9cf2e5e03
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.4.6.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+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/paramiko[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/jinja[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/pyyaml[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/cryptography[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(-)] dev-python/netaddr[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(-)] 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-1.0.1[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-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(-)]
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=6
+HOMEPAGE=https://ansible.com/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[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/jinja[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/pyyaml[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/cryptography[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(-)] dev-python/netaddr[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(-)] 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.4.6.0.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=808bdaa6c07173e7842b65dd78f381c1
diff --git a/metadata/md5-cache/app-admin/ansible-2.5.6 b/metadata/md5-cache/app-admin/ansible-2.5.6
new file mode 100644
index 000000000000..b0823d15728e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.5.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+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(-)] doc? ( dev-python/sphinx[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/paramiko[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/jinja[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/pyyaml[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/cryptography[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(-)] dev-python/netaddr[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(-)] 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-1.0.1[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-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(-)]
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=6
+HOMEPAGE=https://ansible.com/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[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/jinja[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/pyyaml[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/cryptography[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(-)] dev-python/netaddr[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(-)] 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.5.6.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=73beead4d32ff66bdab1f630ff38d020
diff --git a/metadata/md5-cache/app-admin/ansible-2.6.1 b/metadata/md5-cache/app-admin/ansible-2.6.1
new file mode 100644
index 000000000000..67f7a4cd0a95
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.6.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+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(-)] doc? ( dev-python/sphinx[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/paramiko[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/jinja[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/pyyaml[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/cryptography[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(-)] dev-python/netaddr[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(-)] 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-1.0.1[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-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(-)]
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=6
+HOMEPAGE=https://ansible.com/
+IUSE=doc test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[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/jinja[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/pyyaml[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/cryptography[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(-)] dev-python/netaddr[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(-)] 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.6.1.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=73beead4d32ff66bdab1f630ff38d020
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index d4d19efd0bbc..8277e5e7aec7 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.4-r1 b/metadata/md5-cache/app-arch/zstd-1.3.4-r1
new file mode 100644
index 000000000000..9cc32cbd31b8
--- /dev/null
+++ b/metadata/md5-cache/app-arch/zstd-1.3.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
+DESCRIPTION=zstd fast compression library
+EAPI=6
+HOMEPAGE=https://facebook.github.io/zstd/
+IUSE=lz4 static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
+SLOT=0/1
+SRC_URI=https://github.com/facebook/zstd/archive/v1.3.4.tar.gz -> zstd-1.3.4.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=cc985c107e97a3debe5713c0fd5c5409
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 4d41140bb573..61cf4d71701a 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/geekbench-4.2.3 b/metadata/md5-cache/app-benchmarks/geekbench-4.2.3
index 9ee7a371ea3d..2120acc24c31 100644
--- a/metadata/md5-cache/app-benchmarks/geekbench-4.2.3
+++ b/metadata/md5-cache/app-benchmarks/geekbench-4.2.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install nofetch postinst
DESCRIPTION=A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows
EAPI=6
HOMEPAGE=https://www.geekbench.com
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* ~amd64 x86
LICENSE=geekbench
RDEPEND=sys-devel/gcc sys-libs/glibc
RESTRICT=bindist fetch mirror strip
SLOT=4
SRC_URI=https://cdn.geekbench.com/Geekbench-4.2.3-Linux.tar.gz
-_md5_=d5d8469d80c0b43e2786931b9379f76f
+_md5_=d20be504f6406690bdb7b3f6af46ac47
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.09.31 b/metadata/md5-cache/app-benchmarks/stress-ng-0.09.32
similarity index 90%
rename from metadata/md5-cache/app-benchmarks/stress-ng-0.09.31
rename to metadata/md5-cache/app-benchmarks/stress-ng-0.09.32
index e44b3b1220d6..0bbed4060cd3 100644
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.09.31
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.09.32
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= net-misc/lksctp-tools sys-apps/attr sys-apps/keyutils sys-libs/libapparmor sys-libs/libcap sys-libs/zlib:=
SLOT=0
-SRC_URI=http://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.09.31.tar.xz
-_md5_=03ff24a4271d0eecfd593cf44598f1aa
+SRC_URI=http://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.09.32.tar.xz
+_md5_=58bffc5d94aab86ffe725437315db80a
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index fa8fe4d1cf17..f27b6945a494 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.8 b/metadata/md5-cache/app-crypt/gnupg-2.2.8
index ccd9b8d8db1b..5e3799e48c4a 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.8
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.8
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
EAPI=6
HOMEPAGE=http://www.gnupg.org/
IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.28 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.8.tar.bz2
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=d5386954c36f05daceecdfa2fd3d25b5
+_md5_=845ae5ccfc670082d5d4d43a34c7cd5a
diff --git a/metadata/md5-cache/app-crypt/jitterentropy-2.1.1 b/metadata/md5-cache/app-crypt/jitterentropy-2.1.1
new file mode 100644
index 000000000000..7d2cc011aa48
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/jitterentropy-2.1.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Hardware RNG based on CPU timing jitter
+EAPI=7
+HOMEPAGE=https://github.com/smuellerDD/jitterentropy-library
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/gktrk/jitterentropy-library/archive/v2.1.1.tar.gz -> jitterentropy-2.1.1.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=c7731779a74436f6d6e515e20036d761
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18.6-r1 b/metadata/md5-cache/app-crypt/libsecret-0.18.6-r1
index b2403afde099..1738427d383b 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18.6-r1
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18.6-r1
@@ -4,7 +4,7 @@ DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
IUSE=+crypt +introspection test vala 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 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd
LICENSE=LGPL-2.1+ Apache-2.0
PDEPEND=>=gnome-base/gnome-keyring-3
RDEPEND=>=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(-)?] crypt? ( >=dev-libs/libgcrypt-1.2.2: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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
@@ -12,4 +12,4 @@ REQUIRED_USE=test? ( introspection ) vala? ( introspection )
SLOT=0
SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.6.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e442e6ce30cfd4f12bb3d6c4c01f749f
+_md5_=76d0eb283993d8bb9806b6cf8c80a335
diff --git a/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-release-20180706 b/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-release-20180706
new file mode 100644
index 000000000000..cd7f67f83358
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/openpgp-keys-gentoo-release-20180706
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install test
+DEPEND=test? ( app-crypt/gnupg )
+DESCRIPTION=OpenPGP keys used for Gentoo releases (snapshots, stages)
+EAPI=6
+HOMEPAGE=https://www.gentoo.org/downloads/signatures/
+IUSE=test
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.20180706.gz test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20180706.tar.gz )
+_md5_=d70a5f092b5b32658403249a9b00349e
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 0571d8785049..bce2d820bc38 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/root-docs-5.34.36 b/metadata/md5-cache/app-doc/root-docs-5.34.36
deleted file mode 100644
index 918728a1078a..000000000000
--- a/metadata/md5-cache/app-doc/root-docs-5.34.36
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/pandoc dev-haskell/pandoc-citeproc[bibutils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended virtual/pkgconfig api? ( media-fonts/dejavu ~sci-physics/root-5.34.36[X,graphviz,opengl] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Documentation for ROOT Data Analysis Framework
-EAPI=5
-HOMEPAGE=https://root.cern.ch
-IUSE=api +math +metric http test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://root.cern.ch/download/root_v5.34.36.source.tar.gz math? ( http://tmva.sourceforge.net/docu/TMVAUsersGuide.pdf -> TMVAUsersGuide-v4.2.0.pdf https://root.cern.ch/download/doc/RooFit_Users_Manual_2.91-33.pdf http://root.cern.ch/drupal/sites/default/files/roofit_quickstart_3.00.pdf ) api? ( https://root.cern.ch/sites/all/themes/newsflash/images/blue/root-banner.png https://root.cern.ch/sites/all/themes/newsflash/images/info.png )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=a457130a7d056ceace01403e83a9d2c0
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index ccb171a1ee26..3cdd80efd59e 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/mg-20180408 b/metadata/md5-cache/app-editors/mg-20180408
index b0172245c8b9..5ecd10287efc 100644
--- a/metadata/md5-cache/app-editors/mg-20180408
+++ b/metadata/md5-cache/app-editors/mg-20180408
@@ -4,10 +4,10 @@ DESCRIPTION=MicroGnuEmacs, a port from the BSDs
EAPI=7
HOMEPAGE=https://homepage.boetes.org/software/mg/
IUSE=livecd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=public-domain
RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
SLOT=0
SRC_URI=https://github.com/hboetes/mg/archive/20180408.tar.gz -> mg-20180408.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=78e071e1b6098d88e54ff2e8f0fadca9
+_md5_=d5af21c06019dbdc9c13608063b1fb70
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index d3b0659fa9c6..e173f0de853a 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.1.13 b/metadata/md5-cache/app-emacs/org-mode-9.1.13
index b9becd3eddb3..5bc9fb0b9c39 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.1.13
+++ b/metadata/md5-cache/app-emacs/org-mode-9.1.13
@@ -4,11 +4,11 @@ DESCRIPTION=An Emacs mode for notes and project planning
EAPI=6
HOMEPAGE=https://www.orgmode.org/
IUSE=contrib doc odt-schema
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
+KEYWORDS=~amd64 ~ppc x86 ~x86-fbsd ~x86-macos
LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
RDEPEND=>=virtual/emacs-24
RESTRICT=test
SLOT=0
SRC_URI=http://orgmode.org/org-9.1.13.tar.gz
_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=27393e3e36475cfd7d6ceb1f7c6b70c1
+_md5_=b3e8c8ae1cd03286c6f92b6816fa8f4c
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 6faccece9ea0..f22fc2fe6e53 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.2.9.5 b/metadata/md5-cache/app-i18n/fcitx-4.2.9.5
deleted file mode 100644
index 054057247c1e..000000000000
--- a/metadata/md5-cache/app-i18n/fcitx-4.2.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) xml? ( app-text/iso-codes dev-libs/libxml2 ) kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx
-IUSE=+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=BSD-1 GPL-2+ LGPL-2+ MIT
-RDEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) xml? ( app-text/iso-codes dev-libs/libxml2 )
-REQUIRED_USE=cairo? ( X ) pango? ( cairo ) qt4? ( X )
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx/fcitx-4.2.9.5_dict.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a804980b2fc847683b13c89567b24746
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.2.9.6 b/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
index 2ff5af296e96..b6ab689b9fb1 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
+++ b/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
DEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) xml? ( app-text/iso-codes dev-libs/libxml2 ) kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
DESCRIPTION=Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx
IUSE=+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml
KEYWORDS=amd64 ~hppa ppc ppc64 x86
LICENSE=BSD-1 GPL-2+ LGPL-2+ MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=cairo? ( X ) pango? ( cairo ) qt4? ( X )
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx/fcitx-4.2.9.6_dict.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a804980b2fc847683b13c89567b24746
+_md5_=319796263908cdc14990464552561ec3
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.9999 b/metadata/md5-cache/app-i18n/fcitx-4.9999
index 32b5a3e1b33c..5573be5e60eb 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-4.9999
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
DEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) xml? ( app-text/iso-codes dev-libs/libxml2 ) kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx
IUSE=+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml
LICENSE=BSD-1 GPL-2+ LGPL-2+ MIT
RDEPEND=dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv virtual/libintl x11-libs/libxkbcommon X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender xml? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) ) cairo? ( x11-libs/cairo[X] x11-libs/libXext pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) xml? ( app-text/iso-codes dev-libs/libxml2 )
@@ -10,4 +10,4 @@ REQUIRED_USE=cairo? ( X ) pango? ( cairo ) qt4? ( X )
SLOT=4
SRC_URI=https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=239c5b16fb2d23ed538d747e34578730
+_md5_=ad9f22b77f5b902358d83ddbfdba797c
diff --git a/metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3 b/metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3
index c2cf4ec6e8bc..70e4dee41468 100644
--- a/metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3
+++ b/metadata/md5-cache/app-i18n/fcitx-anthy-0.2.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
DESCRIPTION=Japanese Anthy input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-anthy
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-anthy
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx-anthy/fcitx-anthy-0.2.3.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=afd3d7522d329fd3c72512fe69acdd63
+_md5_=df9c8bbf2f66770c5f63e92867f4bb6f
diff --git a/metadata/md5-cache/app-i18n/fcitx-anthy-4.9999 b/metadata/md5-cache/app-i18n/fcitx-anthy-4.9999
index 955fce4db02f..741ee02b182e 100644
--- a/metadata/md5-cache/app-i18n/fcitx-anthy-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-anthy-4.9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Japanese Anthy input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-anthy
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-anthy
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4[X,xml] app-i18n/anthy:= virtual/libintl
SLOT=4
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3518b24115f56018b2448ae469a0831e
+_md5_=9fe6aeae749df191d026ae0a9e1f3a77
diff --git a/metadata/md5-cache/app-i18n/fcitx-chewing-0.2.3 b/metadata/md5-cache/app-i18n/fcitx-chewing-0.2.3
index 93791e11f93d..3ebfbf81e11a 100644
--- a/metadata/md5-cache/app-i18n/fcitx-chewing-0.2.3
+++ b/metadata/md5-cache/app-i18n/fcitx-chewing-0.2.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libchewing-0.5.0:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
DESCRIPTION=Chinese Chewing input method for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-chewing
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-chewing
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libchewing-0.5.0:= virtual/libintl
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx-chewing/fcitx-chewing-0.2.3.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21aa9f21ec03c9d4e5b552e3f9dfda53
+_md5_=35411ec9348e3ec239bae969f89f36e8
diff --git a/metadata/md5-cache/app-i18n/fcitx-chewing-4.9999 b/metadata/md5-cache/app-i18n/fcitx-chewing-4.9999
index 384a8a0f20a9..4e0f0a4492e3 100644
--- a/metadata/md5-cache/app-i18n/fcitx-chewing-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-chewing-4.9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libchewing-0.5.0:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Chinese Chewing input method for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-chewing
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-chewing
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libchewing-0.5.0:= virtual/libintl
SLOT=4
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=410984c6b9d9d1ea2226274434c48c1e
+_md5_=58e9dca180bace1b0ff304a4a94bb63e
diff --git a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.6 b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.6
index c60485ac8eec..a7dd0ae42957 100644
--- a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.6
+++ b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-0.3.6
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=Internet look-up support for Chinese Pinyin input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-cloudpinyin
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2b2969a2f9f65f4218c45cfb733e3e12
+_md5_=dd651d6a346a612ed21f101808e431b6
diff --git a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-4.9999 b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-4.9999
index d705a6b1cea2..78313222a1cf 100644
--- a/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-cloudpinyin-4.9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Internet look-up support for Chinese Pinyin input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-cloudpinyin
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 net-misc/curl:= virtual/libiconv virtual/libintl
SLOT=4
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3ed33899210f20963b924096045a67d7
+_md5_=e3c342e93d8e7619d8c9cc7cc0eb8de3
diff --git a/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10 b/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
index 95a0e6afb682..19cb1c23c5f6 100644
--- a/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
+++ b/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=GTK+ GUI configuration tool for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-configtool
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2+ LGPL-2.1+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-0.4.10.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad76ccfe18a017711ad9c0c3ae0ad673
+_md5_=14d9086ac46d8bf6d71ea9297b17fae4
diff --git a/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999 b/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999
index 692ffb1660c7..1b6bb98a9880 100644
--- a/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=GTK+ GUI configuration tool for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-configtool
LICENSE=GPL-2+ LGPL-2.1+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3
SLOT=4
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2021ccdc069433509f3c194b1767d2bc
+_md5_=67c58793994fc5524bb59072deb5375f
diff --git a/metadata/md5-cache/app-i18n/fcitx-hangul-0.3.1 b/metadata/md5-cache/app-i18n/fcitx-hangul-0.3.1
index 04e1f2d59bef..c1ac6e61a73f 100644
--- a/metadata/md5-cache/app-i18n/fcitx-hangul-0.3.1
+++ b/metadata/md5-cache/app-i18n/fcitx-hangul-0.3.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
DESCRIPTION=Korean Hangul input method for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-hangul
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-hangul
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=BSD GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx-hangul/fcitx-hangul-0.3.1.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=83814ef9ac72f8ab46f91101680a6e16
+_md5_=00d3ef2ad917b0acbd69b76ffb7924bd
diff --git a/metadata/md5-cache/app-i18n/fcitx-hangul-4.9999 b/metadata/md5-cache/app-i18n/fcitx-hangul-4.9999
index ac360fa42174..3e91b0e07b97 100644
--- a/metadata/md5-cache/app-i18n/fcitx-hangul-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-hangul-4.9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Korean Hangul input method for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-hangul
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-hangul
LICENSE=BSD GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-i18n/libhangul:= virtual/libiconv virtual/libintl
SLOT=4
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=da61dacb606e52e1e084801171ff3621
+_md5_=1184e70319aed17d5357817199d902fb
diff --git a/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3 b/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3
index 82ec5e98f432..d421af5526ef 100644
--- a/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3
+++ b/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libpinyin-2.1.0:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictionary-manager? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
DESCRIPTION=Chinese LibPinyin input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-libpinyin
IUSE=dictionary-manager
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2+ GPL-3+
@@ -10,4 +10,4 @@ RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libpinyin-2.1.0:= dev-libs/glib:2 sy
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx-libpinyin/fcitx-libpinyin-0.5.3_dict.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa1e5f2221374d6a1af46135754bac19
+_md5_=9fc22822398886b295a2e58b526d7b65
diff --git a/metadata/md5-cache/app-i18n/fcitx-libpinyin-4.9999 b/metadata/md5-cache/app-i18n/fcitx-libpinyin-4.9999
index 0bfb94f6739d..63c129e04f7b 100644
--- a/metadata/md5-cache/app-i18n/fcitx-libpinyin-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-libpinyin-4.9999
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libpinyin-2.1.0:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictionary-manager? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Chinese LibPinyin input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-libpinyin
IUSE=dictionary-manager
LICENSE=GPL-2+ GPL-3+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libpinyin-2.1.0:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictionary-manager? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 )
SLOT=4
SRC_URI=https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c1dcf438c1cc352c10db0b9a5f7f556e
+_md5_=35b881f7e34ea38de34e5b5892d7c1a4
diff --git a/metadata/md5-cache/app-i18n/fcitx-m17n-0.2.4 b/metadata/md5-cache/app-i18n/fcitx-m17n-0.2.4
index 7ed16a527972..21cc27b7bf9a 100644
--- a/metadata/md5-cache/app-i18n/fcitx-m17n-0.2.4
+++ b/metadata/md5-cache/app-i18n/fcitx-m17n-0.2.4
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-libs/m17n-lib virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=m17n-provided input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-m17n
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-m17n
KEYWORDS=amd64 ~hppa ppc ppc64 x86
LICENSE=LGPL-2.1+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-libs/m17n-lib virtual/libintl
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx-m17n/fcitx-m17n-0.2.4.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d727708f2a9f53ae870e972b91c9b782
+_md5_=e93f32424acec20da4baa11615a206cd
diff --git a/metadata/md5-cache/app-i18n/fcitx-m17n-4.9999 b/metadata/md5-cache/app-i18n/fcitx-m17n-4.9999
index ed34422ae2a8..a902ebf3272d 100644
--- a/metadata/md5-cache/app-i18n/fcitx-m17n-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-m17n-4.9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-libs/m17n-lib virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=m17n-provided input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-m17n
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-m17n
LICENSE=LGPL-2.1+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-libs/m17n-lib virtual/libintl
SLOT=4
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b21c92dc02425c04174bf5b638a9244
+_md5_=ddb6febff96f4d841293bed20c11c2ff
diff --git a/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.2 b/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.2
deleted file mode 100644
index 3d1a8aed5f53..000000000000
--- a/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon dev-qt/qtconcurrent:5 kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Fcitx input method module for Qt 5
-EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=BSD GPL-2+ GPL-3+ LGPL-2+
-RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
-SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-1.2.2.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c6cef7b60c4279d44559ddb5f068de05
diff --git a/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.1 b/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.3
similarity index 88%
rename from metadata/md5-cache/app-i18n/fcitx-qt5-1.2.1
rename to metadata/md5-cache/app-i18n/fcitx-qt5-1.2.3
index 017a9471abc6..e23ed88399d7 100644
--- a/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.1
+++ b/metadata/md5-cache/app-i18n/fcitx-qt5-1.2.3
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon dev-qt/qtconcurrent:5 kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=Fcitx input method module for Qt 5
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5
KEYWORDS=amd64 ~hppa ppc ppc64 x86
LICENSE=BSD GPL-2+ GPL-3+ LGPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
SLOT=4
-SRC_URI=https://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-1.2.1.tar.xz
+SRC_URI=https://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-1.2.3.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=47a1c3eda665e0228718f565ba98a080
+_md5_=0183d0c25112b654576b3d9ac88806de
diff --git a/metadata/md5-cache/app-i18n/fcitx-qt5-4.9999 b/metadata/md5-cache/app-i18n/fcitx-qt5-4.9999
index 6105e1b75cb3..fca16456e5c7 100644
--- a/metadata/md5-cache/app-i18n/fcitx-qt5-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-qt5-4.9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon dev-qt/qtconcurrent:5 kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Fcitx input method module for Qt 5
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5
LICENSE=BSD GPL-2+ GPL-3+ LGPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 virtual/libintl x11-libs/libxkbcommon
SLOT=4
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d9a4d46b676fe7c0cfc7c9e24eb2bda8
+_md5_=c91ff62a4a360664c8d99a8e99e0d5b1
diff --git a/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2 b/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2
index c2906bcac3a9..cfc55c833c86 100644
--- a/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2
+++ b/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install postinst postrm prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Chinese RIME input method for Fcitx
+DESCRIPTION=Chinese RIME input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-rime
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx-rime/fcitx-rime-0.3.2.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bf09775f83aabed70628d7bc68f6d7ee
+_md5_=07e68003d464267cbf3d2678bbf815ad
diff --git a/metadata/md5-cache/app-i18n/fcitx-rime-4.9999 b/metadata/md5-cache/app-i18n/fcitx-rime-4.9999
index 6bfe5b3b210e..ee4481d7521a 100644
--- a/metadata/md5-cache/app-i18n/fcitx-rime-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-rime-4.9999
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl configuration_tool? ( >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) virtual/pkgconfig configuration_tool? ( dev-qt/qtconcurrent:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Chinese RIME input method for Fcitx
+DESCRIPTION=Chinese RIME input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-rime
IUSE=+configuration_tool
LICENSE=GPL-2
RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl configuration_tool? ( >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
SLOT=4
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=628de1527b3adadc73602db90b584d31
+_md5_=2283526d293a9402278036795b07e5ca
diff --git a/metadata/md5-cache/app-i18n/fcitx-sayura-0.1.2 b/metadata/md5-cache/app-i18n/fcitx-sayura-0.1.2
index c5b212f05ef8..6f8b2c9a31f1 100644
--- a/metadata/md5-cache/app-i18n/fcitx-sayura-0.1.2
+++ b/metadata/md5-cache/app-i18n/fcitx-sayura-0.1.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libiconv virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
DESCRIPTION=Sinhala Sayura input method for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-sayura
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sayura
KEYWORDS=amd64 ~hppa ppc ppc64 x86
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libiconv virtual/libintl
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx-sayura/fcitx-sayura-0.1.2.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc08fd4be5de0651ff765dae02bd8e86
+_md5_=a98274b0154c127fea9352047677ecfe
diff --git a/metadata/md5-cache/app-i18n/fcitx-sayura-4.9999 b/metadata/md5-cache/app-i18n/fcitx-sayura-4.9999
index 87c65f426fa5..1e89036f6034 100644
--- a/metadata/md5-cache/app-i18n/fcitx-sayura-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-sayura-4.9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libiconv virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Sinhala Sayura input method for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-sayura
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sayura
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libiconv virtual/libintl
SLOT=4
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e6e3f4ddfda711f5b6c2fbccd3ffdb72
+_md5_=14c958473db91482bf925e235cb0b4c6
diff --git a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2 b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
index de4d919efc9e..5a374079c27a 100644
--- a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
+++ b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
DESCRIPTION=Chinese SunPinyin input method for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sunpinyin
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d3c6308c4a8c2679bf988896f228c4b
+_md5_=6a90d03ce1977a5abc8ce47a99e58039
diff --git a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999 b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
index 9eede241d1bb..43042a144cf1 100644
--- a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Chinese SunPinyin input method for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sunpinyin
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl
SLOT=4
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3404fd61c327daa8215e3680bc460c19
+_md5_=f04a35d5efe844b6b4233c1ad2bc5069
diff --git a/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8 b/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
index a927bb50e3c1..203f1704a300 100644
--- a/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
+++ b/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4[table] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
DESCRIPTION=Extra Chinese table input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-table-extra
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-table-extra
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4[table]
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx-table-extra/fcitx-table-extra-0.3.8.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb1db71d972ae5048530f24e62f44553
+_md5_=7480f46b1c7009a91d71fee9d5da716a
diff --git a/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999 b/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999
index 0cefca5ac56f..4db4a20236d6 100644
--- a/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4[table] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Extra Chinese table input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-table-extra
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-table-extra
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4[table]
SLOT=4
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=67ad54c3efcb134f2f7faa24f19ecd52
+_md5_=aacad16e7f8ef8f47cfa18d715ed6151
diff --git a/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7 b/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7
index ceb507a47384..7c9a8dea35d3 100644
--- a/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7
+++ b/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 ) sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
DESCRIPTION=Vietnamese Unikey input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-unikey
IUSE=+macro-editor
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2+ GPL-3+ LGPL-2+
@@ -10,4 +10,4 @@ RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcit
SLOT=4
SRC_URI=https://download.fcitx-im.org/fcitx-unikey/fcitx-unikey-0.2.7.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9e286e62de0dd5e31803518b967a2149
+_md5_=033aa5d6e4b2c9fe93aae6652f147385
diff --git a/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999 b/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
index 26cb729bc383..9c237c81f958 100644
--- a/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 ) sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Vietnamese Unikey input methods for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-unikey
IUSE=+macro-editor
LICENSE=GPL-2+ GPL-3+ LGPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 )
SLOT=4
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f54888591e88f1a88090b45aa06b8b8
+_md5_=6482fea68c6acfed816a3e6a61b3e86e
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.5 b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.5
index 75db25cf0287..af97963ade05 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.5
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.5
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile !app-i18n/kcm-fcitx:4[-minimal(-)] kde-frameworks/extra-cmake-modules:5 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=KDE configuration module for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/kcm-fcitx
KEYWORDS=amd64 x86
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile !app-i18n/kcm-fcitx:4[-minimal(-)]
SLOT=4-plasma5
SRC_URI=https://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.5.5.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4dfd5de64d12fdb5006745f0fce18b1f
+_md5_=6289fc09e49ed277a4e307d4b295e2f3
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-4.5.9999 b/metadata/md5-cache/app-i18n/kcm-fcitx-4.5.9999
index f0eb249b364f..2c02ef1064fb 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-4.5.9999
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-4.5.9999
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile !app-i18n/kcm-fcitx:4[-minimal(-)] kde-frameworks/extra-cmake-modules:5 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=KDE configuration module for Fcitx
EAPI=6
-HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx
+HOMEPAGE=https://fcitx-im.org/ https://gitlab.com/fcitx/kcm-fcitx
LICENSE=GPL-2+
RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 x11-libs/libxkbfile !app-i18n/kcm-fcitx:4[-minimal(-)]
SLOT=4-plasma5
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d270a261d05f19b68f8d880f128a0bf5
+_md5_=e868ac963a7548a474ef0c7fd0deda95
diff --git a/metadata/md5-cache/app-i18n/mozc-2.23.2815.102 b/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
index e2b7b98526c7..cdb5878cbca4 100644
--- a/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
+++ b/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting
SLOT=0
SRC_URI=https://github.com/google/mozc/archive/afb03ddfe72dde4cf2409863a3bfea160f7a66d8.tar.gz -> mozc-2.23.2815.102.tar.gz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz -> japanese-usage-dictionary-20120416091336.tar.gz fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.23.2815.102.1.patch )
_eclasses_=elisp-common 23f47b2e1de7abf387105eddd1318738 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=871ad34201bc0444e8048fd1b53a24e1
+_md5_=cf71561ab1f84c8c7e5d8a5fb2380e24
diff --git a/metadata/md5-cache/app-i18n/mozc-9999 b/metadata/md5-cache/app-i18n/mozc-9999
index 4a3980f9d602..066fd8036d09 100644
--- a/metadata/md5-cache/app-i18n/mozc-9999
+++ b/metadata/md5-cache/app-i18n/mozc-9999
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/protobuf-3.0.0:= emacs? ( virtual/emacs ) fcitx4? ( app-i18n/
REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )
SLOT=0
_eclasses_=elisp-common 23f47b2e1de7abf387105eddd1318738 git-r3 8f6de46b0aa318aea0e8cac62ece098b multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=12af11923cdbf31bd71d8c46df046090
+_md5_=c1b2d7a9e13da354a52e7e386f62527b
diff --git a/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20180610092832 b/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20180610092832
index 4876b4d3c06f..ef140f388c17 100644
--- a/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20180610092832
+++ b/metadata/md5-cache/app-i18n/tagainijisho-1.2.0_pre20180610092832
@@ -10,4 +10,4 @@ RDEPEND=>=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprint
SLOT=0
SRC_URI=https://github.com/Gnurou/tagainijisho/archive/dde2ad85dc6dc47ac7862e728878a7c8d9d4faf6.tar.gz -> tagainijisho-1.2.0_pre20180610092832.tar.gz https://home.apache.org/~arfrever/distfiles/JMdict-2018-06-12.gz https://home.apache.org/~arfrever/distfiles/kanjidic2-2018-06-12.xml.gz https://github.com/KanjiVG/kanjivg/releases/download/r20160426/kanjivg-20160426.xml.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f2c814a943eb2293f43100011de835bc
+_md5_=4cf57fd404a12047094fd49c3fcbf08e
diff --git a/metadata/md5-cache/app-i18n/tagainijisho-9999 b/metadata/md5-cache/app-i18n/tagainijisho-9999
index c988ca52a0c5..43909f5155d4 100644
--- a/metadata/md5-cache/app-i18n/tagainijisho-9999
+++ b/metadata/md5-cache/app-i18n/tagainijisho-9999
@@ -9,4 +9,4 @@ RDEPEND=>=dev-db/sqlite-3.12:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprint
SLOT=0
SRC_URI=https://github.com/KanjiVG/kanjivg/releases/download/r20160426/kanjivg-20160426.xml.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2a52d956ec1a23f22c10bba230a1ce7b
+_md5_=e89d99ed5b560b4b7298f55f1633ef47
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index a2f70350dffc..541dafd97373 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.5.2 b/metadata/md5-cache/app-office/libreoffice-6.0.5.2
index be393b883858..0c23b16454f2 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.5.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.5.2
@@ -10,6 +10,6 @@ PDEPEND==app-office/libreoffice-l10n-6.0*
RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.5.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.5//libreoffice-6.0.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.5//libreoffice-help-6.0.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.5.2/src/libreoffice-6.0.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.5.2/src/libreoffice-help-6.0.5.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.5.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.5.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.5//libreoffice-6.0.5.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.5//libreoffice-help-6.0.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.5.2/src/libreoffice-6.0.5.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.5.2/src/libreoffice-help-6.0.5.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c check-reqs fd05cf75484aa28d307cf4ee6e1db056 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc5768ce0b39ff3180c66c4f3a277586
+_md5_=8880ddf3660f1634c39df5f4a46aa197
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.9999 b/metadata/md5-cache/app-office/libreoffice-6.0.9999
index 1576ada8e8f6..3c19b2b4b109 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.9999
@@ -9,6 +9,6 @@ PDEPEND=!app-office/libreoffice-l10n
RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.5.2-patchset-01.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c check-reqs fd05cf75484aa28d307cf4ee6e1db056 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc5768ce0b39ff3180c66c4f3a277586
+_md5_=88590c78f6ce15667fbf7467709cc7d0
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 5f1abc4ae351..887df0ba9248 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/htmlrecode-1.3.1 b/metadata/md5-cache/app-text/htmlrecode-1.3.1
index 5466d140d955..c3048cc2ab07 100644
--- a/metadata/md5-cache/app-text/htmlrecode-1.3.1
+++ b/metadata/md5-cache/app-text/htmlrecode-1.3.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare
DEPEND=>=sys-apps/sed-4
DESCRIPTION=Recodes HTML file using a new character set
EAPI=4
-HOMEPAGE=http://bisqwit.iki.fi/source/htmlrecode.html
+HOMEPAGE=https://bisqwit.iki.fi/source/htmlrecode.html
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
-SRC_URI=http://bisqwit.iki.fi/src/arch/htmlrecode-1.3.1.tar.bz2
+SRC_URI=https://bisqwit.iki.fi/src/arch/htmlrecode-1.3.1.tar.bz2
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=40b755997854fade8f0605a2632ee19a
+_md5_=05e8a55f9d019640a1249e1cd4c91584
diff --git a/metadata/md5-cache/app-text/htmlrecode-1.3.1-r1 b/metadata/md5-cache/app-text/htmlrecode-1.3.1-r1
new file mode 100644
index 000000000000..59df3b592de1
--- /dev/null
+++ b/metadata/md5-cache/app-text/htmlrecode-1.3.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Recodes HTML file using a new character set
+EAPI=7
+HOMEPAGE=https://bisqwit.iki.fi/source/htmlrecode.html
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://bisqwit.iki.fi/src/arch/htmlrecode-1.3.1.tar.bz2
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=557d4b8bef59093983249f080abefc12
diff --git a/metadata/md5-cache/app-text/libnumbertext-1.0_beta3_p20180611 b/metadata/md5-cache/app-text/libnumbertext-1.0
similarity index 73%
rename from metadata/md5-cache/app-text/libnumbertext-1.0_beta3_p20180611
rename to metadata/md5-cache/app-text/libnumbertext-1.0
index 2b7666ea7605..08c8dd69affe 100644
--- a/metadata/md5-cache/app-text/libnumbertext-1.0_beta3_p20180611
+++ b/metadata/md5-cache/app-text/libnumbertext-1.0
@@ -3,10 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !
DESCRIPTION=Number to number name and money text conversion libraries
EAPI=7
HOMEPAGE=https://github.com/Numbertext/libnumbertext
-IUSE=debug doc test
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-3+
SLOT=0
-SRC_URI=https://github.com/Numbertext/libnumbertext/archive/53ee927a1d431aea09a4f844213d608d8c10defd.tar.gz -> libnumbertext-1.0_beta3_p20180611.tar.gz
+SRC_URI=https://github.com/Numbertext/libnumbertext/archive/1.0.tar.gz -> libnumbertext-1.0.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b3a0ada018a7ddd14b0bd2228bec6a0c
+_md5_=4556c04b3896801a02c27defa245a524
diff --git a/metadata/md5-cache/app-text/pinfo-0.6.10-r6 b/metadata/md5-cache/app-text/pinfo-0.6.10-r6
index f7dea348328e..894451c85cd3 100644
--- a/metadata/md5-cache/app-text/pinfo-0.6.10-r6
+++ b/metadata/md5-cache/app-text/pinfo-0.6.10-r6
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl )
SLOT=0
SRC_URI=https://alioth.debian.org/frs/download.php/3351/pinfo-0.6.10.tar.bz2
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=73e898faf9d733d2ce64c8bdbd4bda1e
+_md5_=a055495ff4cd53916062c62656506dc4
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 8fd3e7011c5c..80a487167b98 100644
Binary files a/metadata/md5-cache/dev-ada/Manifest.gz and b/metadata/md5-cache/dev-ada/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ada/libadalang-2018 b/metadata/md5-cache/dev-ada/libadalang-2018
new file mode 100644
index 000000000000..c1903b5fe6f0
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/libadalang-2018
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup test
+DEPEND=dev-python/pyyaml || ( dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=] dev-ada/gnatcoll-bindings[iconv,shared,gnat_2016=,gnat_2017=,gnat_2018] ) 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_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-ada/langkit-2018
+DESCRIPTION=high performance semantic engine for the Ada programming language
+EAPI=6
+HOMEPAGE=https://libre.adacore.com/
+IUSE=gnat_2016 gnat_2017 +gnat_2018 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 gcc-runtime-library-exception-3.1
+RDEPEND=dev-python/pyyaml || ( dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=] dev-ada/gnatcoll-bindings[iconv,shared,gnat_2016=,gnat_2017=,gnat_2018] ) 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_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(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18 -> libadalang-gpl-2018-src.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=1d704709176bdf065bfc5e5c2c322e48
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 7c874d168e0a..6c4eefe89dff 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/barman-2.4 b/metadata/md5-cache/dev-db/barman-2.4
new file mode 100644
index 000000000000..c226c6fcb145
--- /dev/null
+++ b/metadata/md5-cache/dev-db/barman-2.4
@@ -0,0 +1,14 @@
+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=Administration tool for disaster recovery of PostgreSQL servers
+EAPI=6
+HOMEPAGE=http://www.pgbarman.org
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/argh[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/psycopg-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/python-dateutil[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/argcomplete[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(-)] net-misc/rsync dev-db/postgresql[server] 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://downloads.sourceforge.net/project/pgbarman/2.4/barman-2.4.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=359934cb55ee4a73d28445af4b8e7d8f
diff --git a/metadata/md5-cache/dev-db/redis-3.2.12 b/metadata/md5-cache/dev-db/redis-3.2.12
index 29202848fe3a..a65efcb2cf66 100644
--- a/metadata/md5-cache/dev-db/redis-3.2.12
+++ b/metadata/md5-cache/dev-db/redis-3.2.12
@@ -4,11 +4,11 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
EAPI=6
HOMEPAGE=http://redis.io/
IUSE=+jemalloc tcmalloc luajit test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
LICENSE=BSD
RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
REQUIRED_USE=?? ( tcmalloc jemalloc )
SLOT=0
SRC_URI=http://download.redis.io/releases/redis-3.2.12.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=77f24780154945c54ce7ec964a0fcd01
+_md5_=c4934b517f99abecbc040b413f2071c0
diff --git a/metadata/md5-cache/dev-db/redis-4.0.10 b/metadata/md5-cache/dev-db/redis-4.0.10
index 746bd1432857..0cffb18b77a5 100644
--- a/metadata/md5-cache/dev-db/redis-4.0.10
+++ b/metadata/md5-cache/dev-db/redis-4.0.10
@@ -4,11 +4,11 @@ DESCRIPTION=A persistent caching system, key-value and data structures database
EAPI=6
HOMEPAGE=https://redis.io
IUSE=+jemalloc tcmalloc luajit test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
LICENSE=BSD
RDEPEND=luajit? ( dev-lang/luajit:2 ) !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )
REQUIRED_USE=?? ( tcmalloc jemalloc )
SLOT=0
SRC_URI=http://download.redis.io/releases/redis-4.0.10.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9cbcba879673fcae455ad27a7ed66bf2
+_md5_=79fc147bec7fc206bab28ee6b80670b0
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 9e35088574ca..e1db95c3a74a 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/dnsjava-2.1.8 b/metadata/md5-cache/dev-java/dnsjava-2.1.8
new file mode 100644
index 000000000000..ff0352fab4a4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/dnsjava-2.1.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=An implementation of DNS in Java
+EAPI=6
+HOMEPAGE=http://www.dnsjava.org/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.dnsjava.org/download/dnsjava-2.1.8.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=dfec1a12c4fd08e541c1c2498a26e58b
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.6.0.1 b/metadata/md5-cache/dev-java/protobuf-java-3.6.0.1
new file mode 100644
index 000000000000..3ad61dd795f5
--- /dev/null
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.6.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=~dev-libs/protobuf-3.6.0.1 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Google's Protocol Buffers - Java bindings
+EAPI=6
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.7 !=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0/16
+SRC_URI=https://github.com/google/protobuf/archive/v3.6.0.1.tar.gz -> protobuf-3.6.0.1.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple 3e71074eb6884746b37b70b2c9c881f4 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3bd68b3187881dd73e95e243d1d1451c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 0c0e4a6107cc..17d44fd83fdb 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/moarvm-2018.06 b/metadata/md5-cache/dev-lang/moarvm-2018.06
new file mode 100644
index 000000000000..bc9b62254a04
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/moarvm-2018.06
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/libatomic_ops dev-libs/libuv dev-lang/lua:= virtual/libffi clang? ( >=sys-devel/clang-3.1 ) dev-lang/perl
+DESCRIPTION=A 6model-based VM for NQP and Rakudo Perl 6
+EAPI=6
+HOMEPAGE=http://moarvm.org
+IUSE=asan clang debug doc +jit static-libs optimize ubsan
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=dev-libs/libatomic_ops dev-libs/libuv dev-lang/lua:= virtual/libffi
+RESTRICT=test
+SLOT=0
+SRC_URI=http://moarvm.org/releases/MoarVM-2018.06.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a98aea3aaeead5c48eed206b6c9228a7
diff --git a/metadata/md5-cache/dev-lang/nqp-2018.06 b/metadata/md5-cache/dev-lang/nqp-2018.06
new file mode 100644
index 000000000000..97ab801febbe
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nqp-2018.06
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
+DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.06[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
+EAPI=6
+HOMEPAGE=https://rakudo.org
+IUSE=doc clang java +moar test elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2018.06[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( java moar )
+SLOT=0
+SRC_URI=https://github.com/perl6/nqp/tarball/2018.06 -> nqp-2018.06.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=540e2c28c3b6e7eaed3f4df7a4974a36
diff --git a/metadata/md5-cache/dev-lang/perl-5.28.9999 b/metadata/md5-cache/dev-lang/perl-5.28.9999
index a809f145557d..5260eba5bedb 100644
--- a/metadata/md5-cache/dev-lang/perl-5.28.9999
+++ b/metadata/md5-cache/dev-lang/perl-5.28.9999
@@ -8,6 +8,6 @@ LICENSE=|| ( Artistic GPL-1+ )
PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 sys-libs/zlib
SLOT=0/5.28
-SRC_URI=mirror://cpan/src/5.0/perl-5.28.0-RC2.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.28.0-RC2.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.28.0-RC2-patches-1/perl-5.28.0-RC2-patches-1.tar.xz mirror://gentoo/perl-5.28.0-RC2-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.28.0-RC2-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.9/perl-cross-1.1.9.tar.gz
+SRC_URI=mirror://cpan/src/5.0/perl-5.28.0.tar.xz mirror://cpan/authors/id/X/XS/XSAWYERX/perl-5.28.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.28.0-RC2-patches-1/perl-5.28.0-RC2-patches-1.tar.xz mirror://gentoo/perl-5.28.0-RC2-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.28.0-RC2-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.9/perl-cross-1.1.9.tar.gz
_eclasses_=alternatives 6c575717515f030736d1b718d507d2f9 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc72f6caa3cc9ee69c11d4fee391d930
+_md5_=45b4bd54fe6a19b4bee49c4e716ff196
diff --git a/metadata/md5-cache/dev-lang/python-3.7.0 b/metadata/md5-cache/dev-lang/python-3.7.0
new file mode 100644
index 000000000000..e5f4afefefe5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.7.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=6
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=PSF-2
+PDEPEND=>=app-eselect/eselect-python-20140125-r1
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!=virtual/jdk-1.7 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A compiler for the Perl 6 programming language
+EAPI=6
+HOMEPAGE=https://rakudo.org
+IUSE=clang java +moar test elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=~dev-lang/nqp-2018.06:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( java moar )
+SLOT=0
+SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2018.06.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=34ab2cd429be00b5f90033afb65eb2e7
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-38.2.1_rc0 b/metadata/md5-cache/dev-lang/spidermonkey-38.3.0
similarity index 87%
rename from metadata/md5-cache/dev-lang/spidermonkey-38.2.1_rc0
rename to metadata/md5-cache/dev-lang/spidermonkey-38.3.0
index 33a4c433165f..d38dd26de1f1 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-38.2.1_rc0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-38.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Stand-alone JavaScript C library
EAPI=6
HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
IUSE=debug +jit minimal static-libs +system-icu test custom-cflags custom-optimization
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
LICENSE=NPL-1.1
RDEPEND=>=dev-libs/nspr-4.10.10 virtual/libffi sys-libs/readline:0= >=sys-libs/zlib-1.2.3 system-icu? ( >=dev-libs/icu-51.1:= )
RESTRICT=ia64? ( test )
SLOT=38
-SRC_URI=https://people.mozilla.org/~sstangl/mozjs-38.2.1.rc0.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot38-patches-01.tar.xz
+SRC_URI=https://archive.mozilla.org/pub/spidermonkey/releases/38.3.0/mozjs-38.3.0sfink2.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot38-patches-01.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e mozcoreconf-v4 45c0b61c53e2dbbcf728355c62f8de3c multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a8ff0a0e74bd28c7ac70632ff05a5569
+_md5_=b6f4c29f2de58fd0b4a30d65fe2ab840
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b768bb957478..cdcf44f0028e 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/double-conversion-2.0.1 b/metadata/md5-cache/dev-libs/double-conversion-2.0.1
deleted file mode 100644
index ce9ee25dfa20..000000000000
--- a/metadata/md5-cache/dev-libs/double-conversion-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-util/scons[python_targets_python2_7]
-DESCRIPTION=Binary-decimal and decimal-binary conversion routines for IEEE doubles
-EAPI=5
-HOMEPAGE=https://github.com/google/double-conversion
-IUSE=static-libs
-KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-SLOT=0/1
-SRC_URI=https://github.com/google/double-conversion/archive/v2.0.1.tar.gz -> double-conversion-2.0.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 scons-utils abbc7625ff457854eae0edaa1fd55cc7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce1472d3a1e69531fbc2a4d93a2492a8
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.0.0 b/metadata/md5-cache/dev-libs/double-conversion-3.0.0
index 02c531bd8d9e..3b9c0fa90d05 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-3.0.0
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=Binary-decimal and decimal-binary conversion routines for IEEE doubl
EAPI=6
HOMEPAGE=https://github.com/google/double-conversion
IUSE=test
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
LICENSE=BSD
SLOT=0/1
SRC_URI=https://github.com/google/double-conversion/archive/v3.0.0.tar.gz -> double-conversion-3.0.0.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=369be32629566f7c42f1078de4caec83
+_md5_=800ce55c594f88b905cd34d31a3dc7e5
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.0.0-r1 b/metadata/md5-cache/dev-libs/double-conversion-3.0.0-r1
new file mode 100644
index 000000000000..33a7d99716fe
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.0.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Binary-decimal and decimal-binary conversion routines for IEEE doubles
+EAPI=6
+HOMEPAGE=https://github.com/google/double-conversion
+IUSE=static-libs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+SLOT=0/1
+SRC_URI=https://github.com/google/double-conversion/archive/v3.0.0.tar.gz -> double-conversion-3.0.0.tar.gz
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=258cc140026cee62d1b9b11c93cd4bbb
diff --git a/metadata/md5-cache/dev-libs/gjs-1.48.7 b/metadata/md5-cache/dev-libs/gjs-1.48.7
index 261a5ba29d14..779c0c8b5ab0 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.48.7
+++ b/metadata/md5-cache/dev-libs/gjs-1.48.7
@@ -4,10 +4,10 @@ DESCRIPTION=Javascript bindings for GNOME
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
IUSE=+cairo examples gtk test test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86
LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
RDEPEND=>=dev-libs/glib-2.52.1 >=dev-libs/gobject-introspection-1.52.1:= sys-libs/readline:0= dev-lang/spidermonkey:38 virtual/libffi cairo? ( x11-libs/cairo[X] ) gtk? ( >=x11-libs/gtk+-3.20:3 )
SLOT=0
SRC_URI=mirror://gnome/sources/gjs/1.48/gjs-1.48.7.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db6d84f2bcd00ef1fd3c498b15962333
+_md5_=5b5e88eb6c2f73d445925a4e9fe662a8
diff --git a/metadata/md5-cache/dev-libs/libfmt-5.1.0 b/metadata/md5-cache/dev-libs/libfmt-5.1.0
new file mode 100644
index 000000000000..1c6ae3f2f761
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfmt-5.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Small, safe and fast formatting library
+EAPI=6
+HOMEPAGE=https://github.com/fmtlib/fmt
+IUSE=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=~amd64 ~x86
+LICENSE=BSD-2
+SLOT=0/5
+SRC_URI=https://github.com/fmtlib/fmt/archive/5.1.0.tar.gz -> libfmt-5.1.0.tar.gz
+_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=30f4d4d6ca77de549fb5ec5343d42283
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.3 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.3
index b6c8a2340862..cf25e9a7fff0 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.8.3
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.3
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
EAPI=6
HOMEPAGE=http://www.gnupg.org/
IUSE=doc o-flag-munging 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=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-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 ~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=LGPL-2.1 MIT
RDEPEND=>=dev-libs/libgpg-error-1.25[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/20
SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.3.tar.bz2
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=944c8d543d33aa2a296c6c5fae2449a6
+_md5_=c5b67f4eec82e14806a351ff49830d1b
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.29 b/metadata/md5-cache/dev-libs/libgpg-error-1.29
index 4bca080bf4ed..176dccd402b6 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.29
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.29
@@ -4,10 +4,10 @@ DESCRIPTION=Contains error handling functions used by GnuPG software
EAPI=6
HOMEPAGE=http://www.gnupg.org/related_software/libgpg-error
IUSE=common-lisp nls 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=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-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 ~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=GPL-2 LGPL-2.1
RDEPEND=nls? ( >=virtual/libintl-0-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=mirror://gnupg/libgpg-error/libgpg-error-1.29.tar.bz2
_eclasses_=libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b7a8804205041c5eea733039d95ab46a
+_md5_=65085838d782b043ea1c18b1c39fdbeb
diff --git a/metadata/md5-cache/dev-libs/libinput-1.11.0 b/metadata/md5-cache/dev-libs/libinput-1.11.2
similarity index 98%
rename from metadata/md5-cache/dev-libs/libinput-1.11.0
rename to metadata/md5-cache/dev-libs/libinput-1.11.2
index 855343e40a1b..de13eba46663 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.11.0
+++ b/metadata/md5-cache/dev-libs/libinput-1.11.2
@@ -9,6 +9,6 @@ LICENSE=MIT
RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
RESTRICT=test
SLOT=0/10
-SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.11.0.tar.xz
+SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.11.2.tar.xz
_eclasses_=meson eb124b9e9d7a5f1ebc89589fe73c816f multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88
_md5_=e30d3b13a58a029a72a80a477f79f658
diff --git a/metadata/md5-cache/dev-libs/libressl-2.6.5 b/metadata/md5-cache/dev-libs/libressl-2.6.5
index e1dec527eb70..cf1dac19c318 100644
--- a/metadata/md5-cache/dev-libs/libressl-2.6.5
+++ b/metadata/md5-cache/dev-libs/libressl-2.6.5
@@ -4,7 +4,7 @@ DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
EAPI=6
HOMEPAGE=https://www.libressl.org/
IUSE=+asm 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 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86
LICENSE=ISC openssl
PDEPEND=app-misc/ca-certificates
RDEPEND=!dev-libs/openssl:0
@@ -12,4 +12,4 @@ REQUIRED_USE=test? ( static-libs )
SLOT=0/44
SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.5.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=6dd28e569aa97ef1ced9b9bb039d1920
+_md5_=c7414b7d3ee35c8dc4c5fdfd3415fac0
diff --git a/metadata/md5-cache/dev-libs/libuv-1.21.0 b/metadata/md5-cache/dev-libs/libuv-1.21.0-r1
similarity index 97%
rename from metadata/md5-cache/dev-libs/libuv-1.21.0
rename to metadata/md5-cache/dev-libs/libuv-1.21.0-r1
index 444eea5cf4a4..2f8d1015c032 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.21.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.21.0-r1
@@ -10,4 +10,4 @@ RESTRICT=test
SLOT=0/1
SRC_URI=https://github.com/libuv/libuv/archive/v1.21.0.tar.gz -> libuv-1.21.0.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=8cfa3b5c69c7d6a18b7b3c80b498561f
+_md5_=32f014e4b444f5c34318c53082532cd9
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.6.0.1 b/metadata/md5-cache/dev-libs/protobuf-3.6.0.1
new file mode 100644
index 000000000000..7713b88d0ccd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/protobuf-3.6.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=emacs? ( virtual/emacs ) zlib? ( sys-libs/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(-)?] ) test? ( >=dev-cpp/gtest-1.8.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(-)?] ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
+EAPI=6
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+IUSE=emacs examples static-libs test 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=emacs? ( virtual/emacs ) zlib? ( sys-libs/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(-)?] )
+SLOT=0/16
+SRC_URI=https://github.com/google/protobuf/archive/v3.6.0.1.tar.gz -> protobuf-3.6.0.1.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d7221809c5901a20a62aefb3bc7ca838
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.0-r1 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.0-r1
index 428ae97aa09c..e6080ac55ec7 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.0-r1
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.3.0-r1
@@ -1,8 +1,8 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/protobuf-2.6.0: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(-)?] test? ( !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) virtual/pkgconfig[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(-)?] >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/protobuf-2.6.0: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(-)?] virtual/pkgconfig[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(-)?] >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Protocol Buffers implementation in C
EAPI=6
-HOMEPAGE=https://github.com/protobuf-c/protobuf-c/
+HOMEPAGE=https://github.com/protobuf-c/protobuf-c
IUSE=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 sparc x86
LICENSE=BSD-2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/protobuf-2.6.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
SLOT=0/1.0.0
SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.0/protobuf-c-1.3.0.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c798a52a9d4f6fe6dcdb18ece0211d69
+_md5_=9bdca3cdc47ff4bed9f4bb4fdfd9d69b
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 676410c6f7d2..acb4b804fe76 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0 b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
index b6f7b6412cb7..b5f259b6b4f0 100644
--- a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
+++ b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Pod-Parser virtual/perl-if dev-perl/Module-Build dev-lang/pe
DESCRIPTION=Convert Pod data to formatted LaTeX
EAPI=5
HOMEPAGE=http://search.cpan.org/dist/Pod-LaTeX/
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd
LICENSE=|| ( GPL-1+ Artistic )
RDEPEND=virtual/perl-Pod-Parser virtual/perl-if dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=83719479d4aa1ce6b030fc4e8dfe7fa4
+_md5_=90a58fdf7748f9a84bf5893efd997a6c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index e4e3210b1a62..85a3be0d07fe 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/e4u-0.1_rc4 b/metadata/md5-cache/dev-python/e4u-0.1_rc5
similarity index 90%
rename from metadata/md5-cache/dev-python/e4u-0.1_rc4
rename to metadata/md5-cache/dev-python/e4u-0.1_rc5
index 55b86ffa2b24..d9d5243177c9 100644
--- a/metadata/md5-cache/dev-python/e4u-0.1_rc4
+++ b/metadata/md5-cache/dev-python/e4u-0.1_rc5
@@ -9,6 +9,6 @@ LICENSE=BSD
RDEPEND=dev-python/beautifulsoup:python-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[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://github.com/lambdalisue/e4u/archive/0.1rc4.tar.gz -> e4u-0.1rc4.tar.gz
+SRC_URI=https://github.com/lambdalisue/e4u/archive/0.1rc5.tar.gz -> e4u-0.1rc5.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e0d0423655e2c3c9a598931ff27abf33
+_md5_=86a3779d8b3e37427124ca3bbe20e255
diff --git a/metadata/md5-cache/dev-python/flask-login-0.4.1 b/metadata/md5-cache/dev-python/flask-login-0.4.1
new file mode 100644
index 000000000000..c9e37e0af23e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-login-0.4.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5: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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/flask-0.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blinker[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/semantic_version[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Login session support for Flask
+EAPI=7
+HOMEPAGE=https://pypi.org/project/Flask-Login/
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-0.10[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5: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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.4.1.tar.gz -> flask-login-0.4.1.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=8e9c4eb8ce0c6afdb217b5aa0ebe8840
diff --git a/metadata/md5-cache/dev-python/keyring-13.2.1 b/metadata/md5-cache/dev-python/keyring-13.2.1
new file mode 100644
index 000000000000..7d7edc8652c7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/keyring-13.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+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/setuptools_scm-1.15.0[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/secretstorage[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/entrypoints[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/pytest-runner[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-2.8[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-flake8[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/collective-checkdocs[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(-)] ) 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(-)]
+DESCRIPTION=Provides access to the system keyring service
+EAPI=6
+HOMEPAGE=https://github.com/jaraco/keyring
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=PSF-2
+RDEPEND=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
+SRC_URI=mirror://pypi/k/keyring/keyring-13.2.1.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc7c5ce9403a580221409edfe2470cfb
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.19.0 b/metadata/md5-cache/dev-python/llvmlite-0.19.0
deleted file mode 100644
index a2fe25538758..000000000000
--- a/metadata/md5-cache/dev-python/llvmlite-0.19.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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(-)] sys-devel/llvm:4 sys-libs/zlib:0= virtual/python-enum34[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=Python wrapper around the llvm C++ library
-EAPI=6
-HOMEPAGE=http://llvmlite.pydata.org/
-IUSE=examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-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(-)] sys-devel/llvm:4 sys-libs/zlib:0= virtual/python-enum34[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/l/llvmlite/llvmlite-0.19.0.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 llvm f9e74238f1b5743ea5d7214fcc7dbb36 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8dc69da5d5016fc4891bc5ddde792411
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.23.0 b/metadata/md5-cache/dev-python/llvmlite-0.24.0
similarity index 97%
rename from metadata/md5-cache/dev-python/llvmlite-0.23.0
rename to metadata/md5-cache/dev-python/llvmlite-0.24.0
index f583dc83aa24..9cb76ae3aedf 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.23.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.24.0
@@ -9,6 +9,6 @@ LICENSE=BSD
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(-)] >=sys-devel/llvm-6.0.0-r1:6 sys-libs/zlib:0= virtual/python-enum34[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/numba/llvmlite/archive/v0.23.0.tar.gz -> llvmlite-0.23.0.gh.tar.gz
+SRC_URI=https://github.com/numba/llvmlite/archive/v0.24.0.tar.gz -> llvmlite-0.24.0.gh.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 llvm f9e74238f1b5743ea5d7214fcc7dbb36 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=19dbb9056f63bba5599d3fcbced4c30c
diff --git a/metadata/md5-cache/dev-python/numba-0.37.0 b/metadata/md5-cache/dev-python/numba-0.37.0
index d60c3dca6eb1..1821809a0037 100644
--- a/metadata/md5-cache/dev-python/numba-0.37.0
+++ b/metadata/md5-cache/dev-python/numba-0.37.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=https://github.com/numba/numba/archive/0.37.0.tar.gz -> numba-0.37.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d559f3027c3acdebe726a8279cad906c
+_md5_=84e8dab3182f388f008b5c814ca6bb42
diff --git a/metadata/md5-cache/dev-python/pbr-4.1.0 b/metadata/md5-cache/dev-python/pbr-4.1.0
new file mode 100644
index 000000000000..9434bac7c956
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pbr-4.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/coverage-4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/coverage-4.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/fixtures-3.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/subunit-1.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testresources-2.0.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testscenarios-0.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/testtools-2.2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/virtualenv-14.0.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Inject some useful and sensible default behaviors into setuptools
+EAPI=6
+HOMEPAGE=https://github.com/openstack-dev/pbr
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pbr/pbr-4.1.0.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60f34fb24d03dd0d3db1b13078602734
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.6.0.1 b/metadata/md5-cache/dev-python/protobuf-python-3.6.0.1
new file mode 100644
index 000000000000..bf69657e42d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.6.0.1
@@ -0,0 +1,14 @@
+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(-)] ~dev-libs/protobuf-3.6.0.1 dev-python/namespace-google[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(-)] 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=Google's Protocol Buffers - Python bindings
+EAPI=6
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/google/protobuf
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+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(-)] ~dev-libs/protobuf-3.6.0.1 dev-python/namespace-google[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(-)] 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-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/16
+SRC_URI=https://github.com/google/protobuf/archive/v3.6.0.1.tar.gz -> protobuf-3.6.0.1.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=52679f09b6ffeb163c3488b4a4e2846f
diff --git a/metadata/md5-cache/dev-python/pyacoustid-1.1.5 b/metadata/md5-cache/dev-python/pyacoustid-1.1.5
new file mode 100644
index 000000000000..f2327860247e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyacoustid-1.1.5
@@ -0,0 +1,14 @@
+BDEPEND=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(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings for Chromaprint and the AcoustID web service
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pyacoustid/
+IUSE=examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/audioread[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[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(-)] media-libs/chromaprint 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/pyacoustid/pyacoustid-1.1.5.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=3aa5ce6d11f59b416fd04067317731a6
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.14.2 b/metadata/md5-cache/dev-python/pyrsistent-0.14.2
index c9e80d01b81e..c145b11d28b5 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.14.2
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.14.2
@@ -4,11 +4,11 @@ DESCRIPTION=Persistent/Functional/Immutable data structures
EAPI=6
HOMEPAGE=https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/
IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5: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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.14.2.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b378fb428980ce2352d5331f200c9e59
+_md5_=37ca853830285848316e85c54177bab7
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1 b/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1
index 7578981a9b46..ed6aedc8169a 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.7.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Extensions to the standard Python datetime module
EAPI=6
HOMEPAGE=https://dateutil.readthedocs.org/ https://pypi.org/project/python-dateutil https://github.com/dateutil/dateutil/
IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=BSD
RDEPEND=>=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-libs/timezone-data python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5: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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.7.2.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=586ded788bfa7209d410ca44dc1447f3
+_md5_=9b56c628f27ffc043a05ca5b2e766d53
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.10.4 b/metadata/md5-cache/dev-python/qscintilla-python-2.10.4
index 417c35711e23..363d30eb5626 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.10.4
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.10.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for Qscintilla
EAPI=6
HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
IUSE=debug python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc64 x86
LICENSE=GPL-3
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(-)] >=dev-python/sip-4.19:=[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/PyQt5[gui,printsupport,widgets,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-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.10.4:=
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.4.tar.gz
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=46f480c346760e0a6cc13a40bb3418b3
+_md5_=9c26f0ea4b81b2770b753de00fe1158b
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.6.0-r2 b/metadata/md5-cache/dev-python/semantic_version-2.6.0-r2
new file mode 100644
index 000000000000..959bd3576638
--- /dev/null
+++ b/metadata/md5-cache/dev-python/semantic_version-2.6.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5: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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Python library providing a few tools handling SemVer in Python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/semantic_version/
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5: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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/rbarrois/python-semanticversion/archive/v2.6.0.tar.gz -> semantic_version-2.6.0-1.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=5050e95f9d662e1c6e99d3788400eb4e
diff --git a/metadata/md5-cache/dev-python/texttable-1.3.1 b/metadata/md5-cache/dev-python/texttable-1.4.0
similarity index 96%
rename from metadata/md5-cache/dev-python/texttable-1.3.1
rename to metadata/md5-cache/dev-python/texttable-1.4.0
index 503c608b971e..313039fdb702 100644
--- a/metadata/md5-cache/dev-python/texttable-1.3.1
+++ b/metadata/md5-cache/dev-python/texttable-1.4.0
@@ -10,6 +10,6 @@ LICENSE=LGPL-2.1
RDEPEND=cjk? ( dev-python/cjkwrap[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(-)] ) 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
-SRC_URI=https://github.com/foutaise/texttable/archive/v1.3.1.tar.gz -> texttable-1.3.1.tar.gz
+SRC_URI=https://github.com/foutaise/texttable/archive/v1.4.0.tar.gz -> texttable-1.4.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
_md5_=703f9542dedb9e3cd41bb9d324b878c2
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index da6f12593b52..f05e43cd7098 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120 b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
index 97548da3f423..4d804fb783bc 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libpng:0= virtual/jpeg:0 geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-bad:1.0 ) hyphen? ( dev-libs/hyphen ) multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[widgets] ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtopengl-5.9.1:5 ) orientation? ( >=dev-qt/qtsensors-5.9.1:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.1:5 ) qml? ( >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtwebchannel-5.9.1:5[qml] ) webp? ( media-libs/libwebp:0= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems dev-lang/perl dev-util/gperf >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libpng:0= virtual/jpeg:0 geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-bad:1.0 ) hyphen? ( dev-libs/hyphen ) multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[widgets] ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtopengl-5.9.1:5[gles2=] ) orientation? ( >=dev-qt/qtsensors-5.9.1:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.1:5 ) qml? ( >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtwebchannel-5.9.1:5[qml] ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems dev-lang/perl dev-util/gperf >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
DESCRIPTION=WebKit rendering library for the Qt5 framework (deprecated)
EAPI=6
HOMEPAGE=https://www.qt.io/
IUSE=geolocation gles2 +gstreamer +hyphen +jit multimedia nsplugin opengl orientation +printsupport qml webp X
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
LICENSE=BSD LGPL-2+
-RDEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libpng:0= virtual/jpeg:0 geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-bad:1.0 ) hyphen? ( dev-libs/hyphen ) multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[widgets] ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtopengl-5.9.1:5 ) orientation? ( >=dev-qt/qtsensors-5.9.1:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.1:5 ) qml? ( >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtwebchannel-5.9.1:5[qml] ) webp? ( media-libs/libwebp:0= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender )
+RDEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libpng:0= virtual/jpeg:0 geolocation? ( >=dev-qt/qtpositioning-5.9.1:5 ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-bad:1.0 ) hyphen? ( dev-libs/hyphen ) multimedia? ( >=dev-qt/qtmultimedia-5.9.1:5[widgets] ) opengl? ( >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtopengl-5.9.1:5[gles2=] ) orientation? ( >=dev-qt/qtsensors-5.9.1:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.9.1:5 ) qml? ( >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtwebchannel-5.9.1:5[qml] ) webp? ( media-libs/libwebp:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXrender )
REQUIRED_USE=nsplugin? ( X ) qml? ( opengl ) ?? ( gstreamer multimedia )
SLOT=5/5.212
SRC_URI=http://code.qt.io/cgit/qt/qtwebkit.git/snapshot/72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da.tar.gz -> qtwebkit-5.212.0_pre20180120.tar.gz
_eclasses_=check-reqs fd05cf75484aa28d307cf4ee6e1db056 cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 ruby-single 7435c1687c234eb8cf5b212756f6381e ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a4596653187a5ad4b02d500419b6841
+_md5_=01fff6cc63c068e0e309f4cfd940c07c
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index ea01ab8ddea3..df1f795e2a07 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/httpclient-2.8.3 b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
index da23752c567c..b2f8ba5d2803 100644
--- a/metadata/md5-cache/dev-ruby/httpclient-2.8.3
+++ b/metadata/md5-cache/dev-ruby/httpclient-2.8.3
@@ -4,11 +4,11 @@ DESCRIPTION='httpclient' gives something like the functionality of libwww-perl (
EAPI=5
HOMEPAGE=https://github.com/nahi/httpclient
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa 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 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_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=https://github.com/nahi/httpclient/archive/v2.8.3.tar.gz -> httpclient-2.8.3.tgz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=69d1ffac03747848264604a161898832
+_md5_=c6df3e6cc55ea5e0be7ca0464cb7a14d
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-5.4.0 b/metadata/md5-cache/dev-ruby/rack-attack-5.4.0
new file mode 100644
index 000000000000..5c2b3cc1963c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rack-attack-5.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/actionpack[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/actionpack[ruby_targets_ruby24] dev-ruby/activesupport[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/actionpack[ruby_targets_ruby25] dev-ruby/activesupport[ruby_targets_ruby25] dev-ruby/rack-test[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A DSL for blocking & throttling abusive clients
+EAPI=6
+HOMEPAGE=https://github.com/kickstarter/rack-attack
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5
+SRC_URI=mirror://rubygems/rack-attack-5.4.0.gem
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=fc65027f454ad60625b8bb64364c69fe
diff --git a/metadata/md5-cache/dev-ruby/rack-protection-2.0.3 b/metadata/md5-cache/dev-ruby/rack-protection-2.0.3
new file mode 100644
index 000000000000..2918c54229aa
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rack-protection-2.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=This gem protects against typical web attacks
+EAPI=6
+HOMEPAGE=https://github.com/rkh/rack-protection
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=2
+SRC_URI=mirror://rubygems/rack-protection-2.0.3.gem
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b9f7dcadbc71d940fb96a9041aba5ed1
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-3.6.0
index 2f1b7d683bd8..e3b979b59985 100644
--- a/metadata/md5-cache/dev-ruby/rspec-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-3.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
EAPI=6
HOMEPAGE=https://github.com/rspec/rspec
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=MIT
RDEPEND=ruby_targets_ruby23? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby23] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby23] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-core-3.6*[ruby_targets_ruby24] =dev-ruby/rspec-expectations-3.6*[ruby_targets_ruby24] =dev-ruby/rspec-mocks-3.6*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=3
SRC_URI=mirror://rubygems/rspec-3.6.0.gem
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=708e921ad60fd6ec3a2903bd29a492e8
+_md5_=b9ae2d04100a62ed7d90d78da2c1587c
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-core-3.6.0
index a10782b5c64b..9b2c5b3d23a2 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
EAPI=6
HOMEPAGE=https://github.com/rspec/rspec-core
IUSE=highlight test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc 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_ruby23? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] !!=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] !!=dev-ruby/coderay-1.0.9[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=3
SRC_URI=https://github.com/rspec/rspec-core/archive/v3.6.0.tar.gz -> rspec-core-3.6.0-git.tgz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=47d63d48eec227e814ff62bd07bddb59
+_md5_=62727471350f578b12641adee9d251cc
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0
index 6d2163ed7323..5251b93622eb 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
EAPI=6
HOMEPAGE=https://github.com/rspec/rspec-expectations
IUSE=test elibc_FreeBSD 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_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] rspec-expectations-3.6.0-git.tgz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=555c03fe9cd3923e9cc8dedf37a527ed
+_md5_=232a043d70e73ca3b5b829fa197507e9
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.6.0
index bc182aec3962..782acb08c5d1 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
EAPI=6
HOMEPAGE=https://github.com/rspec/rspec-mocks
IUSE=test elibc_FreeBSD 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_ruby23? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.6*[ruby_targets_ruby24] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby24] =dev-ruby/diff-lcs-1*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=3
SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.6.0.tar.gz -> rspec-mocks-3.6.0-git.tgz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b74eaa861045ead1f81448bffa90c2ab
+_md5_=a8adcfd46ceb1409ebefd708838bfa77
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.6.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.6.0
index c37a0c879e94..86fcffd28901 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.6.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
EAPI=6
HOMEPAGE=https://github.com/rspec/rspec-support
IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=3
SRC_URI=https://github.com/rspec/rspec-support/archive/v3.6.0.tar.gz -> rspec-support-3.6.0-git.tgz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6e7ecd3c901f9e0d2be7508c81b14c9f
+_md5_=97d08095c743545bb3e4fd1693c371b6
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-atk-3.1.1
index c1dc0053ec57..333015c9fdbd 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby Atk bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=dev-libs/atk ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=61d39429801b916adf8e8f89912db585
+_md5_=0373f0e0fda8974f8b96c3e40c24434d
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-clutter-3.1.1
index d36e70b02407..b8bfbd0ef16f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby Clutter bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=media-libs/clutter ruby_targets_ruby23? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=af3ee8a1d1b57a05806de5bdb60f1701
+_md5_=1ed9aa9ef19feda2e6673b47457b93ee
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.1.1
index 3e5cb09fcf31..37fc8c1a3cfa 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gdk-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby binding of GDK specific API of Clutter
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=media-libs/clutter[gtk] ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=2c475a3757a1882c750cc1010882230f
+_md5_=b14e35575a1e2996d4517e32486f5ff5
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.1.1
index fbbc6498db48..78b7d217851d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gstreamer-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby Clutter bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=media-libs/clutter-gst:* ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=00c6787c98c8e4aec14699edc00800aa
+_md5_=97e70ca4bd31dae937c2e46aa700d951
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1
index 639f9f74c6a7..7dbc4de9c6d6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-gtk-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby Clutter bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=media-libs/clutter-gtk[gtk] ruby_targets_ruby23? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=4878e50a40fb283ee698865118964d53
+_md5_=e2cfe310366fb0f7d16a52f2016ff836
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.1.1
index 76ec02344837..517218b1a69d 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdk3-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gdk3-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby GDK-3.x bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-cairo-gobject-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=55745fae7874bf2d675b24f4ef240262
+_md5_=0e695b78415aa36f890f3735a566f5f6
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1
index be1d46112102..1c52fe78a4e6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ) virtual/pkgconfig ruby_targets_ruby23? ( dev-ruby/pkg-config[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24] )
DESCRIPTION=Ruby GdkPixbuf2 bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
-RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby23? ( >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=00e7fb125b4cab757b679f75ed85801e
+_md5_=8f85914df0413de07ffde66b28987c39
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
index 0f43e9233b4e..3728004e7aee 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.2.9
@@ -4,11 +4,11 @@ DESCRIPTION=Native Language Support Library and Tools modeled after GNU gettext
EAPI=6
HOMEPAGE=https://ruby-gettext.github.io/
IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ppc64 ~sparc x86
LICENSE=|| ( Ruby LGPL-3+ )
RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby23] >=dev-ruby/text-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby24] >=dev-ruby/text-1.3.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby25] >=dev-ruby/text-1.3.0[ruby_targets_ruby25] ) sys-devel/gettext ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/gettext-3.2.9.gem
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=10a6bbf2bc9ceea671f839a7c81f8a1f
+_md5_=cef402fe38841b6badf4b602e7d5e1b5
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1
index ce30287b5edf..328712a48d6a 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby binding of GooCanvas
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=710c1a27198af2130ecbd5ea72ebbfb3
+_md5_=73f0c1773186c4fffb307bcce83a3bdc
diff --git a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1
index c2399a567747..b01006b78245 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gnome2-3.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Ruby Gnome2 bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gstreamer-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gdk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-clutter-gtk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gstreamer-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtksourceview3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-poppler-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-rsvg-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-vte-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-vte3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-webkit2-gtk-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=615bfa9bfa187d4e32f55f140f27a6b9
+_md5_=07b99f9be2a97f6923ac3680a53c04de
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.1.1
index a5927098fdd5..e302db39b430 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby GStreamer bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ruby23? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] ~dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=04feb9acef73d786ecb6f452cbea7cc9
+_md5_=ad70d476e5fdc57536740cf9d6bb41f8
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1
index 260843495ad6..e9360ff20f80 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby Gtk2 bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=8f04542ba7ed560e1d6b25097a5b2934
+_md5_=cb1b3f331561f88a695254526b61ec9a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.1.1
index 0f1344539fce..fccf8dbaa695 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk3-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk3-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby Gtk3 bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=x11-libs/gtk+:3 ruby_targets_ruby23? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-atk-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdk3-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gio2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-pango-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=46c23e7f9855ed40110d691f6800680d
+_md5_=5a0541bb4ecdbefeb921f5af09316be6
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1
index b2e8b7a9cbdf..0c6b2fe42933 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby bindings for gtksourceview
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=x11-libs/gtksourceview:2.0 ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=09b2a1db739dd522730e5a3b25ccbe07
+_md5_=19b3e0b46d4f5f61e3eab533a22881d9
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1
index e26b44b05061..13bf2736ee6f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-gtksourceview3-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby Gtk3 bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=x11-libs/gtksourceview:3.0 ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=8a27d3fcbc591c93e409729d54e5988f
+_md5_=3d03d8803bb46aacf2ef99e8094687a7
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.1.1
index d7341c5c2eb7..f599eb4b2661 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby poppler-glib bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=app-text/poppler[cairo] ruby_targets_ruby23? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby23] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ruby-gdkpixbuf2[ruby_targets_ruby24] >=dev-ruby/ruby-glib2-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ad87e5252d295b821db3a472ca812756
+_md5_=d8e40d156ee4e027715af30e7ddef598
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1
index b86bfabe2ce7..f8a799f958e8 100644
--- a/metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby bindings for librsvg
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=>=gnome-base/librsvg-2.16.1 ruby_targets_ruby23? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby23] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gdkpixbuf2-3.1.1[ruby_targets_ruby24] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1e5fa94ad298c4918435cb97b2887c74
+_md5_=d3f411e8b10bcb8b03047a98babe5c6d
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-vte-3.1.1
index 3e3b752ea014..5418a9eff0e9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-vte-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby vte bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=>=x11-libs/vte-0.12.1:0 ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk2-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8e7e82c8f3700fb195a25e0d451dcca7
+_md5_=4169ee43c43837e8f19d9d0a82c1987c
diff --git a/metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1
index 515dd3ead2d4..41397e82c906 100644
--- a/metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-vte3-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby VTE bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=x11-libs/vte:2.91 ruby_targets_ruby23? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=26c06d3d424818595f86e5691f26b499
+_md5_=b5ed9039083d0db9894297ecd8bbd0b2
diff --git a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.1.1 b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.1.1
index 4a77489ed5e0..b0af63a5a0d9 100644
--- a/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.1.1
+++ b/metadata/md5-cache/dev-ruby/ruby-webkit2-gtk-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby WebKitGtk+ for Gtk 3.0 bindings
EAPI=5
HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
IUSE=test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
LICENSE=Ruby
RDEPEND=net-libs/webkit-gtk:4 ruby_targets_ruby23? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby23] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/ruby-gobject-introspection-3.1.1[ruby_targets_ruby24] >=dev-ruby/ruby-gtk3-3.1.1[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.1.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-ng-gnome2 c87555693e48d10b05cae511675dc22c ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=0fe00bca1a83007b3e50716d7c01eff8
+_md5_=61f7ed929bdc884b0436efbbdde01499
diff --git a/metadata/md5-cache/dev-ruby/source_map-3.0.1 b/metadata/md5-cache/dev-ruby/source_map-3.0.1
index 965ff8b4ee18..dbe9ce82685c 100644
--- a/metadata/md5-cache/dev-ruby/source_map-3.0.1
+++ b/metadata/md5-cache/dev-ruby/source_map-3.0.1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/json:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
DESCRIPTION=Provides an API for parsing, and an API for generating source maps in ruby
EAPI=5
HOMEPAGE=https://github.com/ConradIrwin/ruby-source_map
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
KEYWORDS=~amd64 ~arm ~x86
LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/json[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/json:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/json:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/source_map-3.0.1.gem
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e2d6e8b075be662e84e610dcb84e0200
+_md5_=94fcfc91f1ae6ee13a623d9e8ef0c061
diff --git a/metadata/md5-cache/dev-ruby/spy-0.4.5 b/metadata/md5-cache/dev-ruby/spy-0.4.5
index dba18f011dd1..ca584741fc1b 100644
--- a/metadata/md5-cache/dev-ruby/spy-0.4.5
+++ b/metadata/md5-cache/dev-ruby/spy-0.4.5
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
DESCRIPTION=A simple opinionated mocking framework
EAPI=5
HOMEPAGE=https://github.com/ryanong/spy
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
KEYWORDS=~amd64
LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/spy-0.4.5.gem
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d6d649cdd6f9351e33324923f6d1288e
+_md5_=fb3ec5fc28760de8ce3a5649db022aa0
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.3 b/metadata/md5-cache/dev-ruby/stomp-1.4.3
deleted file mode 100644
index 8a69c92522f5..000000000000
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Ruby bindings for the stomp messaging protocol
-EAPI=5
-HOMEPAGE=https://github.com/stompgem/stomp
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/stomp-1.4.3.gem
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f2c844e28cd68495acd44cb6e4545c3a
diff --git a/metadata/md5-cache/dev-ruby/stomp-1.4.4 b/metadata/md5-cache/dev-ruby/stomp-1.4.4
index 2c4e3868df3e..dacbbd706fcd 100644
--- a/metadata/md5-cache/dev-ruby/stomp-1.4.4
+++ b/metadata/md5-cache/dev-ruby/stomp-1.4.4
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
DESCRIPTION=Ruby bindings for the stomp messaging protocol
EAPI=6
HOMEPAGE=https://github.com/stompgem/stomp
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/stomp-1.4.4.gem
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=6aa7126a4708258399f30268d7bd8c88
+_md5_=829178472515cc0c68dd4536de8a2da7
diff --git a/metadata/md5-cache/dev-ruby/zentest-4.11.1 b/metadata/md5-cache/dev-ruby/zentest-4.11.1
index 8ad27bd25318..c904ff907724 100644
--- a/metadata/md5-cache/dev-ruby/zentest-4.11.1
+++ b/metadata/md5-cache/dev-ruby/zentest-4.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Ra
EAPI=5
HOMEPAGE=https://github.com/seattlerb/zentest
IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Ruby
RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/ZenTest-4.11.1.gem
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a2247bfb7938745ef22bb54b8d16b7a9
+_md5_=d12a22cd61c32d961ac748de68c4881c
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 1d1b9f317f9e..cf59091cd347 100644
Binary files a/metadata/md5-cache/dev-scheme/Manifest.gz and b/metadata/md5-cache/dev-scheme/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-scheme/guile-sqlite3-0.1.0 b/metadata/md5-cache/dev-scheme/guile-sqlite3-0.1.0
new file mode 100644
index 000000000000..d37fc3080de3
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/guile-sqlite3-0.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=>=dev-scheme/guile-2.0.11:= dev-db/sqlite:3= >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Guile bindings of sqlite3
+EAPI=6
+HOMEPAGE=https://notabug.org/civodul/guile-sqlite3.git
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+ GPL-2
+RDEPEND=>=dev-scheme/guile-2.0.11:= dev-db/sqlite:3=
+SLOT=0
+SRC_URI=https://notabug.org/civodul/guile-sqlite3/archive/v0.1.0.tar.gz -> guile-sqlite3-0.1.0.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=48bbae4aaf1e4dfab40a28eddc31131d
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index b1d70c0f7482..5fe0f875797e 100644
Binary files a/metadata/md5-cache/dev-tex/Manifest.gz and b/metadata/md5-cache/dev-tex/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tex/latexdiff-1.2.1 b/metadata/md5-cache/dev-tex/latexdiff-1.2.1
index d9f88795cb81..5324c05a7427 100644
--- a/metadata/md5-cache/dev-tex/latexdiff-1.2.1
+++ b/metadata/md5-cache/dev-tex/latexdiff-1.2.1
@@ -4,9 +4,9 @@ DESCRIPTION=Compare two latex files and mark up significant differences
EAPI=6
HOMEPAGE=http://www.ctan.org/tex-archive/support/latexdiff/ https://github.com/ftilmann/latexdiff/
IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-3
RDEPEND=>=dev-lang/perl-5.8 virtual/latex-base || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended ) dev-perl/Algorithm-Diff
SLOT=0
SRC_URI=https://github.com/ftilmann/latexdiff/archive/1.2.1.tar.gz -> latexdiff-1.2.1.tar.gz
-_md5_=f453a426ee8badcf3321eee16919ff79
+_md5_=07e8b3724c123fed268a045df682c2ba
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4b4d19d59ba5..4b2f8c4b6abc 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/cloc-1.76 b/metadata/md5-cache/dev-util/cloc-1.76
deleted file mode 100644
index b78ef9fea10f..000000000000
--- a/metadata/md5-cache/dev-util/cloc-1.76
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/perl
-DESCRIPTION=Count Lines of Code
-EAPI=6
-HOMEPAGE=https://github.com/AlDanial/cloc
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-lang/perl dev-perl/Algorithm-Diff dev-perl/Regexp-Common virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-File-Spec virtual/perl-File-Temp
-SLOT=0
-SRC_URI=https://github.com/AlDanial/cloc/releases/download/v1.76/cloc-1.76.tar.gz
-_md5_=d34389ed929b8e4ce9927476585d158b
diff --git a/metadata/md5-cache/dev-util/cloc-1.76-r1 b/metadata/md5-cache/dev-util/cloc-1.76-r1
new file mode 100644
index 000000000000..82011866eb50
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cloc-1.76-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/perl
+DESCRIPTION=Count Lines of Code
+EAPI=6
+HOMEPAGE=https://github.com/AlDanial/cloc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-lang/perl dev-perl/Algorithm-Diff dev-perl/Parallel-ForkManager dev-perl/Regexp-Common virtual/perl-Digest-MD5 virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=https://github.com/AlDanial/cloc/releases/download/v1.76/cloc-1.76.tar.gz
+_md5_=b3d395ee20d4cb680b187c13ed9c959f
diff --git a/metadata/md5-cache/dev-util/debhelper-11.3.5 b/metadata/md5-cache/dev-util/debhelper-11.3.5
new file mode 100644
index 000000000000..51f661aaf69a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debhelper-11.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=6
+HOMEPAGE=https://tracker.debian.org/pkg/debhelper
+IUSE=test l10n_de l10n_es l10n_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_11.3.5.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=16be2c043232472fe92a860b452e3a14
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.106 b/metadata/md5-cache/dev-util/debootstrap-1.0.106
new file mode 100644
index 000000000000..21bc15b3c08a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.106
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Debian/Ubuntu bootstrap scripts
+EAPI=6
+HOMEPAGE=https://packages.qa.debian.org/d/debootstrap.html
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.106.tar.gz mirror://gentoo/devices.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=92d627779b3299fd0240974f831cf2c9
diff --git a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32 b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32
index cb48e61435fe..8068082036e1 100644
--- a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32
+++ b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32
@@ -4,11 +4,11 @@ DESCRIPTION=Converts Glade files to GtkBuilder XML format
EAPI=6
HOMEPAGE=https://www.gtk.org/
IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=LGPL-2+
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=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(+)] !=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.50:2[dbus] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.14:3[introspection] >=x11-libs/gtksourceview-3.14:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://gnome/sources/meld/3.18/meld-3.18.2.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e0a6beba226d83f8ca572c6e077c0f4
+_md5_=b07c86e0d54f196c470e96f1d3d9f709
diff --git a/metadata/md5-cache/dev-util/meson-0.46.0 b/metadata/md5-cache/dev-util/meson-0.46.0
index fb459e7905a6..3c38cabba47f 100644
--- a/metadata/md5-cache/dev-util/meson-0.46.0
+++ b/metadata/md5-cache/dev-util/meson-0.46.0
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
EAPI=6
HOMEPAGE=http://mesonbuild.com/
IUSE=python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris
LICENSE=Apache-2.0
RDEPEND=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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/m/meson/meson-0.46.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2261cdd8f8e5a10a3d1b1569dd8b1ddd
+_md5_=e8d193a409872725bee064245d769abe
diff --git a/metadata/md5-cache/dev-util/meson-0.46.1 b/metadata/md5-cache/dev-util/meson-0.46.1
index 3c00a82434ee..588876f00a1b 100644
--- a/metadata/md5-cache/dev-util/meson-0.46.1
+++ b/metadata/md5-cache/dev-util/meson-0.46.1
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
EAPI=6
HOMEPAGE=http://mesonbuild.com/
IUSE=python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris
LICENSE=Apache-2.0
RDEPEND=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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/m/meson/meson-0.46.1.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8ae9883e093b8a7b22e1942d90e93d9b
+_md5_=e6c422afdb9b99c4f1c701118b7e5b8d
diff --git a/metadata/md5-cache/dev-util/meson-0.47.0 b/metadata/md5-cache/dev-util/meson-0.47.0
new file mode 100644
index 000000000000..11f5bfd5d80b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meson-0.47.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Open source build system
+EAPI=6
+HOMEPAGE=http://mesonbuild.com/
+IUSE=python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/m/meson/meson-0.47.0.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e8d193a409872725bee064245d769abe
diff --git a/metadata/md5-cache/dev-util/meson-9999 b/metadata/md5-cache/dev-util/meson-9999
index a18d0433884b..277b7faa9661 100644
--- a/metadata/md5-cache/dev-util/meson-9999
+++ b/metadata/md5-cache/dev-util/meson-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
RESTRICT=test
SLOT=0
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 git-r3 8f6de46b0aa318aea0e8cac62ece098b multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2261cdd8f8e5a10a3d1b1569dd8b1ddd
+_md5_=e8d193a409872725bee064245d769abe
diff --git a/metadata/md5-cache/dev-util/vint-0.3.19 b/metadata/md5-cache/dev-util/vint-0.3.19
new file mode 100644
index 000000000000..b9161bfec35e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/vint-0.3.19
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/ansicolor-0.2.4[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/chardet-2.3.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/pyyaml-3.11[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(-)] virtual/python-enum34[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(-)] virtual/python-pathlib[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(-)] virtual/python-typing[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(-)] test? ( >=dev-python/coverage-3.7.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/pytest-3.3.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/pytest-cov-2.5.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-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) 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=Lint tool for Vim script language
+EAPI=6
+HOMEPAGE=https://github.com/Kuniwak/vint https://pypi.org/project/vim-vint/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/ansicolor-0.2.4[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/chardet-2.3.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/pyyaml-3.11[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(-)] virtual/python-enum34[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(-)] virtual/python-pathlib[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(-)] virtual/python-typing[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(-)]
+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/Kuniwak/vint/archive/v0.3.19.tar.gz -> vint-0.3.19.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c1677dfa8c74d018d58f0569844a3e06
diff --git a/metadata/md5-cache/dev-util/wxglade-0.8.2 b/metadata/md5-cache/dev-util/wxglade-0.8.2
index 49cd756e5035..4f0e6471a8b6 100644
--- a/metadata/md5-cache/dev-util/wxglade-0.8.2
+++ b/metadata/md5-cache/dev-util/wxglade-0.8.2
@@ -4,7 +4,7 @@ DESCRIPTION=Glade-like GUI designer which can generate Python, Perl, C++ or XRC
EAPI=6
HOMEPAGE=http://wxglade.sourceforge.net/
IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~sparc x86
LICENSE=MIT
RDEPEND=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_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-python/wxpython:3.0[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(+)]
REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/wxglade/wxGlade-0.8.2.zip
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f0dc90c4378ff7d51cac00ddb0d07c6f
+_md5_=b2360a18e40c13d414a9c6067d55ff78
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index cd96f104f80e..78b79fec4531 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/cvsgraph-1.7.0 b/metadata/md5-cache/dev-vcs/cvsgraph-1.7.0
index e7f1dd970307..ce5d3765f09d 100644
--- a/metadata/md5-cache/dev-vcs/cvsgraph-1.7.0
+++ b/metadata/md5-cache/dev-vcs/cvsgraph-1.7.0
@@ -4,9 +4,9 @@ DESCRIPTION=CVS/RCS repository grapher
EAPI=0
HOMEPAGE=http://www.akhphd.au.dk/~bertho/cvsgraph
IUSE=gif jpeg nls png truetype zlib
-KEYWORDS=-alpha amd64 -ia64 ~ppc sparc x86
+KEYWORDS=-alpha amd64 -ia64 ppc sparc x86
LICENSE=GPL-2
RDEPEND=media-libs/gd zlib? ( sys-libs/zlib ) gif? ( media-libs/giflib ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) truetype? ( media-libs/freetype )
SLOT=0
SRC_URI=http://www.akhphd.au.dk/~bertho/cvsgraph/release/cvsgraph-1.7.0.tar.gz
-_md5_=91196d067185e0aa0cf9154cd95f1973
+_md5_=0a10c4131ce9dfa2dc7d1874051b6e94
diff --git a/metadata/md5-cache/dev-vcs/mr-1.20171231 b/metadata/md5-cache/dev-vcs/mr-1.20171231
index 7268c89dcf5f..969fa9234109 100644
--- a/metadata/md5-cache/dev-vcs/mr-1.20171231
+++ b/metadata/md5-cache/dev-vcs/mr-1.20171231
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
DESCRIPTION=Multiple Repository management tool
EAPI=6
HOMEPAGE=https://myrepos.branchable.com/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl dev-perl/libwww-perl dev-perl/HTML-Parser
SLOT=0
SRC_URI=https://dev.gentoo.org/~tamiko/distfiles/mr-1.20171231.tar.xz
-_md5_=d4f9a1f399f6fe97ce7de37bfb208617
+_md5_=33a748a654f438eb1976c9358ab1d523
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 4e11196c291f..c68ecbb4e842 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/zsnes-1.51-r7 b/metadata/md5-cache/games-emulation/zsnes-1.51-r7
new file mode 100644
index 000000000000..fa53b55d7ea7
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/zsnes-1.51-r7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] ) dev-lang/nasm debug? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=SNES (Super Nintendo) emulator that uses x86 assembly
+EAPI=6
+HOMEPAGE=http://www.zsnes.com/ http://ipherswipsite.com/zsnes/
+IUSE=ao custom-cflags +debug opengl pax_kernel png
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] )
+SLOT=0
+SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e9c85e87d34287a1f7ee5a167affc8ab
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index d0c34f3426a9..e21fde0df618 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/urbanterror-4.3.3_p20180218 b/metadata/md5-cache/games-fps/urbanterror-4.3.3_p20180218
deleted file mode 100644
index d80f3739fddc..000000000000
--- a/metadata/md5-cache/games-fps/urbanterror-4.3.3_p20180218
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm pretend
-DEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.3 sys-libs/zlib:=[minizip] virtual/jpeg:0
-DESCRIPTION=Hollywood tactical shooter based on the ioquake3 engine
-EAPI=6
-HOMEPAGE=http://urbanterror.info https://github.com/mickael9/ioq3
-IUSE=+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.3 sys-libs/zlib:=[minizip] virtual/jpeg:0
-REQUIRED_USE=|| ( client server ) voip? ( opus )
-SLOT=0
-SRC_URI=https://github.com/mickael9/ioq3/archive/d93f05de38a6cae60fbf0f073aace64b3adc7aaf.tar.gz -> urbanterror-4.3.3_p20180218.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66f7cae862f4ddabeabb512e0200b855
diff --git a/metadata/md5-cache/games-fps/urbanterror-4.3.3_p20180410 b/metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180627
similarity index 84%
rename from metadata/md5-cache/games-fps/urbanterror-4.3.3_p20180410
rename to metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180627
index feba2a7d6ef0..08ee23e19457 100644
--- a/metadata/md5-cache/games-fps/urbanterror-4.3.3_p20180410
+++ b/metadata/md5-cache/games-fps/urbanterror-4.3.4_p20180627
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm pretend
-DEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.3 sys-libs/zlib:=[minizip] virtual/jpeg:0
+DEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.4 sys-libs/zlib:=[minizip] virtual/jpeg:0
DESCRIPTION=Hollywood tactical shooter based on the ioquake3 engine
EAPI=6
HOMEPAGE=https://urbanterror.info https://github.com/mickael9/ioq3
IUSE=+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.3 sys-libs/zlib:=[minizip] virtual/jpeg:0
+RDEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.4 sys-libs/zlib:=[minizip] virtual/jpeg:0
REQUIRED_USE=|| ( client server ) voip? ( opus )
SLOT=0
-SRC_URI=https://github.com/mickael9/ioq3/archive/d6db4589efd1ff2b7a4fa2983e58993d06098327.tar.gz -> urbanterror-4.3.3_p20180410.tar.gz
+SRC_URI=https://github.com/mickael9/ioq3/archive/e8c941ec8b753b9ecb4f8c4fcec07e4fe3babc64.tar.gz -> urbanterror-4.3.4_p20180627.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7171fcba95b708c4fea0bdac9644b439
+_md5_=79e7cf19aff009c8eb61bec007ad93e8
diff --git a/metadata/md5-cache/games-fps/urbanterror-data-4.3.3 b/metadata/md5-cache/games-fps/urbanterror-data-4.3.4
similarity index 86%
rename from metadata/md5-cache/games-fps/urbanterror-data-4.3.3
rename to metadata/md5-cache/games-fps/urbanterror-data-4.3.4
index 16a82b111dda..688e1ac20db9 100644
--- a/metadata/md5-cache/games-fps/urbanterror-data-4.3.3
+++ b/metadata/md5-cache/games-fps/urbanterror-data-4.3.4
@@ -6,6 +6,6 @@ HOMEPAGE=http://www.urbanterror.info
KEYWORDS=~amd64 ~x86
LICENSE=Q3AEULA-20000111 urbanterror-4.2-maps
SLOT=0
-SRC_URI=https://up.barbatos.fr/urt/UrbanTerror43_full_2.zip -> urbanterror-data-4.3.0.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.0-to-4.3.1.zip -> urbanterror-data-4.3.0-to-4.3.1.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.1-to-4.3.2.zip -> urbanterror-data-4.3.1-to-4.3.2.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.2-to-4.3.3.zip -> urbanterror-data-4.3.2-to-4.3.3.zip
+SRC_URI=https://up.barbatos.fr/urt/UrbanTerror43_full_2.zip -> urbanterror-data-4.3.0.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.0-to-4.3.1.zip -> urbanterror-data-4.3.0-to-4.3.1.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.1-to-4.3.2.zip -> urbanterror-data-4.3.1-to-4.3.2.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.2-to-4.3.3.zip -> urbanterror-data-4.3.2-to-4.3.3.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.3-to-4.3.4.zip -> urbanterror-data-4.3.3-to-4.3.4.zip
_eclasses_=check-reqs fd05cf75484aa28d307cf4ee6e1db056 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=78966198a7d0177aac2105c55318c366
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index ba88f37b3870..755809635ca6 100644
Binary files a/metadata/md5-cache/kde-apps/Manifest.gz and b/metadata/md5-cache/kde-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-apps/kopete-18.04.2 b/metadata/md5-cache/kde-apps/kopete-18.04.2-r1
similarity index 70%
rename from metadata/md5-cache/kde-apps/kopete-18.04.2
rename to metadata/md5-cache/kde-apps/kopete-18.04.2-r1
index 851d0ba906eb..481aaca5cc97 100644
--- a/metadata/md5-cache/kde-apps/kopete-18.04.2
+++ b/metadata/md5-cache/kde-apps/kopete-18.04.2-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0 >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.2:5 ) x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib:= ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.2:5 ) x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.44.0:5 handbook? ( >=kde-frameworks/kdoctools-5.44.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
EAPI=6
HOMEPAGE=https://kopete.kde.org https://www.kde.org/applications/internet/kopete
IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp yahoo zeroconf debug +handbook test
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0 >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn sys-libs/zlib ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.2:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kopete:4 !kde-apps/kde-l10n !=dev-qt/qtcore-5.9.4:5
+RDEPEND=>=kde-frameworks/kcmutils-5.44.0:5 >=kde-frameworks/kconfig-5.44.0:5 >=kde-frameworks/kcrash-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/kcoreaddons-5.44.0:5 >=kde-frameworks/kdbusaddons-5.44.0:5 >=kde-frameworks/kdelibs4support-5.44.0:5 >=kde-frameworks/kemoticons-5.44.0:5 >=kde-frameworks/khtml-5.44.0:5 >=kde-frameworks/ki18n-5.44.0:5 >=kde-frameworks/knotifyconfig-5.44.0:5 >=kde-frameworks/kparts-5.44.0:5 >=kde-frameworks/ktexteditor-5.44.0:5 >=kde-apps/kcontacts-18.04.2:5 >=kde-apps/kidentitymanagement-18.04.2:5 >=kde-apps/libkleo-18.04.2:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 app-crypt/gpgme[cxx,qt5] dev-libs/libpcre media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) jingle? ( dev-libs/expat dev-libs/openssl:0= >=media-libs/mediastreamer-2.3.0 media-libs/speex net-libs/libsrtp:= net-libs/ortp:= ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib:= ) yahoo? ( media-libs/jasper ) zeroconf? ( >=kde-frameworks/kdnssd-5.44.0:5 >=kde-apps/kidentitymanagement-18.04.2:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.44.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kopete:4 !kde-apps/kde-l10n !=dev-qt/qtcore-5.9.4:5
RESTRICT=test
SLOT=5
SRC_URI=mirror://kde/stable/applications/18.04.2/src/kopete-18.04.2.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 37630108e4f125721941b09a9b3f36af kde5-functions 1ef6ad49b6dfedfdb4d566ea3d2790c1 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2ee379934babbaf3377d21352899efa
+_md5_=fe8b89389ee165b37b3d50eddbd95afb
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index e7c31451741b..d70391788727 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.13.2 b/metadata/md5-cache/kde-plasma/kdecoration-5.13.2-r1
similarity index 66%
rename from metadata/md5-cache/kde-plasma/kdecoration-5.13.2
rename to metadata/md5-cache/kde-plasma/kdecoration-5.13.2-r1
index 23d26be3516b..32b96199c780 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.13.2
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.13.2-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=Plugin based library to create window decorations
EAPI=6
HOMEPAGE=https://www.kde.org/
IUSE=test debug test
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
SRC_URI=mirror://kde/stable/plasma/5.13.2/kdecoration-5.13.2.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 37630108e4f125721941b09a9b3f36af kde5-functions 1ef6ad49b6dfedfdb4d566ea3d2790c1 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=788f380fd9a38e6680fa287d99c3bc1c
+_md5_=1f930e6e4a11e943d9c208acbe1d17d0
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index ae652484d04c..f5fb26e43f3f 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/hamlib-3.2 b/metadata/md5-cache/media-libs/hamlib-3.2
index e85fa26239c6..43ce74efc913 100644
--- a/metadata/md5-cache/media-libs/hamlib-3.2
+++ b/metadata/md5-cache/media-libs/hamlib-3.2
@@ -4,7 +4,7 @@ DESCRIPTION=Ham radio backend rig control libraries
EAPI=5
HOMEPAGE=https://www.hamlib.org
IUSE=doc perl python tcl 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
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=~amd64 x86 ~x86-fbsd
LICENSE=LGPL-2 GPL-2
RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) tcl? ( dev-lang/tcl:0= )
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://www.github.com/hamlib/hamlib/releases/download/3.2/hamlib-3.2.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b53612625efab04599ad62877f168a53
+_md5_=308850c711361220752c0e52cedea408
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.8.1 b/metadata/md5-cache/media-libs/harfbuzz-1.8.1
index 23482f4ef1e6..4599f2b8ba2d 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-1.8.1
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=An OpenType text shaping engine
EAPI=6
HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype 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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
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.8.1.tar.bz2
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71e99ae36688fd04e44db0116f567a2e
+_md5_=31fc93f13d468c2c50c2dd2495bafb4a
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 6d6c6ceb5a9e..ca4adb860b63 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1 b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
index 7cbb7c209199..d53eea9d6177 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
+++ b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r1
@@ -1,7 +1,7 @@
DEFINED_PHASES=compile config configure install postinst postrm prepare setup unpack
DEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
DESCRIPTION=VDR Plugin: Web Access To Settings
-EAPI=5
+EAPI=6
HOMEPAGE=http://live.vdr-developer.org
IUSE=pcre ssl ssl
KEYWORDS=amd64 x86
@@ -10,4 +10,4 @@ RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1
SLOT=0
SRC_URI=mirror://gentoo/vdr-live-0.3.0_p20130504.tar.bz2 https://dev.gentoo.org/~hd_brummy/distfiles/vdr-live-0.3.0_p20130504.tar.bz2
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert b5e85f9a834c71d8bd532de477fe4ce2 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vdr-plugin-2 786b4f5aa9f17e2d5cec5e628f462c01
-_md5_=5f4fb8e1a3f1554e4342483e2b5928af
+_md5_=45b3e6442f976463dbff8fa9ad80ec83
diff --git a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r2 b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r2
index 6572ddadbe29..08b84ae4fb4f 100644
--- a/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r2
+++ b/metadata/md5-cache/media-plugins/vdr-live-0.3.0_p20130504-r2
@@ -1,7 +1,7 @@
DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
DEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
DESCRIPTION=VDR Plugin: Web Access To Settings
-EAPI=5
+EAPI=6
HOMEPAGE=http://live.vdr-developer.org
IUSE=pcre ssl ssl
KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1
SLOT=0
SRC_URI=mirror://gentoo/vdr-live-0.3.0_p20130504.tar.bz2 https://dev.gentoo.org/~hd_brummy/distfiles/vdr-live-0.3.0_p20130504.tar.bz2
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert b5e85f9a834c71d8bd532de477fe4ce2 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vdr-plugin-2 786b4f5aa9f17e2d5cec5e628f462c01
-_md5_=960c325b7a93f328e41fe39a19713736
+_md5_=4a4dc7e3d0f8d57cafeede7591aec438
diff --git a/metadata/md5-cache/media-plugins/vdr-live-2.3.1 b/metadata/md5-cache/media-plugins/vdr-live-2.3.1
new file mode 100644
index 000000000000..5557e09230b7
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/vdr-live-2.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
+DEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
+DESCRIPTION=VDR Plugin: Web Access To Settings
+EAPI=6
+HOMEPAGE=http://live.vdr-developer.org
+IUSE=pcre ssl ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-video/vdr >=dev-libs/tntnet-2.2.1[ssl=] >=dev-libs/cxxtools-2.2.1 pcre? ( >=dev-libs/libpcre-8.12[cxx] ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
+SLOT=0
+SRC_URI=https://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/release_2-3-1.tar.bz2
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert b5e85f9a834c71d8bd532de477fe4ce2 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vdr-plugin-2 786b4f5aa9f17e2d5cec5e628f462c01
+_md5_=7331e09dbbca05d03182087bf3e6678f
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index c3e7d73c6981..45167fdb5503 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
diff --git a/metadata/md5-cache/media-radio/fldigi-4.0.16 b/metadata/md5-cache/media-radio/fldigi-4.0.16
index dbfc89e5e8ff..82c2f1d66f4a 100644
--- a/metadata/md5-cache/media-radio/fldigi-4.0.16
+++ b/metadata/md5-cache/media-radio/fldigi-4.0.16
@@ -4,10 +4,10 @@ DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
EAPI=5
HOMEPAGE=http://www.w1hkj.com
IUSE=hamlib nls pulseaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-3
RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl >=media-libs/portaudio-19_pre20071207 hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10
SLOT=0
SRC_URI=mirror://sourceforge/fldigi/fldigi-4.0.16.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=601ebb41c26c9a7b03ae8be831485930
+_md5_=f5d7fbac2c7644a5fb78d9302c2ac192
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.39 b/metadata/md5-cache/media-radio/flrig-1.3.39
index d5204305e56e..7d969c12f194 100644
--- a/metadata/md5-cache/media-radio/flrig-1.3.39
+++ b/metadata/md5-cache/media-radio/flrig-1.3.39
@@ -4,10 +4,10 @@ DESCRIPTION=Transceiver control program for Amateur Radio use
EAPI=5
HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
SLOT=0
SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.39.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a43d7207588bf29a0db799c98ca0e3f
+_md5_=eb7dec43768f610b17d30de5feb60a87
diff --git a/metadata/md5-cache/media-radio/gpredict-2.2.1 b/metadata/md5-cache/media-radio/gpredict-2.2.1
index eb7d42f8ed56..9f21e2e2f17e 100644
--- a/metadata/md5-cache/media-radio/gpredict-2.2.1
+++ b/metadata/md5-cache/media-radio/gpredict-2.2.1
@@ -3,9 +3,9 @@ DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 x11-libs/goocan
DESCRIPTION=Real-time satellite tracking and orbit prediction application
EAPI=6
HOMEPAGE=http://gpredict.oz9aec.net
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=~amd64 ppc x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 x11-libs/goocanvas:2.0 net-misc/curl
SLOT=0
SRC_URI=mirror://sourceforge/gpredict/gpredict-2.2.1.tar.bz2
-_md5_=4b6b902c6fd4b8045f70f2dc58212dfc
+_md5_=22b772298b17fa7e511011b8586fe0ef
diff --git a/metadata/md5-cache/media-radio/svxlink-17.12.2 b/metadata/md5-cache/media-radio/svxlink-17.12.2
index a2aa0eb5baa2..9597d3a52cc1 100644
--- a/metadata/md5-cache/media-radio/svxlink-17.12.2
+++ b/metadata/md5-cache/media-radio/svxlink-17.12.2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/q
DESCRIPTION=Multi Purpose Voice Services System, including Qtel for EchoLink
EAPI=6
HOMEPAGE=http://www.svxlink.org
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-2 LGPL-2.1
RDEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-sound/gsm dev-libs/libgcrypt:0 media-libs/speex media-libs/opus dev-libs/libsigc++:2 dev-libs/popt
SLOT=0
SRC_URI=https://github.com/sm0svx/svxlink/archive/17.12.2.tar.gz -> svxlink-17.12.2.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f6d541354dff5147645434d2445f7e87
+_md5_=482bfdc5be1d618b1a4ba5bfda5c298c
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 1b944bd453d9..13cb392f5ed6 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/kid3-3.6.1 b/metadata/md5-cache/media-sound/kid3-3.6.1
index 506e39ac7744..d2f9291a36cc 100644
--- a/metadata/md5-cache/media-sound/kid3-3.6.1
+++ b/metadata/md5-cache/media-sound/kid3-3.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=Simple tag editor based on Qt
EAPI=6
HOMEPAGE=https://kid3.sourceforge.io/
IUSE=acoustid flac kde mp3 mp4 +taglib vorbis debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-2+
RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !media-sound/kid3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
REQUIRED_USE=flac? ( vorbis )
SLOT=5
SRC_URI=mirror://sourceforge/kid3/kid3-3.6.1.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 37630108e4f125721941b09a9b3f36af kde5-functions 1ef6ad49b6dfedfdb4d566ea3d2790c1 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=abddbff59f90e4166d2d524cdd9b3127
+_md5_=9d2aefddcd1d9c88bd8792e3793d0fb7
diff --git a/metadata/md5-cache/media-sound/pnmixer-0.7.2 b/metadata/md5-cache/media-sound/pnmixer-0.7.2
new file mode 100644
index 000000000000..78bc3fb731e0
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pnmixer-0.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/glib:2 media-libs/alsa-lib x11-libs/gtk+:3 x11-libs/libX11 libnotify? ( x11-libs/libnotify ) virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Volume mixer for the system tray
+EAPI=6
+HOMEPAGE=https://github.com/nicklan/pnmixer
+IUSE=doc libnotify nls
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 media-libs/alsa-lib x11-libs/gtk+:3 x11-libs/libX11 libnotify? ( x11-libs/libnotify )
+SLOT=0
+SRC_URI=https://github.com/nicklan/pnmixer/releases/download/v0.7.2/pnmixer-v0.7.2.tar.gz
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=373c32c061787ac1fd9215b7af47d22a
diff --git a/metadata/md5-cache/media-sound/pulseaudio-11.1-r1 b/metadata/md5-cache/media-sound/pulseaudio-11.1-r1
index df3359e7c3e8..0f7803dff0b1 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-11.1-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-11.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A networked sound server with an advanced plugin system
EAPI=6
HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
IUSE=+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf 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 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )
PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,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(-)?] ) )
RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-libs/libpcre ) >=media-libs/libsndfile-1.0.20[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(-)?] X? ( >=x11-libs/libX11-1.4.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(-)?] >=x11-libs/libxcb-1.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(-)?] x11-libs/libSM[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(-)?] x11-libs/libICE[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(-)?] x11-libs/libXtst[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(-)?] ) caps? ( >=sys-libs/libcap-2.22-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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0: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(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( virtual/jack ) tcpd? ( sys-apps/tcp-wrappers[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(-)?] ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.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(-)?] ) gtk? ( x11-libs/gtk+:3 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-5 >=sys-apps/dbus-1.0.0 media-libs/sbc ) asyncns? ( net-libs/libasyncns[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(-)?] ) udev? ( >=virtual/udev-143[hwdb(+)] ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) media-libs/speexdsp gdbm? ( sys-libs/gdbm:= ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 ) systemd? ( sys-apps/systemd: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(-)?] ) dev-libs/libltdl:0 selinux? ( sec-policy/selinux-pulseaudio ) equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) ) system-wide? ( alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-5 ) )
@@ -12,4 +12,4 @@ REQUIRED_USE=bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth
SLOT=0
SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-11.1.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=871698d3efff70f3ed888b475ec3946e
+_md5_=173032e1e1f95deaf2d82ef296290f51
diff --git a/metadata/md5-cache/media-sound/sox-14.4.2-r1 b/metadata/md5-cache/media-sound/sox-14.4.2-r1
index 7b6482f931be..55e312c8dbab 100644
--- a/metadata/md5-cache/media-sound/sox-14.4.2-r1
+++ b/metadata/md5-cache/media-sound/sox-14.4.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The swiss army knife of sound processing programs
EAPI=6
HOMEPAGE=http://sox.sourceforge.net
IUSE=alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
LICENSE=LGPL-2.1
RDEPEND=dev-libs/libltdl:0= >=media-sound/gsm-1.0.12-r1 alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ao? ( media-libs/libao ) encode? ( >=media-sound/lame-3.98.4 ) flac? ( >=media-libs/flac-1.1.3 ) id3tag? ( media-libs/libid3tag ) ladspa? ( media-libs/ladspa-sdk ) mad? ( media-libs/libmad ) ogg? ( media-libs/libogg media-libs/libvorbis ) opus? ( media-libs/opus media-libs/opusfile ) png? ( media-libs/libpng:0= sys-libs/zlib ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.11 ) twolame? ( media-sound/twolame ) wavpack? ( media-sound/wavpack )
SLOT=0
SRC_URI=mirror://sourceforge/sox/sox-14.4.2.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b008bb13a8e89291ddddc2f90fde69fb
+_md5_=b19433120391b09c6e8db58844b393eb
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 7815d8409ed2..cc7cdffbb9a6 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index 01e00855acaa..4c875424d8f6 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=python_targets_python2_7 gbm? ( gles ) || ( gles opengl ) ^^ ( gbm
SLOT=0
SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.1-Leia-Alpha-1.tar.gz -> libdvdcss-1.4.1-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-1.tar.gz -> libdvdread-6.0.0-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-1.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-1.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.1-Leia-Alpha3-1.tar.gz -> ffmpeg-kodi-4.0.1-Leia-Alpha3-1.tar.gz )
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b libtool 0081a71a261724730ec4c248494f044d linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e80ee522c40078f6d5e44deabf38a922
+_md5_=2c84ba0615e8439b8b9e75329e217bde
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.13.2 b/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1
similarity index 97%
rename from metadata/md5-cache/media-tv/plex-media-server-1.13.2
rename to metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1
index 5d3b53f50358..7055095d1201 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.13.2
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1
@@ -12,4 +12,4 @@ RESTRICT=bindist strip
SLOT=0
SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.13.2.5154-fd05be322/plexmediaserver_1.13.2.5154-fd05be322_amd64.deb )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=081c2496bb449d64229bf72bf2eca68a
+_md5_=82cacdd653d4fefaa5bb13c675fa728d
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 6bf3b23b1e45..c3d87210ed6e 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_linux_bonding-1.4 b/metadata/md5-cache/net-analyzer/nagios-check_linux_bonding-1.4
index f303364be874..3e6cca563945 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_linux_bonding-1.4
+++ b/metadata/md5-cache/net-analyzer/nagios-check_linux_bonding-1.4
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl
DESCRIPTION=Nagios plugin to monitor bonding status of network interfaces
EAPI=5
HOMEPAGE=http://folk.uio.no/trondham/software/check_linux_bonding.html
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-3
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=http://folk.uio.no/trondham/software/files/check_linux_bonding-1.4.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=d3dd7f4f442e37113b864c50dffd352b
+_md5_=4039969ec050b2d7a8076fc6fc197174
diff --git a/metadata/md5-cache/net-analyzer/sarg-2.3.11-r1 b/metadata/md5-cache/net-analyzer/sarg-2.3.11-r1
index 468805242c48..cb7d93e42dde 100644
--- a/metadata/md5-cache/net-analyzer/sarg-2.3.11-r1
+++ b/metadata/md5-cache/net-analyzer/sarg-2.3.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Squid Analysis Report Generator
EAPI=6
HOMEPAGE=http://sarg.sourceforge.net/
IUSE=+gd ldap pcre
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=gd? ( media-libs/gd[png,truetype] ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre )
SLOT=0
SRC_URI=mirror://sourceforge/sarg/sarg-2.3.11.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=d64aec029b57924a2c76ac7e9c570aa8
+_md5_=864c448447dcbc163cd423471e5e7fcb
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.14 b/metadata/md5-cache/net-analyzer/zabbix-3.0.14
deleted file mode 100644
index b7f522dacb52..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.0.14.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 webapp 6ae2395d7f341093c36057cb4f69101a
-_md5_=d017eff3e65733035a378f01fa009472
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.17 b/metadata/md5-cache/net-analyzer/zabbix-3.0.17
deleted file mode 100644
index df73e7ac188e..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.0.17.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 webapp 6ae2395d7f341093c36057cb4f69101a
-_md5_=f28af2e5f7118902ec993e88c63c78f8
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.18 b/metadata/md5-cache/net-analyzer/zabbix-3.0.19
similarity index 98%
rename from metadata/md5-cache/net-analyzer/zabbix-3.0.18
rename to metadata/md5-cache/net-analyzer/zabbix-3.0.19
index b0f0861cd711..4cd28fbb84c0 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.18
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.0.19
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.0.18.tar.gz
+SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.0.19.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 webapp 6ae2395d7f341093c36057cb4f69101a
_md5_=f28af2e5f7118902ec993e88c63c78f8
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.10 b/metadata/md5-cache/net-analyzer/zabbix-3.2.10
deleted file mode 100644
index af6b7042a74a..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.2.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.2.10.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 webapp 6ae2395d7f341093c36057cb4f69101a
-_md5_=19f7292023cc7bba28a0817cdbbc7b62
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.9 b/metadata/md5-cache/net-analyzer/zabbix-3.2.9
deleted file mode 100644
index d24798df3aea..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.2.9.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 webapp 6ae2395d7f341093c36057cb4f69101a
-_md5_=19f7292023cc7bba28a0817cdbbc7b62
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.9 b/metadata/md5-cache/net-analyzer/zabbix-3.4.11
similarity index 97%
rename from metadata/md5-cache/net-analyzer/zabbix-3.4.9
rename to metadata/md5-cache/net-analyzer/zabbix-3.4.11
index 625cdd68ec53..89d50f11be5e 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.9
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.4.11
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.9.tar.gz
+SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.11.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 webapp 6ae2395d7f341093c36057cb4f69101a
_md5_=9acf0f7d74ccdec6e0f5d90dcf49c142
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.5 b/metadata/md5-cache/net-analyzer/zabbix-3.4.5
deleted file mode 100644
index 51ce87b47afe..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.5.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 webapp 6ae2395d7f341093c36057cb4f69101a
-_md5_=1ec160ea1ea06413abe3948c156ff6ba
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.6 b/metadata/md5-cache/net-analyzer/zabbix-3.4.6
deleted file mode 100644
index 46f5070b885e..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.6.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 webapp 6ae2395d7f341093c36057cb4f69101a
-_md5_=1ec160ea1ea06413abe3948c156ff6ba
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.7 b/metadata/md5-cache/net-analyzer/zabbix-3.4.7
deleted file mode 100644
index a0070d225cb2..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.7.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 webapp 6ae2395d7f341093c36057cb4f69101a
-_md5_=1ec160ea1ea06413abe3948c156ff6ba
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.8 b/metadata/md5-cache/net-analyzer/zabbix-3.4.8
deleted file mode 100644
index a9540eab7a74..000000000000
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
-DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
-EAPI=6
-HOMEPAGE=https://www.zabbix.com/
-IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
-SLOT=0
-SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.8.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 webapp 6ae2395d7f341093c36057cb4f69101a
-_md5_=1ec160ea1ea06413abe3948c156ff6ba
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index b24d1ba4ecb9..d981fd90c89d 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.7-r6 b/metadata/md5-cache/net-dialup/ppp-2.4.7-r6
index 719af8591b22..fe78c62bb9a1 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.7-r6
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.7-r6
@@ -4,11 +4,11 @@ DESCRIPTION=Point-to-Point Protocol (PPP)
EAPI=6
HOMEPAGE=https://ppp.samba.org/
IUSE=activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
LICENSE=BSD GPL-2
PDEPEND=net-dialup/ppp-scripts
RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
SLOT=0/2.4.7
SRC_URI=https://download.samba.org/pub/ppp/ppp-2.4.7.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.7-patches-6.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ccad6d0b02fa01827a27a88eab2b8064
+_md5_=c5a47cbc85b8322bf4f4e45ee73a8106
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 16180cc11f2b..a64dd5b8ca3c 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/libidn-1.33-r99 b/metadata/md5-cache/net-dns/libidn-1.33-r99
new file mode 100644
index 000000000000..7f3e2f47c4fb
--- /dev/null
+++ b/metadata/md5-cache/net-dns/libidn-1.33-r99
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Internationalized Domain Names (IDN) implementation
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libidn/
+IUSE=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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 GPL-3 LGPL-3
+RDEPEND=!=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Client library for accessing NFS shares over a network
-EAPI=5
-HOMEPAGE=https://github.com/sahlberg/libnfs
-IUSE=examples static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86
-LICENSE=LGPL-2.1 GPL-3
-SLOT=0/8
-SRC_URI=https://github.com/sahlberg/libnfs/archive/libnfs-1.10.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a62f695c8929539c23c012b583a502c
diff --git a/metadata/md5-cache/net-fs/libnfs-1.11.0 b/metadata/md5-cache/net-fs/libnfs-1.11.0
deleted file mode 100644
index 48cc9d323c5e..000000000000
--- a/metadata/md5-cache/net-fs/libnfs-1.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Client library for accessing NFS shares over a network
-EAPI=5
-HOMEPAGE=https://github.com/sahlberg/libnfs
-IUSE=examples static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86
-LICENSE=LGPL-2.1 GPL-3
-SLOT=0/8
-SRC_URI=https://github.com/sahlberg/libnfs/archive/libnfs-1.11.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a62f695c8929539c23c012b583a502c
diff --git a/metadata/md5-cache/net-fs/libnfs-1.9.5 b/metadata/md5-cache/net-fs/libnfs-1.9.5
deleted file mode 100644
index e52c04635727..000000000000
--- a/metadata/md5-cache/net-fs/libnfs-1.9.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Client library for accessing NFS shares over a network
-EAPI=5
-HOMEPAGE=https://github.com/sahlberg/libnfs
-IUSE=examples static-libs
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 x86
-LICENSE=LGPL-2.1 GPL-3
-SLOT=0
-SRC_URI=https://github.com/sahlberg/libnfs/archive/libnfs-1.9.5.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a20b585beb1fff153917567896f4532
diff --git a/metadata/md5-cache/net-fs/libnfs-1.9.8 b/metadata/md5-cache/net-fs/libnfs-1.9.8
deleted file mode 100644
index 175fb5e1dd79..000000000000
--- a/metadata/md5-cache/net-fs/libnfs-1.9.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Client library for accessing NFS shares over a network
-EAPI=5
-HOMEPAGE=https://github.com/sahlberg/libnfs
-IUSE=examples static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86
-LICENSE=LGPL-2.1 GPL-3
-SLOT=0/8
-SRC_URI=https://github.com/sahlberg/libnfs/archive/libnfs-1.9.8.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a62f695c8929539c23c012b583a502c
diff --git a/metadata/md5-cache/net-fs/libnfs-3.0.0 b/metadata/md5-cache/net-fs/libnfs-3.0.0
new file mode 100644
index 000000000000..bf96f83d8403
--- /dev/null
+++ b/metadata/md5-cache/net-fs/libnfs-3.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Client library for accessing NFS shares over a network
+EAPI=6
+HOMEPAGE=https://github.com/sahlberg/libnfs
+IUSE=examples static-libs utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86
+LICENSE=LGPL-2.1 GPL-3
+SLOT=0/12
+SRC_URI=https://github.com/sahlberg/libnfs/archive/libnfs-3.0.0.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=3eb359450edf453f36233516570e67a0
diff --git a/metadata/md5-cache/net-fs/libnfs-9999 b/metadata/md5-cache/net-fs/libnfs-9999
index 9bcc3c1722a5..fff2ab2dc074 100644
--- a/metadata/md5-cache/net-fs/libnfs-9999
+++ b/metadata/md5-cache/net-fs/libnfs-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile configure install prepare test unpack
+DEFINED_PHASES=configure install prepare unpack
DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Client library for accessing NFS shares over a network
-EAPI=5
+EAPI=6
HOMEPAGE=https://github.com/sahlberg/libnfs
-IUSE=examples static-libs
+IUSE=examples static-libs utils
LICENSE=LGPL-2.1 GPL-3
-SLOT=0/11
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc git-r3 8f6de46b0aa318aea0e8cac62ece098b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d0eed21e79510467c96545fa914790c2
+SLOT=0/12
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 git-r3 8f6de46b0aa318aea0e8cac62ece098b libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=3eb359450edf453f36233516570e67a0
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 397e66804771..7333d58f6a75 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/konversation-1.7.4-r1 b/metadata/md5-cache/net-irc/konversation-1.7.4-r1
deleted file mode 100644
index f18f3c9dc9fa..000000000000
--- a/metadata/md5-cache/net-irc/konversation-1.7.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/gettext crypt? ( app-crypt/qca:2[qt5(+)] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=A user friendly IRC Client
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/konversation/ https://konversation.kde.org
-IUSE=+crypt debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/gettext crypt? ( app-crypt/qca:2[qt5(+)] ) !net-irc/konversation:4 crypt? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/konversation/1.7.4/src/konversation-1.7.4.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 37630108e4f125721941b09a9b3f36af kde5-functions 1ef6ad49b6dfedfdb4d566ea3d2790c1 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=60de5e554f329965f3e3c1975728d591
diff --git a/metadata/md5-cache/net-irc/konversation-1.7.5 b/metadata/md5-cache/net-irc/konversation-1.7.5
index 32f44ce9b10d..147141f8ac57 100644
--- a/metadata/md5-cache/net-irc/konversation-1.7.5
+++ b/metadata/md5-cache/net-irc/konversation-1.7.5
@@ -4,10 +4,10 @@ DESCRIPTION=A user friendly IRC Client
EAPI=6
HOMEPAGE=https://www.kde.org/applications/internet/konversation/ https://konversation.kde.org
IUSE=+crypt debug +handbook
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-libs/phonon[qt5(+)] sys-devel/gettext crypt? ( app-crypt/qca:2[qt5(+)] ) !net-irc/konversation:4 crypt? ( app-crypt/qca:2[ssl] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
SLOT=5
SRC_URI=mirror://kde/stable/konversation/1.7.5/src/konversation-1.7.5.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 37630108e4f125721941b09a9b3f36af kde5-functions 1ef6ad49b6dfedfdb4d566ea3d2790c1 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e57f5a524105851815f54e6161651fdb
+_md5_=e1ec4a72075f2560df4e023f6d39b596
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index fd61d676f28f..acc684d6529b 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libtrace-4.0.3 b/metadata/md5-cache/net-libs/libtrace-4.0.3
index 46ff509015ac..11d9bfcfb840 100644
--- a/metadata/md5-cache/net-libs/libtrace-4.0.3
+++ b/metadata/md5-cache/net-libs/libtrace-4.0.3
@@ -5,9 +5,9 @@ EAPI=6
HOMEPAGE=http://research.wand.net.nz/software/libtrace.php
IUSE=doc ncurses numa static-libs
KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=LGPL-3
RDEPEND=>=net-libs/libpcap-0.8 dev-libs/openssl:0= ncurses? ( sys-libs/ncurses:0= ) net-libs/wandio numa? ( sys-process/numactl )
SLOT=0
SRC_URI=http://research.wand.net.nz/software/libtrace/libtrace-4.0.3.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=50c96ce44813f4a3818d94a5f99e549d
+_md5_=5141d9308dba12eccfff1fafab70c189
diff --git a/metadata/md5-cache/net-libs/libtrace-4.0.2 b/metadata/md5-cache/net-libs/libtrace-4.0.4
similarity index 95%
rename from metadata/md5-cache/net-libs/libtrace-4.0.2
rename to metadata/md5-cache/net-libs/libtrace-4.0.4
index 80e2d41d0563..20b7a16f96b4 100644
--- a/metadata/md5-cache/net-libs/libtrace-4.0.2
+++ b/metadata/md5-cache/net-libs/libtrace-4.0.4
@@ -5,9 +5,9 @@ EAPI=6
HOMEPAGE=http://research.wand.net.nz/software/libtrace.php
IUSE=doc ncurses numa static-libs
KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=LGPL-3
RDEPEND=>=net-libs/libpcap-0.8 dev-libs/openssl:0= ncurses? ( sys-libs/ncurses:0= ) net-libs/wandio numa? ( sys-process/numactl )
SLOT=0
-SRC_URI=http://research.wand.net.nz/software/libtrace/libtrace-4.0.2.tar.gz
+SRC_URI=http://research.wand.net.nz/software/libtrace/libtrace-4.0.4.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b7cb995c297b8b48ebd4c26f52a1bf3f
+_md5_=5141d9308dba12eccfff1fafab70c189
diff --git a/metadata/md5-cache/net-libs/nodejs-10.4.1 b/metadata/md5-cache/net-libs/nodejs-10.6.0
similarity index 88%
rename from metadata/md5-cache/net-libs/nodejs-10.4.1
rename to metadata/md5-cache/net-libs/nodejs-10.6.0
index 8dc13d03a1a8..d05380eb0d4c 100644
--- a/metadata/md5-cache/net-libs/nodejs-10.4.1
+++ b/metadata/md5-cache/net-libs/nodejs-10.6.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.20.3:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DEPEND=>=dev-libs/libuv-1.21.0:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
EAPI=6
HOMEPAGE=https://nodejs.org/
IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.20.3:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
+RDEPEND=>=dev-libs/libuv-1.21.0:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
SLOT=0
-SRC_URI=https://nodejs.org/dist/v10.4.1/node-v10.4.1.tar.xz
+SRC_URI=https://nodejs.org/dist/v10.6.0/node-v10.6.0.tar.xz
_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=874aae4600392f391dcaa49bbc238dd6
+_md5_=752d22d3c182337e01754e2daf5ca5fc
diff --git a/metadata/md5-cache/net-libs/wandio-1.0.5 b/metadata/md5-cache/net-libs/wandio-1.0.5
index c2562053263d..8d313ffb1be7 100644
--- a/metadata/md5-cache/net-libs/wandio-1.0.5
+++ b/metadata/md5-cache/net-libs/wandio-1.0.5
@@ -5,8 +5,8 @@ EAPI=6
HOMEPAGE=https://research.wand.net.nz/software/libwandio.php
IUSE=bzip2 http lzma lzo static-libs zlib
KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=LGPL-3
RDEPEND=!=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux dev-libs/openssl:0= sys-apps/lsb-release
-DESCRIPTION=MiniUPnP IGD Daemon
-EAPI=6
-HOMEPAGE=http://miniupnp.free.fr/
-IUSE=+leasefile igd2 ipv6 pcp-peer portinuse strict
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux dev-libs/openssl:0=
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.0.20180410.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=347d4254f733ab1583c67e072ef51faf
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.0.20180422 b/metadata/md5-cache/net-misc/miniupnpd-2.1.20180706
similarity index 91%
rename from metadata/md5-cache/net-misc/miniupnpd-2.0.20180422
rename to metadata/md5-cache/net-misc/miniupnpd-2.1.20180706
index af38650b77c2..f2eb49d93208 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-2.0.20180422
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.1.20180706
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=BSD
RDEPEND=>=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= dev-libs/gmp:0= sys-apps/util-linux dev-libs/openssl:0=
SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.0.20180422.tar.gz
+SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.1.20180706.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
_md5_=347d4254f733ab1583c67e072ef51faf
diff --git a/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2 b/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2
index c222c8545a21..7e08b8c58ce5 100644
--- a/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2
+++ b/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2
@@ -1,10 +1,10 @@
DEFINED_PHASES=install unpack
DESCRIPTION=tool to reliably distribute binary data using UDP broadcasting techniques
EAPI=0
-HOMEPAGE=http://www.wudika.de/~jan/netpipe/
+HOMEPAGE=https://www.wudika.de/~jan/netpipe/
KEYWORDS=ppc x86
LICENSE=GPL-2
SLOT=0
-SRC_URI=http://www.wudika.de/~jan/netpipe/netpipe.tar.gz
+SRC_URI=https://www.wudika.de/~jan/netpipe/netpipe.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=6ebc50b85c84f4f45032bda315eedeeb
+_md5_=e816bcbba5dbe4319d9ffdc1618b1c59
diff --git a/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r1 b/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r1
index b9317f13fe92..56092a4de5c7 100644
--- a/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r1
+++ b/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r1
@@ -1,10 +1,10 @@
DEFINED_PHASES=install unpack
DESCRIPTION=tool to reliably distribute binary data using UDP broadcasting techniques
EAPI=0
-HOMEPAGE=http://www.wudika.de/~jan/netpipe/
+HOMEPAGE=https://www.wudika.de/~jan/netpipe/
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
-SRC_URI=http://www.wudika.de/~jan/netpipe/netpipe.tar.gz
+SRC_URI=https://www.wudika.de/~jan/netpipe/netpipe.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e82b446447b6486617b713564f77a6a7
+_md5_=b2ea6a2d1021f49dea0ca2191e6e719f
diff --git a/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r2 b/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r2
new file mode 100644
index 000000000000..004cc4742426
--- /dev/null
+++ b/metadata/md5-cache/net-misc/netpipe-1.0.0_beta2-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=tool to reliably distribute binary data using UDP broadcasting techniques
+EAPI=7
+HOMEPAGE=https://www.wudika.de/~jan/netpipe/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://www.wudika.de/~jan/netpipe/netpipe.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=a1d80405bf71f0910846132704efbe11
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.10.10 b/metadata/md5-cache/net-misc/networkmanager-1.10.10
index e6d0c1a6e5d5..fc723a16b042 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.10.10
+++ b/metadata/md5-cache/net-misc/networkmanager-1.10.10
@@ -4,11 +4,11 @@ DESCRIPTION=A set of co-operative tools that make networking simple and straight
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
IUSE=audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2+
RDEPEND=>=sys-apps/dbus-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(-)?] >=dev-libs/dbus-glib-0.100[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-libs/glib-2.37.6: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(-)?] >=dev-libs/libnl-3.2.8:3=[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(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[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(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[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(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[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(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) gnutls? ( dev-libs/libgcrypt: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(-)?] >=net-libs/gnutls-2.12:=[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-0.10.3:= ) json? ( dev-libs/jansson[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(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[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(-)?] ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
REQUIRED_USE=modemmanager? ( ppp ) vala? ( introspection ) wext? ( wifi ) ^^ ( nss gnutls ) ?? ( consolekit elogind systemd )
SLOT=0
SRC_URI=mirror://gnome/sources/NetworkManager/1.10/NetworkManager-1.10.10.tar.xz
_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 user 8bc2845510e2109af75e3eeac607ec81 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf308bac9807d6e7d13d274733897153
+_md5_=937e5f729a2337f420b7faf614a33230
diff --git a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.4 b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.4
index a277265803a3..1f744cca96d3 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.4
+++ b/metadata/md5-cache/net-misc/networkmanager-openvpn-1.8.4
@@ -4,10 +4,10 @@ DESCRIPTION=NetworkManager OpenVPN plugin
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
IUSE=gtk test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
LICENSE=GPL-2+
RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=gnome-extra/nm-applet-1.7.0 >=x11-libs/gtk+-3.4:3 )
SLOT=0
SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.4.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=31ab6a331ed741592c8f38edbda7fb80
+_md5_=8106c2ceceb9e5e807a18303214e6be4
diff --git a/metadata/md5-cache/net-misc/snarf-7.0-r3 b/metadata/md5-cache/net-misc/snarf-7.0-r3
index f9670e57c4c0..3d2e605772f5 100644
--- a/metadata/md5-cache/net-misc/snarf-7.0-r3
+++ b/metadata/md5-cache/net-misc/snarf-7.0-r3
@@ -1,10 +1,10 @@
DEFINED_PHASES=install postinst unpack
DESCRIPTION=Small and fast CLI resource grabber for http, gopher, finger, ftp
EAPI=0
-HOMEPAGE=http://www.xach.com/snarf/
+HOMEPAGE=https://www.xach.com/snarf/
KEYWORDS=alpha amd64 ppc sparc x86
LICENSE=GPL-2
SLOT=0
-SRC_URI=http://www.xach.com/snarf/snarf-7.0.tar.gz
+SRC_URI=https://www.xach.com/snarf/snarf-7.0.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=51262f9727ce0384f9338171d5bd386f
+_md5_=f498f1ecea8b6f751611cfb9ece9b93e
diff --git a/metadata/md5-cache/net-misc/snarf-7.0-r4 b/metadata/md5-cache/net-misc/snarf-7.0-r4
new file mode 100644
index 000000000000..3a91233579e5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/snarf-7.0-r4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Small and fast CLI resource grabber for http, gopher, finger, ftp
+EAPI=7
+HOMEPAGE=https://www.xach.com/snarf/
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://www.xach.com/snarf/snarf-7.0.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=6d72bf161292905e2a203ba3c2542ea0
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.1.2.1 b/metadata/md5-cache/net-misc/x2goclient-4.1.2.1
index 47d3ee018164..6b6318f7a480 100644
--- a/metadata/md5-cache/net-misc/x2goclient-4.1.2.1
+++ b/metadata/md5-cache/net-misc/x2goclient-4.1.2.1
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 de
SLOT=0
SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=71ab0b57fee2cde0a0d30f580534f15d
+_md5_=c0d42ca2702cc7dbc283a3830c92da98
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 5419b99c051c..4e89eea15e3c 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/tinc-1.1_pre15 b/metadata/md5-cache/net-vpn/tinc-1.1_pre15
index feb4372e35bb..e57acba37bb1 100644
--- a/metadata/md5-cache/net-vpn/tinc-1.1_pre15
+++ b/metadata/md5-cache/net-vpn/tinc-1.1_pre15
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.1pre15.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c3ee4b901cc3215c3152cdbd413b6c2a
+_md5_=967fe01d3aad72f43d0d71faddc2559c
diff --git a/metadata/md5-cache/net-vpn/tinc-1.1_pre16 b/metadata/md5-cache/net-vpn/tinc-1.1_pre16
new file mode 100644
index 000000000000..22ea99e49a8c
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tinc-1.1_pre16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+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_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(+)] gui? ( dev-python/wxpython:3.0[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(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=tinc is an easy to configure VPN implementation
+EAPI=6
+HOMEPAGE=http://www.tinc-vpn.org/
+IUSE=+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=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_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(+)] gui? ( dev-python/wxpython:3.0[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(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.1pre16.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=7fcb15236171ff6682098756f246ead6
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 63a0dcf22f5a..7f7bd062802d 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.6-r1 b/metadata/md5-cache/net-wireless/hostapd-2.6-r1
deleted file mode 100644
index 85b613e7403c..000000000000
--- a/metadata/md5-cache/net-wireless/hostapd-2.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=ssl? ( dev-libs/openssl:*[-bindist] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 ) virtual/pkgconfig
-DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon
-EAPI=6
-HOMEPAGE=http://hostap.epitest.fi
-IUSE=ipv6 logwatch netlink sqlite +ssl +wps +crda
-KEYWORDS=amd64 ~arm ~mips ppc x86
-LICENSE=BSD
-RDEPEND=ssl? ( dev-libs/openssl:*[-bindist] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
-SLOT=0
-SRC_URI=http://hostap.epitest.fi/releases/hostapd-2.6.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fffa3e7abdb19a1b4df1ef9bd16c4ff8
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.6-r4 b/metadata/md5-cache/net-wireless/hostapd-2.6-r4
index ef8639bd81a2..c07765404936 100644
--- a/metadata/md5-cache/net-wireless/hostapd-2.6-r4
+++ b/metadata/md5-cache/net-wireless/hostapd-2.6-r4
@@ -10,4 +10,4 @@ RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs
SLOT=0
SRC_URI=http://hostap.epitest.fi/releases/hostapd-2.6.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24559b8c4a82ae98e6211e4819f100e2
+_md5_=978f23404ca3c673b10cdbdd1a1ce340
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.6-r5 b/metadata/md5-cache/net-wireless/hostapd-2.6-r5
index 0be3fc522e13..ff5e0d632bfd 100644
--- a/metadata/md5-cache/net-wireless/hostapd-2.6-r5
+++ b/metadata/md5-cache/net-wireless/hostapd-2.6-r5
@@ -10,4 +10,4 @@ RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs
SLOT=0
SRC_URI=http://w1.fi/releases/hostapd-2.6.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.6-r5_extras.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aba5d07dcda9154b7d6d514b85ae47c4
+_md5_=21b8b1d2800197c0a0f4d40afbfef986
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.6-r6 b/metadata/md5-cache/net-wireless/hostapd-2.6-r6
new file mode 100644
index 000000000000..79c7206e0cd9
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/hostapd-2.6-r6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend
+DEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 ) virtual/pkgconfig
+DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon
+EAPI=6
+HOMEPAGE=http://w1.fi
+IUSE=internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda savedconfig
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86
+LICENSE=BSD
+RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
+SLOT=0
+SRC_URI=http://w1.fi/releases/hostapd-2.6.tar.gz https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.6-r6_extras.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=662b92e77707fc6ca6676b8833eda057
diff --git a/metadata/md5-cache/net-wireless/hostapd-9999 b/metadata/md5-cache/net-wireless/hostapd-9999
index 034c82351cb6..84ff0f0d6a9b 100644
--- a/metadata/md5-cache/net-wireless/hostapd-9999
+++ b/metadata/md5-cache/net-wireless/hostapd-9999
@@ -9,4 +9,4 @@ RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs
SLOT=0
SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.6-r5_extras.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4bbcdef15c9a046fa34a01d61482a673
+_md5_=7670b756ff37ed4b184e7714d3716e6b
diff --git a/metadata/md5-cache/net-wireless/linssid-3.5-r1 b/metadata/md5-cache/net-wireless/linssid-3.5-r1
deleted file mode 100644
index 2f1c9d416ad7..000000000000
--- a/metadata/md5-cache/net-wireless/linssid-3.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/qwt:6[opengl,qt5(+),svg]
-DESCRIPTION=Graphical wireless scanning for Linux
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/linssid/
-IUSE=policykit
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=net-wireless/iw x11-libs/libxkbcommon[X] policykit? ( sys-auth/polkit ) !policykit? ( app-admin/sudo x11-libs/gksu ) dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/qwt:6[opengl,qt5(+),svg]
-SLOT=0
-SRC_URI=mirror://sourceforge/linssid/linssid_3.5.orig.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab217c1fb933632986ee11e0559156ed
diff --git a/metadata/md5-cache/net-wireless/linssid-3.6 b/metadata/md5-cache/net-wireless/linssid-3.6
index e5a16a77dac5..eeacabf41cc6 100644
--- a/metadata/md5-cache/net-wireless/linssid-3.6
+++ b/metadata/md5-cache/net-wireless/linssid-3.6
@@ -10,4 +10,4 @@ RDEPEND=net-wireless/iw x11-libs/libxkbcommon[X] policykit? ( sys-auth/polkit )
SLOT=0
SRC_URI=mirror://sourceforge/linssid/linssid_3.6.orig.tar.gz
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab217c1fb933632986ee11e0559156ed
+_md5_=b88bf840143e15521b99cb2e119b0e3c
diff --git a/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
index 76b616639460..aaccf5c83df8 100644
--- a/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
+++ b/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
SLOT=0
SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/lorcon-0.0_p20150109.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f8f4b9b13d1ff5fa8a190b79b1b0e7af
+_md5_=106b33fcddb470284544dbd3b9b7626f
diff --git a/metadata/md5-cache/net-wireless/lorcon-0.0_p20180409-r1 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20180409-r1
new file mode 100644
index 000000000000..52705393f4ad
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/lorcon-0.0_p20180409-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python? ( 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-libs/libnl:3= net-libs/libpcap
+DESCRIPTION=A generic library for injecting 802.11 frames
+EAPI=6
+HOMEPAGE=https://github.com/kismetwireless/lorcon
+IUSE=python python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python? ( 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-libs/libnl:3= net-libs/libpcap
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+SLOT=0
+SRC_URI=https://github.com/kismetwireless/lorcon/archive/d8637792f2e857f31849f29759c1022eb0518c83.tar.gz -> lorcon-0.0_p20180409.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f00c76f34a7c5ef5a0cbee9dacc07477
diff --git a/metadata/md5-cache/net-wireless/lorcon-9999 b/metadata/md5-cache/net-wireless/lorcon-9999
index 33d58052b31e..9bf2e57c02a1 100644
--- a/metadata/md5-cache/net-wireless/lorcon-9999
+++ b/metadata/md5-cache/net-wireless/lorcon-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=python? ( 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-libs/libnl:3= net-libs/libpcap >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=A generic library for injecting 802.11 frames
-EAPI=5
-HOMEPAGE=http://802.11ninja.net/lorcon
+EAPI=6
+HOMEPAGE=https://github.com/kismetwireless/lorcon
IUSE=python python_targets_python2_7
LICENSE=GPL-2
RDEPEND=python? ( 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-libs/libnl:3= net-libs/libpcap
REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8b3a65f18bb1557b74d22a26a196cf35
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 git-r3 8f6de46b0aa318aea0e8cac62ece098b multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f00c76f34a7c5ef5a0cbee9dacc07477
diff --git a/metadata/md5-cache/perl-core/Archive-Tar-2.300.0 b/metadata/md5-cache/perl-core/Archive-Tar-2.300.0
new file mode 100644
index 000000000000..6f403607b210
--- /dev/null
+++ b/metadata/md5-cache/perl-core/Archive-Tar-2.300.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Harness-2.260.0 virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=A Perl module for creation and manipulation of tar files
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Archive-Tar/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=virtual/perl-File-Spec-0.820.0 >=virtual/perl-IO-Compress-2.15.0 >=virtual/perl-IO-Zlib-1.10.0 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.30.tar.gz
+_eclasses_=alternatives 6c575717515f030736d1b718d507d2f9 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
+_md5_=20b9f102ed7e9fa5f39bc44f59193e4c
diff --git a/metadata/md5-cache/perl-core/Manifest.gz b/metadata/md5-cache/perl-core/Manifest.gz
index aa6f2ce6a450..11695945056e 100644
Binary files a/metadata/md5-cache/perl-core/Manifest.gz and b/metadata/md5-cache/perl-core/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 16eaf1e10452..587839a8091d 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/cfitsio-3.410 b/metadata/md5-cache/sci-libs/cfitsio-3.410
index 663c71146c11..eee2b7b2db19 100644
--- a/metadata/md5-cache/sci-libs/cfitsio-3.410
+++ b/metadata/md5-cache/sci-libs/cfitsio-3.410
@@ -4,10 +4,10 @@ DESCRIPTION=C and Fortran library for manipulating FITS files
EAPI=6
HOMEPAGE=https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
IUSE=bzip2 doc examples fortran static-libs +tools threads 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 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
LICENSE=MIT
RDEPEND=sys-libs/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(-)?] bzip2? ( app-arch/bzip2[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(-)?] ) fortran? ( virtual/fortran )
SLOT=0/5
SRC_URI=https://dev.gentoo.org/~bicatali/distfiles/cfitsio-3.410.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc fortran-2 9e7f20c99213f0627ff7f873d4aaa25d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6be50d455248371dcaafa8e522f4b0c1
+_md5_=13df48163a2ab39f82fcb21243d71937
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index f194e3f99c95..e0e8e9519c1b 100644
Binary files a/metadata/md5-cache/sci-physics/Manifest.gz and b/metadata/md5-cache/sci-physics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-physics/root-5.34.36 b/metadata/md5-cache/sci-physics/root-5.34.36
deleted file mode 100644
index ffd61b80438a..000000000000
--- a/metadata/md5-cache/sci-physics/root-5.34.36
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=app-arch/xz-utils:0= >=dev-lang/cfortran-4.4-r2 dev-libs/libpcre:3= media-fonts/dejavu media-libs/freetype:2= media-libs/libpng:0= sys-libs/zlib:0= X? ( media-libs/ftgl:0= media-libs/glew:0= x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXpm:0= || ( media-libs/libafterimage[gif,jpeg,png,tiff?] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] ) opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt4? ( dev-qt/qtgui:4= dev-qt/qtopengl:4= dev-qt/qt3support:4= dev-qt/qtsvg:4= dev-qt/qtwebkit:4= dev-qt/qtxmlpatterns:4= ) x11-libs/libXft:0= ) afs? ( net-fs/openafs ) emacs? ( virtual/emacs ) fits? ( sci-libs/cfitsio:0= ) fftw? ( sci-libs/fftw:3.0= ) graphviz? ( media-gfx/graphviz:0= ) http? ( dev-libs/fcgi:0= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) math? ( sci-libs/gsl:0= sci-mathematics/unuran:0= mpi? ( virtual/mpi ) ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic:0= ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6= ) pythia8? ( >=sci-physics/pythia-8.1.80:8= =dev-lang/python-2.7.5-r2:2.7 ) >=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(+)] ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3= ) ssl? ( dev-libs/openssl:0= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( >=net-libs/xrootd-3.3.5:0= ) zeroconf? ( net-dns/avahi:0= ) virtual/pkgconfig virtual/fortran
-DESCRIPTION=C++ data analysis framework and interpreter from CERN
-EAPI=5
-HOMEPAGE=https://root.cern.ch
-IUSE=+X afs c++11 c++14 doc emacs examples fits fftw gdml graphviz http kerberos ldap +math +memstat mpi mysql odbc +opengl openmp oracle postgres prefix pythia6 pythia8 python qt4 +reflex ruby shadow sqlite ssl table +tiff xinetd xml xrootd zeroconf python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
-PDEPEND=doc? ( ~app-doc/root-docs-5.34.36[http=,math=] )
-RDEPEND=app-arch/xz-utils:0= >=dev-lang/cfortran-4.4-r2 dev-libs/libpcre:3= media-fonts/dejavu media-libs/freetype:2= media-libs/libpng:0= sys-libs/zlib:0= X? ( media-libs/ftgl:0= media-libs/glew:0= x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXpm:0= || ( media-libs/libafterimage[gif,jpeg,png,tiff?] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] ) opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt4? ( dev-qt/qtgui:4= dev-qt/qtopengl:4= dev-qt/qt3support:4= dev-qt/qtsvg:4= dev-qt/qtwebkit:4= dev-qt/qtxmlpatterns:4= ) x11-libs/libXft:0= ) afs? ( net-fs/openafs ) emacs? ( virtual/emacs ) fits? ( sci-libs/cfitsio:0= ) fftw? ( sci-libs/fftw:3.0= ) graphviz? ( media-gfx/graphviz:0= ) http? ( dev-libs/fcgi:0= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) math? ( sci-libs/gsl:0= sci-mathematics/unuran:0= mpi? ( virtual/mpi ) ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic:0= ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6= ) pythia8? ( >=sci-physics/pythia-8.1.80:8= =dev-lang/python-2.7.5-r2:2.7 ) >=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(+)] ) ruby? ( dev-lang/ruby:= dev-ruby/rubygems:= ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3= ) ssl? ( dev-libs/openssl:0= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( >=net-libs/xrootd-3.3.5:0= ) zeroconf? ( net-dns/avahi:0= ) reflex? ( dev-cpp/gccxml ) xinetd? ( sys-apps/xinetd ) virtual/fortran
-REQUIRED_USE=!X? ( !opengl !qt4 !tiff ) mpi? ( math !openmp ) openmp? ( math !mpi ) python? ( python_targets_python2_7 )
-SLOT=0/5.34.36
-SRC_URI=https://root.cern.ch/download/root_v5.34.36.source.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc fortran-2 9e7f20c99213f0627ff7f873d4aaa25d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0587e6856aba77cf4ba8422b1a0720ce
diff --git a/metadata/md5-cache/sci-physics/root-6.12.06-r4 b/metadata/md5-cache/sci-physics/root-6.12.06-r4
new file mode 100644
index 000000000000..6bcc773be5d9
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/root-6.12.06-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3= dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2= media-libs/libpng:0= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXft:0= x11-libs/libXpm:0= opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwebengine:5= ) ) asimage? ( || ( media-libs/libafterimage[gif,jpeg,png,tiff?] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] ) ) avahi? ( net-dns/avahi[mdnsresponder-compat] ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz:0= ) gsl? ( sci-libs/gsl ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6= ) pythia8? ( sci-physics/pythia:8= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) vc? ( dev-libs/vc ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
+DESCRIPTION=C++ data analysis framework and interpreter from CERN
+EAPI=6
+HOMEPAGE=https://root.cern
+IUSE=+X avahi aqua +asimage +davix emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd 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
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
+RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3= dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2= media-libs/libpng:0= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXft:0= x11-libs/libXpm:0= opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwebengine:5= ) ) asimage? ( || ( media-libs/libafterimage[gif,jpeg,png,tiff?] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] ) ) avahi? ( net-dns/avahi[mdnsresponder-compat] ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz:0= ) gsl? ( sci-libs/gsl ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6= ) pythia8? ( sci-physics/pythia:8= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) vc? ( dev-libs/vc ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) xinetd? ( sys-apps/xinetd ) fortran? ( virtual/fortran )
+REQUIRED_USE=!X? ( !asimage !opengl !qt4 !qt5 !tiff ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) tmva? ( gsl ) davix? ( ssl xml )
+SLOT=6.12/06
+SRC_URI=https://root.cern/download/root_v6.12.06.source.tar.gz
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 fortran-2 9e7f20c99213f0627ff7f873d4aaa25d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=76a674dc639c605a0f2479ef4bad7ef9
diff --git a/metadata/md5-cache/sci-physics/root-6.14.00-r1 b/metadata/md5-cache/sci-physics/root-6.14.00-r1
new file mode 100644
index 000000000000..a83a3f26c048
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/root-6.14.00-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3= dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2= media-libs/libpng:0= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXft:0= x11-libs/libXpm:0= opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwebengine:5= ) ) asimage? ( || ( media-libs/libafterimage[gif,jpeg,png,tiff?] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] ) ) avahi? ( net-dns/avahi[mdnsresponder-compat] ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz:0= ) gsl? ( sci-libs/gsl ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6= ) pythia8? ( sci-physics/pythia:8= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) vc? ( dev-libs/vc ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
+DESCRIPTION=C++ data analysis framework and interpreter from CERN
+EAPI=6
+HOMEPAGE=https://root.cern
+IUSE=+X avahi aqua +asimage +davix emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd 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
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
+RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3= dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2= media-libs/libpng:0= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXft:0= x11-libs/libXpm:0= opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwebengine:5= ) ) asimage? ( || ( media-libs/libafterimage[gif,jpeg,png,tiff?] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] ) ) avahi? ( net-dns/avahi[mdnsresponder-compat] ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz:0= ) gsl? ( sci-libs/gsl ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6= ) pythia8? ( sci-physics/pythia:8= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) vc? ( dev-libs/vc ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) xinetd? ( sys-apps/xinetd ) fortran? ( virtual/fortran )
+REQUIRED_USE=!X? ( !asimage !opengl !qt4 !qt5 !tiff ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) tmva? ( gsl ) davix? ( ssl xml )
+SLOT=6.14/00
+SRC_URI=https://root.cern/download/root_v6.14.00.source.tar.gz
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 fortran-2 9e7f20c99213f0627ff7f873d4aaa25d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7310a16ffc25b97762a161e8edd341fd
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
new file mode 100644
index 000000000000..0c1e7c1c605c
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3= dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2= media-libs/libpng:0= sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXft:0= x11-libs/libXpm:0= opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwebengine:5= ) ) asimage? ( || ( media-libs/libafterimage[gif,jpeg,png,tiff?] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] ) ) avahi? ( net-dns/avahi[mdnsresponder-compat] ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz:0= ) gsl? ( sci-libs/gsl ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6= ) pythia8? ( sci-physics/pythia:8= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) vc? ( dev-libs/vc ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran ) >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=C++ data analysis framework and interpreter from CERN
+EAPI=6
+HOMEPAGE=https://root.cern
+IUSE=+X avahi aqua +asimage +davix emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd 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
+LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
+RDEPEND=app-arch/lz4 app-arch/xz-utils fortran? ( dev-lang/cfortran ) dev-libs/libpcre:3= dev-libs/xxhash media-fonts/dejavu media-libs/freetype:2= media-libs/libpng:0= sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXft:0= x11-libs/libXpm:0= opengl? ( media-libs/ftgl:0= media-libs/glew:0= virtual/opengl virtual/glu x11-libs/gl2ps:0= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtwebengine:5= ) ) asimage? ( || ( media-libs/libafterimage[gif,jpeg,png,tiff?] >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?] ) ) avahi? ( net-dns/avahi[mdnsresponder-compat] ) davix? ( net-libs/davix ) emacs? ( virtual/emacs ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz:0= ) gsl? ( sci-libs/gsl ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( virtual/mysql ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:= ) pythia6? ( sci-physics/pythia:6= ) pythia8? ( sci-physics/pythia:8= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) vc? ( dev-libs/vc ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) xinetd? ( sys-apps/xinetd ) fortran? ( virtual/fortran )
+REQUIRED_USE=!X? ( !asimage !opengl !qt4 !qt5 !tiff ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) tmva? ( gsl ) davix? ( ssl xml )
+SLOT=0
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 fortran-2 9e7f20c99213f0627ff7f873d4aaa25d git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=03a3fa54594b1da9c3b3b582aebf4f64
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 9b499c05f287..61f339ad220e 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/fakechroot-2.19 b/metadata/md5-cache/sys-apps/fakechroot-2.19
index e5f05411f2f9..34d51adf1b39 100644
--- a/metadata/md5-cache/sys-apps/fakechroot-2.19
+++ b/metadata/md5-cache/sys-apps/fakechroot-2.19
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Provide a faked chroot environment without requiring root privileges
EAPI=5
HOMEPAGE=http://fakechroot.alioth.debian.org/
-KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
LICENSE=LGPL-2.1
RESTRICT=test
SLOT=0
SRC_URI=mirror://debian/pool/main/f/fakechroot/fakechroot_2.19.orig.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3b5a08851b07e55af1a9c078d895e321
+_md5_=a2f5edd4dfcdf9f9127980cac17030d6
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.20.2-r1 b/metadata/md5-cache/sys-apps/fakeroot-1.23
similarity index 83%
rename from metadata/md5-cache/sys-apps/fakeroot-1.20.2-r1
rename to metadata/md5-cache/sys-apps/fakeroot-1.23
index 69fbc8e7997f..59a29dc9b3e6 100644
--- a/metadata/md5-cache/sys-apps/fakeroot-1.20.2-r1
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.23
@@ -4,9 +4,9 @@ DESCRIPTION=A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP)
EAPI=6
HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
IUSE=acl debug static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
SLOT=0
-SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.20.2.orig.tar.bz2
+SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.23.orig.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3b53bbe3fb669147f6696651afdef8e6
+_md5_=cf7ede58666de0d750fbc0729f0b4c4e
diff --git a/metadata/md5-cache/sys-apps/guix-0.15.0 b/metadata/md5-cache/sys-apps/guix-0.15.0
new file mode 100644
index 000000000000..4b9b5cc1eba6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/guix-0.15.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/libgcrypt:0= >=dev-scheme/guile-2:=[regex,networking,threads] dev-scheme/bytestructures dev-scheme/guile-git dev-scheme/guile-json dev-scheme/guile-sqlite3 net-libs/gnutls[guile] sys-libs/zlib app-arch/bzip2 dev-db/sqlite >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GNU package manager (nix sibling)
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/guix/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0= >=dev-scheme/guile-2:=[regex,networking,threads] dev-scheme/bytestructures dev-scheme/guile-git dev-scheme/guile-json dev-scheme/guile-sqlite3 net-libs/gnutls[guile] sys-libs/zlib app-arch/bzip2 dev-db/sqlite
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnu-alpha/guix/guix-0.15.0.tar.gz mirror://gnu-alpha/guix/bootstrap/aarch64-linux/20170217/guile-2.0.14.tar.xz -> guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/armhf-linux/20150101/guile-2.0.11.tar.xz -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/i686-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/mips64el-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/x86_64-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81
+_md5_=2ebefe807a00aebc20ce74d6fc55a0ce
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20180531 b/metadata/md5-cache/sys-apps/osinfo-db-20180531
index a5dd29ffd5d9..05abb400ea7c 100644
--- a/metadata/md5-cache/sys-apps/osinfo-db-20180531
+++ b/metadata/md5-cache/sys-apps/osinfo-db-20180531
@@ -3,8 +3,8 @@ DEPEND=sys-apps/osinfo-db-tools
DESCRIPTION=osinfo database files
EAPI=6
HOMEPAGE=http://libosinfo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20180531.tar.xz
-_md5_=be12560bf2655cd433a98d20a27e75b7
+_md5_=d993cb126bf808a40b13062850aeaf31
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.3 b/metadata/md5-cache/sys-apps/rng-tools-6.3
new file mode 100644
index 000000000000..e348e6bd4668
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/rng-tools-6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error sys-fs/sysfsutils jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( net-misc/curl[ssl] dev-libs/libxml2:2= dev-libs/openssl:0= ) nistbeacon? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Daemon to use hardware random number generators
+EAPI=6
+HOMEPAGE=https://github.com/nhorman/rng-tools
+IUSE=jitterentropy nistbeacon selinux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error sys-fs/sysfsutils jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( net-misc/curl[ssl] dev-libs/libxml2:2= dev-libs/openssl:0= ) selinux? ( sec-policy/selinux-rngd )
+SLOT=0
+SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.3.tar.gz -> rng-tools-6.3.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=116691e16c626a20ae020e565664e405
diff --git a/metadata/md5-cache/sys-apps/toybox-0.7.7 b/metadata/md5-cache/sys-apps/toybox-0.7.7
new file mode 100644
index 000000000000..e726b8c864fd
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/toybox-0.7.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Common linux commands in a multicall binary
+EAPI=5
+HOMEPAGE=http://landley.net/code/toybox/
+IUSE=savedconfig
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://landley.net/code/toybox/downloads/toybox-0.7.7.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=924bb7e00e97df13d4c06289b86e86a5
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 847a01f9573f..dd707113af29 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/mbuffer-20180625 b/metadata/md5-cache/sys-block/mbuffer-20180625
new file mode 100644
index 000000000000..48868dddf127
--- /dev/null
+++ b/metadata/md5-cache/sys-block/mbuffer-20180625
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst prepare test
+DEPEND=ssl? ( dev-libs/openssl:0= ) test? ( dev-libs/openssl:0 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=M(easuring)buffer is a replacement for buffer with additional functionality
+EAPI=6
+HOMEPAGE=http://www.maier-komor.de/mbuffer.html
+IUSE=debug ssl test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:0= )
+REQUIRED_USE=test? ( ssl )
+SLOT=0
+SRC_URI=http://www.maier-komor.de/software/mbuffer/mbuffer-20180625.tgz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=4dda1dd97df7b3b4e4b1454d07d7bb35
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 2615dd742bfa..39f6e4ce1d04 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/systemrescuecd-x86-grub-0.1 b/metadata/md5-cache/sys-boot/systemrescuecd-x86-grub-0.1-r1
similarity index 83%
rename from metadata/md5-cache/sys-boot/systemrescuecd-x86-grub-0.1
rename to metadata/md5-cache/sys-boot/systemrescuecd-x86-grub-0.1-r1
index c20a1217226a..ac1a57ff88e1 100644
--- a/metadata/md5-cache/sys-boot/systemrescuecd-x86-grub-0.1
+++ b/metadata/md5-cache/sys-boot/systemrescuecd-x86-grub-0.1-r1
@@ -1,9 +1,9 @@
DEFINED_PHASES=install postinst
DESCRIPTION=Grub menu entries for the .iso image of systemrescuecd-x86
-EAPI=5
+EAPI=7
HOMEPAGE=http://www.sysresccd.org/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=app-admin/systemrescuecd-x86 sys-boot/grub
SLOT=0
-_md5_=c057448a81013c3aa02ecd5a78265054
+_md5_=52fc627f4ebcb3a29ec2f60378ecb30a
diff --git a/metadata/md5-cache/sys-boot/woeusb-3.1.5 b/metadata/md5-cache/sys-boot/woeusb-3.1.5
index 251b7fd53391..79e35a9baa08 100644
--- a/metadata/md5-cache/sys-boot/woeusb-3.1.5
+++ b/metadata/md5-cache/sys-boot/woeusb-3.1.5
@@ -4,10 +4,10 @@ DESCRIPTION=Creates windows installer on usb media from an iso image
EAPI=6
HOMEPAGE=https://github.com/slacka/WoeUSB
IUSE=minimal
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-3
RDEPEND=sys-apps/util-linux sys-block/parted sys-fs/dosfstools sys-fs/ntfs3g sys-boot/grub:2[grub_platforms_pc] !minimal? ( x11-libs/wxGTK:3.0-gtk3 )
SLOT=0
SRC_URI=https://github.com/slacka/WoeUSB/archive/v3.1.5.tar.gz -> woeusb-3.1.5.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets 04e063b0eff26daaea83d859dd9d6e05
-_md5_=aeefcf8199eb73cbb32ef9b0cdbb7a46
+_md5_=82e120771bfaf4e0a5fe7fd61f3dc264
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index f2da5d04195e..ec35f3326a55 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/llvm-4.0.1-r1 b/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
index a77b06d0c99d..36bd5ae0b6e8 100644
--- a/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
+++ b/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
SLOT=4
SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-4.0.1.tar.bz2 )
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b93702af8239bd80b4dcaccc342c9f22
+_md5_=851c072b4030e5a4e2c943b1c3adc5f4
diff --git a/metadata/md5-cache/sys-devel/llvm-5.0.2 b/metadata/md5-cache/sys-devel/llvm-5.0.2
index eab3b2a195ba..95593afbcfef 100644
--- a/metadata/md5-cache/sys-devel/llvm-5.0.2
+++ b/metadata/md5-cache/sys-devel/llvm-5.0.2
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
SLOT=5
SRC_URI=https://releases.llvm.org/5.0.2/llvm-5.0.2.src.tar.xz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.1-patchset.tar.bz2 !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.2-manpages.tar.bz2 )
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e35b180594e9b8fc3712e4c32090d9f
+_md5_=d84a25ab0eeb0dd22751026e1decda6c
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index a587a4272ad0..066a1b0e8ed8 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20180703 b/metadata/md5-cache/sys-firmware/intel-microcode-20180703
new file mode 100644
index 000000000000..05a2fdf73108
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20180703
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
+DEPEND=sys-apps/iucode_tool
+DESCRIPTION=Intel IA32/IA64 microcode update data
+EAPI=6
+HOMEPAGE=http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=27945
+IUSE=hostonly initramfs +split-ucode vanilla
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=intel-ucode
+RDEPEND=!=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
RESTRICT=binchecks strip
SLOT=4.14.52
SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/genpatches-4.14-57.base.tar.xz mirror://gentoo/genpatches-4.14-57.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-57.experimental.tar.xz )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=95bd081c7db2292628d592816197f17c
+_md5_=f1eefe90ef94f0f54c3b71b7fa1fffa2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.95 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.95
index 975bb683ca30..43c7cea506a2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.95
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.95
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
EAPI=6
HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
IUSE=experimental symlink build
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86
LICENSE=GPL-2 linux-firmware
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
RESTRICT=binchecks strip
SLOT=4.9.95
SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-98.base.tar.xz mirror://gentoo/genpatches-4.9-98.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-98.experimental.tar.xz )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=86756b564e424b504e78783b85c7132a
+_md5_=00abff12bae80537a1d7e0eb382011fc
diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.9 b/metadata/md5-cache/sys-kernel/spl-0.7.9
index 08f015502e5c..fdb8ed621289 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.7.9
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.9
@@ -4,11 +4,11 @@ DESCRIPTION=The Solaris Porting Layer provides many of the Solaris kernel APIs
EAPI=5
HOMEPAGE=http://zfsonlinux.org/
IUSE=custom-cflags debug kernel_linux
-KEYWORDS=~amd64
+KEYWORDS=amd64
LICENSE=GPL-2
RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
RESTRICT=debug? ( strip ) test
SLOT=0
SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/spl-0.7.9.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info aedb720bff5a5dec9b87edd351382bfc linux-mod 8ce5c5f548ed010d6499eb792ac1a638 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f40972d04a0a283e934935504b4f6648
+_md5_=6e304bf6d6fc5dc2158788e01a39b1fe
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.52 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.53
similarity index 93%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.52
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.53
index 21cc2f125eca..a56891ebbe2e 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.52
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.53
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2 linux-firmware
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
RESTRICT=binchecks strip
-SLOT=4.14.52
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.52.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.53
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.53.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.138 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.139
similarity index 93%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.4.138
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.4.139
index 56b43a2d6fdf..65df4567fea7 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.138
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.139
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2 linux-firmware
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
RESTRICT=binchecks strip
-SLOT=4.4.138
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.138.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+SLOT=4.4.139
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.139.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.110 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.111
similarity index 93%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.9.110
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.9.111
index fefa160bd106..ca39d6c2a3b2 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.110
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.111
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-2 linux-firmware
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
RESTRICT=binchecks strip
-SLOT=4.9.110
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.110.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.111
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.111.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=8f4238b1a7ebc7da5b83472577770508
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 8e96c7c3cab4..f6af3209e380 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/libcap-2.25 b/metadata/md5-cache/sys-libs/libcap-2.25
index f9e330e0358e..8a901b215fd5 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.25
+++ b/metadata/md5-cache/sys-libs/libcap-2.25
@@ -4,10 +4,10 @@ DESCRIPTION=POSIX 1003.1e capabilities
EAPI=5
HOMEPAGE=http://www.friedhoff.org/posixfilecaps.html
IUSE=pam 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=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
LICENSE=|| ( GPL-2 BSD )
RDEPEND=>=sys-apps/attr-2.4.47-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(-)?] pam? ( virtual/pam )
SLOT=0
SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.25.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4da68582e0fffff4838213cb0f7fbba3
+_md5_=dfad359511114366aa06716862cfe4e4
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 1b3015dd1891..6a70cc8bca98 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0 b/metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0
new file mode 100644
index 000000000000..61f3cc29e6af
--- /dev/null
+++ b/metadata/md5-cache/virtual/perl-Archive-Tar-2.300.0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Archive-Tar
+EAPI=6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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
+RDEPEND=~perl-core/Archive-Tar-2.300.0 dev-lang/perl:= !perl-core/Archive-Tar-2.300.0-r999
+SLOT=0
+_md5_=61e7b104408e7d14b0668ff95344601d
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 65171b2f48d7..c1b549aefa0c 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/opera-54.0.2952.41 b/metadata/md5-cache/www-client/opera-54.0.2952.46
similarity index 84%
rename from metadata/md5-cache/www-client/opera-54.0.2952.41
rename to metadata/md5-cache/www-client/opera-54.0.2952.46
index c296cd0dfdf4..a1ff8958ed6f 100644
--- a/metadata/md5-cache/www-client/opera-54.0.2952.41
+++ b/metadata/md5-cache/www-client/opera-54.0.2952.46
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
LICENSE=OPERA-2014
RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
SLOT=0
-SRC_URI=http://download1.operacdn.com/pub/opera/desktop/54.0.2952.41/linux/opera-stable_54.0.2952.41_amd64.deb http://download2.operacdn.com/pub/opera/desktop/54.0.2952.41/linux/opera-stable_54.0.2952.41_amd64.deb http://download3.operacdn.com/pub/opera/desktop/54.0.2952.41/linux/opera-stable_54.0.2952.41_amd64.deb http://download4.operacdn.com/pub/opera/desktop/54.0.2952.41/linux/opera-stable_54.0.2952.41_amd64.deb
+SRC_URI=http://download1.operacdn.com/pub/opera/desktop/54.0.2952.46/linux/opera-stable_54.0.2952.46_amd64.deb http://download2.operacdn.com/pub/opera/desktop/54.0.2952.46/linux/opera-stable_54.0.2952.46_amd64.deb http://download3.operacdn.com/pub/opera/desktop/54.0.2952.46/linux/opera-stable_54.0.2952.46_amd64.deb http://download4.operacdn.com/pub/opera/desktop/54.0.2952.46/linux/opera-stable_54.0.2952.46_amd64.deb
_eclasses_=chromium-2 3d468f3fc7ed63c78db7408ea04246e3 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=4f8be215632c60a14d3dfee846ca70e1
diff --git a/metadata/md5-cache/www-client/opera-53.0.2907.110 b/metadata/md5-cache/www-client/opera-54.0.2952.51
similarity index 80%
rename from metadata/md5-cache/www-client/opera-53.0.2907.110
rename to metadata/md5-cache/www-client/opera-54.0.2952.51
index 83a62e19cae7..8bc150a670d4 100644
--- a/metadata/md5-cache/www-client/opera-53.0.2907.110
+++ b/metadata/md5-cache/www-client/opera-54.0.2952.51
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
LICENSE=OPERA-2014
RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
SLOT=0
-SRC_URI=http://download1.operacdn.com/pub/opera/desktop/53.0.2907.110/linux/opera-stable_53.0.2907.110_amd64.deb http://download2.operacdn.com/pub/opera/desktop/53.0.2907.110/linux/opera-stable_53.0.2907.110_amd64.deb http://download3.operacdn.com/pub/opera/desktop/53.0.2907.110/linux/opera-stable_53.0.2907.110_amd64.deb http://download4.operacdn.com/pub/opera/desktop/53.0.2907.110/linux/opera-stable_53.0.2907.110_amd64.deb
+SRC_URI=http://download1.operacdn.com/pub/opera/desktop/54.0.2952.51/linux/opera-stable_54.0.2952.51_amd64.deb http://download2.operacdn.com/pub/opera/desktop/54.0.2952.51/linux/opera-stable_54.0.2952.51_amd64.deb http://download3.operacdn.com/pub/opera/desktop/54.0.2952.51/linux/opera-stable_54.0.2952.51_amd64.deb http://download4.operacdn.com/pub/opera/desktop/54.0.2952.51/linux/opera-stable_54.0.2952.51_amd64.deb
_eclasses_=chromium-2 3d468f3fc7ed63c78db7408ea04246e3 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=4f8be215632c60a14d3dfee846ca70e1
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1221.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1226.3_p1-r1
similarity index 86%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1221.3_p1
rename to metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1226.3_p1-r1
index fecab9cdcd29..4f07c17ce0f9 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1221.3_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1226.3_p1-r1
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex 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.16.1221.3-1_amd64.deb -> vivaldi-snapshot-1.16.1221.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1221.3-1_armhf.deb -> vivaldi-snapshot-1.16.1221.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1221.3-1_i386.deb -> vivaldi-snapshot-1.16.1221.3_p1-i386.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1226.3-1_amd64.deb -> vivaldi-snapshot-1.16.1226.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1226.3-1_armhf.deb -> vivaldi-snapshot-1.16.1226.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1226.3-1_i386.deb -> vivaldi-snapshot-1.16.1226.3_p1-i386.deb )
_eclasses_=chromium-2 3d468f3fc7ed63c78db7408ea04246e3 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bfdfb4f4ee2bf86ecf7a6069013016a7
+_md5_=ce4ef294feb04393514a5a7f2de6f969
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1230.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1230.3_p1
new file mode 100644
index 000000000000..3413efa54815
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-1.16.1230.3_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv >=sys-apps/sed-4
+DESCRIPTION=A browser for our friends
+EAPI=5
+HOMEPAGE=https://vivaldi.com/
+IUSE=+l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64 ~arm ~x86
+LICENSE=Vivaldi
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex 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.16.1230.3-1_amd64.deb -> vivaldi-snapshot-1.16.1230.3_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1230.3-1_armhf.deb -> vivaldi-snapshot-1.16.1230.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_1.16.1230.3-1_i386.deb -> vivaldi-snapshot-1.16.1230.3_p1-i386.deb )
+_eclasses_=chromium-2 3d468f3fc7ed63c78db7408ea04246e3 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker 87633b2194cdb56adaa1f5a5c8862c44 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ce4ef294feb04393514a5a7f2de6f969
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index cc04df4dec72..05b6771df819 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.22 b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.22
index 42d28ede6c1c..9941a8a7b1b2 100644
--- a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.22
+++ b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.22
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=sys-apps/kmod:= sys-libs/libunwind:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 alsa? ( media-libs/alsa-lib:= ) chamelium? ( dev-libs/xmlrpc-c ) glib? ( dev-libs/glib:2 ) gsl? ( sci-libs/gsl ) valgrind? ( dev-util/valgrind ) video_cards_intel? ( sys-libs/zlib:= ) xrandr? ( >=x11-libs/libXrandr-1.3 ) amd64? ( xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) x86? ( xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) amd64? ( x11-base/xorg-proto >=dev-util/peg-0.1.18 ) x86? ( x11-base/xorg-proto >=dev-util/peg-0.1.18 ) doc? ( >=dev-util/gtk-doc-1.25-r1 ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
+DEPEND=sys-apps/kmod:= sys-libs/libunwind:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 alsa? ( media-libs/alsa-lib:= ) chamelium? ( dev-libs/xmlrpc-c ) glib? ( dev-libs/glib:2 ) gsl? ( sci-libs/gsl ) valgrind? ( dev-util/valgrind ) video_cards_intel? ( sys-libs/zlib:= ) xrandr? ( >=x11-libs/libXrandr-1.3 ) amd64? ( xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) x86? ( xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) amd64? ( x11-base/xorg-proto >=dev-util/peg-0.1.18 ) x86? ( x11-base/xorg-proto >=dev-util/peg-0.1.18 ) >=dev-util/gtk-doc-1.25-r1 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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 ) >=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=Intel GPU userland tools
EAPI=5
HOMEPAGE=https://01.org/linuxgraphics https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://www.x.org/releases/individual/app/intel-gpu-tools-1.22.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
-_md5_=456750906eda37f66d99af7ac2d48b8e
+_md5_=8f1e9aae9597269a06139dc3bb87418a
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 195192b46846..5e2a719f303f 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.16.1 b/metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.16.1
new file mode 100644
index 000000000000..b1191dbec455
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/glib-2.26 gtk? ( x11-libs/gtk+:3 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=A number of classes and functions for programming GTK+ programs using C++
+EAPI=6
+HOMEPAGE=http://cxx-gtk-utils.sourceforge.net/
+IUSE=+gtk nls static-libs
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.26 gtk? ( x11-libs/gtk+:3 )
+SLOT=0
+SRC_URI=mirror://sourceforge/cxx-gtk-utils/c++-gtk-utils-2.2.16.1.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=419b29d868813169ae5bafc91ab8a27a
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.32 b/metadata/md5-cache/x11-libs/gtk+-2.24.32
index e109c2183460..e0bef217ca9d 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.32
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.32
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
EAPI=6
HOMEPAGE=https://www.gtk.org/
IUSE=aqua cups examples +introspection test vim-syntax xinerama 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 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=LGPL-2+
PDEPEND=x11-themes/gtk-engines-adwaita gnome-base/librsvg[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(-)?] vim-syntax? ( app-vim/gtk-syntax )
RDEPEND=>=dev-libs/atk-2.10.0[introspection?,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-libs/glib-2.34.3: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(-)?] >=media-libs/fontconfig-2.10.92[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(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,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(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,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(-)?] >=x11-libs/pango-1.36.3[introspection?,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(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,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(-)?] >=x11-libs/libXrender-0.9.8[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(-)?] >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXi-1.7.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(-)?] >=x11-libs/libXext-1.3.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(-)?] >=x11-libs/libXrandr-1.5[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(-)?] >=x11-libs/libXcursor-1.1.14[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(-)?] >=x11-libs/libXfixes-5.0.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(-)?] >=x11-libs/libXcomposite-0.4.4-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(-)?] >=x11-libs/libXdamage-1.1.4-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(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[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-util/gtk-update-icon-cache-2 !=x11-themes/adwaita-icon-theme-3.14 x11-themes/gnome-themes-standard
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=2
SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.32.tar.xz https://dev.gentoo.org/~leio/distfiles/gtk+-2.24.32-patchset.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f637fcefa4f20b77df743e437aad118
+_md5_=a3e90c479a63ba248cb0affcc684176d
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.22.30 b/metadata/md5-cache/x11-libs/gtk+-3.22.30
index 33a095ce5ab8..1b61f6dc828c 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.22.30
+++ b/metadata/md5-cache/x11-libs/gtk+-3.22.30
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
EAPI=6
HOMEPAGE=https://www.gtk.org/
IUSE=aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama 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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=LGPL-2+
PDEPEND=gnome-base/librsvg[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(-)?] >=x11-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
RDEPEND=>=dev-libs/atk-2.15[introspection?,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-libs/glib-2.49.4: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(-)?] media-libs/fontconfig[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(-)?] >=media-libs/libepoxy-1.0[X(+)?,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(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,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(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,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(-)?] >=x11-libs/pango-1.37.3[introspection?,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(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[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-libs/json-glib-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(-)?] ) colord? ( >=x11-misc/colord-0.1.9: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(-)?] ) cups? ( >=net-print/cups-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[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-libs/wayland-protocols-1.12 media-libs/mesa[wayland,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(-)?] >=x11-libs/libxkbcommon-0.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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[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(-)?] x11-libs/libX11[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(-)?] >=x11-libs/libXi-1.3[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(-)?] x11-libs/libXext[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(-)?] >=x11-libs/libXrandr-1.5[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(-)?] x11-libs/libXcursor[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(-)?] x11-libs/libXfixes[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(-)?] x11-libs/libXcomposite[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(-)?] x11-libs/libXdamage[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(-)?] xinerama? ( x11-libs/libXinerama[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-util/gtk-update-icon-cache-3 !=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
REQUIRED_USE=vala? ( introspection )
SLOT=3.0/3
SRC_URI=mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.8.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=709ed660ce985e399e2083afb2dc9651
+_md5_=131255debcf118790d27941eb6360410
diff --git a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3 b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
new file mode 100644
index 000000000000..e0f86376f760
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXext-1.3.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(-)?] >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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 XScrnSaver library
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
+IUSE=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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXext-1.3.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(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXScrnSaver-1.2.3.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
+_md5_=10860147bf35b43796bd0cfd64bf3fc3
diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.4 b/metadata/md5-cache/x11-libs/libXinerama-1.1.4
new file mode 100644
index 000000000000..10c22411550b
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXinerama-1.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXext-1.3.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(-)?] >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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 Xinerama library
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
+IUSE=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 ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.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(-)?] >=x11-libs/libXext-1.3.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(-)?]
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXinerama-1.1.4.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
+_md5_=00b799180a76a2f47ee876bfafd436d6
diff --git a/metadata/md5-cache/x11-libs/libXxf86misc-1.0.4 b/metadata/md5-cache/x11-libs/libXxf86misc-1.0.4
new file mode 100644
index 000000000000..c19ba811828f
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libXxf86misc-1.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1: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 Xxf86misc library
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libXxf86misc-1.0.4.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
+_md5_=9e41f25b97ce9a3e186bf384bb0ccdc7
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.10.4 b/metadata/md5-cache/x11-libs/qscintilla-2.10.4
index 9828b77c96d3..6ceebacce8fa 100644
--- a/metadata/md5-cache/x11-libs/qscintilla-2.10.4
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.10.4
@@ -4,10 +4,10 @@ DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
EAPI=6
HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
IUSE=designer doc
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
SLOT=0/13
SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.4.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d0bdcf82d3f56a942a2544dd47043b84
+_md5_=7e8a0c0439cc67a4ba9e969afc5b5ac9
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 6ca42b80c93d..cd3957ab41fb 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/dunst-1.3.2 b/metadata/md5-cache/x11-misc/dunst-1.3.2
index e3d70f0d6ec8..0f2953364d0d 100644
--- a/metadata/md5-cache/x11-misc/dunst-1.3.2
+++ b/metadata/md5-cache/x11-misc/dunst-1.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Customizable and lightweight notification-daemon
EAPI=6
HOMEPAGE=http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst
IUSE=dunstify
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
LICENSE=BSD
RDEPEND=dev-libs/glib:2 dev-libs/libxdg-basedir sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXinerama x11-libs/libXrandr x11-libs/pango[X] dunstify? ( x11-libs/libnotify )
SLOT=0
SRC_URI=https://github.com/dunst-project/dunst/archive/v1.3.2.tar.gz -> dunst-1.3.2.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=990dde1b80ebb8cb6068479007bbdfb6
+_md5_=a9fe62f85c66b138c7812ede5571601d
diff --git a/metadata/md5-cache/x11-misc/xbatt-1.3_rc1 b/metadata/md5-cache/x11-misc/xbatt-1.3_rc1
index dd8317ca9e5f..a09ffc9d8a4a 100644
--- a/metadata/md5-cache/x11-misc/xbatt-1.3_rc1
+++ b/metadata/md5-cache/x11-misc/xbatt-1.3_rc1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/l
DESCRIPTION=Notebook battery indicator for X
EAPI=6
HOMEPAGE=http://www.clave.gr.jp/~eto/xbatt/
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=~amd64 ppc x86
LICENSE=xbatt
RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-libs/libxkbfile x11-libs/libXpm
SLOT=0
SRC_URI=http://www.clave.gr.jp/~eto/xbatt/xbatt-1.3pr1.tar.gz
_eclasses_=eapi7-ver d97a56a62c7df8614afddcb25f5ff00f multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=0056db656adc02111f6c07a03c7cbbb3
+_md5_=edb021048ff2511a441ce74131fdc2b5
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 602b898e7c78..22663c14b3b9 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/terminology-1.1.0 b/metadata/md5-cache/x11-terms/terminology-1.1.0
index fdabd63ffe1e..778e215fa5bb 100644
--- a/metadata/md5-cache/x11-terms/terminology-1.1.0
+++ b/metadata/md5-cache/x11-terms/terminology-1.1.0
@@ -4,9 +4,9 @@ DESCRIPTION=Feature rich terminal emulator using the Enlightenment Foundation Li
EAPI=7
HOMEPAGE=https://www.enlightenment.org/about-terminology
IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=BSD-2
RDEPEND=>=dev-libs/efl-1.18.0[eet,X]
SLOT=0
SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.1.0.tar.xz
-_md5_=17f593f8221d4ffd12b297c856ca4ff4
+_md5_=fbc82846902e9706a85a5457f0a92a31
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 0f153f9fe0c7..f23be9dee509 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/experience-3.04-r1 b/metadata/md5-cache/x11-themes/experience-3.04-r1
index 7f995b635099..8acd0c8709cf 100644
--- a/metadata/md5-cache/x11-themes/experience-3.04-r1
+++ b/metadata/md5-cache/x11-themes/experience-3.04-r1
@@ -3,9 +3,9 @@ DEPEND=x11-themes/gtk-engines-experience
DESCRIPTION=GTK+2 themes which copy and improve the look of XP Luna
EAPI=7
HOMEPAGE=https://web.archive.org/web/20130730053042/https://art.gnome.org/themes/gtk2/1058
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~amd64 ~ppc sparc x86
LICENSE=GPL-2
RDEPEND=x11-themes/gtk-engines-experience
SLOT=0
SRC_URI=mirror://gnome/teams/art.gnome.org/themes/gtk2/GTK2-EXperience.tar.gz -> experience-3.04.tar.gz
-_md5_=5532b1ea74b09f33603d317eebf36aae
+_md5_=6f387a551380f61d62468d19400cbf54
diff --git a/metadata/md5-cache/x11-themes/zukini-20120817 b/metadata/md5-cache/x11-themes/zukini-20120817
index dfbe077fbd93..e576ccf1d01b 100644
--- a/metadata/md5-cache/x11-themes/zukini-20120817
+++ b/metadata/md5-cache/x11-themes/zukini-20120817
@@ -3,10 +3,10 @@ DEFINED_PHASES=install unpack
DESCRIPTION=Unified look for GTK+ 2.x, GTK+ 3.x, gnome-shell, metacity and more
EAPI=7
HOMEPAGE=http://lassekongo83.deviantart.com/#/d4ic1u2
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 x86
LICENSE=GPL-3
RDEPEND=>=x11-themes/gtk-engines-murrine-0.98.2 >=x11-themes/gtk-engines-unico-1.0.2
RESTRICT=binchecks strip
SLOT=0
SRC_URI=https://dev.gentoo.org/~sping/distfiles/zukini-20120817.zip
-_md5_=cc9b99f861c0000d1f79cd9aa1ffb746
+_md5_=a9dbc933e746944a16bb879d669ed5eb
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 92426aeb1696..84650a084ee2 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/dwm-6.1-r1 b/metadata/md5-cache/x11-wm/dwm-6.1-r1
index 8ca055f2d77e..c15ab59fca4e 100644
--- a/metadata/md5-cache/x11-wm/dwm-6.1-r1
+++ b/metadata/md5-cache/x11-wm/dwm-6.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a dynamic window manager for X11
EAPI=6
HOMEPAGE=https://dwm.suckless.org/
IUSE=xinerama savedconfig
-KEYWORDS=amd64 ~arm ppc ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
LICENSE=MIT
RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
SLOT=0
SRC_URI=https://dl.suckless.org/dwm/dwm-6.1.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=d4e04e05aa923c64395f3a3633d4400c
+_md5_=ff588bf0b844a9e11eb5be016c372e94
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.21.7 b/metadata/md5-cache/x11-wm/enlightenment-0.21.7
index 1f379267958a..78742b4e92eb 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.21.7
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.21.7
@@ -4,10 +4,10 @@ DESCRIPTION=Enlightenment DR17 window manager
EAPI=5
HOMEPAGE=https://www.enlightenment.org
IUSE=pam spell static-libs systemd ukit wayland +enlightenment_modules_conf-applications +enlightenment_modules_conf-bindings +enlightenment_modules_conf-dialogs +enlightenment_modules_conf-display +enlightenment_modules_conf-interaction +enlightenment_modules_conf-intl +enlightenment_modules_conf-menus +enlightenment_modules_conf-paths +enlightenment_modules_conf-performance +enlightenment_modules_conf-randr +enlightenment_modules_conf-shelves +enlightenment_modules_conf-theme +enlightenment_modules_conf-window-manipulation +enlightenment_modules_conf-window-remembers +enlightenment_modules_appmenu +enlightenment_modules_backlight +enlightenment_modules_bluez4 +enlightenment_modules_battery +enlightenment_modules_clock +enlightenment_modules_conf +enlightenment_modules_connman +enlightenment_modules_cpufreq +enlightenment_modules_everything +enlightenment_modules_fileman +enlightenment_modules_fileman-opinfo +enlightenment_modules_gadman +enlightenment_modules_geolocation +enlightenment_modules_ibar +enlightenment_modules_ibox +enlightenment_modules_lokker +enlightenment_modules_mixer +enlightenment_modules_msgbus +enlightenment_modules_music-control +enlightenment_modules_notification +enlightenment_modules_pager +enlightenment_modules_packagekit +enlightenment_modules_pager-plain +enlightenment_modules_quickaccess +enlightenment_modules_shot +enlightenment_modules_start +enlightenment_modules_syscon +enlightenment_modules_systray +enlightenment_modules_tasks +enlightenment_modules_teamwork +enlightenment_modules_temperature +enlightenment_modules_tiling +enlightenment_modules_time +enlightenment_modules_winlist +enlightenment_modules_wireless +enlightenment_modules_wizard +enlightenment_modules_wl-desktop-shell +enlightenment_modules_wl-drm +enlightenment_modules_wl-text-input +enlightenment_modules_wl-weekeyboard +enlightenment_modules_wl-wl +enlightenment_modules_wl-x11 +enlightenment_modules_xkbswitch +enlightenment_modules_xwayland nls doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=BSD-2
RDEPEND=pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd ) wayland? ( dev-libs/efl[wayland] >=dev-libs/wayland-1.10.0 >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) >=dev-libs/efl-1.18[X] x11-libs/xcb-util-keysyms nls? ( sys-devel/gettext )
SLOT=0.17/0.21.7
SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.21.7.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 enlightenment e2ebae76ba56501855712c5fd3c4c77c epatch 9a5f039771f143195164a15a4faa41a1 epunt-cxx e99babeaa7d98c1caaa6a61a79902210 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f3282cb709678a489802e10207937644
+_md5_=f63a5c66fcefeceb3e119e1d34c54d6b
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 792c3a7d8e9b..a7975ada2715 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Jul 2018 05:08:30 +0000
+Sat, 07 Jul 2018 11:38:26 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index c95b687cb6b7..77975403b952 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -93,11 +93,6 @@
Markus Meier
Member (Gentoo/ARM)
-
- mrueg@gentoo.org
- Manuel Rüger
- Member (Gentoo/ARM)
-
nerdboy@gentoo.org
Steve Arnold
@@ -1211,10 +1206,6 @@
eva@gentoo.org
Gilles Dartiguelongue
-
- mrueg@gentoo.org
- Manuel Rüger
-
pacho@gentoo.org
Pacho Ramos
@@ -1858,11 +1849,6 @@
Michael Palimaka
Developer
-
- mrueg@gentoo.org
- Manuel Rüger
- Developer
-
mschiff@gentoo.org
Marc Schiffbauer
@@ -1910,11 +1896,6 @@
Mike Pagano
Member (Kernel, gentoo-sources, genpatches)
-
- mrueg@gentoo.org
- Manuel Rüger
- Member (Kernel, gentoo-sources, genpatches)
-
whissi@gentoo.org
Thomas Deutschmann
@@ -2023,10 +2004,6 @@
LXQt
https://wiki.gentoo.org/wiki/Project:LXQt
Maintains LXQt DE related packages.
-
- mrueg@gentoo.org
- Manuel Rüger
-
layman@gentoo.org
@@ -2858,11 +2835,6 @@ developers and volunteer mentors.
Andreas K. Hüttel
Developer
-
- mrueg@gentoo.org
- Manuel Rüger
- Developer
-
tamiko@gentoo.org
Matthias Maier
@@ -3432,11 +3404,6 @@ developers and volunteer mentors.
Hans de Graaff
Lead
-
- mrueg@gentoo.org
- Manuel Rüger
- Developer
-
naota@gentoo.org
Naohiro Aota
@@ -4287,10 +4254,6 @@ developers and volunteer mentors.
Matt Turner
Lead
-
- mrueg@gentoo.org
- Manuel Rüger
-
remi@gentoo.org
Rémi Cardona
diff --git a/metadata/timestamp b/metadata/timestamp
index e0f741d672ae..17a8b57411ca 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jul 5 05:08:29 UTC 2018
+Sat Jul 7 11:38:26 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index abd58264be30..6162dfb05bcd 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Jul 2018 05:30:01 +0000
+Sat, 07 Jul 2018 12:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c5c5082e1570..8d02a5bb82bd 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-97eca49854422fa568ba75968a196ce38e5ffba3 1530766276 2018-07-05T04:51:16+00:00
+81d9a51b0ad0f49dc574f4ff35b186e914bc23ca 1530962502 2018-07-07T11:21:42+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5851c0c0efd8..7da461187400 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1530767101 Thu 05 Jul 2018 05:05:01 AM UTC
+1530963301 Sat 07 Jul 2018 11:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8f2f35c33ba6..a7975ada2715 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Jul 2018 05:08:29 +0000
+Sat, 07 Jul 2018 11:38:26 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c69ee67a29bc..bc6c8a827ccf 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
index f4770fb1ae58..6cb284ba95a4 100644
--- a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
+++ b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://folk.uio.no/trondham/software/files/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
RDEPEND="dev-lang/perl"
diff --git a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
index 10cc09c45d5e..88f7c507e91e 100644
--- a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
+++ b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://sarg.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
SLOT="0"
IUSE="+gd ldap pcre"
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index c57b6a310558..c650bb1940fd 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,14 +1,6 @@
DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B fc634ca5124525b3143bb736b53b5040c8f1fd45ecfcf3cc2bdf7e625d54b0fcfa3690ce5d766e987d320d9ccbf7f430957f532c31f180a0a037334d6eb5b51a SHA512 5d92c17e86608359fff220416d5eed2d4ac10edfe56f4162f4b7660c472cf6f609ba01034d76e5b7164c22d55a1fc5be753f5d0e0ce7ac71d00a6f68dca14afd
DIST zabbix-2.2.21.tar.gz 15489747 BLAKE2B e00fe140977f0ce995497954a15ff647c813c048a706e536a12010a649d3467d6c63343c3c0d11b1900f91f8fcc5bb235f9e4a030362c93ad3c1c31e68699f54 SHA512 29e3cba0663e7160dce5141cc389959571e5e298206baed26209facab206cc4f66611d48d76306a53925a2096db6f0bed1753435ec1be20bd8db53862cb902a4
-DIST zabbix-3.0.14.tar.gz 15643983 BLAKE2B 129bcde3318c049932ad24d6b20fcd3cdf3a0a0f246aadb81663265eb31550fd5966745486e4e863236801d41e6cefec3bdc82eca024be94bc2437f44b2d81a1 SHA512 b024de610b86bd45fc0be655e8275daf53b1de813e13a1e78cfad149b1191a7f118862646f5ded43938bc489ff0b0f325de36d4b2c076ce6fe768ee4234eb944
-DIST zabbix-3.0.17.tar.gz 15646656 BLAKE2B c24ac286f35d36163054abf3946e9d6530bf44c66576a4c077874bf68dff1ad0a36a98bf23b81063ba551b5bc0069a1d7c74ab75f5bf67c87039af371bcf2512 SHA512 5a06e8dca49c1f7e9fef936f0e534e78af9be6fecdf534d24e914ce658ad7140c1bd62510603f6a8860f964e4fe78093c115efd8da8e12581b452116b6b14627
-DIST zabbix-3.0.18.tar.gz 15661951 BLAKE2B a6c31cf783f9b2a1ceb4ec5d2430bbc6127bc9e7a7b2c656c436bab10c821d28e782552403de95d45aed3df82b5f61072638251a03c695424c1ae55e1bd40b72 SHA512 b1bf3a109becaf6f756898f0f3bbf8d4df0ec9dfabf9b9c7cf7c7c7813b917e3c23c757f6f62df782c3f37f25e0532049a378e8d5a86d59aaee60e39dc4eaf2a
-DIST zabbix-3.2.10.tar.gz 16089723 BLAKE2B c69b8b00781198b8e4845f94e5a42e3910950954bd240703165be15630788f22e486a2ebbd941902eb92b06b42bc7923869f7b885fcc7248508d9e535ad23170 SHA512 6413247ea0f47f410eadd970599dc4a0bfef4202b6f88bcb1636d1fad270a2d5545a90870052af5445a5219dab3b58867c23f3afaddb5d78e200fecbd987e545
+DIST zabbix-3.0.19.tar.gz 15642128 BLAKE2B b9b84f21371db1eb8efdfb547e2b4a9216e9fb3c76fe54420ab1c76bad5cbf4537f6f0aca720748d39fb2ebf0447c3f82bf9e0d276f9fa4c9e91bc70e8b67f22 SHA512 30239db9236f536325f0ad3a8ea08abd8c460caf60dfd80b881cc9532d2f65d6154e8911be89d141539f7eeced359809405cf1b655eafdab1b940c314c8d3132
DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 7038679ecc9ae1b6684d65b3dd0019865e587c82e5a3ffe55610c057f8516ebe34978101065ac31628e6fd54077877c447d64cb1d169e0ad7402e727c7e65d76 SHA512 a14e0af4b183c8deb524c8965700c2988c0c131844f7fbc748aa8d1703b9dad73c2cf6d77663799fbd455adf58fdd1ce8dc5fd6404a9269c1a42160ad0e33e6e
-DIST zabbix-3.2.9.tar.gz 16098846 BLAKE2B a8d7ab803cab075889bbaee10806c1f35be42a91c78e1ee62e8fa458987865401d2fb677d4ebf42267e13acb38b8689bb6d232fbc3247ffba3f06f5e8c3cd692 SHA512 e8d82d4cadd8f6d5124de5d1b93f4768086c9543bfea676f321df86a76e001400330ea3650d3c295b25fa76858a205dac49caa97d61af30cc31fac544025d347
DIST zabbix-3.4.10.tar.gz 17300622 BLAKE2B 1b4c275d271ae4d4607400cb6e5f955ba624bf19cd116728e7a71a1b4adc0fbbde8cf91e6b0a71c5d48bf5c38b2ebe0db79f00ba3a42cc4213a0e310d56d5e29 SHA512 25e85cbe7a93a088fa0132ed6f3f75ad1aadedb839d745be38e180f0f9b858e32045b9d057b10cab4d3a8aa770b22b631aa0894fe5f1c3ca4ca62a000934bf94
-DIST zabbix-3.4.5.tar.gz 17170228 BLAKE2B bd799a3ad25256421bc2a8458019237da17e78d2dd5253485cebbc40df785e550e7cf15fcf8925a225c118e38e9aaad3f7532f909ba3eaff3a175136033ae81a SHA512 e77c8693d687c9f1e3c160f2f41161b5e4ac663f0db69f4bff424da4ba607815ad0148448c6f80a2b9357ad7472016610f4beed173e40c6fcf661874d75c69a4
-DIST zabbix-3.4.6.tar.gz 17162881 BLAKE2B cf8a461f720b2f1d4910d8f512ac9949c56b9116fb9ddd1a26687b22da2c3938c4f10e6d0029bf348101e897fe6d352880964aaf5a0f55dd377fb6eec59a5006 SHA512 02300b103278f6f2867629a958a8bc5ea8e6cfe5743056b7e2f9d59afdeea04e29f51cae7c5d9847899c45c321a4c15cdaf66203c627fb1d85b3af619afe73ca
-DIST zabbix-3.4.7.tar.gz 17177022 BLAKE2B db465ff9c0085922e23ba042b0975d1368abb15408e943aa784e8efb49f7c412761742d1c8cda19c3cf86ea03d358d731cbe022ba3c9b139963f396290e4a272 SHA512 8397ee41c3b4efc2fb66638fd7c554ea668fad0a7c79d8aa3ed442cae065e62355c1e16e2008c7a65def775f23e6dfa1d75bbc682c49a45c9db5d7eddf905140
-DIST zabbix-3.4.8.tar.gz 17289635 BLAKE2B a90eb47f8a93877aa5131e263f0c00da7cea4e745ee816887dffeb2d40919c1b4251a8ea61fa834699d1d39547c6c366519a3751c266aea47e3d28a1d18c35c3 SHA512 a4e3573b3ffc07bf9a5a68b784a56569219caf7dbcadfc2d0eb5d87e1f3aa3b5ddf339b61a41e432487d55d2f4788f1a8a722574b07b8ecb7abd3c99ce7c7d70
-DIST zabbix-3.4.9.tar.gz 17300077 BLAKE2B 99335efb27f074a2b0f0fe1f911c6a7f3e379a9b6e0ac9370a02702148dec934645016cd93a652e7dd395ac73277240f1b203b20a53f3210d8d7de90ec78d442 SHA512 364f6272d33b4eb74d3644e3f3dca240803596e620fc71e8ea8b4957673c4eeaa69ec9a696d23b268749dda6654e0aa83c557363d9bbb35ca9abc6551efef4ac
+DIST zabbix-3.4.11.tar.gz 17517171 BLAKE2B 72f7d1cad3e8cb7972cb9c3698d35f70c45de1244c14a87f403a0c2c9b1825d679fa32e54dc4b2aae80a24acb7723ce489e0d409fb027c1afc8bb4eccecf9867 SHA512 1360e1de02fbbda30539e0f1dbe9d4aee57bc693f597db011cdefe7e7c4acaa6e3452813ee29e0e614794336e7fc9210ff3458f3761fcec90db66fb4a2275373
diff --git a/net-analyzer/zabbix/zabbix-3.0.14.ebuild b/net-analyzer/zabbix/zabbix-3.0.14.ebuild
deleted file mode 100644
index 3a7170154702..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.14.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
- ldap? (
- net-nds/openldap
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls
- )
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( dev-db/postgresql:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
- libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )
- ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
- proxy? ( net-analyzer/fping )
- server? ( net-analyzer/fping
- app-admin/webapp-config )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
- )
- frontend? (
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- oracle? ( dev-lang/php[oci8-instant-client] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- static? (
- ldap? (
- net-nds/openldap[static-libs]
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- )
- mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( dev-db/postgresql:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2[static-libs] )
- odbc? ( dev-db/unixODBC[static-libs] )
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use oracle; then
- if [ -z "${ORACLE_HOME}" ]; then
- eerror
- eerror "The environment variable ORACLE_HOME must be set"
- eerror "and point to the correct location."
- eerror "It looks like you don't have Oracle installed."
- eerror
- die "Environment variable ORACLE_HOME is not set"
- fi
- if has_version 'dev-db/oracle-instantclient-basic'; then
- ewarn
- ewarn "Please ensure you have a full install of the Oracle client."
- ewarn "dev-db/oracle-instantclient* is NOT sufficient."
- ewarn
- fi
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- default
-}
-
-src_configure() {
- econf \
- $(use_enable server) \
- $(use_enable proxy) \
- $(use_enable agent) \
- $(use_enable ipv6) \
- $(use_enable static) \
- $(use_enable java) \
- $(use_with ldap) \
- $(use_with snmp net-snmp) \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- $(use_with oracle) \
- $(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
- $(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl) \
- || die "econf failed"
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
- fi
-}
-
-src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- if use server; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
- fi
-
- if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
- dosbin src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
- fi
-
- fowners zabbix:zabbix \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-0.9.27.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-0.9.27.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-1.6.1.jar
- exeinto /${ZABBIXJAVA_BASE}/
- doexe \
- src/zabbix_java/settings.sh \
- src/zabbix_java/startup.sh \
- src/zabbix_java/shutdown.sh
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n "
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-
- if use server || use proxy ; then
- # check for fping
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
- case "${fping_perms}" in
- 4[157][157][157])
- ;;
- *)
- ewarn
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
- ewarn "you have to make /usr/sbin/fping setuid root and executable"
- ewarn "by everyone. Run the following command to fix it:"
- ewarn
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
- ewarn
- ewarn "Please be aware that this might impose a security risk,"
- ewarn "depending on the code quality of fping."
- ewarn
- ;;
- esac
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.0.18.ebuild b/net-analyzer/zabbix/zabbix-3.0.18.ebuild
deleted file mode 100644
index c3575d4f121b..000000000000
--- a/net-analyzer/zabbix/zabbix-3.0.18.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
- ldap? (
- net-nds/openldap
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls
- )
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( dev-db/postgresql:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
- libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )
- ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
- proxy? ( net-analyzer/fping )
- server? ( net-analyzer/fping
- app-admin/webapp-config )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
- )
- frontend? (
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- oracle? ( dev-lang/php[oci8-instant-client] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- static? (
- ldap? (
- net-nds/openldap[static-libs]
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- )
- mysql? ( >=virtual/mysql-5.0.3[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( dev-db/postgresql:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2[static-libs] )
- odbc? ( dev-db/unixODBC[static-libs] )
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use oracle; then
- if [ -z "${ORACLE_HOME}" ]; then
- eerror
- eerror "The environment variable ORACLE_HOME must be set"
- eerror "and point to the correct location."
- eerror "It looks like you don't have Oracle installed."
- eerror
- die "Environment variable ORACLE_HOME is not set"
- fi
- if has_version 'dev-db/oracle-instantclient-basic'; then
- ewarn
- ewarn "Please ensure you have a full install of the Oracle client."
- ewarn "dev-db/oracle-instantclient* is NOT sufficient."
- ewarn
- fi
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- default
-}
-
-src_configure() {
- econf \
- $(use_enable server) \
- $(use_enable proxy) \
- $(use_enable agent) \
- $(use_enable ipv6) \
- $(use_enable static) \
- $(use_enable java) \
- $(use_with ldap) \
- $(use_with snmp net-snmp) \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- $(use_with oracle) \
- $(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
- $(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl) \
- || die "econf failed"
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
- fi
-}
-
-src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- if use server; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
- fi
-
- if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
- dosbin src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
- fi
-
- fowners zabbix:zabbix \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-0.9.27.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-0.9.27.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-1.6.1.jar
- exeinto /${ZABBIXJAVA_BASE}/
- doexe \
- src/zabbix_java/settings.sh \
- src/zabbix_java/startup.sh \
- src/zabbix_java/shutdown.sh
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n "
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-
- if use server || use proxy ; then
- # check for fping
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
- case "${fping_perms}" in
- 4[157][157][157])
- ;;
- *)
- ewarn
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
- ewarn "you have to make /usr/sbin/fping setuid root and executable"
- ewarn "by everyone. Run the following command to fix it:"
- ewarn
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
- ewarn
- ewarn "Please be aware that this might impose a security risk,"
- ewarn "depending on the code quality of fping."
- ewarn
- ;;
- esac
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.0.17.ebuild b/net-analyzer/zabbix/zabbix-3.0.19.ebuild
similarity index 100%
rename from net-analyzer/zabbix/zabbix-3.0.17.ebuild
rename to net-analyzer/zabbix/zabbix-3.0.19.ebuild
diff --git a/net-analyzer/zabbix/zabbix-3.2.10.ebuild b/net-analyzer/zabbix/zabbix-3.2.10.ebuild
deleted file mode 100644
index 318cb9575249..000000000000
--- a/net-analyzer/zabbix/zabbix-3.2.10.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
- ldap? (
- net-nds/openldap
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls
- )
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( dev-db/postgresql:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
- libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )
- ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
- proxy? ( net-analyzer/fping[suid] )
- server? ( net-analyzer/fping[suid]
- app-admin/webapp-config )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
- )
- frontend? (
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- oracle? ( dev-lang/php[oci8-instant-client] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- static? (
- ldap? (
- net-nds/openldap[static-libs]
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- )
- mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( dev-db/postgresql:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2[static-libs] )
- odbc? ( dev-db/unixODBC[static-libs] )
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use oracle; then
- if [ -z "${ORACLE_HOME}" ]; then
- eerror
- eerror "The environment variable ORACLE_HOME must be set"
- eerror "and point to the correct location."
- eerror "It looks like you don't have Oracle installed."
- eerror
- die "Environment variable ORACLE_HOME is not set"
- fi
- if has_version 'dev-db/oracle-instantclient-basic'; then
- ewarn
- ewarn "Please ensure you have a full install of the Oracle client."
- ewarn "dev-db/oracle-instantclient* is NOT sufficient."
- ewarn
- fi
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- default
-}
-
-src_configure() {
- econf \
- $(use_enable server) \
- $(use_enable proxy) \
- $(use_enable agent) \
- $(use_enable ipv6) \
- $(use_enable static) \
- $(use_enable java) \
- $(use_with ldap) \
- $(use_with snmp net-snmp) \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- $(use_with oracle) \
- $(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
- $(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl) \
- || die "econf failed"
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
- fi
-}
-
-src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- if use server; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
- fi
-
- if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
- dosbin src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
- fi
-
- fowners zabbix:zabbix \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-0.9.27.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-0.9.27.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-1.6.1.jar
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n "
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-
- if use server || use proxy ; then
- # check for fping
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
- case "${fping_perms}" in
- 4[157][157][157])
- ;;
- *)
- ewarn
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
- ewarn "you have to make /usr/sbin/fping setuid root and executable"
- ewarn "by everyone. Run the following command to fix it:"
- ewarn
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
- ewarn
- ewarn "Please be aware that this might impose a security risk,"
- ewarn "depending on the code quality of fping."
- ewarn
- ;;
- esac
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.2.9.ebuild b/net-analyzer/zabbix/zabbix-3.2.9.ebuild
deleted file mode 100644
index 318cb9575249..000000000000
--- a/net-analyzer/zabbix/zabbix-3.2.9.ebuild
+++ /dev/null
@@ -1,328 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
- ldap? (
- net-nds/openldap
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls
- )
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( dev-db/postgresql:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
- libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )
- ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
- proxy? ( net-analyzer/fping[suid] )
- server? ( net-analyzer/fping[suid]
- app-admin/webapp-config )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
- )
- frontend? (
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- oracle? ( dev-lang/php[oci8-instant-client] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- static? (
- ldap? (
- net-nds/openldap[static-libs]
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- )
- mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( dev-db/postgresql:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2[static-libs] )
- odbc? ( dev-db/unixODBC[static-libs] )
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use oracle; then
- if [ -z "${ORACLE_HOME}" ]; then
- eerror
- eerror "The environment variable ORACLE_HOME must be set"
- eerror "and point to the correct location."
- eerror "It looks like you don't have Oracle installed."
- eerror
- die "Environment variable ORACLE_HOME is not set"
- fi
- if has_version 'dev-db/oracle-instantclient-basic'; then
- ewarn
- ewarn "Please ensure you have a full install of the Oracle client."
- ewarn "dev-db/oracle-instantclient* is NOT sufficient."
- ewarn
- fi
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- default
-}
-
-src_configure() {
- econf \
- $(use_enable server) \
- $(use_enable proxy) \
- $(use_enable agent) \
- $(use_enable ipv6) \
- $(use_enable static) \
- $(use_enable java) \
- $(use_with ldap) \
- $(use_with snmp net-snmp) \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- $(use_with oracle) \
- $(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
- $(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl) \
- || die "econf failed"
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
- fi
-}
-
-src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- if use server; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
- fi
-
- if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
- dosbin src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
- fi
-
- fowners zabbix:zabbix \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-0.9.27.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-0.9.27.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-1.6.1.jar
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n "
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-
- if use server || use proxy ; then
- # check for fping
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
- case "${fping_perms}" in
- 4[157][157][157])
- ;;
- *)
- ewarn
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
- ewarn "you have to make /usr/sbin/fping setuid root and executable"
- ewarn "by everyone. Run the following command to fix it:"
- ewarn
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
- ewarn
- ewarn "Please be aware that this might impose a security risk,"
- ewarn "depending on the code quality of fping."
- ewarn
- ;;
- esac
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.4.9.ebuild b/net-analyzer/zabbix/zabbix-3.4.11.ebuild
similarity index 100%
rename from net-analyzer/zabbix/zabbix-3.4.9.ebuild
rename to net-analyzer/zabbix/zabbix-3.4.11.ebuild
diff --git a/net-analyzer/zabbix/zabbix-3.4.5.ebuild b/net-analyzer/zabbix/zabbix-3.4.5.ebuild
deleted file mode 100644
index e06d6f85c700..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.5.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- server? ( ^^ ( mysql oracle postgres odbc ) )
- static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
- ldap? (
- net-nds/openldap
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls
- )
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( dev-db/postgresql:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
- libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )
- ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
- proxy? ( net-analyzer/fping[suid] )
- server? ( net-analyzer/fping[suid]
- app-admin/webapp-config
- dev-libs/libevent )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
- )
- frontend? (
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- oracle? ( dev-lang/php[oci8-instant-client] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- static? (
- ldap? (
- net-nds/openldap[static-libs]
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- )
- mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( dev-db/postgresql:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2[static-libs] )
- odbc? ( dev-db/unixODBC[static-libs] )
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use oracle; then
- if [ -z "${ORACLE_HOME}" ]; then
- eerror
- eerror "The environment variable ORACLE_HOME must be set"
- eerror "and point to the correct location."
- eerror "It looks like you don't have Oracle installed."
- eerror
- die "Environment variable ORACLE_HOME is not set"
- fi
- if has_version 'dev-db/oracle-instantclient-basic'; then
- ewarn
- ewarn "Please ensure you have a full install of the Oracle client."
- ewarn "dev-db/oracle-instantclient* is NOT sufficient."
- ewarn
- fi
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- default
-}
-
-src_configure() {
- econf \
- $(use_enable server) \
- $(use_enable proxy) \
- $(use_enable agent) \
- $(use_enable ipv6) \
- $(use_enable static) \
- $(use_enable java) \
- $(use_with ldap) \
- $(use_with snmp net-snmp) \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- $(use_with oracle) \
- $(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
- $(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl) \
- || die "econf failed"
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
- fi
-}
-
-src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- if use server; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
- fi
-
- if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
- dosbin src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
- fi
-
- fowners zabbix:zabbix \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-0.9.27.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-0.9.27.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-1.6.1.jar
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n "
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-
- if use server || use proxy ; then
- # check for fping
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
- case "${fping_perms}" in
- 4[157][157][157])
- ;;
- *)
- ewarn
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
- ewarn "you have to make /usr/sbin/fping setuid root and executable"
- ewarn "by everyone. Run the following command to fix it:"
- ewarn
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
- ewarn
- ewarn "Please be aware that this might impose a security risk,"
- ewarn "depending on the code quality of fping."
- ewarn
- ;;
- esac
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.4.6.ebuild b/net-analyzer/zabbix/zabbix-3.4.6.ebuild
deleted file mode 100644
index e06d6f85c700..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.6.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- server? ( ^^ ( mysql oracle postgres odbc ) )
- static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
- ldap? (
- net-nds/openldap
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls
- )
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( dev-db/postgresql:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
- libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )
- ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
- proxy? ( net-analyzer/fping[suid] )
- server? ( net-analyzer/fping[suid]
- app-admin/webapp-config
- dev-libs/libevent )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
- )
- frontend? (
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- oracle? ( dev-lang/php[oci8-instant-client] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- static? (
- ldap? (
- net-nds/openldap[static-libs]
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- )
- mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( dev-db/postgresql:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2[static-libs] )
- odbc? ( dev-db/unixODBC[static-libs] )
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use oracle; then
- if [ -z "${ORACLE_HOME}" ]; then
- eerror
- eerror "The environment variable ORACLE_HOME must be set"
- eerror "and point to the correct location."
- eerror "It looks like you don't have Oracle installed."
- eerror
- die "Environment variable ORACLE_HOME is not set"
- fi
- if has_version 'dev-db/oracle-instantclient-basic'; then
- ewarn
- ewarn "Please ensure you have a full install of the Oracle client."
- ewarn "dev-db/oracle-instantclient* is NOT sufficient."
- ewarn
- fi
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- default
-}
-
-src_configure() {
- econf \
- $(use_enable server) \
- $(use_enable proxy) \
- $(use_enable agent) \
- $(use_enable ipv6) \
- $(use_enable static) \
- $(use_enable java) \
- $(use_with ldap) \
- $(use_with snmp net-snmp) \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- $(use_with oracle) \
- $(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
- $(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl) \
- || die "econf failed"
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
- fi
-}
-
-src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- if use server; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
- fi
-
- if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
- dosbin src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
- fi
-
- fowners zabbix:zabbix \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-0.9.27.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-0.9.27.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-1.6.1.jar
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n "
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-
- if use server || use proxy ; then
- # check for fping
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
- case "${fping_perms}" in
- 4[157][157][157])
- ;;
- *)
- ewarn
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
- ewarn "you have to make /usr/sbin/fping setuid root and executable"
- ewarn "by everyone. Run the following command to fix it:"
- ewarn
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
- ewarn
- ewarn "Please be aware that this might impose a security risk,"
- ewarn "depending on the code quality of fping."
- ewarn
- ;;
- esac
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.4.7.ebuild b/net-analyzer/zabbix/zabbix-3.4.7.ebuild
deleted file mode 100644
index e06d6f85c700..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.7.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- server? ( ^^ ( mysql oracle postgres odbc ) )
- static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
- ldap? (
- net-nds/openldap
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls
- )
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( dev-db/postgresql:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
- libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )
- ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
- proxy? ( net-analyzer/fping[suid] )
- server? ( net-analyzer/fping[suid]
- app-admin/webapp-config
- dev-libs/libevent )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
- )
- frontend? (
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- oracle? ( dev-lang/php[oci8-instant-client] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- static? (
- ldap? (
- net-nds/openldap[static-libs]
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- )
- mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( dev-db/postgresql:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2[static-libs] )
- odbc? ( dev-db/unixODBC[static-libs] )
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use oracle; then
- if [ -z "${ORACLE_HOME}" ]; then
- eerror
- eerror "The environment variable ORACLE_HOME must be set"
- eerror "and point to the correct location."
- eerror "It looks like you don't have Oracle installed."
- eerror
- die "Environment variable ORACLE_HOME is not set"
- fi
- if has_version 'dev-db/oracle-instantclient-basic'; then
- ewarn
- ewarn "Please ensure you have a full install of the Oracle client."
- ewarn "dev-db/oracle-instantclient* is NOT sufficient."
- ewarn
- fi
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- default
-}
-
-src_configure() {
- econf \
- $(use_enable server) \
- $(use_enable proxy) \
- $(use_enable agent) \
- $(use_enable ipv6) \
- $(use_enable static) \
- $(use_enable java) \
- $(use_with ldap) \
- $(use_with snmp net-snmp) \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- $(use_with oracle) \
- $(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
- $(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl) \
- || die "econf failed"
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
- fi
-}
-
-src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- if use server; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
- fi
-
- if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
- dosbin src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
- fi
-
- fowners zabbix:zabbix \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-0.9.27.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-0.9.27.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-1.6.1.jar
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n "
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-
- if use server || use proxy ; then
- # check for fping
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
- case "${fping_perms}" in
- 4[157][157][157])
- ;;
- *)
- ewarn
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
- ewarn "you have to make /usr/sbin/fping setuid root and executable"
- ewarn "by everyone. Run the following command to fix it:"
- ewarn
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
- ewarn
- ewarn "Please be aware that this might impose a security risk,"
- ewarn "depending on the code quality of fping."
- ewarn
- ;;
- esac
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.4.8.ebuild b/net-analyzer/zabbix/zabbix-3.4.8.ebuild
deleted file mode 100644
index e06d6f85c700..000000000000
--- a/net-analyzer/zabbix/zabbix-3.4.8.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- server? ( ^^ ( mysql oracle postgres odbc ) )
- static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
- ldap? (
- net-nds/openldap
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls
- )
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( dev-db/postgresql:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
- libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )
- ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
- proxy? ( net-analyzer/fping[suid] )
- server? ( net-analyzer/fping[suid]
- app-admin/webapp-config
- dev-libs/libevent )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
- )
- frontend? (
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- oracle? ( dev-lang/php[oci8-instant-client] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- static? (
- ldap? (
- net-nds/openldap[static-libs]
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- )
- mysql? ( >=virtual/mysql-5.0.3 virtual/libmysqlclient[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( dev-db/postgresql:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2[static-libs] )
- odbc? ( dev-db/unixODBC[static-libs] )
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use oracle; then
- if [ -z "${ORACLE_HOME}" ]; then
- eerror
- eerror "The environment variable ORACLE_HOME must be set"
- eerror "and point to the correct location."
- eerror "It looks like you don't have Oracle installed."
- eerror
- die "Environment variable ORACLE_HOME is not set"
- fi
- if has_version 'dev-db/oracle-instantclient-basic'; then
- ewarn
- ewarn "Please ensure you have a full install of the Oracle client."
- ewarn "dev-db/oracle-instantclient* is NOT sufficient."
- ewarn
- fi
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- default
-}
-
-src_configure() {
- econf \
- $(use_enable server) \
- $(use_enable proxy) \
- $(use_enable agent) \
- $(use_enable ipv6) \
- $(use_enable static) \
- $(use_enable java) \
- $(use_with ldap) \
- $(use_with snmp net-snmp) \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- $(use_with oracle) \
- $(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
- $(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl) \
- || die "econf failed"
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
- fi
-}
-
-src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- if use server; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
- fi
-
- if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
- dosbin src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
- fi
-
- fowners zabbix:zabbix \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-0.9.27.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-0.9.27.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-1.6.1.jar
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n "
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-
- if use server || use proxy ; then
- # check for fping
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
- case "${fping_perms}" in
- 4[157][157][157])
- ;;
- *)
- ewarn
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
- ewarn "you have to make /usr/sbin/fping setuid root and executable"
- ewarn "by everyone. Run the following command to fix it:"
- ewarn
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
- ewarn
- ewarn "Please be aware that this might impose a security risk,"
- ewarn "depending on the code quality of fping."
- ewarn
- ;;
- esac
- fi
-}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index c536f810ffe7..2b03fcf0bcae 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/ppp/ppp-2.4.7-r6.ebuild b/net-dialup/ppp/ppp-2.4.7-r6.ebuild
index 206abd0dd04d..f8547e791e9e 100644
--- a/net-dialup/ppp/ppp-2.4.7-r6.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
DEPEND="activefilter? ( net-libs/libpcap )
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 3e1e7a109ee6..c9ba03e5954c 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 8351a9011db1..4f4d621296f4 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,2 +1,3 @@
+DIST libidn-1.33-security_backports-01.tar.xz 3420 BLAKE2B c0311d83dee53b83bceab7777e9508ffdc2737e31eec71dc7e67b29ee75cdcef8558db0e89d857ed8c402980fdd7c3419fbb123eba91dddc2358a06684114811 SHA512 e925d20c9258b47821d444c563c75f09f003d1c6b367c934a808242ce4c259ff83e9d67e886cb3e832117df1cd9cae4b18417c48fbf9c77266ab379d3afcd4f4
DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6
DIST libidn-1.35.tar.gz 4169217 BLAKE2B 809f9e854a4f2fcd3b2d5f7cdb34e2c68a0f00f5fcffc9002ead2d2d3dcee38022b3288f29716437f65f09e259e35cc98679d9c9d943423190cebb76fcbc94fa SHA512 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09
diff --git a/net-dns/libidn/libidn-1.33-r99.ebuild b/net-dns/libidn/libidn-1.33-r99.ebuild
new file mode 100644
index 000000000000..170b0346b6e2
--- /dev/null
+++ b/net-dns/libidn/libidn-1.33-r99.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib-minimal libtool
+
+DESCRIPTION="Internationalized Domain Names (IDN) implementation"
+HOMEPAGE="https://www.gnu.org/software/libidn/"
+SRC_URI="
+ mirror://gnu/libidn/${P}.tar.gz
+ https://dev.gentoo.org/~polynomial-c/${P}-security_backports-01.tar.xz
+"
+
+LICENSE="GPL-2 GPL-3 LGPL-3"
+SLOT="1.33"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="!<${CATEGORY}/${PN}-1.35:0"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.33-parallel-make.patch
+)
+
+src_prepare() {
+ default
+
+ eapply "${WORKDIR}"/patches
+
+ # breaks eautoreconf
+ sed '/AM_INIT_AUTOMAKE/s@ -Werror@@' -i configure.ac || die
+ # Breaks build because --disable-gtk-doc* gets ignored
+ sed '/^SUBDIRS/s@ doc@@' -i Makefile.am || die
+ eautoreconf
+ elibtoolize # for Solaris shared objects
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-java
+ --disable-csharp
+ --disable-nls
+ --disable-static
+ --disable-silent-rules
+ --disable-valgrind-tests
+ --with-packager-bug-reports="https://bugs.gentoo.org"
+ --with-packager-version="r${PR}"
+ --with-packager="Gentoo"
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ # only run libidn specific tests and not gnulib tests (bug #539356)
+ emake -C tests check
+}
+
+multilib_src_install() {
+ dolib.so lib/.libs/libidn.so.11*
+}
diff --git a/net-dns/valtz/valtz-0.7-r1.ebuild b/net-dns/valtz/valtz-0.7-r1.ebuild
new file mode 100644
index 000000000000..4e9cc257f220
--- /dev/null
+++ b/net-dns/valtz/valtz-0.7-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Validation tool for tinydns-data zone files"
+SRC_URI="https://x42.com/software/valtz/${PN}.tgz"
+HOMEPAGE="https://x42.com/software/valtz/"
+IUSE=""
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+src_install() {
+ dobin valtz
+ dodoc README CHANGES
+}
diff --git a/net-dns/valtz/valtz-0.7.ebuild b/net-dns/valtz/valtz-0.7.ebuild
index 7df2526b1dec..6601585cf112 100644
--- a/net-dns/valtz/valtz-0.7.ebuild
+++ b/net-dns/valtz/valtz-0.7.ebuild
@@ -4,8 +4,8 @@
EAPI=0
DESCRIPTION="Validation tool for tinydns-data zone files"
-SRC_URI="http://x42.com/software/valtz/${PN}.tgz"
-HOMEPAGE="http://x42.com/software/valtz/"
+SRC_URI="https://x42.com/software/valtz/${PN}.tgz"
+HOMEPAGE="https://x42.com/software/valtz/"
IUSE=""
SLOT="0"
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index ff396514fee0..229e82a183cb 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 49a0d0abd1da..948e38aff510 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -1,6 +1,3 @@
-DIST libnfs-1.10.0.tar.gz 149108 BLAKE2B 9df18e65e6f7e25ed57f5257a9b6e756ff76cd8d0e768051866d1f636a3fbefb4e8125a4ef742beb703c2bbc655b09ff7cda233ea48c04925278eb703292ab26 SHA512 9d1bdd2e193f189841dd915d5a4d0965cfd0c597372fa82b12377c4da1f6b5ec022bd0cddfe46dda1a4ac3de3f31eed73cb7dcf832469a4d292e05401b8fb247
-DIST libnfs-1.11.0.tar.gz 152239 BLAKE2B 91df1eeb93a636eea0db2101921f30ce09509f9f292b828d0ac75a559b39e469e85dfe27649d86d6afa972ba66dc50e0b4b1157a9a265d3efb42d7878ca4fa4a SHA512 e1ef6e341fd56955c3adedf6ba90841a57be9c6a962d61ff18425593bfc2787c34c776fdc8ec711f8bb2da1ec08271fc8778a0499aef01c3a7694c384a4c037b
-DIST libnfs-1.9.5.tar.gz 141162 BLAKE2B c19ca0bc2dc1b8edaf407f8a25909286b39952284717e3b728436bff8075e25f29db9e1b2e3f73f447bd82bc418f638ba81477dfe3965d16e906c92d15031e23 SHA512 fee676503b3655f3710342f5f6944f598b1e404f0a00891387d36d41f55f25f27254cbe061b8d8b00ee445a1bfd51df9c2cbccd72f3cdb0f7e8925691fcb2a4b
DIST libnfs-1.9.7.tar.gz 145925 BLAKE2B 0b1d7a2d67b5dc870e20642438eddcd667c6fa57fe6128d22c358232a0c5b9d70e3414e4ebb7d684318cf3f9cda93ca6b427bf6ea38b2cce470630653cf1215a SHA512 0dec9a6eee61bcab5a406b6f8bd50d15ffa257bc0fae7079e25a3e0ecb1177845514c232d699c67c59a3f1a269099a46225959d413301bf4550aa37504e2f492
-DIST libnfs-1.9.8.tar.gz 148757 BLAKE2B fd4e6989ce8c2508de5776d71e522d4191f6ebf4f526aad16d69c9a17ef32ec37c68a817ddf7e709d01ba4a60e14ed43aaa45d27c310468cb73473fa0ecd974b SHA512 2a0e11dde5a2c4d25fcf1040d04ad984fe3b2e2ce5f544d602becb55aebdabbfe29a3b961d3db7d034c918862b540d3a03735bbbad0606ff3a128c50c2dad666
DIST libnfs-2.0.0.tar.gz 200932 BLAKE2B df5ae4487bd7e19428551f047a1d61df712ecc73b3db33995121abfba2df8f9283ef69f4a0d897266d7d476010bfcfa5fdea109b265f82fe4df8904cd6d05c6c SHA512 701dd5317b0395523be89123d473f4da5c3ff53c2e30004a922f649f0dbbd97546ee39ab34fce06278a8148c13200ca383726a0822d09846fad6e308f29e42c7
+DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bda0015f159341a7bca2245d708abaa283f9a8f505a320a0b446166b36106cd9f54e885a02cb486168c87a2a7f SHA512 9af31f8824431e9d28267c468dafc7cfc4062b1a280ca141036bc28a2ba544c4470a67955b5e5fbcc6c175435812381013b4c5d3d3d1a175d5efc7b802ae9b3b
diff --git a/net-fs/libnfs/files/libnfs-1.9.5-headers.patch b/net-fs/libnfs/files/libnfs-1.9.5-headers.patch
deleted file mode 100644
index 96719ffd54c2..000000000000
--- a/net-fs/libnfs/files/libnfs-1.9.5-headers.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 0bfc3e09b7d7ca2b75d42c17874b89333b96f371 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger
-Date: Mon, 3 Dec 2012 22:30:04 -0500
-Subject: [PATCH] fix implicit decl warnings
-
-Include the proper headers to fix warnings like:
-libnfs-sync.c:1529:3: warning: implicit declaration of function 'gettimeofday' [-Wimplicit-function-declaration]
-libnfs-zdr.c:506:2: warning: implicit declaration of function 'getuid' [-Wimplicit-function-declaration]
-
-Signed-off-by: Mike Frysinger
----
- lib/libnfs-sync.c | 1 +
- lib/libnfs-zdr.c | 9 +++++++++
- lib/libnfs.c | 1 +
- lib/socket.c | 1 +
- 4 files changed, 12 insertions(+)
-
-diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
-index 0fc1094..c140258 100644
---- a/lib/libnfs-sync.c
-+++ b/lib/libnfs-sync.c
-@@ -77,6 +77,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
-diff --git a/lib/libnfs-zdr.c b/lib/libnfs-zdr.c
-index c32f661..b6b3ed9 100644
---- a/lib/libnfs-zdr.c
-+++ b/lib/libnfs-zdr.c
-@@ -20,6 +20,10 @@
- * i.e. zdrmem_create() buffers.
- * It aims to be compatible with normal rpcgen generated functions.
- */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #ifdef WIN32
- #include "win32_compat.h"
- #endif
-@@ -28,9 +32,14 @@
- #include "aros_compat.h"
- #endif
-
-+#ifdef HAVE_ARPA_INET_H
-+#include
-+#endif
-+
- #include
- #include
- #include
-+#include
- #include "libnfs-zdr.h"
-
- struct opaque_auth _null_auth;
-diff --git a/lib/libnfs.c b/lib/libnfs.c
-index 5692dc3..0a7d139 100644
---- a/lib/libnfs.c
-+++ b/lib/libnfs.c
-@@ -73,6 +73,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
-diff --git a/lib/socket.c b/lib/socket.c
-index 3f7f89f..f8db957 100644
---- a/lib/socket.c
-+++ b/lib/socket.c
-@@ -68,6 +68,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include "libnfs-zdr.h"
- #include "libnfs.h"
---
-2.0.0
-
diff --git a/net-fs/libnfs/files/libnfs-1.9.5-implicit-internal.patch b/net-fs/libnfs/files/libnfs-1.9.5-implicit-internal.patch
deleted file mode 100644
index e702c81f5cb4..000000000000
--- a/net-fs/libnfs/files/libnfs-1.9.5-implicit-internal.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2be32c3c41207c029f54ebd0f4aa08e216bd3c21 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger
-Date: Fri, 8 Aug 2014 05:45:32 -0400
-Subject: [PATCH 3/3] fix implicit decls of rpc_{g,s}et_error
-
-Signed-off-by: Mike Frysinger
----
- lib/libnfs-zdr.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/libnfs-zdr.c b/lib/libnfs-zdr.c
-index b6b3ed9..90abe26 100644
---- a/lib/libnfs-zdr.c
-+++ b/lib/libnfs-zdr.c
-@@ -41,6 +41,9 @@
- #include
- #include
- #include "libnfs-zdr.h"
-+#include "libnfs.h"
-+#include "libnfs-raw.h"
-+#include "libnfs-private.h"
-
- struct opaque_auth _null_auth;
-
---
-2.0.0
-
diff --git a/net-fs/libnfs/files/libnfs-3.0.0-utils.patch b/net-fs/libnfs/files/libnfs-3.0.0-utils.patch
new file mode 100644
index 000000000000..b26716158b59
--- /dev/null
+++ b/net-fs/libnfs/files/libnfs-3.0.0-utils.patch
@@ -0,0 +1,20 @@
+diff --git a/configure.ac b/configure.ac
+index a1f51d0..f96879a 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,11 +25,13 @@ fi
+ AC_SYS_LARGEFILE
+
+ #option: utils
++MAYBE_UTILS="utils"
+ AC_ARG_ENABLE([utils],
+ [AC_HELP_STRING([--enable-utils],
+ [Build util programs])],
+- [MAYBE_UTILS=""],
+- [MAYBE_UTILS="utils"])
++ [if test $enableval = no ; then
++ MAYBE_UTILS=""
++ fi])
+ AC_SUBST(MAYBE_UTILS)
+
+ #option: examples
diff --git a/net-fs/libnfs/libnfs-1.10.0.ebuild b/net-fs/libnfs/libnfs-1.10.0.ebuild
deleted file mode 100644
index edc14e1cdcd6..000000000000
--- a/net-fs/libnfs/libnfs-1.10.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools-utils eutils
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
-fi
-
-DESCRIPTION="Client library for accessing NFS shares over a network"
-HOMEPAGE="https://github.com/sahlberg/libnfs"
-
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/8" # sub-slot matches SONAME major
-IUSE="examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_install() {
- autotools-utils_src_install
- if use examples; then
- # --enable-examples configure switch just compiles them
- # better install sources instead
- exeinto /usr/share/doc/${PF}/examples/
- for program in $(grep PROGRAMS examples/Makefile.am | cut -d= -f2); do
- doexe examples/${program}.c
- done
- fi
-}
diff --git a/net-fs/libnfs/libnfs-1.11.0.ebuild b/net-fs/libnfs/libnfs-1.11.0.ebuild
deleted file mode 100644
index edc14e1cdcd6..000000000000
--- a/net-fs/libnfs/libnfs-1.11.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools-utils eutils
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
-fi
-
-DESCRIPTION="Client library for accessing NFS shares over a network"
-HOMEPAGE="https://github.com/sahlberg/libnfs"
-
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/8" # sub-slot matches SONAME major
-IUSE="examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_install() {
- autotools-utils_src_install
- if use examples; then
- # --enable-examples configure switch just compiles them
- # better install sources instead
- exeinto /usr/share/doc/${PF}/examples/
- for program in $(grep PROGRAMS examples/Makefile.am | cut -d= -f2); do
- doexe examples/${program}.c
- done
- fi
-}
diff --git a/net-fs/libnfs/libnfs-1.9.5.ebuild b/net-fs/libnfs/libnfs-1.9.5.ebuild
deleted file mode 100644
index 1ddf85203797..000000000000
--- a/net-fs/libnfs/libnfs-1.9.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools-utils eutils
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
- KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86"
-fi
-
-DESCRIPTION="Client library for accessing NFS shares over a network"
-HOMEPAGE="https://github.com/sahlberg/libnfs"
-
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-IUSE="examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.9.5-headers.patch
- "${FILESDIR}"/${PN}-1.9.5-implicit-internal.patch
-)
-
-src_install() {
- autotools-utils_src_install
- if use examples; then
- # --enable-examples configure switch just compiles them
- # better install sources instead
- exeinto /usr/share/doc/${PF}/examples/
- for program in $(grep PROGRAMS examples/Makefile.am | cut -d= -f2); do
- doexe examples/${program}.c
- done
- fi
-}
diff --git a/net-fs/libnfs/libnfs-1.9.8.ebuild b/net-fs/libnfs/libnfs-3.0.0.ebuild
similarity index 68%
rename from net-fs/libnfs/libnfs-1.9.8.ebuild
rename to net-fs/libnfs/libnfs-3.0.0.ebuild
index edc14e1cdcd6..96606a99d49c 100644
--- a/net-fs/libnfs/libnfs-1.9.8.ebuild
+++ b/net-fs/libnfs/libnfs-3.0.0.ebuild
@@ -1,34 +1,48 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools-utils eutils
+inherit autotools
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
inherit git-r3
+ EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
else
SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+ S="${WORKDIR}/${PN}-${P}"
fi
DESCRIPTION="Client library for accessing NFS shares over a network"
HOMEPAGE="https://github.com/sahlberg/libnfs"
LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/8" # sub-slot matches SONAME major
-IUSE="examples static-libs"
+SLOT="0/12" # sub-slot matches SONAME major
+IUSE="examples static-libs utils"
RDEPEND=""
DEPEND="${RDEPEND}
virtual/pkgconfig"
-S="${WORKDIR}/${PN}-${P}"
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.0-utils.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable utils)
+ )
+ econf "${myeconfargs[@]}"
+}
src_install() {
- autotools-utils_src_install
+ default
if use examples; then
# --enable-examples configure switch just compiles them
# better install sources instead
@@ -37,4 +51,5 @@ src_install() {
doexe examples/${program}.c
done
fi
+ find "${ED}" -name "*.la" -delete || die
}
diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild
index 958c36a1dd24..96606a99d49c 100644
--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-9999.ebuild
@@ -1,42 +1,48 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools autotools-utils eutils
+inherit autotools
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
inherit git-r3
+ EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
else
SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+ S="${WORKDIR}/${PN}-${P}"
fi
DESCRIPTION="Client library for accessing NFS shares over a network"
HOMEPAGE="https://github.com/sahlberg/libnfs"
LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/11" # sub-slot matches SONAME major
-IUSE="examples static-libs"
+SLOT="0/12" # sub-slot matches SONAME major
+IUSE="examples static-libs utils"
RDEPEND=""
DEPEND="${RDEPEND}
virtual/pkgconfig"
-S="${WORKDIR}/${PN}-${P}"
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.0-utils.patch"
+)
src_prepare() {
default
-
- epatch_user
-
eautoreconf
}
+src_configure() {
+ local myeconfargs=(
+ $(use_enable static-libs static)
+ $(use_enable utils)
+ )
+ econf "${myeconfargs[@]}"
+}
+
src_install() {
- autotools-utils_src_install
+ default
if use examples; then
# --enable-examples configure switch just compiles them
# better install sources instead
@@ -45,4 +51,5 @@ src_install() {
doexe examples/${program}.c
done
fi
+ find "${ED}" -name "*.la" -delete || die
}
diff --git a/net-fs/libnfs/metadata.xml b/net-fs/libnfs/metadata.xml
index 0a94e5f6ef13..bdbf712883c6 100644
--- a/net-fs/libnfs/metadata.xml
+++ b/net-fs/libnfs/metadata.xml
@@ -5,6 +5,9 @@
base-system@gentoo.org
Gentoo Base System
+
+ Build/install nfs-{cat,ls,cp} utils
+
sahlberg/libnfs
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 1fcd918e7d63..e4801d38fea9 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 3a522b3bd17b..616a869958e3 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,2 +1 @@
-DIST konversation-1.7.4.tar.xz 3737732 BLAKE2B 585ce998bba94fe928c40c41e360d2dbdf5b5f2be586f8dcbf543c4e4c9a6ff8df428c325d638e21c0b54ae2d82875d2cc53e38f8abb01827428652b138ff600 SHA512 8d30fc0c0e533f1fa3268f8360eb5b9321b505fca3103ce189f707247345b2b2c409f590ce45d6fb129a76fc642a4e9f6a802c244a0a3e56aded422ddf4ed19a
DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
diff --git a/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch b/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch
deleted file mode 100644
index 46508bf20a23..000000000000
--- a/net-irc/konversation/files/konversation-1.7.4-qt-5.11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5740a0fdb6805c2e26dce20555a946da8485fe50 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Mon, 19 Mar 2018 17:13:30 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (missing QTabWidget)
-
-Reviewers: #konversation
-
-Differential Revision: https://phabricator.kde.org/D11490
----
- src/dcc/transferdetailedinfopanel.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/dcc/transferdetailedinfopanel.h b/src/dcc/transferdetailedinfopanel.h
-index e8debbc0..0e7391de 100644
---- a/src/dcc/transferdetailedinfopanel.h
-+++ b/src/dcc/transferdetailedinfopanel.h
-@@ -16,6 +16,7 @@
- #include "ui_transferdetailedinfopanelui.h"
- #include "ui_transferdetailedtimeinfopanelui.h"
-
-+#include
-
- class QTimer;
-
---
-2.16.2
-
diff --git a/net-irc/konversation/konversation-1.7.4-r1.ebuild b/net-irc/konversation/konversation-1.7.4-r1.ebuild
deleted file mode 100644
index d16bd9092d16..000000000000
--- a/net-irc/konversation/konversation-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A user friendly IRC Client"
-HOMEPAGE="https://www.kde.org/applications/internet/konversation/ https://konversation.kde.org"
-SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+crypt"
-
-DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kemoticons)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kidletime)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- media-libs/phonon[qt5(+)]
- sys-devel/gettext
- crypt? ( app-crypt/qca:2[qt5(+)] )
-"
-RDEPEND="${DEPEND}
- !net-irc/konversation:4
- crypt? ( app-crypt/qca:2[ssl] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package crypt Qca-qt5)
- )
-
- kde5_src_configure
-}
-
-src_install() {
- kde5_src_install
-
- # Bug 616162
- insinto /etc/xdg
- doins "${FILESDIR}"/konversationrc
-}
diff --git a/net-irc/konversation/konversation-1.7.5.ebuild b/net-irc/konversation/konversation-1.7.5.ebuild
index 9b24e2c65001..412eb10ff27c 100644
--- a/net-irc/konversation/konversation-1.7.5.ebuild
+++ b/net-irc/konversation/konversation-1.7.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kde.org/applications/internet/konversation/ https://konver
SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+crypt"
DEPEND="
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index b7a32f757c67..1758a11c096f 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libtrace/Manifest b/net-libs/libtrace/Manifest
index 32c44aa9c743..1465b65dbeeb 100644
--- a/net-libs/libtrace/Manifest
+++ b/net-libs/libtrace/Manifest
@@ -1,2 +1,2 @@
-DIST libtrace-4.0.2.tar.gz 934255 BLAKE2B 776761288aadbafc812695db9b2af7f2ace3789925e957ae5bd6bfbdb883e49af324a903ea66e303e151300e8a31467b270a45e2dab4d8af1fe2b0e981f188ea SHA512 246fb1812b9c46b7ef543c16159849bb420db633b0778a375f616286cc26988d42542dcecd47256c03d637ceaa97d60168f0ce34b9892d957a3bcae89d984514
DIST libtrace-4.0.3.tar.gz 938865 BLAKE2B b3f7cda52f18fe2905f53af61459c238fe2630c1ffca8189ed73c010a6fd057f04beca9979fc0f515de4797f1aee383b57ddc63dc9a08a88bae5946a9949f010 SHA512 08da665ed355b48daa006119261af7dc1c1a64c193efcd736e91394753f4b3c46af074044d970242d2396389577d92137264acdbb6ab70cdc69a6e3965f742ae
+DIST libtrace-4.0.4.tar.gz 949490 BLAKE2B 63b4e3bee7502deabbb07891ffe81fbed81f6b3b6c8b78148b035565fbb4e9f8302ee8f824e35584e68c453e61b0459f5a602b471330e6e0abae747a80f65872 SHA512 255a0654f762f9185ef70969225a160c017d50e0b01d1e90c31f555c1ebf5ce6509931f0c78bbed183e670d6acecb68e23efb8009a0e236fddd3a8f032401def
diff --git a/net-libs/libtrace/libtrace-4.0.3.ebuild b/net-libs/libtrace/libtrace-4.0.3.ebuild
index a639a3ebd159..30734d72f4b6 100644
--- a/net-libs/libtrace/libtrace-4.0.3.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.3.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="A library and tools for trace processing"
HOMEPAGE="http://research.wand.net.nz/software/libtrace.php"
SRC_URI="http://research.wand.net.nz/software/${PN}/${P/_/-}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc ncurses numa static-libs"
diff --git a/net-libs/libtrace/libtrace-4.0.2.ebuild b/net-libs/libtrace/libtrace-4.0.4.ebuild
similarity index 94%
rename from net-libs/libtrace/libtrace-4.0.2.ebuild
rename to net-libs/libtrace/libtrace-4.0.4.ebuild
index bb592018d475..30734d72f4b6 100644
--- a/net-libs/libtrace/libtrace-4.0.2.ebuild
+++ b/net-libs/libtrace/libtrace-4.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ DESCRIPTION="A library and tools for trace processing"
HOMEPAGE="http://research.wand.net.nz/software/libtrace.php"
SRC_URI="http://research.wand.net.nz/software/${PN}/${P/_/-}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc ncurses numa static-libs"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index cce000050a2b..98dc8501d56c 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,6 +1,6 @@
DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
-DIST node-v10.4.1.tar.xz 19663396 BLAKE2B 2490ba251c1a10fa2b4a9b0601e512a3c2d8e7ac6711b1a207f2abccc49bbe8623f8428cf86d20311fb6127ff95110c7b5590b0c39ccdc0625dc31127e3af0da SHA512 83f4a4b630d930ec1a05ca72cba0cf3e89ba07b6e928e5b9913fe6ee8032927a6f03575253514c6a081d26cbbfd865ea2da64ff3935813a06615f16af2af2a9f
DIST node-v10.5.0.tar.xz 19700916 BLAKE2B eb687776a4e51f9eba30ba0ff293bfb9a7f30443191bd2023edd6d41e973e58c13c8d783a48fa34e500769e9b8846b45abf28e5406bb443e9df1409a382a15bf SHA512 f22774d604e552fc105054aea531486ec84995e3e20c482c098dff5ddbcda41674423a98ee86f3a44245d3cb3e57a9c7c7ff31baf9539576bb1d3b74cf1a983d
+DIST node-v10.6.0.tar.xz 19741864 BLAKE2B f94ba788b4510b93e4ec556d0452da713e380621d9b3cc65a47fb0ac91766b4b25ec1f6dd06f35f621dd2d18781186a2a90aae7d728803ae221c08dd015139ba SHA512 c9434d8ea362aa8ea41053013bbd69fc5b5f4e133f9662419947919d29c246950ffad4d262cf9a252bc9f8a0cc63676947c8f0b83135a120c031d71ca37f4fd8
DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
diff --git a/net-libs/nodejs/nodejs-10.4.1.ebuild b/net-libs/nodejs/nodejs-10.6.0.ebuild
similarity index 99%
rename from net-libs/nodejs/nodejs-10.4.1.ebuild
rename to net-libs/nodejs/nodejs-10.6.0.ebuild
index 45f560f36a3d..b02e635479a6 100644
--- a/net-libs/nodejs/nodejs-10.4.1.ebuild
+++ b/net-libs/nodejs/nodejs-10.6.0.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
"
RDEPEND="
- >=dev-libs/libuv-1.20.3:=
+ >=dev-libs/libuv-1.21.0:=
>=net-libs/http-parser-2.8.0:=
>=net-libs/nghttp2-1.29.0
sys-libs/zlib
diff --git a/net-libs/wandio/Manifest b/net-libs/wandio/Manifest
index ba43ec2187cc..453dfe6ef2da 100644
--- a/net-libs/wandio/Manifest
+++ b/net-libs/wandio/Manifest
@@ -1,2 +1,2 @@
-DIST wandio-1.0.4.tar.gz 381793 BLAKE2B 904eebcbe9ac1a08ea8b2d62691f32adb2575e4b2f5329ea1fc3af9e5b92e4851198db221cee91138d6b529d44c438b278c7a5c905d7adee226ae78b7db16274 SHA512 247e3fe26ca0732acf50549284bdce34b3e0afd6b7bc7a44a2188c67a5fb38417feca23e9428acae903941c3d0a9f077e05aae879199deed64711615cd4174a2
DIST wandio-1.0.5.tar.gz 385535 BLAKE2B a7911ab14ff9911ef19bf35b6e50d3f2e6dd0fa06f5689b6c353cc5ff2ee93175d7e758657f79fd35e7aff29fb1a4b4c343c30ab1e00a118ec3056ba9129cd60 SHA512 3bf2b4362355bb3db047ea12055b96cc6fdd759b4efbd9cf1caf05133ae9e7e1fab5f4a7e5eadda45d7c1b4dcf9aba1cf3a4c04bc23694934aa8aa67ec31e480
+DIST wandio-4.0.0.tar.gz 385706 BLAKE2B 7f6e7855a06ae2c23138598c5cf16c9a38f57932d488cf2c9d0fda2fe54e971b8e93b5768a487328afc2079add7f269cd8f0203314b06eb3d256f8739828c6fb SHA512 8ee4149439411e8ca784a434766c5c35144fb49c7166c2f135cf47625011815e2b27af5b61d75d6a4f9e64ab1091ce1cfd4ef114e34b57e0c53029be45f9369c
diff --git a/net-libs/wandio/wandio-1.0.5.ebuild b/net-libs/wandio/wandio-1.0.5.ebuild
index 295c4fa7e4eb..069c3be4975f 100644
--- a/net-libs/wandio/wandio-1.0.5.ebuild
+++ b/net-libs/wandio/wandio-1.0.5.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Library for transparent file I/O with compression"
HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="LGPL-3"
SLOT="0/2"
KEYWORDS="~amd64 ~x86"
IUSE="bzip2 http lzma lzo static-libs zlib"
diff --git a/net-libs/wandio/wandio-1.0.4.ebuild b/net-libs/wandio/wandio-4.0.0.ebuild
similarity index 75%
rename from net-libs/wandio/wandio-1.0.4.ebuild
rename to net-libs/wandio/wandio-4.0.0.ebuild
index aa7cbe4c16af..069c3be4975f 100644
--- a/net-libs/wandio/wandio-1.0.4.ebuild
+++ b/net-libs/wandio/wandio-4.0.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="Library for transparent file I/O with compression"
-HOMEPAGE="http://research.wand.net.nz/software/libwandio.php"
-SRC_URI="http://research.wand.net.nz/software/${PN}/${P}.tar.gz"
+HOMEPAGE="https://research.wand.net.nz/software/libwandio.php"
+SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="LGPL-3"
SLOT="0/2"
KEYWORDS="~amd64 ~x86"
IUSE="bzip2 http lzma lzo static-libs zlib"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 271867186c03..5b0947c4d226 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/casync/metadata.xml b/net-misc/casync/metadata.xml
index b5956467d232..5a566fd24bed 100644
--- a/net-misc/casync/metadata.xml
+++ b/net-misc/casync/metadata.xml
@@ -1,10 +1,7 @@
-
- mrueg@gentoo.org
- Manuel Rüger
-
+
Enable fuse support
Build and install man pages
diff --git a/net-misc/icaclient/icaclient-13.10.0.20.ebuild b/net-misc/icaclient/icaclient-13.10.0.20.ebuild
index ee8e17fda098..09f7c5ef1a86 100644
--- a/net-misc/icaclient/icaclient-13.10.0.20.ebuild
+++ b/net-misc/icaclient/icaclient-13.10.0.20.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
media-libs/libogg
media-libs/libvorbis
media-libs/speex
- net-dns/libidn
+ net-dns/libidn:1.33
net-libs/libsoup:2.4
net-misc/curl
sys-libs/e2fsprogs-libs
diff --git a/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild b/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
index 6f5258ae80f7..6de1b07173b3 100644
--- a/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
+++ b/net-misc/icaclient/icaclient-13.8.0.10299729-r1.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
media-libs/libogg
media-libs/libvorbis
media-libs/speex
- net-dns/libidn
+ net-dns/libidn:1.33
net-libs/libsoup:2.4
sys-libs/e2fsprogs-libs
sys-libs/zlib
diff --git a/net-misc/icaclient/icaclient-13.9.1.6.ebuild b/net-misc/icaclient/icaclient-13.9.1.6.ebuild
index 43759820b120..adccfce74fe8 100644
--- a/net-misc/icaclient/icaclient-13.9.1.6.ebuild
+++ b/net-misc/icaclient/icaclient-13.9.1.6.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
media-libs/libogg
media-libs/libvorbis
media-libs/speex
- net-dns/libidn
+ net-dns/libidn:1.33
net-libs/libsoup:2.4
sys-libs/e2fsprogs-libs
sys-libs/zlib
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 2455b87a7b0b..364e949bb86c 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,3 +1,2 @@
-DIST miniupnpd-2.0.20180410.tar.gz 224736 BLAKE2B 76bb4eba8cd3985ff46b1e46543018171a44cee636affb6db75c7b4bfcfa5ef19a678a23467280cf7d199b8fe332cfae6595848c4a2446da2095aecadb82d5f6 SHA512 4a3392b3883e72689e6160941b80533f7254dbaf54407fe2899caef8848d7dbe82ece6079fc39446c162053c1ea1dc10912af0a31d71eb16fbfbec0029dbc645
-DIST miniupnpd-2.0.20180422.tar.gz 224942 BLAKE2B 62ec30de6d3551b9f31ed7eb81ceffaf75eeaa91236114f5532218d748e148574fdc195447beecc5cfd6898c2fe28f3e9bf15755979cf34633388194301a51dc SHA512 338ebb03edfd9448a91277c3cc47843a45c1ee9d9e43ba52cd5f897cca8ddc5cbb53dd291056d30a906c68a5dfe0e5eb50169f7ffefab003fcf440de46b83f42
DIST miniupnpd-2.0.20180503.tar.gz 225454 BLAKE2B d08c1fe050fce4a6f2348ff17f9d03feae04ca99a1b70fd7cc1734f56374f2be73708c5b495cf1a23ae76bd1f0042a90442793a87adb3ed9d0c49678dd8eb0b8 SHA512 7615f28d8e41bbe5b7343159a526ba33e643d14e2be7c2382461fda36ecfb3420ef2903e0cc9fa92ffe376f8609feb9403a316244eec0459e78a6b5ad96462ee
+DIST miniupnpd-2.1.20180706.tar.gz 233675 BLAKE2B 641be6dc6a32383a02711139ac56236dc285041f2bda595a909ed5281a5163d1300212892e011f6256c6cf73b877f0e5e2e93efbfb08a77b0ae7d3dde94c28f6 SHA512 90881e08754f9fe3d1ef01da1fe437626d1fef09bea5eab9c1bcf3347e1197038ab87de8c7c454083ba90a86760230a323a6c293307b0fcecefbd5cfb658d227
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20180422.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20180422.ebuild
deleted file mode 100644
index 9f786c4d43a2..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.0.20180422.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
- net-libs/libnfnetlink:=
- net-libs/libmnl:=
- dev-libs/gmp:0=
- sys-apps/util-linux
- dev-libs/openssl:0="
-DEPEND="${RDEPEND}
- sys-apps/lsb-release"
-
-src_prepare() {
- default
- mv Makefile.linux Makefile || die
-}
-
-src_configure() {
- local -a opts
- opts=(
- --vendorcfg
- $(usex igd2 '--igd2' '')
- $(usex ipv6 '--ipv6' '')
- $(usex leasefile '--leasefile' '')
- $(usex portinuse '--portinuse' '')
- $(usex pcp-peer '--pcp-peer' '')
- $(usex strict '--strict' '')
- )
-
- emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
- # By default, it builds a bunch of unittests that are missing wrapper
- # scripts in the tarball
- emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
- emake PREFIX="${ED}" STRIP=true install
-
- newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
- newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-pkg_postinst() {
- elog "Please correct the external interface in the top of the two"
- elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20180410.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20180706.ebuild
similarity index 100%
rename from net-misc/miniupnpd/miniupnpd-2.0.20180410.ebuild
rename to net-misc/miniupnpd/miniupnpd-2.1.20180706.ebuild
diff --git a/net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild b/net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild
index ec826724d25f..af216cb7ee05 100644
--- a/net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild
+++ b/net-misc/netpipe/netpipe-1.0.0_beta2-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=0
inherit toolchain-funcs
DESCRIPTION="tool to reliably distribute binary data using UDP broadcasting techniques"
-HOMEPAGE="http://www.wudika.de/~jan/netpipe/"
-SRC_URI="http://www.wudika.de/~jan/${PN}/${PN}.tar.gz"
+HOMEPAGE="https://www.wudika.de/~jan/netpipe/"
+SRC_URI="https://www.wudika.de/~jan/${PN}/${PN}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild b/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild
new file mode 100644
index 000000000000..dbdaac08b108
--- /dev/null
+++ b/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="tool to reliably distribute binary data using UDP broadcasting techniques"
+HOMEPAGE="https://www.wudika.de/~jan/netpipe/"
+SRC_URI="https://www.wudika.de/~jan/${PN}/${PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ sed -i \
+ -e "s:^OPT=.*:OPT = ${CFLAGS} ${LDFLAGS}:" \
+ -e "s:^CC=.*:CC = $(tc-getCC):" \
+ Makefile || die "sed failed"
+ default
+}
+
+src_install() {
+ dobin netpipe
+ dodoc DOCUMENTATION INSTALL TECH-NOTES
+}
diff --git a/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild b/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild
index a32e5c187ac6..4c8855a3fede 100644
--- a/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild
+++ b/net-misc/netpipe/netpipe-1.0.0_beta2.ebuild
@@ -6,8 +6,8 @@ EAPI=0
inherit toolchain-funcs
DESCRIPTION="tool to reliably distribute binary data using UDP broadcasting techniques"
-HOMEPAGE="http://www.wudika.de/~jan/netpipe/"
-SRC_URI="http://www.wudika.de/~jan/netpipe/${PN}.tar.gz"
+HOMEPAGE="https://www.wudika.de/~jan/netpipe/"
+SRC_URI="https://www.wudika.de/~jan/netpipe/${PN}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.4.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.4.ebuild
index 6a30526364ca..cd96e2fddf41 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.4.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
IUSE="gtk test"
RDEPEND="
diff --git a/net-misc/networkmanager/networkmanager-1.10.10.ebuild b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
index 3d3830010e12..c5534157fd1f 100644
--- a/net-misc/networkmanager/networkmanager-1.10.10.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
?? ( consolekit elogind systemd )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
# gobject-introspection-0.10.3 is needed due to gnome bug 642300
# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/snarf/snarf-7.0-r3.ebuild b/net-misc/snarf/snarf-7.0-r3.ebuild
index ad4c94916f16..398ad27531d0 100644
--- a/net-misc/snarf/snarf-7.0-r3.ebuild
+++ b/net-misc/snarf/snarf-7.0-r3.ebuild
@@ -7,8 +7,8 @@ inherit eutils
IUSE=""
DESCRIPTION="Small and fast CLI resource grabber for http, gopher, finger, ftp"
-SRC_URI="http://www.xach.com/snarf/${P}.tar.gz"
-HOMEPAGE="http://www.xach.com/snarf/"
+SRC_URI="https://www.xach.com/snarf/${P}.tar.gz"
+HOMEPAGE="https://www.xach.com/snarf/"
KEYWORDS="alpha amd64 ppc sparc x86"
LICENSE="GPL-2"
SLOT="0"
diff --git a/net-misc/snarf/snarf-7.0-r4.ebuild b/net-misc/snarf/snarf-7.0-r4.ebuild
new file mode 100644
index 000000000000..dacf70a7a6c3
--- /dev/null
+++ b/net-misc/snarf/snarf-7.0-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Small and fast CLI resource grabber for http, gopher, finger, ftp"
+HOMEPAGE="https://www.xach.com/snarf/"
+SRC_URI="https://www.xach.com/snarf/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}"/snarf-basename-patch.diff
+ "${FILESDIR}"/snarf-unlink-empty.diff
+ "${FILESDIR}"/snarf-fix-off-by-ones.diff
+)
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin snarf
+ doman snarf.1
+ dodoc ChangeLog README TODO
+}
+
+pkg_postinst() {
+ elog 'To use snarf with portage, try these settings in your make.conf'
+ elog
+ elog ' FETCHCOMMAND="/usr/bin/snarf -b \${URI} \${DISTDIR}/\${FILE}"'
+ elog ' RESUMECOMMAND="/usr/bin/snarf -rb \${URI} \${DISTDIR}/\${FILE}"'
+}
diff --git a/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch b/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch
new file mode 100644
index 000000000000..2329813defd8
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch
@@ -0,0 +1,20 @@
+From: Mihai Moldovan
+Date: Thu, 5 Jul 2018 06:52:18 +0000 (+0200)
+Subject: src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+.
+X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff_plain;h=ce14cfda34175b6456a8cc7d1e336dce2b0b0682
+
+src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+.
+---
+
+diff --git a/src/printwidget.cpp b/src/printwidget.cpp
+index 58a8af7..131d340 100644
+--- a/src/printwidget.cpp
++++ b/src/printwidget.cpp
+@@ -23,6 +23,7 @@
+ #include "x2gosettings.h"
+ #include "x2gologdebug.h"
+ #include
++#include
+ #ifdef Q_OS_WIN
+ #include "wapi.h"
+ #endif
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
index ae8b67cda78e..3b19d9115649 100644
--- a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit eutils gnome2-utils qmake-utils
+inherit desktop gnome2-utils qmake-utils
DESCRIPTION="The X2Go Qt client"
HOMEPAGE="http://www.x2go.org"
@@ -32,6 +32,10 @@ RDEPEND="${COMMON_DEPEND}
CLIENT_BUILD="${WORKDIR}"/${P}.client_build
PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
+PATCHES=(
+ "${FILESDIR}/${P}-qt511.patch"
+)
+
src_prepare() {
default
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 63cf4b7ad511..0695551bcf22 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index ca1d7e95537a..959505f8846c 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,3 +1,4 @@
DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da SHA512 f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd SHA512 b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725
DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e SHA512 29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17
+DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b SHA512 b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43
diff --git a/net-vpn/tinc/files/tinc-1.1-fix-paths.patch b/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
similarity index 100%
rename from net-vpn/tinc/files/tinc-1.1-fix-paths.patch
rename to net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
diff --git a/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch b/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
new file mode 100644
index 000000000000..30cafee87878
--- /dev/null
+++ b/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
@@ -0,0 +1,55 @@
+diff -Naur tinc-1.1pre16.orig/src/names.c tinc-1.1pre16/src/names.c
+--- tinc-1.1pre16.ori/src/names.c 2018-04-02 10:41:12.000000000 -0400
++++ tinc-1.1pre16/src/names.c 2018-07-06 15:11:35.970680875 -0400
+@@ -103,47 +103,13 @@
+ }
+
+ #else
+- bool fallback = false;
+-
+- if(daemon) {
+- if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK)) {
+- fallback = true;
+- }
+- } else {
+- char fname[PATH_MAX];
+- snprintf(fname, sizeof(fname), LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
+-
+- if(access(fname, R_OK)) {
+- snprintf(fname, sizeof(fname), "%s" SLASH "pid", confbase);
+-
+- if(!access(fname, R_OK)) {
+- fallback = true;
+- }
+- }
++ if(!logfilename) {
++ xasprintf(&logfilename, "/var/log" SLASH "%s.log", identname);
+ }
+
+- if(!fallback) {
+- if(!logfilename) {
+- xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
+- }
+-
+- if(!pidfilename) {
+- xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
+- }
+- } else {
+- if(!logfilename) {
+- xasprintf(&logfilename, "%s" SLASH "log", confbase);
+- }
+-
+- if(!pidfilename) {
+- if(daemon) {
+- logger(DEBUG_ALWAYS, LOG_WARNING, "Could not access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, strerror(errno), confbase);
+- }
+-
+- xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
+- }
++ if(!pidfilename) {
++ xasprintf(&pidfilename, "/run" SLASH "%s.pid", identname);
+ }
+-
+ #endif
+
+ if(!unixsocketname) {
diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild b/net-vpn/tinc/tinc-1.1_pre15.ebuild
index ea6d0816b40c..359469d9dc7a 100644
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre15.ebuild
@@ -49,13 +49,19 @@ if [[ -n ${UPSTREAM_VER} ]]; then
fi
PATCHES+=(
- "${FILESDIR}"/${PN}-1.1-fix-paths.patch #560528
+ "${FILESDIR}"/${PF}-fix-paths.patch #560528
"${FILESDIR}"/${PN}-1.1-tinfo.patch #621868
)
src_prepare() {
default
eautoreconf
+
+ # Fix the static (failing UNKNOWN) version in the autoconf
+ # NOTE: When updating the ebuild, make sure to check that this
+ # line number hasn't changed in the upstream sources.
+ sed -i "4d" configure.ac
+ sed -i "4iAC_INIT([tinc], ${PVR})" configure.ac
}
src_configure() {
diff --git a/net-vpn/tinc/tinc-1.1_pre16.ebuild b/net-vpn/tinc/tinc-1.1_pre16.ebuild
new file mode 100644
index 000000000000..919232287018
--- /dev/null
+++ b/net-vpn/tinc/tinc-1.1_pre16.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1 systemd
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/"
+
+# UPSTREAM_VER=1
+
+[[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
+ ${UPSTREAM_PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ gui? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ lzo? ( dev-libs/lzo:2 )
+ ncurses? ( sys-libs/ncurses:= )
+ readline? ( sys-libs/readline:= )
+ upnp? ( net-libs/miniupnpc )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+ vde? ( net-misc/vde )"
+S="${WORKDIR}/${MY_P}"
+
+# Upstream's patchset
+if [[ -n ${UPSTREAM_VER} ]]; then
+ PATCHES=( "${WORKDIR}"/patches-upstream )
+fi
+
+PATCHES+=(
+ "${FILESDIR}"/${PF}-fix-paths.patch #560528
+ "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868
+)
+
+src_prepare() {
+ default
+ eautoreconf
+
+ # Fix the static (failing UNKNOWN) version in the autoconf
+ # NOTE: When updating the ebuild, make sure to check that this
+ # line number hasn't changed in the upstream sources.
+ sed -i "6d" configure.ac
+ sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac
+}
+
+src_configure() {
+ econf \
+ --enable-jumbograms \
+ --disable-silent-rules \
+ --enable-legacy-protocol \
+ --disable-tunemu \
+ --with-systemd="$(systemd_get_systemunitdir)" \
+ $(use_enable lzo) \
+ $(use_enable ncurses curses) \
+ $(use_enable readline) \
+ $(use_enable uml) \
+ $(use_enable vde) \
+ $(use_enable zlib) \
+ $(use_enable upnp miniupnpc) \
+ $(use_with ssl openssl)
+ #--without-libgcrypt \
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodir /etc/tinc
+ dodoc AUTHORS NEWS README THANKS
+ doconfd "${FILESDIR}"/tinc.networks
+ newconfd "${FILESDIR}"/tincd.conf tincd
+ newinitd "${FILESDIR}"/tincd-r2 tincd
+
+ if use gui; then
+ python_fix_shebang "${ED}"/usr/bin/tinc-gui
+ else
+ rm -f "${ED}"/usr/bin/tinc-gui || die
+ fi
+}
+
+pkg_postinst() {
+ elog "This package requires the tun/tap kernel device."
+ elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 939897c5b370..cad9c3450c90 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 34faab85331e..45eaaa812e7a 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,2 +1,3 @@
DIST hostapd-2.6.tar.gz 1822341 BLAKE2B c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011 SHA512 e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981 SHA512 cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70
+DIST net-wireless_hostapd_2.6-r6_extras.tar.xz 11156 BLAKE2B 62205070d4dd081d4149616f1abb4f84105c77433464dc9fea41a3fa9f58cc09af99b4e6618657777e77759d33e38c8a5647537c0098e772f032a368b82be709 SHA512 c21155e16ef931e431cca54c0f83567915b511d7abe42a5b4a4475d40eda3616eb017f0a669fd7326bc4f410f9a8e174fb8e0619cb32631ab1ca22e6fad2c612
diff --git a/net-wireless/hostapd/hostapd-2.6-r4.ebuild b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
index a0403321ea59..6f00dd912468 100644
--- a/net-wireless/hostapd/hostapd-2.6-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
@@ -82,7 +82,7 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
- if use internal-tls && !use libressl; then
+ if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}
else
# SSL authentication methods
@@ -183,7 +183,7 @@ src_configure() {
src_compile() {
emake V=1
- if use libressl || !use internal-tls; then
+ if use libressl || ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -198,7 +198,7 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
- if use libressl || !use internal-tls; then
+ if use libressl || ! use internal-tls; then
dobin nt_password_hash hlr_auc_gw
fi
diff --git a/net-wireless/hostapd/hostapd-2.6-r5.ebuild b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
index 67f105b8c77a..82e50e8b7f08 100644
--- a/net-wireless/hostapd/hostapd-2.6-r5.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
@@ -85,7 +85,7 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
- if use internal-tls && !use libressl; then
+ if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}
else
# SSL authentication methods
@@ -186,7 +186,7 @@ src_configure() {
src_compile() {
emake V=1
- if use libressl || !use internal-tls; then
+ if use libressl || ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -201,7 +201,7 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
- if use libressl || !use internal-tls; then
+ if use libressl || ! use internal-tls; then
dobin nt_password_hash hlr_auc_gw
fi
diff --git a/net-wireless/hostapd/hostapd-2.6-r1.ebuild b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
similarity index 68%
rename from net-wireless/hostapd/hostapd-2.6-r1.ebuild
rename to net-wireless/hostapd/hostapd-2.6-r6.ebuild
index 8a0d613bea7d..484677f3913d 100644
--- a/net-wireless/hostapd/hostapd-2.6-r1.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
@@ -3,20 +3,26 @@
EAPI="6"
-inherit toolchain-funcs eutils systemd
-
-# bogus commit to force manifest regeneration #596462
+inherit toolchain-funcs eutils systemd savedconfig
DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+HOMEPAGE="http://w1.fi"
+EXTRAS_VER="2.6-r6"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="http://w1.fi/releases/${P}.tar.gz
+ https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
-
-DEPEND="ssl? ( dev-libs/openssl:*[-bindist] )
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? (
+ internal-tls? ( dev-libs/libtommath )
+ !internal-tls? ( dev-libs/openssl:0=[-bindist] )
+ )
kernel_linux? (
dev-libs/libnl:3
crda? ( net-wireless/crda )
@@ -28,18 +34,35 @@ RDEPEND="${DEPEND}"
S="${S}/${PN}"
+pkg_pretend() {
+ if use internal-tls; then
+ if use libressl; then
+ elog "libressl flag takes precedence over internal-tls"
+ else
+ ewarn "internal-tls implementation is experimental and provides fewer features"
+ fi
+ fi
+}
+
src_prepare() {
# Allow users to apply patches to src/drivers for example,
# i.e. anything outside ${S}/${PN}
pushd ../ >/dev/null || die
+
+ # Add LibreSSL compatibility patch bug (#567262)
+ eapply "${WORKDIR}/${EXTRAS_NAME}/${P}-libressl-compatibility.patch"
+
# https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
- eapply "${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
- eapply "${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
- eapply "${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
- eapply "${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
- eapply "${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
- eapply "${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
- eapply "${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
+ eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
+
+ eapply "${WORKDIR}/${EXTRAS_NAME}/nl80211-Fix-NL80211_ATTR_SMPS_MODE-encoding.patch"
+
default
popd >/dev/null || die
@@ -51,6 +74,12 @@ src_prepare() {
src_configure() {
local CONFIG="${S}/.config"
+ restore_config "${CONFIG}"
+ if [[ -f "${CONFIG}" ]]; then
+ default_src_configure
+ return 0
+ fi
+
# toolchain setup
echo "CC = $(tc-getCC)" > ${CONFIG}
@@ -59,7 +88,9 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
- if use ssl; then
+ if use internal-tls && ! use libressl; then
+ echo "CONFIG_TLS=internal" >> ${CONFIG}
+ else
# SSL authentication methods
echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
@@ -68,6 +99,7 @@ src_configure() {
echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
echo "CONFIG_TLSV11=y" >> ${CONFIG}
echo "CONFIG_TLSV12=y" >> ${CONFIG}
+ echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
fi
if use wps; then
@@ -91,7 +123,6 @@ src_configure() {
echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
- echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
einfo "Enabling drivers: "
@@ -100,8 +131,6 @@ src_configure() {
einfo " HostAP driver enabled"
echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
einfo " Wired driver enabled"
- echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
- einfo " Prism54 driver enabled"
echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
einfo " None driver enabled"
@@ -160,7 +189,7 @@ src_configure() {
src_compile() {
emake V=1
- if use ssl; then
+ if use libressl || ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -175,11 +204,13 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
- use ssl && dobin nt_password_hash hlr_auc_gw
+ if use libressl || ! use internal-tls; then
+ dobin nt_password_hash hlr_auc_gw
+ fi
- newinitd "${FILESDIR}"/${PN}-init.d ${PN}
- newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
- systemd_dounit "${FILESDIR}"/${PN}.service
+ newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
+ newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
+ systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
doman ${PN}{.8,_cli.1}
@@ -196,6 +227,8 @@ src_install() {
exeinto /etc/log.d/scripts/services/
doexe logwatch/${PN}
fi
+
+ save_config .config
}
pkg_postinst() {
diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild
index 7cf65530325c..2b99c9ab8875 100644
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -86,7 +86,7 @@ src_configure() {
echo "CONFIG_ERP=y" >> ${CONFIG}
echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
- if use internal-tls && !use libressl; then
+ if use internal-tls && ! use libressl; then
echo "CONFIG_TLS=internal" >> ${CONFIG}
else
# SSL authentication methods
@@ -187,7 +187,7 @@ src_configure() {
src_compile() {
emake V=1
- if use libressl || !use internal-tls; then
+ if use libressl || ! use internal-tls; then
emake V=1 nt_password_hash
emake V=1 hlr_auc_gw
fi
@@ -202,7 +202,7 @@ src_install() {
dosbin ${PN}
dobin ${PN}_cli
- if use libressl || !use internal-tls; then
+ if use libressl || ! use internal-tls; then
dobin nt_password_hash hlr_auc_gw
fi
diff --git a/net-wireless/linssid/Manifest b/net-wireless/linssid/Manifest
index 240b5a574f07..fbb32192ee6c 100644
--- a/net-wireless/linssid/Manifest
+++ b/net-wireless/linssid/Manifest
@@ -1,2 +1 @@
-DIST linssid_3.5.orig.tar.gz 396769 BLAKE2B f2d04af5d990a51cce8501309fcf14090e262b531ec6b914c3373d4bf0cb2d2bfed9ead81a21e2dfe5a3f7bf2cef3d400aadb216604317946a8dc4938298246a SHA512 874f428a6a6de34404b57601f016f9e417e75578ec5c5c0661fa614f2bde80d732132d31880f7b947a7178b0fcaf6b00bb3c317a652346d50009ce814b46f7b1
DIST linssid_3.6.orig.tar.gz 397541 BLAKE2B 35d56cc9439a3a117200c59a03dad3a53bbecbe522a5592ba4cd6a5d37332c4b8c6ec065b7357643bda6b7b54462d720e3ee0b3efcb5a80e14c809330d84fc2b SHA512 066c890776a23d0e5fe8518826c64edc4b7d6dcef28cd7ce58f842e52b9e2b13517358ca6df636613abd1e860b20c6b542b5df165de1aa262e1e7db8a60e00e5
diff --git a/net-wireless/linssid/linssid-3.5-r1.ebuild b/net-wireless/linssid/linssid-3.5-r1.ebuild
deleted file mode 100644
index 3b0e116ee02e..000000000000
--- a/net-wireless/linssid/linssid-3.5-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Graphical wireless scanning for Linux"
-HOMEPAGE="https://sourceforge.net/projects/linssid/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="policykit"
-
-DEPEND="dev-libs/boost:=
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- x11-libs/qwt:6[opengl,qt5(+),svg]"
-
-RDEPEND="net-wireless/iw
- x11-libs/libxkbcommon[X]
- policykit? ( sys-auth/polkit )
- !policykit? ( app-admin/sudo
- x11-libs/gksu )
- ${DEPEND}"
-
-S="${WORKDIR}/${P}/${PN}-app"
-
-DOCS=( README_${PV} )
-
-src_prepare() {
- # Use system qwt for compiling
- sed -i -e 's/CONFIG += release/CONFIG += release qwt/' linssid-app.pro || die
-
- # Fix lib path for x11-libs/qwt
- if use amd64; then
- sed -i -e "s/lib\/libqwt-qt5.so.6/\/$(get_libdir)\/libqwt6-qt5.so.6/" linssid-app.pro || die
- fi
-
- # Enable 'gksu' when a user don't want policykit
- if ! use policykit; then
- sed -i -e 's/Exec=.*/Exec=gksu linssid/' linssid.desktop || die
- fi
-
- default
-}
-
-src_configure() {
- eqmake5
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/net-wireless/linssid/linssid-3.6.ebuild b/net-wireless/linssid/linssid-3.6.ebuild
index 3b0e116ee02e..79d6ce72d296 100644
--- a/net-wireless/linssid/linssid-3.6.ebuild
+++ b/net-wireless/linssid/linssid-3.6.ebuild
@@ -37,9 +37,7 @@ src_prepare() {
sed -i -e 's/CONFIG += release/CONFIG += release qwt/' linssid-app.pro || die
# Fix lib path for x11-libs/qwt
- if use amd64; then
- sed -i -e "s/lib\/libqwt-qt5.so.6/\/$(get_libdir)\/libqwt6-qt5.so.6/" linssid-app.pro || die
- fi
+ sed -i -e '/libqwt-qt5.so.6/c\LIBS += -lqwt6-qt5' linssid-app.pro || die
# Enable 'gksu' when a user don't want policykit
if ! use policykit; then
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index a17a6921ca70..9b556bcf1876 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1 +1,2 @@
DIST lorcon-0.0_p20150109.tar.xz 259788 BLAKE2B e3bd188642f7ef49fa3b7361bd659fdd47d6449598b5248412ad3d8e85e5d0b9c0f8d73fdcd3d0822f19a0d069bf0eeb832bed7bb38c418970d617c03387d1ce SHA512 acbd88477317475ca8555d579a1483ea5e5d9eac0f86ef7bde2592e007025070ca56c6cd43e814560e28165ac7b40bd86f2703a466faeca1619b8373dc2b625b
+DIST lorcon-0.0_p20180409.tar.gz 506177 BLAKE2B d4bea3e91ce506c6ba56221b4fc2e25ffd5ba979b905e66166c570adefc513ca51229fab5706276dbbd1bea68ee2c2802adf4eeefb1e5f0c593fada6cb39ab51 SHA512 7273b68fa4aa7418d9bab8b4651b93e315b9ea55657efa7d14ef444fda7e0e036267d319cda6676951e54b661391a77cc848778f859249a50847d33dac0b8ea9
diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
index c10482d2cdfb..702bd34a3a2d 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
new file mode 100644
index 000000000000..0348df635401
--- /dev/null
+++ b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A generic library for injecting 802.11 frames"
+HOMEPAGE="https://github.com/kismetwireless/lorcon"
+
+if [[ ${PV} == "9999" ]] ; then
+ #EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git"
+ EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git"
+ inherit git-r3
+ KEYWORDS=""
+ S="${WORKDIR}"/${P}
+else
+ GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
+ SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}"/"${PN}-${GIT_HASH}"
+ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="python"
+
+DEPEND="
+ python? ( ${PYTHON_DEPS} )
+ dev-libs/libnl:3=
+ net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-r3_src_unpack
+ cp -R "${S}/" "${WORKDIR}/all"
+ fi
+ default_src_unpack
+}
+
+src_prepare() {
+ sed -i 's##"../lorcon.h"#' pylorcon2/PyLorcon2.c
+ sed -i 's##"../lorcon.h"#' pylorcon2/PyLorcon2.h
+ sed -i 's##"../lorcon_packet.h"#' pylorcon2/PyLorcon2.c
+ sed -i 's##"../lorcon_packet.h"#' pylorcon2/PyLorcon2.h
+ sed -i 's##"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c
+ sed -i 's##"../lorcon_multi.h"#' pylorcon2/PyLorcon2.h
+ default
+ use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+ default_src_configure
+}
+
+src_compile() {
+ default_src_compile
+ if use python; then
+ LDFLAGS+=" -L${S}/.libs/"
+ cd pylorcon2 || die
+ distutils-r1_src_compile
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install
+ if use python; then
+ cd pylorcon2 || die
+ distutils-r1_src_install
+ fi
+}
+
+src_test() {
+ :
+}
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index f0502097ecd1..0348df635401 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
DISTUTILS_OPTIONAL=1
@@ -9,14 +9,18 @@ DISTUTILS_OPTIONAL=1
inherit distutils-r1
DESCRIPTION="A generic library for injecting 802.11 frames"
-HOMEPAGE="http://802.11ninja.net/lorcon"
+HOMEPAGE="https://github.com/kismetwireless/lorcon"
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://code.google.com/p/lorcon/"
+ #EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git"
+ EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git"
inherit git-r3
KEYWORDS=""
+ S="${WORKDIR}"/${P}
else
- SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+ GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
+ SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}"/"${PN}-${GIT_HASH}"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
fi
@@ -32,8 +36,6 @@ RDEPEND="${DEPEND}"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-S="${WORKDIR}"/${P}
-
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
git-r3_src_unpack
@@ -44,6 +46,12 @@ src_unpack() {
src_prepare() {
sed -i 's##"../lorcon.h"#' pylorcon2/PyLorcon2.c
+ sed -i 's##"../lorcon.h"#' pylorcon2/PyLorcon2.h
+ sed -i 's##"../lorcon_packet.h"#' pylorcon2/PyLorcon2.c
+ sed -i 's##"../lorcon_packet.h"#' pylorcon2/PyLorcon2.h
+ sed -i 's##"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c
+ sed -i 's##"../lorcon_multi.h"#' pylorcon2/PyLorcon2.h
+ default
use python && distutils-r1_src_prepare
}
diff --git a/perl-core/Archive-Tar/Archive-Tar-2.300.0.ebuild b/perl-core/Archive-Tar/Archive-Tar-2.300.0.ebuild
new file mode 100644
index 000000000000..fa4859ac4f82
--- /dev/null
+++ b/perl-core/Archive-Tar/Archive-Tar-2.300.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=BINGOS
+DIST_VERSION=2.30
+inherit perl-module
+
+DESCRIPTION="A Perl module for creation and manipulation of tar files"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+ >=virtual/perl-File-Spec-0.820.0
+ >=virtual/perl-IO-Compress-2.15.0
+ >=virtual/perl-IO-Zlib-1.10.0
+"
+DEPEND="${DEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Test-Harness-2.260.0
+ virtual/perl-Test-Simple
+ )
+"
+# TODO
+# Consider adding some sort of system for turning this stuff on, the
+# ENV vars GENTOO_TAR_BZIP2 and GENTOO_TAR_PTARDIFF exist for expert users,
+# but we can't regulate it by USE flags without creating a circular
+# dependency, specifically, the kind of circular dependency that
+# prohibits dev-lang/perl depending on virtual/perl-Archive-Tar
+# depending on perl-core/Archive-Tar, due to needing dev-perl/Text-Diff
+# that *will not be present* during perl upgrade.
+PATCHES=(
+ "${FILESDIR}/${PN}-2.30-makefileptar.patch"
+)
+PERL_RM_FILES=(
+ "t/99_pod.t"
+)
diff --git a/perl-core/Archive-Tar/Manifest b/perl-core/Archive-Tar/Manifest
new file mode 100644
index 000000000000..16252e1ab749
--- /dev/null
+++ b/perl-core/Archive-Tar/Manifest
@@ -0,0 +1 @@
+DIST Archive-Tar-2.30.tar.gz 63693 BLAKE2B aa7d1697984d76211e66d50488de1b7748f45187b7da946570342c7e9fda508325f1b9dc1263a5fc54d57809a91fc685b188de4c181c6935da0d2c18344c12e2 SHA512 7be2745d7c5b73cec9ef66968e6f28a4d4dcc0d80b41861e3aa2d4c27ba6c013cce6a87bba8a626888fcaa0d4ebecd17a7b09324215876f79ca9f39d671aed4b
diff --git a/perl-core/Archive-Tar/files/Archive-Tar-2.30-makefileptar.patch b/perl-core/Archive-Tar/files/Archive-Tar-2.30-makefileptar.patch
new file mode 100644
index 000000000000..dad52df5d344
--- /dev/null
+++ b/perl-core/Archive-Tar/files/Archive-Tar-2.30-makefileptar.patch
@@ -0,0 +1,130 @@
+From 14ecca4632b44461d3c23344027ec30eedba1b0a Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Fri, 6 Jul 2018 17:20:30 +1200
+Subject: Patch ptardiff support out conditional on ENV
+
+- Toggle installation and testing of ptardiff functionality to only
+ trigger when requested
+
+- Toggle testing of bzip2 support only when requested
+
+- Disable mechanics intended for user-perl environments where
+ installation is to somewhere that may fall outside PATH
+---
+ Makefile.PL | 46 +++++++++-------------------------------------
+ t/07_ptardiff.t | 11 +++++++++--
+ 2 files changed, 18 insertions(+), 39 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index fe093bd..0289409 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -9,19 +9,12 @@ unless( $] >= 5.005_03 ) {
+ die qq[Archive::Tar requires perl version 5.005_03 or higher to run\n];
+ }
+
+-if( !eval { require IO::Compress::Bzip2; 1 } and !$opt->{n} ) {
+- warn qq[You do not have IO::Compress::Bzip2 installed. This means you can ].
+- qq[not read or write bzip2 compressed archives!\n] .
+- qq[Note: you can disable this warning (and the prerequisite) ].
+- qq[by invoking Makefile.PL with '-n'\n];
++if( $ENV{GENTOO_TAR_BZIP2} ) {
++ require IO::Compress::Bzip2;
+ }
+
+-if( !$opt->{d} and not eval { require Text::Diff; 1 } ) {
+- print qq[\nArchive::Tar comes with a utility called 'ptardiff' which ].
+- qq[lets you run diffs against tar archives.\n\nHowever, this ].
+- qq[utility requires you to have Text::Diff installed.\n\n].
+- qq[To add Text::Diff as a prerequisite, please supply the ].
+- qq['-d' option when invoking this Makefile.PL.\n\n];
++if ( $ENV{GENTOO_TAR_PTARDIFF} ) {
++ require Text::Diff;
+ }
+
+ my $prereqs = {
+@@ -45,10 +38,10 @@ unless ($Config{useperlio}) {
+ }
+
+ ### ok, you didn't want IO::Zlib ###
+-delete $prereqs->{'IO::Compress::Bzip2'} if $opt->{n};
++delete $prereqs->{'IO::Compress::Bzip2'} unless $ENV{GENTOO_TAR_BZIP2};
+
+ ### so you want text::diff ###
+-$prereqs->{'Text::Diff'} = 0 if $opt->{d};
++$prereqs->{'Text::Diff'} = 0 if $ENV{GENTOO_TAR_PTARDIFF};
+
+
+ WriteMakefile1(
+@@ -68,7 +61,6 @@ WriteMakefile1(
+ #EXE_FILES => ['bin/ptar', 'bin/ptardiff'],
+ EXE_FILES => [ _scripts() ],
+ PREREQ_PM => $prereqs,
+- INSTALLDIRS => ( $] >= 5.009003 && $] < 5.012 ? 'perl' : 'site' ),
+ AUTHOR => 'Jos Boumans ',
+ ABSTRACT => 'Manipulates TAR archives',
+ );
+@@ -84,29 +76,9 @@ sub _scripts {
+ File::Copy::copy( $_, "$_$version" ) for @scripts;
+ @scripts = glob("bin/*$version");
+ }
+- if ( $] >= 5.012 && $Config::Config{installscript} ne $Config::Config{installsitescript} ) {
+- my $script = $Config::Config{installscript};
+- my $site = $Config::Config{installsitescript};
+- warn <<"WARNING";
+-###############################################################
+-##
+-## Hi! Your script and sitescript locations are different
+-##
+-## As your perl is v5.12.0 or greater the script included
+-## in this distribution will be installed into sitescript
+-##
+-## You might want to check that the following location is
+-## in your PATH environment variable:
+-##
+-## '$site'
+-##
+-## Many thanks.
+-##
+-###############################################################
+-
+-WARNING
+- sleep 10;
+- }
++ }
++ if ( not $ENV{GENTOO_TAR_PTARDIFF} ) {
++ @scripts = grep { $_ !~ /ptardiff/ } @scripts;
+ }
+ return @scripts;
+ }
+diff --git a/t/07_ptardiff.t b/t/07_ptardiff.t
+index 6935fc6..da4ea29 100644
+--- a/t/07_ptardiff.t
++++ b/t/07_ptardiff.t
+@@ -1,5 +1,13 @@
+ use strict;
+ use warnings;
++
++BEGIN {
++ unless ( $ENV{GENTOO_TAR_PTARDIFF} ) {
++ print "1..0 # SKIP this test requires GENTOO_TAR_PTARDIFF set";
++ exit
++ }
++}
++
+ use Test::More;
+
+ use File::Spec;
+@@ -14,8 +22,7 @@ my $tarfile = File::Spec->catfile("t", "ptardiff.tar");
+ my $ptardiff = File::Spec->catfile($Bin, "..", "bin", "ptardiff");
+ my $cmd = "$^X $ptardiff $tarfile";
+
+-eval { require Text::Diff; };
+-plan skip_all => 'Text::Diff required to test ptardiff' if $@;
++require Text::Diff;
+ plan tests => 1;
+
+ # create directory/files
+--
+2.17.1
+
diff --git a/perl-core/Archive-Tar/metadata.xml b/perl-core/Archive-Tar/metadata.xml
new file mode 100644
index 000000000000..02a8a8d03d6c
--- /dev/null
+++ b/perl-core/Archive-Tar/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ perl@gentoo.org
+ Gentoo Perl Project
+
+
+ Archive-Tar
+ Archive::Tar
+ Archive::Tar::Constant
+ Archive::Tar::File
+
+
diff --git a/perl-core/Manifest.gz b/perl-core/Manifest.gz
index 6ee33ad89df7..37ff57d66838 100644
Binary files a/perl-core/Manifest.gz and b/perl-core/Manifest.gz differ
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ccb997eb8b9b..c213f3690a2c 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 17a746794517..e1df758480b8 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
#--- END OF EXAMPLES ---
+# Göktürk Yüksek (6 Jul 2018)
+# Dependency app-crypt/jitterentropy is keyworded for amd64
+sys-apps/rng-tools -jitterentropy
+
# Rick Farina (27 Jun 2018)
# Catalyst has support for assembling bootloader on this arch
dev-util/catalyst -system-bootloader
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index c0d59e4c2d27..c9a3ef9916d8 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -14,7 +14,6 @@ media-video/mpv -vulkan
# Andreas K. Hüttel (21 May 2018)
# LO kde support on x86 is broken, see bug 650208
-=app-office/libreoffice-6.0* kde
=app-office/libreoffice-bin-6.0* kde
=app-office/libreoffice-bin-debug-6.0* kde
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ed2354146781..cff38ab6aaf9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,11 @@
# This file is only for generic masks. For arch-specific masks (i.e.
# mask everywhere, unmask on arch/*) use arch/base.
+# Göktürk Yüksek (6 Jul 2018)
+# Dependency app-crypt/jitterentropy is keyworded for
+# only a subset of the archs rng-tools supports
+sys-apps/rng-tools jitterentropy
+
# Andreas Sturmlechner (18 Jun 2018)
# Qt4 is dead and going away. Bug #638260
sci-libs/ViSP qt4
diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc
index 60a2af632d18..d167e7a9155f 100644
--- a/profiles/features/prefix/standalone/profile.bashrc
+++ b/profiles/features/prefix/standalone/profile.bashrc
@@ -15,12 +15,21 @@ if [[ ${CATEGORY}/${PN} == sys-devel/gcc && ${EBUILD_PHASE} == configure ]]; the
eend $?
done
- # use sysroot of toolchain to get currect include and library at compile time
+ # use sysroot of toolchain to get correct include and library at compile time
EXTRA_ECONF="${EXTRA_ECONF} --with-sysroot=${EPREFIX}"
ebegin "remove --sysroot call on ld for native toolchain"
sed -i 's/--sysroot=%R//' gcc/gcc.c
eend $?
+elif [[ ${CATEGORY}/${PN} == sys-devel/clang && ${EBUILD_PHASE} == configure ]]; then
+ ebegin "Use ${EPREFIX} as default sysroot"
+ sed -i -e "s@DEFAULT_SYSROOT \"\"@DEFAULT_SYSROOT \"${EPREFIX}\"@" "${S}"/CMakeLists.txt
+ eend $?
+ pushd "${S}/lib/Driver/ToolChains" >/dev/null
+ ebegin "Remove --sysroot call on ld for native toolchain"
+ sed -i -e "$(grep -n -B1 sysroot= Gnu.cpp | sed -ne '{1s/-.*//;1p}'),+1 d" Gnu.cpp
+ eend $?
+ popd >/dev/null
elif [[ ${CATEGORY}/${PN} == sys-devel/binutils && ${EBUILD_PHASE} == prepare ]]; then
ebegin "Prefixifying native library path"
sed -i -r "/NATIVE_LIB_DIRS/s,((/usr(/local|)|)/lib),${EPREFIX}\1,g" \
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index afac0df64f6a..0a06390604fc 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -93,6 +93,31 @@ arm default/linux/arm/13.0/armv7a dev
arm default/linux/arm/13.0/armv7a/desktop dev
arm default/linux/arm/13.0/armv7a/desktop/gnome dev
arm default/linux/arm/13.0/armv7a/developer dev
+arm default/linux/arm/17.0 stable
+arm default/linux/arm/17.0/desktop dev
+arm default/linux/arm/17.0/desktop/gnome dev
+arm default/linux/arm/17.0/desktop/gnome/systemd dev
+arm default/linux/arm/17.0/developer dev
+arm default/linux/arm/17.0/armv4 dev
+arm default/linux/arm/17.0/armv4/desktop dev
+arm default/linux/arm/17.0/armv4/desktop/gnome dev
+arm default/linux/arm/17.0/armv4/developer dev
+arm default/linux/arm/17.0/armv4t dev
+arm default/linux/arm/17.0/armv4t/desktop dev
+arm default/linux/arm/17.0/armv4t/desktop/gnome dev
+arm default/linux/arm/17.0/armv4t/developer dev
+arm default/linux/arm/17.0/armv5te dev
+arm default/linux/arm/17.0/armv5te/desktop dev
+arm default/linux/arm/17.0/armv5te/desktop/gnome dev
+arm default/linux/arm/17.0/armv5te/developer dev
+arm default/linux/arm/17.0/armv6j dev
+arm default/linux/arm/17.0/armv6j/desktop dev
+arm default/linux/arm/17.0/armv6j/desktop/gnome dev
+arm default/linux/arm/17.0/armv6j/developer dev
+arm default/linux/arm/17.0/armv7a dev
+arm default/linux/arm/17.0/armv7a/desktop dev
+arm default/linux/arm/17.0/armv7a/desktop/gnome dev
+arm default/linux/arm/17.0/armv7a/developer dev
# ARM64 Profiles
# @MAINTAINER: arm64@gentoo.org
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7de7504c7947..088b16762d3c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -236,6 +236,7 @@ app-arch/wimlib:openssl - Use the SHA-1 message digest from libcrypto instead of
app-arch/wimlib:yasm - Use yasm assembler instead of nasm
app-arch/xz-utils:extra-filters - Build additional filters that are not used in any of the default xz presets. This includes delta and BCJ coders, additional match finders and SHA256 checks.
app-arch/zip:natspec - Use dev-libs/libnatspec to correctly decode non-ascii file names archived in Windows.
+app-arch/zstd:lz4 - Enable support for LZ4 compression using app-arch/lz4
app-backup/amanda:ndmp - Support for the NDMP protocol
app-backup/amanda:s3 - Support for backing up to the Amazon S3 system
app-backup/amanda:xfs - Support for backing up raw XFS filesystems using xfsdump
@@ -361,10 +362,6 @@ app-doc/linuxfromscratch:htmlsingle - Install all-on-one-page HTML version.
app-doc/pms:binary - Download pre-built files instead of building from sources
app-doc/pms:html - Generate PMS as .html as well
app-doc/pms:twoside - Enable two-sided layout suitable for printing
-app-doc/root-docs:api - Generate html API documentation
-app-doc/root-docs:http - Build HttpServer documentation
-app-doc/root-docs:math - Provide all math related documentation
-app-doc/root-docs:metric - Default to A4 paper size and metric measurement. Letter will be used otherwise
app-doc/tldp-howto:html - Install multi-chapter HTML docs
app-doc/tldp-howto:htmlsingle - Install all-on-one-page HTML docs
app-doc/tldp-howto:pdf - Install pdf docs
@@ -1382,6 +1379,7 @@ dev-ada/gtkada:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
dev-ada/gtkada:shared - Build gtkada as shared library
dev-ada/libadalang:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
dev-ada/libadalang:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/libadalang:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
dev-ada/libgpr:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
dev-ada/libgpr:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
dev-ada/libgpr:gnat_2018 - Compile with dev-lang/gnat-gpl-2018
@@ -5725,6 +5723,7 @@ net-fs/cvmfs:aufs - Use AUFS instead of OverlayFS for the server
net-fs/cvmfs:preload - Install the cvmfs cache preloader for distributed file systems
net-fs/cvmfs:server - Install the cvmfsd program and init script
net-fs/cvmfs:test-programs - Install unit test programs
+net-fs/libnfs:utils - Build/install nfs-{cat,ls,cp} utils
net-fs/netatalk:pgp - Add support pgp authentication module
net-fs/netatalk:quota - Add support for user quota on various filesystems
net-fs/netatalk:shadow - Add shadow support
@@ -7571,8 +7570,6 @@ sci-physics/pythia:lhapdf - Support the use of external PDF sets via sci-physics
sci-physics/pythia:root - Use sci-physics/root trees and histograms (in examples only)
sci-physics/root:R - Enable support for dev-lang/R
sci-physics/root:asimage - Enable support for media-libs/libafterimage
-sci-physics/root:c++11 - Build ROOT using the C++11 standard
-sci-physics/root:c++14 - Build ROOT using the C++14 standard
sci-physics/root:davix - Enable support for DAVIX Data Management Client (https://cern.ch/davix)
sci-physics/root:fits - Enable support for images and data from FITS files with sci-libs/cfitsio
sci-physics/root:fortran - Compile included Fortran programs
@@ -7585,7 +7582,6 @@ sci-physics/root:memstat - Build memory statistics library, helps to detect memo
sci-physics/root:minuit - Build ROOT's internal versions of minuit (fortran) and minuit2 (C++)
sci-physics/root:pythia6 - Build the interface for sci-physics/pythia version 6.x
sci-physics/root:pythia8 - Build the interface for sci-physics/pythia version 8.x
-sci-physics/root:reflex - Build the reflection database for the C++ interpreter
sci-physics/root:roofit - Build RooFit function fitting package
sci-physics/root:root7 - Build experimental features to be released with ROOT 7
sci-physics/root:shadow - Enable shadow authentication in rootd and proofd
@@ -7801,6 +7797,7 @@ sys-apps/proot:care - Build dynamic CARE binary (more info - http://reproducible
sys-apps/qingy:consolekit - Enable native consolekit support
sys-apps/qingy:opensslcrypt - Encrypt communications between qingy and its GUI using dev-libs/openssl
sys-apps/razercfg:pm-utils - Installs the pm-utils hooks for suspend/resume and requires sys-power/pm-utils
+sys-apps/rng-tools:jitterentropy - Enable Jitter RNG entropy support
sys-apps/rng-tools:nistbeacon - Enable NIST beacon entropy support
sys-apps/roccat-tools:input_devices_roccat_ryosmkfx - Enable support for Ryos Mk FX keyboard.
sys-apps/roccat-tools:input_devices_roccat_skeltr - Enable support for Skeltr keyboard.
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index c49c0e4c2554..59549242ae8a 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/cfitsio/cfitsio-3.410.ebuild b/sci-libs/cfitsio/cfitsio-3.410.ebuild
index 110615b06bd4..e9cc7246e436 100644
--- a/sci-libs/cfitsio/cfitsio-3.410.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.410.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/5"
-KEYWORDS="alpha amd64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="bzip2 doc examples fortran static-libs +tools threads"
RDEPEND="
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index faf8c1dd1cd2..5dea7e7ecd9f 100644
Binary files a/sci-physics/Manifest.gz and b/sci-physics/Manifest.gz differ
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 9587434290a7..4409b07a8de2 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,2 +1,2 @@
-DIST root_v5.34.36.source.tar.gz 75427331 BLAKE2B 203af03e1459c7fe079fcb1b30da145b3262f90c074abb7ff8fb3b1b2b90ac24391ce51aa8afbd10e0db8d69549207f15176207bc30a13720e0ae94342a38dfa SHA512 2cc0c8f8b63b2a3ce01c49c41704483548a7324d92c21a63e3e36a00f4d6f5656a7844fdf48cb71a6f2a2c974112527300ffd3bb5502d8365ffaf138e6ae4c7a
DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
+DIST root_v6.14.00.source.tar.gz 162436586 BLAKE2B 6047fe9fb898be9d4f00f2e6eb378d213996b49b9677f61ccc0250bb6d0801d8410850a39e0983534da2c6a307bd64b0ed6c03ab873a6c8b844500a96444a455 SHA512 2d4e754e3054018a53af28408b218bc52c0c60bea69a3c9e48f0d3feadbfebb559087fb453505b281fe01043f723e4b766cda8fca1e68dbf9e202c67d417e5b3
diff --git a/sci-physics/root/files/root-5.28.00b-glibc212.patch b/sci-physics/root/files/root-5.28.00b-glibc212.patch
deleted file mode 100644
index a365431396f5..000000000000
--- a/sci-physics/root/files/root-5.28.00b-glibc212.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- root.orig/net/auth/src/TAFS.cxx 2010-09-14 03:22:22.647915854 +0400
-+++ root/net/auth/src/TAFS.cxx 2010-09-14 03:22:39.034599899 +0400
-@@ -11,6 +11,7 @@
-
- #ifndef WIN32
- # include
-+# include
- #else
- # define ssize_t int
- # include
-
diff --git a/sci-physics/root/files/root-5.32.00-cfitsio.patch b/sci-physics/root/files/root-5.32.00-cfitsio.patch
deleted file mode 100644
index 156667f8fee4..000000000000
--- a/sci-physics/root/files/root-5.32.00-cfitsio.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure 2012-01-19 23:44:44.127607638 +0100
-+++ b/configure 2012-01-20 00:19:20.420652913 +0100
-@@ -3435,9 +3435,7 @@
- cfitsioinc=$found_hdr
- cfitsioincdir=$found_dir
-
-- # At this time, libcfitsio.a should always be prefered over .so,
-- # to avoid forcing users to install cfitsio.
-- check_library "libcfitsio cfitsio" "no" "$cfitsiolibdir" \
-+ check_library "libcfitsio cfitsio" "yes" "$cfitsiolibdir" \
- $CFITSIO ${CFITSIO:+$CFITSIO/lib} ${CFITSIO:+$CFITSIO/.libs} \
- ${finkdir:+$finkdir/lib} \
- /usr/local/lib /usr/lib /opt/cfitsio/lib
diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch b/sci-physics/root/files/root-5.32.00-chklib64.patch
deleted file mode 100644
index 23f20d54f0cc..000000000000
--- a/sci-physics/root/files/root-5.32.00-chklib64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-bug fix for #406817
---- a/configure 2012-02-29 19:46:41.000000000 +0400
-+++ b/configure 2012-03-22 03:28:43.458968696 +0400
-@@ -441,14 +441,13 @@
- fi
- else
- if file $filearg $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
-- check_link $chklib64
-- ret=$link_result
-- else
-- logmsg " file $filearg $chklib64 | grep '64-bit'"
-- if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
-- ret=1
-- fi
-+ # get real binary .so name from .so ld script
-+ chklib64=$(gawk '($1 == "GROUP") { print $3 }' $chklib64)
- fi
-+ logmsg " file $filearg $chklib64 | grep '64-bit'"
-+ if file $filearg $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
-+ ret=1
-+ fi
- fi
- logmsg " result: $ret"
- if test $ret -eq 1 ; then
diff --git a/sci-physics/root/files/root-5.32.00-dotfont.patch b/sci-physics/root/files/root-5.32.00-dotfont.patch
deleted file mode 100644
index 85d6dea7655e..000000000000
--- a/sci-physics/root/files/root-5.32.00-dotfont.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- root/html/src/TClassDocOutput.cxx.orig 2012-05-25 16:18:10.000000000 +0400
-+++ root/html/src/TClassDocOutput.cxx 2012-05-29 21:36:53.813593012 +0400
-@@ -625,7 +625,7 @@
- << "size=\"8,10\";" << endl
- << "ratio=auto;" << endl
- << "margin=0;" << endl
-- << "node [shape=plaintext,fontsize=40,width=4,height=0.75];" << endl
-+ << "node [shape=plaintext,fontsize=40,width=4,height=0.75,fontname=\"DejaVu Serif\"];" << endl
- << "\"" << fCurrentClass->GetName() << "\" [shape=ellipse];" << endl;
-
- std::stringstream ssDep;
-@@ -704,7 +704,7 @@
- outdot << ";" << endl;
- } else if (writeAndMoreFor) {
- outdot << " \"...andmore" << writeAndMoreFor->GetName()
-- << "\" [label=\"...and more\",fontname=\"Times-Italic\",fillcolor=lightgrey,style=filled];" << endl;
-+ << "\" [label=\"...and more\",fontname=\"DejaVu Serif Italic\",fillcolor=lightgrey,style=filled];" << endl;
- }
- }
- if (!levelExists) break;
-@@ -733,7 +733,7 @@
- << "ranksep=0.1;" << endl
- << "nodesep=0;" << endl
- << "margin=0;" << endl;
-- outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10];" << endl;
-+ outdot << " node [style=filled,width=0.7,height=0.15,fixedsize=true,shape=plaintext,fontsize=10,fontname=\"DejaVu Serif\"];" << endl;
-
- std::stringstream ssDep;
- const int numColumns = 3;
-@@ -939,7 +939,7 @@
- << "ranksep=0;" << endl
- << "nodesep=0;" << endl
- << "size=\"8,10\";" << endl
-- << "node [fontsize=20,shape=plaintext];" << endl;
-+ << "node [fontsize=20,shape=plaintext,fontname=\"DejaVu Serif\"];" << endl;
-
- for (std::list::iterator iFile = listFilesToParse.begin();
- iFile != listFilesToParse.end(); ++iFile) {
-@@ -999,7 +999,8 @@
- << "ranksep=0.7;" << endl
- << "nodesep=0.3;" << endl
- << "size=\"8,8\";" << endl
-- << "ratio=compress;" << endl;
-+ << "ratio=compress;" << endl
-+ << "node [fontname=\"DejaVu Serif\"];" << endl;
-
- TString libs(fCurrentClass->GetSharedLibs());
- outdot << "\"All Libraries\" [URL=\"LibraryDependencies.html\",shape=box,rank=max,fillcolor=lightgray,style=filled];" << endl;
-@@ -1109,7 +1110,8 @@
-
- dotout << "digraph G {" << endl
- << "ratio=auto;" << endl
-- << "rankdir=RL;" << endl;
-+ << "rankdir=RL;" << endl
-+ << "node [fontname=\"DejaVu Serif\"];" << endl;
-
- // loop on all classes
- TClassDocInfo* cdi = 0;
diff --git a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch b/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
deleted file mode 100644
index ec67a15887f6..000000000000
--- a/sci-physics/root/files/root-5.34.05-nobyte-compile.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -Naur root.as-needed/Makefile root/Makefile
---- a/Makefile.orig 2013-02-15 02:27:56.000000000 +0400
-+++ b/Makefile 2013-02-23 02:22:14.556465852 +0400
-@@ -1258,10 +1258,7 @@
- for lib in $(RFLX_GRFLXPY); do \
- rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
- done; \
-- for lib in $(RFLX_GRFLXPYC); do \
-- rm -f $(DESTDIR)$(LIBDIR)/$${lib#lib/}; \
-- done; \
-- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \
-+ if test "x$(RFLX_GRFLXPY)" != "x"; then \
- dir=$(subst lib/,,$(RFLX_GRFLXDD)); \
- while test "x$${dir}" != "x" && \
- test -d $(DESTDIR)$(LIBDIR)/$${dir} && \
-diff -Naur root.as-needed/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk
---- root.as-needed/bindings/pyroot/Module.mk 2011-07-10 10:42:48.991561304 +0400
-+++ root/bindings/pyroot/Module.mk 2011-07-10 10:43:21.493339703 +0400
-@@ -48,8 +48,6 @@
- ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS))
- $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@
- endif
--ROOTPYC := $(ROOTPY:.py=.pyc)
--ROOTPYO := $(ROOTPY:.py=.pyo)
-
- # used in the main Makefile
- ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH))
-@@ -68,10 +66,8 @@
- include/%.h: $(PYROOTDIRI)/%.h
- cp $< $@
-
--%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )'
-
--$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) $(ROOTPYC) $(ROOTPYO) \
-+$(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTPY) \
- $(ROOTLIBSDEP) $(PYTHONLIBDEP)
- @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \
-@@ -113,7 +109,7 @@
-
- distclean-$(MODNAME): clean-$(MODNAME)
- @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \
-- $(ROOTPY) $(ROOTPYC) $(ROOTPYO) $(PYROOTMAP) \
-+ $(ROOTPY) $(PYROOTMAP) \
- $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64)
-
- distclean:: distclean-$(MODNAME)
-diff -Naur root.as-needed/build/package/debian/rules root/build/package/debian/rules
---- root.as-needed/build/package/debian/rules 2011-07-10 10:42:49.241549346 +0400
-+++ root/build/package/debian/rules 2011-07-10 10:48:06.989670589 +0400
-@@ -691,10 +691,6 @@
- -X$(SYSCONFDIR)/root/system.rootauthrc \
- -X$(SYSCONFDIR)/root/system.rootdaemonrc \
- -X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \
-- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyc \
-- -X$(PREFIX)/lib/root/$(SOVERS)/PyCintex.pyo \
-- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyc \
-- -X$(PREFIX)/lib/root/$(SOVERS)/ROOT.pyo \
- -X$(PREFIX)/lib/root/$(SOVERS)/cint7 \
- -X$(PREFIX)/include/root/Minuit2
- # $(foreach i, \
-diff -Naur root.as-needed/cint/cintex/Module.mk root/cint/cintex/Module.mk
---- root.as-needed/cint/cintex/Module.mk 2011-07-10 10:42:49.104889217 +0400
-+++ root/cint/cintex/Module.mk 2011-07-10 10:43:21.496672876 +0400
-@@ -31,10 +31,6 @@
- CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
- $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
- endif
--ifneq ($(BUILDPYTHON),no)
--CINTEXPYC := $(CINTEXPY:.py=.pyc)
--CINTEXPYO := $(CINTEXPY:.py=.pyo)
--endif
-
- # used in the main Makefile
- ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
-@@ -86,8 +82,6 @@
- fi)
- cp $< $@
-
--%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )'
--%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )'
-
- $(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
- $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
-diff -Naur root.as-needed/cint/reflex/Module.mk root/cint/reflex/Module.mk
---- root.as-needed/cint/reflex/Module.mk 2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/Module.mk 2011-07-10 10:43:21.496672876 +0400
-@@ -48,9 +48,6 @@
- RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py)
- RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS))
- RFLX_GRFLXPY += $(RFLX_GCCXMLPATHPY)
--ifneq ($(BUILDPYTHON),no)
--RFLX_GRFLXPYC := $(subst .py,.pyc,$(RFLX_GRFLXPY))
--endif
-
- RFLX_LIBDIR = $(LIBDIR)
-
-@@ -92,7 +89,7 @@
-
- ALLEXECS += $(RFLX_GENMAPX)
-
--POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+POSTBIN += $(RFLX_GRFLXPY)
-
- ##### local rules #####
- .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \
-@@ -122,8 +119,6 @@
- mkdir -p lib/python/genreflex; fi )
- cp $< $@
-
--$(RFLX_GRFLXDD)/%.pyc: $(RFLX_GRFLXDD)/%.py
-- @python -c 'import py_compile; py_compile.compile( "$<" )'
-
- $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap
-
-@@ -149,7 +144,7 @@
- $(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \
- -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL)
-
--all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY)
-+all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPY)
-
- clean-genreflex:
- @rm -rf lib/python/genreflex
-diff -Naur root.as-needed/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt
---- root.as-needed/cint/reflex/python/CMakeLists.txt 2011-07-10 10:42:49.074890651 +0400
-+++ root/cint/reflex/python/CMakeLists.txt 2011-07-10 10:43:21.496672876 +0400
-@@ -15,7 +15,7 @@
- ##################### sources ####################
-
- FILE(GLOB_RECURSE GENREFLEX_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} genreflex/*.py)
--SET(GENREFLEX_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/genreflex/genreflex.pyc PARENT_SCOPE)
-+SET(GENREFLEX_SCRIPT PARENT_SCOPE)
-
- ##################### gccxmlpath ####################
-
diff --git a/sci-physics/root/files/root-5.34.13-unuran.patch b/sci-physics/root/files/root-5.34.13-unuran.patch
deleted file mode 100644
index 8262313184b5..000000000000
--- a/sci-physics/root/files/root-5.34.13-unuran.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/math/unuran/Module.mk b/math/unuran/Module.mk
-index 00a530b..7cd22dc 100644
---- a/math/unuran/Module.mk
-+++ b/math/unuran/Module.mk
-@@ -31,7 +31,7 @@ UNRS := $(wildcard $(UNRDIRS)/src/utils/*.c) \
- $(wildcard $(UNRDIRS)/src/uniform/*.c) \
- $(wildcard $(UNRDIRS)/src/urng/*.c)
- else
--UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -))
-+UNRTARCONTENT:=
- UNRS := $(filter %.c, \
- $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \
- $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \
-@@ -81,10 +81,9 @@ INCLUDEFILES += $(UNURANDEP)
- ##### local rules #####
- .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
-
--include/%.h: $(UNURANDIRI)/%.h $(UNURANETAG)
-+include/%.h: $(UNURANDIRI)/%.h
- cp $< $@
-
--$(UNURANDEP): $(UNRCFG)
- $(UNRS): $(UNURANETAG)
-
- $(UNURANETAG): $(UNRSRCS)
-@@ -137,12 +136,12 @@ $(UNRCFG): $(UNURANETAG)
- GNUMAKE=$(MAKE) ./configure CC="$$ACC" \
- CFLAGS="$$ACFLAGS");
-
--$(UNURANLIB): $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \
-+$(UNURANLIB): $(UNURANO) $(UNURANDO) $(ORDER_) \
- $(MAINLIBS) $(UNURANLIBDEP)
- @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
- "$(SOFLAGS)" libUnuran.$(SOEXT) $@ \
- "$(UNURANO) $(UNURANDO)" \
-- "$(UNURANLIBEXTRA) $(UNRO)"
-+ "$(UNURANLIBEXTRA) -lunuran"
-
- $(UNURANDS): $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP)
- $(MAKEDIR)
diff --git a/sci-physics/root/files/root-5.34.26-ldflags.patch b/sci-physics/root/files/root-5.34.26-ldflags.patch
deleted file mode 100644
index b81dbb5edb00..000000000000
--- a/sci-physics/root/files/root-5.34.26-ldflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 3c8bc686abf57e7e2037c4c191cb63a1a5172b5b
-Author: Andrew Savchenko
-Date: Sun Feb 22 03:45:21 2015 +0300
-
- root-5.32.00-prop-flags.patch -> root-5.34.26-prop-flags.patch
-
-diff --git a/config/Makefile.in b/config/Makefile.in
-index 89674e7..91d25b9 100644
---- a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -29,7 +29,7 @@ EXTRA_CFLAGS := -Iinclude @cflags@
- USERCONF_CFLAGS:= @usercflags@
- EXTRA_CXXFLAGS := -Iinclude @cflags@
- USERCONF_CXXFLAGS:= @usercxxflags@
--EXTRA_LDFLAGS := @ldflags@
-+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS)
- WERROR := @werror@
- WINRTDEBUG := @winrtdebug@
-
diff --git a/sci-physics/root/files/root-6.13.02-hsimple.patch b/sci-physics/root/files/root-6.13.02-hsimple.patch
new file mode 100644
index 000000000000..cab8a40afa7a
--- /dev/null
+++ b/sci-physics/root/files/root-6.13.02-hsimple.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 03af62fcd3..8ec5330773 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -367,26 +367,6 @@ else()
+ install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ endif()
+
+-#---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
+-add_custom_target(hsimple ALL DEPENDS tutorials/hsimple.root)
+-add_dependencies(hsimple onepcm)
+-if(WIN32)
+- add_custom_command(OUTPUT tutorials/hsimple.root
+- COMMAND set PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} &&
+- set ROOTIGNOREPREFIX=1 &&
+- $ -l -q -b -n -x hsimple.C -e return
+- WORKING_DIRECTORY tutorials
+- DEPENDS $ Cling Hist Tree Gpad Graf HistPainter move_artifacts)
+-else()
+- add_custom_command(OUTPUT tutorials/hsimple.root
+- COMMAND ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
+- ROOTIGNOREPREFIX=1
+- $ -l -q -b -n -x hsimple.C -e return
+- WORKING_DIRECTORY tutorials
+- DEPENDS $ Cling Hist Tree Gpad Graf HistPainter move_artifacts)
+-endif()
+-install(FILES ${CMAKE_BINARY_DIR}/tutorials/hsimple.root DESTINATION ${CMAKE_INSTALL_TUTDIR} COMPONENT tests)
+-
+ #---version--------------------------------------------------------------------------------------
+ if(NOT WIN32)
+ add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh ${CMAKE_BINARY_DIR}
diff --git a/sci-physics/root/files/root-6.14.00-http.patch b/sci-physics/root/files/root-6.14.00-http.patch
new file mode 100644
index 000000000000..04ec4bea567b
--- /dev/null
+++ b/sci-physics/root/files/root-6.14.00-http.patch
@@ -0,0 +1,28 @@
+From bed1568548d7a47785d8fe24ec7a9ce5799040ff Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio
+Date: Wed, 27 Jun 2018 15:08:07 +0200
+Subject: [PATCH] Do not exclude etc/http directory from installation
+
+This was an unintended side-effect of a previous commit:
+9b4d0d8dccbd48d21b0f7c79b6eaf94428f691b1.
+---
+ CMakeLists.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4c760d0fdb..a3a0f59925 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -426,8 +426,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
+ PATTERN "rootd.xinetd" EXCLUDE
+ PATTERN "proofd.xinetd" EXCLUDE
+ PATTERN "root.mimes" EXCLUDE
+- PATTERN "cmake" EXCLUDE
+- PATTERN "http" EXCLUDE )
++ PATTERN "cmake" EXCLUDE )
+ install(DIRECTORY fonts/ DESTINATION ${CMAKE_INSTALL_FONTDIR})
+ install(DIRECTORY icons/ DESTINATION ${CMAKE_INSTALL_ICONDIR})
+ install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR})
+--
+2.18.0
+
diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml
index b57d99b68fc0..da893cfc0e6c 100644
--- a/sci-physics/root/metadata.xml
+++ b/sci-physics/root/metadata.xml
@@ -20,8 +20,6 @@
graphics, GUI toolkit, and a complete visualization framework.
- Build ROOT using the C++11 standard
- Build ROOT using the C++14 standard
Enable support for media-libs/libafterimage
Enable support for DAVIX Data Management Client (https://cern.ch/davix)
Enable support for images and data from FITS files with sci-libs/cfitsio
@@ -36,7 +34,6 @@
Build the interface for sci-physics/pythia version 6.x
Build the interface for sci-physics/pythia version 8.x
Enable support for dev-lang/R
- Build the reflection database for the C++ interpreter
Build RooFit function fitting package
Build experimental features to be released with ROOT 7
Enable shadow authentication in rootd and proofd
diff --git a/sci-physics/root/root-5.34.36.ebuild b/sci-physics/root/root-5.34.36.ebuild
deleted file mode 100644
index 3651637f2f53..000000000000
--- a/sci-physics/root/root-5.34.36.ebuild
+++ /dev/null
@@ -1,441 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="http://root.cern.ch/git/root.git"
-else
- SRC_URI="https://root.cern.ch/download/${PN}_v${PV}.source.tar.gz"
- KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit elisp-common eutils fortran-2 multilib prefix python-single-r1 \
- toolchain-funcs user versionator xdg-utils
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="https://root.cern.ch"
-
-SLOT="0/$(get_version_component_range 1-3 ${PV})"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-IUSE="+X afs c++11 c++14 doc emacs examples fits fftw gdml
- graphviz http kerberos ldap +math +memstat mpi mysql odbc
- +opengl openmp oracle postgres prefix pythia6 pythia8
- python qt4 +reflex ruby shadow sqlite ssl table +tiff xinetd
- xml xrootd zeroconf"
-
-# TODO: add support for: davix
-# TODO: unbundle: vdt
-
-REQUIRED_USE="
- !X? ( !opengl !qt4 !tiff )
- mpi? ( math !openmp )
- openmp? ( math !mpi )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-CDEPEND="
- app-arch/xz-utils:0=
- >=dev-lang/cfortran-4.4-r2
- dev-libs/libpcre:3=
- media-fonts/dejavu
- media-libs/freetype:2=
- media-libs/libpng:0=
- sys-libs/zlib:0=
- X? (
- media-libs/ftgl:0=
- media-libs/glew:0=
- x11-libs/libX11:0=
- x11-libs/libXext:0=
- x11-libs/libXpm:0=
- || (
- media-libs/libafterimage[gif,jpeg,png,tiff?]
- >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
- )
- opengl? ( virtual/opengl virtual/glu x11-libs/gl2ps:0= )
- qt4? (
- dev-qt/qtgui:4=
- dev-qt/qtopengl:4=
- dev-qt/qt3support:4=
- dev-qt/qtsvg:4=
- dev-qt/qtwebkit:4=
- dev-qt/qtxmlpatterns:4=
- )
- x11-libs/libXft:0=
- )
- afs? ( net-fs/openafs )
- emacs? ( virtual/emacs )
- fits? ( sci-libs/cfitsio:0= )
- fftw? ( sci-libs/fftw:3.0= )
- graphviz? ( media-gfx/graphviz:0= )
- http? ( dev-libs/fcgi:0= )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap:0= )
- math? (
- sci-libs/gsl:0=
- sci-mathematics/unuran:0=
- mpi? ( virtual/mpi )
- )
- mysql? ( virtual/mysql )
- odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
- oracle? ( dev-db/oracle-instantclient-basic:0= )
- postgres? ( dev-db/postgresql:= )
- pythia6? ( sci-physics/pythia:6= )
- pythia8? ( >=sci-physics/pythia-8.1.80:8= =net-libs/xrootd-3.3.5:0= )
- zeroconf? ( net-dns/avahi:0= )
-"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}
- reflex? ( dev-cpp/gccxml )
- xinetd? ( sys-apps/xinetd )"
-
-PDEPEND="doc? ( ~app-doc/root-docs-${PV}[http=,math=] )"
-
-S="${WORKDIR}/${PN}"
-
-# install stuff in ${P} and not ${PF} for easier tracking in root-docs
-DOC_DIR="/usr/share/doc/${P}"
-
-die_compiler() {
- eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities"
- die "Need one of the following C++$1 capable compilers:\n"\
- " >=sys-devel/gcc[cxx]-$2\n"\
- " >=sys-devel/clang-$3\n"\
- " >=dev-lang/icc-$4"
-}
-
-# check compiler to satisfy minimal versions
-# $1 - std version
-# $2 - g++
-# $3 - clang++
-# $4 - icc/icpc
-check_compiler() {
- local cur ver
- case "$(tc-getCXX)" in
- *clang++*)
- ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
- cur="$3"
- ;;
- *g++*)
- ver="$(gcc-version)"
- cur="$2"
- ;;
- *icc*|*icpc*)
- ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')"
- cur="$4"
- ;;
- *)
- ewarn "You are using an unsupported compiler."
- ewarn "Please report any issues upstream."
- return 0
- ;;
- esac
- version_is_at_least "${cur}" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
-}
-
-pkg_setup() {
- fortran-2_pkg_setup
- use python && python-single-r1_pkg_setup
- echo
- elog "There are extra options on packages not yet in Gentoo:"
- elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
- elog "HDFS, Monalisa, MaxDB/SapDB, SRP."
- elog "You can use the env variable EXTRA_ECONF variable for this."
- elog "For example, for SRP, you would set: "
- elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=${EROOT%/}/usr/$(get_libdir)\""
- echo
-
- enewgroup rootd
- enewuser rootd -1 -1 /var/spool/rootd rootd
-
- if use math; then
- if use openmp; then
- if [[ "$(tc-getCXX)" == *g++* && "$(tc-getCXX)" != *clang++* ]] && ! tc-has-openmp; then
- ewarn "You are using a g++ without OpenMP capabilities"
- die "Need an OpenMP capable compiler"
- else
- export USE_OPENMP=1 USE_PARALLEL_MINUIT2=1
- fi
- elif use mpi; then
- export USE_MPI=1 USE_PARALLEL_MINUIT2=1
- fi
- fi
-
- use c++11 && check_compiler "11" "4.8" "3.3" "13"
- use c++14 && check_compiler "14" "4.9" "3.4" "15"
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
- "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
- "${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
- "${FILESDIR}"/${PN}-5.32.00-dotfont.patch \
- "${FILESDIR}"/${PN}-5.34.05-nobyte-compile.patch \
- "${FILESDIR}"/${PN}-5.34.13-unuran.patch \
- "${FILESDIR}"/${PN}-5.34.26-ldflags.patch
-
- # make sure we use system libs and headers
- rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
- rm -r graf2d/asimage/src/libAfterImage || die
- rm -r graf3d/ftgl/{inc,src} || die
- rm -r graf2d/freetype/src || die
- rm -r graf3d/glew/{inc,src} || die
- rm -r core/pcre/src || die
- rm -r math/unuran/src/unuran-*.tar.gz || die
- LANG=C LC_ALL=C find core/zip -type f -name "[a-z]*" -print0 | \
- xargs -0 rm || die
- rm -r core/lzma/src/*.tar.gz || die
- rm graf3d/gl/{inc,src}/gl2ps.* || die
- sed -i -e 's/^GLLIBS *:= .* $(OPENGLLIB)/& -lgl2ps/' \
- graf3d/gl/Module.mk || die
-
- # In Gentoo, libPythia6 is called libpythia6
- # iodbc is in /usr/include/iodbc
- # pg_config.h is checked instead of libpq-fe.h
- sed -i \
- -e 's:libPythia6:libpythia6:g' \
- -e 's:$ODBCINCDIR:$ODBCINCDIR /usr/include/iodbc:' \
- -e 's:libpq-fe.h:pg_config.h:' \
- configure || die "adjusting configure for Gentoo failed"
-
- hprefixify configure
- hprefixify -e "s,I/usr/include,I${EPREFIX}/usr/include," config/Makefile.in
-
- # CSS should use local images
- sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
- # fix reflex path (bug #497280)
- sed -i -e 's|${ROOTSYS}/lib|@libdir@|' config/genreflex.in || die
-
- # QTDIR only used for qt3 in gentoo, and configure looks for it.
- unset QTDIR
-}
-
-src_configure() {
- local -a myconf
- # Some compilers need special care
- case "$(tc-getCXX)" in
- *clang++*)
- myconf=(
- --with-clang
- --with-f77="$(tc-getFC)"
- )
- ;;
- *icc*|*icpc*)
- # For icc we need to provide architecture manually
- # and not to tamper with tc-get*
- use x86 && myconf=( linuxicc )
- use amd64 && myconf=( linuxx8664icc )
- ;;
- *) # gcc goes here too
- myconf=(
- --with-cc="$(tc-getCC)"
- --with-cxx="$(tc-getCXX)"
- --with-f77="$(tc-getFC)"
- --with-ld="$(tc-getCXX)"
- )
- ;;
- esac
-
- # the configure script is not the standard autotools
- myconf+=(
- --prefix="${EPREFIX}/usr"
- --etcdir="${EPREFIX}/etc/root"
- --libdir="${EPREFIX}/usr/$(get_libdir)/${PN}"
- --docdir="${EPREFIX}${DOC_DIR}"
- --tutdir="${EPREFIX}${DOC_DIR}/examples/tutorials"
- --testdir="${EPREFIX}${DOC_DIR}/examples/tests"
- --cflags='${CFLAGS}'
- --cxxflags='${CXXFLAGS}'
- --disable-builtin-afterimage
- --disable-builtin-ftgl
- --disable-builtin-freetype
- --disable-builtin-glew
- --disable-builtin-lzma
- --disable-builtin-pcre
- --disable-builtin-zlib
- --disable-cling
- --disable-werror
- --enable-explicitlink
- --enable-shared
- --enable-soversion
- --fail-on-missing
- --nohowto
- --with-afs-shared=yes
- --with-sys-iconpath="${EPREFIX}/usr/share/pixmaps"
- $(use_enable X x11)
- $(use_enable X asimage)
- $(use_enable X xft)
- $(use_enable afs)
- $(use_enable c++11 cxx11)
- $(use_enable c++14 cxx14)
- $(use_enable fits fitsio)
- $(use_enable fftw fftw3)
- $(use_enable gdml)
- $(use_enable graphviz gviz)
- $(use_enable http)
- $(use_enable kerberos krb5)
- $(use_enable ldap)
- $(use_enable math genvector)
- $(use_enable math gsl-shared)
- $(use_enable math mathmore)
- $(use_enable math minuit2)
- $(use_enable math roofit)
- $(use_enable math tmva)
- $(use_enable math vc)
- $(use_enable math vdt)
- $(use_enable math unuran)
- $(use_enable memstat)
- $(use_enable mysql)
- $(usex mysql "--with-mysql-incdir=${EPREFIX}/usr/include/mysql" "")
- $(use_enable odbc)
- $(use_enable opengl)
- $(use_enable oracle)
- $(use_enable postgres pgsql)
- $(use_enable prefix rpath)
- $(use_enable pythia6)
- $(use_enable pythia8)
- $(use_enable python)
- $(use_enable qt4 qt)
- $(use_enable qt4 qtgsi)
- $(use_enable reflex cintex)
- $(use_enable reflex)
- $(use_enable ruby)
- $(use_enable shadow shadowpw)
- $(use_enable sqlite)
- $(use_enable ssl)
- $(use_enable table)
- $(use_enable tiff astiff)
- $(use_enable xml)
- $(use_enable xrootd)
- $(use_enable zeroconf bonjour)
- ${EXTRA_ECONF}
- )
-
- # usex can't be used here, because pg_config may be not
- # installed with USE="-postgres"
- use postgres && myconf+=( --with-pgsql-incdir=$(pg_config --includedir) )
-
- ./configure ${myconf[@]} || die "configure failed"
-}
-
-src_compile() {
- # The build system does not handle the dependency of bin/rmkdepend correctly,
- # preventing it to be called in parallel. Build bin/rmkdepend explicitly
- # first to circumvent the problem.
- emake bin/rmkdepend
- emake \
- OPT="${CXXFLAGS}" \
- F77OPT="${FFLAGS}" \
- ROOTSYS="${S}" \
- LD_LIBRARY_PATH="${S}/lib"
- use emacs && elisp-compile build/misc/*.el
-}
-
-daemon_install() {
- local daemons="rootd proofd"
- dodir /var/spool/rootd
- fowners rootd:rootd /var/spool/rootd
- dodir /var/spool/rootd/{pub,tmp}
- fperms 1777 /var/spool/rootd/{pub,tmp}
-
- local i
- for i in ${daemons}; do
- newinitd "${FILESDIR}"/${i}.initd ${i}
- newconfd "${FILESDIR}"/${i}.confd ${i}
- done
- if use xinetd; then
- insinto /etc/xinetd
- doins "${S}"/etc/daemons/{rootd,proofd}.xinetd
- fi
-}
-
-desktop_install() {
- cd "${S}"
- echo "Icon=root-system-bin" >> etc/root.desktop
- domenu etc/root.desktop
- doicon build/package/debian/root-system-bin.png
-
- insinto /usr/share/icons/hicolor/48x48/mimetypes
- doins build/package/debian/application-x-root.png
-
- insinto /usr/share/icons/hicolor/48x48/apps
- doicon build/package/debian/root-system-bin.xpm
-}
-
-cleanup_install() {
- # Cleanup of files either already distributed or unused on Gentoo
- pushd "${ED}" > /dev/null
- rm usr/share/root/fonts/LICENSE || die
- rm etc/root/proof/*.sample || die
- rm -r etc/root/daemons || die
- # these should be in PATH
- mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
- rm ${DOC_DIR#/}/{INSTALL,LICENSE,COPYING.CINT} || die
- use examples || rm -r ${DOC_DIR#/}/examples || die
- cd usr/$(get_libdir)/root/cint/cint
- rm lib/posix/mktypes lib/dll_stl/setup lib/G__* || die
- rm lib/dll_stl/G__* lib/dll_stl/rootcint_* lib/posix/exten.o || die
- rm include/makehpib || die
- popd > /dev/null
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- echo "LDPATH=${EPREFIX%/}/usr/$(get_libdir)/root" > 99root
-
- use pythia8 && echo "PYTHIA8=${EPREFIX%/}/usr" >> 99root
- if use python; then
- echo "PYTHONPATH=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
- python_optimize "${D}/usr/$(get_libdir)/root"
- use reflex && python_optimize "${D}/usr/$(get_libdir)/root/python/genreflex/"
- fi
- use ruby && \
- echo "RUBYLIB=${EPREFIX%/}/usr/$(get_libdir)/root" >> 99root
- use emacs && elisp-install ${PN} build/misc/*.{el,elc}
- if use examples; then
- # these should really be taken care of by the root make install
- insinto ${DOC_DIR}/examples/tutorials/tmva
- doins -r tmva/test
- fi
- doenvd 99root
-
- # The build system installs Emacs support unconditionally in the wrong
- # directory. Remove it and call elisp-install in case of USE=emacs.
- rm -r "${ED}"/usr/share/emacs || die
-
- daemon_install
- desktop_install
- cleanup_install
-
- # do not copress files used by ROOT's CLI (.credit, .demo, .license)
- docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials}
- # needed for .license command to work
- dosym "${ED}"usr/portage/licenses/LGPL-2.1 "${DOC_DIR}/LICENSE"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/sci-physics/root/root-6.12.06-r4.ebuild b/sci-physics/root/root-6.12.06-r4.ebuild
new file mode 100644
index 000000000000..151a9f60739f
--- /dev/null
+++ b/sci-physics/root/root-6.12.06-r4.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_BUILD_TYPE=Release
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils eapi7-ver elisp-common eutils fortran-2 \
+ prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="https://root.cern"
+SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+
+IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran
+ +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat
+ +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8
+ +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
+ +threads +tiff +tmva +unuran vc xinetd +xml xrootd"
+
+SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+ !X? ( !asimage !opengl !qt4 !qt5 !tiff )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tmva? ( gsl )
+ davix? ( ssl xml )
+"
+
+CDEPEND="
+ app-arch/lz4
+ app-arch/xz-utils
+ fortran? ( dev-lang/cfortran )
+ dev-libs/libpcre:3=
+ dev-libs/xxhash
+ media-fonts/dejavu
+ media-libs/freetype:2=
+ media-libs/libpng:0=
+ sys-libs/ncurses:=
+ sys-libs/zlib
+ X? (
+ x11-libs/libX11:0=
+ x11-libs/libXext:0=
+ x11-libs/libXft:0=
+ x11-libs/libXpm:0=
+ opengl? (
+ media-libs/ftgl:0=
+ media-libs/glew:0=
+ virtual/opengl
+ virtual/glu
+ x11-libs/gl2ps:0=
+ )
+ qt4? (
+ dev-qt/qtcore:4=
+ dev-qt/qtgui:4=
+ )
+ qt5? (
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtwebengine:5=
+ )
+ )
+ asimage? ( || (
+ media-libs/libafterimage[gif,jpeg,png,tiff?]
+ >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
+ ) )
+ avahi? ( net-dns/avahi[mdnsresponder-compat] )
+ davix? ( net-libs/davix )
+ emacs? ( virtual/emacs )
+ fftw? ( sci-libs/fftw:3.0= )
+ fits? ( sci-libs/cfitsio:0= )
+ graphviz? ( media-gfx/graphviz:0= )
+ gsl? ( sci-libs/gsl )
+ http? ( dev-libs/fcgi:0= )
+ jemalloc? ( dev-libs/jemalloc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap:0= )
+ libcxx? ( sys-libs/libcxx )
+ unuran? ( sci-mathematics/unuran:0= )
+ minuit? ( !sci-libs/minuit )
+ mysql? ( virtual/mysql )
+ odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql:= )
+ pythia6? ( sci-physics/pythia:6= )
+ pythia8? ( sci-physics/pythia:8= )
+ python? ( ${PYTHON_DEPS} )
+ R? ( dev-lang/R )
+ shadow? ( virtual/shadow )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:0= )
+ tbb? ( dev-cpp/tbb )
+ tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+ vc? ( dev-libs/vc )
+ xml? ( dev-libs/libxml2:2= )
+ xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+ xinetd? ( sys-apps/xinetd )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.11.02-hsimple.patch
+ "${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
+ "${FILESDIR}"/${PN}-6.12.04-no-opengl.patch
+ "${FILESDIR}"/${PN}-6.12.04-z3.patch
+)
+
+pkg_setup() {
+ use fortran && fortran-2_pkg_setup
+ use python && python-single-r1_pkg_setup
+
+ echo
+ elog "There are extra options on packages not yet in Gentoo:"
+ elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+ elog "HDFS, Monalisa, MaxDB/SapDB, SRP, VecCore."
+ elog "You can use the env variable EXTRA_ECONF variable for this."
+ elog "For example, for Chirp, you would set: "
+ elog "EXTRA_ECONF=\"-Dchirp=ON\""
+ echo
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
+
+ # CSS should use local images
+ sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+}
+
+# Note: ROOT uses bundled clang because it is patched and API-incompatible
+# with vanilla clang. The patches enable the C++ interpreter to work.
+# Since ROOT installs many small files into /etc (~100MB in total),
+# we install it into another directory to avoid making /etc too big.
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_C_FLAGS="${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)"
+ -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/share/man"
+ -DMCAKE_INSTALL_LIBDIR=$(get_libdir)
+ -DDEFAULT_SYSROOT="${EPREFIX}"
+ -Dexplicitlink=ON
+ -Dexceptions=ON
+ -Dfail-on-missing=ON
+ -Dshared=ON
+ -Dsoversion=ON
+ -Dbuiltin_llvm=ON
+ -Dbuiltin_afterimage=OFF
+ -Dbuiltin_cfitsio=OFF
+ -Dbuiltin_davix=OFF
+ -Dbuiltin_fftw3=OFF
+ -Dbuiltin_freetype=OFF
+ -Dbuiltin_ftgl=OFF
+ -Dbuiltin_gl2ps=OFF
+ -Dbuiltin_glew=OFF
+ -Dbuiltin_gsl=OFF
+ -Dbuiltin_lz4=OFF
+ -Dbuiltin_lzma=OFF
+ -Dbuiltin_openssl=OFF
+ -Dbuiltin_pcre=OFF
+ -Dbuiltin_tbb=OFF
+ -Dbuiltin_unuran=OFF
+ -Dbuiltin_vc=OFF
+ -Dbuiltin_vdt=OFF
+ -Dbuiltin_veccore=OFF
+ -Dbuiltin_xrootd=OFF
+ -Dbuiltin_xxhash=OFF
+ -Dbuiltin_zlib=OFF
+ -Dx11=$(usex X)
+ -Dxft=$(usex X)
+ -Dafdsmgrd=OFF
+ -Dafs=OFF # not implemented
+ -Dalien=OFF
+ -Dasimage=$(usex asimage)
+ -Dastiff=$(usex tiff)
+ -Dbonjour=$(usex avahi)
+ -Dlibcxx=$(usex libcxx)
+ -Dccache=OFF # use ccache via portage
+ -Dcastor=OFF
+ -Dchirp=OFF
+ -Dcling=ON # cling=OFF is broken
+ -Dcocoa=$(usex aqua)
+ -Dcxx14=$(usex root7)
+ -Dcxxmodules=OFF # requires clang, unstable
+ -Ddavix=$(usex davix)
+ -Ddcache=OFF
+ -Dfftw3=$(usex fftw)
+ -Dfitsio=$(usex fits)
+ -Dfortran=$(usex fortran)
+ -Dftgl=$(usex opengl)
+ -Dgdml=$(usex gdml)
+ -Dgenvector=ON # genvector=OFF ignored
+ -Dgeocad=OFF
+ -Dgfal=OFF
+ -Dgl2ps=$(usex opengl)
+ -Dglite=OFF # not implemented
+ -Dglobus=OFF
+ -Dgminimal=OFF
+ -Dgnuinstall=OFF
+ -Dgsl_shared=$(usex gsl)
+ -Dgviz=$(usex graphviz)
+ -Dhdfs=OFF
+ -Dhttp=$(usex http)
+ -Dimt=$(usex tbb)
+ -Djemalloc=$(usex jemalloc)
+ -Dkrb5=$(usex kerberos)
+ -Dldap=$(usex ldap)
+ -Dmathmore=$(usex gsl)
+ -Dmemstat=$(usex memstat)
+ -Dminimal=OFF
+ -Dminuit2=$(usex minuit)
+ -Dminuit=$(usex minuit)
+ -Dmonalisa=OFF
+ -Dmysql=$(usex mysql)
+ -Dodbc=$(usex odbc)
+ -Dopengl=$(usex opengl)
+ -Doracle=$(usex oracle)
+ -Dpch=ON # pch=OFF is broken
+ -Dpgsql=$(usex postgres)
+ -Dpythia6=$(usex pythia6)
+ -Dpythia8=$(usex pythia8)
+ -Dpython=$(usex python)
+ -Dqt5web=$(usex qt5)
+ -Dqtgsi=$(usex qt4)
+ -Dqt=$(usex qt4)
+ -Drfio=OFF
+ -Droofit=$(usex roofit)
+ -Droot7=$(usex root7)
+ -Drootbench=OFF
+ -Droottest=$(usex test)
+ -Drpath=ON # needed for multi-slot to work
+ -Druby=OFF # deprecated and broken
+ -Druntime_cxxmodules=OFF # does not work yet
+ -Dr=$(usex R)
+ -Dsapdb=OFF # not implemented
+ -Dshadowpw=$(usex shadow)
+ -Dsqlite=$(usex sqlite)
+ -Dsrp=OFF # not implemented
+ -Dssl=$(usex ssl)
+ -Dtable=$(usex table)
+ -Dtbb=$(usex tbb)
+ -Dtcmalloc=OFF
+ -Dtesting=$(usex test)
+ -Dthread=$(usex threads)
+ -Dtmva=$(usex tmva)
+ -Dunuran=$(usex unuran)
+ -Dvc=$(usex vc)
+ -Dvdt=OFF
+ -Dveccore=OFF
+ -Dxml=$(usex xml)
+ -Dxrootd=$(usex xrootd)
+ ${EXTRA_ECONF}
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ ROOTSYS=${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)
+ ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
+
+ # ROOT fails without this symlink because it only looks in lib
+ if [[ ! -d ${D}/${ROOTSYS}/lib ]]; then
+ dosym $(get_libdir) /usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/lib
+ fi
+
+ cat > ${ROOTENV} <<- EOF || die
+ MANPATH="${ROOTSYS}/share/man"
+ PATH="${ROOTSYS}/bin"
+ ROOTPATH="${ROOTSYS}/bin"
+ LDPATH="${ROOTSYS}/$(get_libdir)"
+ EOF
+
+ if use python; then
+ echo "PYTHONPATH=${ROOTSYS}/$(get_libdir)" >> ${ROOTENV} || die
+ fi
+
+ doenvd ${ROOTENV}
+
+ pushd "${D}/${ROOTSYS}" > /dev/null
+
+ if use emacs; then
+ elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+ fi
+
+ if ! use gdml; then
+ rm -r geom || die
+ fi
+
+ if ! use examples; then
+ rm -r test tutorials || die
+ fi
+
+ if use tmva; then
+ rm -r tmva || die
+ fi
+
+ # clean up unnecessary files from installation
+ rm -r config emacs etc/vmc || die
+}
diff --git a/sci-physics/root/root-6.14.00-r1.ebuild b/sci-physics/root/root-6.14.00-r1.ebuild
new file mode 100644
index 000000000000..124bdd2658fb
--- /dev/null
+++ b/sci-physics/root/root-6.14.00-r1.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_BUILD_TYPE=Release
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils eapi7-ver elisp-common eutils fortran-2 \
+ prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="https://root.cern"
+SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+
+IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran
+ +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat
+ +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8
+ +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
+ +threads +tiff +tmva +unuran vc xinetd +xml xrootd"
+
+SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+ !X? ( !asimage !opengl !qt4 !qt5 !tiff )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tmva? ( gsl )
+ davix? ( ssl xml )
+"
+
+CDEPEND="
+ app-arch/lz4
+ app-arch/xz-utils
+ fortran? ( dev-lang/cfortran )
+ dev-libs/libpcre:3=
+ dev-libs/xxhash
+ media-fonts/dejavu
+ media-libs/freetype:2=
+ media-libs/libpng:0=
+ sys-libs/ncurses:=
+ sys-libs/zlib
+ X? (
+ x11-libs/libX11:0=
+ x11-libs/libXext:0=
+ x11-libs/libXft:0=
+ x11-libs/libXpm:0=
+ opengl? (
+ media-libs/ftgl:0=
+ media-libs/glew:0=
+ virtual/opengl
+ virtual/glu
+ x11-libs/gl2ps:0=
+ )
+ qt4? (
+ dev-qt/qtcore:4=
+ dev-qt/qtgui:4=
+ )
+ qt5? (
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtwebengine:5=
+ )
+ )
+ asimage? ( || (
+ media-libs/libafterimage[gif,jpeg,png,tiff?]
+ >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
+ ) )
+ avahi? ( net-dns/avahi[mdnsresponder-compat] )
+ davix? ( net-libs/davix )
+ emacs? ( virtual/emacs )
+ fftw? ( sci-libs/fftw:3.0= )
+ fits? ( sci-libs/cfitsio:0= )
+ graphviz? ( media-gfx/graphviz:0= )
+ gsl? ( sci-libs/gsl )
+ http? ( dev-libs/fcgi:0= )
+ jemalloc? ( dev-libs/jemalloc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap:0= )
+ libcxx? ( sys-libs/libcxx )
+ unuran? ( sci-mathematics/unuran:0= )
+ minuit? ( !sci-libs/minuit )
+ mysql? ( virtual/mysql )
+ odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql:= )
+ pythia6? ( sci-physics/pythia:6= )
+ pythia8? ( sci-physics/pythia:8= )
+ python? ( ${PYTHON_DEPS} )
+ R? ( dev-lang/R )
+ shadow? ( virtual/shadow )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:0= )
+ tbb? ( dev-cpp/tbb )
+ tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+ vc? ( dev-libs/vc )
+ xml? ( dev-libs/libxml2:2= )
+ xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+ xinetd? ( sys-apps/xinetd )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
+ "${FILESDIR}"/${PN}-6.13.02-hsimple.patch
+ "${FILESDIR}"/${PN}-6.14.00-http.patch
+)
+
+pkg_setup() {
+ use fortran && fortran-2_pkg_setup
+ use python && python-single-r1_pkg_setup
+
+ echo
+ elog "There are extra options on packages not yet in Gentoo:"
+ elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+ elog "HDFS, Monalisa, MaxDB/SapDB, SRP, VecCore."
+ elog "You can use the env variable EXTRA_ECONF variable for this."
+ elog "For example, for Chirp, you would set: "
+ elog "EXTRA_ECONF=\"-Dchirp=ON\""
+ echo
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
+
+ # CSS should use local images
+ sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+}
+
+# Note: ROOT uses bundled clang because it is patched and API-incompatible
+# with vanilla clang. The patches enable the C++ interpreter to work.
+# Since ROOT installs many small files into /etc (~100MB in total),
+# we install it into another directory to avoid making /etc too big.
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_C_FLAGS="${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)"
+ -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/share/man"
+ -DMCAKE_INSTALL_LIBDIR=$(get_libdir)
+ -DDEFAULT_SYSROOT="${EPREFIX}"
+ -DCLING_BUILD_PLUGINS=OFF
+ -Dexplicitlink=ON
+ -Dexceptions=ON
+ -Dfail-on-missing=ON
+ -Dshared=ON
+ -Dsoversion=ON
+ -Dbuiltin_llvm=ON
+ -Dbuiltin_afterimage=OFF
+ -Dbuiltin_cfitsio=OFF
+ -Dbuiltin_davix=OFF
+ -Dbuiltin_fftw3=OFF
+ -Dbuiltin_freetype=OFF
+ -Dbuiltin_ftgl=OFF
+ -Dbuiltin_gl2ps=OFF
+ -Dbuiltin_glew=OFF
+ -Dbuiltin_gsl=OFF
+ -Dbuiltin_lz4=OFF
+ -Dbuiltin_lzma=OFF
+ -Dbuiltin_openssl=OFF
+ -Dbuiltin_pcre=OFF
+ -Dbuiltin_tbb=OFF
+ -Dbuiltin_unuran=OFF
+ -Dbuiltin_vc=OFF
+ -Dbuiltin_vdt=OFF
+ -Dbuiltin_veccore=OFF
+ -Dbuiltin_xrootd=OFF
+ -Dbuiltin_xxhash=OFF
+ -Dbuiltin_zlib=OFF
+ -Dx11=$(usex X)
+ -Dxft=$(usex X)
+ -Dafdsmgrd=OFF
+ -Dafs=OFF # not implemented
+ -Dalien=OFF
+ -Dasimage=$(usex asimage)
+ -Dastiff=$(usex tiff)
+ -Dbonjour=$(usex avahi)
+ -Dlibcxx=$(usex libcxx)
+ -Dccache=OFF # use ccache via portage
+ -Dcastor=OFF
+ -Dchirp=OFF
+ -Dcling=ON # cling=OFF is broken
+ -Dcocoa=$(usex aqua)
+ -Dcxx14=$(usex root7)
+ -Dcxxmodules=OFF # requires clang, unstable
+ -Ddavix=$(usex davix)
+ -Ddcache=OFF
+ -Dfftw3=$(usex fftw)
+ -Dfitsio=$(usex fits)
+ -Dfortran=$(usex fortran)
+ -Dftgl=$(usex opengl)
+ -Dgdml=$(usex gdml)
+ -Dgenvector=ON # genvector=OFF ignored
+ -Dgeocad=OFF
+ -Dgfal=OFF
+ -Dgl2ps=$(usex opengl)
+ -Dglite=OFF # not implemented
+ -Dglobus=OFF
+ -Dgminimal=OFF
+ -Dgnuinstall=OFF
+ -Dgsl_shared=$(usex gsl)
+ -Dgviz=$(usex graphviz)
+ -Dhdfs=OFF
+ -Dhttp=$(usex http)
+ -Dimt=$(usex tbb)
+ -Djemalloc=$(usex jemalloc)
+ -Dkrb5=$(usex kerberos)
+ -Dldap=$(usex ldap)
+ -Dmathmore=$(usex gsl)
+ -Dmemstat=$(usex memstat)
+ -Dminimal=OFF
+ -Dminuit2=$(usex minuit)
+ -Dminuit=$(usex minuit)
+ -Dmonalisa=OFF
+ -Dmysql=$(usex mysql)
+ -Dodbc=$(usex odbc)
+ -Dopengl=$(usex opengl)
+ -Doracle=$(usex oracle)
+ -Dpch=ON # pch=OFF is broken
+ -Dpgsql=$(usex postgres)
+ -Dpythia6=$(usex pythia6)
+ -Dpythia8=$(usex pythia8)
+ -Dpython=$(usex python)
+ -Dqt5web=$(usex qt5)
+ -Dqtgsi=$(usex qt4)
+ -Dqt=$(usex qt4)
+ -Drfio=OFF
+ -Droofit=$(usex roofit)
+ -Droot7=$(usex root7)
+ -Drootbench=OFF
+ -Droottest=$(usex test)
+ -Drpath=ON # needed for multi-slot to work
+ -Druby=OFF # deprecated and broken
+ -Druntime_cxxmodules=OFF # does not work yet
+ -Dr=$(usex R)
+ -Dsapdb=OFF # not implemented
+ -Dshadowpw=$(usex shadow)
+ -Dsqlite=$(usex sqlite)
+ -Dsrp=OFF # not implemented
+ -Dssl=$(usex ssl)
+ -Dtable=$(usex table)
+ -Dtbb=$(usex tbb)
+ -Dtcmalloc=OFF
+ -Dtesting=$(usex test)
+ -Dthread=$(usex threads)
+ -Dtmva-cpu=$(usex tmva)
+ -Dtmva-gpu=OFF
+ -Dtmva=$(usex tmva)
+ -Dunuran=$(usex unuran)
+ -Dvc=$(usex vc)
+ -Dvdt=OFF
+ -Dveccore=OFF
+ -Dxml=$(usex xml)
+ -Dxrootd=$(usex xrootd)
+ ${EXTRA_ECONF}
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ ROOTSYS=${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)
+ ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
+
+ # ROOT fails without this symlink because it only looks in lib
+ if [[ ! -d ${D}/${ROOTSYS}/lib ]]; then
+ dosym $(get_libdir) /usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/lib
+ fi
+
+ cat > ${ROOTENV} <<- EOF || die
+ MANPATH="${ROOTSYS}/share/man"
+ PATH="${ROOTSYS}/bin"
+ ROOTPATH="${ROOTSYS}/bin"
+ LDPATH="${ROOTSYS}/$(get_libdir)"
+ EOF
+
+ if use python; then
+ echo "PYTHONPATH=${ROOTSYS}/$(get_libdir)" >> ${ROOTENV} || die
+ fi
+
+ doenvd ${ROOTENV}
+
+ pushd "${D}/${ROOTSYS}" > /dev/null
+
+ if use emacs; then
+ elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+ fi
+
+ if ! use gdml; then
+ rm -r geom || die
+ fi
+
+ if ! use examples; then
+ rm -r test tutorials || die
+ fi
+
+ if use tmva; then
+ rm -r tmva || die
+ fi
+
+ # clean up unnecessary files from installation
+ rm -r config emacs etc/vmc || die
+}
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
new file mode 100644
index 000000000000..9231a3e5261a
--- /dev/null
+++ b/sci-physics/root/root-9999.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_BUILD_TYPE=Release
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils eapi7-ver elisp-common eutils fortran-2 \
+ prefix python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ KEYWORDS=""
+ EGIT_REPO_URI="http://root.cern/git/root.git"
+ SLOT=0
+else
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+ SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+fi
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="https://root.cern"
+
+IUSE="+X avahi aqua +asimage +davix emacs +examples fits fftw fortran
+ +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat
+ +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8
+ +python qt4 qt5 R +roofit root7 shadow sqlite +ssl table +tbb test
+ +threads +tiff +tmva +unuran vc xinetd +xml xrootd"
+
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+
+REQUIRED_USE="
+ !X? ( !asimage !opengl !qt4 !qt5 !tiff )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tmva? ( gsl )
+ davix? ( ssl xml )
+"
+
+CDEPEND="
+ app-arch/lz4
+ app-arch/xz-utils
+ fortran? ( dev-lang/cfortran )
+ dev-libs/libpcre:3=
+ dev-libs/xxhash
+ media-fonts/dejavu
+ media-libs/freetype:2=
+ media-libs/libpng:0=
+ sys-devel/llvm:5=
+ sys-libs/ncurses:=
+ sys-libs/zlib
+ X? (
+ x11-libs/libX11:0=
+ x11-libs/libXext:0=
+ x11-libs/libXft:0=
+ x11-libs/libXpm:0=
+ opengl? (
+ media-libs/ftgl:0=
+ media-libs/glew:0=
+ virtual/opengl
+ virtual/glu
+ x11-libs/gl2ps:0=
+ )
+ qt4? (
+ dev-qt/qtcore:4=
+ dev-qt/qtgui:4=
+ )
+ qt5? (
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtwebengine:5=
+ )
+ )
+ asimage? ( || (
+ media-libs/libafterimage[gif,jpeg,png,tiff?]
+ >=x11-wm/afterstep-2.2.11[gif,jpeg,png,tiff?]
+ ) )
+ avahi? ( net-dns/avahi[mdnsresponder-compat] )
+ davix? ( net-libs/davix )
+ emacs? ( virtual/emacs )
+ fftw? ( sci-libs/fftw:3.0= )
+ fits? ( sci-libs/cfitsio:0= )
+ graphviz? ( media-gfx/graphviz:0= )
+ gsl? ( sci-libs/gsl )
+ http? ( dev-libs/fcgi:0= )
+ jemalloc? ( dev-libs/jemalloc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap:0= )
+ libcxx? ( sys-libs/libcxx )
+ unuran? ( sci-mathematics/unuran:0= )
+ minuit? ( !sci-libs/minuit )
+ mysql? ( virtual/mysql )
+ odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql:= )
+ pythia6? ( sci-physics/pythia:6= )
+ pythia8? ( sci-physics/pythia:8= )
+ python? ( ${PYTHON_DEPS} )
+ R? ( dev-lang/R )
+ shadow? ( virtual/shadow )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:0= )
+ tbb? ( dev-cpp/tbb )
+ tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+ vc? ( dev-libs/vc )
+ xml? ( dev-libs/libxml2:2= )
+ xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+ xinetd? ( sys-apps/xinetd )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
+ "${FILESDIR}"/${PN}-6.13.02-hsimple.patch
+)
+
+pkg_setup() {
+ use fortran && fortran-2_pkg_setup
+ use python && python-single-r1_pkg_setup
+
+ echo
+ elog "There are extra options on packages not yet in Gentoo:"
+ elog "Afdsmgrd, AliEn, castor, Chirp, dCache, gfal, Globus, gLite,"
+ elog "HDFS, Monalisa, MaxDB/SapDB, SRP, VecCore."
+ elog "You can use the env variable EXTRA_ECONF variable for this."
+ elog "For example, for Chirp, you would set: "
+ elog "EXTRA_ECONF=\"-Dchirp=ON\""
+ echo
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
+
+ # CSS should use local images
+ sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+}
+
+# Note: ROOT uses bundled clang because it is patched and API-incompatible
+# with vanilla clang. The patches enable the C++ interpreter to work.
+# Since ROOT installs many small files into /etc (~100MB in total),
+# we install it into another directory to avoid making /etc too big.
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_C_FLAGS="${CFLAGS}"
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)"
+ -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/share/man"
+ -DMCAKE_INSTALL_LIBDIR=$(get_libdir)
+ -DDEFAULT_SYSROOT="${EPREFIX}"
+ -DLLVM_CONFIG="${EPREFIX%/}/usr/lib/llvm/5/bin/llvm-config"
+ -DCLING_BUILD_PLUGINS=OFF
+ -Dexplicitlink=ON
+ -Dexceptions=ON
+ -Dfail-on-missing=ON
+ -Dshared=ON
+ -Dsoversion=ON
+ -Dbuiltin_llvm=OFF
+ -Dbuiltin_afterimage=OFF
+ -Dbuiltin_cfitsio=OFF
+ -Dbuiltin_davix=OFF
+ -Dbuiltin_fftw3=OFF
+ -Dbuiltin_freetype=OFF
+ -Dbuiltin_ftgl=OFF
+ -Dbuiltin_gl2ps=OFF
+ -Dbuiltin_glew=OFF
+ -Dbuiltin_gsl=OFF
+ -Dbuiltin_lz4=OFF
+ -Dbuiltin_lzma=OFF
+ -Dbuiltin_openssl=OFF
+ -Dbuiltin_pcre=OFF
+ -Dbuiltin_tbb=OFF
+ -Dbuiltin_unuran=OFF
+ -Dbuiltin_vc=OFF
+ -Dbuiltin_vdt=OFF
+ -Dbuiltin_veccore=OFF
+ -Dbuiltin_xrootd=OFF
+ -Dbuiltin_xxhash=OFF
+ -Dbuiltin_zlib=OFF
+ -Dx11=$(usex X)
+ -Dxft=$(usex X)
+ -Dafdsmgrd=OFF
+ -Dafs=OFF # not implemented
+ -Dalien=OFF
+ -Dasimage=$(usex asimage)
+ -Dastiff=$(usex tiff)
+ -Dbonjour=$(usex avahi)
+ -Dlibcxx=$(usex libcxx)
+ -Dccache=OFF # use ccache via portage
+ -Dcastor=OFF
+ -Dchirp=OFF
+ -Dcling=ON # cling=OFF is broken
+ -Dcocoa=$(usex aqua)
+ -Dcxx14=$(usex root7)
+ -Dcxxmodules=OFF # requires clang, unstable
+ -Ddavix=$(usex davix)
+ -Ddcache=OFF
+ -Dfftw3=$(usex fftw)
+ -Dfitsio=$(usex fits)
+ -Dfortran=$(usex fortran)
+ -Dftgl=$(usex opengl)
+ -Dgdml=$(usex gdml)
+ -Dgenvector=ON # genvector=OFF ignored
+ -Dgeocad=OFF
+ -Dgfal=OFF
+ -Dgl2ps=$(usex opengl)
+ -Dglite=OFF # not implemented
+ -Dglobus=OFF
+ -Dgminimal=OFF
+ -Dgnuinstall=OFF
+ -Dgsl_shared=$(usex gsl)
+ -Dgviz=$(usex graphviz)
+ -Dhdfs=OFF
+ -Dhttp=$(usex http)
+ -Dimt=$(usex tbb)
+ -Djemalloc=$(usex jemalloc)
+ -Dkrb5=$(usex kerberos)
+ -Dldap=$(usex ldap)
+ -Dmathmore=$(usex gsl)
+ -Dmemstat=$(usex memstat)
+ -Dminimal=OFF
+ -Dminuit2=$(usex minuit)
+ -Dminuit=$(usex minuit)
+ -Dmonalisa=OFF
+ -Dmysql=$(usex mysql)
+ -Dodbc=$(usex odbc)
+ -Dopengl=$(usex opengl)
+ -Doracle=$(usex oracle)
+ -Dpch=ON # pch=OFF is broken
+ -Dpgsql=$(usex postgres)
+ -Dpythia6=$(usex pythia6)
+ -Dpythia8=$(usex pythia8)
+ -Dpython=$(usex python)
+ -Dqt5web=$(usex qt5)
+ -Dqtgsi=$(usex qt4)
+ -Dqt=$(usex qt4)
+ -Drfio=OFF
+ -Droofit=$(usex roofit)
+ -Droot7=$(usex root7)
+ -Drootbench=OFF
+ -Droottest=$(usex test)
+ -Drpath=ON # needed for multi-slot to work
+ -Druby=OFF # deprecated and broken
+ -Druntime_cxxmodules=OFF # does not work yet
+ -Dr=$(usex R)
+ -Dsapdb=OFF # not implemented
+ -Dshadowpw=$(usex shadow)
+ -Dsqlite=$(usex sqlite)
+ -Dsrp=OFF # not implemented
+ -Dssl=$(usex ssl)
+ -Dtable=$(usex table)
+ -Dtbb=$(usex tbb)
+ -Dtcmalloc=OFF
+ -Dtesting=$(usex test)
+ -Dthread=$(usex threads)
+ -Dtmva-cpu=$(usex tmva)
+ -Dtmva-gpu=OFF
+ -Dtmva=$(usex tmva)
+ -Dunuran=$(usex unuran)
+ -Dvc=$(usex vc)
+ -Dvdt=OFF
+ -Dveccore=OFF
+ -Dxml=$(usex xml)
+ -Dxrootd=$(usex xrootd)
+ ${EXTRA_ECONF}
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ ROOTSYS=${EPREFIX%/}/usr/$(get_libdir)/${PN}/$(ver_cut 1-2)
+ ROOTENV=9999${PN}-$(ver_cut 1-2)
+
+ # ROOT fails without this symlink because it only looks in lib
+ if [[ ! -d ${D}/${ROOTSYS}/lib ]]; then
+ dosym $(get_libdir) /usr/$(get_libdir)/${PN}/$(ver_cut 1-2)/lib
+ fi
+
+ cat > ${ROOTENV} <<- EOF || die
+ MANPATH="${ROOTSYS}/share/man"
+ PATH="${ROOTSYS}/bin"
+ ROOTPATH="${ROOTSYS}/bin"
+ LDPATH="${ROOTSYS}/$(get_libdir)"
+ EOF
+
+ if use python; then
+ echo "PYTHONPATH=${ROOTSYS}/$(get_libdir)" >> ${ROOTENV} || die
+ fi
+
+ doenvd ${ROOTENV}
+
+ pushd "${D}/${ROOTSYS}" > /dev/null
+
+ if use emacs; then
+ elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+ fi
+
+ if ! use gdml; then
+ rm -r geom || die
+ fi
+
+ if ! use examples; then
+ rm -r test tutorials || die
+ fi
+
+ if use tmva; then
+ rm -r tmva || die
+ fi
+
+ # clean up unnecessary files from installation
+ rm -r bin/clang* config emacs etc/vmc || die
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6f32a992f300..9fe6ef80e6a6 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/fakechroot/fakechroot-2.19.ebuild b/sys-apps/fakechroot/fakechroot-2.19.ebuild
index 7bbdde0ffba7..8126e0b444bd 100644
--- a/sys-apps/fakechroot/fakechroot-2.19.ebuild
+++ b/sys-apps/fakechroot/fakechroot-2.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE=""
RESTRICT="test"
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 1a8f5f69f4ba..32410d87432a 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -1,2 +1,2 @@
-DIST fakeroot_1.20.2.orig.tar.bz2 326910 BLAKE2B 813fce6416a375de7dce0581a2a7398f023e5e5d6b981d6dd973e9e29380b5908e0bb9e1e84db3b20638933817ed85a8f7d341b369631881905aab9ca4cf2119 SHA512 1ac231f995774aa40f43c4325cd9e6de45365963277c32a85776690c3e7fd281ac410f3d91395dc1e5e5ca3b143e89914e048632011a3985ead216e870852231
DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a
+DIST fakeroot_1.23.orig.tar.xz 298080 BLAKE2B eac3da8486d57266f0f6af0479f0fcec5aaf82f4707ad8f810f954373a31cf5f390ef57dcc71ba630a1d4a578df95ac9beda9c93b3c75adffcbc89860f442b69 SHA512 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036
diff --git a/sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild b/sys-apps/fakeroot/fakeroot-1.23.ebuild
similarity index 73%
rename from sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild
rename to sys-apps/fakeroot/fakeroot-1.23.ebuild
index 79faa7e78dee..91ad0aff45d0 100644
--- a/sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.23.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools eutils flag-o-matic
+inherit autotools flag-o-matic
DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="acl debug static-libs test"
DEPEND="
@@ -23,7 +23,7 @@ DOCS="AUTHORS BUGS DEBUG README doc/README.saving"
PATCHES=(
"${FILESDIR}"/${PN}-1.19-no-acl_h.patch
- "${FILESDIR}"/${P}-glibc-2.24.patch
+ "${FILESDIR}"/${PN}-1.20.2-glibc-2.24.patch
)
src_prepare() {
@@ -41,5 +41,5 @@ src_configure() {
src_install() {
default
- prune_libtool_files
+ find "${ED}" -name '*.la' -o -name '*.a' -delete || die
}
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index 72cad7890cca..df9a23319f5c 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -1,5 +1,6 @@
DIST guix-0.13.0.tar.gz 18490387 BLAKE2B e146f7a414f91076eafebe122c0abd772c1c2a562da015e952f978e97528c099905c1e7157e659633e644cbbd7066feac021550d52cb76d5999ff464fb685f2f SHA512 39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf
DIST guix-0.14.0.tar.gz 19852695 BLAKE2B 257050ebebc35e7d6c82a30c3bb974da3d3eae9ca7c95dd8d98da6c60a68585330e5665b5343738188a058d84217d3c85731492e16afbd80c23771d40725b31c SHA512 635f6131c3ffa1ea5d18500fabc1d9d86d604a5cd3c8134d0f99dc44e171eef5d15f7ffa008c0e0726cf93fd0886afff0e9a5949014545d6919f8e8dba80eb69
+DIST guix-0.15.0.tar.gz 22704560 BLAKE2B 6abd50c0436abedaa3a20ba9649ccf8af0efeeac8d975171befb4e9a231be99bfcebed34f08d66b4ddaedfd64a9916f176e96bf810dba3bbc13cc6856828b5be SHA512 5e85ed03cde979d625df11d02d4f2ac7128bd944d11a763754e10a8e980f1eaeb721053fa12547bbc4289b33b3c7818bf992c7bfe79233f3a9555c96b8d52d7f
DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337
DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c
diff --git a/sys-apps/guix/guix-0.15.0.ebuild b/sys-apps/guix/guix-0.15.0.ebuild
new file mode 100644
index 000000000000..45aca6b4d2c0
--- /dev/null
+++ b/sys-apps/guix/guix-0.15.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools readme.gentoo-r1 user
+
+DESCRIPTION="GNU package manager (nix sibling)"
+HOMEPAGE="https://www.gnu.org/software/guix/"
+
+# taken from gnu/local.mk and gnu/packages/bootstrap.scm
+BOOT_GUILE=(
+ "aarch64-linux 20170217 guile-2.0.14.tar.xz"
+ "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ "i686-linux 20131110 guile-2.0.9.tar.xz"
+ "mips64el-linux 20131110 guile-2.0.9.tar.xz"
+ "x86_64-linux 20131110 guile-2.0.9.tar.xz"
+)
+
+binary_src_uris() {
+ local system_date_guilep uri
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
+ # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
+ echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
+ done
+}
+
+# copy bootstrap binaries from DISTDIR to ${S}
+copy_boot_guile_binaries() {
+ local system_date_guilep
+ for system_date_guilep in "${BOOT_GUILE[@]}"; do
+ # $1 $2 $3
+ # "armhf-linux 20150101 guile-2.0.11.tar.xz"
+ set -- ${system_date_guilep}
+ cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
+ done
+}
+
+SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
+ $(binary_src_uris)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # complains about size of config.log and refuses to start tests
+
+RDEPEND="
+ dev-libs/libgcrypt:0=
+ >=dev-scheme/guile-2:=[regex,networking,threads]
+ dev-scheme/bytestructures
+ dev-scheme/guile-git
+ dev-scheme/guile-json
+ dev-scheme/guile-sqlite3
+ net-libs/gnutls[guile]
+ sys-libs/zlib
+ app-arch/bzip2
+ dev-db/sqlite
+"
+
+DEPEND="${RDEPEND}
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.13.0-default-daemon.patch)
+
+QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS="Quick start user guide on Gentoo:
+
+[as root] allow binary substitution to be downloaded (optional)
+ # guix archive --authorize < /usr/share/guix/hydra.gnu.org.pub
+[as root] enable guix-daemon service:
+ [systemd] # systemctl enable guix-daemon
+ [openrc] # rc-update add guix-daemon
+[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
+[as a user] install guix packages:
+ \$ guix package -i hello
+[as a user] configure environment:
+ Somewhere in .bash_profile you might want to set
+ export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
+
+Next steps:
+ guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
+"
+
+pkg_setup() {
+ enewgroup guixbuild
+ for i in {1..10}; do
+ # we list 'guixbuild' twice to
+ # both assign a primary group for user
+ # and add a user to /etc/group
+ enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
+ done
+}
+
+src_prepare() {
+ copy_boot_guile_binaries
+
+ default
+ # build system is very eager to run automake itself: bug #625166
+ eautoreconf
+
+ # guile is trying to avoid recompilation by checking if file
+ # /usr/lib64/guile/2.2/site-ccache/guix/modules.go
+ # is newer than
+ # guix/modules.scm
+ # In case it is instead of using 'guix/modules.scm' guile
+ # loads system one (from potentially older version of guix).
+ # To work it around we bump last modification timestamp of
+ # '*.scm' files.
+ find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_configure() {
+ # to be compatible with guix from /gnu/store
+ econf \
+ --localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+ # guile occasionally fails with 'bad address'
+ emake -j1
+}
+
+src_install() {
+ # TODO: emacs highlighter
+ default
+
+ readme.gentoo_create_doc
+
+ keepdir /etc/guix
+ # TODO: will need a tweak for prefix
+ keepdir /gnu/store
+ fowners root:guixbuild /gnu/store
+ fperms 1775 /gnu/store
+
+ keepdir /var/guix/profiles/per-user
+ fperms 1777 /var/guix/profiles/per-user
+
+ newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/sys-apps/habitat/metadata.xml b/sys-apps/habitat/metadata.xml
index 67159d965888..2b27fe032012 100644
--- a/sys-apps/habitat/metadata.xml
+++ b/sys-apps/habitat/metadata.xml
@@ -1,10 +1,7 @@
-
- mrueg@gentoo.org
- Manuel Rüger
-
+
habitat-sh/habitat
diff --git a/sys-apps/nix/files/nix-1.11.6-per-user.patch b/sys-apps/nix/files/nix-1.11.6-per-user.patch
deleted file mode 100644
index 9cea685c59a4..000000000000
--- a/sys-apps/nix/files/nix-1.11.6-per-user.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-By default created symlink poins to a directory not accessible by user.
-Make a symlink the same way NixOS does symlinking.
-diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
-index 672d1f0..e3b0978 100644
---- a/scripts/nix-profile.sh.in
-+++ b/scripts/nix-profile.sh.in
-@@ -6,3 +6,3 @@ if [ -n "$HOME" ]; then
- echo "creating $NIX_LINK" >&2
-- _NIX_DEF_LINK=@localstatedir@/nix/profiles/default
-+ _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile
- @coreutils@/ln -s "$_NIX_DEF_LINK" "$NIX_LINK"
diff --git a/sys-apps/osinfo-db/osinfo-db-20180531.ebuild b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
index 9e69a433ac60..db4a3c50856c 100644
--- a/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index a72ffa680659..b5c76696588b 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,4 +1,5 @@
DIST rng-tools-5.tar.gz 122182 BLAKE2B de7085d530e38de21a1c33792d67a72e0131b221082d690cdb299367b80b0a123c2976174aa3f895a4a2ab1216aacfaa8e09de485c85154dc4a5b8f960d05245 SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50
DIST rng-tools-6.1.tar.gz 29814 BLAKE2B 4102c03ced36b33f9db6f7e5f77e8f918c4b9286a4c94cfd9ea9645c394f054fb3165255c3beb0f73d897d066831301f69a64e2758296b4418808343c97f3269 SHA512 388593ffeef0b5f2770532629418cdf1b6421092ae9c5fe0a68d198a5cbd4ff733fbca8091d497e09620c61a9e8b982298fb064edfd05a0fc36fa49c22eef5c9
DIST rng-tools-6.2.tar.gz 30421 BLAKE2B 646628095cbc611aee4113198e0874b5f0672cd787f04f1649ff350883edebe6b31753aef3ac2bca1f05eedcf3c1400435c084382bde9f97fe6dcdd71adf18c2 SHA512 ffd8be5b232f092f8bcfdb6281580ce9053ec8bb87ff6bcae76585c38e3e91b9e464a9544a33ecd9814a9f244a89bac973d15c9bd3560d1164559685c720d174
+DIST rng-tools-6.3.tar.gz 31474 BLAKE2B 4d3924b3ca85d31d1999ceb45908cf64e8d2978d2e0aa638d9bbd3054a11a41251f9db54db35583c8fc080fd0667387cd63792c15486048d1f52300217e02fa9 SHA512 c00ac28c059ba689f114480958fe993e2199a1428137b151779a0331b9cc5a667f08770aa7b28d98c801166a509e8bd40d6b92f5c29b6ff73eb50a1cb0f2dd13
DIST rng-tools-6.tar.gz 26024 BLAKE2B a523328fcce56997e2847940cdc096abd5a539135f857f0a4cd3d782a1659f4d2978870149caac47b839c80788df6a3d891adcd39371d5968149dd29bc46bc62 SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4
diff --git a/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch b/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch
new file mode 100644
index 000000000000..f7b87c88715d
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch
@@ -0,0 +1,36 @@
+From c9f795da2dbeb0e85025f6264321aef1ba12059e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?=
+Date: Fri, 6 Jul 2018 17:20:28 -0400
+Subject: [PATCH] Makefile.am: use the libjitterentropy available on the system
+
+---
+ Makefile.am | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b80e9a0..5d33aaf 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,9 +2,7 @@
+ ## Toplevel Makefile.am for rng-tools
+ ##
+ if JITTER
+- JSUBDIR = jitterentropy-library
+- JSUBLIB = ./jitterentropy-library/libjitterentropy.a
+- AM_CPPFLAGS = -I./jitterentropy-library
++ jitterentropy_LIBS = -ljitterentropy
+ endif
+
+ SUBDIRS = contrib tests $(JSUBDIR)
+@@ -33,7 +31,7 @@ if JITTER
+ rngd_SOURCES += rngd_jitter.c
+ endif
+
+-rngd_LDADD = librngd.a -lsysfs $(JSUBLIB) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS}
++rngd_LDADD = librngd.a -lsysfs $(jitterentropy_LIBS) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS}
+
+ rngd_CFLAGS = ${libxml2_CFLAGS} ${openssl_CFLAGS}
+
+--
+2.17.0
+
diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index bda25e86a520..911b7587f660 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/metadata.xml
@@ -10,6 +10,9 @@
Gentoo Base System
+
+ Enable Jitter RNG entropy support
+
Enable NIST beacon entropy support
diff --git a/sys-apps/rng-tools/rng-tools-6.3.ebuild b/sys-apps/rng-tools/rng-tools-6.3.ebuild
new file mode 100644
index 000000000000..17386bfd0054
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="jitterentropy nistbeacon selinux"
+
+DEPEND="dev-libs/libgcrypt:0
+ dev-libs/libgpg-error
+ sys-fs/sysfsutils
+ jitterentropy? (
+ app-crypt/jitterentropy:=
+ )
+ nistbeacon? (
+ net-misc/curl[ssl]
+ dev-libs/libxml2:2=
+ dev-libs/openssl:0=
+ )
+"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-rngd )"
+DEPEND="${DEPEND}
+ nistbeacon? (
+ virtual/pkgconfig
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/test-for-argp.patch
+ "${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
+ "${FILESDIR}"/${PN}-6.3-jitterentropy-linking-fix.patch
+)
+
+src_prepare() {
+ echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+ default
+
+ mv README.md README || die
+
+ if use jitterentropy; then
+ # Fool the build system into thinking that
+ # jitterentropy source code exists
+ touch "${S}"/jitterentropy-library/Makefile || die
+ fi
+ eautoreconf
+
+ sed -i '/^AR /d' Makefile.in || die
+ tc-export AR
+}
+
+src_configure() {
+ econf $(use_with nistbeacon)
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}"/rngd-initd-6 rngd
+ newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
+ systemd_dounit "${FILESDIR}"/rngd.service
+}
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index cf338fb8dad3..7fc0f6a84567 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,2 +1,3 @@
DIST toybox-0.7.5.tar.gz 818815 BLAKE2B 0d91eb07b9c2e64c611be24eb09aac7ffc26d65f3dd39ee7663419e4eff1e9d559b7b6e8df0dc8e13986124aefa706b343c4a3521466f2bdf657d4c9a82a9fc2 SHA512 f0cc54da2394ed14b41dbc80bf674f86989f0312b645b9e1e5403fb0a3282cafce9608b2d738ab2dbb6fe3779eed70d51133a867c6ea76683dd7e6de245df127
DIST toybox-0.7.6.tar.gz 834351 BLAKE2B 7c6737a8b16f77fd7a5e389be17ef8eb41d28718e46231ec1aa48af0a0ec1cbdc1c0b74670c3f79f58a5b0547f47aa6e5ccbaccc5451b12a80e1c566ee49a30d SHA512 1ed06114f5feb46e642bfeee517366a16c0a5d76562841a3cdf6b003bb330be10d4ac5009c7cf845eb5ea99bb8ae8b4291c413bbd45fd89c2ae3e4a69c1455bb
+DIST toybox-0.7.7.tar.gz 843039 BLAKE2B fb4ef2ad483acd2b42905e765f7287b41fa8b1822796579c4a57a8ad3f5a3cdb8bbcd0e6790eddc8daf2ec41c50be478c7d19623d1c8db2e7b1d4db8b52fbbc6 SHA512 89369662eaf48bb52909f49932b98395eed6e672f6a37387819a02ba9c33f6b737686782ca3bf0ed0f9b60e1e2fff88ad1ebb678999582986acfec371d100827
diff --git a/sys-apps/toybox/toybox-0.7.7.ebuild b/sys-apps/toybox/toybox-0.7.7.ebuild
new file mode 100644
index 000000000000..876ef47e3464
--- /dev/null
+++ b/sys-apps/toybox/toybox-0.7.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multiprocessing savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gfto/toybox.git"
+else
+ SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+# makefile is stupid
+RESTRICT="test"
+
+DESCRIPTION="Common linux commands in a multicall binary"
+HOMEPAGE="http://landley.net/code/toybox/"
+
+# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+src_prepare() {
+ epatch_user
+ restore_config .config
+}
+
+src_configure() {
+ if [ -f .config ]; then
+ yes "" | emake -j1 oldconfig > /dev/null
+ return 0
+ else
+ einfo "Could not locate user configfile, so we will save a default one"
+ emake defconfig > /dev/null
+ fi
+}
+
+src_compile() {
+ tc-export CC STRIP
+ export HOSTCC=$(tc-getBUILD_CC)
+ unset CROSS_COMPILE
+ export CPUS=$(makeopts_jobs)
+ emake V=1
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ save_config .config
+ newbin generated/unstripped/toybox toybox
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index e258657f4955..895031500184 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 858bb66989eb..94931a1e438c 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -3,3 +3,4 @@ DIST mbuffer-20171011.tgz 136630 BLAKE2B ba69435684b8c844701a51c5a77d0f5ecbf8bef
DIST mbuffer-20180318.tgz 137259 BLAKE2B bec1f6acc68c3c9cf617dd7a752644628d088541c20816737ea1533eb0e9c92b76ef2dd037912501c29056994443e3ad66b1e7f4456e0f40687b32e4c6a12cf1 SHA512 ac71876aa0bea3acce8ea00c3848783b752991a0e60ebc4245277fd435c2c9e08c79cc5f47c996e590e711ca1bd652ded075c24ca820efe845f578b106c43594
DIST mbuffer-20180410.tgz 140026 BLAKE2B d271b4c744d5c54aebaea9a68a674df184ac460f879ac4788afaca732466c95dd958145ffcb42155ed998cab771a5b0e70a57a6b479d244156afe6232c37b154 SHA512 88fdad5b767bc4dabdbe3300cf3de99a56d137ac991aa5be7ba383fc2447ec01cb43853f31ec88be3bf0cfa736753afe8bd5ef0a5abb386521f2d3316b781d74
DIST mbuffer-20180505.tgz 140183 BLAKE2B 4c575c9654f15b4f81357fff21f41170627f6747313a462a76abbb8f5125a2e97549a9975aa67a59b402af6651b4e27b17e4ac7ea72b45620b43542ebccf9107 SHA512 b2f541332afadb42bbd2452d2079373f9d8ad44f0fe5eab2934cf4c46c6b2e4ec18c862ed385ba10e5b820efeab28c982bcf4ffa37a9cf70c5c92b5aabde7f4f
+DIST mbuffer-20180625.tgz 140946 BLAKE2B b52bf77acc142be418479a4ce878bd8a1e368aaaca44dc13b2b58a2e82c2f0e172ab04dc9d6e1a7664f353af5b005063da942441baa026caa5519ffe2b04575e SHA512 01d712f51ac0b206d6ee91fbbd4cea4873784aaca02daa9b3d72cfcc0a63696b20c15ca4b6e834924f02f2878ac90192110df584c55fb1a65620ae8b0f7ec87e
diff --git a/sys-block/mbuffer/mbuffer-20180625.ebuild b/sys-block/mbuffer/mbuffer-20180625.ebuild
new file mode 100644
index 000000000000..3b1fd2aa6a99
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20180625.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
+SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ssl test"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/openssl:0 )"
+
+REQUIRED_USE="test? ( ssl )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20180410-sysconfdir.patch"
+)
+
+src_prepare() {
+ ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+
+ # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+ # using same port and src_install may have problems (with /etc folder)
+ export MAKEOPTS=-j1
+
+ default
+
+ mv configure.in configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable ssl md5)
+ $(use_enable debug)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+ ewarn "Some tests may fail with FEATURES=usersandbox or"
+ ewarn "FEATURES=network-sandbox; Skipping tests because"
+ ewarn "test suite would hang forever in such environments!"
+ return 0;
+ fi
+
+ default
+}
+
+pkg_postinst() {
+ if ! has_version "app-arch/mt-st"; then
+ elog ""
+ elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+ fi
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 5a724c4d8ac2..c0a1eac25d48 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
index e9695c4b4821..269b1eb76adb 100644
--- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
+++ b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
. /usr/share/grub/grub-mkconfig_lib
@@ -32,28 +32,28 @@ if [ -f "${srcd}" ]; then
submenu "${longname}" --class submenu {
menuentry "${longname} (32bit standard${bootops}" --class rescue {
${grub_string}
- set isofile=${srcd}
+ set isofile=${path}
loopback loop \${isofile}
linux (loop)/isolinux/rescue32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
initrd (loop)/isolinux/initram.igz
}
menuentry "${longname} (64bit standard${bootops}" --class rescue {
${grub_string}
- set isofile=${srcd}
+ set isofile=${path}
loopback loop \${isofile}
linux (loop)/isolinux/rescue64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
initrd (loop)/isolinux/initram.igz
}
menuentry "${longname} (32bit alternative${bootops}" --class rescue {
${grub_string}
- set isofile=${srcd}
+ set isofile=${path}
loopback loop \${isofile}
linux (loop)/isolinux/altker32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
initrd (loop)/isolinux/initram.igz
}
menuentry "${longname} (64bit alternative${bootops}" --class rescue {
${grub_string}
- set isofile=${srcd}
+ set isofile=${path}
loopback loop \${isofile}
linux (loop)/isolinux/altker64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
initrd (loop)/isolinux/initram.igz
diff --git a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild
similarity index 92%
rename from sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild
rename to sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild
index 3a5d11ae858b..80a820419133 100644
--- a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild
+++ b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
DESCRIPTION="Grub menu entries for the .iso image of systemrescuecd-x86"
HOMEPAGE="http://www.sysresccd.org/"
@@ -10,7 +10,6 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT=0
KEYWORDS="~amd64 ~x86"
-IUSE=""
S=${WORKDIR}
diff --git a/sys-boot/woeusb/woeusb-3.1.5.ebuild b/sys-boot/woeusb/woeusb-3.1.5.ebuild
index d1da40809082..803545692f5b 100644
--- a/sys-boot/woeusb/woeusb-3.1.5.ebuild
+++ b/sys-boot/woeusb/woeusb-3.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="minimal"
RDEPEND="
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 95fa1a89928d..3f7b7d93c6e7 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/llvm/files/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch b/sys-devel/llvm/files/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch
new file mode 100644
index 000000000000..6eaacec77a84
--- /dev/null
+++ b/sys-devel/llvm/files/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch
@@ -0,0 +1,31 @@
+From b25d5675b67bd08e25dd093aaaf8c8f4bb1f822e Mon Sep 17 00:00:00 2001
+From: Tilmann Scheller
+Date: Thu, 1 Feb 2018 11:40:01 -0600
+Subject: [PATCH] Fix return type in ORC readMem() client interface.
+
+GCC 8.0.1 detects the type mismatch and causes the compilation to fail. Clang
+and earlier versions of GCC don't detect the issue.
+
+Fixes rhbz#1540620.
+---
+ include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
+index da02250ba16..bed472e2e0e 100644
+--- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
++++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
+@@ -713,8 +713,8 @@ private:
+
+ uint32_t getTrampolineSize() const { return RemoteTrampolineSize; }
+
+- Expected> readMem(char *Dst, JITTargetAddress Src,
+- uint64_t Size) {
++ Expected> readMem(char *Dst, JITTargetAddress Src,
++ uint64_t Size) {
+ // Check for an 'out-of-band' error, e.g. from an MM destructor.
+ if (ExistingError)
+ return std::move(ExistingError);
+--
+2.18.0
+
diff --git a/sys-devel/llvm/llvm-4.0.1-r1.ebuild b/sys-devel/llvm/llvm-4.0.1-r1.ebuild
index 044c8c45fedd..1df06e2d848c 100644
--- a/sys-devel/llvm/llvm-4.0.1-r1.ebuild
+++ b/sys-devel/llvm/llvm-4.0.1-r1.ebuild
@@ -79,6 +79,9 @@ src_prepare() {
# e.g. https://bugs.gentoo.org/617154
eapply "${FILESDIR}"/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
+ # gcc-8 build failure
+ eapply "${FILESDIR}"/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch
+
# Remove failing test (fixed in newer versions)
rm test/tools/llvm-symbolizer/print_context.c || die
diff --git a/sys-devel/llvm/llvm-5.0.2.ebuild b/sys-devel/llvm/llvm-5.0.2.ebuild
index 768c86f3ad63..58c2bb820959 100644
--- a/sys-devel/llvm/llvm-5.0.2.ebuild
+++ b/sys-devel/llvm/llvm-5.0.2.ebuild
@@ -86,6 +86,9 @@ src_prepare() {
# Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD).
eapply "${FILESDIR}"/6.0.9999/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch
+ # gcc-8 build failure
+ eapply "${FILESDIR}"/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch
+
# disable use of SDK on OSX, bug #568758
sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index bd075d462080..104893998a6d 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 78f1666053d5..591546218b23 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,2 +1,4 @@
DIST intel-microcode-collection-20180616.tar.xz 4413444 BLAKE2B 4ba5371914f64c8a7261720512dff128f83cc25950a4bdf8d41e9eeb724c6d3150212b1a7f2ee966a2b9c835a2622ac885625fada497ec2bc0aa3c435a2968e8 SHA512 5c0cd4e764397f8c2593153256d573db8f57cce1fc062f5e687a108e5a430c7ed506f63d0d324ea2b88cc8bf8762d3fec507252ee9890c55bb9d3b5604151afe
+DIST intel-microcode-collection-20180630.tar.xz 4456400 BLAKE2B 493229bb8ce65c62b4a894a219bd89e677a5908a774e1104389335f88fe27479de8e117bbd3b1c5bd1d9e70ed0f1c79ddba684357138dbb559141d48d5a3c456 SHA512 66a1217514c43dcc308cc1e9e4737041c48cad85cd846a9adaabd5885197ffffca3fef71c43ccdaaf25d10df747a3c3e837d95ae332d53961579e4bb3c1f0bed
DIST microcode-20180425.tgz 1565473 BLAKE2B 70e0a56f0f5f720e00ab18d6553bc221147589e83df34fdc0c130c6f74a239e48355bfe1845b1de919ed1bce9ade7b7db298883eb3de1d53732a694b15d76f62 SHA512 6cea53cc0f486891fb9ddffc1e03e8e0a6d1d91df6bfda81250b2c60714e7b4111caa9df5afa7f13d8144e591550ef7eb4fd1e153fc67fc904afb83ccc2e3bb0
+DIST microcode-20180703.tgz 1550181 BLAKE2B edf86dcc8dedeffd22a9b608cc11e5b043d36617ae6325e14326d402388f42ead29c8483a0312ab9ea2015604803cc07506d6f119b314b922639a71f9d65a39d SHA512 25af4158f97fba2fb88f05a44f42ed7d2415001ccc58f573d366f405ff198472517468f619628f4f6e5a371793c41ea8faf5a932d2362b2a51726bb5c84e0eed
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180703.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180703.ebuild
new file mode 100644
index 000000000000..a9113dcbc00e
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20180703.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info toolchain-funcs mount-boot
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+COLLECTION_SNAPSHOT="20180630"
+INTEL_SNAPSHOT="20180703"
+NUM="27945"
+DESCRIPTION="Intel IA32/IA64 microcode update data"
+HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
+SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
+ https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="hostonly initramfs +split-ucode vanilla"
+REQUIRED_USE="|| ( initramfs split-ucode )"
+
+DEPEND="sys-apps/iucode_tool"
+
+# !perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 4ccded51d440..eb4611b0e120 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 7e1f177fe403..94d9d2638ba1 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,5 +2,5 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_53.0.2907.110_amd64.deb 54978102 BLAKE2B ea7629597804d31e1e1decbef064f0a22ee083863fa35fe660af5ef83fa0b446b37dc56b821f4b0d14ead61e31d03ba4937a3e1c0f681c0cedbbc495670fe36b SHA512 1d36518a96610788d60e358a8a03c667247a41637716bbd4be3712f11227552c07fb138da943358e1cb5134e1dcf3709d859945083e579efc9bb592b91fd32e7
-DIST opera-stable_54.0.2952.41_amd64.deb 55050838 BLAKE2B 13bfd91148c909815c027a8f54d82763b05c7479fb23a941d58a83f6bcd5321bf5394d9dc65e53ceded9fc24281e2f70ba7d68a2254b74802bdbe31dedc71c2e SHA512 36534d1658d9f96a0df01a7a514d6ed7fa41333a72ab44d8f39ec4bc7f09200e9c6d5dc6539936b84a030a8a49520f1214ea227910ebe10db45e7c0d34e5a6a0
+DIST opera-stable_54.0.2952.46_amd64.deb 55502514 BLAKE2B 85831f94f7cd5ba2fb62c3d916644839b1fabeb4a251e3b87cd1123bb8a3176958d090c5f6e8b13cedc2a9dab72b98ab88974e71227ae25ca9e5763d60dbfbe3 SHA512 d7840c02988f06d3f92e6c4c332a5f2cde012644d01bc925fa0a108cf2f0cfd5a85377396b8378ae2590a295b93610903874bc458df2ef1306ede9e89dd9146b
+DIST opera-stable_54.0.2952.51_amd64.deb 55848686 BLAKE2B 4a26a16bb5a1fbf1f12e4ee3b3b347a4da6eb13d10866ecd5d1d908a352d73a376df40070f98046e412b522b59f4877591a78c0b931bc62672349e060a713da5 SHA512 2905808f54604f11c195d808928928dbb733a4a570f033dcb0164b5117620d5835afcf7da6c3345cd3d5afe48b6a997bf2d81588bb4afdbdeb129066dd643251
diff --git a/www-client/opera/opera-53.0.2907.110.ebuild b/www-client/opera/opera-54.0.2952.46.ebuild
similarity index 100%
rename from www-client/opera/opera-53.0.2907.110.ebuild
rename to www-client/opera/opera-54.0.2952.46.ebuild
diff --git a/www-client/opera/opera-54.0.2952.41.ebuild b/www-client/opera/opera-54.0.2952.51.ebuild
similarity index 100%
rename from www-client/opera/opera-54.0.2952.41.ebuild
rename to www-client/opera/opera-54.0.2952.51.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 6a7c4dbf2066..9c74b666171b 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,6 +1,6 @@
-DIST vivaldi-snapshot-1.16.1221.3_p1-amd64.deb 54929464 BLAKE2B 580f04ba12bd88bd23167bd02d6c808ecbf310e7e63cee213556d520de61771344e35063f4c8afdeae90c8358e323731dc75281704cd8a6680d334b87f16f4f5 SHA512 0ac69d286e2982a001831d6f989b02e5ba47dcce3b19280dcb8360ad591fe9c5af725eb8916aa6d7052dee0759cd8e93b29d7f26094285d314f8bd87eef6f88d
-DIST vivaldi-snapshot-1.16.1221.3_p1-armhf.deb 48793424 BLAKE2B 3caf45b1e0a5b89b13f81b6c0a50523596173f0c56fcbfe4de984283959721c396e2bcbc464f256d60d9643d45cd4c4c627a9de06c84ac3b896511e9f72db829 SHA512 73b5c85333e4a8c98cb245cd8802f8ec062021cd8ba8ae9d518f4da766c344e3b26f44cdb3c343cf2b3bc16c80ef2a59e73ec382a052b812395c7f3625017414
-DIST vivaldi-snapshot-1.16.1221.3_p1-i386.deb 54401486 BLAKE2B 6fcb7b85460daf62596643d6d8d81472d502b11de64bbd5075671f80cb63a83970b5f925326245f102fcaf814b9f64e3e4dfd4f034ccc31f19e775a734223420 SHA512 0d18164aa5e8e0034f96c50b359b73a34533a7fbff3534e47437830e117836529d20bcd22a452e5c8c91c39546c2df314347153cf420be4dbbf8dc4bcb589817
DIST vivaldi-snapshot-1.16.1226.3_p1-amd64.deb 54931368 BLAKE2B fecdbf62cf301a051f0798545847aba381f803b69165c470f6057247b626b31c0194f1bdf88f7bfeda57cbcc7d2b14d21efbf9e60cd177f37d9cd65d7edd6f36 SHA512 88a5c72cc2b0558d9819eb17525f00d3a049b01ebd80734ddbcc0b5928f188b3b6f081b7ed1e1a403cf2a071b009d5b26ea5af2b72b26b45eb42e644f5a47236
DIST vivaldi-snapshot-1.16.1226.3_p1-armhf.deb 48799752 BLAKE2B 4bf6ddf1ff1869c1a4614615046de27367dce9bf6c02208701740e12a3e6ef0c821ec486129feee8b2886c6a7f744d57115e5e8c2077e5540c71b70faadef4cd SHA512 d53eeba114f0502c0e045fc3a5d5531654f36bafeb34666ecea3798c4ceda8966f7079fb80c55617789c16ee273529f9ff6b872c56d63b430997bd2901cae6af
DIST vivaldi-snapshot-1.16.1226.3_p1-i386.deb 54406672 BLAKE2B 42e979c5b16d3f4d7ba3cf22c63b84b8991d14a13b3f1d8950cc1e504800cbb4a25a560b515201ebc4292a6aef6254008150926dbab5bb806ab70bfc84da0b7a SHA512 b7f50f377ede4a3a9ccb90dece883f5ca289f875b4397c0aa9151c60ab80378eed4dc198a0aa4d3960bfb766061510277f8b53f3a72c29532940b3878d04d887
+DIST vivaldi-snapshot-1.16.1230.3_p1-amd64.deb 54948576 BLAKE2B e32ed93d6e5692f4e2dd21e7fb93edfe67408e346e3ab264f7dbc0f536245d32d06573edc396efb9c7eff5e7eb02ceb1965321c104e6be556998102aba6c65bc SHA512 6e60ddc456525012a02648cff70aa1908635da79b0711cea6b9a296d983969f2fe2e22f0dc78ee29d362403a4cb5dacacc8e3d3f302e4fc5170cd508639fd348
+DIST vivaldi-snapshot-1.16.1230.3_p1-armhf.deb 48827914 BLAKE2B 53166df94706501b96c185cc97681cec6a1a227ceb74f5974a6e63b5f70148195fde0ddfda978c7694f480460d915ad7f8f5c3b68217835847a7b2d109362923 SHA512 a1483e209a82886b24fe067218b27f72667aa40f92382db560008d5198a018df43ec076c17f2059e03c2a41402f8f862799537385660007dff30b29e899cc127
+DIST vivaldi-snapshot-1.16.1230.3_p1-i386.deb 54437300 BLAKE2B 0465cfed1663a1595d9361ed9677019edfe10ef9b3e3c39ddf450c86ad9f23aa56307a95c048fc67dfee9d0e440e2519498b8913bde306f4eff159a429b1276c SHA512 3c24a26f8797ec844bbbf385ea61390000ee27c4cd9dce09958ac4e21143b65fad0bfaca56b35caba4f22401cf0e3279471e034520deb4ec1b424a7f18bacf3e
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1221.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1226.3_p1-r1.ebuild
similarity index 97%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1221.3_p1.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1226.3_p1-r1.ebuild
index 0b21131251e0..e897c38d5d11 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1221.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1226.3_p1-r1.ebuild
@@ -91,8 +91,6 @@ src_prepare() {
chromium_remove_language_paks
popd > /dev/null || die
- epatch "${FILESDIR}"/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
-
epatch_user
}
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1230.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1230.3_p1.ebuild
new file mode 100644
index 000000000000..e897c38d5d11
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.16.1230.3_p1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CHROMIUM_LANGS="
+ am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
+ hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
+ sw ta te th tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 eutils gnome2-utils multilib unpacker toolchain-funcs xdg-utils
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+ amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+ arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+ x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+ virtual/libiconv
+"
+RDEPEND="
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/speex
+ 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]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+ unpack_deb ${A}
+}
+
+src_prepare() {
+ iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+ mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+ mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+ chmod 0755 usr/share/doc/${PF} || die
+
+ rm \
+ _gpgbuilder \
+ etc/cron.daily/${PN} \
+ ${VIVALDI_HOME}/libwidevinecdm.so \
+ || die
+ rmdir \
+ etc/cron.daily/ \
+ etc/ \
+ || die
+
+ local c d
+ for d in 16 22 24 32 48 64 128 256; do
+ mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+ cp \
+ ${VIVALDI_HOME}/product_logo_${d}.png \
+ usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+ done
+
+ pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+ epatch_user
+}
+
+src_install() {
+ mv * "${D}" || die
+ dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+ fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 4d6c6f7940b0..be7bb5310f73 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild
index be16cea0651b..805a51f63791 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild
@@ -47,7 +47,7 @@ RDEPEND="sys-apps/kmod:=
DEPEND="${RDEPEND}
amd64? ( ${X86_DEPEND} )
x86? ( ${X86_DEPEND} )
- doc? ( >=dev-util/gtk-doc-1.25-r1 )"
+ >=dev-util/gtk-doc-1.25-r1"
PATCHES=(
"${FILESDIR}"/${P}-KBL-ICL-PCI-IDs.patch
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 8e4d71cc8f4c..d8223681ec7f 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
index 894b8ea450df..e4b2e239599c 100644
--- a/x11-libs/c++-gtk-utils/Manifest
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -4,3 +4,4 @@ DIST c++-gtk-utils-2.0.32.tar.gz 2753596 BLAKE2B 8b3cccca9a5229084df5c929b5ec88f
DIST c++-gtk-utils-2.2.10.tar.gz 2643918 BLAKE2B 3953b8acb7e8fcb47cfc55ade75baa6dd344e2e6e25187e67346137ef4cc241817c893597d75ae58462aaf0a0b58db5f018fd053e1da0b38716ae41c8ed40af3 SHA512 a0ea673988c95404846da6af6ff7ea51978653df3781be6a8323db5fe96826e94b0de9bbda5d3b821bbba2286dda6e66f4c099de4cd8da7bdefa4caa684d7a31
DIST c++-gtk-utils-2.2.14.1.tar.gz 2790401 BLAKE2B 14b1a90d054ffcd1fc31db61a0ec4a2aa140f1560ff5332cbf97cf179da0bce087d8602ff820fe10fe448fa14691eb8200d25e467ce0dec2114a0ca426e2a0d7 SHA512 f6ce101bdc4b10f7afe05af5d90924e5ca7999e2c3db22885666e6528ae87b35cb75a40b92af9df823e12c3fd0dbf45cb8385e3637326829b9d0bcab0f691831
DIST c++-gtk-utils-2.2.15.tar.gz 2943272 BLAKE2B 3eae2d8d0d724e005b0843fb8124d946fc89c48ef8b4f30a5aced222106693826c0bb23ea45005eb545b09f3a45aa191f04ad2932ec56a0050d6764cc0944329 SHA512 0181fb0400173fb99f89d72b52bc2ef458d25688d5f3be064f7baafbee6586fde386b3400d90e2178bdd3228c9dc184f87a0db0a50a020db5785b50f34785acc
+DIST c++-gtk-utils-2.2.16.1.tar.gz 3034643 BLAKE2B 10da7fb712ec37d5ab8fa00ed7f17afb46bdad32d11de3b44aa5df41dde8ad657c39bc132ad3bc4ddd67a4521705f18e94b7eb6f5b49b2d07f05a61dbbe1cc99 SHA512 e63b82c6ad15c96859d0631c1d76cdd73ababe11e2231e139bd451a3845f2275f5d7a903bdf7a0ce5740deec6397904818e3b5f6650887def6233c2a3f051e7a
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.16.1.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.16.1.ebuild
new file mode 100644
index 000000000000..e4e56f2c3744
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.16.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="A number of classes and functions for programming GTK+ programs using C++"
+HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+gtk nls static-libs"
+SLOT="0"
+
+RDEPEND="
+ >=dev-libs/glib-2.26
+ gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_with gtk) \
+ $(use_enable static-libs static) \
+ --docdir=/usr/share/doc/${PF} \
+ --htmldir=/usr/share/doc/${PF}/html \
+ --without-guile
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/x11-libs/gtk+/gtk+-2.24.32.ebuild b/x11-libs/gtk+/gtk+-2.24.32.ebuild
index 847e511a254a..c378616f951d 100644
--- a/x11-libs/gtk+/gtk+-2.24.32.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
xinerama? ( !aqua )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Upstream wants us to do their job:
# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
index 7661241aa30e..7f3853feafa8 100644
--- a/x11-libs/gtk+/gtk+-3.22.30.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.30.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
xinerama? ( X )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Upstream wants us to do their job:
# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
index db3725e99188..a1510fb96e97 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
IUSE="glade +introspection vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index a818c51c000c..03623275b4cb 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1 +1,2 @@
DIST libXScrnSaver-1.2.2.tar.bz2 290437 BLAKE2B 051218bdfc249d7dcf3d53b3d6e7136b0215b3b445254aba27515ab4813da6b086d09d7be97e35d3f33ece78ecbc003911e671564f492e47d240e1613de5cda5 SHA512 973aed3ad296c7160b66fccd4fff7375afc4332239acbe0ae1644fed9c453de69040f8174882ba264c731448edba9b499d398d013d556aea72434339399ed29f
+DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
new file mode 100644
index 000000000000..43cd32468eab
--- /dev/null
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org XScrnSaver library"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index f51e9e61bacf..a54842941601 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1 +1,2 @@
DIST libXinerama-1.1.3.tar.bz2 278026 BLAKE2B d44c693cee0dab38918fb4a00803430fa4bbbc985e2cd541187bdbb717a9e3d843254f76e098f415ce4ada575aa271ab7d3ca14c8b590dcc3fe31e615ee0db99 SHA512 c9f059697c04fdc600d9e63873e924032d6cff456674ee28a885270c54722d96df0ef7a78432c2bdc0844241f115e00ad730c29d84681efc1c45a2e1acb3288c
+DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
new file mode 100644
index 000000000000..9bbaca5198d0
--- /dev/null
+++ b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xinerama library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-base/xorg-proto
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest
index f2922ee076f6..e0056a589834 100644
--- a/x11-libs/libXxf86misc/Manifest
+++ b/x11-libs/libXxf86misc/Manifest
@@ -1 +1,2 @@
DIST libXxf86misc-1.0.3.tar.bz2 255831 BLAKE2B 3e9fc6cc8853fb74facdbb9183111a513de7fdbc484679561def89af46a99b2cf6fd49fe66cd6b7ad9bf95cc96aeb09207bcaa46094fdebcf373198db10f9a68 SHA512 4df80bdf6cae9f43a1ddf09b078f354d0cfcab1861d073f3d274bc3a5dd0efe1057abae792f6c512e8f45286a62db95f85bf8c02de23fe96a76d8972cc1fdb7f
+DIST libXxf86misc-1.0.4.tar.bz2 282048 BLAKE2B 5d60bc5d04f232444143aa1d89b5760a92aa5951efb41b83eed449916219346d049f0c2b7893858c7ba5148dcf273bb0d2b558e43843f897d057780362d0ccca SHA512 1dbd51a51188a060f676b88e5d98809ea355f69933972ceb7721c83289b5bb94c1f7b889baa83209a5ed864e67dd8a4ed62f1393634e97cc99ce36a2cef447fb
diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
new file mode 100644
index 000000000000..e8c14407c2ba
--- /dev/null
+++ b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="X.Org Xxf86misc library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-base/xorg-proto
+ x11-libs/libX11
+ x11-libs/libXext"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
index 1b74d6e22141..e21f66bf7606 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0/13"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
IUSE="designer doc"
DEPEND="
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 02ff1320aff7..e9df618f4ecb 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/dunst/dunst-1.3.2.ebuild b/x11-misc/dunst/dunst-1.3.2.ebuild
index 18ef727cb181..e4b9b064c4f8 100644
--- a/x11-misc/dunst/dunst-1.3.2.ebuild
+++ b/x11-misc/dunst/dunst-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
IUSE="dunstify"
CDEPEND="
diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index e8323ad9d9b8..58ae09abe576 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz"
LICENSE="xbatt"
SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
RDEPEND="
x11-libs/libX11
x11-libs/libXmu
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 5cc621d5a451..96f9bbc12e5f 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/terminology/terminology-1.1.0.ebuild b/x11-terms/terminology/terminology-1.1.0.ebuild
index ddf20a904f22..cd65d6cd9025 100644
--- a/x11-terms/terminology/terminology-1.1.0.ebuild
+++ b/x11-terms/terminology/terminology-1.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="nls"
RDEPEND=">=dev-libs/efl-1.18.0[eet,X]"
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index ef9ea02a52e8..86715dc71c60 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/experience/experience-3.04-r1.ebuild b/x11-themes/experience/experience-3.04-r1.ebuild
index 52deb15b89d2..5e5f3ebfcf1a 100644
--- a/x11-themes/experience/experience-3.04-r1.ebuild
+++ b/x11-themes/experience/experience-3.04-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnome/teams/art.gnome.org/themes/gtk2/GTK2-EXperience.tar.gz -
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
IUSE=""
RDEPEND="x11-themes/gtk-engines-experience"
diff --git a/x11-themes/zukini/zukini-20120817.ebuild b/x11-themes/zukini/zukini-20120817.ebuild
index 05d476b9d932..1830c71ba052 100644
--- a/x11-themes/zukini/zukini-20120817.ebuild
+++ b/x11-themes/zukini/zukini-20120817.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~sping/distfiles/${P}.zip"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
IUSE=""
RESTRICT="binchecks strip"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 0a351bdc0012..58689cd2d254 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/dwm/dwm-6.1-r1.ebuild b/x11-wm/dwm/dwm-6.1-r1.ebuild
index e10b6affe468..49ee11e91a57 100644
--- a/x11-wm/dwm/dwm-6.1-r1.ebuild
+++ b/x11-wm/dwm/dwm-6.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
IUSE="xinerama"
RDEPEND="
diff --git a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
index 16478dc29330..ce5aacf8041c 100644
--- a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_URI_APPEND="${PN}"
else
SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
inherit enlightenment xdg-utils