From f625b9919a60a30f1bd860f7d1b2eac183ced593 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 8 Aug 2018 20:11:47 +0100
Subject: gentoo resync : 08.08.2018

---
 sys-apps/Manifest.gz                               | Bin 49844 -> 49850 bytes
 sys-apps/dbus/Manifest                             |   4 +-
 sys-apps/dbus/dbus-1.12.10.ebuild                  | 274 +++++++++++++++++
 sys-apps/dbus/dbus-1.12.6.ebuild                   | 274 -----------------
 sys-apps/habitat/Manifest                          |   2 +-
 sys-apps/habitat/habitat-0.54.0.ebuild             |   2 +-
 sys-apps/memtest86+/Manifest                       |   2 +-
 sys-apps/memtest86+/memtest86+-5.01-r4.ebuild      |   2 +-
 sys-apps/openrc/Manifest                           |   4 +-
 sys-apps/openrc/openrc-0.38.1.ebuild               | 326 ---------------------
 sys-apps/openrc/openrc-0.38.2.ebuild               | 326 +++++++++++++++++++++
 sys-apps/portage/Manifest                          |  20 +-
 sys-apps/portage/files/README.RESCUE               |   2 +-
 sys-apps/portage/portage-2.3.13-r1.ebuild          |   6 -
 sys-apps/portage/portage-2.3.19-r1.ebuild          |   6 -
 sys-apps/portage/portage-2.3.24-r1.ebuild          |   6 -
 sys-apps/portage/portage-2.3.40-r1.ebuild          |   6 -
 sys-apps/portage/portage-2.3.43-r1.ebuild          | 297 -------------------
 sys-apps/portage/portage-2.3.44.ebuild             |  21 --
 sys-apps/portage/portage-2.3.45.ebuild             | 264 +++++++++++++++++
 sys-apps/portage/portage-2.3.8.ebuild              |   6 -
 sys-apps/portage/portage-9999.ebuild               |   9 -
 sys-apps/ripgrep/Manifest                          |  28 ++
 sys-apps/ripgrep/ripgrep-0.9.0.ebuild              |  89 ++++++
 sys-apps/smcipmitool/Manifest                      |   8 +-
 sys-apps/smcipmitool/files/fake-java.bash          |  24 ++
 sys-apps/smcipmitool/files/launcher-pre.bash       |   3 +
 .../smcipmitool/smcipmitool-2.19.0.171201.ebuild   |  91 ------
 .../smcipmitool/smcipmitool-2.20.0.180525.ebuild   |  77 +++++
 29 files changed, 1109 insertions(+), 1070 deletions(-)
 create mode 100644 sys-apps/dbus/dbus-1.12.10.ebuild
 delete mode 100644 sys-apps/dbus/dbus-1.12.6.ebuild
 delete mode 100644 sys-apps/openrc/openrc-0.38.1.ebuild
 create mode 100644 sys-apps/openrc/openrc-0.38.2.ebuild
 delete mode 100644 sys-apps/portage/portage-2.3.43-r1.ebuild
 create mode 100644 sys-apps/portage/portage-2.3.45.ebuild
 create mode 100644 sys-apps/ripgrep/ripgrep-0.9.0.ebuild
 create mode 100644 sys-apps/smcipmitool/files/fake-java.bash
 create mode 100644 sys-apps/smcipmitool/files/launcher-pre.bash
 delete mode 100644 sys-apps/smcipmitool/smcipmitool-2.19.0.171201.ebuild
 create mode 100644 sys-apps/smcipmitool/smcipmitool-2.20.0.180525.ebuild

(limited to 'sys-apps')

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a2a47023071f..0d3013fcf0b1 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index b896a4f23694..ed02763c349f 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,10 +3,10 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 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.6.tar.gz 2068612 BLAKE2B 3dbb05e899e511a636816393ebc28548cc2ecaabaa0c04737189a0812791da195708ee455d7b0439fc81eea113f4bd8fc64b1b9b93e9dac84664b9c51049e75c SHA512 a0599329190e90d5982215138a19031028ed825f54c76c1ae13b54c2e4ddf14c949eacaac05c667db11bca13fb4bbdf8855fc9e15641cece55be1efde00c41ab
+DIST dbus-1.12.10.tar.gz 2073510 BLAKE2B 27ecd31e2535666a06cb77ab8df4f4a0990e21d43bc9e18e62f2385b9c05515a2f7ea452d4a376ecb4f764379c05235c908cd6392303300b1ff14d9cfeb25554 SHA512 36a16393af6630c32474b971fb8864ded0fb5fe08c5ff5243a4ca312b95af4f20335c5f166b72526a0b8162c1ccfe6542ad6953c5d21a0542d920d7cb4a9ac76
 DIST dbus-1.12.8.tar.gz 2071751 BLAKE2B 9ba26d48f34b4d328335917bbc40d5f4423a48f90b0436783a8d6d290bc8b99c54aa31d23efaf52ef90748d53e68b7c0e3ddce0f4ce26ea5369acbd57d726b84 SHA512 8177898bf2db22e5c6abff0d9ffec8f248f0d155a83b7ae906c1ce3b61d289e7ba7bef9799102e6de3ca64198c7d293dccecf92c7e8b7403c1d9b1bb86e99ea3
 EBUILD dbus-1.10.18.ebuild 7377 BLAKE2B f52e7c26449cd69956b0c23288b620d17ba1c5f916ff47762045ae793761a8883366fd80c5648b147aa1195d5c7acba1743ae01f0c69d025329ea87cbb1b8ebc SHA512 4e1be287542458b080f67e442a47fad1bc2dd8fab0d28d90c516703a4b4a42f7161b06af7dc990913f3a2fb6edb874c620a7cd745f4186555dcf5e407c2c5a61
 EBUILD dbus-1.10.24.ebuild 7385 BLAKE2B 5061ed488e5da35a5c82c1ac023671916fb5a6e68b9fb7eed26d4b74264d4c2e9e04a56a0b64c39d926a078f7e8ba1fa4d9c90fd37a42169f14b455b6c2632cc SHA512 9a39c78efa3ad1b198c0a2c95b39a761fcb1868226dffcf4fb5eb0f14a4412a62e55c0703e35f0ab7de5e14ee0ed9b70e09c46a12cc3282b7e8d30b86c825f5a
-EBUILD dbus-1.12.6.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
+EBUILD dbus-1.12.10.ebuild 7450 BLAKE2B 7d0512a5a88b2517250b5dacde920c261a66e6151963a64d80d0e81a4f4e0907d32a514432b3f06aebdad3774982c542e237e7994a51a994548bba97f6f56294 SHA512 9a7de44b70956441f983f05f4e1c52f59b808f4ebffce447e23f1600c469811b212e229be78d5544c1fe070968a52960d2a422f67c2228076f9d60eeb758d540
 EBUILD dbus-1.12.8.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.10.ebuild b/sys-apps/dbus/dbus-1.12.10.ebuild
new file mode 100644
index 000000000000..7691f4d1a92c
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.12.10.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit autotools 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 ~arm-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 )
+	test? ( debug )
+"
+
+CDEPEND="
+	>=dev-libs/expat-2.1.0
+	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
+	dev-libs/expat
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		>=dev-libs/glib-2.40: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"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-enable-elogind.patch"
+)
+
+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
+
+	default
+
+	# required 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 virtx emake -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
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+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.12.6.ebuild b/sys-apps/dbus/dbus-1.12.6.ebuild
deleted file mode 100644
index d53c2a80ec6f..000000000000
--- a/sys-apps/dbus/dbus-1.12.6.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit autotools ltprune 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 ~arm-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 )
-	test? ( debug )
-"
-
-CDEPEND="
-	>=dev-libs/expat-2.1.0
-	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
-	dev-libs/expat
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		>=dev-libs/glib-2.40: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"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-enable-elogind.patch"
-)
-
-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
-
-	default
-
-	# required 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 virtx emake -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/habitat/Manifest b/sys-apps/habitat/Manifest
index 4b6431543962..1daa64446ba5 100644
--- a/sys-apps/habitat/Manifest
+++ b/sys-apps/habitat/Manifest
@@ -1,4 +1,4 @@
 DIST habitat-0.54.0.tar.gz 35324897 BLAKE2B 554a2097c019e61cd6f1facdd0195abbca5e94834819283ddc2d742d196b6768e1da03a8a94f462a17d3c5c751fdddc1499f59a698f73fce170387055a07cbc6 SHA512 4b34de34e6d7b20ab641222636720357c903228aeb6833462ecc3367c6844d9f377d101b3187996e3cf3c179aa7b0c71a83921b4d18d1002fe30e3b25e31a35d
 DIST habitat-cargo-0.54.0.tar.xz 247811208 BLAKE2B 28d79018ff9f1209881908b335a1c77f60c39799fbd02e37ffde6bccc37c46aafe1cb05914c9b373150a0a917fa5b1538a94a8a75127172cf9d15cca5ba90520 SHA512 603e45b6e61b24b5420e57ef1d06bf15a67681525ae7a4210f07d14a072cf116947d28cc754e415f1e35fc6e03ede70cd47706ddf4857b76ac17aa420bf95d07
-EBUILD habitat-0.54.0.ebuild 754 BLAKE2B d9bcfd151b0a52503d55d158fcef886c9854c234b98c0d5b95bc068d8b3b64c4153f304a2961a61ac0ccdfe6bfd81c5010a1f161f8148d57c1b7b17a913dd791 SHA512 16cbb9a4ab24c6daae3eedfb2c2666cc93b2cbb19f1ab9c485db38e82cdafda74f74b662a26720d37beae474e7ae8500baedf2e128200cb8face4c4d8c390c85
+EBUILD habitat-0.54.0.ebuild 753 BLAKE2B ca44968fd068ca7b045fa4c5c5bef285f8a0dd483a0e43eaec3762abb255417dc27135ed9445ff1fe8314edc92db7177c57b86cfb0042a2d490c02844ef71fce SHA512 d9ad93a950ba31da1f0b0d05600055e6a67067d8ab235598ac4f72a78d062e9a9691b1e7bee2dd37a51f1f77e9795770ac4ae3f61244fa53cfbb32aaebe96781
 MISC metadata.xml 250 BLAKE2B a106b4f4027e144e7bccf077c9602554d75cae2a511e63b43c6811db362e367697d1f4c0bd3df91222fe25fd437f3b7e8abcc30938887aa27d7d5af6ba8f5830 SHA512 427ed66d63881efc32787274abdb196c339589c15ffeb5cbde100f3ccd92a2caac9476d28acae4d1ab61b8df714fa1d71d294435784a04ffb2879565cc07796d
diff --git a/sys-apps/habitat/habitat-0.54.0.ebuild b/sys-apps/habitat/habitat-0.54.0.ebuild
index 407816389d25..1f7b48451252 100644
--- a/sys-apps/habitat/habitat-0.54.0.ebuild
+++ b/sys-apps/habitat/habitat-0.54.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND="dev-util/cargo
+DEPEND="virtual/cargo
 	>=virtual/rust-1.23
 	>=net-libs/zeromq-3.2
 	virtual/pkgconfig"
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index b9142f25b167..91d67bb6e62c 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -16,5 +16,5 @@ DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce5
 EBUILD memtest86+-4.20-r1.ebuild 1950 BLAKE2B 7748912836525d02d7909675f7c8b362f253fc3567495d243b0a08e3570d382c300de6239c3052af5b60db1761157754555f6f98793a7c285aeadc7b2f274cee SHA512 5bff802747e652f95f2b8bd7c4d73efaf581c5008f1bb6c17aa492335939012b9ef661a2986447a0e6f9493c522ea9cbd93f4ca3e6164f7142543b8a05adf2c4
 EBUILD memtest86+-4.20-r3.ebuild 1756 BLAKE2B 1e9d161b3358030cfc89d3b1c439d9494ac2063af1db9c28432e60200b5825a675ea421f6c7161bc7a9f151efdcfb1483a669aa60a4bcdd97961e00b2f643111 SHA512 3cc41d0ccd74282b5ed2929359829f4377478605b06c868728e9446f3b1df8a5f38166d793f0c800428b17b724118e0eafdfb44791ef577c8bef87d614d422e2
 EBUILD memtest86+-5.01-r2.ebuild 2384 BLAKE2B 6a7205c3fa74bd10c7c290151a49c2e6cb4bb966bf193a34956c763eca1969d2930a9abae09f5558facb37ce74c5ae32ae20824f6e75809b8f2e9fde310d6963 SHA512 a2912927e8d490829a187959711c85438649a912e440af637f1a9d401a574dcaf368203337123f5c9168897e5bdca0658170c2b07861bc4b10b40e53693820f4
-EBUILD memtest86+-5.01-r4.ebuild 2803 BLAKE2B 7a403c8b07e6908975ca3c645d23889f84cb454b6ea1bf07ef5a96ff4532447006887c8c6a6ec2657ca308c6314bde760e6680390ff9fcbd0f18a4528a949ada SHA512 49fdc3ef564b050e5a07b9271f536ace2567cdab70f841bb0574558293aee6ce841421c9d8ff3a257ab51793a7290ca604acbcc0a930eed261c80a2531ad7fa1
+EBUILD memtest86+-5.01-r4.ebuild 2802 BLAKE2B 66af00a5567b1cd2475d3c113f000fe7def2954f25b881d1668e7eff7b2272b0adbf94f83e7a0fa308aa9dbe306857e8dec04697b6664f0446304c6ceb61d405 SHA512 85ed667275321e755453c46d051bb1f58c116d22524a348419390caa5c8b78cc026a48e5cb623db27f496b54b33698b19fb63f1c685cca1352c55f0ec94af339
 MISC metadata.xml 563 BLAKE2B bd4e7ef2022ed705fc3902cd113f20b057b672dd50a9cf9362f56d4ccf1be9bab1fdb45d162cd646deb2acdab6829942da59f6dce0475a2d51c060662a33b9dd SHA512 26d725110c8b6214fce06feae590d1c437b64c9884ee5bc5421b4804b9391d7b928e11a270d84421ffbb5ea7a7b551dd26484565706499bdfbe871aef7ffb61b
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
index e9528e637a87..1e94fe931689 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE="+boot floppy iso serial"
 
 BOOTDIR="/boot/memtest86plus"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 33b05611a11b..77f0e39c5bc1 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -5,11 +5,11 @@ DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582d
 DIST openrc-0.35.5.tar.gz 241784 BLAKE2B 6f63dcf30c430949f25108b0ca808f2317b2e58440419fa5c2aac04ed614c5b22105bfa38d51d54ee0d293be8b11f15b756b00d805ab71f9a2e92f44b98ce6e1 SHA512 655a0a32650ed46998ae84473e8a82aadd9de09904c5173cd9b9e2500fc8935e96539672b513a883c077ae862ece12ab768d4f379dbeb4389a7067ce7121dc0d
 DIST openrc-0.36.tar.gz 240179 BLAKE2B 1361d22782d6063e7fce61a98ef1e1f754d0208ec58de02ae60a0950531d248ac6e65e1ed45b412c89288103f6848b24aa51dd66232aa46e7900b339cac21a57 SHA512 f4730489e595a9ac4477c2b410e034b4eea2b8111c12c2695916aa04102020f8c84cb24220d3aa552709898035aa196e2fd48cba9b12a71dff1f5c2b03c3d424
 DIST openrc-0.37.tar.gz 240928 BLAKE2B b802260a3bd71e6d8e6d54b21007024481d42a4f179eff824a39fb91f5b1cd4f7a2fd52d9e7f23b1077965b57d319a99a5b39b8cd2d7f66dfe272b4497d53a22 SHA512 16235774ad28a66308dd1ea00238b4025a4d26c9c0bb6cdb032f28d00479520c4c5fdb349f82d33a535eee3d491d0349b5871b15cae30ef296ec476883965b83
-DIST openrc-0.38.1.tar.gz 241574 BLAKE2B 74ef47159ddad11bec2cf4151ec71492fbd6c9ac74b01050aab236ede23e2471563365dd68c665a54d47ee534a3f2f55a8d7e607d966e6b2bb5b36b85892553e SHA512 3fc4fef60e25ae34039753c3de6471baba89a7ffcd25f6756cf00954ab63262d07c749441a53198099678e5769c9547179074152872aebc66fe7a220d0302804
+DIST openrc-0.38.2.tar.gz 240924 BLAKE2B a50e567aa3ac1edfd4e7cbdfbf3d7ce6ac39b7d7c2b4a9bcc8cf088735fa436a334eb077ecb10b67f6f5faab979ba62729aca4f3f61e12167cbd48fc8a7f3776 SHA512 5c5f1cfa9990970a02619c5b97c0d424d921fe16e83767372beee9a7b296c6ea33b43ae4045cf7266254b98871a5d347de1040443fe8fc68d7b9d164eed909e6
 EBUILD openrc-0.34.11.ebuild 10072 BLAKE2B 5cc312d0a7ebe0f776f815d5b3cd4bc3b68812552393ae82fe270a09b010f0549ef25ec6926bc17205e06d20a9f51a82406d806f5fd597a7caf397f020f2fa54 SHA512 7e76a682408bc28df1892424aa3843f2cd3a38eeec7d5920cbf5de6229ec5bec1324c85a0fd6fdbdfb29e9b785415c59f80a86c39eeba413d82cc8d6124b8844
 EBUILD openrc-0.35.5.ebuild 9976 BLAKE2B e3c47e0f95115e34d7b9084ba2985b854de17030c11301a8ea1b8f6d89a28a2222665737ed2eb8c5f84a282b9d1587bd98ece6965700ca9d85c89815e7a862e6 SHA512 a78575665626eb2c56870429f84eddfae6ceee4ff26fcdaf525584989a538a40266b3dd741d444301b021b615fd401713fca8a24735a126c0a5ca98932bc57f0
 EBUILD openrc-0.36.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
 EBUILD openrc-0.37.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
-EBUILD openrc-0.38.1.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
+EBUILD openrc-0.38.2.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
 EBUILD openrc-9999.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.38.1.ebuild b/sys-apps/openrc/openrc-0.38.1.ebuild
deleted file mode 100644
index 7babd0045d3b..000000000000
--- a/sys-apps/openrc/openrc-0.38.1.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic pam toolchain-funcs
-
-DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
-HOMEPAGE="https://github.com/openrc/openrc/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
-	unicode kernel_linux kernel_FreeBSD"
-
-COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-	)
-	audit? ( sys-process/audit )
-	kernel_linux? (
-		sys-process/psmisc
-		!<sys-process/procps-3.3.9-r2
-	)
-	selinux? (
-		sys-apps/policycoreutils
-		>=sys-libs/libselinux-2.6
-	)
-	!<sys-apps/baselayout-2.1-r1
-	!<sys-fs/udev-init-scripts-27"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-	!prefix? (
-		kernel_linux? (
-			>=sys-apps/sysvinit-2.86-r6[selinux?]
-			virtual/tmpfiles
-		)
-		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
-	)
-	selinux? (
-		>=sec-policy/selinux-base-policy-2.20170204-r4
-		>=sec-policy/selinux-openrc-2.20170204-r4
-	)
-	!<app-shells/gentoo-bashcomp-20180302
-	!<app-shells/gentoo-zsh-completions-20180228
-"
-
-PDEPEND="netifrc? ( net-misc/netifrc )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		local ver="git-${EGIT_VERSION:0:6}"
-		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
-	fi
-}
-
-src_compile() {
-	unset LIBDIR #266688
-
-	MAKE_ARGS="${MAKE_ARGS}
-		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/lib/rc
-		MKBASHCOMP=yes
-		MKNET=$(usex newnet)
-		MKSELINUX=$(usex selinux)
-		MKAUDIT=$(usex audit)
-		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)
-		MKZSHCOMP=yes"
-
-	local brand="Unknown"
-	if use kernel_linux ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
-		brand="Linux"
-	elif use kernel_FreeBSD ; then
-		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
-		brand="FreeBSD"
-	fi
-	export BRANDING="Gentoo ${brand}"
-	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-	export DEBUG=$(usev debug)
-	export MKTERMCAP=$(usev ncurses)
-
-	tc-export CC AR RANLIB
-	emake ${MAKE_ARGS}
-}
-
-# set_config <file> <option name> <yes value> <no value> test
-# a value of "#" will just comment out the option
-set_config() {
-	local file="${ED}/$1" var=$2 val com
-	eval "${@:5}" && val=$3 || val=$4
-	[[ ${val} == "#" ]] && com="#" && val='\2'
-	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
-}
-
-set_config_yes_no() {
-	set_config "$1" "$2" YES NO "${@:3}"
-}
-
-src_install() {
-	emake ${MAKE_ARGS} DESTDIR="${D}" install
-
-	# move the shared libs back to /usr so ldscript can install
-	# more of a minimal set of files
-	# disabled for now due to #270646
-	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
-	#gen_usr_ldscript -a einfo rc
-	gen_usr_ldscript libeinfo.so
-	gen_usr_ldscript librc.so
-
-	if ! use kernel_linux; then
-		keepdir /lib/rc/init.d
-	fi
-	keepdir /lib/rc/tmp
-
-	# Backup our default runlevels
-	dodir /usr/share/"${PN}"
-	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
-	rm -rf "${ED}"/etc/runlevels
-
-	# Setup unicode defaults for silly unicode users
-	set_config_yes_no /etc/rc.conf unicode use unicode
-
-	# Cater to the norm
-	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
-
-	# On HPPA, do not run consolefont by default (bug #222889)
-	if use hppa; then
-		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
-	fi
-
-	# Support for logfile rotation
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/openrc.logrotate openrc
-
-	# install gentoo pam.d files
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
-
-	# install documentation
-	dodoc ChangeLog *.md
-	if use newnet; then
-		dodoc README.newnet
-	fi
-}
-
-add_boot_init() {
-	local initd=$1
-	local runlevel=${2:-boot}
-	# if the initscript is not going to be installed and is not
-	# currently installed, return
-	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
-		|| return
-	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
-
-	# if runlevels dont exist just yet, then create it but still flag
-	# to pkg_postinst that it needs real setup #277323
-	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
-		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
-		touch "${EROOT}"etc/runlevels/.add_boot_init.created
-	fi
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
-}
-add_boot_init_mit_config() {
-	local config=$1 initd=$2
-	if [[ -e ${EROOT}${config} ]] ; then
-		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
-			add_boot_init ${initd}
-		fi
-	fi
-}
-
-pkg_preinst() {
-	local f LIBDIR=$(get_libdir)
-
-	# avoid default thrashing in conf.d files when possible #295406
-	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
-		(
-		unset hostname HOSTNAME
-		source "${EROOT}"etc/conf.d/hostname
-		: ${hostname:=${HOSTNAME}}
-		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
-		)
-	fi
-
-	# set default interactive shell to sulogin if it exists
-	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
-	# termencoding was added in 0.2.1 and needed in boot
-	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
-
-	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
-	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
-
-	if ! has_version ">=sys-apps/openrc-0.11"; then
-		add_boot_init sysfs sysinit
-	fi
-
-	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
-		migrate_udev_mount_script
-	fi
-
-	# these were added in 0.12.
-	if ! has_version ">=sys-apps/openrc-0.12"; then
-		add_boot_init loopback
-
-		# ensure existing /etc/conf.d/net is not removed
-		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
-		# this needs to stay in openrc ebuilds for a long time. :(
-		# Added in 0.12.
-		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
-			einfo "Modifying conf.d/net to keep it from being removed"
-			cat <<-EOF >>"${EROOT}"etc/conf.d/net
-
-# The network scripts are now part of net-misc/netifrc
-# In order to avoid sys-apps/${P} from removing this file, this comment was
-# added; you can safely remove this comment.  Please see
-# /usr/share/doc/netifrc*/README* for more information.
-EOF
-		fi
-	fi
-	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
-
-	if ! has_version ">=sys-apps/openrc-0.18.3"; then
-		add_boot_init mtab
-		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
-			ewarn "${EROOT}etc/mtab will be replaced with a"
-			ewarn "symbolic link to /proc/self/mounts on the next"
-			ewarn "reboot."
-			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
-			ewarn "if you do not want this to happen."
-		fi
-	fi
-
-	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
-
-}
-
-# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
-migrate_udev_mount_script() {
-	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
-		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
-		add_boot_init udev-mount sysinit
-	fi
-	return 0
-}
-
-pkg_postinst() {
-	local LIBDIR=$(get_libdir)
-
-	# Make our runlevels if they don't exist
-	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
-		einfo "Copying across default runlevels"
-		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
-		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
-	else
-		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/sysinit
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
-				"${EROOT}"etc/runlevels/sysinit
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
-			mkdir -p "${EROOT}"etc/runlevels/shutdown
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
-				"${EROOT}"etc/runlevels/shutdown
-		fi
-		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
-			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
-				"${EROOT}"etc/runlevels
-		fi
-	fi
-
-	if use hppa; then
-		elog "Setting the console font does not work on all HPPA consoles."
-		elog "You can still enable it by running:"
-		elog "# rc-update add consolefont boot"
-	fi
-
-	# Added for 0.35.
-	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	elif ! use kernel_linux; then
-		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
-		fi
-	fi
-
-	# update the dependency tree after touching all files #224171
-	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
-
-	if ! use newnet && ! use netifrc; then
-		ewarn "You have emerged OpenRc without network support. This"
-		ewarn "means you need to SET UP a network manager such as"
-		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
-		ewarn "Or, you have the option of emerging openrc with the newnet"
-		ewarn "use flag and configuring /etc/conf.d/network and"
-		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
-		ewarn
-	fi
-
-	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
-		ewarn "Please add the network service to your boot runlevel"
-		ewarn "as soon as possible. Not doing so could leave you with a system"
-		ewarn "without networking."
-		ewarn
-	fi
-}
diff --git a/sys-apps/openrc/openrc-0.38.2.ebuild b/sys-apps/openrc/openrc-0.38.2.ebuild
new file mode 100644
index 000000000000..7babd0045d3b
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.38.2.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)
+		MKZSHCOMP=yes"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /lib/rc/init.d
+	fi
+	keepdir /lib/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+
+	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
+
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	elif ! use kernel_linux; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 5f2fb2eb44c8..83b164acf8bb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,4 +1,4 @@
-AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c9234c25d1266e4f6eba6ac72f907757c5f98394e1248b436286f8ba1c48456b752ee4ceb8405da SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0
+AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3
 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
@@ -6,15 +6,15 @@ DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9
 DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f82cd46aa1523eb0f70109551009a422546f2fbde1beee7a18dad4ecbfc6465b3b3052a25720196950f7da81adeb66d87940f2b477fbeca27afba56fa18e SHA512 b0482b8dac8af97b841ded426001872c1c708f649dc7774bd3c7003179888fd4d126ece33d001d127b643d88b8a70b9af75bbeb36beeaca7b8ad308f92ff72e7
 DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
-DIST portage-2.3.43.tar.bz2 998958 BLAKE2B 28874db4dc989e550aa4a54a91b8ad303f17b2444d6e23a539672c4742ec62c4228f6070f0d36a31b90d1d32998bc4825de706e5a6635bb7051e5b592f8e3eac SHA512 b8f3ab4f700cc72364b38153451a32a371d0b222feacfb206017be7182596cbc83b7e036025d07399e8b32cf3e3889dbc6ba8d26a64fbfc4253f1506da3c8252
 DIST portage-2.3.44.tar.bz2 1008301 BLAKE2B de370ce9f455e6f778dece3be78703f23852caa9185d79b54e6fc35939923f2a28c91aa372a4ae601872b7933970b536e935ea1f8cb8604bf1547dced3d70c33 SHA512 e491998958439dc27fed6e6f9a3b87867c881cae6ec1fe9515db3277fb2f6f866b6ea6298bae5bf6553591ebe75719a5f379ae92e4aede440ac620ce4af9160d
+DIST portage-2.3.45.tar.bz2 1009687 BLAKE2B 396dc6e09e2415ab034963f2b30fe318bd783c873437f3f82e8af233605b7356130c45a18e2423029ec025669f0490542283308011dd60f4c3ee7a95a6d28c2b SHA512 551d24ac168f1cd8dd3affd6bc30e3a6e8a0622956407db72ffb283cfc0937b81b2cb1007ffe7eb8f9c7f94515fab44e1b82c1f45be0375c9d867369b2533792
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
-EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
-EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
-EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea
-EBUILD portage-2.3.40-r1.ebuild 9948 BLAKE2B 148e93c0bda6febdcabe74eea89aabae4d9be7ad68fa284824b78d1b32bab8404b89904a791ba487c0152270d0578a2dd35a07160483703eeb5ccab330f5a54d SHA512 4c184513337bc67deaf118986b5be94e81bf8dba02ade64a767c796525c51e66754674e4e323c0d89c0002b83cf99b5ad56f290fe764ecf1b19a6af84b79dddf
-EBUILD portage-2.3.43-r1.ebuild 9880 BLAKE2B a38b18fbf692f1bfed43c9f85566eb1262f804ff5ed6e0aa95329aa5faa73f14dd18e95dc456ccbb4253df53e0f8c440a2ff0a3714e5a980db066a6e409144eb SHA512 75f3e6d49b41eaa6cbf7a041590994ef79f41535d20af1fc43edd691b3319a221e594c5f1d14bd8bfba640ed863f8ba5235c0d5a0c4e63fd71cb9f3950d6767e
-EBUILD portage-2.3.44.ebuild 9362 BLAKE2B b6707ff66a01b3dc659e2ce1da922fdb7e5e054a8084ff20292cada826704f20a90d0bd8230a275c61c1023c67d0ee9378ede97ac14ecd572b32c4dd85f1b807 SHA512 7a5e773ac818d97a0f44d0b56b7118b413c79cf7f9affeed5d040a154cd39e5155fcfc8b7c118714b7ef1ac0e3218da672f3e7a0b00606b3b3f6462d968770ab
-EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
-EBUILD portage-9999.ebuild 8839 BLAKE2B 1dea8a4b171b64e0dae5818179acfc089a4c3335fce9182a4200652d15fe5f6ff2d044f54b01f6580896da46515278ddd0a107be6b7d5391bf0bb35f6f12f8cf SHA512 d08279a4a54c83baa26447fbb19a6158217e0e6054cd4e74814461d84be8a6b9eca30bf7e523f2b365cdc51cdc858f58390a28954a9b190b6f8c770d1be940db
+EBUILD portage-2.3.13-r1.ebuild 8239 BLAKE2B a98cf19dd9b963a97e2a0b018ec39a8680977fb5d787ce82514b649f73dce01ecf6723e9b5f973c3156449a911a29f6af235cd116761d55b269077499a6acffe SHA512 bb355bfbb9f0e31230aebfc0e2ab00e6a8b684aa83387343a3402db3591aefc416265f574b0a2e96e7f3ef64bd1578a5c63a7fdd722055cc0bfc19ca825f7316
+EBUILD portage-2.3.19-r1.ebuild 8143 BLAKE2B 624c8ab644fcb4a0a7d62d110f17c2112c7043157da9b53ef2d52384ee68adec7d530cc90d4954293b14ddbe7b9499dfffcb8f55e285b2f766c265dedd13649d SHA512 2e81c73d6a5aea4e333a187fe053a803088f6ca17dcdf5db3f287e0b483ce637779d4e1840a6fc7317ef7108d9d358ece9f4ed13df12ef48d88f4fb1344a5383
+EBUILD portage-2.3.24-r1.ebuild 8997 BLAKE2B 66941bf2ca4330b0fa230833f6460044d8063b177fe537192125a6170f6861a1c6182a1ce25efc2c22d04cf76c7ab2c48e8c332120afb7f191a78be065df93dc SHA512 eafc67c5df88075390151a28e1cd9e89bb2ab85d9e2c3cb5dc02ef3cae93d91aaea219c642dd8a59b3ab8d8e06614524dc116459c311b957bed7f4c2c848362d
+EBUILD portage-2.3.40-r1.ebuild 9676 BLAKE2B 143c477c2089c9cd8ab1df8a377cd6c5c65869027744a9fe82acacabd10d74011694772c46983b54d3f222ed0ae2bfb3449e8b899e6b1f3c1a8a06867d51d27a SHA512 4c5c837f5f546cfcb95afd9b1000d65575a3d3ff03d43161e83c2c5b905adec30808b75d58714db091e069cd08f71735964b3373261254a3c445fb236c250053
+EBUILD portage-2.3.44.ebuild 8678 BLAKE2B edeeb0ee8584d7adc647b1be0e101018d89fada9aceef207188e8bf72112633f1a43d428809c489eda5f94d28eee047e78191860da641fac2f43e4652c55caba SHA512 07a19dcd4e12678c4d82d8c1a2fddaaa9a15c99edd8fb0ec1e82d77693a21d1dd3266593461391de85a3472822556bcd2b47490ac53dc0bd3b7040db27bd3eea
+EBUILD portage-2.3.45.ebuild 8678 BLAKE2B edeeb0ee8584d7adc647b1be0e101018d89fada9aceef207188e8bf72112633f1a43d428809c489eda5f94d28eee047e78191860da641fac2f43e4652c55caba SHA512 07a19dcd4e12678c4d82d8c1a2fddaaa9a15c99edd8fb0ec1e82d77693a21d1dd3266593461391de85a3472822556bcd2b47490ac53dc0bd3b7040db27bd3eea
+EBUILD portage-2.3.8.ebuild 7912 BLAKE2B 1ce75b28134fdd89a42bf12973dc87d609f3dc115f125e66159d8fda21f31f7e7629ff0832db995e11b711addb4ecab1500985700527758eaabbaa020fd75b18 SHA512 3b96e079c2c9be6213a40216a6eb0f7ffba6629263cd9f3bb1ad6d48ac66d45cddbf6df724e54252320e964de87a1c0d5cf0e7a8e22f287c3d3401652b745e3c
+EBUILD portage-9999.ebuild 8542 BLAKE2B 4c38d0c06a40d0aeeaa720d5a8b145166d8105dffaf46a202d9ff01c0187a145eeb4130ae34448e9a55564f4157730e6ef0e86e839d2d2c931d095d269eb86dc SHA512 42d98dad2ac11daf92995991963b3cd50a4f7a5baa51e7debcd735923a410b9dec46ff92dcc0ebeb4b83ffc5df05bec446f18e99a520c96828e5e77643627129
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/files/README.RESCUE b/sys-apps/portage/files/README.RESCUE
index 70c494ebb81b..e8f3932ac214 100644
--- a/sys-apps/portage/files/README.RESCUE
+++ b/sys-apps/portage/files/README.RESCUE
@@ -1,2 +1,2 @@
-Please see http://www.gentoo.org/proj/en/portage/doc/manually-fixing-portage.xml
+Please see https://wiki.gentoo.org/wiki/Project:Portage/Fixing_broken_portage
 for a recovery guide for a broken portage installation.
diff --git a/sys-apps/portage/portage-2.3.13-r1.ebuild b/sys-apps/portage/portage-2.3.13-r1.ebuild
index 82326a4eb631..07ce618e0590 100644
--- a/sys-apps/portage/portage-2.3.13-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.13-r1.ebuild
@@ -253,10 +253,4 @@ pkg_postinst() {
 		ewarn "git repositories.  There have been too many problems and"
 		ewarn "performance issues.  See bugs 552814, 559008"
 	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
 }
diff --git a/sys-apps/portage/portage-2.3.19-r1.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
index 9e3a669db1d0..f35f915422f3 100644
--- a/sys-apps/portage/portage-2.3.19-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.19-r1.ebuild
@@ -251,10 +251,4 @@ pkg_postinst() {
 		ewarn "git repositories.  There have been too many problems and"
 		ewarn "performance issues.  See bugs 552814, 559008"
 	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
 }
diff --git a/sys-apps/portage/portage-2.3.24-r1.ebuild b/sys-apps/portage/portage-2.3.24-r1.ebuild
index a1bbe006ba62..2ce6dbe9b0ec 100644
--- a/sys-apps/portage/portage-2.3.24-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.24-r1.ebuild
@@ -275,10 +275,4 @@ pkg_postinst() {
 		ewarn "git repositories.  There have been too many problems and"
 		ewarn "performance issues.  See bugs 552814, 559008"
 	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
 }
diff --git a/sys-apps/portage/portage-2.3.40-r1.ebuild b/sys-apps/portage/portage-2.3.40-r1.ebuild
index ac3cb5f359ef..718b2c5c9df1 100644
--- a/sys-apps/portage/portage-2.3.40-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.40-r1.ebuild
@@ -284,10 +284,4 @@ pkg_postinst() {
 		ewarn "git repositories.  There have been too many problems and"
 		ewarn "performance issues.  See bugs 552814, 559008"
 	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
 }
diff --git a/sys-apps/portage/portage-2.3.43-r1.ebuild b/sys-apps/portage/portage-2.3.43-r1.ebuild
deleted file mode 100644
index 54096df31b3b..000000000000
--- a/sys-apps/portage/portage-2.3.43-r1.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_4 python3_5 python3_6 python3_7
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-12.1[${PYTHON_USEDEP}]
-			app-crypt/openpgp-keys-gentoo-release
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	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-admin/logrotate-3.8.0
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Apply ae8cc32ccd81 and e46dd735cd4d for python3.7 compat.
-	sed -e 's|\(def call_.*,*args\)):$|\1, **kwargs):|' \
-		-i pym/portage/util/_eventloop/EventLoop.py || die
-
-	# Apply dc1ba7729c42 and de9801740fcb for bug 661906.
-	sed -e 's|^\(					return \)(1, False)|\1False|' \
-		-i pym/portage/sync/modules/git/git.py || die
-
-	# Apply e356d53ceb10 for bug 661834.
-	sed -e 's|subprocess.call(rsynccommand)|portage.process.spawn(rsynccommand, **self.spawn_kwargs)|' \
-		-i pym/portage/sync/modules/rsync/rsync.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i pym/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_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 use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	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 pym/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 use 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_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# 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
-
-	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/sys-apps/portage/portage-2.3.44.ebuild b/sys-apps/portage/portage-2.3.44.ebuild
index 4cf0b294edb7..0da8ed04e4f9 100644
--- a/sys-apps/portage/portage-2.3.44.ebuild
+++ b/sys-apps/portage/portage-2.3.44.ebuild
@@ -261,25 +261,4 @@ pkg_preinst() {
 	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
 		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
 	fi
-
-	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
 }
diff --git a/sys-apps/portage/portage-2.3.45.ebuild b/sys-apps/portage/portage-2.3.45.ebuild
new file mode 100644
index 000000000000..0da8ed04e4f9
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.45.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6 python3_7
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-12.1[${PYTHON_USEDEP}]
+			app-crypt/openpgp-keys-gentoo-release
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	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-admin/logrotate-3.8.0
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	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 use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	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 use 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_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# 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/portage-2.3.8.ebuild b/sys-apps/portage/portage-2.3.8.ebuild
index 58eeac56b574..b6caa53bbad4 100644
--- a/sys-apps/portage/portage-2.3.8.ebuild
+++ b/sys-apps/portage/portage-2.3.8.ebuild
@@ -241,10 +241,4 @@ pkg_postinst() {
 		ewarn "git repositories.  There have been too many problems and"
 		ewarn "performance issues.  See bugs 552814, 559008"
 	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
 }
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 1e2fe5ea47f9..36c253e8dd70 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -260,12 +260,3 @@ pkg_preinst() {
 		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
 	fi
 }
-
-pkg_postinst() {
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman now has it's own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index d3788e18f535..d451b95ac1b1 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,48 +1,76 @@
 DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
+DIST aho-corasick-0.6.6.crate 26330 BLAKE2B dbdfcba15832736cf1ec65c9f93943e7ef368fc71e5545e1481788428ce1ebacaf87b4d045cb22695c1738ac6a0c579b38e886a461bd665b07898ca3a7f9e808 SHA512 6ac654a3e670ca53350ae6a4b21f7cc50335a42ac8557f34712575e9e9871991d29e45a45280f8c32a8a44340a54ac33585e7f1ab9b549462002e0ec24da2caa
 DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST atty-0.2.6.crate 5617 BLAKE2B 52274b58d4ae19cdd57a85a46449be32ac4662da6ce746382eff30c75729dbb5e50a9e9ad59f11b11f6d40b7ec2bc261e290f33127de62636c7f249c174bc4d3 SHA512 ae0aa91616571391eb4a2cc46b4765784dcd96b514fc7c3b64f756d1a180f95c83b9d14086f872fb7466be0e623f44a1a3170e786d7fbff5bdd949ef0cd88997
 DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
+DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
 DIST bytecount-0.3.1.crate 12347 BLAKE2B 31d4d72e7edd37b78232db9b7a0ad2ea2fd18596891e43cff7f00438f5e033d5b3f901e6750fa179dc4d313424afb4dd853d3f5714a0d14c4faaf83958eb961a SHA512 09f2fda4bcddffc94f9e1f60afe478ba988c74276196e003f652229d7979491b1dc29686d3d11e2a9015b628638288b6dac23b27b157ae1025f64b05c35a5e19
 DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa
+DIST cfg-if-0.1.4.crate 7113 BLAKE2B fe63fee332d08ff50384f5e5d90a30281445f339e29a9d0f036ce2202a72f02c7e78ffc166baa681c3b739afbbbe8727ebf5ca16ea0a6fda2f38e08dd8b94996 SHA512 4a7131fdaec1ab63485b016e0b09d538815dee8b64218bc33230910277344e0631bba80e57b1188ca4fd6247595c6c5e3b2381369614574d7ff17cdb5b8546a2
 DIST clap-2.30.0.crate 190562 BLAKE2B f97f4eb85f5a6775a42f112bd26c48561bf8ae41016b638b4f0fe0c18987896a1a3918f41211330f617b44a40c7ae0a2ccdd107e6f3bbdf53bb6c035439f4139 SHA512 2a4af4035dd92adf00e183d15528ed658ce7dec6d9df592565fbcc86e94b1b41ce9f11996da64a655a85909fc89c9b9404ec9b717bbca78c14d96e85916480bb
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST crossbeam-0.3.2.crate 33440 BLAKE2B a5fe9d77b3fcb4ac890b3ccf4e2548cf82c99571961d3960326210ce63dbe8b04e4a5917b57dbb657777288942dec1689387b73e41175b86e013307e057e7257 SHA512 e467a84c3a3655ed1108e2af2ee75dc1fd7bd435dc28fa29e43c055edd26d24d8a5d95edac86fb428e52ba70fcca68ac960952442d0a451568877c371057f0e9
 DIST encoding_rs-0.7.2.crate 1241345 BLAKE2B f3aea266a3cd48027405d537e8bdf45b5b1084ab2d9d30a17dfdc23806607fc4eae4ecbd20d6faf667084d401f58fbe0fb53babc2aadbbfcdb30b81bd91a325e SHA512 92633620eb915ec3a4b1cc3d9d3ac38134827fa5f750eb7415e31e97c99e65e8532393090202a6a5a86979ac64127a7e8531b7c736f1109f47ea303bcb4f81ee
+DIST encoding_rs-0.8.4.crate 1244691 BLAKE2B 616b2434296fe178c33c8368bdc4c08a1fe5631912eede33ae0f93ae754276c055104f7b7cf92e3cb7ca57b0261b616dc5f9b33f09f93eb0a9ddcc108be63117 SHA512 ca696c7c2200dc95218fdd28aea5a0f59a95ee6811b00b4b504d71674dff275a9c2ffee323923d5acd0d498c90e57109a5f52faf8a593def81baa4a67097b9cd
+DIST encoding_rs_io-0.1.1.crate 15200 BLAKE2B 16f3ccb2f6111f3dff5792c8d66100a286d33fde33310d7533d13a3568bdb447043f1085b8071fe99f38b606e25b0d85acd6032da27fd574a6fb7e04d886c404 SHA512 ced3d52333f62779e7af983550ae9a4617357eb26b7b21f1e38433f9383e3b18aa647b51f3e59fe886608959914baea2256805f6c66676668e725f251fe41311
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST globset-0.3.0.crate 21315 BLAKE2B ff971a15dd85f7ab420c60f1ffcd1f2b772ee35e7743b8312fd4b45ee6e2160c783458173dffca540f5f7a4c7feeafaf31932ec775e8a99a6c6aaeebc87e98f1 SHA512 53cce0854058e70c869c4d7803dc040866028bb91ef2a5be59f3d93de18452898ec958b035961d536821fe967ad52c074114dcf23d62e0d0a5317b32d264e8bf
+DIST globset-0.4.1.crate 22363 BLAKE2B 8a2c7fbe083bfdb470866bc954579f50944c11d4460ef3d2115f7e523935ba8375c1073346f42d564d1d55f32e4e8fe51fe42fa2e5c31697bd943befefe7c303 SHA512 3cc7fb4b296ebc8c0a20d8080a9cf913ec61f2ed14bd45c2aebd0c73101514b3895123a93c5e1b5037362a74e18057fd6deefb5c91ff3880aa88ca0e1fb9095c
 DIST grep-0.1.8.crate 236744 BLAKE2B f119476878826f0b410770db4b95fa65fdc89b461f6ecdc43d15013d9fc82d91117b76fba6150c193633667243b3e49f88499cc532a3cac21565bd3e68217abc SHA512 d0a4e9dd51402ed8036aa5d2cfcdb184538d2bf0c81baac75c73e80d05945a63cb08a931d87fa526695af93271cecaed6650a045904ceaa05ed6e06fd23e537b
+DIST grep-0.1.9.crate 237472 BLAKE2B 6b5223b45baeaf5257976b07ce1025c6aacf18886f16ef5739f729291841fafdc7dad324cc953c42ef77d8bdf39802776c759e478c0b61c99954c475bf612323 SHA512 1ce3c1c1faf2d001bdafc6e021ec3523e08cfaec611bbaf70492cf0038578c2e738ead0df826229fbc0f5e54ff3f9f9cf928be9223bb53907f12b6f468545ef3
 DIST ignore-0.4.1.crate 41806 BLAKE2B 0c311a0c552d0a4fedd6a410d6482815469caf6ba318714e247d1056426eea803ad8fd15c5cc364b779b162467d482d7eadf1cd0fdefbe266983ba5326b51022 SHA512 3ea888576957cde216c07e003e3a2401d7bb27edf8cdf045e8f37f51488c0d9aeafca71281991109a0d291741a948f0577c4d24e189f448e474fa79829f6f79a
+DIST ignore-0.4.3.crate 42827 BLAKE2B 0ce4296d6a16b2b3f17e2e79c372325408f2ffcbf617024720b600843e91499f00088a74b377e98deb712f0b9aa38c19cfc44857f47f5ad21b7736a4f342de0d SHA512 a4372de85ee945e68c503e743f28621d88e19facd2ec0af5dd2cfccc45c8ad25abc655c16020427a4357bd0c07f48348ccd2d19dc7d6b9046d13fcb33973a06a
 DIST lazy_static-1.0.0.crate 12611 BLAKE2B c7ffeb553b82cacfeacf214ab069cd0abbc6b83d670ad84704ecd30919c390055b3679ddc85e9a7d0add530df588f6cba4cfd7c5e44e9158b609edef2fe85e4e SHA512 73044fce4d00002d35931d4b28810feb5c28c3debfb7bd570d9a8434cf15c29c17f0daf29ac04d748a32f52a205d5f52ecf69aa395f49d46b825e3fc0cbcd41b
+DIST lazy_static-1.0.2.crate 11431 BLAKE2B b427dcfd4a1acfd2f3a1e353e5550d439a3a81f038365b6065d21ad74def83d3107abbc6759a22087c59c141612e17b93b54c3e5cbc268f9715a4af82ce5eb94 SHA512 43ceb14b418143ae6bf46d5bee378e419a005ecf772c5ced809ca79be292568a3e70cca8a0652e5d06fbd76e1a9057adf44831705b2fc564bd4ef7446b2097fb
 DIST libc-0.2.36.crate 310575 BLAKE2B cd61236a99ce86b18329e0bfc34b738b6133a38e90d4a1a257b2739ec0e91e6ff24243f6b2b7e1c5ad3b4aa1301da42adc81e67769698f11928ee712ec31e70b SHA512 97995c49322f5a3c93df2db08b7372ba3a6da0edc9247cbd3bfb58f9b01315953596154c97c5bca1517b56b8e35e8d03bbf89f9b980aff724977b98bc0d938ed
+DIST libc-0.2.42.crate 336080 BLAKE2B 0de0726bfb00ff42d67abf06efa26c1a4f8132b29be2f957b9089da2ef3e4dfddddea49ea23af3449a367d262dc563b70968c6b2b6a1dc81829e6c6a8a1dac63 SHA512 c99a4358805012d7552f416ae68c9651dfd260599bf0cd618b55036acd08ab8eeda8aa18c18b893f074c9613694ef6562e87f032639eb86b86514aa0fd815870
 DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
+DIST log-0.4.3.crate 21629 BLAKE2B 0656ca6931f7be89fb5c551b33ce2800f0c20f804884ea88ea04eaad27ba595988d6f7cfddcf07973bd2a58d6fa6b2092c3736ae353da0323727336116499555 SHA512 bb92f3ce23ef7361116964d2d0d6d9aca192d99c231385da71b23d0e4d1ed71fefc2ebdccf1f40f047916909df26faeef777aea68edb960298c75799765dfa2f
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
 DIST memmap-0.6.2.crate 15015 BLAKE2B 0bcadeff2c355ca77c7828e71f87b1c05ed6eb27d1a244d4bac8c05463903c7c237b1b5aeabaae421af2046a83aea1c4d184a3622d59358e71e083fe2bdd618c SHA512 67e05abb90f5c771f719492b3ac00fb2059e6eb94106be597dd3204cc9f23d91b90476ec1d36b7fcda1fe3d011df596052ac666c239bbd2e1df16bdafed46b4f
 DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
 DIST rand-0.3.22.crate 11318 BLAKE2B 6a8d7bd3a7044a8c1bf8d9e2701a65770365304338ab6b48ccdffdead493213cd7e442dd5a6dae3b5f372d3004c382cd073c60a924f4b2ce50f9e1d5964a996b SHA512 1b3af2048992341ce5a3bb5d5c9bc2580949dc5e92f7aa14d17bc3eb3cde4ff4ffc9201ff2c4dcc02dbfefd5307f0731775ec46825032dc1b576a2d77cb4cee5
 DIST rand-0.4.2.crate 76170 BLAKE2B 28c9965519db48357f23517b5ac43a641d1f0ffc4396c42933d22181fda3c6df1cfe08dae66a188e60df0708112839781daaa5b5cbf667d6850b10bcc4448f99 SHA512 ac6eaf9f0914fd966c835a04ec644c5a8d62a4a634187d538cecfb711955a977234dc5fe487cd4d351514bc0de4f51cbd0f09a8f6aac56aa0467ae5eb17a4fad
 DIST redox_syscall-0.1.37.crate 13980 BLAKE2B 9896615b819ccee17b18093c28a778bf6b4e0b4f6986f071e9e956a9bbc9724e151fd497d394c669d0feb8dcb95c3258a4103af9aacfe8381fc930cd5a1acd8a SHA512 147e48d44227cfe8ea190d543f9f8ab1e49fe2336c80f7e2b83546e617d0eeb8a1e94ce6e4d6f633b92ca72241cbfe0aec082425bc5f7b63d5efd164b51d5e48
+DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-0.2.6.crate 197800 BLAKE2B d135424d756eee989ad9a9180882c773fa4f399cb7f99b454c1b7ce3f2d66ce8daaa19f989878e5676b70f8d5dc2cac30773654156d8cd4b410bef44bc1276d5 SHA512 69c84096834b794227e4937db7598f35e8c489ef8445d3b5f3c0b2a73fe54be029f6db609b046441fda6374485c16943197f7416ed9545c784d14fb61c9e804d
+DIST regex-1.0.2.crate 245163 BLAKE2B 11db7370515901dd40aab09cf37af555b2a48474b4afbe2bf9bc299b0cc0366c42af4a948cd8fed26d4462c090570edd0c1b0e2e942e148330494d8188c55e82 SHA512 546d38e992c4474d6cec812c1b6f57c7a1991f27cc0d5772d814a21f670128ce11f1ea1750a6ade402fba8b31a8485a61891a9ccbccdc8483054316eca84a047
 DIST regex-syntax-0.4.2.crate 126234 BLAKE2B 874339260fc870fcbb8bb982629cfe1b5789877eb3db13181a73a4295b567a2466b3fc17433b890c0a7986ac3640382bd28c155abfec126b650d2a1c99003b3d SHA512 9b37814ab8bf8ba9d0ad125ea4038f505a0d232084faacbc4fa4126afefb3b8bdee03bfb55ee6f29c518a28f25021a31a8eb35d69999c48c739b1c30c2dba98d
+DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
+DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
 DIST ripgrep-0.8.1.crate 199607 BLAKE2B ba936fb5ad1072d45314abe67f916121e9082cb5fc58779b213ee75db4164576de683c7b616f4558d779dce29944904db510ba3b3ea38432686ef13a3d85af85 SHA512 bd1575d0b2efc9799ad00bf931fee61e5a475db9725c9587f9f157e0dcb6c958defb09ffa4636965806481a09e3d3218b820f601d931bf5a9b8bcde92956d9bb
+DIST ripgrep-0.9.0.crate 205514 BLAKE2B 95de95d5bb4b284c65b585f75013b9033916891eead9e1bc703635148f6ba50020d4b469a04f36f263fc1779cbed28dd147a455cb41b31256dba250763606d2f SHA512 8adab0f95421e853b813d74d6c45cfbcf6fe9485f445fc79e34fe53ac59f81dce727d1551a2a99effdf8b7c479681927c1dbeba86bce55dab8353e8a7e0db60b
 DIST same-file-1.0.2.crate 8870 BLAKE2B 0c723d2f7377e7837babe62ee55807943bb12f013d8608c895701e78f873785b0beb4a2ea84e83e3b44848dcf032b36b573a31be7e4ce9932578fb6ea6a51b7f SHA512 56c923ebd529308c5c1efdeae0314c150ec6fc3d68fe3057ae1a9ec78520f96a78e151985bcea2568775d0d59e4e04e262837d2f3965b175b71569fa703b0951
 DIST simd-0.2.1.crate 35716 BLAKE2B e34e1e937ed92e921603f7aa4b78283a01ee9246c9033c7e16cb95e2585c9145a591ac4f9786f0c51d0b303637203fdf9a0354a0ebc3d658c47edcd055a98546 SHA512 2bf1c2f830d10f60e62def7c5525598e121124e8a4fe1125419c0da3ed97bceec9909550eee171a335ec9c6944958ce5581ae53baad47cccddd234d2b7801535
+DIST simd-0.2.2.crate 37477 BLAKE2B 647b2bc68400f7a1dd126c1954254dca7914d7790a9a47c1685ffb59a42da13de0dc9736556671b844c556f8b6634d24558b30c33500fd518b60c733c13d1a21 SHA512 d4641898dabad23421575024d5240bfa1f6781c57953bc20ab22810ddb9dd015a48a3847ea307a0fe0e66f4099e4f2c7c95608c3813d391489c4745f50fbade1
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST tempdir-0.3.5.crate 10605 BLAKE2B 1c15dca19ae03d6c8c5f189e25b484e3de70327239dbaa48b78d4f9a6231b07249d88e111d0c011ea49d0416438c3b66fa6bda9a6cc09f092b6d07a45ff893a7 SHA512 5ef3cb15064fc51ab2b371f8a48694205ad831fdcd11ff0fd6be85708a8ee955c82c3cbf926360fabc2cac91528a1db90f8425090bb361fa192c8ce9b1e1f0ab
+DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST termcolor-0.3.5.crate 13539 BLAKE2B d5b9edfa562321ed1efd0d26d634c327d0256f09a0d8d1eb5b35b6095561756a4a374f5b43b5384faa8ca321882b8f2598692734b02909884911dff9825bda8c SHA512 3057a20b5aee2a745180c51605469f7b27c0c15b3073b2ce901558cab19893b4cf2afccf95128596a709464c281e08a66b7ae7bf1d28e64da4fb221865733277
+DIST termcolor-1.0.1.crate 14228 BLAKE2B 795c4c9020d3ab31f59e909640e9de5012d2b2c8af122b072b125172086cccb65743bae6a88e248e9fce62c68b497e33ecbc56d51ede7adbf3d9a71f37e21512 SHA512 4498f619e736501cbad0d242cdb7e64592de8109ed8d2dd1fc51ade5493ce21dfa9110e4ca96a603410348d61a8029e8df33d17e29e53cefd94fa662f0cde320
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
 DIST thread_local-0.3.5.crate 11794 BLAKE2B 775c55a2165b942eec4cfaa78653e3ff06a6b951635e95dd176f8bde9c58f789a4e3698cc7fa5eb7a9d173fb6c1eb8da682c65a36aa29beded1facae01817336 SHA512 c17bb6bb58e8ef5f27cd6b0a4290752ec00c9856753c9800664e1debc347a26930970b073ba87d6f95936b1be540f87559a8410151b18d01ecc3fe77c45d6cb6
+DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
 DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST walkdir-2.1.4.crate 22695 BLAKE2B 87d989088a5f4a28c6e7a96c534092ed9574525e711a3d5f7e1abb9a7aa3d347da155f5f0d98cfe6653803b1eabae78dad01594beacd7e5281d6187d7c2db5e4 SHA512 db8a52b2708fc344833a0cf67ef96eea77dd0471337d49c806e7418e18b6c09dafd0034bc3c2ac62dcc360f4292c3634f5a20da3f10a071bb734ec8a121a4387
 DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
+DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb6d380baacf3455fa43ec2d18061fad25b83c2022ffa36e30132358f3abf3bfdc74dd3fba6a5b54cf2eb5d10 SHA512 6d79a5cce1a234b5645fd1798d580602f89a202adb0672a213bd2fe54aec94c75b489d3c47320c6d5f53d415766a7cf628874f0713a347d9e3017e904449bf2f
 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
 DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
+DIST wincolor-1.0.0.crate 4777 BLAKE2B 843d2b3f9d56b332504de707879a490169a790ccb515311d32114c43122f0b13dc8c360f9610361f810b2e23424da35b2918fd30480b7daeeb2a9b2689b5ecbb SHA512 c5a6c6c01fd4cadbd0967d95f69e28b5f6aeac38a7e5297f843be4ebdbed2253db3d5d38f58a91eb2cc7055bad5884a199350a52ae17b06ef11232167f610b04
 EBUILD ripgrep-0.8.1-r2.ebuild 1532 BLAKE2B 1b5dec09d8a0ad05d570534daa72dfd4cff896a20e79b6c26daf151c79234042eaa02a44afa1652c16881b2787e0612d46649fbccbf52fa8008feafd7196ef60 SHA512 d4d4be24db631878e260c1d43b4b2d73bad4a8002cdf2fc404457f587b52b975e836ded7d17a9e9b9343b8dc54941dc06debf717d4532453a67ca8d5b9f525bb
+EBUILD ripgrep-0.9.0.ebuild 1621 BLAKE2B bb7082046a7c58bdc8925cda09b742a0edb6eef23b8f8bea7967d21a275c0090a69b7d90388955cb4182c12d1b2c439197c535b01a23084e0ca65d18aff0bc10 SHA512 c0746daf908533a60254bb6d59308ece831073e7fbe1f4464ae022a7370244e1bab9fb33aa739e089a18c66656dc6b78eb5bb7be49ee7c39091d2cdcd3d50e27
 MISC metadata.xml 339 BLAKE2B 814975935c3042512ae2d83d3964bc94bef9b6b19181adc8c07f538e095983d503af6f6683c61109f4c3515175f02879f07d352845966c04bc774ee47d65db97 SHA512 4501066b64cc47d58915b452027ea603d319b0eae3d9bcd45642f16bcca3e5bbba3fc998fe8501ce63c4717ccf5f404392b98b54d53b93c648e8c8de116141ef
diff --git a/sys-apps/ripgrep/ripgrep-0.9.0.ebuild b/sys-apps/ripgrep/ripgrep-0.9.0.ebuild
new file mode 100644
index 000000000000..0ff2472b266e
--- /dev/null
+++ b/sys-apps/ripgrep/ripgrep-0.9.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.6.6
+ansi_term-0.11.0
+atty-0.2.11
+bitflags-1.0.3
+bytecount-0.3.1
+cfg-if-0.1.4
+clap-2.32.0
+crossbeam-0.3.2
+encoding_rs-0.8.4
+encoding_rs_io-0.1.1
+fnv-1.0.6
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+glob-0.2.11
+globset-0.4.1
+grep-0.1.9
+ignore-0.4.3
+lazy_static-1.0.2
+libc-0.2.42
+log-0.4.3
+memchr-2.0.1
+memmap-0.6.2
+num_cpus-1.8.0
+rand-0.4.2
+redox_syscall-0.1.40
+redox_termios-0.1.1
+regex-1.0.2
+regex-syntax-0.6.2
+remove_dir_all-0.5.1
+ripgrep-0.9.0
+same-file-1.0.2
+simd-0.2.2
+strsim-0.7.0
+tempdir-0.3.7
+termcolor-1.0.1
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.5
+ucd-util-0.1.1
+unicode-width-0.1.5
+unreachable-1.0.0
+utf8-ranges-1.0.0
+void-1.0.2
+walkdir-2.1.4
+winapi-0.3.5
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.0
+"
+
+inherit cargo bash-completion-r1
+
+DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
+HOMEPAGE="https://github.com/BurntSushi/ripgrep"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Unlicense )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=virtual/rust-1.20
+	doc? ( app-text/asciidoc )"
+
+src_test() {
+	cargo test || die "tests failed"
+}
+
+src_install() {
+	cargo_src_install
+
+	# hacks to find/install generated files
+	BUILD_DIR=$(dirname $(find target/release -name rg.bash))
+	if use doc ; then
+	    doman "${BUILD_DIR}"/rg.1
+	fi
+	newbashcomp "${BUILD_DIR}"/rg.bash rg
+
+	dodoc CHANGELOG.md README.md
+
+	insinto /usr/share/zsh/site-functions
+	doins complete/_rg
+}
diff --git a/sys-apps/smcipmitool/Manifest b/sys-apps/smcipmitool/Manifest
index a0e7f5ff50e4..da84058bef0f 100644
--- a/sys-apps/smcipmitool/Manifest
+++ b/sys-apps/smcipmitool/Manifest
@@ -1,4 +1,6 @@
-DIST SMCIPMITool_2.19.0_build.171201_bundleJRE_Linux.tar.gz 77155490 BLAKE2B 5e69eb07f80aeb385ba7444a7eb8d14c24006fb8dd58c00976e5dfb1fca86a33b2079c33c6186baefcef2566ceefcaa45e738e9f1cbc0265551eaa89d145d8eb SHA512 c249a9ddfb1ee91eb74fa001e842b09f00ff10048f2b74650b3441794923261f077f3892bf719cb19f769acbf307d404006614f139a844e17135ff2220e5a1d4
-DIST SMCIPMITool_2.19.0_build.171201_bundleJRE_Linux_x64.tar.gz 75724816 BLAKE2B e473a3a2a419fab0c5a450ec23614b65379e5dca1e60ff46d38aa985ff461dc1dcb72565d210ce4cb9e35f8f3c3904f1e8e9fcabbb118e20e341dc0602260270 SHA512 d66688560653f122f086a1e8354065e76849435a3f704cc9e07f3ed8bf892b039547c3f24127d4813fe34ff29db8cfb4ee14a34846ce31c1774bd8b7cdc9bda3
-EBUILD smcipmitool-2.19.0.171201.ebuild 2476 BLAKE2B 7d8d11af4957d4750fef7a9ffba850b313c6264b2b5f2013375f0bd21b2042df3ac67b81bf9779f9c1d02c168956af6599de4f8f5b45124ad2204bb0770b0875 SHA512 65c95f5eca4474431a7b87ba593c15f61177acaf1cab3e003a24d795f19a287f78cf2bc79d2140e548312d83b44868c04203d870c1674ffa8a91017ab0675ee4
+AUX fake-java.bash 301 BLAKE2B e164317201544295dfaa10724c0319a4dc980d25256706172cb8547706725c05244c827489929faf19c0375630db0597427b1e42c758521a4b4d352d1e742d33 SHA512 bb5b4a57a0492df04f9428bbeedb6917fe5cf7273f0c73a300adb13e4d8b6e5cd907729cabfad548bafaa71a98e4ee1d996914fa4dafe0cd6e5a5310b1625e6d
+AUX launcher-pre.bash 149 BLAKE2B 7af8c0fb3d29784008e0c94aefad7d4f586e42f49a3dc9542c82755e1bf9af91cca452f8050b1c8c96f7bac887cb7da1c782efeae9d9eba24350a3a09c958025 SHA512 1d3ae073b2268ef070b4480a7d117091c6bbdc029a33e9f97c8cb5f008aa4b2d951371c17023ee91199b7daee4cd1fcd42f72cd8c3abb50c9932d29e65bb01a7
+DIST SMCIPMITool_2.20.0_build.180525_bundleJRE_Linux.tar.gz 78319288 BLAKE2B 9084894dd52aebce26853c611ca445d20d8d5363771013830ca2a27c4dfdbdfd00a660019755d579eb9bb6a845e196e59ef03c824cd7da5af9c9081406049c2f SHA512 b2c9fdc22c5963e8ab45ded776e823466fc5bd9fb3b1c04d44603f719409c38cc7f3f78fdd82c1230bf015f271607131ba0e00b73ef182ce18426490b9c58e9e
+DIST SMCIPMITool_2.20.0_build.180525_bundleJRE_Linux_x64.tar.gz 76888805 BLAKE2B 73ec6205ce5ed261706ecc2cd0947cdb6f27c930bdd3809581eb06062d2608d76c6696b906a44cd48b065eed1b2f5a83108b7a616cd956c77238c9af0ff1fa46 SHA512 4adab5f7d45eb8a2c88c37c519743af5244509f75800b3dcd6b002d6385309709e8efa15c0dca18f827d054ad7861168d17fcc93d4e1f5427769a0071f5772bc
+EBUILD smcipmitool-2.20.0.180525.ebuild 2188 BLAKE2B 4694471854e6bed78f303b6416f1d433fb4a527687290d7a12285a74a2a8145fd31d5f17a8566da86f2a7649d4d183b3759710ac9a8f4a81bf4401aa2f5189b3 SHA512 2c1722f3b040d2d5bb9ba0c4922d66875eb07a2c442ca3cb5a772943a27b28bfad3d530a924d2a39169f31232d5c0850e540182d6a692c2c3616191c38a697f9
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/sys-apps/smcipmitool/files/fake-java.bash b/sys-apps/smcipmitool/files/fake-java.bash
new file mode 100644
index 000000000000..ed89f4fc6532
--- /dev/null
+++ b/sys-apps/smcipmitool/files/fake-java.bash
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+for ARG in "${@}"; do
+	case ${ARG} in
+		-jar)
+			EXE=${2}
+			shift 2
+			break
+			;;
+		*)
+			shift
+			;;
+	esac
+done
+
+if [[ ${EXE} != *.jar ]]; then
+	echo "error: could not find jar argument in java invocation" >&2
+	exit 1
+fi
+
+EXE=smcipmitool-${EXE%.jar}
+EXE=${EXE,,}
+
+exec "${EXE}" "${@}"
diff --git a/sys-apps/smcipmitool/files/launcher-pre.bash b/sys-apps/smcipmitool/files/launcher-pre.bash
new file mode 100644
index 000000000000..e24bf72544f1
--- /dev/null
+++ b/sys-apps/smcipmitool/files/launcher-pre.bash
@@ -0,0 +1,3 @@
+gjl_pwd=${XDG_CONFIG_HOME:-${HOME}/.config}/smcipmitool
+mkdir -p "${gjl_pwd}" || exit $?
+ln -snf /usr/share/smcipmitool/jre "${gjl_pwd}"/ || exit $?
diff --git a/sys-apps/smcipmitool/smcipmitool-2.19.0.171201.ebuild b/sys-apps/smcipmitool/smcipmitool-2.19.0.171201.ebuild
deleted file mode 100644
index 5f5cb4965929..000000000000
--- a/sys-apps/smcipmitool/smcipmitool-2.19.0.171201.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="SMCIPMITool"
-MY_PN_SRC_URI="SMCIPMItool"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI"
-HOMEPAGE="https://www.supermicro.com/"
-SRC_URI="amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
-	x86? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )"
-
-LICENSE="supermicro"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="net-misc/stunnel
-	sys-libs/ncurses:5
-	virtual/jre"
-
-RESTRICT="bindist fetch mirror strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/smcipmitool/libiKVM*.so
-	opt/smcipmitool/libjcurses*.so
-	opt/smcipmitool/libSharedLibrary*.so"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_install() {
-	# Choose ARCH
-	if use amd64; then
-		local my_arch="${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64"
-	else
-		local my_arch="${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux"
-	fi
-
-	# Install binary
-	exeinto /opt/smcipmitool
-	doexe ${my_arch}/SMCIPMITool
-
-	# Install libs
-	exeinto /opt/smcipmitool
-	if use amd64; then
-		doexe ${my_arch}/*64.so
-	else
-		doexe ${my_arch}/libjcurses.so ${my_arch}/*32.so
-	fi
-
-	# Install java libs
-	exeinto /opt/smcipmitool
-	if use amd64; then
-		doexe ${my_arch}/*64.jnilib
-	fi
-
-	# Install files
-	insinto /opt/smcipmitool
-	doins ${my_arch}/*.jar ${my_arch}/*.lax ${my_arch}/*.properties
-
-	# Use system java
-	dosym ../..${JAVA_VM_SYSTEM}/jre /opt/smcipmitool/jre
-
-	# Install certificates
-	insinto /opt/smcipmitool/BMCSecurity
-	doins ${my_arch}/BMCSecurity/*.crt ${my_arch}/BMCSecurity/*.key ${my_arch}/BMCSecurity/*.pem ${my_arch}/BMCSecurity/*.txt
-
-	# Install Stunnel config
-	insinto /opt/smcipmitool/BMCSecurity/linux
-	doins ${my_arch}/BMCSecurity/linux/stunnel.conf
-
-	# Use system stunnel
-	dosym ../../../../usr/bin/stunnel /opt/smcipmitool/BMCSecurity/linux/stunnel$(usex amd64 64 32)
-
-	# Install symlink
-	dodir /opt/bin
-	dosym ../smcipmitool/SMCIPMITool /opt/bin/smcipmitool
-
-	# Install docs
-	local DOCS=( "${my_arch}/jcurses.README" "${my_arch}/ReleaseNotes.txt" "${my_arch}/SMCIPMITool_User_Guide.pdf" )
-	einstalldocs
-}
diff --git a/sys-apps/smcipmitool/smcipmitool-2.20.0.180525.ebuild b/sys-apps/smcipmitool/smcipmitool-2.20.0.180525.ebuild
new file mode 100644
index 000000000000..67d6d6f7c2bd
--- /dev/null
+++ b/sys-apps/smcipmitool/smcipmitool-2.20.0.180525.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver java-pkg-2 prefix
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="SMCIPMITool"
+MY_PN_SRC_URI="SMCIPMItool"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI"
+HOMEPAGE="https://www.supermicro.com/"
+SRC_URI="amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
+	x86? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )"
+
+LICENSE="supermicro"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="net-misc/stunnel
+	sys-libs/ncurses:5
+	virtual/jre:1.8"
+
+RESTRICT="bindist fetch mirror strip"
+
+DIR="/usr/share/${PN}"
+QA_PREBUILT="usr/lib*"
+
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_unpack() {
+	unpack ${A}
+	mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux$(usex amd64 _x64 "") ${P} || die
+}
+
+src_prepare() {
+	default
+
+	# Don't use their scary launchers
+	rm -v lax.jar || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+	java-pkg_doso libjcurses.so $(usex amd64 '*64.so' '*32.so')
+
+	local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
+	java-pkg_dolauncher smcipmitool-ikvm --jar iKVM.jar -pre "${pre}"
+	java-pkg_dolauncher smcipmitool-jviewersmc --jar JViewerSMC.jar -pre "${pre}"
+	java-pkg_dolauncher smcipmitool-jviewerx9 --jar JViewerX9.jar -pre "${pre}"
+	java-pkg_dolauncher smcipmitool --jar SMCIPMITool.jar -pre "${pre}"
+
+	exeinto ${DIR}/jre/bin
+	newexe $(prefixify_ro "${FILESDIR}"/fake-java.bash) java
+
+	insinto ${DIR}/lib/BMCSecurity
+	doins BMCSecurity/*.{crt,key,pem,txt}
+
+	insinto ${DIR}/lib/BMCSecurity/linux
+	doins BMCSecurity/linux/stunnel.conf
+
+	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel32
+	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel64
+
+	local DOCS=( "jcurses.README" "ReleaseNotes.txt" "SMCIPMITool_User_Guide.pdf" )
+	einstalldocs
+}
-- 
cgit v1.2.3