gentoo resync : 21.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-21 10:20:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-21 10:20:03 +0100
commit: 6f8038813c460b4f0572d5ef595cdfa94af3a94d (patch)
tree: 3509e94070265053394b7f2e30a779d7e60c2064 /sys-apps
parent: eccb70a7f91b2d22582587f26d1a28bb31408b45 (diff)
40 files changed, 399 insertions, 921 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 2c6265acf34f..fa71eee80cc0 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index c22969f7db1d..9cf900100810 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,3 @@
-DIST baobab-3.26.1.tar.xz 973020 BLAKE2B 37ddfbbc72482bf31367210d0f814a6e163c415730d5fd86f3b48c5591c4f7c15cf1e7c3fbe7ddb20a465be5e4a4bf87705bef0175da98a5fffc37588871f1a3 SHA512 be16249de5ba22ef40b7addaae9823ac9d853422d33b3c345aaca1e07e3497793ec00bddfadc0da882b3c187419210026a4a6e66d23ce7c5cac455d39cfd9375
 DIST baobab-3.30.0.tar.xz 765760 BLAKE2B 7003507e0923eedd709db8f3934c341215decb77b300b6660a334f6c23dfa6d83476d3c0a0ef3d76a5104a1add0759f7e268e13bcf00f69f51ae5b9986bdefc5 SHA512 3fa1c20e6e3a654d3dfa11b8f0a7e0dea77cc8ab88ff65a4471cd467d3cb3a7d2d39521be1718f3f6ab32984b9331332574f87f5fcaf13c1aa8cf93bd081d7e0
-EBUILD baobab-3.26.1.ebuild 889 BLAKE2B a27b7d030635fad710c3e9b09393f8577954b81a75b054322942031a3ad701d00d545d4dbc875919f51eca5c5ed846f8cd4b997bf9fb278f2dfa6a4f2e7899dc SHA512 65fde991159d00a6d6d7406e7ff634bb754f8f09f010cd6a63fba1a87c218610ee7080136d86d7adca7ef71ea8eb1285e5f6dcfe9d8fcd06ee2a3ac722d2a113
 EBUILD baobab-3.30.0.ebuild 748 BLAKE2B 68c2372c12edc6ecc4f9c71af075e2e5a799feee07b660551644f4b2efb1796df141cdcbca104d5ddec858d630b16b7251c86af5d0817d654dce31004030065e SHA512 b371a75101d86cf473baeebfd09f11e8f1b597d7368a919c2595903b17f1dcaa7e24caa8365f17625321843f1d267d9ed976c9ab02255127602fda9a27a322b4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-3.26.1.ebuild b/sys-apps/baobab/baobab-3.26.1.ebuild
deleted file mode 100644
index 98029caaf0e9..000000000000
--- a/sys-apps/baobab/baobab-3.26.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Disk usage browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2[dbus]
-	>=x11-libs/gtk+-3.19.1:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	x11-themes/adwaita-icon-theme
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-# libxml2 required for glib-compile-resources
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure   \
-		VALAC=$(type -P true)  \
-		VAPIGEN=$(type -P true)
-}
diff --git a/sys-apps/baselayout-java/Manifest b/sys-apps/baselayout-java/Manifest
index 71e2e409b304..18252c11f2e6 100644
--- a/sys-apps/baselayout-java/Manifest
+++ b/sys-apps/baselayout-java/Manifest
@@ -1,4 +1,4 @@
 DIST baselayout-java-0.1.0.tar.gz 72571 BLAKE2B 3a41752b1bdc3980fe8690e499738e19ba9c390164fba04d16eba8f85a73557c7f9c15e311fcd738c250ed1226cc143bc933eef14edad0546b27eb5b41cf3bd3 SHA512 6f5b6ff1ed07406711e15a768f5abdf9f7edef1b31e094760f265863aa8991bf60ff71c8b10003265d8ec1aa7c94a611bede96980d25c819908b705b4d2d1062
-EBUILD baselayout-java-0.1.0-r1.ebuild 1348 BLAKE2B 76dd5531276e7d34b58559678a6fbb343610eb72936f8d95df687edba89eedf83d61d36a887e10199ccf486585b0cba77b0d0988681cae4a21d5c42a378b9729 SHA512 6647babab7169e525101666d4ef3b7a4f68cd4a66aa887c1a863ad6b5bd42e5fcb938f6b454f26b5a231524c5d4aa30fec6122814245fc6baf5370682771997a
+EBUILD baselayout-java-0.1.0-r1.ebuild 1347 BLAKE2B bdf44c56186435dfe80cdfdd0690064f1ebc27d75b69fd12b16e20e58d6342f4ec070bb4880e1711146ef296732dc6be286901216f3213b10accfb26bc7bc92a SHA512 caee3c05a64edf4db4ed280ff6ecb8ea3914722a7de7cedbcf7a9e82176d8fc6cbee63321c3a75d743ec4faece972b7d63ec5464cd323f33b43258176d361e41
 EBUILD baselayout-java-0.1.0.ebuild 693 BLAKE2B 1602030e82d6c609815266571ed6e2569e03742485984367ae504db7976254514f5409eb46553ac87d323eb714f994e5010ce7707eae2e12fe67e941949ea292 SHA512 1acf9e4c15f850b7da3c063dd4145d213f6e8abc41fef1052411ddd5c929044a92a7dd99bdf99ef706d545714c2cf84c5668889350bd1930518d2df5cc3cd1f4
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
index 5a321eeb7f16..eeba60bf8e9d 100644
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 5c4610f8d2f7..26e0ff906b08 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,11 +3,9 @@ AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a03
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
-DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 95b8a04362e78001e723301e5f170e923bca8b7b1728e6a7658d606550923d2bd60a6a6916c0fcd88205ecdc4a25ab58309bdcabaeb32c2f6c5e4ef8686af02c SHA512 726f97d0a2016f4f0625ba332e93e2d33bb16857cd35cb6c79da0f44fff297df948c3df62c31ffbec34713a7b85b3ff5b65f31517fe3511ddbd3bf18bd4748ed
-DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5c73ac8a570e1e13f37f9d6b8c2aea2545b1a3979d3a94ce7a2ddda7280afde4ecd9b682d3d31355f82af217f7 SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c
 DIST dbus-1.12.12.tar.gz 2077301 BLAKE2B 6245559fc3419bfdca1bdb2da7f6f5a34e5377dc67e0c8ecb7a87914ea65d044a95be59b749d9cfef7008ad09854b549b86863ca987b8a3949cf0d58cc5a2cb6 SHA512 51af4e86ab7d36e1c9a861164e7cd7aa1605fdd82f90aed8728b34c45a87864a00671de9db00d88ea6f96be97459c7eb53d2517ea9d9687ae9ebf81c58c3a80f
-EBUILD dbus-1.10.18.ebuild 7366 BLAKE2B ec30593cceffe5a927529a64a895e4ab3913aacce6d9a6aeea54e613c38f4b557c81b7b3a7c968ce2f08e9d019f17d15c56dd4ab51b3014ed3f2d382328e14ce SHA512 1a8ee80dd263512afa76aeea6e0442b6c8fc58c69c6c3c04b760772d15964bbdc5ca4172af6bb5d5d1669514e56a4dedb73dc534f91e33609e2a85d3ec1167f5
-EBUILD dbus-1.10.24.ebuild 7371 BLAKE2B 86359da505027828bb4c146e7c33e50e569cbf997fede7ef03d37bfc15b1ce96db4852b24561d45efcd7156a420691cde680dded84c5e82d9aab98a1e904fdb7 SHA512 b9365d7d92412b9a0ccd674859e7eada5e5019a848cdc4a3d8a05aaa3b5308660e22af86869a93536619aa62c0fa63632e99230f49bad5de6481ecdcd6e3dd0d
+DIST dbus-1.12.14.tar.gz 2091526 BLAKE2B 45876c4a2880bf9136d4b247b5a533d7306b1d724bb8204b4fb3e5f6a4d34864a25ae947f8276239678f36010f5e69ffe3acecb5ffeeeab0307722b3b0659238 SHA512 b5707a9b429683995a44ba1c61acd402f8c3f2bd867fffc46506583c67dac864c262ce3e7310f653cf3a78fa1a9cae7326a62d244a2b515f613bad274d1826c6
 EBUILD dbus-1.12.12-r1.ebuild 7772 BLAKE2B 81a77839677b283f6de47d63b3050938ea3929bfe92653ae627c07d0afd648c640064f6c9310b99f697b8984a4f9a06be499db3d7ce303fb74055aaa22f429c7 SHA512 d11da21d55d69a77ef83e3b310a0fa7c0875a376f0de80127e93cdde8dfb0bc35aaa37f9fe95bcaa23c81aebd96d0a0f3feca6d69346ade4c8775c775f5fa240
 EBUILD dbus-1.12.12-r2.ebuild 8000 BLAKE2B 8f25876dba09f3d609f32b6dd23d77ac342070acbaf7a86e7f504980bc7f2e24dec38c848bac9ca699f5b5ddbdb82464803196396a2f4d3be8ae90dc1a878c92 SHA512 f55a77c706bcf660ef5eae51e2b4f1f5c4c8f466ea76c5959b6a11b459b6d56d089463f5845cd0876b7781fb0f38fec1b5d2c69066901a1288a4a8400111f6ef
+EBUILD dbus-1.12.14.ebuild 7861 BLAKE2B 9ad8b5cc984da5738d9ff3e4d2d19c38c3ee9eba8fa55e1cfb7b457cd7d61ed4b4228130ca3c375fa71f816e8cea61e906ff18453fdfc4c351ec3a8421be47fa SHA512 bfc468fba9b80a1168ad4e97ef506139c29e6e75dab9fecc6aee1bb6bf19c61776c3bf6fdd6bcde437514989b1cfa2054105c49a9cd5c0c2fac92a776e0802cf
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.10.18.ebuild b/sys-apps/dbus/dbus-1.10.18.ebuild
deleted file mode 100644
index ee0bb0f2fc77..000000000000
--- a/sys-apps/dbus/dbus-1.10.18.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://dbus.freedesktop.org/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
-
-LICENSE="|| ( AFL-2.1 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 ~sparc-solaris ~x86-solaris"
-IUSE="debug doc elogind selinux static-libs systemd test user-session X"
-
-RESTRICT="test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-CDEPEND="
-	>=dev-libs/expat-2
-	selinux? (
-		sys-libs/libselinux
-	)
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-"
-DEPEND="${CDEPEND}
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.4
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		>=dev-libs/glib-2.36:2
-		${PYTHON_DEPS}
-	)
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-dbus )
-"
-
-DOC_CONTENTS="
-	Some applications require a session bus in addition to the system
-	bus. Please see \`man dbus-launch\` for more information.
-"
-
-# out of sources build dir for make check
-TBD=${WORKDIR}/${P}-tests-build
-
-pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 -1 -1 messagebus
-
-	use test && python-any-r1_pkg_setup
-
-	if use kernel_linux; then
-		CONFIG_CHECK="~EPOLL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Tests were restricted because of this
-	sed -i \
-		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' \
-		bus/test-main.c || die
-
-	eapply "${FILESDIR}/${PN}-enable-elogind.patch"
-
-	eapply_user
-
-	# required for asneeded patch but also for bug 263909, cross-compile so
-	# don't remove eautoreconf
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local docconf myconf
-
-	# so we can get backtraces from apps
-	case ${CHOST} in
-		*-mingw*)
-			# error: unrecognized command line option '-rdynamic' wrt #488036
-			;;
-		*)
-			append-flags -rdynamic
-			;;
-	esac
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	myconf=(
-		--localstatedir="${EPREFIX}/var"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		$(use_enable static-libs static)
-		$(use_enable debug verbose-mode)
-		--disable-asserts
-		--disable-checks
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		--disable-apparmor
-		$(use_enable kernel_linux inotify)
-		$(use_enable kernel_FreeBSD kqueue)
-		$(use_enable elogind)
-		$(use_enable systemd)
-		$(use_enable user-session)
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_enable debug stats)
-		--with-session-socket-dir="${EPREFIX}"/tmp
-		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
-		--with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-dbus-user=messagebus
-		$(use_with X x)
-		)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=(
-			--enable-launchd
-			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
-		)
-	fi
-
-	if multilib_is_native_abi; then
-		docconf=(
-			--enable-xml-docs
-			$(use_enable doc doxygen-docs)
-		)
-	else
-		docconf=(
-			--disable-xml-docs
-			--disable-doxygen-docs
-		)
-		myconf+=(
-			--disable-selinux
-			--disable-libaudit
-			--disable-elogind
-			--disable-systemd
-			--without-x
-
-			# expat is used for the daemon only
-			# fake the check for multilib library build
-			ac_cv_lib_expat_XML_ParserCreate_MM=yes
-		)
-	fi
-
-	einfo "Running configure in ${BUILD_DIR}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
-	if multilib_is_native_abi && use test; then
-		mkdir "${TBD}" || die
-		cd "${TBD}" || die
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
-			$(use_enable test asserts) \
-			$(use_enable test checks) \
-			$(use_enable test embedded-tests) \
-			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
-	fi
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		# after the compile, it uses a selinuxfs interface to
-		# check if the SELinux policy has the right support
-		use selinux && addwrite /selinux/access
-
-		einfo "Running make in ${BUILD_DIR}"
-		emake
-
-		if use test; then
-			einfo "Running make in ${TBD}"
-			emake -C "${TBD}"
-		fi
-	else
-		emake -C dbus libdbus-1.la
-	fi
-}
-
-src_test() {
-	DBUS_VERBOSE=1 Xemake -j1 -C "${TBD}" check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C dbus \
-			install-libLTLIBRARIES install-dbusincludeHEADERS \
-			install-nodist_dbusarchincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	newinitd "${FILESDIR}"/dbus.initd-r1 dbus
-
-	if use X; then
-		# dbus X session script (#77504)
-		# turns out to only work for GDM (and startx). has been merged into
-		# other desktop (kdm and such scripts)
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/80-dbus
-	fi
-
-	# needs to exist for dbus sessions to launch
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/{session,system}.d
-	# machine-id symlink from pkg_postinst()
-	keepdir /var/lib/dbus
-	# let the init script create the /var/run/dbus directory
-	rm -rf "${ED}"/var/run
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	readme.gentoo_create_doc
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
-	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
-	# dependencies with hardcoded paths (although the known ones got fixed already)
-	dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
-	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		local plist="org.freedesktop.dbus-session.plist"
-		elog
-		elog
-		elog "For MacOS/Darwin we now ship launchd support for dbus."
-		elog "This enables autolaunch of dbus at session login and makes"
-		elog "dbus usable under MacOS/Darwin."
-		elog
-		elog "The launchd plist file ${plist} has been"
-		elog "installed in ${EPREFIX}/Library/LaunchAgents."
-		elog "For it to be used, you will have to do all of the following:"
-		elog " + cd ~/Library/LaunchAgents"
-		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
-		elog " + logout and log back in"
-		elog
-		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
-		elog "specified and refused to start otherwise, then export the"
-		elog "the following to your environment:"
-		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
-	fi
-
-	if use user-session; then
-		ewarn "You have enabled user-session. Please note this can cause"
-		ewarn "bogus behaviors in several dbus consumers that are not prepared"
-		ewarn "for this dbus activation method yet."
-		ewarn
-		ewarn "See the following link for background on this change:"
-		ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html"
-		ewarn
-		ewarn "Known issues are tracked here:"
-		ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028"
-	fi
-}
diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.12.14.ebuild
index 4d7969914d1e..1219009c8285 100644
--- a/sys-apps/dbus/dbus-1.10.24.ebuild
+++ b/sys-apps/dbus/dbus-1.12.14.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+EAPI=7
 
-inherit autotools ltprune linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
 HOMEPAGE="https://dbus.freedesktop.org/"
@@ -12,37 +12,36 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 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 ~sparc-solaris ~x86-solaris"
-IUSE="debug doc elogind selinux static-libs systemd test user-session X"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
 
-#RESTRICT="test"
+REQUIRED_USE="?? ( elogind systemd )"
 
-REQUIRED_USE="
-	?? ( elogind systemd )
-	test? ( debug )
+BDEPEND="
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.4
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
 "
-
-CDEPEND="
-	>=dev-libs/expat-2
-	selinux? ( sys-libs/libselinux )
+COMMON_DEPEND="
+	>=dev-libs/expat-2.1.0
 	elogind? ( sys-auth/elogind )
+	selinux? ( sys-libs/libselinux )
 	systemd? ( sys-apps/systemd:0= )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXt
-		)
+	)
 "
-DEPEND="${CDEPEND}
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.4
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+DEPEND="${COMMON_DEPEND}
+	dev-libs/expat
 	test? (
-		>=dev-libs/glib-2.36:2
 		${PYTHON_DEPS}
-		)
+		>=dev-libs/glib-2.40:2
+	)
 "
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-dbus )
 "
 
@@ -56,6 +55,7 @@ TBD="${WORKDIR}/${P}-tests-build"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-enable-elogind.patch"
+	"${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136
 )
 
 pkg_setup() {
@@ -79,12 +79,26 @@ src_prepare() {
 
 	default
 
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# fix standards conflict, due to gcc being c99 by default nowadays
+		sed -i \
+			-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+			configure.ac || die
+	fi
+
 	# required for bug 263909, cross-compile so don't remove eautoreconf
 	eautoreconf
 }
 
+src_configure() {
+	local rundir=$(usex kernel_linux /run /var/run)
+	sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
+		> "${T}"/dbus.initd || die
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
-	local docconf myconf
+	local docconf myconf testconf
 
 	# so we can get backtraces from apps
 	case ${CHOST} in
@@ -118,12 +132,12 @@ multilib_src_configure() {
 		--disable-modular-tests
 		$(use_enable debug stats)
 		--with-session-socket-dir="${EPREFIX}"/tmp
-		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
-		--with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
+		--with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
+		--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		--with-dbus-user=messagebus
 		$(use_with X x)
-		)
+	)
 
 	if [[ ${CHOST} == *-darwin* ]]; then
 		myconf+=(
@@ -143,15 +157,12 @@ multilib_src_configure() {
 			--disable-doxygen-docs
 		)
 		myconf+=(
+			--disable-daemon
 			--disable-selinux
 			--disable-libaudit
 			--disable-elogind
 			--disable-systemd
 			--without-x
-
-			# expat is used for the daemon only
-			# fake the check for multilib library build
-			ac_cv_lib_expat_XML_ParserCreate_MM=yes
 		)
 	fi
 
@@ -161,12 +172,15 @@ multilib_src_configure() {
 	if multilib_is_native_abi && use test; then
 		mkdir "${TBD}" || die
 		cd "${TBD}" || die
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
-			$(use_enable test asserts) \
-			$(use_enable test checks) \
-			$(use_enable test embedded-tests) \
+		testconf=(
+			$(use_enable test asserts)
+			$(use_enable test checks)
+			$(use_enable test embedded-tests)
+			$(use_enable test stats)
 			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+		)
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
 	fi
 }
 
@@ -204,7 +218,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	newinitd "${FILESDIR}"/dbus.initd-r1 dbus
+	newinitd "${T}"/dbus.initd dbus
 
 	if use X; then
 		# dbus X session script (#77504)
@@ -222,10 +236,10 @@ multilib_src_install_all() {
 	# let the init script create the /var/run/dbus directory
 	rm -rf "${ED}"/var/run
 
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
+	dodoc AUTHORS ChangeLog NEWS README doc/TODO
 	readme.gentoo_create_doc
 
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 4c1dc4f42c0e..c787ef8cc241 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -15,6 +15,6 @@ EBUILD dtc-1.4.3.ebuild 1123 BLAKE2B 0ce6d8ff290534e99b3236173b704f3cd5a8c3810b3
 EBUILD dtc-1.4.4-r1.ebuild 1181 BLAKE2B 4ea4eb40173c5e481fe2d7e935df40e53cce6b79440bd0a12416e6e775e5d367401bc7e040230f43228d8e06a6c20dead191eb30da98454a751877304c011be7 SHA512 de6b2dbd04270c132fce691dec8a1dd7b25c75717c89075091a85d98c3c15f9b154568f4b7beb0d35cd60bd8e775c45a606c7aaf31570d899d64efc85bdfe83e
 EBUILD dtc-1.4.4.ebuild 1121 BLAKE2B 0e6226dce63ed1b6bc6dd96deb179f8451564f99e6a91aeff689a25623a4085a9ed706a9495f8ee59e9a9e415cb8b8f559d8474ac7670f61deec48e9582424f4 SHA512 bea9060f27a2fbfddecf0d3b58ca26c429166e5efe71678f6f3cdf3a59b71c4e27ce6f9ef84806c6527d8804ee7a0a1ceb323c81e301c5f44f3aafef7aa5721b
 EBUILD dtc-1.4.6.ebuild 1217 BLAKE2B e82baa485e5139389f870dd2ecb83c6883af617585c2aa38bf6f1f26fd62c9f1c3c45888f1d305b53a3ba69a5e6c1511284289132499ea5a7b698286d156bcf2 SHA512 06acd8e5b7e8d26acfcc174d158f19a17fcf7f8fe5e5e597b309064773c9424d4032fdcca78eab02ccb3e8894d489ddd0ec8db88081f3645026b5488e7dc43ba
-EBUILD dtc-1.5.0.ebuild 1237 BLAKE2B bf7c5489e6e6ea1140fafca0c2f31d76f8953a659d8b0771e6cadf0a020a4fd4daf2cc7d5a50825e8901c1f218842b92514f671cec5438dcaf3cec94f4f11e24 SHA512 bfe85728d556c2a2c62ffe704e203e74a7c0e05e010ff9cf5019d82046bce1dd3347bfd3add12775cd6da85da326310dbe44b2a91cc642210d73fcddae9ae0f6
+EBUILD dtc-1.5.0.ebuild 1236 BLAKE2B 8ba0593e2fff77c60976b3dc47d2650fa5eaf369883051cfdde29d5c25062252f3b4b94120c889aab4ace60d06fba0297d24a98415dba33d11976d46786870f0 SHA512 1571c470a9fca97f75040b9723ce590ebbf76fad93d4484b17a0402139bf3d28216e68cbce43d0f8a83baf8e316fbfdccbbde389447bc2b646235fe838c00fd1
 EBUILD dtc-9999.ebuild 1181 BLAKE2B 4ea4eb40173c5e481fe2d7e935df40e53cce6b79440bd0a12416e6e775e5d367401bc7e040230f43228d8e06a6c20dead191eb30da98454a751877304c011be7 SHA512 de6b2dbd04270c132fce691dec8a1dd7b25c75717c89075091a85d98c3c15f9b154568f4b7beb0d35cd60bd8e775c45a606c7aaf31570d899d64efc85bdfe83e
 MISC metadata.xml 335 BLAKE2B 123cf55da545acd9b0b568ca010eba5f7818f43bf020f412a479397f08cfb571f7cd83f4b8c63c97d3ab3216278b62e6eff03a8c349f3b6758b1a41d559787b4 SHA512 757b9539f0dd59ff4c25127df262c6f030c3e4ddf4a4044a77bb7e2ee126001adff606a683b3af24f11d23604919366fa42cb496941ed232a5169ed2eac7c631
diff --git a/sys-apps/dtc/dtc-1.5.0.ebuild b/sys-apps/dtc/dtc-1.5.0.ebuild
index 077ffad552b1..4268a6db11c7 100644
--- a/sys-apps/dtc/dtc-1.5.0.ebuild
+++ b/sys-apps/dtc/dtc-1.5.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://kernel/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/entropy/Manifest b/sys-apps/entropy/Manifest
index 0c04d381fcbb..cee4a302a995 100644
--- a/sys-apps/entropy/Manifest
+++ b/sys-apps/entropy/Manifest
@@ -1,3 +1,3 @@
 DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD entropy-302-r1.ebuild 3219 BLAKE2B a7958b38a68343672ef0bbf0cb5ba5689709316b0becb42960b647485f98c72c1aa14ffbb8afa9f875505388f1594cfe3a1670cd87c3d7fc8e6979008576c5a7 SHA512 85016151e842a5799a2956c27fd7d6bc6d9d8496eb42bde757d36327af76b37d319366cfb83770ace69b3fd8c2fa7c8f8039bb6dadca7e610ec3af01d37b5fa1
+EBUILD entropy-302-r1.ebuild 3165 BLAKE2B 62ef56df52e0f1c499bc620b1f2b3d401b73038c5458b6478b55bc89a6b106b0b92a03c5ef4682a362fd40634297253da12175a90ff7654a9f23761f2a87f2bc SHA512 d9cbf3cf10f08912dc9bf872b3b13e6e95d8213fed5ed5ca5ab4f76e47bf735cdf0d5f54402158a0baa53587b9f7426666ea2db9543dd5a3461ab157a90e1083
 MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/sys-apps/entropy/entropy-302-r1.ebuild b/sys-apps/entropy/entropy-302-r1.ebuild
index 60af0793b789..0cd3b60c7998 100644
--- a/sys-apps/entropy/entropy-302-r1.ebuild
+++ b/sys-apps/entropy/entropy-302-r1.ebuild
@@ -23,10 +23,7 @@ RDEPEND=">=app-misc/pax-utils-0.7
 	net-misc/rsync
 	sys-apps/diffutils
 	sys-apps/sandbox
-	|| (
-		>=sys-apps/portage-2.1.9[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-	)
+	>=sys-apps/portage-2.1.9[${PYTHON_USEDEP}]
 	sys-devel/gettext
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index aa14974e3e84..7e120b8109f0 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,7 +1,7 @@
-DIST ethtool-4.13.tar.xz 217472 BLAKE2B be60c4763a06dba4b246c17b76dd10bf956e69d19d02c09b6370b1cf92c5c8a6e97f5048c98dfbb3a72b8c5889302538d8f11b9771120724b53949f9aedd11c6 SHA512 d0f881b88379b959cd34949c924b0e4d4fb1af0873192cdf8ec9cc2d2d677a4de13021efabb0a1aea1932ef38a6952d9f3eb040c478a9af770054a6170777789
 DIST ethtool-4.19.tar.xz 221932 BLAKE2B 5a44d30b5b426ad89f41545617d9b36133fff8aa6c6bb0d5adacc4f5fef4e81f693ab620403a5d107d6abad177492b7adc406dc4b082c343938c228562f46f67 SHA512 5b0b83e09799a04e401563e34c4c784029803ecf83d5ba4f3a9cc92bfc7c2bc9cb0d86cb76ac9a7ffbfb379f6a0fc4bc3e0cf9b7826971e46504052e40156abd
 DIST ethtool-5.0.tar.xz 224444 BLAKE2B 49f968604485e49403a3370839f413c63a992fe2153eb0be000e68019570a176378b570600c970bf89e4fa1f5702d7708129151ac5833367c996206ad8e853e6 SHA512 9ff6433466585e38dd0dbb99ed06430cd885f26ef4e11f6b95c024ed7511c376f8d86ff53c298cb8e811193500514737ce21eb0cd925bede0373799eb3a990b6
-EBUILD ethtool-4.13.ebuild 453 BLAKE2B 039558a1279ee3cbfb7c11005761705fd30f8248d97cd79d089be6d7e9b27aec8f9cba28ed58bc6f80e2a33877dee10e67ddf09211d27b30371e2e2fffdfb81c SHA512 46b487cd70ed8f5bfb656a9371ef185f46761c4dcc1ad2f9cbbc20abbc5c9e2d32f6f3a52f0ae709b2444ab8514d4ada9cf66b5fdec88c342bf6ca367cd525a4
+DIST ethtool-5.1.tar.xz 237580 BLAKE2B 74657b44558548ef3dc2ca960cdf760bf1ce28741b1bc1c7684c5bb5a25b6cd90a0458201fb03ca848fa622c91594cbfe982179344316ec9a51a1d5567cef43b SHA512 291317ebf604138ae0c745ca73372388e3c9612fa7ae8522353e81593eed9b0e024fed1ba98f7b48bbc12e763eae9e8d845b67d102c0441c38a6ea36ed9f723d
 EBUILD ethtool-4.19.ebuild 448 BLAKE2B 4c01a965b0f8316cc6b6d81072fe252e630e059ecf231682c3093b79419e3db61da9949f47a6999e3e2ec823c626ba2874f60cc33ee1386c6cf8c3000d5fba9c SHA512 e510b9ddcd60ddcae090a406c008ac75ee613c6ebfa142ef511d9910997fafd6e705fe5b25d4842c3e3dcd724f43a5465bd62be2cfc20fdb62e30d5e9314a8b4
 EBUILD ethtool-5.0.ebuild 458 BLAKE2B 894672b02c5b2be3ec477864f7efb9d1bb48b74cbc7c3b072de4a70977c38d403b5748ca0c7c19cac75efde02e60c86bf4f87bd3cbad7b41aa207946c5768047 SHA512 7d4350486a6c463e0794ae4242e0bcbb3461f4c8916fc22241462840c4ce1f8773fde4c99722462a9a87124b8645a0265a9cb0b0c693d7726521308da75cdfb8
+EBUILD ethtool-5.1.ebuild 458 BLAKE2B b3992a08d298c7d944f1803a3bdd326c070dfbcd64585d18e0214b0490060fe9a3827c237c922c9496579a1529644d8b9ce0170e474acdd4cca791a3ae4363e7 SHA512 fe34a2982e1103e13b1d72d3d9ac454d343ecd7c759b265aec0fc3c4b400eaf1fc7fa4fa428eec7a6a4fd7195fb3951971e63d7ad79beed3a0f90af448099fe7
 MISC metadata.xml 814 BLAKE2B cb6f1a2aa029191f22615d83df4f166c7c53c70ac6486deadab63ea5a463b08ae9aa8392f0a2732b83efc2a476c2416cd94b2e47ed9b09097217da5746d110d2 SHA512 7ba75f7aa20f8cc48b91b7576449e416abfc412fe26670142d4ec1513b6a3939858b298ccdbf72c208c2d70b5c00eea88dc3c4201e2187b188ed4a9d33cf0272
diff --git a/sys-apps/ethtool/ethtool-4.13.ebuild b/sys-apps/ethtool/ethtool-5.1.ebuild
index 4ef19eb26fcf..a1a695dd922a 100644
--- a/sys-apps/ethtool/ethtool-4.13.ebuild
+++ b/sys-apps/ethtool/ethtool-5.1.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="5"
+EAPI=7
 
 DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
 HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
@@ -9,6 +9,6 @@ SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 4948ea4dbe29..33c41347d667 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,4 +1,6 @@
 DIST file-5.36.tar.gz 875792 BLAKE2B ce1d98148e26c243982bb85357d440ab774fc42c526bca4dbff15c05247d2c15b54b030671a5590020fa5383c436204116f7817ec4dd33aa4387b059e4d7fe21 SHA512 3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751
+DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 EBUILD file-5.36.ebuild 3162 BLAKE2B 5836be9e33ad27cb6127b786309ba35b5744ed3b0acfc36a1d19ad423712e0974bc3a6679379e58a6bd24c96be8c10064a66626869b12df7ea0d47dfc71c565b SHA512 d044a7a80227222c09fa20f602f074b54b4da9df505b8a58133f79d88e37756ff9206e504b00a3b72fc8aa8119229d0925dd562ee38f0fabdeb97e06c755a0f7
-EBUILD file-9999.ebuild 3254 BLAKE2B 00379e6413836ea41552fbf550173a28d6442f7b95613b5e4a3a0318030e4aa9fce92ea33ce0318f7effde48d12364ee8a9a988686c8c76ad55a59e130da2a01 SHA512 dd78b23c0e5ae4b59645dfceac8207f7c189c7370c1d92709d1d01b243dd8e3337523eba8993ffa43a550cc5a2ed4ede12714c63c0955be277cdcbc45882a5e1
+EBUILD file-5.37.ebuild 3183 BLAKE2B e21fbeb3888a1a3580416a264a703680da8484536f12bbd754b8efe06311e8c640c834d7c9da6016d1145fc87cc4fc77ae1258964960d1a97cfd0a30119bc01f SHA512 d613e428f9faf4f48044020609b65a0c487551a8de3a981610a9c842c945c3c48cacdeb9e4a49692ae2b4491ee24958123066718bf661fb99159f7559a1b924b
+EBUILD file-9999.ebuild 3262 BLAKE2B d31587707116d0ec0d4b21a877503dc835b890f008e6605208ad35110b925effca36af66a2e64209b54e49ff49910dde80b62628e57ae21fdce18ee4faaaf93e SHA512 cad7c42b58628f899d4d02fda762c5610947e88d8c70b53521ac74febfe363d2e7d8bd0a62e41c7044329a94365ba442c6e272dbd2b0682eb86f276f5fa1b76e
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.37.ebuild b/sys-apps/file/file-5.37.ebuild
new file mode 100644
index 000000000000..8a909bc82b5c
--- /dev/null
+++ b/sys-apps/file/file-5.37.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit autotools git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="python static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-libseccomp
+		--enable-fsect-man5
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		tc-export_build_env BUILD_C{C,XX}
+		ECONF_SOURCE="${S}" \
+		ac_cv_header_zlib_h=no \
+		ac_cv_lib_z_gzopen=no \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} -static" \
+		CC=${BUILD_CC} \
+		CXX=${BUILD_CXX} \
+		econf --disable-shared --disable-libseccomp
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index e112905e6984..2244b217ecda 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 DISTUTILS_OPTIONAL=1
@@ -123,5 +123,5 @@ multilib_src_install_all() {
 		cd python || die
 		distutils-r1_src_install
 	fi
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 768000e994a8..3b5242c16ef9 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,6 +1,7 @@
+AUX fwupd-1.2.9-without_systemd_build_fix.patch 2232 BLAKE2B 9cdd0466f4d9e86f823ddd1cfd3d899545cccd4ecf933cb48447a5010cd67ede434834ebfb348f457404da2f10395f2987e56afa3549432bff53380236eccac0 SHA512 29790db66320547fd1046f5f05d0485c54d984be8e0394bba5e8a64dbb73328639896840ece42d4d252d48a2a9c30fe599e0b064491ed16bb7b028ee18f6484b
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
-DIST fwupd-1.2.7.tar.gz 1899554 BLAKE2B aed0377135354c6391f63eb0802d27b5359efdb0f9d3b5c1a55ba8fe7ef0c84c9201e689d8a1bdde998e8147b25767e4dc7586c57bcf33e9f9e9d807e38e7a04 SHA512 12b5c193ab6e55e14256ea84273d139e7353618b6524197ba1f4477db32071e33a73b3e2e2b34733ca6269c4dbad5a03f2d3546b27d22b2a6db23989c69be6e5
 DIST fwupd-1.2.8.tar.gz 1911999 BLAKE2B 61a24ce24f778b96f7ad23496890f7a1d20c09e6bbd707f29d154992668d5c0a25cfd31b5d0d11519740e086c098cbdfd440fe9f5cab4dde0ac43fe6b438e911 SHA512 d603f9f4e5a4c0fc6abb0b75f7d884eff47fb8a16285aa545f7140fe98ce781d127ff3769f9c206bb3bfd084bbc5bf6abf9424f70e727ff79162416fe7881154
-EBUILD fwupd-1.2.7.ebuild 3635 BLAKE2B ef585e46a8d923c4b9efa7db3f0be37c8b5edb3f39853698eb2cab6fd65f9bbabdd40eec037945a8f29a8ebc03a1550d8b5076ba3293172b32ef6367e69a841d SHA512 b641c3d787e28a5f0724647d193ed3b4a63d1227abedc0db7c2f7a2663d0dbebe68615b6a6d74ae66fd44c4d8a82495ca2e459efe5088dde6fee3752cacef887
-EBUILD fwupd-1.2.8.ebuild 3634 BLAKE2B 6756dd3ba1f12b56d4fe960b7478df57968ad36ab1276de6b2438f526cd78db332fdafae85adb0538cdb8cdb21bee6c98fe8d3c668d35c5f7fd994677fdd11cd SHA512 8661c3b4cbe4d0b0b995cba2b7f24b22ccd5d3dee068ebbf67bbbcc014011bc6f228a4a0bcc5322a445ffb60ba71e7e5436ad3d9b823f8f4773b84153bcd72ca
+DIST fwupd-1.2.9.tar.gz 1938008 BLAKE2B 6a16c8e3a2c94dfbe9485d3ed57f3908fa2d7bcd95ac122d4b08e9a869706c01483132015f06cfa3076c861fec903740bed83b7ef763ac9b20147673a25a54a1 SHA512 942c6bad822dc65846d1984850798bec677b6a312100c6f5971fc9d5906c182267182ef29e0834bbd2b83fe72b11c3b6e50855d90388d2bf85e8a3b95d0a5a68
+EBUILD fwupd-1.2.8.ebuild 3656 BLAKE2B 4f219b26d50bc3fd9560ec8684a3629f788f92f6b9fa15ef1d948302f40f6194191b4a7d0a9891a5b8d5973d75d575df3d48c27e49733f32a0c8454af0c621d6 SHA512 224bcb6a1b84676695992bdcdcb6d28892b8068ad4f4a09d5b7bad50fba77902c4b10d172e705aa703195f80a0b879cb8322c9f5bb08a9610c502432e6908c5d
+EBUILD fwupd-1.2.9.ebuild 3723 BLAKE2B 0b61a6fc582f93030cac14a6f0bef178c112dba75d859a0df69cb721a39a8c6cac846a59b0403aebddde6b55baf3f41c5e6c57c7dfa6f5d62dd76b55f87223bb SHA512 b9f86fb31cb227a446f5a67e683f004c95f3a44e6cce2e4bd2480f4b6402bcf2c7c9ab704966ac817bced154b8d80370a570de075fa593ad6bda719c0803f268
 MISC metadata.xml 1093 BLAKE2B 0f2e81196b336c6047ae2df81cf2aed692eb452c396d9b65b726e951be859c43a76638ca635fbca96d6d7dfee7e1ebf7d3fc844eb1633569ecfdbea0dcd9228f SHA512 99344e56a5a3641e65bee382a6ada656cd5c63cf114785b4185f4ee1b3a0c9514f83ca3adc77d38f145d9a1f1e64aa21dd72dcc1e4f78cb50d042f901a5c9c8a
diff --git a/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch b/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch
new file mode 100644
index 000000000000..37be190d8aa1
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.2.9-without_systemd_build_fix.patch
@@ -0,0 +1,77 @@
+From d92cccaf1396d93f97480f32694372b8256f9b11 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 20 May 2019 11:28:31 +0100
+Subject: [PATCH] trivial: Fix non-systemd build
+
+---
+ src/fu-tool.c        | 2 ++
+ src/fu-util-common.c | 5 ++++-
+ src/fu-util.c        | 6 +++++-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/fu-tool.c b/src/fu-tool.c
+index 353a52e88..eac7a8cc4 100644
+--- a/src/fu-tool.c
++++ b/src/fu-tool.c
+@@ -113,8 +113,10 @@ fu_util_start_engine (FuUtilPrivate *priv, FuEngineLoadFlags flags, GError **err
+ {
+ 	g_autoptr(GError) error_local = NULL;
+ 
++#ifdef HAVE_SYSTEMD
+ 	if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), &error_local))
+ 		g_debug ("Failed top stop daemon: %s", error_local->message);
++#endif
+ 	if (!fu_engine_load (priv->engine, flags, error))
+ 		return FALSE;
+ 	if (fu_engine_get_tainted (priv->engine)) {
+diff --git a/src/fu-util-common.c b/src/fu-util-common.c
+index 219752b1e..51e16f671 100644
+--- a/src/fu-util-common.c
++++ b/src/fu-util-common.c
+@@ -28,6 +28,7 @@ fu_util_get_systemd_unit (void)
+ 	return SYSTEMD_FWUPD_UNIT;
+ }
+ 
++#ifdef HAVE_SYSTEMD
+ static const gchar *
+ fu_util_get_expected_command (const gchar *target)
+ {
+@@ -35,10 +36,12 @@ fu_util_get_expected_command (const gchar *target)
+ 		return "fwupd.fwupdmgr";
+ 	return "fwupdmgr";
+ }
++#endif
+ 
+ gboolean
+ fu_util_using_correct_daemon (GError **error)
+ {
++#ifdef HAVE_SYSTEMD
+ 	g_autofree gchar *default_target = NULL;
+ 	g_autoptr(GError) error_local = NULL;
+ 	const gchar *target = fu_util_get_systemd_unit ();
+@@ -58,7 +61,7 @@ fu_util_using_correct_daemon (GError **error)
+ 			     fu_util_get_expected_command (target));
+ 		return FALSE;
+ 	}
+-
++#endif
+ 	return TRUE;
+ }
+ 
+diff --git a/src/fu-util.c b/src/fu-util.c
+index c8528e71e..dec96e741 100644
+--- a/src/fu-util.c
++++ b/src/fu-util.c
+@@ -2122,7 +2122,11 @@ fu_util_modify_config (FuUtilPrivate *priv, gchar **values, GError **error)
+ 		if (!fu_util_prompt_for_boolean (FALSE))
+ 			return TRUE;
+ 	}
+-	return fu_systemd_unit_stop (fu_util_get_systemd_unit (), error);
++#ifdef HAVE_SYSTEMD
++	if (!fu_systemd_unit_stop (fu_util_get_systemd_unit (), error))
++		return FALSE;
++#endif
++	return TRUE;
+ }
+ 
+ static void
diff --git a/sys-apps/fwupd/fwupd-1.2.8.ebuild b/sys-apps/fwupd/fwupd-1.2.8.ebuild
index 9f2372052b63..9107999ee4a7 100644
--- a/sys-apps/fwupd/fwupd-1.2.8.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -71,7 +71,10 @@ BDEPEND="
 	>=dev-util/meson-0.47.0
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
 "
 
 # required for fwupd daemon to run.
diff --git a/sys-apps/fwupd/fwupd-1.2.7.ebuild b/sys-apps/fwupd/fwupd-1.2.9.ebuild
index 5951cd35b846..ab05058f3b68 100644
--- a/sys-apps/fwupd/fwupd-1.2.7.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.9.ebuild
@@ -71,13 +71,20 @@ BDEPEND="
 	>=dev-util/meson-0.47.0
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
 "
 
 # required for fwupd daemon to run.
 # NOT a build time dependency. The build system does not check for dbus.
 PDEPEND="sys-apps/dbus"
 
+PATCHES=(
+	"${FILESDIR}/${P}-without_systemd_build_fix.patch"
+)
+
 src_prepare() {
 	default
 	sed -e "s/'--create'/'--absolute-name', '--create'/" \
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 19eb8f281c6c..30be93e59294 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,7 +1,4 @@
 AUX elogind-support.patch 4363 BLAKE2B 060db5cb921d8b51d7eb3acd76186649b3d3887ebd72aaca79dfcdc44a602591d3d9ee11047af1655678e6a9f5c2fd445e67cb66b65cc1ac0a244db22b8f9c1d SHA512 1f7ec2af9e2764f338d5d903ce506a8416d21cf03be6c2dc927d3fde67420c5a9066244db0e3837468fa2bea0527643bfb55dc6db8524e8122467d13e19db418
-DIST gnome-disk-utility-3.24.1.tar.xz 1947976 BLAKE2B a3b9d02417bed415bf6b9b8d86abcfa857abe316133ce7abfa11db835831e916d879b09d1e1129d12621b0234ffa27c1e246837cb614c51c54ce387a9c73bea4 SHA512 ae6bf83e005733ae985987411a9fe25b0059f64484fc0d613ad54af478130782974607bec53713ee36c2a28de653ceba82b0fb091aee57101773c0eeeaaed2d5
 DIST gnome-disk-utility-3.30.2.tar.xz 1665896 BLAKE2B 9000dc8e95f27cccdb3a13b84c527c740f801a58b0f3f1a384ae1415eeed330f5f81f284f190d110dca0f5dcfb9316262491b715c2b2cd4f67813587046b5b42 SHA512 59228fa923b7b1e89e8ce8d96920b6f452bc6ae62c203261bffbc584a2ef231e1d2006db8ddbd15f1f7b4ee14aeae54b85520b89bfd3e1450d42c423d987f2dc
-EBUILD gnome-disk-utility-3.24.1.ebuild 1048 BLAKE2B 9efcbf2160fc20cf85e6d720966d67f158ebc7575dbcb1f994993a6f3f21328482cf4500e2ab911dd576a2fb81e9c61c934c39c023e206b8d38b963ec6c15daf SHA512 ced1da29f927fd86b9be3472ee52cacfec069119ce308f64a37768933a4c9bdbddc7ce4547d5696918094d3fb21f1b931487eb6992f6fa55f8faa520f22404bf
 EBUILD gnome-disk-utility-3.30.2-r1.ebuild 1629 BLAKE2B 1826f137b2d5c4e302008788db219129ce0e2068eef5b19b3dfa4e2ae9c6cd40c3d88858a0ae899c3dc7d1c32b34b31ce6db378c6779bd524397305cabae1dbf SHA512 6fb3e9afa9c37aba7259053cba6e25f75aa774ce30e0ae00a2eee8a91abbb0e533e380658fa5e1208b9f46abf183e3f2af1030618e49bc732f146f6f295d27fb
-EBUILD gnome-disk-utility-3.30.2.ebuild 1459 BLAKE2B f30180a801f992aa23d6c7dd20ddc6ed11a84814857b8f9bfc86106326a0b3ec89be063a8d9887b4ff1115af9d99f9432892ed0d537a9099f16d97f81ed96908 SHA512 3fa9c3d366538cdd705910b279d2108b37e862572e5decd799e4e605fe205071695affe6d0adbe8beedff18b8a4307452c132d9ebe6239782c7804038acfe06c
 MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.24.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.24.1.ebuild
deleted file mode 100644
index 493c50f407ca..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.24.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="fat gnome systemd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
-
-COMMON_DEPEND="
-	>=app-arch/xz-utils-5.0.5
-	>=app-crypt/libsecret-0.7
-	>=dev-libs/glib-2.31:2[dbus]
-	dev-libs/libpwquality
-	>=media-libs/libcanberra-0.1[gtk3]
-	>=media-libs/libdvdread-4.2.0
-	>=sys-fs/udisks-2.1.1:2
-	>=x11-libs/gtk+-3.16.0:3
-	>=x11-libs/libnotify-0.7:=
-	systemd? ( >=sys-apps/systemd-209:0= )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	fat? ( sys-fs/dosfstools )
-	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable gnome gsd-plugin) \
-		$(use_enable systemd libsystemd)
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.30.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.30.2.ebuild
deleted file mode 100644
index 16ce62737a9e..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.30.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="fat gnome systemd"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	>=sys-fs/udisks-2.7.6:2
-	>=x11-libs/gtk+-3.16.0:3
-	>=app-crypt/libsecret-0.7
-	>=dev-libs/libpwquality-1.0.0
-	>=media-libs/libcanberra-0.1[gtk3]
-	>=media-libs/libdvdread-4.2.0
-	>=x11-libs/libnotify-0.7:=
-	>=app-arch/xz-utils-5.0.5
-	systemd? ( >=sys-apps/systemd-209:0= )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	fat? ( sys-fs/dosfstools )
-	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-"
-# appstream-glib for developer_name tag in appdata (gettext-0.19.8.1 own appdata.its file doesn't have it yet)
-# libxml2 for xml-stripblanks in gresource
-DEPEND="${COMMON_DEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gnome gsd_plugin)
-		$(meson_use systemd libsystemd)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest
index 24ed31341c5e..9204a316d9d6 100644
--- a/sys-apps/lsd/Manifest
+++ b/sys-apps/lsd/Manifest
@@ -33,5 +33,5 @@ DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD lsd-0.14.0.ebuild 1164 BLAKE2B c48c27c05cf96cb3055f2272fa3cfeec26009bc82884d66f5cbc6d00330458de460d53a93bcf6a24d9f43b61e9a5e27cf17b071866443d4b13f851860178e92b SHA512 b721c5b867f539b6617022f2aa02ba43811fd5cfd1b1f66550983d15c88af66a65893d6cff7e192c25d9ac1610900c39190e145c5f6646e0c2c91ee62efd38d5
+EBUILD lsd-0.14.0.ebuild 1163 BLAKE2B 175ce505dd0d0dda5c45f9a28438cc9a42aca08ff6456e24353177260e23c2b624a9c37960fd44e24bb2545c44e6575ffbe68b854e2ffc381d5e14b2a3be45aa SHA512 c2017256d9a8f218b828944157420787805787362c74d12953c523d8a51ba4090ff661bbc5c05562c84c4fcca062fd8459260f4ae6f56a023e32641c50442f56
 MISC metadata.xml 759 BLAKE2B 46f9729d738136d537cfed0a59cb6be6821b5b59bd4381171fce99943119cc477c54b03f303be47451ba9f8929fe94bb62c32881eb730ec11e306517afca505a SHA512 98a410b73a6a4f51f3e949a6e78087052580ce53e4720528aa9e97d3ddb052b6d6e1055cd2609f07d7a605c499e620843842461d514ddc84644f6cac007be599
diff --git a/sys-apps/lsd/lsd-0.14.0.ebuild b/sys-apps/lsd/lsd-0.14.0.ebuild
index 780361d67877..b7706acf02f5 100644
--- a/sys-apps/lsd/lsd-0.14.0.ebuild
+++ b/sys-apps/lsd/lsd-0.14.0.ebuild
@@ -49,7 +49,7 @@ SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
deleted file mode 100644
index e31771d87cc5..000000000000
--- a/sys-apps/portage-mgorny/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST portage-mgorny-2.3.51.1.tar.gz 1257484 BLAKE2B 85761b1fb5b44e4457173f8820166643fb3afb3115e9eab1436f16ee3a10f4fe1c8ab62b3e70239b4f2b00977d8421bc24a441d4a60d122c450185ff56e1e531 SHA512 8d2bd540a82f0d4aa5b089032d41c72a3d33b88041240e480ffa7d924eea0197e674b29241eb30ef13f154052514419e038d98aa72e89a5e1977dfcb6a86fa83
-EBUILD portage-mgorny-2.3.51.1.ebuild 7159 BLAKE2B ed371cfdd7ed6e71ae4ebdeda65325407dbd3a2643e2a8717dade24320faa47d567f62b1420b43473010c725f6124c262a93e9c2170e75b59938f730a41e89c0 SHA512 73af7d3c8b6227a4b61502f73d0f0e837cf0139fdf4bca15bf1f3e824bbcb28f3bff56a9485308d370fc5af0cd332079e143d8262b051ba59f404fe8b4567af7
-EBUILD portage-mgorny-9999.ebuild 7071 BLAKE2B 8223a3f01c9819b88aa15963784dd64d5d20773017b630c7c4f5aa37e138a88c3eab7fa3a759ccc5fb4c745fda216a8400b4dc89e1e600cdefa4df146387e0f2 SHA512 1e62d73fc575790d2770be08ab6e806e4697733bad70286a3b05c22f7c47872bc72bae397006b7f03f90d0e3eb98f7a52246c4f3fff579f63a49712b4ffaaffd
-MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/metadata.xml b/sys-apps/portage-mgorny/metadata.xml
deleted file mode 100644
index 1d50aed841d4..000000000000
--- a/sys-apps/portage-mgorny/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<use>
-		<flag name="ipc">
-			Use inter-process communication between Portage and running
-			ebuilds.
-		</flag>
-		<flag name="native-extensions">
-			Compiles native "C" extensions (speedups, instead of using
-			Python backup code).  Currently includes libc-locales.  This
-			should only be temporarily disabled for some bootstrapping
-			operations.  Cross-compilation is not supported.
-		</flag>
-		<flag name="xattr">
-			Preserve extended attributes (filesystem-stored metadata)
-			when installing files. Usually only required for hardened
-			systems.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.51.1.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.51.1.ebuild
deleted file mode 100644
index 7c190529617e..000000000000
--- a/sys-apps/portage-mgorny/portage-mgorny-2.3.51.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
-HOMEPAGE="https://github.com/mgorny/portage-mgorny"
-SRC_URI="https://github.com/mgorny/portage-mgorny/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	>=sys-apps/sed-4.0.5
-	sys-devel/patch"
-RDEPEND="
-	>=app-arch/tar-1.27
-	!build? (
-		>=app-admin/eselect-1.2
-		app-crypt/openpgp-keys-gentoo-release
-		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		>=app-portage/gemato-10[${PYTHON_USEDEP}]
-		app-shells/bash:0[readline]
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
-		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-		>=sys-apps/sed-4.0.5
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!app-portage/repoman
-	!sys-apps/portage"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-	)"
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	if [[ -f ${EROOT%/}/etc/make.conf ]]; then
-		eerror "You seem to be using /etc/make.conf. Please migrate to the new"
-		eerror "/etc/portage/make.conf location before upgrading."
-		if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then
-			eerror
-			eerror "  mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf"
-		else
-			ewarn
-			ewarn "WARNING: You seem to have make.conf in both locations. Please take"
-			ewarn "care not to accientally overwrite one with the other."
-		fi
-		die "${EROOT%/}/etc/make.conf present"
-	fi
-
-	if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then
-		eerror "You seem to be using /etc/portage/package.keywords. Please migrate"
-		eerror "to the new /etc/portage/package.accept_keywords location before"
-		eerror "upgrading."
-		eerror
-		if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords/99old"
-		else
-			if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-				eerror "  cat ${EROOT%/}/etc/portage/package.accept_keywords >> ${EROOT%/}/etc/portage/package.keywords"
-			fi
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords"
-		fi
-		die "${EROOT%/}/etc/portage/package.keywords present"
-	fi
-
-	if has_version sys-apps/portage; then
-		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
-		ewarn "please note that Portage will abort upon having to unmerge itself."
-		ewarn "However, sys-apps/portage-mgorny will already be installed at this"
-		ewarn "point, so you simply have to restart emerge and it will successfully"
-		ewarn "clean the old package afterwards."
-		ewarn
-		ewarn "If you did not use '--dynamic-deps n' in Portage, your VDB dependency"
-		ewarn "graph is probably broken. You may need to use '--changed-deps y'"
-		ewarn "for your first @world upgrade to resolve the conflicts. Afterwards,"
-		ewarn "--changed-deps should no longer be necessary and any conflicts"
-		ewarn "introduced afterwards should be reported to bugs.gentoo.org."
-	fi
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py ||
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i lib/portage/const.py ||
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "${REPLY}")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" ||
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [[ -f make.conf.example.${ARCH}.diff ]]; then
-		patch make.conf.example "make.conf.example.${ARCH}.diff" ||
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_configure_all() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		portage-ext-modules=$(usex native-extensions true false)
-	EOF
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-
-	keepdir /var/log/portage/elog
-}
-
-pkg_preinst() {
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
deleted file mode 100644
index 6c03fc1f54ec..000000000000
--- a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
-HOMEPAGE="https://github.com/mgorny/portage-mgorny"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/portage-mgorny.git"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-SLOT="0"
-IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	>=sys-apps/sed-4.0.5
-	sys-devel/patch"
-RDEPEND="
-	>=app-arch/tar-1.27
-	!build? (
-		>=app-admin/eselect-1.2
-		app-crypt/openpgp-keys-gentoo-release
-		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		>=app-portage/gemato-10[${PYTHON_USEDEP}]
-		app-shells/bash:0[readline]
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
-		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-		>=sys-apps/sed-4.0.5
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!app-portage/repoman
-	!sys-apps/portage"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-	)"
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	if [[ -f ${EROOT%/}/etc/make.conf ]]; then
-		eerror "You seem to be using /etc/make.conf. Please migrate to the new"
-		eerror "/etc/portage/make.conf location before upgrading."
-		if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then
-			eerror
-			eerror "  mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf"
-		else
-			ewarn
-			ewarn "WARNING: You seem to have make.conf in both locations. Please take"
-			ewarn "care not to accientally overwrite one with the other."
-		fi
-		die "${EROOT%/}/etc/make.conf present"
-	fi
-
-	if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then
-		eerror "You seem to be using /etc/portage/package.keywords. Please migrate"
-		eerror "to the new /etc/portage/package.accept_keywords location before"
-		eerror "upgrading."
-		eerror
-		if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords/99old"
-		else
-			if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-				eerror "  cat ${EROOT%/}/etc/portage/package.accept_keywords >> ${EROOT%/}/etc/portage/package.keywords"
-			fi
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords"
-		fi
-		die "${EROOT%/}/etc/portage/package.keywords present"
-	fi
-
-	if has_version sys-apps/portage; then
-		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
-		ewarn "please note that Portage will abort upon having to unmerge itself."
-		ewarn "However, sys-apps/portage-mgorny will already be installed at this"
-		ewarn "point, so you simply have to restart emerge and it will successfully"
-		ewarn "clean the old package afterwards."
-		ewarn
-		ewarn "If you did not use '--dynamic-deps n' in Portage, your VDB dependency"
-		ewarn "graph is probably broken. You may need to use '--changed-deps y'"
-		ewarn "for your first @world upgrade to resolve the conflicts. Afterwards,"
-		ewarn "--changed-deps should no longer be necessary and any conflicts"
-		ewarn "introduced afterwards should be reported to bugs.gentoo.org."
-	fi
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py ||
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i lib/portage/const.py ||
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "${REPLY}")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" ||
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [[ -f make.conf.example.${ARCH}.diff ]]; then
-		patch make.conf.example "make.conf.example.${ARCH}.diff" ||
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_configure_all() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		portage-ext-modules=$(usex native-extensions true false)
-	EOF
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-
-	keepdir /var/log/portage/elog
-}
-
-pkg_preinst() {
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index ade2e8936622..1c01425cda89 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -153,5 +153,5 @@ DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
 EBUILD ripgrep-0.10.0-r1.ebuild 2659 BLAKE2B 475772332840ff5192a16b30d1df0859f01e83d9b5e14d6883c03f11d49d84950b0d8956df9cfcd2ec75709abbda60e7555d37260fbe70194cbc28233a76faba SHA512 8f2a4a0ce6bc329e5ea1eb7a8746b5eb001e9245a9ae593db141a06e00e08dfd47876b88e1069c2ee8e1321fbfac7cfe2a7f12d24d29f05eee022389252bbcd1
-EBUILD ripgrep-11.0.1.ebuild 2594 BLAKE2B 37b84b44c6d8884107808a0a943ccf62dd63fcf66a519af9ba635758948a5254ff1195afec392cddba5777149f9be9fccabdc9c730659d80902bfdc9a643a78d SHA512 e16fac2a6efb185bce4bd61d1e2ace9c861a464747689d8a9c70ed369982b9932bab41f1c3f6dadcf002fd049f1412ee5bc8c47c5298eb12ead906848044f37b
+EBUILD ripgrep-11.0.1.ebuild 2593 BLAKE2B 405a168e0cb93f49863d8aee2a3649daaf34ca2ae6657f267fb2281297cab7ecac11449167fc1266f1b1ecf19655e9279623bd48942f043ed5be6e80f265d6e4 SHA512 5656d71145a10bd398b6d942562c7fa0f0c2673188a0720053ced25b0b839676e43e9aaa5fbd441e15dc77ff48e4bdd381457a4fd2325694a8b6317ecbddf67e
 MISC metadata.xml 837 BLAKE2B c7f5f0c13fdb6d695a24724c84105b873fb2674212896bf2184a9ceef2efe2fe98a17a6f98284eaa0776457ca18729a184eeb22d31214f0f77e30bca99f26352 SHA512 b45056a97c83bd9ddd5d49f94d5f5b1d3c00c53fe14263be8eff908b14a5635f9ff5151344ac7d8b656d9c62937b0d63f3a3a228ad3256da14fc7bae8981a934
diff --git a/sys-apps/ripgrep/ripgrep-11.0.1.ebuild b/sys-apps/ripgrep/ripgrep-11.0.1.ebuild
index 33bb53925e12..7c2dbd8ad9fd 100644
--- a/sys-apps/ripgrep/ripgrep-11.0.1.ebuild
+++ b/sys-apps/ripgrep/ripgrep-11.0.1.ebuild
@@ -96,7 +96,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="|| ( MIT Unlicense )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+man pcre"
 
 DEPEND=""
diff --git a/sys-apps/thunderbolt-software-user-space/Manifest b/sys-apps/thunderbolt-software-user-space/Manifest
index 552d6e26c8d2..dd1cadbea87b 100644
--- a/sys-apps/thunderbolt-software-user-space/Manifest
+++ b/sys-apps/thunderbolt-software-user-space/Manifest
@@ -1,5 +1,5 @@
 DIST thunderbolt-software-user-space-0.9.2.tar.gz 14485 BLAKE2B 8a471888fefbbd7949454b176845b4162b08736d60a86b53f2330e115b776d1ef25b1a706e6fc76661551339525876ddfb621c52301d9327b0c7be0b1abd1f9c SHA512 fbd5902f3f06d3cfec309a972fe5dc32e87eab39668b2c07401bd79ad9af2210f8db41ecdd30cfae34ba24b03dc47df439c2fcd2e74da55d1101237f723b4540
 DIST thunderbolt-software-user-space-0.9.3.tar.gz 22186 BLAKE2B afc614d0d2f7de3c23988e08c0053d24a04be51d22986497e3863b76ad59f1a8a9e2ab323210df27a3fa2f07ab05122666a3c6bfde146250f0854b2dfb6748f8 SHA512 b8bcb31d864376c644f9813abf2d090cc3239271df8a8e71ff7d5e398e993d4d01e94ba5fc1bc13d7dd0fa861b4b918a6df0724ca43f54a5e706ec67f3c7846b
 EBUILD thunderbolt-software-user-space-0.9.2.ebuild 735 BLAKE2B 37f618fe655c62cc0140c7d3e539df741471b28aeba4d97a91dca9e6a26cfdc7f6b5c9f2a1f6055c71d837e07a1861a628923043e5e4aae72c2747e832ae9889 SHA512 74eff6a383a5fcab2415d1a6491d4afa402acb8675cf5f8ee6371296c2aa769a5ecbf030e30398b45c02760a6dcf5ca13dc6d5b7141a5180e67017101f25a334
-EBUILD thunderbolt-software-user-space-0.9.3.ebuild 731 BLAKE2B ac3ef0e87f70127d0059d3d496040aeda027532b48dae9a9b4cdca02797155df92c286033a1eda50655e6a9ca9ff44ccfa32739a9b352b8a71fadff89ae84414 SHA512 2788a68c4508a8661e174489bbc30b8a59fbb62fea98a1a6f3b47751de63972cdcf03994ac1f0b51e33be44a812456ae89b0eef2df2e0a02289291e184f534f9
+EBUILD thunderbolt-software-user-space-0.9.3.ebuild 730 BLAKE2B 065c2025f3a2de5c3e337b4677ba5452b5a1d431c216ad923acc656a8c7f9f0372f6783da4456f2975c3d62193963ff0ed6b5aa916f9f5933b78ca133d050ce8 SHA512 7f454e304a976c2efe4364e579c455aabab22b0ceda17ef12a911b40d57705c3fdc99461c40c939dbe717318fab7ff79695699806c02afd4dc23e7c3c410b746
 MISC metadata.xml 554 BLAKE2B 0ccaeead65893d20860bfb9e81f00aff2959c23e2e1754ab67342b0c4b027ed255d249f1b03146f98677933dae84982e01fce130b276785471b5a730fe2d2998 SHA512 70ddc8c30381a7a2288f1aff50eb932ef418bb72ac0f7b60e15b4846133ddff8b3de77bff9e4bb40a336f5077c1bc1dca9c574eb5fa3a53c0f3f083511b185d2
diff --git a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3.ebuild b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3.ebuild
index 24583d136aad..c557cb821474 100644
--- a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3.ebuild
+++ b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index e22ccee9d681..81a2637623dd 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -2,8 +2,10 @@ DIST ucspi-ssl-0.94.tgz 112640 BLAKE2B c85c75664e7da4486fbc1b7e0ba3c8e2c57b47194
 DIST ucspi-ssl-0.97.tgz 112640 BLAKE2B ead9a3d720e9aee8855039ce3873f30d9766ad78dcd7eece41e52bbf670945248ae0f8e0b9391c3abe390eef9174e0a31880be605af3378422356f170ab86eaa SHA512 2cafa091f700e0b06b6e0ab23ac02b9459003d747c1ee0e8e95cf0922d94f8f32bde5c956307e333b193ce4514cf99078383a3cc7ffee45aadbd303e2eb454c7
 DIST ucspi-ssl-0.98b.tgz 112640 BLAKE2B 3b970525f8c3f9511daadfc2fda3840566e679b885acd3c17b0d1b2a775d837b59e9ccbbf5543614440366bedd8c24ba5f8f1c4d6b94877c7ef92d3859fdf652 SHA512 c9f6749048059f870b5221296ecb01d4b5c57c1d8c8b3574c67926b60569bce983f257afacfc3383b1b9a60d55b470a5a1548d2c19b0a505b953171a83cee12b
 DIST ucspi-ssl-0.99.tgz 112640 BLAKE2B da1974f59d2fece5877f645f5843311eadd509bfb715576a56b59bc79f6f9954eca9bad88bb36b055aa939d533a8b95b4fb3d3ae9ebde1081bcd6a51b60af5b4 SHA512 2fd29d0f6b31b54f2b53206c6ccd0cf35c759834f34aab26d2a883319d33ff2257163150fc85a2e450c7bd81ce7bbed7b59c4013d71a35a9b3446a6338cb406e
+DIST ucspi-ssl-0.99e.tgz 112640 BLAKE2B 6db975f412723da1c6c76ff1040c27001c2d5b2b0c8bb3199f37226c31cf1e48f629aa1f8234319c844f2ccf8001d6d9ffd7700da2ae57b6cb22177cfc1e56f8 SHA512 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa
 EBUILD ucspi-ssl-0.94-r1.ebuild 1235 BLAKE2B 37260b380a2b8b6576b0ff0b8a37fbfb4b46fd0b239c30cdc40b492d23a2aa010854c47b636afeb863ac337da741776e3165472ad3b9b7eefad488e7cd5e04be SHA512 8ee5369d142b93d9f69374b13b3198c379019cff283fba7fe47f01b1f7cc65e8da7e178514921842bae6ed6e807c4f278357294026ba86344d24dbdb39936f7d
 EBUILD ucspi-ssl-0.97.ebuild 1305 BLAKE2B 2999b3b930b64d1c33283ecf354a6eef4e5e3386942e941c85b53f17c127f6eded3f4fa1c74008f5c7c5ebb727c44e42dc20d0597166774b2c02c8b7778534fe SHA512 8bba0c5ab8162cda29bbe4c6b108638189bc4f93756be2c72191e9fa4c802fc0322bafefbd561653cd63cc9cdbc4e3167b5034a64d2409d22a12b2f2c61f4e45
 EBUILD ucspi-ssl-0.98b.ebuild 1275 BLAKE2B e3d7f5202d5db765612bc600c6e837d7e68eecf0d96e2095bb44b4baee32ed72e7e26dbaa2aa0d96337e0a55e25bb75907e29b57be5280d7b791281aff6c39f7 SHA512 918b19b10d219c230f1429da48a8c2ecd5a6f5a9b73d78a3aa999f5b36771017bf7244806e57fd29fd22ed1ad1319ebc55223e106118cb075f44588b4cedd456
 EBUILD ucspi-ssl-0.99.ebuild 1268 BLAKE2B e81513430e2c5f4b38fad648e6aec4db87c3e643629ae620e64a71ad10d532c30d47dc7c7014a815f6f2d3af7e149b6ae2d1b984ff1d28ca5da5d89d0b688245 SHA512 59c6a61739f5dd6f1542246f05e007696be068c79dbc4d3d74fcf5dcbe867cdf1094c3a920e083102e9a3cf31e077036284b941e1937a19c1dc1ac24c3893343
-MISC metadata.xml 647 BLAKE2B b1126954520abbf20741b167d4536506ed0a44c7ee4e0c6e8caa67b5151eeb9042d88c0c05141a2188ef755e919b833765117f98e1a6841d366145bf0dfe9271 SHA512 c4d025d04de18b02d5741b8b3fd7299163198094b4d78dbf78cf82887defef03b6830a3a0ed009075c0e472db220c439a024c014f137d5b3558ddc18fead361b
+EBUILD ucspi-ssl-0.99e.ebuild 1571 BLAKE2B b06f2049a8383d8dd6428ed63c347a12b9217d9349d231a9ceb5ec9470ffcba2fd56cab818cf1f7c4552688a68840f44228f4466af4d0888611b6beaa4b26af7 SHA512 5ac6da5ee5fe9758cbfc0aa8c9c12fa4658f1d6e6ef91f44a6a0d0c94a38b4d2058c206fa0221308d364a30a2e55ca186e5e3ec7023228514d199a95dc035ed9
+MISC metadata.xml 749 BLAKE2B 3b6d6b29627fdd626bffc49b35d559c21436b0e31fb0ea037f872a5f3bcd114902ef91eb2c4be5d78100b16622c8b8cabd745fd82cb41570085b70ae6c4f9c8d SHA512 3e9e1026800839e5ca908831406d77e5aca076edfaa62588c9b966767d690ff6ed1c396ee3cb2457259c26b10e5160a10ac38f70a0be1cad0bf262adfd661366
diff --git a/sys-apps/ucspi-ssl/metadata.xml b/sys-apps/ucspi-ssl/metadata.xml
index 37052d6e36cd..32a4fcc2cbce 100644
--- a/sys-apps/ucspi-ssl/metadata.xml
+++ b/sys-apps/ucspi-ssl/metadata.xml
@@ -17,4 +17,7 @@
 		building SSL client-server applications. They conform to the UNIX
 		Client-Server Program Interface, UCSPI.
 	</longdescription>
+	<use>
+		<flag name="bindist">Disable EC/RC5 algorithms in OpenSSL for patent reasons.</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
new file mode 100644
index 000000000000..7325e21a7b02
--- /dev/null
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fixheadtails qmail
+
+DESCRIPTION="Command-line tools for building SSL client-server applications"
+HOMEPAGE="https://www.fehcom.de/ipnet/ucspi-ssl.html"
+SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bindist perl libressl"
+
+DEPEND="libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	perl? ( dev-lang/perl:= )"
+RDEPEND="${DEPEND}
+	sys-apps/ucspi-tcp"
+
+S="${WORKDIR}"/host/superscript.com/net/${P}
+
+src_prepare() {
+	ht_fix_all
+
+	sed -i -e 's:auto:gcc:' conf-cc || die
+	sed -i -e 's:-m64::' conf-ld || die
+	qmail_set_cc
+
+	echo "/usr/bin" > conf-tcpbin || die
+	echo "/usr/share/ca-certificates/" > conf-cadir || die
+	echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
+	echo "/usr/" > src/home || die
+	sed -i -e 's:HOME/command:/usr/bin:' \
+		src/sslcat.sh src/sslconnect.sh src/https\@.sh || die
+
+	# workaround: SSL_TXT_ECDH is always set in openssl/ssl.h, even with openssl[bindist]
+	sed -i -e 's:SSL_TXT_ECDH:ENABLE_SSL_TXT_ECDH:' src/ucspissl.h src/ssl_params.c conf-ecdh || die
+	if use bindist; then
+		echo > conf-ecdh || die
+	fi
+
+	eapply_user
+}
+
+src_compile() {
+	cd src || die
+	emake sysdeps
+	emake uint32.h
+	emake
+}
+
+src_install() {
+	dodoc -r doc/.
+	doman man/*
+
+	cd src || die
+	dobin $(<../package/commands-base)
+	use perl && dobin $(<../package/commands-sslperl)
+}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 3259448e1b1d..7b37acee0c51 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -3,6 +3,7 @@ AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254
 AUX util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch 1546 BLAKE2B 11a714486f7c6e4ca3d38adbf59231378ac94a5cd934816d93e46c73e8a9ff3f23909d88c39381b15d0beb4da8dd5c97af72166eec5822dc6a49b67a60eacf5f SHA512 5dfa5bb88e9e454a99c8ff5e8f76b9323729962aa9eba682a4a6ccfadc3af6068714ea3bf0e19abf5cc402dcafeb92057eaf4d25d5c292937d0cb94bbc8d99c2
 AUX util-linux-2.33-sparc-setarch.patch 2353 BLAKE2B 16f3c627096644da973152db4b29d09f6e76d5576d1e9513ae29ed76e1112d71327ceef31b915e58652f8ead0b506819a2c5a996bda0c3670035f13d1f9595eb SHA512 d9e2bbe4a5c0d41dc199406a27187107121294b9bd13794b7f48b558c2dfe3f16b0dfa11e7ef70b6072fd6464d2220f35a0ab032bf6b99e11740056751ec7aed
 AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
+AUX util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch 971 BLAKE2B f035bbcc83fd342e202ced33d0e50d11d6d89e34f59826ab4a95231afcc0696ab6e34d504eed599681e44d369fdca8578b46875f264a6f3f70f562abe9748226 SHA512 b6d5fdb7cd49df072fb00410d1ead9990c53c5105ce7dd2e48ed3c88e91f45271c0a62a87a5cd9c703d96004cb7a81a48c5fff504269c4c1b8edb2d9a4471eab
 DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
 DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
@@ -10,6 +11,6 @@ DIST util-linux-2.34-rc1.tar.xz 4930092 BLAKE2B 742322c85c2b92ff16cc95e98da40522
 EBUILD util-linux-2.33-r1.ebuild 8369 BLAKE2B c8991a1f9a36cc09ad888b439b1baba241740707112abda423a85fdaf13db09c10be9a29ff2c018166cb14f64f425b6f8ffd6c2680c3fce1e25369f4ee8d3209 SHA512 13e47582fe9ae0bced2ad9c2c47e8d4b062ad4ed1cc65973debb2b6fa54d5aa232936f91fc88b6183cd53c2ec2754f00d7a79e274e7cc41f2dd6a8949004311c
 EBUILD util-linux-2.33.1.ebuild 8638 BLAKE2B 9ed38cd12026e04327b38f33a2c0f5285cbe148f9e604e03fd2ba179cdc10351b12ef3768bd97da7f7ba5e65972c42b04c1cef50a2f7ab6854953a990eba8b10 SHA512 aca35d647f0d3d3e260acc67e95a2e32a6d5b4898c78a187306a9c2d228e4304503eeaaed8fe92a6b2c6f7e0a6110ae087d3f486d37ad1c429d04f30b49b8832
 EBUILD util-linux-2.33.2.ebuild 8646 BLAKE2B 14ff1524097b52badbf1d9387be0227f965726c0de918759bd97af2d60eb1e7f3b8e5c06b04874eeb6031d31b9b5f776b794cc8cca17cfbb296598a985c668e9 SHA512 fe5dc9c0c5e40aafa89ced9058048d2f1df5c17e7eb19cf178c7b416c4f9a72af520f921ea4952ec9f28d24151bc902b89f1d6e83ee6c2edb6c5a84c2edf4645
-EBUILD util-linux-2.34_rc1.ebuild 8245 BLAKE2B 5d684f8e337a35b70677dc6892dced421bbd845152f7a0cb2b86a0bfe6081db0d04d4f17dc4cb5adb24f5cab885213b71f112d16f8b00ba1d8099ee36301559b SHA512 91e752558f6623f7400b0e2fd18cc144d4fd3919b298ff2a3c5c4c13d81c9491fce50fd7eee7635423ba22a0541d87c2a93947518889c9fd7cd232bb79feaab1
+EBUILD util-linux-2.34_rc1.ebuild 8319 BLAKE2B 4be344e257e15a2505d06071c912e0555923c13333f147b1388d2107ba6950437fae0e13875d79efa6aa14964890d76a6aba180c0748bd00b5da8b437d35f717 SHA512 ea35a87124c3d9a0fe75ba78e974f8fb38639b350a2031e7c1a04fe8043e49c73d77e40084f8e3aebcedf8e093841fc0bcb549438cf67500b1a507b0e6e07766
 EBUILD util-linux-9999.ebuild 8238 BLAKE2B 8fd5c1b2fc9bde4b6e9331da10d8f013d3c29a2f74b69ffb63c8f34ddad81d67f638be661bf258d41c31b973a9b00dd01f06ae6dcf2e0f1e4b259e9c22bf2ea8 SHA512 cc6bf3d785dc23b101ab4f147dea9c0ab258fbebf6c4de44f6e4600c46e986a555f2b54264142d7168bbbbe5ce280fcc995c879dbb3afb8b50940128e89008b4
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/files/util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch b/sys-apps/util-linux/files/util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch
new file mode 100644
index 000000000000..b1314e0e44c7
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch
@@ -0,0 +1,28 @@
+From 836455917879333e94d4a535aa22f1235b5d4885 Mon Sep 17 00:00:00 2001
+From: Sami Kerola <kerolasa@iki.fi>
+Date: Sat, 18 May 2019 10:19:35 +0100
+Subject: [PATCH] lscpu: fix floating point exception
+
+FIXME: this commit should include vmware_fpe regression test inclusion.
+
+Caused-by: e5f721132ec8b8c933a396d8dcb3efcb67854f13
+Addresses: https://github.com/karelzak/util-linux/issues/788
+Reported-by: Lars Wendler <polynomial-c@gentoo.org>
+Signed-off-by: Sami Kerola <kerolasa@iki.fi>
+---
+ sys-utils/lscpu.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
+index ca7f6a037..7f6277f00 100644
+--- a/sys-utils/lscpu.c
++++ b/sys-utils/lscpu.c
+@@ -1925,6 +1925,8 @@ static int get_cache_full_size(struct lscpu_desc *desc,
+ 	/* Correction for CPU threads */
+ 	if (desc->nthreads > desc->ncores)
+ 		nshares /= (desc->nthreads / desc->ncores);
++	if (nshares < 1)
++		nshares = 1;
+ 
+ 	*res = (desc->ncores / nshares) * ca->size;
+ 	return 0;
diff --git a/sys-apps/util-linux/util-linux-2.34_rc1.ebuild b/sys-apps/util-linux/util-linux-2.34_rc1.ebuild
index 1c6fd4ea22a3..b222e422b0fa 100644
--- a/sys-apps/util-linux/util-linux-2.34_rc1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.34_rc1.ebuild
@@ -63,6 +63,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-lscpu_floating_point_exception_fix.patch
+)
+
 src_prepare() {
 	default
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-21 10:20:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-21 10:20:03 +0100
commit	6f8038813c460b4f0572d5ef595cdfa94af3a94d (patch)
tree	3509e94070265053394b7f2e30a779d7e60c2064 /sys-apps
parent	eccb70a7f91b2d22582587f26d1a28bb31408b45 (diff)