Sync with portage [Mon Mar 4 09:40:02 MSK 2019].

5 years ago · 2f25b5d6c6
parent 7c04f05a8c
commit 2f25b5d6c6
2199 changed files with 21527 additions and 15016 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X +introspection"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"

 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.30.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.30.0.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"

 RDEPEND="
 	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@ -1,4 +1 @@
-DIST cdist-4.10.1.tar.gz 660264 BLAKE2B 7e4c9bc1e4a750865880aa442ed6c8a125b80d35ba2fbb49f6549c25764a8aea62defd95d3e32782a7290729f45e6a9a658fd2d6abaae15b3686c3ed312dce37 SHA512 d5852ddceb869a5d70c77d65b9288a780cc62794472fff1537a22d3e890b87ffc15181bc425f0bbbf43952eba12aa99046f482cf97f4afa6ca747d2cb55bea98
-DIST cdist-4.10.4.tar.gz 679595 BLAKE2B ae22287a4424dbcc2dc8c58db2ca3e0af3f526525277208f2256df615d8c214e15483b2c13af882e56121c4bece0f61fb259d2c5f44f02a2f6807451c986554c SHA512 696563dc0cb5a9f25b0d9282017de6315addb999cf63b3de87c1f5de4ce3f1fb99ee0c03f346aacebebfa2dd7f8eed58d22cdb05d2d4c26474963d29688056ed
-DIST cdist-4.6.1.tar.gz 454461 BLAKE2B 5cf5ba376b981feb6d740f53b4c4cdf51a8f0b4d4422db2c2c7312dd1288e006bfcae7c3459707e361536002a2a6b49bb8ef836783fac8167834978fb5737683 SHA512 f0c3759d00221fbd36d7662de6ccc57fc0070b8aee6a0d80e6bab6f41215c537a1cf1a6ec9fdebf81c45ad8126b8e730a14be8f1286d5baf5f4a5672611e31dc
-DIST cdist-4.7.3.tar.gz 497537 BLAKE2B e743e49291d6b212810911607ac149a54e6c8423841c4149f620d2127bbeb2fdce7d5ceff76572f1599a3a3326944066ba336f93f25de50d98ad972188562709 SHA512 9b69e257c816d515e4d94bc73d26ca1cfb2343fc4fc8298aadfbb82417aa28c9759831c304b90d6427e275988442cd19681e455c98757c87426d0435dd90ae41
+DIST cdist-4.10.6.tar.gz 676651 BLAKE2B 107b60c8890ede0bfa9f741375cc1705946b2d6be9caa4ae41c2ba155097b64e451474218ae9d5a8e2aa2511908869e8a5aa24fe15f0d41a50c8775d037a7eb3 SHA512 558fbe242a24fcd204a0b2519c9ad73405fe20466600af3635c6a5029641c4aec4315be99af0d5d9c1920aaadfe96942ffab94133c48675655ea8107fc8af90c
--- a/app-admin/cdist/cdist-4.10.4.ebuild
+++ b/app-admin/cdist/cdist-4.10.4.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A usable configuration management system"
-HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
-	distutils-r1_python_install_all
-
-	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
-}
--- a/app-admin/cdist/cdist-4.10.6.ebuild
+++ b/app-admin/cdist/cdist-4.10.6.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )

 inherit distutils-r1

--- a/app-admin/cdist/cdist-4.6.1.ebuild
+++ b/app-admin/cdist/cdist-4.6.1.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A usable configuration management system"
-HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
-	distutils-r1_python_install_all
-
-	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
-}
--- a/app-admin/cdist/cdist-4.7.3.ebuild
+++ b/app-admin/cdist/cdist-4.7.3.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A usable configuration management system"
-HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
-	distutils-r1_python_install_all
-
-	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
-}
--- a/app-admin/chrootuid/chrootuid-1.3-r2.ebuild
+++ b/app-admin/chrootuid/chrootuid-1.3-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 arm ia64 ppc x86"
 IUSE=""

 S="${WORKDIR}/${MY_P}"
--- a/app-admin/cli53/Manifest
+++ b/app-admin/cli53/Manifest
@ -1,2 +1 @@
-DIST cli53-0.8.12.tar.gz 973966 BLAKE2B 9011b036a2673a32170accf3be80d1e18d7fab4a1f83e0c3c9c84029e27a9aedc14642822e22bbeaafb12381bffb76c8ad926521bb68c3f6e2091de4730ebe18 SHA512 abe5e092fb570336b2d50099934d1cc5e722e394155b86de2dc2315df70eb1a89bb57f131913ec2dd588b6476c900c9d07daab0e8396e8364548f92651377fea
-DIST cli53-0.8.9.tar.gz 4372517 BLAKE2B 9780883159cb2fb4ecedee58e4df57d03e55576cb0d81cfadacf42fa7c7b679d21ad182bce5cc32652c102b4d663f162f3ac7bec520e9ec32bd12cc565ce28e5 SHA512 14db2d69feaa5af9e82c77b6c837be55a5d97e438eb6efbb71857fa1630ec1aa5ec77648d0979ce69ca8fcf72478b55c55c12a5e5dbac20415e656fd9c8d0beb
+DIST cli53-0.8.14.tar.gz 9263235 BLAKE2B 2df06c3de9372e5f3adb2fabdfa74525a880d41f9d28d356fda291baf576525b42ea3e42f354b9dd91b063485752d936710823d5a5c777cc1a4972dcdd382140 SHA512 b2e97ffea855ad1ac06ceb76b5cdffcd890d237a67abb0f3e9be035ca4438af0b0ccdfd86e7dc7e485ebd5ee12783c6e24c818757c29e80c8c4d6b67ed9f77cf
--- a/app-admin/cli53/cli53-0.8.14.ebuild
+++ b/app-admin/cli53/cli53-0.8.14.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 if [[ ${PV} == 9999 ]]; then
 	inherit golang-vcs
--- a/app-admin/cli53/cli53-0.8.9.ebuild
+++ b/app-admin/cli53/cli53-0.8.9.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	inherit golang-vcs
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Command line tool for Amazon Route 53"
-HOMEPAGE="https://github.com/barnybug/cli53"
-
-LICENSE="MIT"
-SLOT="0"
-
-EGO_PN="github.com/barnybug/cli53"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" emake build
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" go test -v || die
-}
-
-src_install() {
-	dobin cli53
-	dodoc CHANGELOG.md README.md
-}
--- a/app-admin/cli53/cli53-9999.ebuild
+++ b/app-admin/cli53/cli53-9999.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 2016-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 if [[ ${PV} == 9999 ]]; then
 	inherit golang-vcs
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@ -1,3 +1,4 @@
 DIST dxf-7.3.0.tar.gz 298408 BLAKE2B a8ba078d1bea8fed58df35562af678f902513f4da18123a3eabb52a707b7973358a7690d309b3b7d86fadc4086856580792177525b4e7e217da4542249e83663 SHA512 2bb16a41990f572c3352f708438e67550cc089c078296c765fcffec4ada60f40f097bfcdf4def3c57a0e6c1db31d2ab9020407b2c165509f132e51cc93af8205
 DIST dxf-7.4.0.tar.gz 300099 BLAKE2B a3d17709efed3af5be82b1bf4ebd4201101e92867f714355467d72b84d560cddcf13a9ad2b4b71553decfc664f29c7ee13f74d551092d8a3a25dc48eea9a4214 SHA512 7aaa5827c6f02bb22b4d2dae9e24aa921ecebe72fe8278d3fc84f48448c1f903c0b70c22873d2772f3da5367ecc45770b8719c4d1aa95cac146a392bd9a923d2
 DIST dxf-7.4.1.tar.gz 300216 BLAKE2B 53452e73a10912a09e912fc0710fcdd1b0a6be4f78e95c704526852deacf5a7bfd2d3b73bc165f178f732249a64547e13bf9f58f77159c31908e954d6d3a4161 SHA512 a7a2ba4da675f1dea73f2e3d7db63804eb2b68cbb859e43235997b3bc5b8e7ef209705935182ae33d4b28cec5857d2ede738375e19df72134a5695190fd609a1
+DIST dxf-7.5.0.tar.gz 301822 BLAKE2B 33f2356cc6e3567b11d48b63ae9951bdbf5e77726e7f6081b3d299b0560646fd775060b3fe2766d3de69b33cedf4c3f21810bbb4429402a1d9c616da2f7c0ba6 SHA512 82a4a4d2b8baaba242f82b2c01ae47adc4856250bf558d28e0582e6a92b081ff9512e33d3b02d022232880003df40dbd62b7a6401aa5bac83cb673ebb9c85435
--- a/app-admin/dxf/dxf-7.5.0.ebuild
+++ b/app-admin/dxf/dxf-7.5.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
+	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+	emake test
+}
--- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-byteswap.patch
@ -1,28 +0,0 @@
-diff -Nuar --exclude '*~' hddtemp-0.3-beta15.orig/src/sata.c hddtemp-0.3-beta15/src/sata.c
--- hddtemp-0.3-beta15.orig/src/sata.c	2006-05-14 02:09:55.579437498 -0700
-+++ hddtemp-0.3-beta15/src/sata.c	2006-05-14 02:06:08.495948437 -0700
-@@ -88,7 +88,9 @@
-     return strdup(_("unknown"));
-   else
-   {
-+		//fprintf(stderr,"sata_model1=%s\n",identify + 54);
-     sata_fixstring(identify + 54, 24);
-+		//fprintf(stderr,"sata_model2=%s\n",identify + 54);
-     return strdup(identify + 54);
-   }
- }
-diff -Nuar --exclude '*~' hddtemp-0.3-beta15.orig/src/satacmds.c hddtemp-0.3-beta15/src/satacmds.c
--- hddtemp-0.3-beta15.orig/src/satacmds.c	2006-05-14 02:09:40.983470339 -0700
-+++ hddtemp-0.3-beta15/src/satacmds.c	2006-05-14 02:09:02.319557333 -0700
-@@ -98,7 +98,10 @@
-   /* convert from big-endian to host byte order */
-   for (p = end ; p != s;) {
-     unsigned short *pp = (unsigned short *) (p -= 2);
-    *pp = ntohs(*pp);
-+		char tmp = p[0];
-+		p[0] = p[1];
-+		p[1] = tmp;
-+    //*pp = ntohs(*pp);
-   }
- 
-   /* strip leading blanks */
--- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-execinfo.patch
@ -1,21 +0,0 @@
--- hddtemp-0.3-beta15/configure.in~	2005-10-17 19:14:19 +0000
-+++ hddtemp-0.3-beta15/configure.in	2006-12-11 18:23:22 +0000
-@@ -18,6 +18,7 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS(fcntl.h)
- AC_CHECK_HEADERS(netinet/in.h)
-+AC_CHECK_HEADERS(execinfo.h)
- AC_CHECK_TYPE(in_addr_t, ,[AC_DEFINE_UNQUOTED([in_addr_t], [uint32_t], [Define to 'uint32_t' if <netinet/in.h> does not define.])], [#include <netinet/in.h>])
- 
- # Checks for typedefs, structures, and compiler characteristics.
--- hddtemp-0.3-beta15/src/backtrace.c-orig	2006-12-11 18:20:41 +0000
-+++ hddtemp-0.3-beta15/src/backtrace.c	2006-12-11 18:23:28 +0000
-@@ -18,7 +18,7 @@
- 
- #include <features.h>
- 
-#if defined(__i386__) && defined(__GLIBC__)
-+#ifdef HAS_EXECINFO_H
- 
- #include <execinfo.h>
- 
--- a/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch
@ -1,26 +0,0 @@
-diff -Naurp hddtemp-0.3-beta15-orig/src/satacmds.c hddtemp-0.3-beta15/src/satacmds.c
--- hddtemp-0.3-beta15-orig/src/satacmds.c	2007-02-10 14:25:15.000000000 +0100
-+++ hddtemp-0.3-beta15/src/satacmds.c	2007-02-10 14:26:53.000000000 +0100
-@@ -54,7 +54,6 @@ int sata_pass_thru(int device, unsigned 
-   unsigned char cdb[16];
-   unsigned char sense[32];
-   int dxfer_direction;
-  int ret;
-   
-   memset(cdb, 0, sizeof(cdb));
-   cdb[0] = ATA_16;
-@@ -78,13 +77,7 @@ int sata_pass_thru(int device, unsigned 
-     cdb[6] = cmd[1];
-   cdb[14] = cmd[0];
- 
-  ret = scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction);
- 
-  /* Verify SATA magics */
-  if (sense[0] != 0x72 || sense[7] != 0x0e || sense[9] != 0x0e || sense[10] != 0x00)
-    return 1;		  
-  else 
-    return ret;
-+  return scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction);
- }
- 
- void sata_fixstring(unsigned char *s, int bytecount)
--- a/app-admin/hddtemp/files/hddtemp.service
+++ b/app-admin/hddtemp/files/hddtemp.service
@ -1,11 +0,0 @@
-[Unit]
-Description=Hard drive temperature monitor daemon
-Documentation=man:hddtemp(8)
-
-[Service]
-Environment=HDDTEMP_OPTIONS=--listen=127.0.0.1
-EnvironmentFile=-/etc/conf.d/hddtemp
-ExecStart=/usr/sbin/hddtemp -d $HDDTEMP_OPTIONS $HDDTEMP_DRIVES
-
-[Install]
-WantedBy=multi-user.target
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@ -1,5 +1,8 @@
 DIST mongo-tools-3.4.16.tar.gz 4697191 BLAKE2B 2e9a0e7dc8016d3e7d7c7f8d0cf80a97d3d199603c0b8b791df5a0d79d418ffaa232eee694047a7ca11fa7623023b4123becd437cfe3dec11e26cd525720bcad SHA512 b40c6dee75d860de1da73faf79f5f68c098ce7c80681486c66fff04a937474dcede91c7be907a8e36033b3898f7499e8f53271944c0df3360756c27361efb6f5
+DIST mongo-tools-3.6.10.tar.gz 4731097 BLAKE2B dffd18bbcb5a1d869cd3a00b40be7c83d12c2146944044c8d873eba409b9fcb0ce0595c01cd61a6b0405dfce685b8dde7c285380150906d4d38d3de9b42962bf SHA512 3e9808c6b275566215f8c2ce033a6259d373e8b63db5e981cc28235d757404b3209a64dd9aa8a98d9290c5c1da137a1bf9bc48629b278cb27ca28be681e86efc
 DIST mongo-tools-3.6.8.tar.gz 4723878 BLAKE2B a1693024d60f69d25c268eaaa30a478b1e4c0042c5fb7a3fd6252ed00aef2fee3fba94516fe825165a1a57887ed38e4fbce488c48ddd4f45349f0b7a1b244020 SHA512 359e8ce2d847d005d48ff12bc2e8af73213d81cd1521d2b5b5ac94792468218248bebbe808e1bd8fd49234eab8480608f294c1b63f317aed58f456b84ef17dcf
 DIST mongo-tools-3.6.9.tar.gz 4723117 BLAKE2B 2cc88b9e8424abe082d68a8f7afa02bf2b21d027cabe04298fafbd065346350d57f6a48ece1a849e779cac6da315aa9d5469c5f63ca5aae6be7e8f73fae3fe4b SHA512 def8e2bb68898c540dfa9fbe742696d463c099e7d70fc2f0e114301d321e3983ef0b07588301340b0a3ffdf2280febc3fa37e77d2520f147e723d2ce147c7261
 DIST mongo-tools-4.0.3.tar.gz 10874727 BLAKE2B 3e5d07b8ae797d0876b68a3018806e91a30758415aaa236423648a77f5e0d475848060516ee0da91a8448813a12a685410b93bf219b8180beb91f448e329a532 SHA512 cbe74b3fdebd0d4f6be6e3acf7f55f5f1a551b0ad1a23d82782643d2a9eb9ea4b7e0133985485b8c5a88c1fea26595e3ed9c759f1f63b578b6472d850154d67b
 DIST mongo-tools-4.0.4.tar.gz 10878921 BLAKE2B 3960838f68333bf033be9b72191e221b449bde8157ecb6d2f595d84c862fadd9597a53be88e5b0ad691cb6163cf90294348145ecce4c796c88bf84a4d7d8ab86 SHA512 d7900dbbd1e1e63d5518494c85559a7eab34f53ffa38880628f3dda0a71ee1211f67cf7dfaac66498b0359eca32abb9c89410e5cc56415a1594acf38ebfa226b
+DIST mongo-tools-4.0.5.tar.gz 10878974 BLAKE2B 704eadb7469d1f07bcf0c18fd2c3d1a2078064e8d0f33e03b0ec0a7539a8ae6e5c4ec3a4f9dff4f34d3cea8a2aa63097bfa050de0af5d0a44e54e4e47c83565f SHA512 5a2ca0cb761895a6c3187bdf4ac0c11222ac681313c2c22801571a1147e07b7b6149150b07e58cd4487413017da56424ec494eaaf9aec9193498ee3cde73c5da
+DIST mongo-tools-4.0.6.tar.gz 10879606 BLAKE2B 9a7656ba1486df4b36ceb527735ad46864d7a04f2d0451fb4e04bbbdc09c3bb0ec922aa5daa584b93e123e1c3764c0ebef96a3566dd0d6b646a627d769645619 SHA512 d6185d7442a593d29db78889c55aba53e070bedd522d78d8c0bf52bb27f26c5fee6d010457f65774ea36a2e6d5280f38c95433ff76ed53ed9d74b1c811198cb7
--- a/app-admin/mongo-tools/mongo-tools-3.6.10.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.6.10.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="${PREFIX}/usr/$(get_libdir)/go" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
--- a/app-admin/mongo-tools/mongo-tools-4.0.5.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.0.5.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="${PREFIX}/usr/$(get_libdir)/go" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
--- a/app-admin/mongo-tools/mongo-tools-4.0.6.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.0.6.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="${PREFIX}/usr/$(get_libdir)/go" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
--- a/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch
+++ b/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch
@ -1,111 +0,0 @@
-add Prefix and Darwin support
-
--- perl-cleaner
-+++ perl-cleaner
-@@ -1,4 +1,4 @@
-#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # vim: set et sw=4 sts=4 tw=80:
- # Copyright 2005-2014 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
-@@ -22,13 +22,13 @@
- PKGS_EXCEPTIONS="dev-lang/perl sys-devel/libperl app-emulation/emul-linux-x86-baselibs"
- PKGS_MANUAL=""
- 
-PKG_DBDIR=/var/db/pkg
-+PKG_DBDIR="@GENTOO_PORTAGE_EPREFIX@/var/db/pkg"
- 
- # See bug 504116 for details
-if [ -e /lib/gentoo/functions.sh ]; then
-    . /lib/gentoo/functions.sh
-elif [ -e /etc/init.d/functions.sh ]; then
-    . /etc/init.d/functions.sh
-+if [ -e "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh" ]; then
-+    . "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh"
-+elif [ -e "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh" ]; then
-+    . "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh"
- else
-     echo "$0: Unable to find functions.sh"
-     exit 1
-@@ -157,7 +157,7 @@
- 
-     veinfo 1 "Locating ph files for removal"
-     eindent ""
-    for i in /usr/lib{,64,x32}/perl5 ; do
-+    for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/lib{,64,x32}/perl5 ; do
-         [[ ! -d ${i} ]] && continue
-         veinfo 4 "...in ${i}"
-         while IFS= read -r -d $'\0' file ; do
-@@ -183,13 +183,13 @@
-         veinfo 1 "Pretend. Nothing to do."
-         return
-     fi
-    pushd /usr/include > /dev/null
-+    pushd "@GENTOO_PORTAGE_EPREFIX@"/usr/include > /dev/null
-     if [[ ${version} =~ ^5.(8|10) ]] ; then
-         eindent
-        veinfo 2 "...in /usr/include"
-+        veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include"
-         h2ph ${option} * 2>/dev/null
-         for dir in sys arpa netinet bits security asm gnu linux ; do
-            veinfo 2 "...in /usr/include/$dir/"
-+            veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include/$dir/"
-             h2ph ${option} -r $dir/*
-         done
-         eoutdent
-@@ -220,13 +220,16 @@
-         veinfo 1 "Locating ebuilds linked against libperl"
-     fi
- 
-+    local scanelf=scanelf
-+    [[ -e "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.dylib ]] \
-+        && scanelf=scanmacho
-     if ${LIBPERL} ; then
-        if ! type -P scanelf >/dev/null 2>&1; then
-            ewarn "scanelf not found! Install app-misc/pax-utils."
-+        if ! type -P ${scanelf} >/dev/null 2>&1; then
-+            ewarn "${scanelf} not found! Install app-misc/pax-utils."
-             ewarn "--libperl is disbled."
-             LIBPERL=false
-         else
-            SONAME="$(scanelf -qBS "$(realpath /usr/lib/libperl.so 2>/dev/null )" | awk '{ print $1 }')"
-+            SONAME="$(${scanelf} -qBS "$(realpath "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.{so,dylib} 2>/dev/null )" | awk '{ print $1 }')"
-             veinfo 4 SONAME="${SONAME}"
-         fi
-     fi
-@@ -268,7 +271,7 @@
-             while read -r type file ; do
-                 shopt -s extglob
-                 [[ ${type} == obj ]] || [[ ${type} == sym ]] || continue
-                [[ ${file} =~ ^/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue
-+                [[ ${file} =~ ^"@GENTOO_PORTAGE_EPREFIX@"/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue
-                 file=${file% +(!([[:space:]])) +([[:digit:]])}
-                 shopt -u extglob
-                 if ${FORCE} || outdated_path "${file}" ; then
-@@ -302,7 +305,7 @@
- 
-         if ${LIBPERL} ; then
-             # We assume the broken libs have all bin or lib in their path
-            broken_libs="$(scanelf -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.so\.[0-9.]*' | sort -u )"
-+            broken_libs="$(${scanelf} -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.\(so\|dylib\)\.[0-9.]*' | sort -u )"
-             if [[ -n "${broken_libs}" ]] ; then
-                 if ${FORCE} || [[ ${broken_libs} != ${SONAME} ]] ; then
-                     PKGS_TO_REMERGE+=" ${CATPKGVER}"
-@@ -327,7 +330,7 @@
-         exit $?
-     fi
- 
-    if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x /usr/bin/portageq ]] ; then
-+    if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq ]] ; then
-         # Filter out --getbinpkg, --getbinpkgonly, --usepkg and --usepkgonly options in EMERGE_DEFAULT_OPTS
-         emerge_default_opts=""
-         for option in $(portageq envvar EMERGE_DEFAULT_OPTS ) ; do
-@@ -383,7 +386,7 @@
-     veinfo 1 "or edited. This script cannot deal with them."
-     vecho 1
- 
-    for i in /usr/{share,lib{,32,64,x32}}/perl5 ; do
-+    for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/{share,lib{,32,64,x32}}/perl5 ; do
-         [[ -d $i ]] && perlpath[${#perlpath[*]}]="$(realpath $i 2>/dev/null )"
-     done
-     [[ ${#perlpath[*]} == 0 ]] && return
--- a/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
+++ b/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,7 +11,7 @@ SRC_URI="http://xjack.org/pwcrypt/downloads/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""

 DOCS=( CREDITS README )
--- a/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then

 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"

 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@ -12,12 +12,17 @@
 		arguments.
 	</longdescription>
 	<use>
-		<flag name="gcrypt">Use SHA2 from <pkg>dev-libs/libgcrypt</pkg> instead of sudo's internal SHA2</flag>
+		<flag name="gcrypt">Use message digest functions from <pkg>dev-libs/libgcrypt</pkg> instead of sudo's</flag>
+		<flag name="libressl">Use message digest functions from <pkg>dev-libs/libressl</pkg> instead of sudo's</flag>
 		<flag name="offensive">Let sudo print insults when the user types the wrong password</flag>
-		<flag name="openssl">Use SHA2 from <pkg>dev-libs/openssl</pkg> instead of sudo's internal SHA2</flag>
+		<flag name="openssl">Use message digest functions from <pkg>dev-libs/openssl</pkg> instead of sudo's</flag>
 		<flag name="sendmail">Allow sudo to send emails with sendmail</flag>
 		<flag name="sssd">Add System Security Services Daemon support</flag>
 		<flag name="secure-path">Replace PATH variable with compile time secure paths</flag>
+		<flag name="system-digest">
+			Use message digest functions from <pkg>dev-libs/libgcrypt</pkg>, <pkg>dev-libs/libressl</pkg>
+			or <pkg>dev-libs/openssl</pkg> instead of sudo's internal SHA2 implementation
+		</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:todd_miller:sudo</remote-id>
--- a/app-admin/sudo/sudo-1.8.27-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.27-r1.ebuild
@ -31,20 +31,25 @@ fi
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-IUSE="gcrypt ldap nls offensive openssl pam sasl +secure-path selinux +sendmail skey sssd"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"

 CDEPEND="
 	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:= )
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
 		dev-libs/cyrus-sasl
 	)
-	openssl? ( dev-libs/openssl:0= )
 	pam? ( virtual/pam )
 	sasl? ( dev-libs/cyrus-sasl )
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	sssd? ( sys-auth/sssd[sudo] )
+	system-digest? (
+		gcrypt? ( dev-libs/libgcrypt:= )
+		!gcrypt? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
 "
 RDEPEND="
 	${CDEPEND}
@ -65,7 +70,6 @@ S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	pam? ( !skey )
 	skey? ( !pam )
-	?? ( gcrypt openssl )
 "

 MAKEOPTS+=" SAMPLES="
@ -145,7 +149,6 @@ src_configure() {
 		--without-opie
 		$(use_enable gcrypt)
 		$(use_enable nls)
-		$(use_enable openssl)
 		$(use_enable sasl)
 		$(use_with offensive insults)
 		$(use_with offensive all-insults)
@ -157,6 +160,13 @@ src_configure() {
 		$(use_with selinux)
 		$(use_with sendmail)
 	)
+
+	if use system-digest && ! use gcrypt; then
+		myeconfargs+=("--enable-openssl")
+	else
+		myeconfargs+=("--disable-openssl")
+	fi
+
 	econf "${myeconfargs[@]}"
 }

--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@ -31,20 +31,25 @@ fi
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-IUSE="gcrypt ldap nls offensive openssl pam sasl +secure-path selinux +sendmail skey sssd"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"

 CDEPEND="
 	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:= )
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
 		dev-libs/cyrus-sasl
 	)
-	openssl? ( dev-libs/openssl:0= )
 	pam? ( virtual/pam )
 	sasl? ( dev-libs/cyrus-sasl )
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	sssd? ( sys-auth/sssd[sudo] )
+	system-digest? (
+		gcrypt? ( dev-libs/libgcrypt:= )
+		!gcrypt? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
 "
 RDEPEND="
 	${CDEPEND}
@ -65,7 +70,6 @@ S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	pam? ( !skey )
 	skey? ( !pam )
-	?? ( gcrypt openssl )
 "

 MAKEOPTS+=" SAMPLES="
@ -145,7 +149,6 @@ src_configure() {
 		--without-opie
 		$(use_enable gcrypt)
 		$(use_enable nls)
-		$(use_enable openssl)
 		$(use_enable sasl)
 		$(use_with offensive insults)
 		$(use_with offensive all-insults)
@ -157,6 +160,13 @@ src_configure() {
 		$(use_with selinux)
 		$(use_with sendmail)
 	)
+
+	if use system-digest && ! use gcrypt; then
+		myeconfargs+=("--enable-openssl")
+	else
+		myeconfargs+=("--disable-openssl")
+	fi
+
 	econf "${myeconfargs[@]}"
 }

--- a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-libs/ivykis-0.42.3
 	>=dev-libs/libpcre-6.1:=
 	!dev-libs/eventlog
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0:= )
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
 	caps? ( sys-libs/libcap )
 	dbi? ( >=dev-db/libdbi-0.9.0 )
 	geoip? ( >=dev-libs/geoip-1.5.0 )
--- a/app-admin/syslog-ng/syslog-ng-3.18.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.18.1.ebuild
@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-libs/ivykis-0.42.3
 	>=dev-libs/libpcre-6.1:=
 	!dev-libs/eventlog
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0:= )
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
 	caps? ( sys-libs/libcap )
 	dbi? ( >=dev-db/libdbi-0.9.0 )
 	geoip? ( >=dev-libs/geoip-1.5.0 )
--- a/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz

 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-libs/ivykis-0.42.3
 	>=dev-libs/libpcre-6.1:=
 	!dev-libs/eventlog
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0:= )
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
 	caps? ( sys-libs/libcap )
 	dbi? ( >=dev-db/libdbi-0.9.0 )
 	geoip? ( >=dev-libs/geoip-1.5.0 )
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/clamav-unofficial-sigs/Manifest
+++ b/app-antivirus/clamav-unofficial-sigs/Manifest
@ -1,2 +1 @@
-DIST clamav-unofficial-sigs-3.7.2.tar.gz 38549 BLAKE2B 2f00e9adf5f54e2b38c602da56a2daeb70618123ab4e59a74804885252f3cad2c23f7b9b10f4ec664c6977bca849947b83d0fc69f76669dbae58ebff54c6755b SHA512 ee07bf521cca229bc85acb887c8e520149955732797a9d220e24f09cb9e89f9bd189ad77dc781c03c60bdaaec2bfa91a6c96cf7a0b689759cddf3ff231b8b0a4
 DIST clamav-unofficial-sigs-5.6.2.tar.gz 50931 BLAKE2B 6fea42f8f76ae5344c2b96c9203d2b09e755573d03f2b9d3d9ee2a488150fbb6f598e052b730daf12c551920a71fd8daad1dc10002fca12fa4a74554cf7d445e SHA512 79978db065a22d778490d0a2673f5a0bb7ab73e42de64563e7d26ac23459f7e5b2e73b0548e1ea6483e3c5f43eed65cdbc6814037cc0c46a339366a0150e5427
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-3.7.2.ebuild
+++ b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-3.7.2.ebuild
@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Downloads and installs third-party clamav signatures"
-HOMEPAGE="https://sourceforge.net/projects/unofficial-sigs"
-SRC_URI="mirror://sourceforge/unofficial-sigs/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# We need its user/group.
-DEPEND="app-antivirus/clamav"
-
-# The script relies on either net-misc/socat, or Perl's
-# IO::Socket::UNIX. We already depend on Perl, and Gentoo's Perl ships
-# with IO::Socket::UNIX, so we can leave out net-misc/socat here.
-RDEPEND="${DEPEND}
-	app-crypt/gnupg
-	dev-lang/perl
-	net-dns/bind-tools
-	net-misc/curl"
-
-src_prepare() {
-	# First, fix the paths contained in the configuration file. Eventually
-	# these should be moved under /run, but for now we keep them sync'ed
-	# with the default clamd.conf.
-	local pid_default="/var/run/clamd.pid"
-	local pid_gentoo="/var/run/clamav/clamd.pid"
-
-	# clamd listens on a local socket by default. The clamd_socket
-	# setting needs to be uncommented in the configuration file for it
-	# to take effect.
-	local socket_default="#clamd_socket=\"/var/run/clamd.socket\""
-	local socket_gentoo="clamd_socket=\"/var/run/clamav/clamd.sock\""
-
-	sed -i  -e '$a\pkg_mgr="emerge"' \
-		-e "\$a\\pkg_rm=\"emerge -C ${PN}\"" \
-		-e "s~${socket_default}~${socket_gentoo}~" \
-		-e "s~${pid_default}~${pid_gentoo}~" \
-		"${PN}.conf" \
-		|| die "failed to update paths in the ${PN}.conf file"
-
-	# Now, change the script's working directory to point to
-	# /var/lib/${PN}. We'll need to make this writable by the clamav
-	# user during src_install.
-	sed -i  -e "s~/usr/unofficial-dbs~/var/lib/${PN}~" "${PN}.conf" \
-		|| die "failed to update the work_dir variable in ${PN}.conf"
-
-	# Tell the script that it's been configured.
-	local cfged_default='user_configuration_complete="no"'
-	local cfged_gentoo='user_configuration_complete="yes"'
-	sed -i "s/${cfged_default}/${cfged_gentoo}/" "${PN}.conf" \
-		|| die "failed to set user configuration completed in ${PN}.conf"
-}
-
-src_install() {
-	dosbin "${PN}.sh"
-
-	# We set the script's working directory to /var/lib/${PN} in
-	# src_compile, so make sure that the permissions are set correctly
-	# here. By default, it runs as clamav/clamav.
-	diropts -m 0755 -o clamav -g clamav
-	dodir "/var/lib/${PN}"
-
-	insinto /etc/logrotate.d
-	doins "${PN}-logrotate"
-
-	insinto /etc
-	doins "${PN}.conf"
-
-	doman "${PN}.8"
-	dodoc CHANGELOG INSTALL README
-}
-
-pkg_postinst() {
-	elog ''
-	elog "You will need to select databases in /etc/${PN}.conf."
-	elog "For details, please see the ${PN}(8) manual page."
-	elog ''
-	elog 'An up-to-date description of the available Sanesecurity'
-	elog 'databases is available at,'
-	elog ''
-	elog '  http://sanesecurity.com/usage/signatures/'
-	elog ''
-}
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
+++ b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 # The script relies on either net-misc/socat, or Perl's
--- a/app-antivirus/clamav/clamav-0.101.0.ebuild
+++ b/app-antivirus/clamav/clamav-0.101.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml"

 CDEPEND="bzip2? ( app-arch/bzip2 )
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/afio/afio-2.5.1-r1.ebuild
+++ b/app-arch/afio/afio-2.5.1-r1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Afio creates cpio-format archives."
-HOMEPAGE="http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio"
-SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
-
-LICENSE="Artistic LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc sparc x86"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch )
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	dodoc ANNOUNCE-* HISTORY README SCRIPTS
-
-	local i
-	for i in {1..4}; do
-		docinto "script${i}"
-		dodoc -r "script${i}"/.
-	done
-}
--- a/app-arch/lrzip/lrzip-0.631-r1.ebuild
+++ b/app-arch/lrzip/lrzip-0.631-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -9,7 +9,7 @@ SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"

 RDEPEND="dev-libs/lzo
--- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 # Remember: we cannot leverage autotools in this ebuild in order
@ -30,7 +30,6 @@ SLOT="0"
 IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"

 RDEPEND="!<app-arch/lzma-4.63
-	!app-arch/lzma-utils
 	!<app-arch/p7zip-4.57"
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
--- a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 # Remember: we cannot leverage autotools in this ebuild in order
@ -31,7 +31,6 @@ SLOT="0"
 IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"

 RDEPEND="!<app-arch/lzma-4.63
-	!app-arch/lzma-utils
 	!<app-arch/p7zip-4.57"
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 # Remember: we cannot leverage autotools in this ebuild in order
@ -31,7 +31,6 @@ SLOT="0"
 IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"

 RDEPEND="!<app-arch/lzma-4.63
-	!app-arch/lzma-utils
 	!<app-arch/p7zip-4.57"
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@ -1,5 +1,4 @@
 DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b3320303258a5dcc6f169cee0134f1114927ff52745d5f6c0b5d604698e45a464a157454a249cab8e3114b01dad3f7b693ca45a5b0b SHA512 0acc0ce61aa5d2575976c66aeae6ebb88ba895dd89c07daf55e2c7af344858a620336f3e79ccfc5e7b8829caa9d600f97a35a4d6e4da630d19d723dd887fdafe
 DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a148449a36845fe63320788432493581ec6bd5958bf178d83d68b532ffbe5c7ee13e92b0bb00c0aca968bb2e499453f1b7a7 SHA512 d84e13eb5fd28fb232a5f93aa76f4855adcb9ccffbcd90dacc3e2b45231afd82e78d40c63f729391e5d00e95c14653e83757faca4e543c6306dd913c4e0edb87
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
-DIST Geekbench-4.3.0-Linux.tar.gz 71075837 BLAKE2B 9d278654d44a43577f252a0a2842e3b9a34bf6b9a0f605b0a053354bff845f5ae5c029b8ff22b3b3f4f66581c60d46a4643207f042ba020515b74a01fa56a37e SHA512 d76c2f0a93ad06afa250c32633c27d5718ca9c2abca7eaa050f967a63d279bde9e220e20677af1433d531bce176d70ed15eee16d020b41aff0b817fde966a0c6
 DIST Geekbench-4.3.3-Linux.tar.gz 71101735 BLAKE2B f7e784a624f558711e7ebc5fc502de0cae5be489154f3d7d20bfccb624269644ff90867c96ce9f8136609f4911b6764bcfb7ecfb037ebddac56e450b3baa2415 SHA512 8c4bdc51f215f6c84ef955d012d3ba81fab542716cb7dd9e2b05d15c68e678955817fd25032ec659028a769312b5bc04d2d3b9832c9f2fa46d55784446e31b49
--- a/app-benchmarks/geekbench/geekbench-4.3.0.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.3.0.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
-HOMEPAGE="https://www.geekbench.com"
-SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="geekbench"
-SLOT="4"
-
-RESTRICT="bindist fetch mirror strip"
-
-S="${WORKDIR}/Geekbench-${PV}-Linux"
-
-QA_PREBUILT="opt/geekbench4/geekbench4 opt/geekbench4/geekbench_x86_32 opt/geekbench4/geekbench_x86_64"
-
-pkg_nofetch() {
-	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_install() {
-	exeinto "/opt/geekbench4"
-	doexe "geekbench4" "geekbench_x86_32" "geekbench_x86_64"
-
-	insinto "/opt/geekbench4"
-	doins "geekbench.plar"
-
-	dodir "/opt/bin"
-	dosym "../geekbench4/geekbench4" "/opt/bin/geekbench4"
-}
-
-pkg_postinst() {
-	elog "If you have purchased a commercial license, you can enter"
-	elog "your email address and your license key with the following command:"
-	elog "geekbench4 -r <email address> <license key>"
-}
--- a/app-benchmarks/geekbench/geekbench-4.3.3.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.3.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"

--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/isoimagewriter/isoimagewriter-0.2.ebuild
+++ b/app-cdr/isoimagewriter/isoimagewriter-0.2.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 inherit kde5

--- a/app-cdr/kcdemu/Manifest
+++ b/app-cdr/kcdemu/Manifest
@ -1 +1,2 @@
 DIST kcdemu-0.7.2.tar.bz2 16408 BLAKE2B 45737abd24b236205b476cfc87b9290d1cd3ef846fbe5ee9626e8256475a33af2d00a9856d4924feaf5f6fe7623a473b05e891acd672ba099bd01c5f5bdab762 SHA512 9ffe5a2d42622cb7e7e072b29eb9977464dfa2517f0d3d2af5580da0dae2fc7e56be8aebcb1dc94aecdc279a12baa3a27fa999293a25c3ebd0316c92848516fa
+DIST kde_cdemu-0.7.3.tar.bz2 14140 BLAKE2B 8631e7cd71605a90f2e9d6ac3c1052466a4469bbbf84bcab883b998bab8a562489483580a0a5c31c3e591d47edaba5648fad58227097b6c15e461dc2a6573727 SHA512 40a87c669a091a5eb1dfa38ccf080c5671349bc88600d4ede914d4e94a2d85962fe4d6afa2eb05a2582feef9d9b3a9949b9d2916acfa43089af5c3515c020aad
--- a/app-cdr/kcdemu/kcdemu-0.7.3.ebuild
+++ b/app-cdr/kcdemu/kcdemu-0.7.3.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="kde_cdemu"
+SOME_HASH="efbd90bba65c0b58a15865dda8288e87a635d59a1da0b465424c26601f37166aba223d0258de7fb79462dcb182c0b359f0cb9533e076d313b21850152aa6207c"
+inherit kde5
+
+DESCRIPTION="Frontend to cdemu daemon based on KDE Frameworks"
+HOMEPAGE="https://www.linux-apps.com/p/998461/"
+SRC_URI="https://dl.opendesktop.org/api/files/download/id/1511553040/s/${SOME_HASH}/t/1551656655/u//${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	>=app-cdr/cdemu-2.0.0[cdemu-daemon]
+"
+
+S="${WORKDIR}/${MY_PN}"
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/etcd-ca/Manifest
+++ b/app-crypt/etcd-ca/Manifest
@ -1 +0,0 @@
-DIST etcd-ca-0_p20150423.tar.gz 55031 BLAKE2B 39f12fe140a5490e512e9d14c58c58f452769788f0c4c6a8a521590d19a254009c28e134611a10a40c8edc2820c4a333e9c2676e7ace2ad5af88e4245d23432a SHA512 8c7ecb80e056da77997283ff2defb6df9a9acef250b0fac8e18c2bca71cccfedf6d782b7c9bf6491574d88ac5fa358f9bc5f540aa718a2470655d75f2f54fff4
--- a/app-crypt/etcd-ca/etcd-ca-0_p20150423-r1.ebuild
+++ b/app-crypt/etcd-ca/etcd-ca-0_p20150423-r1.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-DESCRIPTION="A simple certificate manager written in Go. Easy to use with limited capability"
-HOMEPAGE="https://github.com/coreos/etcd-ca"
-EGIT_COMMIT="31fef42f75294cf8bf1e7facf82648de0c2d87a3"
-SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.2:="
-RDEPEND=""
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-src_prepare() {
-	sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
-		-i build || die
-}
-
-src_compile() {
-	CGO_CFLAGS="${CFLAGS}" ./build || die
-}
-
-# go tool: no such tool "cover"; to install:
-#    go get code.google.com/p/go.tools/cmd/cover
-#src_test() {
-#	./test || die
-#}
-
-src_install() {
-	dobin "${S}"/bin/${PN}
-	dodoc README.md
-	use doc && dodoc -r Documentation
-}
--- a/app-crypt/etcd-ca/metadata.xml
+++ b/app-crypt/etcd-ca/metadata.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <bugs-to>https://github.com/coreos/etcd-ca/issues</bugs-to>
-    <changelog>https://github.com/coreos/etcd-ca/commits/master</changelog>
-    <doc>https://github.com/coreos/etcd-ca/blob/master/README.md</doc>
-    <remote-id type="github">coreos/etcd-ca</remote-id>
-  </upstream>
-  <maintainer type="person">
-    <email>zmedico@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@ -1,2 +1,3 @@
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 DIST rhash-1.3.7-src.tar.gz 362981 BLAKE2B bc248e0dcdf2337e46292f1bcdff0ce027705679ab937c8aa13139226bc09f3815ba23d8383f624dfba255c54378473f6b0b28a710611cdc83150055b8d649d0 SHA512 182f474b0f0a39f9e0adb7e34fcc5ddca6f00e75d7cf6b846da33af166257b2ed38be70aa71e6732c4e6cbdd156712790b8bc5340933b65f3ce57269835d1585
+DIST rhash-1.3.8-src.tar.gz 393544 BLAKE2B c326b3fa6dbc5ea2cce40105dc319456fdcc58140a05e8002bf1d92be921d8bbd27bf670370ba7cf2ff2001ff70ddbeb8efc9712869a7b215c5f51a5e493b5c9 SHA512 9dba4fa4dd49d323f2e440c5b93eac1ef62eb4046ec4ef611f0978c12c1739002f1ac1f1ec5e61bd359dc89e9ed612db71be91a795184ac5d5433280d27fa4c1
--- a/app-crypt/rhash/rhash-1.3.8.ebuild
+++ b/app-crypt/rhash/rhash-1.3.8.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Console utility and library for computing and verifying file hash sums"
+HOMEPAGE="http://rhash.anz.ru/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug nls libressl ssl static-libs"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+)"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/RHash-${PV}"
+
+src_prepare() {
+	default
+	# fix Solaris detection, upstream:
+	# https://github.com/rhash/RHash/pull/81
+	sed -i -e 's/sunos)/solaris2.*)/' configure || die
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	set -- \
+		./configure \
+		--target="${CHOST}" \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysconfdir="${EPREFIX}"/etc \
+		--disable-openssl-runtime \
+		--disable-static \
+		--enable-lib-shared \
+		$(use_enable debug) \
+		$(use_enable nls gettext) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs lib-static)
+
+	echo "${@}"
+	"${@}" || die "configure failed"
+}
+
+# We would add compile-gmo to the build targets but install-gmo always
+# recompiles unconditionally. :(
+
+multilib_src_install() {
+	# -j1 needed due to race condition.
+	emake DESTDIR="${D}" -j1 \
+		  install{,-lib-headers,-pkg-config} \
+		  $(use nls && echo install-gmo) \
+		  $(use kernel_Winnt || echo install-lib-so-link)
+}
+
+multilib_src_test() {
+	emake test
+}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/bvi/files/bvi-1.3.2-fix-buffer-overflow.patch
+++ b/app-editors/bvi/files/bvi-1.3.2-fix-buffer-overflow.patch
@ -1,22 +0,0 @@
-diff --git a/edit.c b/edit.c
-index 328a0cd..3cf6572 100644
--- a/edit.c
-+++ b/edit.c
-@@ -42,7 +42,7 @@ char contru[][4] = {"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",
- 					"CAN", " EM", "SUB", "ESC", " FS", " GS", " RS", " US",
- 					"DEL" };
- char tmpbuf[10];
-char linbuf[256];
-+char linbuf[16384];
- 
- static  char    getcbuff[BUFFER];
- static  char    *getcnext = NULL;
-@@ -492,7 +492,7 @@ printline(mempos, scpos)
- 			*(string + print_pos) = '.';
- 	}
- 	*(string + Anzahl) = '\0';
-	strcat(linbuf, string);
-+	strncat(linbuf, string, sizeof(linbuf) - strlen(linbuf) - 1);
- 	mvaddstr(scpos, 0, linbuf);
- }
- 
--- a/app-editors/bvi/files/bvi-1.3.2-tinfo.patch
+++ b/app-editors/bvi/files/bvi-1.3.2-tinfo.patch
@ -1,35 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 68076d8..81da696 100644
--- a/configure.in
-+++ b/configure.in
-@@ -58,17 +58,19 @@ AC_ARG_WITH(ncurses,
-   fi
- ])
- 
-AC_CHECK_HEADER(ncurses.h,
-    AC_CHECK_LIB(ncurses, initscr,
-        AC_DEFINE(HAVE_NCURSES_H) LIBS="${LIBS} -lncurses",
-        AC_CHECK_LIB(curses, initscr,
-        AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses",
-        AC_MSG_ERROR([bvi requires the curses library]))),
-    AC_CHECK_HEADER(curses.h,
-        AC_CHECK_LIB(curses, initscr,
-		AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses",
-		AC_MSG_ERROR([bvi requires the curses library])),
-		AC_MSG_ERROR([bvi requires the curses library])))
-+AC_CHECK_HEADER([ncurses.h],[
-+    AC_SEARCH_LIBS([initscr], [ncurses],[
-+            AC_DEFINE(HAVE_NCURSES_H)
-+	    AC_SEARCH_LIBS([tputs], [tinfo])], [
-+        AC_SEARCH_LIBS([initscr], [curses],[
-+                AC_DEFINE(HAVE_CURSES_H)
-+                AC_SEARCH_LIBS([tputs], [tinfo])],[
-+	    AC_MSG_ERROR([bvi requires the curses library])])])],[
-+    AC_CHECK_HEADER([curses.h],[
-+    	AC_SEARCH_LIBS([initscr], [curses], [
-+		AC_DEFINE(HAVE_CURSES_H)],[
-+		AC_MSG_ERROR([bvi requires the curses library])])],[
-+		AC_MSG_ERROR([bvi requires the curses library])])])
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- dnl AC_TYPE_SIZE_T
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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"

 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@ -1,4 +1,3 @@
-DIST containerd-1.0.3.tar.gz 3776722 BLAKE2B 31e9f2e56b23d09341e4cdd546198233517893e1596c9aefd084044f04b1e1831219343142eef09159a5698720fa307e3ec1dbb86304e071a9d8e1f8f8436519 SHA512 31aa462f357a77434033ae4bff2e453ce849cbd91e4981383be3c7cdea77ea1f57081c4f8121d15c151145defc2003348fe23b26a11568b38780fa2fb9cf114c
 DIST containerd-1.1.2.tar.gz 5124208 BLAKE2B d989519d6bef4e12d1fa04aa00bfee223e94676a90525304d4357f4caf46326b4d2b897b885e9e137fe01ce66b93bc92fb7da7bd2b5dd5019edda5bb0bbc6d0a SHA512 fe4121a43e72a354cd87577b5227f2c2e0d54674244001e6fdb695da78873b3fd3f46b6bda6bbd0c8793b33f50e0d725cb356bb75b789a273c862bbe7d4f719c
 DIST containerd-1.1.4.tar.gz 5328134 BLAKE2B cb69f9bd80bc279ae2bd85c75152dacdbdf13df9aa2efae2453c11bf6ea9b990a4e8ec3cb07778ff1b07ef2fbc05d19bb5714616fa5618f590dc8c5b5c2b2bd0 SHA512 c51b3168b8d8121b1479f75f5ba21280848bb1cbed2d2c4a7e315ec24d1805fc9c512a1fc53e8e8fc32e150c7f2becb8daca0ecab4eaf760b3274c11fbcd6ea8
 DIST containerd-1.2.2.tar.gz 4607013 BLAKE2B aca366f23cb24ddd0363333e5a4ab0fc833f917c7f1f01d56fd22bdb4bc6721f077e5ba411db6faecc4152b8f047af5da95283029f6e66dadad49c7296b82c89 SHA512 0fdd8799c5afb75074b6f00d5191e983ff570b323242665055c73b2e7a6bdd74a745e287f4f7b675dde26e8bf083c144104151e794ad24d2a8f6f39ae2ee6fff
--- a/app-emulation/containerd/containerd-1.0.3.ebuild
+++ b/app-emulation/containerd/containerd-1.0.3.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/containerd/${PN}"
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	MY_PV="${PV/_rc/-rc.}"
-	EGIT_COMMIT="v${MY_PV}"
-	CONTAINERD_COMMIT="773c489"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+btrfs hardened"
-
-DEPEND="btrfs? ( sys-fs/btrfs-progs )"
-RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
-	>=app-emulation/runc-1.0.0_rc4 )
-	sys-libs/libseccomp"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-src_prepare() {
-	default
-	if [[ ${PV} != *9999* ]]; then
-		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
-			-e "s/-s -w//" \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	local options=( $(usex btrfs "" "no_btrfs") )
-	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
-}
-
-src_install() {
-	dobin bin/containerd{-shim,-stress,} bin/ctr
-}
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@ -1,3 +1,3 @@
-DIST docker-18.03.1.tar.gz 12758590 BLAKE2B 98213af07b945fda536e321ef5cc9e272848aab97dcadb7a6b1433b9310fa78015794b5ee4f255448251366a7811e97248b9cc90b0225c528249188768f344ab SHA512 48c4916421cd500ada1bfc2207123a29870939a15a1c7c4a0c082f61c1e3e063381e2345ee9df645dbaca49e002dbfaba70cf6fe233b39a4e1f44fb015807e10
 DIST docker-18.06.2.tar.gz 13675733 BLAKE2B 1b0852851a9c0412d7098b114f8ff62a7fc624f1bd77ba72629009c5b2afbbbacd79f93cdb4287bdb5a58c9b09ff76c9fb5b9ea40933686b62c78ebdc61d1a1b SHA512 78ab030555501071eee47964894798847d7a60ac826479215a2d0a74c75bac88ad212b7f5ab0f29444407456a3914c263c04a1398dc895586026440f203b50a4
 DIST docker-18.09.2.tar.gz 15252871 BLAKE2B f87d3a7e6ccb4750eae231b88c686ad9c0be08aa8e0657343c89593d75374dfaeb063f842b8f5cef58e4b64982d3296a6808f076837243e61d75b93ad495fb44 SHA512 eacbeb754cdf2c111a2b72473b437e64cf176a5e93e1a9a0e5ed092d38db5846777d23c4ad51112d8a21317d471e5f1e93f85ae5c0ad1d5d50aea95e226dfa01
+DIST docker-18.09.3.tar.gz 15249718 BLAKE2B ca63e611185d8514a3719e95dcc4688a1fcb4b155ffb8997e11442bd6719cc63d9e6aea9153254d281bcff1c48ea7f8c40c38bcda09b7f21b7718ccd348ee3a0 SHA512 c7df08c03c6bfd8451977cb86593d8ac68390c846c84cc4d8a32e05e815688ccd84a6296f819e440c850c2aa52c131686492206ec4d47765cd0af90c3c39dc03
--- a/app-emulation/docker/docker-18.03.1.ebuild
+++ b/app-emulation/docker/docker-18.03.1.ebuild
@ -1,303 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	inherit versionator
-	if [ "$(get_version_component_count)" = 4 ]; then
-		MY_PV="$(replace_version_separator 3 '-ce-')"
-	else
-		MY_PV="$PV-ce"
-	fi
-	DOCKER_GITCOMMIT="9ee9f40"
-	EGIT_COMMIT="v${MY_PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
-	>=dev-db/sqlite-3.7.9:3
-	device-mapper? (
-		>=sys-fs/lvm2-2.02.89[thin]
-	)
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-	apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
-	${CDEPEND}
-
-	dev-go/go-md2man
-
-	btrfs? (
-		>=sys-fs/btrfs-progs-3.16.1
-	)
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
-	${CDEPEND}
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	~app-emulation/containerd-1.0.3
-	~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?]
-	~app-emulation/docker-proxy-0.8.0_p20180411
-	container-init? ( >=sys-process/tini-0.16.1[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal.patch )
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
-	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	if use overlay; then
-		CONFIG_CHECK+="
-			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-		"
-	fi
-
-	linux-info_pkg_setup
-
-	# create docker group for the code checking for it in /etc/group
-	enewgroup docker
-}
-
-src_compile() {
-	export GOPATH="${WORKDIR}/${P}"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-	# fake golang layout
-	ln -s docker-ce/components/engine ../docker || die
-	ln -s docker-ce/components/cli ../cli || die
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor pkcs11 seccomp; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	pushd components/engine || die
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	VERSION="$(cat ../../VERSION)" \
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	# build cli
-	emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="$(cat ../../VERSION)" \
-		GITCOMMIT="${DOCKER_GITCOMMIT}" \
-		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
-		dynbinary || die
-
-	# build man pages
-	go build -o gen-manpages github.com/docker/cli/man || die
-	./gen-manpages --root . --target ./man/man1 || die
-	./man/md2man-all.sh -q || die
-	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-
-	popd || die # components/cli
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	pushd components/engine || die
-	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	newbin build/docker-* docker
-
-	doman man/man*/*
-
-	dobashcomp contrib/completion/bash/*
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-}
--- a/app-emulation/docker/docker-18.03.1-r1.ebuild
+++ b/app-emulation/docker/docker-18.03.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,16 +11,9 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
 	inherit git-r3
 else
-	inherit versionator
-	if [ "$(get_version_component_count)" = 4 ]; then
-		MY_PV="$(replace_version_separator 3 '-ce-')"
-	else
-		MY_PV="$PV-ce"
-	fi
-	DOCKER_GITCOMMIT="9ee9f40"
-	EGIT_COMMIT="v${MY_PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
+	DOCKER_GITCOMMIT="774a1f4"
+	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
@ -30,7 +23,7 @@ DESCRIPTION="The core functions you need to create Docker images and run Docker
 HOMEPAGE="https://dockerproject.org"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay pkcs11 seccomp"

 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
 CDEPEND="
@ -61,18 +54,17 @@ RDEPEND="
 	>=dev-vcs/git-1.7
 	>=app-arch/xz-utils-4.9
 	dev-libs/libltdl
-	~app-emulation/containerd-1.0.3
-	~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?]
-	~app-emulation/docker-proxy-0.8.0_p20180411
-	container-init? ( >=sys-process/tini-0.16.1[static] )
+	~app-emulation/containerd-1.2.2
+	~app-emulation/runc-1.0.0_rc6_p20181203[apparmor?,seccomp?]
+	>=app-emulation/runc-1.0.0_rc6_p20181203-r1
+	~app-emulation/docker-proxy-0.8.0_p20181207
+	container-init? ( >=sys-process/tini-0.18.0[static] )
 "

 RESTRICT="installsources strip"

 S="${WORKDIR}/${P}/src/${EGO_PN}"

-PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal-r1.patch )
-
 # see "contrib/check-config.sh" from upstream's sources
 CONFIG_CHECK="
 	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
@ -282,6 +274,8 @@ src_install() {
 	doman man/man*/*

 	dobashcomp contrib/completion/bash/*
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
 	insinto /usr/share/zsh/site-functions
 	doins contrib/completion/zsh/_*
 	popd || die # components/cli
@ -300,4 +294,7 @@ pkg_postinst() {
 	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
 	elog "  usermod -aG docker youruser"
 	elog
+
+	elog " Devicemapper storage driver has been deprecated"
+	elog " It will be removed in a future release"
 }
--- a/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal.patch
+++ b/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal.patch
@ -1,20 +0,0 @@
-From: Goldwyn Rodrigues <rgoldwyn@suse.com>
-Subject: Allow signal mediation while for apparmor profile
-
-Allows docker processes under docker-default ot receive all signals.
-
-Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
- components/engine/profiles/apparmor/template.go |    1 +
- 1 file changed, 1 insertion(+)
-
--- a/components/engine/profiles/apparmor/template.go
-+++ b/components/engine/profiles/apparmor/template.go
-@@ -17,6 +17,7 @@ profile {{.Name}} flags=(attach_disconne
-   capability,
-   file,
-   umount,
-+  signal (receive) peer=unconfined,
- 
-   deny @{PROC}/* w,   # deny write for all files directly in /proc (not in a subdir)
-   # deny write to files not in /proc/<number>/** or /proc/sys/**
--- a/app-emulation/dynamips/files/0.2.14-docs.patch
+++ b/app-emulation/dynamips/files/0.2.14-docs.patch
@ -1,20 +0,0 @@
--- a/CMakeLists.txt	2014-11-28 14:51:14.375913296 +0900
-+++ b/CMakeLists.txt	2014-11-28 14:52:09.579369288 +0900
-@@ -37,16 +37,6 @@
- add_subdirectory ( stable )
- add_subdirectory ( unstable )
- 
-install_docs (
-   "ChangeLog"
-   "COPYING"
-   "MAINTAINERS"
-   "README"
-   "README.hypervisor"
-   "RELEASE-NOTES"
-   "TODO"
-   )
-
- # uninstall target - leaves behind any directory created during install
- set ( _templatefile "${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" )
- set ( _scriptfile "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" )
-
--- a/app-emulation/ganeti-htools/Manifest
+++ b/app-emulation/ganeti-htools/Manifest
@ -1 +0,0 @@
-DIST ganeti-htools-0.3.1.tar.gz 300261 BLAKE2B b7eb1a94ff4a5026955a9b8c7331dc6b529ff9eb688ae4cafe1822b93d3705bff4f9c5006bd674cd03ecb2bf41d0e32142d039b485e08a797240e8f51f553c2a SHA512 76acc476dc5b3add808db41b7aad4be6ee4b62d31e81eaefa17fbf010daa817bcc920b4e290727ebeddebbe6015017b19d2b7643dbc6d529f158b9746b7a4b43
--- a/app-emulation/ganeti-htools/files/ganeti-htools-0.2.8-use-QC-1.patch
+++ b/app-emulation/ganeti-htools/files/ganeti-htools-0.2.8-use-QC-1.patch
@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 5e189fc..bfdf175 100644
--- a/Makefile
-+++ b/Makefile
-@@ -20,7 +20,8 @@ $(HALLPROGS): %: %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile
- 
- test live-test: HEXTRA=-fhpc -Wwarn -fno-warn-missing-signatures \
- 	-fno-warn-monomorphism-restriction -fno-warn-orphans \
-	-fno-warn-missing-methods -fno-warn-unused-imports
-+	-fno-warn-missing-methods -fno-warn-unused-imports \
-+	-package $(shell ghc-pkg list | sed -n '/ QuickCheck-1./p')
- 
- $(DOCS) : %.html : %
- 	rst2html -v --strict $< $@
--- a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-base-4.patch
+++ b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-base-4.patch
@ -1,171 +0,0 @@
-diff --git a/Ganeti/HTools/CLI.hs b/Ganeti/HTools/CLI.hs
-index b000a00..d9177c6 100644
--- a/Ganeti/HTools/CLI.hs
-+++ b/Ganeti/HTools/CLI.hs
-@@ -74,11 +74,11 @@ module Ganeti.HTools.CLI
- 
- import Data.Maybe (fromMaybe)
- import qualified Data.Version
-import Monad
-+import Control.Monad
- import System.Console.GetOpt
- import System.IO
- import System.Info
-import System
-+import System.Exit
- import Text.Printf (printf)
- 
- import qualified Ganeti.HTools.Version as Version(version)
-diff --git a/Ganeti/HTools/ExtLoader.hs b/Ganeti/HTools/ExtLoader.hs
-index 0412c1b..17b8449 100644
--- a/Ganeti/HTools/ExtLoader.hs
-+++ b/Ganeti/HTools/ExtLoader.hs
-@@ -36,10 +36,11 @@ module Ganeti.HTools.ExtLoader
-     ) where
- 
- import Data.Maybe (isJust, fromJust)
-import Monad
-+import Control.Monad
-+import qualified Control.Exception as E
- import System.FilePath
- import System.IO
-import System
-+import System.Exit
- import Text.Printf (printf, hPrintf)
- 
- import qualified Ganeti.HTools.Luxi as Luxi
-@@ -56,8 +57,8 @@ import Ganeti.HTools.CLI
- import Ganeti.HTools.Utils (sepSplit, tryRead)
- 
- -- | Error beautifier
-wrapIO :: IO (Result a) -> IO (Result a)
-wrapIO = flip catch (return . Bad . show)
-+wrapIO :: (Show a) => IO (Result a) -> IO (Result a)
-+wrapIO = flip (E.catch :: IO a -> (E.IOException -> IO a) -> IO a) (return . Bad . show )
- 
- parseUtilisation :: String -> Result (String, DynUtil)
- parseUtilisation line =
-diff --git a/hail.hs b/hail.hs
-index 541e1a9..68f4488 100644
--- a/hail.hs
-+++ b/hail.hs
-@@ -27,10 +27,10 @@ module Main (main) where
- 
- import Data.List
- import Data.Maybe (isJust, fromJust)
-import Monad
-import System (exitWith, ExitCode(..))
-+import Control.Monad
-+import System.Environment
-+import System.Exit
- import System.IO
-import qualified System
- 
- import qualified Ganeti.HTools.Cluster as Cluster
- 
-@@ -99,7 +99,7 @@ readRequest opts args = do
- -- | Main function.
- main :: IO ()
- main = do
-  cmd_args <- System.getArgs
-+  cmd_args <- getArgs
-   (opts, args) <- parseOpts cmd_args "hail" options
- 
-   let shownodes = optShowNodes opts
-diff --git a/hbal.hs b/hbal.hs
-index 46cccf8..0254008 100644
--- a/hbal.hs
-+++ b/hbal.hs
-@@ -30,12 +30,12 @@ import Control.Exception (bracket)
- import Data.List
- import Data.Maybe (isJust, isNothing, fromJust)
- import Data.IORef
-import Monad
-import System (exitWith, ExitCode(..))
-+import Control.Monad
- import System.IO
-+import System.Exit
- import System.Posix.Process
- import System.Posix.Signals
-import qualified System
-+import System.Environment
- 
- import Text.Printf (printf, hPrintf)
- 
-@@ -223,7 +223,7 @@ runJobSet master fin_nl il cmd_jobs = do
- -- | Main function.
- main :: IO ()
- main = do
-  cmd_args <- System.getArgs
-+  cmd_args <- getArgs
-   (opts, args) <- parseOpts cmd_args "hbal" options
- 
-   unless (null args) $ do
-diff --git a/hscan.hs b/hscan.hs
-index c14846f..d613f83 100644
--- a/hscan.hs
-+++ b/hscan.hs
-@@ -28,11 +28,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- module Main (main) where
- 
- import Data.Maybe (isJust, fromJust, fromMaybe)
-import Monad
-import System (exitWith, ExitCode(..))
-+import Control.Monad
-+import System.Environment
-+import System.Exit
- import System.IO
- import System.FilePath
-import qualified System
- 
- import Text.Printf (printf)
- 
-@@ -135,7 +135,7 @@ writeDataInner nlen name opts cdata fixdata = do
- -- | Main function.
- main :: IO ()
- main = do
-  cmd_args <- System.getArgs
-+  cmd_args <- getArgs
-   (opts, clusters) <- parseOpts cmd_args "hscan" options
-   let local = "LOCAL"
- 
-diff --git a/hspace.hs b/hspace.hs
-index 57d0302..f207c67 100644
--- a/hspace.hs
-+++ b/hspace.hs
-@@ -29,10 +29,10 @@ import Data.Char (toUpper, isAlphaNum)
- import Data.List
- import Data.Maybe (isJust, fromJust)
- import Data.Ord (comparing)
-import Monad
-import System (exitWith, ExitCode(..))
-+import Control.Monad
-+import System.Exit
-+import System.Environment
- import System.IO
-import qualified System
- 
- import Text.Printf (printf, hPrintf)
- 
-@@ -207,7 +207,7 @@ printAllocationMap verbose msg nl ixes =
- -- | Main function.
- main :: IO ()
- main = do
-  cmd_args <- System.getArgs
-+  cmd_args <- getArgs
-   (opts, args) <- parseOpts cmd_args "hspace" options
- 
-   unless (null args) $ do
-diff --git a/test.hs b/test.hs
-index 12aa50d..81838eb 100644
--- a/test.hs
-+++ b/test.hs
-@@ -29,7 +29,7 @@ import Data.IORef
- import Test.QuickCheck.Batch
- import System.IO
- import System.Exit
-import System (getArgs)
-+import System.Environment (getArgs)
- 
- import Ganeti.HTools.QC
- 
--- a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-containers.patch
+++ b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-containers.patch
@ -1,9 +0,0 @@
-diff --git a/Ganeti/HTools/QC.hs b/Ganeti/HTools/QC.hs
-index 534a7b1..6f99a96 100644
--- a/Ganeti/HTools/QC.hs
-+++ b/Ganeti/HTools/QC.hs
-@@ -753,3 +753,3 @@ prop_ClusterAllocBalance node =
-     let nl = makeSmallCluster node count
-        (hnode, nl') = IntMap.deleteFindMax nl
-+        ((_k, hnode), nl') = IntMap.deleteFindMax nl
-         il = Container.empty
--- a/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch
+++ b/app-emulation/ganeti-htools/files/ganeti-htools-0.3.1-ghc-7.10.patch
@ -1,29 +0,0 @@
-diff --git a/Ganeti/HTools/Types.hs b/Ganeti/HTools/Types.hs
-index 104bf64..8146870 100644
--- a/Ganeti/HTools/Types.hs
-+++ b/Ganeti/HTools/Types.hs
-@@ -65,2 +65,4 @@ import qualified Data.Map as M
- import qualified Text.JSON as JSON
-+import Control.Applicative
-+import Control.Monad
- 
-@@ -221,2 +223,9 @@ data Result a
- 
-+instance Functor Result where
-+    fmap  = liftM
-+
-+instance Applicative Result where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad Result where
-@@ -252,2 +261,9 @@ data OpResult a = OpFail FailMode -- ^ Failed operation
- 
-+instance Functor OpResult where
-+    fmap  = liftM
-+
-+instance Applicative OpResult where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad OpResult where
--- a/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
+++ b/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="Cluster tools for fixing common allocation problems on Ganeti 2.0
-clusters"
-HOMEPAGE="http://www.ganeti.org/"
-SRC_URI="https://ganeti.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-DEPEND="dev-lang/ghc
-	dev-haskell/json
-	dev-haskell/curl
-	dev-haskell/network
-	dev-haskell/parallel"
-RDEPEND="${DEPEND}
-	!<app-emulation/ganeti-2.4"
-DEPEND+=" test? ( dev-haskell/quickcheck:1 )"
-
-src_prepare() {
-	# htools does not currently compile cleanly with ghc-6.12+, so remove this
-	# for now
-	sed -i -e "s:-Werror ::" Makefile
-	# Workaround to skip pandoc
-	sed -i -e "s:) man:):" Makefile
-	epatch "${FILESDIR}"/${PN}-0.2.8-use-QC-1.patch #316629
-	epatch "${FILESDIR}"/${PN}-0.3.1-base-4.patch #424299
-	epatch "${FILESDIR}"/${PN}-0.3.1-ghc-7.10.patch
-	epatch "${FILESDIR}"/${PN}-0.3.1-containers.patch
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dosbin hspace hscan hbal
-	exeinto /usr/$(get_libdir)/ganeti/iallocators
-	doexe hail
-	doman man/*.1
-	dodoc README NEWS AUTHORS
-	use doc && dohtml -r apidoc/*
-}
--- a/app-emulation/ganeti-htools/metadata.xml
+++ b/app-emulation/ganeti-htools/metadata.xml
@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>virtualization@gentoo.org</email>
-		<name>Gentoo Virtualization Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription lang="en">
-	These are some simple cluster tools for fixing common allocation
-	problems on Ganeti 2.0 clusters.
-
-	Note that these tools are most useful for bigger cluster sizes
-	(e.g. more than five or ten machines); at lower sizes, the computations
-	they do can also be done manually.
-
-	Most of the tools revolve around the concept of keeping the cluster N+1
-	compliant: this means that in case of failure of any node, the instances
-	affected can be failed over (via ``gnt-node failover`` or ``gnt-instance
-	failover``) to their secondary node, and there is enough memory reserved
-	for this operation without needing to shutdown other instances or
-	rebalance the cluster.
-	</longdescription>
-</pkgmetadata>
--- a/app-emulation/libvirt/libvirt-4.10.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.10.0.ebuild
@ -28,9 +28,9 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 IUSE="
-	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
+	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct
+	+libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
+	policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
 	wireshark-plugins xen zeroconf zfs
 "

@ -81,6 +81,7 @@ RDEPEND="
 	fuse? ( >=sys-fs/fuse-2.8.6:= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
 	libssh? ( net-libs/libssh )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
 	nfs? ( net-fs/nfs-utils )
@ -257,6 +258,7 @@ src_configure() {
 		$(use_with glusterfs)
 		$(use_with glusterfs storage-gluster)
 		$(use_with iscsi storage-iscsi)
+		$(use_with iscsi-direct storage-iscsi-direct)
 		$(use_with libvirtd)
 		$(use_with libssh)
 		$(use_with lvm storage-lvm)
--- a/app-emulation/libvirt/libvirt-4.9.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.9.0.ebuild
@ -28,9 +28,9 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 IUSE="
-	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-	+qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
+	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct
+	+libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
+	policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
 	wireshark-plugins xen zeroconf zfs
 "

@ -76,6 +76,7 @@ RDEPEND="
 	fuse? ( >=sys-fs/fuse-2.8.6:= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
 	libssh? ( net-libs/libssh )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
 	nfs? ( net-fs/nfs-utils )
@ -252,6 +253,7 @@ src_configure() {
 		$(use_with glusterfs)
 		$(use_with glusterfs storage-gluster)
 		$(use_with iscsi storage-iscsi)
+		$(use_with iscsi-direct storage-iscsi-direct)
 		$(use_with libvirtd)
 		$(use_with libssh)
 		$(use_with lvm storage-lvm)
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@ -28,9 +28,9 @@ DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="http://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 IUSE="
-	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
-	libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
-	+qemu rbd sasl selinux +udev +vepa virtualbox virt-network
+	apparmor audit +caps +dbus firewalld fuse glusterfs iscsi iscsi-direct
+	+libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp
+	policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network
 	wireshark-plugins xen zeroconf zfs
 "

@ -75,6 +75,7 @@ RDEPEND="
 	fuse? ( >=sys-fs/fuse-2.8.6:= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
 	libssh? ( net-libs/libssh )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
 	nfs? ( net-fs/nfs-utils )
@ -253,6 +254,7 @@ src_configure() {
 		$(use_with glusterfs)
 		$(use_with glusterfs storage-gluster)
 		$(use_with iscsi storage-iscsi)
+		$(use_with iscsi-direct storage-iscsi-direct)
 		$(use_with libvirtd)
 		$(use_with libssh)
 		$(use_with lvm storage-lvm)
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@ -11,6 +11,9 @@
 </maintainer>
 <use>
 	<!-- Pool backend flags -->
+	<flag name="iscsi-direct">
+		Allow using libiscsi for iSCSI storage pool backend
+	</flag>
 	<flag name="iscsi">
 		Allow using an iSCSI remote storage server as pool for disk image storage
 	</flag>
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@ -1,2 +1,3 @@
 DIST nemu-2.0.0.tar.gz 85769 BLAKE2B daadbd5925d56d3747b59a3a8f28ceeeb24a674e57f003cf07c67c24dc0ed73f024d35e2f02836d89c7568b7ac51bfc3c6131afb4864febdd6ac6f86a827bfee SHA512 74c489e35b96699fcc5f9cabdbe4445c1cdad5b06c2a18928e2270e169b76e009463177990c4f4d80b160e06118b0b4e87209132cc0ae0ee3d77e2d811865f5a
 DIST nemu-2.1.0.tar.gz 89117 BLAKE2B a44bf67990d79af0b73caf077266c4775f302ffc81d2394993da45870a72f462d487a92d63abdbe875c382d11b8d691f446a5e0b7270355770838ea86328fb1d SHA512 7e655227e22f5e2dd5ec1f77ef1635f1aaab2e57e417fb33d83d35cc67d7b802c35fa9174cf4282287213a1a825714743773260b96b452a382a8248fbef238bf
+DIST nemu-2.2.0.tar.gz 94061 BLAKE2B 95304e8834f1d5c1e31065728363de5d797ae79554733dd3fecd90388b2766bc8907acfeded36676272967153eed5a7f30baba9ef2384fca67d19f3519461fa6 SHA512 2f427a560ea5ac4112b7d5cdd8524366521ca3d185676a4faa9bc480331c3381b7a362aed20025dc1acc0f576f07fb627b03137e1998926761a169c5be0eaf97
--- a/app-emulation/nemu/metadata.xml
+++ b/app-emulation/nemu/metadata.xml
@ -8,6 +8,8 @@
 	<use>
 		<flag name="vnc-client">Adds support for external VNC client</flag>
 		<flag name="savevm">Adds support for QEMU savevm snapshots (experimental, QEMU must be patched)</flag>
+		<flag name="spice">Adds Spice protocol support</flag>
 		<flag name="ovf">Adds support for OVA/OVF import</flag>
+		<flag name="network-map">Adds possibility of exporting network map to SVG</flag>
 	</use>
 </pkgmetadata>
--- a/app-emulation/nemu/nemu-2.2.0.ebuild
+++ b/app-emulation/nemu/nemu-2.2.0.ebuild
@ -0,0 +1,73 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info
+
+DESCRIPTION="ncurses interface for QEMU"
+HOMEPAGE="https://lib.void.so/nemu/ https://bitbucket.org/PascalRD/nemu/"
+SRC_URI="https://lib.void.so/src/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug network-map +ovf savevm spice +vnc-client"
+
+RDEPEND="app-emulation/qemu[vnc,virtfs,spice?]
+	dev-db/sqlite:3=
+	sys-libs/ncurses:0=[unicode]
+	virtual/libusb:1
+	virtual/libudev:=
+	network-map? ( media-gfx/graphviz )
+	ovf? (
+
+	dev-libs/libxml2:2
+	app-arch/libarchive
+
+	)
+	vnc-client? ( net-misc/tigervnc )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="sys-devel/gettext"
+
+pkg_pretend() {
+	if use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel"
+		else
+			CONFIG_CHECK="~VETH ~MACVTAP"
+			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
+			ERROR_VETH+=" into your kernel or loaded as a module to use the"
+			ERROR_VETH+=" local network settings feature."
+			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
+
+			check_extra_config
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNM_DEBUG=$(usex debug)
+		-DNM_WITH_NETWORK_MAP=$(usex network-map)
+		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
+		-DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
+		-DNM_WITH_SPICE=$(usex spice)
+		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "For non-root usage execute script:"
+	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
+	elog "and add udev rule:"
+	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /lib/udev/rules.d"
+	if use savevm; then
+		elog ""
+		elog "QEMU must be patched with qemu-qmp-savevm-VERSION.patch"
+		elog "Get this patch from nEMU repository"
+	fi
+}
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -484,7 +484,6 @@ qemu_src_configure() {
 		conf_opts+=(
 			--audio-drv-list="${audio_opts}"
 		)
-		use sdl && conf_opts+=( --with-sdlabi=2.0 )
 	fi

 	case ${buildtype} in
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@ -1,3 +1,2 @@
-DIST runc-1.0.0_rc5.tar.gz 1183902 BLAKE2B 46d0ffd9aa79a6f74b3194fa9e1932390115a43c903ae553acb7749d6be41220874a1ff9bae9706b5fecb9495dd6686c38ee1e9baf6118a14990f142baf6f64d SHA512 714230887ff9706c29b0656c5cdb253698bde6252a23e7f48aa690747fb57abd7884c2da1c4d0e314f9f301c5962417351557d15d986e45fcc336e98069aeac6
 DIST runc-1.0.0_rc5_p20180509.tar.gz 1185576 BLAKE2B b56f9c185c061f51a1fd81c19d378b06c71d06c6eddcbc1c946b234814eb469ea4af37bf42ef3889e4d37bc430e69d0a563281b13055f855f1bc15935531fe28 SHA512 9a55bdb8e39830f46cceff48970b7688139927552e3d268b9ef4a6e640ffc3d95164b99c5b05d07d295bedc2ea22daf6062fd520df1548d78b1d481fd928f1e3
 DIST runc-1.0.0_rc6_p20181203.tar.gz 1202869 BLAKE2B 5b5808fc65f3725e5cc22794c5ff6c5eba6016110358b0f60dd3378df2e5b64afb5631e5652f45e9721838dd02745b8c5a88abfcd244de202196ac16bfccd5a7 SHA512 ec3d3fec773f2f9df714b0813efb110e21e328634e0b4ae77f323a892d0327aea5d4b6f9ae2a549aa06fda5b27431f4514fd663c7033dc170ca1a03627931f9d
--- a/app-emulation/runc/runc-1.0.0_rc5-r1.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc5-r1.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/opencontainers/${PN}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-build golang-vcs
-else
-	MY_PV="${PV/_/-}"
-	EGIT_COMMIT="v${MY_PV}"
-	RUNC_COMMIT="4fc53a81fb7c994640722ac585fa9ca548971871" # Change this when you update the ebuild
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
-	inherit golang-build golang-vcs-snapshot
-fi
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://runc.io"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+ambient apparmor hardened +seccomp"
-
-RDEPEND="
-	apparmor? ( sys-libs/libapparmor )
-	seccomp? ( sys-libs/libseccomp )
-	!app-emulation/docker-runc
-"
-
-src_compile() {
-	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usex ambient 'ambient')
-		$(usex apparmor 'apparmor')
-		$(usex seccomp 'seccomp')
-	)
-
-	GOPATH="${S}"\
-		emake BUILDTAGS="${options[*]}" \
-		COMMIT="${RUNC_COMMIT}" -C src/${EGO_PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin runc
-	dodoc README.md PRINCIPLES.md
-	popd || die
-}
--- a/app-emulation/spectemu/files/spectemu-0.99.3-qa.patch
+++ b/app-emulation/spectemu/files/spectemu-0.99.3-qa.patch
@ -1,23 +0,0 @@
--- spectemu-0.99.3/Makefile.in
-+++ spectemu-0.99.3/Makefile.in
-@@ -45,9 +45,9 @@
- 
- install_prog: $(progs)
- 	if test -f xspect; then \
-	   $(INSTALL_PROGRAM) -s -m 755 xspect $(i_bindir); fi
-+	   $(INSTALL_PROGRAM) -m 755 xspect $(i_bindir); fi
- 	if test -f vgaspect; then \
-	   $(INSTALL_PROGRAM) -s -m 4755 vgaspect $(i_bindir); fi
-+	   $(INSTALL_PROGRAM) -m 4755 vgaspect $(i_bindir); fi
- 
- install_man:
- 	$(INSTALL_DATA) ./xspect.1 $(i_mandir)
-@@ -88,7 +88,7 @@
- 	./sp_to_s < i386emul.sp > i386emul.s
- 
- i386emul.o: i386emul.s
-	$(CC) -c $(CFLAGS) i386emul.s
-+	$(CC) -c $(ASFLAGS) -Xassembler --noexecstack i386emul.s
- 
- sp_to_s: sp_to_s.o
- 	$(CC) -o sp_to_s $(LDFLAGS) sp_to_s.o
--- a/app-emulation/vkd3d/vkd3d-1.1.ebuild
+++ b/app-emulation/vkd3d/vkd3d-1.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
 fi

--- a/app-emulation/wine-mono/wine-mono-4.7.5.ebuild
+++ b/app-emulation/wine-mono/wine-mono-4.7.5.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}.msi"

 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"

 DEPEND="!!app-emulation/wine:0"

--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"

 inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
@ -19,9 +19,9 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-        MINOR_V=$(ver_cut 2)
+	MINOR_V=$(ver_cut 2)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+	KEYWORDS="-* amd64 ~x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"

--- a/app-emulation/wine-vanilla/wine-vanilla-4.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.1.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"

 inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"

 inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@ -1,2 +1 @@
 DIST afflib-3.7.18.tar.gz 540371 BLAKE2B 6c1837ebcb5cca97622736f38e61c35f149c045bc1a60acea455dd9059e8c60447cd8f45304fd55aa7f2e5f783d40e266a23d09b33209f9dc5441f971b8a188d SHA512 47ab74c86bbaedc2494558962f99463066e267f7a3f583902a53e1f488085a309b0d871093c67439033272c3ebf03d213649886930b9812013e66782ea84df85
-DIST afflib-3.7.4.tar.gz 569346 BLAKE2B e296bf58499bff4d44c9f5e1dd7363b4a68581213ff04ab14ffbe35b877c8307da03fb49e967a722ad9869f6284de496b86258f1b20c7c9e6b6a6cdcf473a03f SHA512 58791388a05d614dd5f219a74173de2ff0938a1f93b21e2dd0731aca52ea544ba60cc4325f0d284937467ce600a4302b7a2f724d84710ecc7f12db1a22a8e41c
--- a/app-forensics/afflib/afflib-3.7.4.ebuild
+++ b/app-forensics/afflib/afflib-3.7.4.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=modules
-
-inherit autotools-utils python-single-r1
-
-MY_PN=AFFLIBv3
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Library that implements the AFF image standard"
-HOMEPAGE="https://github.com/simsong/AFFLIBv3/"
-SRC_URI="https://github.com/simsong/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86 ~x64-macos"
-IUSE="fuse ncurses python qemu readline s3 static-libs threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/expat
-	dev-libs/openssl:0
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse )
-	ncurses? ( sys-libs/ncurses:0= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0 )
-	s3? ( net-misc/curl )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.1-python-module.patch
-	"${FILESDIR}"/${PN}-3.6.12-pyaff-header.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i '/FLAGS/s: -g::' configure.ac || die
-	sed -i '/-static/d' tools/Makefile.am || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Hacks for automagic dependencies
-	use ncurses || export ac_cv_lib_ncurses_initscr=no
-	use readline || export ac_cv_lib_readline_readline=no
-
-	local myeconfargs=(
-		$(use_enable fuse)
-		$(use_enable python)
-		$(use_enable qemu)
-		$(use_enable s3)
-		$(use_enable threads threading)
-	)
-	autotools-utils_src_configure
-}
--- a/app-forensics/afflib/files/afflib-3.6.12-pyaff-header.patch
+++ b/app-forensics/afflib/files/afflib-3.6.12-pyaff-header.patch
@ -1,13 +0,0 @@
-Fix include location based on the include directories passed via CFLAGS.
-
--- afflib-3.6.12/pyaff/pyaff.c.orig
-+++ afflib-3.6.12/pyaff/pyaff.c
-@@ -21,7 +21,7 @@
-  ****************************************************/
- 
- #include "Python.h"
-#include "lib/afflib.h"
-+#include "afflib.h"
- 
- #include <string.h>
- #include <stdlib.h>
--- a/app-forensics/afflib/files/afflib-3.7.1-python-module.patch
+++ b/app-forensics/afflib/files/afflib-3.7.1-python-module.patch
@ -1,14 +0,0 @@
--- afflib-3.7.1/pyaff/Makefile.am
-+++ afflib-3.7.1/pyaff/Makefile.am
-@@ -7,8 +7,8 @@
- pyexec_LTLIBRARIES 	= pyaff.la
- 
- pyaff_la_SOURCES	= pyaff.c
-pyaff_la_LIBADD		= ../lib/libafflib.la
-+pyaff_la_LIBADD		= @top_builddir@/lib/libafflib.la
- pyaff_la_CPPFLAGS 	= $(PYTHON_CPPFLAGS)
-pyaff_la_CFLAGS                = -fno-strict-aliasing
-pyaff_la_LDFLAGS 	= -module -avoid-version $(PYTHON_LDFLAGS)
-+pyaff_la_CFLAGS     = $(AM_CFLAGS) -shared -fno-strict-aliasing
-+pyaff_la_LDFLAGS 	= -module -avoid-version -shared $(PYTHON_LDFLAGS)
- endif
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST etcd-ca-0_p20150423.tar.gz 55031 BLAKE2B 39f12fe140a5490e512e9d14c58c58f452769788f0c4c6a8a521590d19a254009c28e134611a10a40c8edc2820c4a333e9c2676e7ace2ad5af88e4245d23432a SHA512 8c7ecb80e056da77997283ff2defb6df9a9acef250b0fac8e18c2bca71cccfedf6d782b7c9bf6491574d88ac5fa358f9bc5f540aa718a2470655d75f2f54fff4`
				`@ -1 +0,0 @@`
				`DIST ganeti-htools-0.3.1.tar.gz 300261 BLAKE2B b7eb1a94ff4a5026955a9b8c7331dc6b529ff9eb688ae4cafe1822b93d3705bff4f9c5006bd674cd03ecb2bf41d0e32142d039b485e08a797240e8f51f553c2a SHA512 76acc476dc5b3add808db41b7aad4be6ee4b62d31e81eaefa17fbf010daa817bcc920b4e290727ebeddebbe6015017b19d2b7643dbc6d529f158b9746b7a4b43`