gentoo resync : 05.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-05 21:17:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-05 21:17:31 +0100
commit: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
tree: c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /sys-apps
parent: 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)
101 files changed, 3016 insertions, 351 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 577413561c20..7aa00d0b5ccd 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 5c19faa2eb95..1f35e4ddf59e 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -2,7 +2,9 @@ AUX ack-2.14-gentoo.patch 431 BLAKE2B 61a7313811afc88f3289609998902d03de0b11b0b0
 DIST ack-2.18.tar.gz 232279 BLAKE2B dc7c347eee2be367a2b1bd4839719661f1c0de68bd3fcb3512c68cb5c42e09e8208712e7e3c57b418a00c961a933574a0c09c7f107fe43a4f96efeae21fbc8d8 SHA512 4147161baa8d82fb84b29980d5eac7cf3197733192ca827d3fa4e8f55fa9df29d92b2ac21beb69df00186eea03c7ae6fcb85d6e4334a0a21c232ddeb4933bcf5
 DIST ack-2.22.tar.gz 250275 BLAKE2B 52cafe63b6f4aa50feb3a8d68141662fbbec7a73d31b2f06d3d63c7efb9ba681214ac20fbfd299f680d4e3758eaed8b4b9b3cd697f38977f2e0657a90dc0478a SHA512 d0073c424d861f2cfdc2ce8c0dfa149620803b4c30adb6c6f4f8896277ac89bb6d97d3e8e9bdfd1202f95808bd387b2e3a8353a3e7d204cdd61eb9cafde48303
 DIST ack-2.24.tar.gz 261289 BLAKE2B 0ec1e280abbcd2319bcc9f0cd83c73f97decd6698928fd1b8be310fe9a81839e02390bf4baabef402cb8603eceb5c005c4c8a1f71a60273cef21e3366efff11c SHA512 3778c1d70ae08852eff9d8dd75688713bbb8dd15d4e72c07a3829cf362c7bfeba1175275e66cfe99265ba28777b6833734ebd6debb4ec4ec79df06ac46a79c24
+DIST ack-2.28.tar.gz 263072 BLAKE2B 5bb5c41165dff9140959d7680a79def77b8d95106ee3b70b842579f082c8bf4ca978d05d1128722bd22456be94703ea1e44de1a87071317c46a4fb80d0cab6cb SHA512 04ad599b644ff2cb07abe687f99286f14ddd0628458ac88dea0124d8487792824af470a60718c21be5930083830b463385e13927cc4a680ff34be133256c0f8a
 EBUILD ack-2.18-r1.ebuild 775 BLAKE2B a78becebdf93c723a77f4eb6276acd28028bcad12e11e74cf64bc42cf400fc2e4e13fde770e070d6de6997d974b982b7fda637232c6d89ede8d0e8655d09aaa6 SHA512 99f7ac2732df2a71c1ee9618ca4efe3f26985d7ff0718d9ed36c7ca2eda4f18a2f234c378e96f12f8b1bb0d2a06c9eadd6d9d0c1e7fae6d5f9a74da06a74529c
 EBUILD ack-2.22.ebuild 777 BLAKE2B 4ced1be4675aa47ef38e1a04282245d9afd68355301e1556828f9b9dd0da58438966cb605d4c2e3a98c83d985ad908ab6cc8cd4e5ef0daf7fc3a9fce73fcd3f9 SHA512 5f464ad156766616670e3d7ed927c0845ca46640b06efccd7279219b221f0885acfd1c562024466214a6bb6a5dc315609961dac794eac4fc962fee18cfeeeda5
 EBUILD ack-2.24.ebuild 774 BLAKE2B 7211436088eb1b529fc33f77a4c93674b1121e1f8b77740afa0d5a940157f2be862985d255de9eb2fad75059133fdf442e7a6a18230ab90141b63aa69a675880 SHA512 1103c9d90347a9c17e4aa24123748f2167b0aa2a392870cea5ff82627c84d673013650b2abb0cd0ae9d7014c7aa7bd5914e89576986d9458c688f12aec4d74b1
+EBUILD ack-2.28.ebuild 774 BLAKE2B 4c3eed595671a3b8e9293cbbf64ddbaff4e4cf2fb9ebb8dcc75568a5efb89b541e5a8e5229751ac01db67df14d2b70cf46ade7787a008d14723efb77b1aaaa79 SHA512 996ee903ecf0b54879b05c64b5a5d0bf37c93db78a1ba2c01234a46456ba31b3f4fc72ea7a27547f73040e95f836181c903742b0430ec1e0dc9c8a07d57a5c9e
 MISC metadata.xml 1725 BLAKE2B 7787caf338ec9ba64acce9d2fcb542279db07d0c19001073e65a3904ac313b62d0f1fcf5df1445a86f4aeacb8563b7f179d077fda31514db4454c50a81599341 SHA512 9ceab2bd4b599aa83b1b780b322b753a5bdfb51b4883aa804907f5d5d8420276c75a04ae717f8520778cb3fc25ba4c4a710a64ddd49193f050992436c0faeb8f
diff --git a/sys-apps/ack/ack-2.28.ebuild b/sys-apps/ack/ack-2.28.ebuild
new file mode 100644
index 000000000000..dbff5491f6a4
--- /dev/null
+++ b/sys-apps/ack/ack-2.28.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_AUTHOR=PETDANCE
+inherit perl-module
+
+DESCRIPTION="ack is a tool like grep, optimized for programmers"
+HOMEPAGE="https://beyondgrep.com"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=dev-perl/File-Next-1.160.0"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/IO-Tty )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.14-gentoo.patch )
+
+src_test() {
+	# Tests fail when run in parallel and if dev-perl/IO-Tty is installed
+	# which enables interactive tests that need to read from stdin. If IO-Tty
+	# is not installed the related tests are skipped.
+	MAKEOPTS+=" -j1" perl-module_src_test
+}
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 5e888fd7327f..a20eec23052e 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,5 +1,6 @@
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
 DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe SHA512 2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f
 EBUILD apparmor-utils-2.13.1.ebuild 2007 BLAKE2B 3656ea0681e8664dc5829db0b221ca9479890663e8aabf45eecef60d0668023e5587505b5a7ed0383a16939d2bb8793014b6e85704118ac4de7702c23ea94a5e SHA512 af53cfeb38a9288b81254b49449c57ac132888fb9037d1496f8fd87155bce9390b980212818b4a0ee3d19323307f007126da97a3bba6466e4e27629ccfe6adca
-EBUILD apparmor-utils-2.13.2.ebuild 2007 BLAKE2B 3c84e2da39925225d1644a6c97a5eeb3330d7987235ff3c859184c59d929fa06ce5723bd1af9d7e0804fc0628889fe26c7d879bff6969a4295e3e9c0e7ffcf22 SHA512 29b835676313cf53405a1ba854d091af7c3464b209f962420d7a033f9e67feb2c2f66bbb011b85b98c947a416556fbbceee6c4effa230e393c3331f3d7e6f6fd
+EBUILD apparmor-utils-2.13.2-r1.ebuild 2183 BLAKE2B 0a54046c5abef22f20dd728b440d193a91c336d56cfcf7139025e6cf75e320bdd87edcb300cefcf0fd68fa594d8abcbac40a86397c2a7b4d3613e809b4277c2a SHA512 31cfd15ed8b1fb2ca8a27288451a918869a19f4e3ce598f972b5bb514db79216927d7c5fe1466caa10abf10080299cb0068e1f092684e8eaa4f315ca3ef16b30
+EBUILD apparmor-utils-2.13.2.ebuild 2067 BLAKE2B 9a99ac56d7e18d1f2ebd204a5d4b621228e047f0a69606aaed8c91cb39bfdcbd6bab63252e009c36c1e3a51158d3a546cebb3fbfc6cd725b2eeff4aff928bd55 SHA512 cdc94e238bc888af7c2da2f9a0357137ffb892dec2d0f33af18bb86e897bf84f0a7f3176b3f48bd668be00eb54761e605a9b1740fd7710ad2701701961bab94a
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild
new file mode 100644
index 000000000000..96e9c45f4802
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit eapi7-ver perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-lang/perl
+	~sys-libs/libapparmor-${PV}
+	${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	~sys-libs/libapparmor-${PV}[perl,python]
+	~sys-apps/apparmor-${PV}
+	dev-perl/Locale-gettext
+	dev-perl/RPC-XML
+	dev-perl/TermReadKey
+	virtual/perl-Data-Dumper
+	virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+	default
+
+	sed -i binutils/Makefile \
+		-e 's/Bstatic/Bdynamic/g' || die
+
+	sed -i utils/aa-remove-unknown \
+		-e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+	python_setup
+
+	pushd utils > /dev/null || die
+	# launches non-make subprocesses causing "make jobserver unavailable"
+	# error messages to appear in generated code
+	emake -j1
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	export EXTRA_CFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" USE_SYSTEM=1
+	popd > /dev/null || die
+}
+
+src_install() {
+	pushd utils > /dev/null || die
+	perl_set_version
+	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+	install_python() {
+		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
+			--root="${D}" --version="${PV}"
+	}
+
+	python_foreach_impl install_python
+	python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \
+		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	emake install DESTDIR="${D}" USE_SYSTEM=1
+	popd > /dev/null || die
+}
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
index b55e5853dc54..48e17afd736f 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
@@ -20,11 +20,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"
 
-DEPEND="
+COMMON_DEPEND="
 	dev-lang/perl
 	~sys-libs/libapparmor-${PV}
 	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
 	~sys-libs/libapparmor-${PV}[perl,python]
 	~sys-apps/apparmor-${PV}
 	dev-perl/Locale-gettext
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index d97bdcbc6bd6..b0a8559e3d88 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -8,5 +8,5 @@ AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f3
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
 DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe SHA512 2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f
 EBUILD apparmor-2.13.1-r1.ebuild 1486 BLAKE2B 0e20d08d76f1b799e4066a26f9aec5371293210ce052b43798daa8bddb0bd1c8a7339a8a75a8eebfb05cdaf3318d33dbe1d11db90356779f2cb5c9831c060c19 SHA512 90642a5a2a97d6ab64ccc3bb071c8d62c9c47996b8ef22582d54c11702f8bc996d440099a17b658385c9ad4c318b9ed120cbec469ea34fb392fa9f748b7d20e6
-EBUILD apparmor-2.13.2.ebuild 1453 BLAKE2B 9ae096c543767904219c8dc711ff2f45529110a768cf183be9377541f771607697360ba6419f1a038d32eb59a4f5976920667417b4f353f1dddcc07a68b60137 SHA512 06334840cc421a454fbfbfc8fae04f33f7a324648ff16cebab72c1657b9545014a3f602ccb382db066a292e33e124d38360f15b304c0b538bd19c69fc16d6cc4
+EBUILD apparmor-2.13.2.ebuild 1502 BLAKE2B 10ad8cb49e3f216b9b97b3bdda55d308a9bb02691f541ac04bf05622a1978fdd98279da6c17b58a521f54242c460611d3e38537cf3b24909208b78057600656f SHA512 c17454f6d83c328591a65205fa1a69a0b55fcd537174e676f09ae05222b5cdf0e657214c759ccd4bb538749e65c21c1bcb77187c91f0762d845c98a6756ff67a
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor/apparmor-2.13.2.ebuild b/sys-apps/apparmor/apparmor-2.13.2.ebuild
index dbf262c1ac62..020f3e4ff37f 100644
--- a/sys-apps/apparmor/apparmor-2.13.2.ebuild
+++ b/sys-apps/apparmor/apparmor-2.13.2.ebuild
@@ -16,10 +16,13 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc"
 
+RESTRICT="test" # bug 675854
+
 RDEPEND="~sys-libs/libapparmor-${PV}"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	sys-devel/bison
+	sys-devel/gettext
 	sys-devel/flex
 	doc? ( dev-tex/latex2html )
 "
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 16eddbf03cf5..60ae468d5d4a 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -1,4 +1,11 @@
-AUX baselayout-2.2-prefix-chaining.patch 1957 BLAKE2B 7bcbe1eeaae4f75b03da92463a3852042d7366beaf141d6dbcd8589e9e83a09d5ea55e301831989ff37a5b07ecb3fcfd06c4516336ccc30859ed05deddb4e7cb SHA512 bb29ff88a7380094653adf9def87566123e3108a43d886560016d56df5f96b9b161270867fd9591012cb12175d78f9660a35f354fc5b3e05e526c5bb4711d90e
 DIST baselayout-2.2.tar.bz2 40744 BLAKE2B 3a1dfdd64b45d5aa8fb3ff9781aa9b1218095874a0bb6d9dd0d2da4c447945272b25258b53b7ea130f3e1067c799fc4c0d14e577f3a3f749f19d72734136e6e9 SHA512 a5199c42e835d9f2683cc94f3c4c47ecdc392316c24e0932845736e2e90479b0c5c8ad72ead8e0537f097405b7d7548d00b87b7ff8c9e3651486e3c5c0970b36
-EBUILD baselayout-prefix-2.2-r5.ebuild 3553 BLAKE2B 82b726d4bafeeb0ac5916df8e594e45f52182c5453d31aa9199a49ac4b430b1c7d592c66506fc416e59eddf1e0f15a1a8cb470ff6c52a5476f7d86077cf34dfd SHA512 a25e275a28a3bb8278c108db743aacca74284f287f343a1a277cb47deb8418c55f4c740838b516cc9774f93df04d697f4ce10ba061dab0ae962c3fea77290de4
-MISC metadata.xml 218 BLAKE2B 82037a8a13bcba2ae00b1c4db95363a5992fdae654412ff76e70f0cdbc6c28c3ad1a3aa9746763e7271c7ff2f30b6103403bde6437ccb45e6897dbe060e205c1 SHA512 5f03bbfedc0f66afc7bc45f1aeeccdfc3c775dd337fb280bb7e80e29f618898ce92a05c66c126e79333e33ce7f422169c5ff1cdeeb30b58475c712e9bdc4e79f
+DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b
+DIST baselayout-prefix-395424f90c8ca6969589905cbf86d74fae9d7ea6.patch 1760 BLAKE2B 227ea5a9f70e927ba19de675f408ad01c4d934575cfeb780a525a4e24afd46d9d91d4e4acf773403cb6ac4a493b81da1cad787a5c0e41096056ad4e233b3cfc8 SHA512 77b4c3cad19251497808b6a07a384846f3ebb2282860d55197cee03d373b16622ef3b6c95e411e1cbb79702f10fe2e9c43cfe4175cca1db3ea6c06c6b2331ac9
+DIST baselayout-prefix-5926fe447541607ed137d67ca84080326584b2fc.patch 809 BLAKE2B 237eb610b6935ec5139299f1dccc6260b31a1d47a82390d713fc759ef37de986de8392a82068c70c1f63f382a9212103025fe019614796f5b6a3b4ed0f81f8b2 SHA512 6cd1bf81d8619be27c20fcd703be9a97cc6129d9c13402172e7f16adf6e9b9eb0238edfd311ca8b98b3898876d2bf9686a2a3905510d26608773a3da5233ee95
+DIST baselayout-prefix-95a8e95af948014d024842892be1405d656ab5fc.patch 3754 BLAKE2B c64cf440d7dc27bd3c38ad93d242a28e3ae0df6ebef282249996bc2c463aa6c0941ea41fbee236ba77742ba5bff777cd3226054b80abe99a454f39d488f8e1c1 SHA512 8e2d44e9caedfa7159f374e39d416a7ceebd407ea9550d9aa52d0a87a44b7b805b1725f8eefd592eb5fbd9a5f3f851a28c18565f3b0e621530f4c51c109df24e
+DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE2B d9b3135fc77a1941e08c68f0981385bcab412fc4949a70c7b75e11e7f8a6ee1eff6b5be0804d06539ed9f02a6245c0161d3dfd6de9fb0bf68d0d07c724650707 SHA512 822065592f434fcbae42b48d475ac0d188e29773337c3154f162ff830b58dcf44c87e3091933d5a0c0cc7e89e4d0223f60cefc0e525ca29aa3c9a0f9a5e974bf
+DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2
+DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51
+EBUILD baselayout-prefix-2.2-r5.ebuild 2888 BLAKE2B f5ec243f42071caf10b9057967922052839a346bd7b01389fc7188f4a9cfae5a3fae3301de458e0784add09a34236561a60d31a847dd0ba207b8f616535bd5d1 SHA512 38cb894c196af88a88bc2e6ad95f4f4321267839484c3bd5dfaf122c0a8661ca98bcaea0ee0c230362a5aa977cd5c43198221a0d41cb2c864f03f0ce13ff0e5b
+EBUILD baselayout-prefix-2.6-r1.ebuild 11002 BLAKE2B 3a0a6d8ca22c1ca654e2c182a520e94c538129529ceed81915883702f80a71eb5bdc2c2b6dab67345d824f005c9a82719011b809feff0ec980acb30ae930a7e6 SHA512 5518b2ae1b3e3e058c6fb104524654a6aae133be1bbaae65e1357ecb9c1afaded0d444429be18b3a7737bb6a45da5b99651442748624936fc9ac4b6c9fb0f8e2
+MISC metadata.xml 317 BLAKE2B 023b00acfd1afc0255ae1356c8a9627a2d3d81e762b8a7bbd155c2e5e626c4a7663ced36ac04590a127e3a845122a17e07f7c0614dec091919e958883e71ced2 SHA512 3893a08cbe1db5c7888ba808a3cf04c20c8ba5988078791a707978f91e56bf2049244e30096617bf5906e3ff4257538407a02645ceb1a49a61ffef57980bcb27
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
index 598159ce7569..5eb365ee62ad 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,22 +27,6 @@ pkg_preinst() {
 	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
 }
 
-src_prepare() {
-	if use prefix-chain; then
-		eapply "${FILESDIR}"/baselayout-${PV}-prefix-chaining.patch
-
-		# need to set the PKG_CONFIG_PATH globally for this prefix, when
-		# chaining is enabled, since pkg-config may not be installed locally,
-		# but still .pc files should be found for all RDEPENDable prefixes in
-		# the chain.
-		echo "PKG_CONFIG_PATH=\"/usr/lib/pkgconfig:/usr/share/pkgconfig\"" >> etc/env.d/00basic
-		echo "PORTAGE_OVERRIDE_EPREFIX=\"${EPREFIX}\"" >> etc/env.d/00basic
-		echo "PORTAGE_CONFIGROOT=\"${EPREFIX}\"" >> etc/env.d/00basic
-		echo "EPREFIX=\"${EPREFIX}\"" >> etc/env.d/00basic
-	fi
-	default
-}
-
 src_install() {
 	# make functions.sh available in /etc/init.d (from gentoo-functions)
 	# Note: we cannot replace the symlink with a file here, or Portage will
@@ -55,12 +39,10 @@ src_install() {
 		-e "/PATH=/!s:/\(etc\|usr/bin\|bin\):\"${EPREFIX}\"/\1:g" \
 		-e "/PATH=/s|\([:\"]\)/|\1${EPREFIX}/|g" \
 		etc/profile > "${ED}"/etc/profile || die
-	if ! use prefix-chain; then
-		sed \
-			-e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \
-			-e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \
-			-i "${ED}"/etc/profile || die
-	fi
+	sed \
+		-e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \
+		-e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \
+		-i "${ED}"/etc/profile || die
 	dodir etc/env.d
 	sed \
 		-e "s:/\(etc/env.d\|opt\|usr\):${EPREFIX}/\1:g" \
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
new file mode 100644
index 000000000000..b689642fcbbf
--- /dev/null
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+# just use "upstream" sources
+MY_P=${P/-prefix/}
+MY_PN=${PN/-prefix/}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://www.gentoo.org/"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
+	KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+
+my_prefix_commits=(
+	# commits in reverse order as listed by:
+	# git log --decorate=no --oneline --no-abbrev-commit origin/master..
+	a054fcc408ad48f775f7379834385c6a707d7a53 # also create etc/gentoo-release
+	5926fe447541607ed137d67ca84080326584b2fc # create usr/bin during layout-usrmerge
+	395424f90c8ca6969589905cbf86d74fae9d7ea6 # add prefix-stack support
+	95a8e95af948014d024842892be1405d656ab5fc # add prefix-guest support
+	c88ceddbfc6a965dc0153aef21e012e774d9e30c # sync prefix usage for Makefile target 'layout'
+	c9338e89cdb603c1e08998bba28fbc977a62fc51 # add prefix support per Makefile target 'install'
+)
+for my_c in ${my_prefix_commits[*]}
+do
+	SRC_URI+=" https://github.com/haubi/gentoo-baselayout/commit/${my_c}.patch -> ${PN}-${my_c}.patch"
+	PATCHES=( "${DISTDIR}/${PN}-${my_c}.patch" "${PATCHES[@]}" )
+done
+unset my_prefix_commits my_c
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	use prefix && return 0
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+		for prefix in ${prefix_lst[@]}; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die " Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile
+}
+
+src_prepare() {
+	default
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+}
+
+src_configure() {
+	local OS
+	# although having a prefix, RAP uses full Linux baselayout
+	OS=$(usex prefix-stack prefix-stack \
+		 $(usex prefix-guest prefix-guest \
+		   $(usex kernel_FreeBSD BSD \
+			 Linux ) ) )
+	# set up immutable Makefile variables once
+	sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \
+		-e   "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \
+		-e      "/^OS\s*?\?=\s*$/s|?\?=.*|= ${OS}|" \
+		-i Makefile || die
+}
+
+src_install() {
+	emake ROOT="${ROOT}" DESTDIR="${D}" install
+	dodoc ChangeLog
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+
+	use prefix-guest || return 0
+
+	# add a dummy to avoid Portage shebang errors
+	dodir sbin
+	cat > "${ED}"/sbin/runscript <<- EOF
+		#!/usr/bin/env sh
+		source "${EPREFIX}/lib/gentoo/functions.sh"
+
+		eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2
+		exit 1
+	EOF
+	chmod 755 "${ED}"/sbin/runscript || die
+	cp "${ED}"/sbin/{runscript,openrc-run} || die
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}/etc/${x}" ] && continue
+		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		[ -e "${EROOT}/etc/${x}" ] && chmod o-rwx "${EROOT}/etc/${x}"
+	done
+
+	# Take care of the etc-update for the user
+	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release
+	fi
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"/etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"/run
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"/proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ver_test ${x} -lt 2.4; then
+			ewarn "After updating ${EROOT}/etc/profile, please run"
+			ewarn "env-update && . ${EPREFIX}/etc/profile"
+		fi
+
+		if ver_test ${x} -lt 2.6; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}{,usr"
+		fi
+	done
+
+	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
+		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}
diff --git a/sys-apps/baselayout-prefix/files/baselayout-2.2-prefix-chaining.patch b/sys-apps/baselayout-prefix/files/baselayout-2.2-prefix-chaining.patch
deleted file mode 100644
index fa86f86e4147..000000000000
--- a/sys-apps/baselayout-prefix/files/baselayout-2.2-prefix-chaining.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/etc/profile
-+++ b/etc/profile
-@@ -4,6 +4,46 @@
- # environment for login shells.
- #
- 
-+#
-+# for prefix-chaining, the very first thing to do is to load
-+# the profiles for all chained instances above.
-+#
-+# TODO: is it safe in any case to shell source make.conf?
-+# don't do any recursive expansion here. if the parent can
-+# use READONLY_EPREFIX's, it has to have the same profile as
-+# we have here, and thus it will source parents before
-+# evaluating anything from itself.
-+#
-+if [[ -r /etc/portage/make.conf ]]; then
-+	_ro_root=$(. /etc/portage/make.conf && echo $READONLY_EPREFIX)
-+elif [[ -r /etc/make.conf ]]; then
-+	_ro_root=$(. /etc/make.conf && echo $READONLY_EPREFIX)
-+else
-+	echo "Failed to read" /etc/portage/make.conf >&2
-+fi
-+_ro_deps=${_ro_root#*:}
-+_ro_root=${_ro_root%:*}
-+if [ -n "${_ro_root}" -a -f "${_ro_root}/"etc/profile ]; then
-+	. "${_ro_root}/"etc/profile
-+fi
-+
-+#
-+# With prefix-chaining we want another set of variables that
-+# should be retained for all prefixes. for example it is ok
-+# to retain PKG_CONFIG_PATH if the parent of the chain can
-+# be used to resolve RDEPEND...
-+#
-+if [[ -n "${_ro_root}" ]]; then
-+	_ro_chained_path_vars="PATH MANPATH"
-+
-+	[[ ${_ro_deps} == *RDEPEND* ]] &&
-+		_ro_chained_path_vars="${_ro_chained_path_vars} PKG_CONFIG_PATH"
-+
-+	for var in ${_ro_chained_path_vars}; do
-+		eval "_ro_backupenv_paths_${var}=\${${var}}"
-+	done
-+fi
-+
- # Load environment settings from profile.env, which is created by
- # env-update from the files in /etc/env.d
- if [ -e /etc/profile.env ] ; then
-@@ -61,3 +101,17 @@
- 	[ -r "$sh" ] && . "$sh"
- done
- unset sh
-+
-+#
-+# finally chain the save variables for previous prefixes in the chain.
-+#
-+if [[ -n "${_ro_chained_path_vars}" ]]; then
-+	for var in ${_ro_chained_path_vars}; do
-+		eval "export ${var}=\${${var}}:\${_ro_backupenv_paths_${var}}"
-+		eval "unset _ro_backupenv_paths_${var}"
-+	done
-+fi
-+
-+unset _ro_root
-+unset _ro_deps
-+unset _ro_chained_path_vars
diff --git a/sys-apps/baselayout-prefix/metadata.xml b/sys-apps/baselayout-prefix/metadata.xml
index 91e2eccbc46d..cbee92f245c3 100644
--- a/sys-apps/baselayout-prefix/metadata.xml
+++ b/sys-apps/baselayout-prefix/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>prefix@gentoo.org</email>
-	</maintainer>
+<maintainer type="project">
+	<email>prefix@gentoo.org</email>
+</maintainer>
+<use>
+	<flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 479ff204448b..93430a19a370 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,5 +1,7 @@
 DIST bolt-0.4.tar.gz 113525 BLAKE2B 4d6b25b60a35bbeee724e4549a49709ff19d99457c8a35c02c66026cdca999359220d09812f8e9f44586b5e3cf3dda2e3ff30f35a4f37ed6d815535e62af39f3 SHA512 3ea6b748768b5d9df60425274ecdb4ccd5ce6599e01f0648a24704643fbbadd7a114d4a1946ee3b7bd8866935758cbfe4494734c26c12ccc508c205a036d5317
 DIST bolt-0.5.tar.gz 149665 BLAKE2B ca7f937d4b7f4911cba93f8619e52af37f18a6542bc76aaee388a9122ea38d11ba0a21f4afb45bd6109e12ada4662783cb8f7aebec0d58751ace6c18c49ace88 SHA512 d36f2e39ac53b131fb9607055231a5a205c368547c0db2c3a7537b6e60b156c8b0663d1e5b09c825e1e1a63fbe21087746d0bafde1bd474eb90f1d0cff991246
+DIST bolt-0.7.tar.gz 188158 BLAKE2B c51588ed746fd2aef15c79c278efe73e78ed8a029d2234b7a6ce717a6a3287ad0e9db82f93661c552a6a35c76a0e16a2712681f45e53f876b3b4f5bd839005b3 SHA512 6786f701501cc2680fac52cda7cdfe37971044abcf058b5c83bfa9f1d0a0381ba00e3377cfc97fcccf53760a2eafc1f8f6d0754f0e121d94201711ad8e40a135
 EBUILD bolt-0.4.ebuild 811 BLAKE2B e28db1546f449f68019161dd5b85ad5a48355df464c9faf29d4197570538d030d9af840c46fcdc8c56291d4be83942fe3bc9f61486ab9571b4ea61164748489f SHA512 8951b1d10ddd4c7102c1047630d9b3cacd5563d1c1d494e306abcde839b85ea31c762e1d16b0caa5e103e66a3faf1b251526c0ef6ee4d340318e44873b19155e
 EBUILD bolt-0.5.ebuild 908 BLAKE2B bba91781931c9be0cfd2f21ebe5fb8fa12eb5d7079deca835856bbdf77d4a5e0941326fab01ae38e817d6503a46dd3cd4a6b2a304c0a6c0fbe04ec2f8ced7d9d SHA512 72ef83615267edac04824a4a7059c5203236d9f43eebb27c51f07da75b1ebcae8f6c03a551ce0b5f7fdf1d4e8263a4ff954279349262a5b2220a73e1a800c8eb
+EBUILD bolt-0.7.ebuild 908 BLAKE2B fb4535d186c3aa48a7caf760bf56ef767748c054275aeaf69b3e2ef482f1de9679786395948057ae2239bb69de2ebbacd4947e2ef6f00e5d7984277b8003437e SHA512 4f32f424fb48ea8189183d668cd9bca8759b58621282251b4dd4f86808131baf6ee8b311ec4ad5da3eb50533e99b824b2c281226b608092e24dd5d765302721a
 MISC metadata.xml 387 BLAKE2B 9c5d99308a9bf4340ad48310dc9cc5f67ad7db1683f54794f025b90667dfb2f178b25c1d9a3d0fa0a7fde249ea8bf40cb608265e96aca30e547f3e2e536b91f0 SHA512 16060e68e59d82a6a556bc0149f5e365a4092b14edadeb09dfad8278b19e28e0d1835fcb24a2f335809d1ec910c788cc69d579d7aaaba9ff32b4090a904c7706
diff --git a/sys-apps/bolt/bolt-0.7.ebuild b/sys-apps/bolt/bolt-0.7.ebuild
new file mode 100644
index 000000000000..28823c01d33e
--- /dev/null
+++ b/sys-apps/bolt/bolt-0.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson systemd
+
+DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3."
+HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc systemd"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0:2
+	dev-util/glib-utils
+	virtual/libudev
+	virtual/udev
+	dev-util/umockdev
+	sys-auth/polkit[introspection]
+	systemd? ( sys-apps/systemd:0= )
+	doc? ( app-text/asciidoc )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-Dman=$(usex doc true false)
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--sharedstatedir=/var/lib
+		-Dsystemd=$(usex systemd true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	keepdir /var/lib/boltd
+}
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 09a9fd4a8490..fdcbeabef496 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,8 +1,10 @@
 DIST checkpolicy-2.7.tar.gz 65967 BLAKE2B 6918187363cd74a1a23df41f0af23a2231c7087c696d3935db65db4c6750cf7dfa7613b1d569dc76b80f9781fed9f58ef8d41e6ed4325086a10fb322f7f8f754 SHA512 fba8a4132f90c98f8222de563dc15aac1b739d3a6207779b6a4715d2813e7553081351c54f42371a1b704a1f5038d40821b61213c4ad53eb705823975858cf7f
 DIST checkpolicy-2.8.tar.gz 66243 BLAKE2B cd4b5ead13606df9888260a15d982eb43d59c659a6f021a18c598657b2a07de5e70a9eacee6528855f26256d26b27bd8bec27b95a7366cf2e44ba5d426369582 SHA512 d1a52dffefcc8f9f879214290f01beb5f4978f1764ab6378ee03a62ef924206b9a6f6a512001ae556034ababcd3a0043d455f5aef66b5629a4f152cd2c9f0b7a
 DIST checkpolicy-2.9-rc1.tar.gz 66244 BLAKE2B 16f34d8ee46dd1d9a23cdb784e72dba28350293ba44fbd08621be013a1cd5e3509c8cde0e155fd45ca6bd000d69cf7ad7ed787011b6c47851c4f1403b6d5808e SHA512 1ad53f70219c0b57ad19ee1b242709b8e0721dc45a6f73f61553b602247e8a64a1c3896226bac977a795aa7c0fb83fa214d1ad1d6ccb6dc3bbc4228f33fe89b0
+DIST checkpolicy-2.9.tar.gz 68735 BLAKE2B 092b7b67ea952be6a829529249f0b209c31245490f263b248cb0208d9f1f4ec922522791c6555c0b913b56b8a0037bfde54a3511940f0be287f13e3a193c8f26 SHA512 8dafdd871c5fd32023883149c74891279c386cc87d70cbfc6f0a8dcb0406f17f1158f9078c1b35892a0f0edcb6b5208a031594ab80898eec016ad765ad046e03
 EBUILD checkpolicy-2.7.ebuild 1232 BLAKE2B a2375ca69a96de38a648904261277d54222ef50fcef3722deaa9430995c62a8adcd24cc06a9b86b868f932d95b5acb27e076115ad73b0e76f6e9630f37e3e38f SHA512 b671810da7baedcd74e6456f53cdd63afdf73cbedab7d5f942023534d863aef4d536ff8e6acf370964352707a86c0b72bd3530601025aa27f96395b29ff3c1f8
 EBUILD checkpolicy-2.8.ebuild 1187 BLAKE2B 1114b1ac3e3591dfc7b1d68d3ddba13e693283e0cf1cf11f8947e49c62b35e520ac85fc0c014b335d31642585c3dc7385b6812964d2d6f329d9fe9913f1e0d50 SHA512 9e2e4cefd22c41bfe102048f88d84883238c826cce1fd186bf4ad0a95d7cbfcde3be1db446f9aab23859e72292efb919882681a2bd984d3b3696d1f9595d32f7
+EBUILD checkpolicy-2.9.ebuild 1169 BLAKE2B da040fe75e5781f417358ba7f94048df9571ad6729ee80fe25d3daf7dfa596cf4ca04b4dd32984c3858ffd549c0f0ac36b8a595f3261d915f808305b80629e05 SHA512 5bf62badf49b4c33268b56660e0d9ac86d3fc8372311fcf27021691361da519c43269eb1e62bd46eb8307a59019793ba71a706303c3973c7290c2abb2a246a1c
 EBUILD checkpolicy-2.9_rc1.ebuild 1169 BLAKE2B aceea7226388d4e727a783e231186bd397473af88d0b2639240361bffbf16f83ad784adcdb792f3c2e1e980260997f095a757610666029f7c052315098222602 SHA512 aeacea41c9dbf261a467842e8db5b1b4c5dbbe7d644da0677c6ad56f10c22ef0c59ed0a98f1a131573ed0f21750df5b555175a1133fd4d33f7570f59f2201470
-EBUILD checkpolicy-9999.ebuild 1169 BLAKE2B aceea7226388d4e727a783e231186bd397473af88d0b2639240361bffbf16f83ad784adcdb792f3c2e1e980260997f095a757610666029f7c052315098222602 SHA512 aeacea41c9dbf261a467842e8db5b1b4c5dbbe7d644da0677c6ad56f10c22ef0c59ed0a98f1a131573ed0f21750df5b555175a1133fd4d33f7570f59f2201470
+EBUILD checkpolicy-9999.ebuild 1169 BLAKE2B da040fe75e5781f417358ba7f94048df9571ad6729ee80fe25d3daf7dfa596cf4ca04b4dd32984c3858ffd549c0f0ac36b8a595f3261d915f808305b80629e05 SHA512 5bf62badf49b4c33268b56660e0d9ac86d3fc8372311fcf27021691361da519c43269eb1e62bd46eb8307a59019793ba71a706303c3973c7290c2abb2a246a1c
 MISC metadata.xml 308 BLAKE2B 9147e4199ebd94dc7cb5d04986bae70ecc5bedf765fa6295546b894df249fa074c66e96a7d788295d912f49e9b0c5c305eb404c98d9b04646ab12a7597d4877f SHA512 e07f79eaa348cc35ebb4eac966f6b59ff87cde6c2b9694ac996da971c45aed834f34b8a9325b205fdfe590d7add0d46013cc551af166a9ca2ca59e0feffbc9bb
diff --git a/sys-apps/checkpolicy/checkpolicy-2.9.ebuild b/sys-apps/checkpolicy/checkpolicy-2.9.ebuild
new file mode 100644
index 000000000000..76dc1f3e8240
--- /dev/null
+++ b/sys-apps/checkpolicy/checkpolicy-2.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20190315"
+
+SEPOL_VER="${PV}"
+SEMNG_VER="${PV}"
+
+DESCRIPTION="SELinux policy compiler"
+HOMEPAGE="http://userspace.selinuxproject.org"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug"
+
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}
+	>=sys-libs/libsemanage-${SEMNG_VER}
+	sys-devel/flex
+	sys-devel/bison"
+
+RDEPEND=">=sys-libs/libsemanage-${SEMNG_VER}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		YACC="bison -y" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		install
+
+	if use debug; then
+		dobin "${S}/test/dismod"
+		dobin "${S}/test/dispol"
+	fi
+}
+
+pkg_postinst() {
+	einfo "This checkpolicy can compile version `checkpolicy -V | cut -f 1 -d ' '` policy."
+}
diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index 529d55147c22..76dc1f3e8240 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20190125"
+MY_RELEASEDATE="20190315"
 
 SEPOL_VER="${PV}"
 SEMNG_VER="${PV}"
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 001e00f758d8..2678f5c43689 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -2,10 +2,12 @@ AUX 80-dbus 341 BLAKE2B 20849eb7c526475d3ff96766ac7183608aa51e5c069f07cf282a2b4d
 AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a032c31ec1860c38c7a54910b3fe8da2a9bce175d01fab1c224008ba38e1981dfc161fde80f725096e644495740052e SHA512 6d07220d8c80c49057396dc76d808cad2c995cce259544e8435d0c8fe328f85ac3a7da5a88209f80a127a04b48591ac20fe661683665adca2af75fedd2563bf2
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
+AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 95b8a04362e78001e723301e5f170e923bca8b7b1728e6a7658d606550923d2bd60a6a6916c0fcd88205ecdc4a25ab58309bdcabaeb32c2f6c5e4ef8686af02c SHA512 726f97d0a2016f4f0625ba332e93e2d33bb16857cd35cb6c79da0f44fff297df948c3df62c31ffbec34713a7b85b3ff5b65f31517fe3511ddbd3bf18bd4748ed
 DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5c73ac8a570e1e13f37f9d6b8c2aea2545b1a3979d3a94ce7a2ddda7280afde4ecd9b682d3d31355f82af217f7 SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c
 DIST dbus-1.12.12.tar.gz 2077301 BLAKE2B 6245559fc3419bfdca1bdb2da7f6f5a34e5377dc67e0c8ecb7a87914ea65d044a95be59b749d9cfef7008ad09854b549b86863ca987b8a3949cf0d58cc5a2cb6 SHA512 51af4e86ab7d36e1c9a861164e7cd7aa1605fdd82f90aed8728b34c45a87864a00671de9db00d88ea6f96be97459c7eb53d2517ea9d9687ae9ebf81c58c3a80f
 EBUILD dbus-1.10.18.ebuild 7366 BLAKE2B ec30593cceffe5a927529a64a895e4ab3913aacce6d9a6aeea54e613c38f4b557c81b7b3a7c968ce2f08e9d019f17d15c56dd4ab51b3014ed3f2d382328e14ce SHA512 1a8ee80dd263512afa76aeea6e0442b6c8fc58c69c6c3c04b760772d15964bbdc5ca4172af6bb5d5d1669514e56a4dedb73dc534f91e33609e2a85d3ec1167f5
 EBUILD dbus-1.10.24.ebuild 7373 BLAKE2B 21ad1bff164e2e67786c1e9b7f74c5c9772316429763bf2dc597c2c85fe6b3706d6f87c20cbfe55c0f297dc99342bc58c6b2ab7e443dfefe1d1b4652c9de3bff SHA512 b820553d81073c0bfd754c56014a40639d26ccf6a42c967f97c74c7c4d71be96b5b534f616caded46774d5d29693985fffdecde10d401f30803b39da4400aca1
-EBUILD dbus-1.12.12-r1.ebuild 7776 BLAKE2B 7cc3688e83c6f5b01f2e7879d7c996e5fef9d2e0ddf1c5f2f792fb5248c6b103672d6f3de9d9b99d5a5f0231186602bac39f59cba8b134fdbc756f2b4d68c1be SHA512 ae25929a3f1684fb3b2eaca3b74ddbd26133ed6fd740693a2a87cd4421d359448e1aadedbb351d1ecca05628f664976a135450835be42d98b5f8fa80ba88dca9
+EBUILD dbus-1.12.12-r1.ebuild 7775 BLAKE2B 7c806ba0936bdb0934d59ce5e4e9c0e761d03feff04b12775ecacd7dc23cad93f03913ffe17cbd5ed79e04cd62d4c6f01e8dda1cb6534803e0c03c1b128bd064 SHA512 3d6bd9a0b1e6d95a6ab1b6ec751d2c092a702c916723e161a051a27ee2317ec192fe25bf3ffeeb27d90103f4ca461972e9fc8021466cdc38034244a3b1aba5bf
+EBUILD dbus-1.12.12-r2.ebuild 8002 BLAKE2B c3af96430acc3caf382f84017c681f5ef1e9c05248fb8e9827230db5dd1f65ea4a2fd02cc6d4cb034cf1031fc0dca64beb60c37140a56f815c012789ea95dc2d SHA512 a4e93064e27e6fcc1f9a80558a146a39dbb7b241b93bff4885866bce305ba1cb6623814de8a75bebfe433ff943d00ffb9d04eea9847d4c55fd95498bd9dafe76
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.12-r1.ebuild b/sys-apps/dbus/dbus-1.12.12-r1.ebuild
index 05d5e0161a2f..145518c608f7 100644
--- a/sys-apps/dbus/dbus-1.12.12-r1.ebuild
+++ b/sys-apps/dbus/dbus-1.12.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc elogind selinux static-libs systemd test user-session X"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-apps/dbus/dbus-1.12.12-r2.ebuild b/sys-apps/dbus/dbus-1.12.12-r2.ebuild
new file mode 100644
index 000000000000..44d36d8040b2
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.12.12-r2.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="https://dbus.freedesktop.org/"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
+
+LICENSE="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+# autoconf-archive-2019.01.06 blocker added for bug #674830
+# Please check on bumps if the blocker is still necessary.
+BDEPEND="
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.4
+	<sys-devel/autoconf-archive-2019.01.06
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+	>=dev-libs/expat-2.1.0
+	elogind? ( sys-auth/elogind )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/expat
+	test? (
+		${PYTHON_DEPS}
+		>=dev-libs/glib-2.40:2
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	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"
+	"${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136
+)
+
+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
+
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# fix standards conflict, due to gcc being c99 by default nowadays
+		sed -i \
+			-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+			configure.ac || die
+	fi
+
+	# required for bug 263909, cross-compile so don't remove eautoreconf
+	eautoreconf
+}
+
+src_configure() {
+	local rundir=$(usex kernel_linux /run /var/run)
+	sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in > "${WORKDIR}"/dbus.initd || die
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local docconf myconf testconf
+
+	# 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}${rundir}"/dbus.pid
+		--with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-dbus-user=messagebus
+		$(use_with X x)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=(
+			--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-daemon
+			--disable-selinux
+			--disable-libaudit
+			--disable-elogind
+			--disable-systemd
+			--without-x
+		)
+	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
+		testconf=(
+			$(use_enable test asserts)
+			$(use_enable test checks)
+			$(use_enable test embedded-tests)
+			$(use_enable test stats)
+			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+		)
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
+	fi
+}
+
+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 "${WORKDIR}"/dbus.initd 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 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/files/dbus.initd.in b/sys-apps/dbus/files/dbus.initd.in
new file mode 100644
index 000000000000..10c7201be478
--- /dev/null
+++ b/sys-apps/dbus/files/dbus.initd.in
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="reload"
+
+description="An IPC message bus daemon"
+pidfile="@rundir@/dbus.pid"
+command="/usr/bin/dbus-daemon"
+command_args="--system"
+
+dbus_socket="@rundir@/dbus/system_bus_socket"
+
+depend() {
+	need localmount
+	after bootmisc
+}
+
+start_pre() {
+	/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
+
+	# We need to test if /var/run/dbus exists, since script will fail if it does not
+	checkpath -q -d "@rundir@/dbus"
+}
+
+stop_post() {
+	[ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}"
+}
+
+reload() {
+	ebegin "Reloading D-BUS messagebus config"
+	dbus-send --print-reply --system --type=method_call \
+			--dest=org.freedesktop.DBus \
+			/ org.freedesktop.DBus.ReloadConfig > /dev/null
+	eend $?
+}
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 83068df2ae07..010b7656002b 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -2,6 +2,6 @@ DIST ethtool-4.13.tar.xz 217472 BLAKE2B be60c4763a06dba4b246c17b76dd10bf956e69d1
 DIST ethtool-4.19.tar.xz 221932 BLAKE2B 5a44d30b5b426ad89f41545617d9b36133fff8aa6c6bb0d5adacc4f5fef4e81f693ab620403a5d107d6abad177492b7adc406dc4b082c343938c228562f46f67 SHA512 5b0b83e09799a04e401563e34c4c784029803ecf83d5ba4f3a9cc92bfc7c2bc9cb0d86cb76ac9a7ffbfb379f6a0fc4bc3e0cf9b7826971e46504052e40156abd
 DIST ethtool-5.0.tar.xz 224444 BLAKE2B 49f968604485e49403a3370839f413c63a992fe2153eb0be000e68019570a176378b570600c970bf89e4fa1f5702d7708129151ac5833367c996206ad8e853e6 SHA512 9ff6433466585e38dd0dbb99ed06430cd885f26ef4e11f6b95c024ed7511c376f8d86ff53c298cb8e811193500514737ce21eb0cd925bede0373799eb3a990b6
 EBUILD ethtool-4.13.ebuild 453 BLAKE2B 039558a1279ee3cbfb7c11005761705fd30f8248d97cd79d089be6d7e9b27aec8f9cba28ed58bc6f80e2a33877dee10e67ddf09211d27b30371e2e2fffdfb81c SHA512 46b487cd70ed8f5bfb656a9371ef185f46761c4dcc1ad2f9cbbc20abbc5c9e2d32f6f3a52f0ae709b2444ab8514d4ada9cf66b5fdec88c342bf6ca367cd525a4
-EBUILD ethtool-4.19.ebuild 451 BLAKE2B dacbf71eceb5d1f2b34e7b3b6daf05d0e4d2f78151f4f62c9bf1760f3fb1817b8a502092dbcc35a371edce86e4e967ef490ab41d0e6781314ec2225493ffa538 SHA512 39a27d51f29c52ee4dc0c49f4490571b5e74429efd6dcbf833b9747de7d986d6602011b5357941a06932cb128d175904c02db64162a52329b869386658fae5da
+EBUILD ethtool-4.19.ebuild 450 BLAKE2B 446d80560cfbe2213f2c43cfdd5467a562522278aa47453301c7a15c2abf067dedbadf5e0f80c2122c8d942b35a712c5911ab3565368bd7e110e99f2187e6a1c SHA512 31e8a2b97f22d747a42435ad5794765971d73d9b11bdc410a3231189cf3ddc0192b43e9ab1c2abe3a94f734dc7028c76fc9b61172af1061ff9e3744ba5c380f5
 EBUILD ethtool-5.0.ebuild 458 BLAKE2B 894672b02c5b2be3ec477864f7efb9d1bb48b74cbc7c3b072de4a70977c38d403b5748ca0c7c19cac75efde02e60c86bf4f87bd3cbad7b41aa207946c5768047 SHA512 7d4350486a6c463e0794ae4242e0bcbb3461f4c8916fc22241462840c4ce1f8773fde4c99722462a9a87124b8645a0265a9cb0b0c693d7726521308da75cdfb8
 MISC metadata.xml 814 BLAKE2B cb6f1a2aa029191f22615d83df4f166c7c53c70ac6486deadab63ea5a463b08ae9aa8392f0a2732b83efc2a476c2416cd94b2e47ed9b09097217da5746d110d2 SHA512 7ba75f7aa20f8cc48b91b7576449e416abfc412fe26670142d4ec1513b6a3939858b298ccdbf72c208c2d70b5c00eea88dc3c4201e2187b188ed4a9d33cf0272
diff --git a/sys-apps/ethtool/ethtool-4.19.ebuild b/sys-apps/ethtool/ethtool-4.19.ebuild
index 3134e19c5694..ad0ce1f0b9b7 100644
--- a/sys-apps/ethtool/ethtool-4.19.ebuild
+++ b/sys-apps/ethtool/ethtool-4.19.ebuild
@@ -9,6 +9,6 @@ SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index d82ab6b79d8c..7d63d90ac527 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,3 +1,3 @@
 DIST fakechroot_2.19.orig.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8937000f1b7ea9f0f915db68efc4a8f1075d9ee1932c1f20d1c20db04f97de22574f6c51905a070dc1d130a435c4 SHA512 3f1846360dac2ebf9430949651ab0e4b232218cb576a3408b7199dac1e8b555d550ec281eacc65890e79f079f558308c9d56c10a6c7ff38e1419bb45ada7450a
-EBUILD fakechroot-2.19.ebuild 544 BLAKE2B fdc6a174bae014fca6a4efb74ba1ba188effd8980d0285698e15a678c5931b9bd96b9ccb53add7033459c737c2ae2f7e7328fce10c61929ba19132b38f043ad1 SHA512 c0e903b64ab26f6303deb2d47796b857c04d39e61d7f5a348ca7bffb093ad451e11404c04eeae1290b0a9399051349a5fd3278a763acd8f7b6104ff247d0545b
+EBUILD fakechroot-2.19.ebuild 550 BLAKE2B 56456eab02ef55e59e1d4176bd9a44a1404c879f5b1dd9684f9b2ee9b5df96a56b9d01bd80322346e6fdc30664d7fd92f074410d7ddbed34590fe575d65c4d94 SHA512 7ab9a333757b3266cb82148b69ada6ba2d6c9fc95eb18a15a870993d26cc7978be69d8fd7e54f7032de70ab1735b346d3d05e152206e93ebab564561ff630658
 MISC metadata.xml 217 BLAKE2B 6e1cd12af01db3565487a9412bae9a06912408439877e1a81fc466c0dc0612175846256a14be3b1102bbd43ac663311d34bc441b5d64caf9462c25ada2cfa3a3 SHA512 1cb210be8d67d18e50ea53bedbfe8b2807e4b2e5c9bf82cc037ce5d60f98d60b5a967e8863a2964769eb6a15626db1e001cc1a38a18b2d1809cc73a3578df4e4
diff --git a/sys-apps/fakechroot/fakechroot-2.19.ebuild b/sys-apps/fakechroot/fakechroot-2.19.ebuild
index c4fc046ad165..04a280336ab5 100644
--- a/sys-apps/fakechroot/fakechroot-2.19.ebuild
+++ b/sys-apps/fakechroot/fakechroot-2.19.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 
 RESTRICT="test"
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 97e37d0efe04..b9759dcc33f4 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,7 +1,7 @@
 AUX fwupd 299 BLAKE2B 65d2229e93e03c38d5db2523bf1ca4f1663c12e3308426501b57b6d5d2dbf4c9756d64ea627ca892671e0e2cb97bda0221bf0313eed596a3ce85b83c0b4ad1d9 SHA512 8d9f94754a2b5d65e71134f9c6e2fca49433dc123441b37518acc7b7e68f397e19e12fad498b586f56fe6df887be6bf8f27c6041238a57afe3b5457026af197c
-AUX fwupd-1.2.4-elogind.patch 3588 BLAKE2B dee3bf0916e1a294e637e1ee1c488f0bb7fea50819171ff6cada035e1d409f4e98ebd1fae652aeff43a3808be625bb113e05dce23c059c9419a64d2aee3999e1 SHA512 9c9eba10e3982f03b98d20ec3f9fe6e948de1390b9e6f6fd2bdf813329b8d5b8add32219312a4d85b68e0f3faa804fb4adea301f9d8c12c0aa4e1c65daa886fe
-DIST fwupd-1.2.4.tar.gz 1808778 BLAKE2B 4dd8db0e73b148cba8ca43ec7942efa183f331a376b947421b8673d473ef868cef57e3abf4f50e031eb22f97fa8eb199b8bd7ef3b96efb598f842d0824c235a7 SHA512 7734be90459364c2e9ca35d9a9327e7becabe64cd0129d5c8f3cb4a95ef0195726c519862e843636952a3251ecea080907d1e6814c3037e9f90e8dde53b406ad
+AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.2.5.tar.gz 1818559 BLAKE2B 0d30248bf3be093d3764624294fdd6e26b979560d70b47e67b3ca5f213177d807e749f5e30abd4d7d7d15e4be507103583834062b6a3243367169019e24a1bc7 SHA512 dc6a0def49225ce50bc89c3f76137497d4c8b71f94e42546fbf5221dc0af504ce6090f803ea9dca175f6166ff1341f6a3eab04652d744257c9e88dbd6875abc7
-EBUILD fwupd-1.2.4-r2.ebuild 3494 BLAKE2B f52a3a9aef81b4c90310228fb0bec40b0e340a5640d574b21b4423e5f1ae6b1f50d48f91534ad1bb20f1f82ee658985d2ca40c9998ff789bf22779435b573b40 SHA512 64eee7c81da78e0221ec90968b6b707b9e4480f310686b9752e46dbde99175da029938ce75dec322dab098a6c87b2eda7d4f03cb335692aaa7c133d9de2c523a
+DIST fwupd-1.2.6.tar.gz 1861765 BLAKE2B 160af03c0c08bed730657520a15f96c9881996807d186a26074f10b6b340e27b0e783ae7a6b1fc433e4347cba535d49bca60b4d242101a9097fc2749f3cca0ee SHA512 c1111fd881126bf85424dec004e4321948cbdd603ed79989eee51f48197f8f0f391371834964dd1bff52eb3b353cc4c2e5714f6ff674b23dbd8e8d0e8a87ff27
 EBUILD fwupd-1.2.5.ebuild 3481 BLAKE2B b6584f19d1e7a11870b82464fd68f14d9b1439dc3cf1bec274a41613ed66beba7723359a82dc3c32f46931549a1018b5598d805004f087e363bc5a53fec2a570 SHA512 0fbed24f38a96137a290548313aaf46aaf2436020d4a43072c343ed12dc911351ad967ff49c00df52fcdc34182c591d5339ce634ac5d2bf96a407bc519f4f1b6
-MISC metadata.xml 1074 BLAKE2B edf991df52234904d0d07b885b6e209e1f533babd3d2275eb2a57f1b85a64dce78f37cb412845285914af10f498d04bd746c5a4cf64ca77b36cb4de49f87e1c4 SHA512 a32ed6a766a8e538a7a95f2abeba57e5277105e15dc4346fefcb958bb93b95d421dd5edc2161295f5692ac47a3fe41d587eee1082179d73d1bb6e5c374d48450
+EBUILD fwupd-1.2.6-r1.ebuild 3706 BLAKE2B 24d91f6899f2aa8f045191926f1dbcfa7722dc9421edc169975cfa6b85271e978ea42496c1b9de51bd0156a242fa4ea42c65daa2b1febdb0cafcf91d1bd98f0b SHA512 03aa3ad72407fff3dc8b750df04f8ea92908b16af452f619f92294f320503c259f6dc2b4e53c6e71f33bb6dcc3b8ac190453703254b8e2bdf6a234a71730e8b8
+MISC metadata.xml 1137 BLAKE2B ffb495509527dd57cc2f835dd5bb2f37f0874ecf4e973732a56811c5688022072a4365bc5a1ee085f6df0225cd56e9a73c18a320ee4f5ba840398570f38275e2 SHA512 bb268eb8ccc78684bb0639962b4ce86de6c258c9f09a4b0adf8011dea35280d7b7b3e494d366b80d1fb2686845487100995b97291cbcb795d9623350de2428cc
diff --git a/sys-apps/fwupd/files/fwupd-1.2.4-elogind.patch b/sys-apps/fwupd/files/fwupd-1.2.4-elogind.patch
deleted file mode 100644
index 1a8b7760001d..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.2.4-elogind.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From de2b70bc7d0ca092659a0b5a4719e41444660b14 Mon Sep 17 00:00:00 2001
-From: Marcin Sucharski <marcin.sucharski@protonmail.com>
-Date: Sun, 24 Feb 2019 00:28:10 +0100
-Subject: [PATCH] Add elogind support
-
----
- data/meson.build     | 27 ++++++++++++++++-----------
- meson.build          |  6 ++++++
- meson_options.txt    |  1 +
- src/fu-util-common.c |  4 ++--
- 4 files changed, 25 insertions(+), 13 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2d7fb632a..f9377c803 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -63,17 +63,6 @@ if get_option('systemd')
-   endif
-   con2.set('dynamic_options', '\n'.join(dynamic_options))
- 
--  # replace @libexecdir@
--  configure_file(
--    input : 'org.freedesktop.fwupd.service.in',
--    output : 'org.freedesktop.fwupd.service',
--    configuration : con2,
--    install: true,
--    install_dir: join_paths(datadir,
--                            'dbus-1',
--                            'system-services'),
--  )
--
-   # replace @bindir@
-   configure_file(
-     input : 'fwupd-offline-update.service.in',
-@@ -92,3 +81,19 @@ if get_option('systemd')
-     install_dir: systemdunitdir,
-   )
- endif
-+
-+if get_option('systemd') or get_option('elogind')
-+  con2 = configuration_data()
-+  con2.set('libexecdir', libexecdir)
-+
-+  # replace @libexecdir@
-+  configure_file(
-+    input : 'org.freedesktop.fwupd.service.in',
-+    output : 'org.freedesktop.fwupd.service',
-+    configuration : con2,
-+    install: true,
-+    install_dir: join_paths(datadir,
-+                            'dbus-1',
-+                            'system-services'),
-+  )
-+endif
-diff --git a/meson.build b/meson.build
-index f4f0af192..d645db2ae 100644
---- a/meson.build
-+++ b/meson.build
-@@ -270,6 +270,12 @@ endif
- if get_option('systemd')
-   systemd = dependency('systemd', version : '>= 211')
-   conf.set('HAVE_SYSTEMD' , '1')
-+  conf.set('HAVE_LOGIND' , '1')
-+endif
-+
-+if get_option('elogind')
-+  elogind = dependency('libelogind', version : '>= 211')
-+  conf.set('HAVE_LOGIND' , '1')
- endif
- 
- if get_option('consolekit')
-diff --git a/meson_options.txt b/meson_options.txt
-index c9b7ba675..6b0902225 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -18,6 +18,7 @@ option('plugin_uefi', type : 'boolean', value : true, description : 'enable UEFI
- option('plugin_nvme', type : 'boolean', value : true, description : 'enable NVMe support')
- option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
- option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units')
-+option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
- option('tests', type : 'boolean', value : true, description : 'enable tests')
- option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
- option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules')
-diff --git a/src/fu-util-common.c b/src/fu-util-common.c
-index cdeb2ff6b..667c142fb 100644
---- a/src/fu-util-common.c
-+++ b/src/fu-util-common.c
-@@ -184,7 +184,7 @@ fu_util_update_shutdown (GError **error)
- 	if (connection == NULL)
- 		return FALSE;
- 
--#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_LOGIND
- 	/* shutdown using logind */
- 	val = g_dbus_connection_call_sync (connection,
- 					   "org.freedesktop.login1",
-@@ -229,7 +229,7 @@ fu_util_update_reboot (GError **error)
- 	if (connection == NULL)
- 		return FALSE;
- 
--#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_LOGIND
- 	/* reboot using logind */
- 	val = g_dbus_connection_call_sync (connection,
- 					   "org.freedesktop.login1",
diff --git a/sys-apps/fwupd/files/fwupd-r1 b/sys-apps/fwupd/files/fwupd-r1
new file mode 100644
index 000000000000..4a4865ef15af
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-r1
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Firmware update daemon"
+pidfile="/var/run/fwupd.pid"
+command="/usr/libexec/fwupd/fwupd"
+command_background="true"
+
+depend() {
+	need %SEAT_MANAGER% dbus
+	before xdm
+}
diff --git a/sys-apps/fwupd/fwupd-1.2.4-r2.ebuild b/sys-apps/fwupd/fwupd-1.2.6-r1.ebuild
index 43db76e1c25a..3006840299ec 100644
--- a/sys-apps/fwupd/fwupd-1.2.4-r2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.6-r1.ebuild
@@ -13,8 +13,8 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="agent colorhug dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )
@@ -80,8 +80,6 @@ BDEPEND="
 # NOT a build time dependency. The build system does not check for dbus.
 PDEPEND="sys-apps/dbus"
 
-PATCHES=( "${FILESDIR}/${P}-elogind.patch" ) # bug 668522
-
 src_prepare() {
 	default
 	sed -e "s/'--create'/'--absolute-name', '--create'/" \
@@ -95,12 +93,15 @@ src_configure() {
 	xdg_environment_reset
 	local emesonargs=(
 		--localstatedir "${EPREFIX}"/var
+		-Dagent="$(usex agent true false)"
 		-Dgtkdoc="$(usex doc true false)"
 		-Delogind="$(usex elogind true false)"
 		-Dgpg="$(usex gpg true false)"
 		-Dman="$(usex man true false)"
 		-Dpkcs7="$(usex pkcs7 true false)"
 		-Dplugin_dell="$(usex dell true false)"
+		# Dependencies are not available (yet?)
+		-Dplugin_modem_manager="false"
 		-Dplugin_nvme="$(usex nvme true false)"
 		-Dplugin_redfish="$(usex redfish true false)"
 		-Dplugin_synaptics="$(usex dell true false)"
@@ -109,15 +110,25 @@ src_configure() {
 		-Dsystemd="$(usex systemd true false)"
 		-Dtests="$(usex test true false)"
 	)
-	use elogind || use systemd || emesonargs+=( -Dconsolekit=true )
+
+	if use elogind || use systemd ; then
+		emesonargs+=( -Dconsolekit=false )
+	else
+		emesonargs+=( -Dconsolekit=true )
+	fi
+
 	meson_src_configure
 }
 
 src_install() {
 	meson_src_install
-	doinitd "${FILESDIR}"/${PN}
 
-	if ! use systemd && ! use elogind ; then
+	sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
+		"${FILESDIR}"/${PN}-r1 \
+		> "${T}"/${PN} || die
+	doinitd "${T}"/${PN}
+
+	if ! use systemd ; then
 		# Don't timeout when fwupd is running (#673140)
 		sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
 			-i "${ED}"/etc/${PN}/daemon.conf || die
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index d6ab1d6e8c68..64d755cca4f6 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -6,6 +6,7 @@
     <name>Lars Wendler</name>
   </maintainer>
   <use>
+    <flag name="agent">Enable update notification agent</flag>
     <flag name="colorhug">Enable ColorHug support through
       <pkg>x11-misc/colord</pkg> package.</flag>
     <flag name="dell">Enable Dell-specific support.</flag>
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 5f3ae349fef7..87d4ba88dd63 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,7 +1,9 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
+DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e692b45f1afe91871621dbed008298154d94813711b8ab89a9ad2e9fffa5ba1e738a613e5e50681b0abea4bfcc92677 SHA512 071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
 DIST help2man-1.47.8.tar.xz 200264 BLAKE2B 2650909986649a471cfa13db96fda34e864312aab96ffa2692c2d38cbb9b36149d90a398b3ea9568992b9da01ab7aeeab8022ee74edebf2e7c83cac48c951e7c SHA512 05e420560b143042418db2e992beaef45cc5a568cdbf640c7b285ba2dc322290d14e0df978ff4c412a99f4346e38f6fb9796ebda695ddc002a3d0e74e85725d6
 DIST help2man-1.47.9.tar.xz 202012 BLAKE2B 08d0a906e61978b12fd00b9d807b8cdb6b2436165223aff539957f217786442bc31fb5d437833d6dae3bd6a4b83e1df28d7bd434d0c753f38fea96b8cf751b76 SHA512 91cddd5ebc8eb2a89bc27fab4298ee18c18fa73363378be8c220258bf415634a0147b8502970c5fea48ddaccddda63753cbd215bf6894798452c2b4b89c4309a
+EBUILD help2man-1.47.10.ebuild 1051 BLAKE2B 1cfcf9550bc7bb12c16c0dd82a578fedf14147c40f3ef6b4c03b20b4125ddc0504bab0bbb3655f0f7765c384ea860cf39c1daa4e8190ec554f691bbc4c0905cc SHA512 8413e59d932a07a6d7c7d33031829931c0cf63bec40ace9003a008146bb661c7678a34a151afdea73d2df8fc2fac3785bab46e890d3815fe268655619912202c
 EBUILD help2man-1.47.6.ebuild 1038 BLAKE2B d619dac2146e132d60389ede2dcede7cd22437d5ce7b6c60f485923611b2238a0b12a5f240267037ae934b9d1321660bbf459ca5ca8157150c96d74fb51bb31b SHA512 ba5512917df566f73e5a52e4411625251d166e807087b0be23988259d63d3f99368630385eb60e1ce74f7d9ad14b1fd745326a1317908010af7b753f7ef6266e
 EBUILD help2man-1.47.8.ebuild 1051 BLAKE2B 6bde9567cb042fb11341f6d6081b7efefaf3f0c1231523040d42267d9abd1d774e276c497d767a0ca475e64524e92f71d30c811532296cc166861ed95a0e68f4 SHA512 a1dafde12c1bd8a58714601bc36e28589940d3e709060722b8996fcce0087d7604f6342d1fe006b297e29100d4d216f12d75377103c31642a43ed93b3170fc6b
 EBUILD help2man-1.47.9.ebuild 1051 BLAKE2B 1cfcf9550bc7bb12c16c0dd82a578fedf14147c40f3ef6b4c03b20b4125ddc0504bab0bbb3655f0f7765c384ea860cf39c1daa4e8190ec554f691bbc4c0905cc SHA512 8413e59d932a07a6d7c7d33031829931c0cf63bec40ace9003a008146bb661c7678a34a151afdea73d2df8fc2fac3785bab46e890d3815fe268655619912202c
diff --git a/sys-apps/help2man/help2man-1.47.10.ebuild b/sys-apps/help2man/help2man-1.47.10.ebuild
new file mode 100644
index 000000000000..c6386779e3bf
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.47.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="https://www.gnu.org/software/help2man/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="dev-lang/perl
+	nls? ( dev-perl/Locale-gettext )"
+DEPEND=${RDEPEND}
+
+DOCS=( debian/changelog NEWS README THANKS ) #385753
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i \
+			-e 's/-shared/-bundle/' \
+			Makefile.in || die
+	fi
+	default
+}
+
+src_configure() {
+	# Disable gettext requirement as the release includes the gmo files #555018
+	econf \
+		ac_cv_path_MSGFMT=$(type -P false) \
+		$(use_enable nls)
+}
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 67a01d666a1f..b3c666c9f42b 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -2,7 +2,7 @@ DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b
 DIST hwids-20180917.tar.gz 3211960 BLAKE2B d1dc00994a63a6cb6f7c41c73267dcc38b59a46b9e627fac9d6df285b8d1abf5d1335c02c047bff2b09c9ed9f8e4a1c79329c1bd7dd932949d3db2bbb5b9b2e6 SHA512 9fdcd5a7b3adca1bed886aa83e9cf3944391a819fc9f09b673bd815d95e6e70cecf40d8e87287207e34bfeb58c888188fc61b1c0ac13c1ecab0efbdb5100f8d9
 DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a6150ec70dc1416dcb507dfa4d8ad9ce325204791a24e5646dee67aea0c1566c15dcddb65a5d9dddbbbb9b896398 SHA512 6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e
 EBUILD hwids-20171003.ebuild 1692 BLAKE2B f5f7f80998064870b8f7a515e19b40412b5085ec46b33d2ffec5f721138be36de0d4dd3687c844d6988619a0276e7a02f1c3195b4b449f3559a9ecfb9f565fd2 SHA512 a6bae7bddd1ffcfc18965da4e568afc1e5246b3746f3b0c1453126475ef33f6f939c76ad5b5291df589e92489c5a0ea038e808ab38350bd52b7642291f50ca01
-EBUILD hwids-20180917.ebuild 1728 BLAKE2B 27809105939f83b68a978d242fd1ee03fcbbf4b208d3062bcb49ad2f9adefaa848bb6d1d05ac7cc4e4d3bd00d9c56ce01fb7d01e2e4cae970ed83b3a0fc6a55d SHA512 661a1f8a9822de548f334b06c7e22ca17fc0f554bf7b965dff770cf45a56a7a87d87bc15f4078a9c2ed403f71d7a7e1a54c63bfe1d799fce1d569ee1c804471e
+EBUILD hwids-20180917.ebuild 1727 BLAKE2B 1bbf331166ed8a4da1f6b371da7b4baba0b4a95a5f1edec4856e6bdcd120728cb6a4fdd0793214f855662aa9bae37e4df40770744f2e9030299257ed52b1395b SHA512 035d60d8b42941f9919fbe03865682073ca936ab992bd80fffee4e1728f063cc378c18eb61ae790131bffe4594083ba6d9da723cc11d12e059deb36fe09e0068
 EBUILD hwids-20190316.ebuild 1740 BLAKE2B 6c831c3994c80d603c3c3babfe9ba1e07875b486e8b8ad8fcb233cda01f5385f91c89a11191c0935d41ef79bd9a936b780a13b4cf500ba3279fa5d98b1394d0f SHA512 aefb4150e54ce9a408be6614cfd39422e5abf9a60311edf03c62da3fd42730aa1e2d624405b7f8f9ddd75e99f8ad32f3914eccb4b5e2373867938c10e93533ec
 EBUILD hwids-99999999.ebuild 1740 BLAKE2B 6c831c3994c80d603c3c3babfe9ba1e07875b486e8b8ad8fcb233cda01f5385f91c89a11191c0935d41ef79bd9a936b780a13b4cf500ba3279fa5d98b1394d0f SHA512 aefb4150e54ce9a408be6614cfd39422e5abf9a60311edf03c62da3fd42730aa1e2d624405b7f8f9ddd75e99f8ad32f3914eccb4b5e2373867938c10e93533ec
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20180917.ebuild b/sys-apps/hwids/hwids-20180917.ebuild
index c5a242584fcb..b700d909bb0b 100644
--- a/sys-apps/hwids/hwids-20180917.ebuild
+++ b/sys-apps/hwids/hwids-20180917.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/install-xattr/Manifest b/sys-apps/install-xattr/Manifest
index b0118527775a..dfa6716a822a 100644
--- a/sys-apps/install-xattr/Manifest
+++ b/sys-apps/install-xattr/Manifest
@@ -1,5 +1,6 @@
 DIST install-xattr-0.5.tar.bz2 16136 BLAKE2B 8973584d4819b9f500dcfb76ed0eaddce725b78e72dfa73ccff52c745e6f041926f8f930e5c5035fa888402c6b530207546098864266268dee2c897404bf7c74 SHA512 0bbde3a548fc5062041b38f90ac09c402f3cb0aebf4f0c331552fc44d39dd3d5e4d73bca0811de36c53af8afa5d22e543a7c90107d272f2a1b97c819b244eb7c
-EBUILD install-xattr-0.5-r1.ebuild 952 BLAKE2B 943b73ec9393c6775a6599fc2b0451a9eb1bf391552462330fc3a15c85c13a8f883a424d1bca39158d07af7b9cb9dbe1ac668acfc6ef4fa51f80834b271fa6f0 SHA512 acaf7ae622eb0f24bf6017765b200a8e918000d643b800151277f344e7f2d76aeaa5ceebc38441c86d35867d27e89e3d1f303b9c4dd6a5d026f2085fd7d2d4a9
+DIST install-xattr-0.6.tar.bz2 16207 BLAKE2B 2f771aa3e81d594eda951ae34242ecf658e18d72f2cb4c8540ab8af40af750e50ad881c44476af84bb05c3ced9df052f08ea8f81ce490f250010e74b190bd1d9 SHA512 1af66ac8ea05b4c32b905f5d5e340e0402fd19d9f5c2fa51c32d0842effafded8327fce58adffdd197b47c0d4d90f8b669c309f512b64e90f86adc7afe995bcf
 EBUILD install-xattr-0.5.ebuild 910 BLAKE2B 99504c17e85a6c5fd9a5d17f73ffb929879ac8f55773bb48e844405371ecc1965b1816a077d57c1093e2f20f4bf8edbdd7653037f486be4648f542f58777dd80 SHA512 edcb914a669002180eac241d124805c8017cd446405f3b8c59a4341f655620385c192e60ab8f681c0c336c3b30887c8cc855472a2e5a4e638790354e9eccd5e8
-EBUILD install-xattr-9999.ebuild 952 BLAKE2B 943b73ec9393c6775a6599fc2b0451a9eb1bf391552462330fc3a15c85c13a8f883a424d1bca39158d07af7b9cb9dbe1ac668acfc6ef4fa51f80834b271fa6f0 SHA512 acaf7ae622eb0f24bf6017765b200a8e918000d643b800151277f344e7f2d76aeaa5ceebc38441c86d35867d27e89e3d1f303b9c4dd6a5d026f2085fd7d2d4a9
+EBUILD install-xattr-0.6.ebuild 1004 BLAKE2B 4a2eebf28c7547f88c94258789e9d2103898b522c01ed836ad2dd79c9a3cbb9f925d26d43d4aae8b33c24052a76e4d1090709d5dcb5ed01e8b0cc43269294a10 SHA512 205371c6bbbfe9e918a58aa9f808c4754771007206de0b5466a693af747f3e5ccc32c0144fe17288022e9b59350cdd49de97acfb9af4fe2dcb394538e9c12ce0
+EBUILD install-xattr-9999.ebuild 1004 BLAKE2B 4a2eebf28c7547f88c94258789e9d2103898b522c01ed836ad2dd79c9a3cbb9f925d26d43d4aae8b33c24052a76e4d1090709d5dcb5ed01e8b0cc43269294a10 SHA512 205371c6bbbfe9e918a58aa9f808c4754771007206de0b5466a693af747f3e5ccc32c0144fe17288022e9b59350cdd49de97acfb9af4fe2dcb394538e9c12ce0
 MISC metadata.xml 330 BLAKE2B c6c9d215cd38a95f824fac1761bc4e6048ac50688318fa33a94d6d97739e726efaff57e4e0814d16b5336cf4481498580d4e2743404a619cad0d81c052880b6f SHA512 6bca1bac9701b2dde509f25dd18dd819d769cda23669faf680800747a37369002eb3954606fc6541dec324473eb13a78bc0c8a97085436072ee076d85e7a2345
diff --git a/sys-apps/install-xattr/install-xattr-0.5-r1.ebuild b/sys-apps/install-xattr/install-xattr-0.6.ebuild
index 830b2d6cd4f9..2da2f9601445 100644
--- a/sys-apps/install-xattr/install-xattr-0.5-r1.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Wrapper to coreutil's install to preserve Filesystem Extended Attributes"
 HOMEPAGE="https://dev.gentoo.org/~blueness/install-xattr/"
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
@@ -23,6 +23,7 @@ SLOT="0"
 src_prepare() {
 	default
 	tc-export CC
+	append-cppflags "-D_FILE_OFFSET_BITS=64"
 }
 
 src_compile() {
diff --git a/sys-apps/install-xattr/install-xattr-9999.ebuild b/sys-apps/install-xattr/install-xattr-9999.ebuild
index 830b2d6cd4f9..2da2f9601445 100644
--- a/sys-apps/install-xattr/install-xattr-9999.ebuild
+++ b/sys-apps/install-xattr/install-xattr-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Wrapper to coreutil's install to preserve Filesystem Extended Attributes"
 HOMEPAGE="https://dev.gentoo.org/~blueness/install-xattr/"
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
@@ -23,6 +23,7 @@ SLOT="0"
 src_prepare() {
 	default
 	tc-export CC
+	append-cppflags "-D_FILE_OFFSET_BITS=64"
 }
 
 src_compile() {
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index f9bca6587f36..28d0db93c8d7 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -7,5 +7,5 @@ DIST ipmiutil-3.1.3.tar.gz 1698835 BLAKE2B a540a4522a22f98ad47c89e59f371e5304583
 EBUILD ipmiutil-3.0.6.ebuild 1334 BLAKE2B 01ed4959fbefdc4487df779d5659a4b9d05893b536da58f1a828e435cf34a4938e2d05ae69568a728b0a91ab6380f040d6ad27b506ba8901f0d191f4ab7241c3 SHA512 a565e97bf6a0875a50033736a8172527f3a745e0ad45ff3d44eb985576e0d597585261bfbce779d552a6d0589ceadf6c453abcb9864e0ecac2867b9ceeacc18c
 EBUILD ipmiutil-3.0.9.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
 EBUILD ipmiutil-3.1.2.ebuild 1459 BLAKE2B 05a9ea153c3da53dab123c1088441e08c246e634aaddbd41b44a13a72917bf70766a1de04a485fab592c7c9e3db87e1e6a0286525d9540f6b183b9dae0869442 SHA512 61dcd5b01576d7eb1fbb8f324c41bfe51788e1e4f58414dbc225145c4a9cd3764b78abf62e127a60be12cdd322cf774f620a3eb413e26406abf3ac2540e387fd
-EBUILD ipmiutil-3.1.3.ebuild 1456 BLAKE2B c3259c90ef77ef51af5723062317681bef1c28f9b69c3bbecba9f222fede2788cc8406b748d37926356a09bbebf6e53f14408d7684aa8856dea8674405e862c1 SHA512 5f7ceb87a1a7b26b301abadaf28fec563b8490cf98a2925e6aa75b11903eab447ccca3aaf70fcfe62d158893b8bdfdfe3f17ce4c4c3ae511cfeb98e9604b0bdb
+EBUILD ipmiutil-3.1.3.ebuild 1461 BLAKE2B c0af26a98214d7ec3b6abaa86ed39a33b0a7f1c9e9b6deed89054179148c7197f92cca199f72b0b038144ba1d7ba8d4c83caa53025cba13cf151b97e29c42833 SHA512 444b4bb91e57f3288c15f734a7b88a40559625648af995b0d4d209662cb0c1e09382c0cab8f69132bb236bbeee0cbdd605769d709c554489419a8e7386652cfd
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.3.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.3.ebuild
index c3f0ddfbf05e..426199d3e70b 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.1.3.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/openssl-1:0="
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 1312923518c9..4a57ca27a29d 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -8,9 +8,11 @@ DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe
 DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
 DIST iproute2-4.20.0.tar.xz 707016 BLAKE2B d62c6b995c4c1f79617e2f8149ff2ed297d741965e81bffebfa475514f5e96f0c9300e65d12bdd14ab492ce66675677eb41af6816876d5e1360218e4f32f4bc8 SHA512 ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b
+DIST iproute2-5.0.0.tar.xz 710656 BLAKE2B 0adf7554c4d3d16821297158e025894efdb72834b93caa89521e200c70e287e7d1ebebd22dd91593483ed4e2f3274b370bbb786b9c249263c84b2345a1f5b358 SHA512 4b1649ccdfefbb5eace9d444843492db9d1357b9b3ee1567d6241283cde00ad3c9dbee6b8e507c4e9a5ca0a6378b71ca0c5fbf1e2ed2a9c7d479daf5d49eaed0
 EBUILD iproute2-4.14.1-r2.ebuild 4092 BLAKE2B b3e3ae2b24182aa2d99f16120231bd4ac2029b73b9af53f0098046ecce73049e3dac510ee405f4dd12aa8c0e45b0504b7f82425c8063d05b5a958475ac2ce9d6 SHA512 c4f5cb98704d5a78d74a17a057bebb89f059c0a622d5e7ed28c6b36a73ed6be6d2a9205ed6b1ac4401f23ae46372e25d85a1038631d6ed215b2fd68c2e6a4c73
 EBUILD iproute2-4.17.0-r1.ebuild 4265 BLAKE2B 12f2034aebd08983d8349dfa07935bfbeb04126b2af45c1a88c00e7a40ff865fb00e498955aa2f0e6a0e1c55e702d281f653b1cf9817e8bdeebc21b8e79b1fbe SHA512 e46431a3827de15fe0d0bd4837a66f378c3e4bc067ca29ae5292faa2bcda10b3bfc79e1eedc31ab4f38db8d245750bc9de9733202e87a2a974bef2cff60640dd
 EBUILD iproute2-4.19.0-r1.ebuild 4278 BLAKE2B bedd85f0cfac4e0db1e210067f287bd4be04e89d6623373ed61097ce91e59636f00ef68a1a39335dc43335e5ca6d3e5ab94091084ae6fc703b7fa939305ca15f SHA512 a71917519ea3a8cff82a3eb5f50cb71723bd3749d2dfa7d7e7a5fa4db27325a14880d9b108ef4bbe450553c65f4711f73f94208acc19b12263cd97ebd9bafa18
 EBUILD iproute2-4.20.0.ebuild 4314 BLAKE2B a4267caef40fefa2ef46a8103c0ca558a51f4f298ed25630614752035c3d2cdadef160904c77f46a978c3d85f2fbf1714d5cd0b9d9c6fb52b8d04cf68f52f664 SHA512 68768fd94cc1571b51e3e87dfa8f0fe009ca354ccca5a5e9b2faa0db5e6f827be637f5cc5594d7c08136e9ff2e8b664bedd2296c02bcad143150e7ebe3c765e5
-EBUILD iproute2-9999.ebuild 4310 BLAKE2B 0569ce4999daa8315da5fa8692ad3bef4623133ea91c8520950b14c0dabeb63f922fbdda33ddad194b44ea205554a61afe225a28f9e5711bb501f3add3fd2f7d SHA512 d70a72670a882f7b1ecc13018e993282a0d532d3d8a8e024d8ab655746daf00d7316ab71ec9caad15c1d9195ba25aea722adb1b73a0753f77fefe48516f03e71
+EBUILD iproute2-5.0.0.ebuild 4345 BLAKE2B 42ac27a91a993f7078ce0c0abfea29ca1819772fde0a48676cd3150a1be529a710a7bfa849f34fb289ccde85d9e6fc18661ca304205c3c58a40e28846edf4b28 SHA512 33259ab7401d30f8ba90679f3432842cf2aadb2e2748a12cbcbd50af106ba692c33d4c434a49f4e523a9e49b14ce9464d5e6ed6fc7a8bb2bc4e1d5499ccb6b55
+EBUILD iproute2-9999.ebuild 4345 BLAKE2B 42ac27a91a993f7078ce0c0abfea29ca1819772fde0a48676cd3150a1be529a710a7bfa849f34fb289ccde85d9e6fc18661ca304205c3c58a40e28846edf4b28 SHA512 33259ab7401d30f8ba90679f3432842cf2aadb2e2748a12cbcbd50af106ba692c33d4c434a49f4e523a9e49b14ce9464d5e6ed6fc7a8bb2bc4e1d5499ccb6b55
 MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97
diff --git a/sys-apps/iproute2/iproute2-5.0.0.ebuild b/sys-apps/iproute2/iproute2-5.0.0.ebuild
new file mode 100644
index 000000000000..c6720ff8aed3
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-5.0.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	dev-libs/libbsd
+	!minimal? ( net-libs/libmnl )
+	caps? ( sys-libs/libcap )
+	elf? ( virtual/libelf )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	iptables? ( virtual/pkgconfig )
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	>=sys-kernel/linux-headers-3.16
+	virtual/pkgconfig
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
+)
+
+src_prepare() {
+	if ! use ipv6 ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	if use minimal ; then
+		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'int main(){return 0;}' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	# run "configure" script first which will create "config.mk"...
+	econf
+
+	# ...now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_CAP      := $(usex caps y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
+		SBINDIR="${EPREFIX%/}"/sbin \
+		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
+		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX%/}"/usr/share/man \
+		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED%/}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		keepdir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
+	fi
+}
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index f9527624933e..c6720ff8aed3 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,11 +18,12 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm caps berkdb elf +iptables ipv6 minimal selinux"
+IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
 
 # We could make libmnl optional, but it's tiny, so eh
 RDEPEND="
 	!net-misc/arpd
+	dev-libs/libbsd
 	!minimal? ( net-libs/libmnl )
 	caps? ( sys-libs/libcap )
 	elf? ( virtual/libelf )
@@ -39,18 +40,19 @@ DEPEND="
 	>=sys-devel/bison-2.4
 	sys-devel/flex
 	>=sys-kernel/linux-headers-3.16
+	virtual/pkgconfig
 	elibc_glibc? ( >=sys-libs/glibc-2.7 )
 "
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
 )
 
 src_prepare() {
 	if ! use ipv6 ; then
 		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
+			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
 		)
 	fi
 
@@ -61,7 +63,6 @@ src_prepare() {
 		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
 		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
 		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
 		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
 		Makefile || die
 
@@ -72,10 +73,12 @@ src_prepare() {
 		man/man8/ip-netns.8 || die
 
 	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
 	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
 
-	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
+	if use minimal ; then
+		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+	fi
 }
 
 src_configure() {
@@ -146,7 +149,7 @@ src_install() {
 	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
 
 	if use berkdb ; then
-		dodir /var/lib/arpd
+		keepdir /var/lib/arpd
 		# bug 47482, arpd doesn't need to be in /sbin
 		dodir /usr/bin
 		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
new file mode 100644
index 000000000000..a0be9731680b
--- /dev/null
+++ b/sys-apps/likwid/Manifest
@@ -0,0 +1,4 @@
+AUX likwid-4.3.1-fix-gnustack.patch 1014 BLAKE2B 68ac831c96f826156238bbb4178c4923cb869a2757928af12f788a01067fb129326fec0c7a98b073f504f0aa8234d42dcd9fe7cdb0185b8107a6db3962cfbc08 SHA512 ab12e2ebebfca5c87b1ad2c89c5073aaa6987e8d440cfdfffc107233fc5b66c6562f25fdbd6720df3c1477becaaa3c3ac470fa4f99ac15bb78ea09fa06460a4b
+DIST likwid-4.3.3.tar.gz 1579433 BLAKE2B 9ec468bba009dec860b24c9c55c3d6023ffda3ab0985d835796686ba52d1d3372b2bfce926cf229388978de34e1ab0b41d8d27c88623c51c3e8ff1e9d674906b SHA512 ae4d68e238bc40e4a4ab5df628561c9bb7a0ef8727d5779dba2c32fff0be1dd333532bee7e4c197e5fe286de81d35b863ef09f4bc8b9f9145360e6e461f3d94e
+EBUILD likwid-4.3.3.ebuild 5585 BLAKE2B efd92d64517d84e798b9db705aa656091e8d4176d94190e44c51fb058548a9a5eb5f95d129f4bba637f12ce745595618bd4d2120d2872ed75192ea52f5dcf2ad SHA512 e5ff5bf6288ffe65b45193199b9dbfcd2af65c703c34b2e0802fa23600c17607774998ca499757c98cd59aee16b62906375d32ef01c69411efa19f9308b77b31
+MISC metadata.xml 333 BLAKE2B bb0321ece26d2e67d8c0cce9895247e8dcb84d72ca1b0186f066e639805e4006d9a8288403042c6fd96fd02489b554eb208843eafe436140f6e352121e5b1806 SHA512 bc44f5e8d86426c7fc32dc2d75c42d85a456c69cacccc1f44dbb8c561defb1748dd665fcc916d3a6577766a3d7bbd0944fa73f7df04b2d17b3fd3353929fa2e2
diff --git a/sys-apps/likwid/files/likwid-4.3.1-fix-gnustack.patch b/sys-apps/likwid/files/likwid-4.3.1-fix-gnustack.patch
new file mode 100644
index 000000000000..c543a6ccd2d3
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-4.3.1-fix-gnustack.patch
@@ -0,0 +1,32 @@
+--- likwid-likwid-4.3.1/bench/Makefile.org	2018-02-26 14:03:17.706837535 +0800
++++ likwid-likwid-4.3.1/bench/Makefile	2018-02-26 14:04:19.427195208 +0800
+@@ -115,6 +115,7 @@
+ $(BUILD_DIR)/%.o:  $(BUILD_DIR)/%.pas
+ 	@echo "===>  ASSEMBLE  $@"
+ 	$(Q)$(PAS) -i $(PASFLAGS) -o $(BUILD_DIR)/$*.s $<  '$(DEFINES)'
++	@cat ../fix_gnustack.txt >> $(BUILD_DIR)/$*.s
+ 	$(Q)$(AS) $(ASFLAGS)  $(BUILD_DIR)/$*.s -o $@
+ 
+ ifeq ($(findstring $(MAKECMDGOALS),clean),)
+
+diff --git a/fix_gnustack.txt b/fix_gnustack.txt
+new file mode 100644
+index 0000000..965af94
+--- /dev/null
++++ likwid-likwid-4.1.1/fix_gnustack.txt
+@@ -0,0 +1,3 @@
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+
+--- likwid-likwid-4.3.1/src/loadData.S.org	2018-02-26 14:06:16.418872121 +0800
++++ likwid-likwid-4.3.1/src/loadData.S	2018-02-26 14:19:03.281289307 +0800
+@@ -41,4 +41,6 @@
+ #endif
+ .size _loadData, .-_loadData
+ 
+-
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+
diff --git a/sys-apps/likwid/likwid-4.3.3.ebuild b/sys-apps/likwid/likwid-4.3.3.ebuild
new file mode 100644
index 000000000000..05afdd520646
--- /dev/null
+++ b/sys-apps/likwid/likwid-4.3.3.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+#PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+# 4.3.4 will need python-single-r1
+inherit fcaps fortran-2 linux-info toolchain-funcs
+
+DESCRIPTION="A performance-oriented tool suite for x86 multicore environments"
+HOMEPAGE="https://github.com/rrze-likwid/likwid"
+SRC_URI="https://ftp.fau.de/pub/likwid/${P}.tar.gz"
+
+# If this ebuild is changed to use the bundled Lua-5.3, then MIT should be
+# added to the LICENSE field.
+LICENSE="GPL-3+ BSD"
+
+SLOT="0"
+KEYWORDS="~amd64" # upstream partial support exists for x86 arm arm64
+IUSE="fortran" # ${PYTHON_REQUIRED_USE}
+
+# lua:
+# likwid's primary functionality is driven by a set of lua scripts installed in
+# /usr/bin/
+# likwid bundles lua-5.3.2, AND supports using a system copy of lua-5.2 or
+# lua-5.3, which we use. This ebuild uses the system copy of Lua instead.
+#
+# hwloc:
+# likwid bundles a MODIFIED copy of hwloc-2.0.0a1 with specific configuration
+# for CPU probing & access
+#
+# Perl:
+# likwid uses Perl to convert from an internal text format to ASM listings
+# likwid also uses perl for some installed helper scripts
+# The build system bundles some Perl modules, that are not removed at this time:
+# Parse-RecDescent
+# Template
+#
+# Python:
+# Python3 is used for one helper script, filter/json, added after 4.3.3
+CDEPEND="dev-lang/perl
+	dev-lang/lua:5.3"
+
+# filter/json uses Python3
+RDEPEND="${CDEPEND}"
+	#${PYTHON_DEPS}"
+
+# Part of the build process depends on Data::Dumper
+#	perl-core/Data-Dumper"
+DEPEND="${CDEPEND}"
+
+CONFIG_CHECK="~X86_MSR"
+
+FILECAPS=(
+	-M 755 cap_sys_rawio+ep usr/sbin/likwid-accessD
+	--
+	-M 755 cap_sys_rawio+ep usr/sbin/likwid-setFreq
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3.1-fix-gnustack.patch"
+	# Old patches are obsolete:
+	#"${FILESDIR}/${PN}-4.3.1-Makefile.patch"
+	#"${FILESDIR}/${PN}-4.3.1-config.mk.patch"
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	#python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Ensure we build with a non executable stack
+	sed \
+		-e '/^SHARED_CFLAGS/s/$/ -Wa,--noexecstack/' \
+		-i make/include_{GCC*,CLANG}.mk \
+		|| die "Failed to set nonexecstack"
+
+	# Make the install targets respect Q= for being quiet or not
+	# MUCH easier for debugging
+	sed -r \
+		-e '/^install/,/^[a-z]/{/^\t@/{ s/@/$(Q)/; }}' \
+		-i \
+		Makefile || die "Failed to sed Makefile"
+
+	sed -i \
+		-e '/^\.NOTPARALLEL:/d' \
+		Makefile \
+		bench/Makefile \
+		ext/hwloc/Makefile || die "Failed to re-enable parallel"
+
+	default
+}
+
+export_emake_opts() {
+	# Warning: this build system uses PREFIX in a way that differs from
+	# autoconf! It's more like:
+	# PREFIX=$(DESTDIR)$(INSTALLED_PREFIX)
+	# it's not 100% like that, because parts of the Makefiles are inconsistent.
+	# this is the same solution used in the upstream RPM specs
+	# these variables are uppercase so they match what's put into Make.
+	local INSTALLED_PREFIX=/usr
+	local INSTALLED_LIBPREFIX=/usr/$(get_libdir) # upstream is '$(INSTALLED_PREFIX)/lib'
+	local INSTALLED_MANPREFIX=/usr/share/man # upstream has it as used but undefined variable.
+	# TODO: support LUA_SINGLE_TARGET here later for Lua 5.2
+	local LUASLOT='5.3'
+	# If the build is too loud, pass 'Q=@'
+	src_compile_opts=(
+		"Q="
+		"INSTALLED_PREFIX=${INSTALLED_PREFIX}"
+		"INSTALLED_LIBPREFIX=${INSTALLED_LIBPREFIX}"
+		"INSTALLED_MANPREFIX=${INSTALLED_MANPREFIX}"
+		"PREFIX=${INSTALLED_PREFIX}"
+		"LIBPREFIX=${INSTALLED_LIBPREFIX}"
+		"MANPREFIX=${INSTALLED_MANPREFIX}"
+		"CC=$(tc-getCC)"
+		"ANSI_CFLAGS=${CFLAGS}"
+		"INSTRUMENT_BENCH=true"
+		"LUA_INCLUDE_DIR=/usr/include/lua${LUASLOT}"
+		"LUA_LIB_DIR=/usr/$(get_libdir)"
+		"LUA_LIB_NAME=lua${LUASLOT}"
+		"LUA_BIN=/usr/bin"
+		"FORTRAN_INTERFACE=$(usex fortran likwid.mod false)"
+		"FC=$(usex fortran "${FC}" false)"
+		"FCFLAGS=-J ./ -fsyntax-only" # needed for building correctly
+	)
+	src_install_opts=(
+		"PREFIX=${D}${INSTALLED_PREFIX}"
+		"LIBPREFIX=${D}${INSTALLED_LIBPREFIX}"
+		"MANPREFIX=${D}${INSTALLED_MANPREFIX}"
+	)
+}
+
+src_compile() {
+	export_emake_opts
+	emake \
+		"${src_compile_opts[@]}" \
+		|| die 'emake failed'
+}
+
+src_install () {
+	export_emake_opts
+	emake \
+		"${src_compile_opts[@]}" \
+		"${src_install_opts[@]}" \
+		DESTDIR="${D}" \
+		install || die 'emake install failed'
+
+	use fortran && doheader likwid.mod
+
+	# Fix Python filter added shortly after 4.3.3
+	#python_fix_shebang "${D}"/usr/share/likwid/filter/
+
+	# Do NOT use 'doman'! The upstream 'make install' target does a sed as it's
+	# generating the final manpage to the real install dir; and the copies in
+	# ${S} are unmodified.
+	dodoc README.md CHANGELOG doc/logo.png
+	dodoc doc/*.txt
+	dodoc doc/*.md
+	dodoc -r doc/applications doc/archs
+	# Fix upstream partial doc install
+	rm -rf "${D}"/usr/share/likwid/docs || die
+	ln -sf "/usr/share/doc/${PF}" "${D}"/usr/share/likwid/docs || die
+}
+
+pkg_preinst() {
+	# This is now a symlink, but used to be a plain directory
+	OLDDOCDIR=/usr/share/likwid/docs
+	if [[ ! -L "${OLDDOCDIR}" && -d "${OLDDOCDIR}" ]]; then
+		einfo "Cleaning up old docdir at ${OLDDOCDIR}"
+		rm -rf "${OLDDOCDIR}" || die
+	fi
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	einfo "If you get 'Cannot gather values from MSR_PLATFORM_INFO', then 'modprobe msr'!"
+	einfo
+	ewarn "To enable users to access performance counters it is necessary to"
+	ewarn "change the access permissions to /dev/cpu/msr[0]* devices."
+	ewarn "It can be accomplished by adding the following line to file"
+	ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\""
+	ewarn "Alternatively, assign the MSR files to a unique group and use mode 0660"
+}
diff --git a/sys-apps/likwid/metadata.xml b/sys-apps/likwid/metadata.xml
new file mode 100644
index 000000000000..3a16425e9da4
--- /dev/null
+++ b/sys-apps/likwid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rrze-likwid/likwid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-apps/makedev/Manifest b/sys-apps/makedev/Manifest
index e42d22da4f48..c9a37900246c 100644
--- a/sys-apps/makedev/Manifest
+++ b/sys-apps/makedev/Manifest
@@ -1,5 +1,5 @@
 AUX makedev-3.23.1-headers.patch 433 BLAKE2B bd8e6e4b32c69be3b5ccec72b425cdafbfa9723b0fdd1b634da6f130590a72fd251c6f21ff29224a705211274efad53f8fecff3ac3710eccff4833e1769c75dc SHA512 ffc80692b9bc317c0c14c5e7211155c4a7849967a9a3588a811f21feb6034da264c7aecdb7ce4e67786aa2a28f8d33af381ff410afd118ab44f47edddc421d0d
 DIST MAKEDEV-3.23-1.tar.gz 122613 BLAKE2B 2b0a4a02db36d7a3a71018378396c7d5ac8bbd4e9f8b24a1d3659084f381e8cc686f3d9198dc54e1efd93095ea09c21aab3b9866b942bff8e8a393355403f28a SHA512 5ca82cdcc4544042ede552370acf6266929fa34d177bd8e831573ccc1c57e06ec87766b9e60a686ec1449b204ae0ac3c048eab32b57ce8d610366219d3a77dbc
-EBUILD makedev-3.23.1-r1.ebuild 1349 BLAKE2B 2c9c0cf37ae4ba631a22169554eb35ba73a1c4287f9631cbc9ccfb65f6f2f948fc3c6a2068c46cb2a071a58ef4cc795cbd84d54cf4ed1e60c9b7372872c4dd37 SHA512 97b7fc5fc3ee88df01a4cb1cb26e1532e9a191d978465e67871e5a946ec4bd4f4fc52e91bfffa31fea39281e0bb02a88685f0abeb7ff6ad0d94489b9970b5a3f
+EBUILD makedev-3.23.1-r1.ebuild 1348 BLAKE2B 3edd10645bfe7990a4f48b6599f2fa877d2673b8a858f2c1777ca3e1d80ea3682c7693f83d976ddbe28b725566f23aed702f2136ae1697fc9aa1acacd867382e SHA512 bca8095c07b8b2daeef6b4ac640e1ca29bd9004d6bf9ff3558043b59e54d7e3471b295f33d99f1bbfe4dca901cffc545c6ae92b4222e78d1c53c4aaf74af687c
 EBUILD makedev-3.23.1.ebuild 1377 BLAKE2B 636977e8eb82b2ef3ebad9a4c8e6c39f82e77caed2b7af2906fb5609f709dc5cf522e2318ce310d0a4624b313e9381f7ad5c0f5fb628adefd8e9b5a2b3291ae7 SHA512 6dd5eb8d3d1bcbe7d459bcebd0eb69e9dbdbb69c6d42e4231bfd0f46261b5f3fd99e9084217c56011a8036f477429accf6e355e21ef0e1613d8e4358ac921b60
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/makedev/makedev-3.23.1-r1.ebuild b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
index 3e0184365d92..f81ec2bfe66e 100644
--- a/sys-apps/makedev/makedev-3.23.1-r1.ebuild
+++ b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.redhat.com/nalin/MAKEDEV/${MY_P}-${MY_REL}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="build selinux"
 
 RDEPEND="!<sys-apps/baselayout-2.0.0_rc"
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 78de89617e3d..2b893b62bedd 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -2,8 +2,10 @@ AUX mcstransd.init 659 BLAKE2B ef74c438407efa47a066a18a1ba8d7cad2b13240fbf39d838
 DIST mcstrans-2.7.tar.gz 41137 BLAKE2B 83f195dee4bf61c36f65b009cf40dd58459e01d75222fbd7fe15c61ae7942315373a4a0e9a1cd0a654efcf471c3c7166f76c87837085ef6a4136567d4b52fc73 SHA512 2e59f26fad3423a0c8e2ea49d619f99022c72e1aebb00e842defb4fad56f187f9ed0f069ef78d3b209ba76f5ebdcba1668f51ff881b753dada5716ee942519b3
 DIST mcstrans-2.8.tar.gz 41385 BLAKE2B 08cdb2588ab2cb48824816fd3eb578a77bfb6696f00fac7b808250ae88a5c85ae02824f047ac6cd6f3653d4b8550352f3570b63969ebfef5b396478ef191b97c SHA512 b20b369fea926ed55db4e454e82ef842fd39a8194190c9feb063b36126f6334f9d3401ef1c3636c03230a813c69648b5efbcc35b163387495175cde80dd6bd39
 DIST mcstrans-2.9-rc1.tar.gz 41364 BLAKE2B a98e2130d4471d5cf72391c738978193e4be220ea5ae3d548ae68548f62529bbc4be4393b4eb9f0f4ec75dd413553090bfd463a9ea12acf3c4c672c04092f960 SHA512 8bac33be160fadbf03268f4eb009c679ecf5c178cc6dd69e593fafb1f5236d875495a9fcde95df4e79857b084983e8bc6711c1797748545f7e38a3e3a09a38ac
+DIST mcstrans-2.9.tar.gz 44451 BLAKE2B e73121351a5d3a09c4754cd0fc6bcdac4b47e3f99d8bd2c40ee9b2bb510095a41721d0dae0d3edb56c36d9e9ef72ece4c69a01298c7f34fe96ccf4883372b1fd SHA512 25a37c6dd7fa23b0599d7e92da78805e1da1605c998edf00777113c8467b1703f634223dff57627337da51e565cf2d1e475698a5a2310966f1f6dcf6687671d1
 EBUILD mcstrans-2.7.ebuild 1217 BLAKE2B 3b6414b7e668a2d7ec5c7ee5bb0c5d0b859f2360ab88fc88db0c1c4a7f06f539e5b881b02035aea89cd4e75e98e7bd6a42d035d1bd3dfb0f810b1191477b454b SHA512 d26037fd0d2f2ef722a21da5ba974410a5441608e32fb35d8674ebae48dd2eb485b30af50d7f54a3d3181b8c7af838e03d744336181f8bd3b8d8b8a47a906250
 EBUILD mcstrans-2.8.ebuild 1132 BLAKE2B 05f10514a2be3196f0d6c64c2288af8252ef151f3c9b6d0bc1ea39ab2f5d9213164de8bacbdcf0d298f9e917654819e5df5bf80d72cc3851669c9d6e743c1582 SHA512 e328c1d9aa6d5b63594bf72b9899fa2ddbb8fa0c9426b1025d0a5422b2087ce6de33b353a4542dc83bb317b75bd3d858f584bb508e762d1a48299884ef10005e
+EBUILD mcstrans-2.9.ebuild 1114 BLAKE2B ab7b9d59f3f91046298d0b71b48aa2bae4f95dbfbe0d92a99ef70c363c65324a054e9fc2246a1af7b262c72680001c18234c02a069229f0dc3f0af9caec8cfd4 SHA512 f91fe4784ed5783e886549b6f5cf33e466a15a6d18e74abe13b70bec8b7ddd679a3804e10868ddda3c959c035acc8fd1f347371134440dba193575c2911eacc7
 EBUILD mcstrans-2.9_rc1.ebuild 1114 BLAKE2B c9edd7c62370a166e28fcba208cfc7db79fad633acf8395eea73c7a95ddf406bf71603d13ef293727e53776e7796db281a126e7d3449b6053eaa3d3b36339489 SHA512 4c31238cc4f0d47f0f0b70b1fd50a07384d7bd61016abe6eb5f3b6ff4fe2b976e0ffb0bd4969e43177f57f95228ce04d885b8e648b90140e50ccda463db286ce
-EBUILD mcstrans-9999.ebuild 1114 BLAKE2B c9edd7c62370a166e28fcba208cfc7db79fad633acf8395eea73c7a95ddf406bf71603d13ef293727e53776e7796db281a126e7d3449b6053eaa3d3b36339489 SHA512 4c31238cc4f0d47f0f0b70b1fd50a07384d7bd61016abe6eb5f3b6ff4fe2b976e0ffb0bd4969e43177f57f95228ce04d885b8e648b90140e50ccda463db286ce
+EBUILD mcstrans-9999.ebuild 1114 BLAKE2B ab7b9d59f3f91046298d0b71b48aa2bae4f95dbfbe0d92a99ef70c363c65324a054e9fc2246a1af7b262c72680001c18234c02a069229f0dc3f0af9caec8cfd4 SHA512 f91fe4784ed5783e886549b6f5cf33e466a15a6d18e74abe13b70bec8b7ddd679a3804e10868ddda3c959c035acc8fd1f347371134440dba193575c2911eacc7
 MISC metadata.xml 451 BLAKE2B bf8e87dcdd8c3dfbb33728600b986bf96e2243a9e9916db87ae4b4d69508f6397915929b24c4b7381d711a7754987402f0abd8ee8217621479d6970c91922189 SHA512 9d1f5669661c1fe232b18517a954640350c8f0c606d3ca91e429f53790532bfc9b73d7c18e575c4055d3ea7ba4a5ade632d1814700ed1d3d000fe5ebfa065744
diff --git a/sys-apps/mcstrans/mcstrans-2.9.ebuild b/sys-apps/mcstrans/mcstrans-2.9.ebuild
new file mode 100644
index 000000000000..1fb74df9e673
--- /dev/null
+++ b/sys-apps/mcstrans/mcstrans-2.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20190315"
+
+MY_P="${P//_/-}"
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="SELinux context translation to human readable names"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/libpcre:=
+	>=sys-libs/libcap-1.10-r10:="
+
+RDEPEND="${DEPEND}
+	!<sys-apps/policycoreutils-2.7_pre"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/mcstransd.init" mcstransd
+}
diff --git a/sys-apps/mcstrans/mcstrans-9999.ebuild b/sys-apps/mcstrans/mcstrans-9999.ebuild
index ca413b09c85c..1fb74df9e673 100644
--- a/sys-apps/mcstrans/mcstrans-9999.ebuild
+++ b/sys-apps/mcstrans/mcstrans-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20190125"
+MY_RELEASEDATE="20190315"
 
 MY_P="${P//_/-}"
 IUSE=""
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 75a972d4d148..ef1df697eaa0 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,5 +1,7 @@
 DIST moreutils-0.61.tar.gz 93234 BLAKE2B cfa3c24d68ca0f9ef220ef97e0ac50a77e557cc399ef898d15a56d4e205ba180f494ca7a89a566e4dea28eebf08590fbd94b75f7850f941a8a22eba147f8e61d SHA512 6164680c8bfec02f7a84274b1d4342a1d6c296e14843496dcc9f9ac71b3e3b1663dea72e2251a546a646775afa70589483e8d5da71b388b1022476bb3dd91b56
 DIST moreutils-0.62.tar.gz 93711 BLAKE2B b8d8cf7c83c3a9fc6a3fb1677954520dcc884ba81eebdf7cde2232f8aea7177f4c79dbce84ff20cf20f924af279c6e02683dfd082ad35237cc0109cddfe30e14 SHA512 100d8129572c1b9ef1381150b69cbcd1762700e66c0ffa0ea849989352bc1bad77b67c5dbc00c159ca6c02905585dbfa3c8a5d88e910da9daaf27b5dba9f2367
+DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
 EBUILD moreutils-0.61.ebuild 1478 BLAKE2B 92147d9ede5c7b0aabf8e33c132432a240a093e0a9eab2df89e51f34da0f6409885239c4663b9acac2536d21c2cfb994bafc80b0370f3265dfd7836f09125648 SHA512 2837b8041fa09763834a3ac0698bd6a16d246e9d58e1bc7957e2a527f85f0cfed145df81838c3e5f5f90521ac2e84acaeaa4b599befadac86e435cbc23d871a9
 EBUILD moreutils-0.62.ebuild 1511 BLAKE2B a978a0b7539b353d9f5f8e015a884a92b91c79a296f74cb757599ebabc651e225c37a85c985f36f76f50f5d1a9713c1377a8c16566ef7b3f215e68b5530418ad SHA512 984edea18c99ca61c8e621c6f1e55a54fe9ed247d16dbe63cc16056a807f78c419b0ead508b70117e2b150ca058577d857f7dd8aeaaac00acb4bcb9086038660
+EBUILD moreutils-0.63.ebuild 1448 BLAKE2B c88b1a5a7f2ebada0cd3b420984e2245673a0cf4c4ca70e10ac7c7468267e585422e3da834367fa4f82487343b5acd1239e68bdc22aa52911f9087a0eb4392a1 SHA512 8e8c2a2ff905e4bc83f23e9b182e67e07ecb8e8db6fe1b7c076bd600a00847e8ec7da8358a0bcb3194b38109a15ad4db718362a45a7fe9b20743a17ef41f209e
 MISC metadata.xml 313 BLAKE2B 66183e9cd23dd84df66abc1f3e229607f3a234f6a07a29cb2246c130cf214fe5ab1275c6f96b5804e27ebc8b867236c49261369756cfaf9dc563dae60f387be5 SHA512 75fcc8c041bbe324b5c1bcd0b006b7cfc17b5b2ae4bf0ef711b9ef4d3233917d4a189320ef06f3165e23f33ac7e6e58d1545cb4c2082eb22a052d09817cecc6f
diff --git a/sys-apps/moreutils/moreutils-0.63.ebuild b/sys-apps/moreutils/moreutils-0.63.ebuild
new file mode 100644
index 000000000000..a52e8ef948fe
--- /dev/null
+++ b/sys-apps/moreutils/moreutils-0.63.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="a collection of tools that nobody thought to write when Unix was young"
+HOMEPAGE="https://joeyh.name/code/moreutils/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux"
+IUSE="+doc +perl"
+
+RDEPEND="
+	perl? (
+		dev-lang/perl
+		dev-perl/IPC-Run
+		dev-perl/Time-Duration
+		dev-perl/TimeDate
+	)"
+DEPEND="
+	app-admin/eselect
+	doc? (
+		dev-lang/perl
+		>=app-text/docbook2X-0.8.8-r2
+		app-text/docbook-xml-dtd:4.4
+	)"
+
+src_prepare() {
+	# don't build manpages
+	if ! use doc ; then
+		sed -i -e '/^all:/s/$(MANS)//' -e '/man1/d' Makefile || die
+	fi
+
+	# don't install perl scripts
+	if ! use perl ; then
+		sed -i -e '/PERLSCRIPTS/d' Makefile || die
+	fi
+
+	default
+}
+
+src_compile() {
+	tc-export CC
+	emake CFLAGS="${CFLAGS}" DOCBOOKXSL=/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
+
+	# sys-process is more advanced than parallel from moreutils, rename it
+	if use doc; then
+		mv "${ED}"/usr/share/man/man1/{,${PN}_}parallel.1 || die
+	fi
+	mv "${ED}"/usr/bin/{,${PN}_}parallel || die
+}
+
+pkg_postinst() {
+	# try to make sure $EDITOR is valid for vipe (bug #604630)
+	eselect editor update
+}
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
index d968c1a0afb8..af260528a7ec 100644
--- a/sys-apps/onerng/Manifest
+++ b/sys-apps/onerng/Manifest
@@ -1,3 +1,3 @@
 DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
-EBUILD onerng-3.6-r1.ebuild 747 BLAKE2B ec317e7c27876830c1f86059470d38e427aa1c0b1306f7a0f25acbf60f93b5784f75640584ef6f19bd64b9439f9bfb37a52733aa77a7a5c3c5b2d515d3fe324f SHA512 cca5bae5b5357a2cf059b7454026e07f0b1cb595e6bc7744f5085cca3d34e7e32ea3d6e4445e1cc503ce09c46ce3e012798df141fc7ddcbfaa4b2d8253f3ca94
+EBUILD onerng-3.6-r1.ebuild 746 BLAKE2B 9b413a16a2986e3adfc7a354e5781c3be943d9ba95363a78e2b19e15436fb01e3763b56a63e4d49944dcc61ede29b62be123e6e1977fc0a0c862a805ebaa7683 SHA512 cac7fca96cf841caff1d1dd8c5ee59875695f6a903c5dba8ce2a99836a47ddcc2d24789e93b756dbb951d2f635b642667d7a169116f68a7232c56acdf57d3cbe
 MISC metadata.xml 834 BLAKE2B 8aba260b830ee41c11c1e843ecfd3130768366ab46a89b838b8c846c48699e0e570d99005d775d8560f4de179a4cf6ef0833294ae1699faabb550a1c0862585c SHA512 8fe1f05b03c98ee95f3fd6d81cb52165d96a6a8385b9c988a667f9b0f714875bb3bc291706ee5e53daf022c2cbd4d16f52bf4e7abfafa94d9cd0481ebb58fc1d
diff --git a/sys-apps/onerng/onerng-3.6-r1.ebuild b/sys-apps/onerng/onerng-3.6-r1.ebuild
index a5f4bae77361..953e639e7f88 100644
--- a/sys-apps/onerng/onerng-3.6-r1.ebuild
+++ b/sys-apps/onerng/onerng-3.6-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-MY_P="${P/-/_}"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit python-r1 udev
 
+MY_P="${P/-/_}"
+
 DESCRIPTION="Software for the Open Hardware Random Number Generator called OneRNG"
 HOMEPAGE="https://www.onerng.info/"
 SRC_URI="https://github.com/OneRNG/onerng.github.io/raw/master/sw/${MY_P}.orig.tar.gz -> ${P}.tar.gz"
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index 3da77279e9c7..4cfff5d2714a 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,5 +1,7 @@
 DIST osinfo-db-tools-1.2.0.tar.gz 447185 BLAKE2B c8ac2556d552bbeee0b8e0615ac5cbb1ed69bff02342617f3b64256120a93696965aa18ba6810b96b1746ed8db6d72db446a72caaf2c3ad850db9d4d4f260bd9 SHA512 6e2519eacb5b60449c968e53a4363966b42ca7c564fac7db7d982ceeecfa70ac0662dc6ea75a2d503a7fa74c8789e0fd1331cd8fd3d75fec5d2cd1a646896b3d
 DIST osinfo-db-tools-1.3.0.tar.gz 456012 BLAKE2B 5c29581f4947caf4ee06f435891cccaeb53b9514cc2bf4ad4bac1e8ee38ebeb61678ee886389f837c9f578f1df93ed94f8492165e1613d1bb60b246ea5c52428 SHA512 e488db70b85ba8d5abadf6c50a772f7cd338405c9465189a70eb0da1b488434cd234118f44933847cd05406f55831d08db767932794798270be5964fa4c3dc1e
+DIST osinfo-db-tools-1.4.0.tar.gz 519089 BLAKE2B 2c2e0cdbcd0a795f8deb09727b8b971748f5d0ecc08449238d3054cbd947a0f6059456d4e9feadded47cd0e0aaa87132f1bec7524a3183115dd459eca989d1b0 SHA512 f4813f948551f630cc9936986abc3ef4455647ec529b353dc4fee71f8071beeebac0a2ee1988cede92ea3635bca9bedd400ac9f275e3f5592ff50236d97cfb91
 EBUILD osinfo-db-tools-1.2.0.ebuild 837 BLAKE2B b6ef18efa3f75872bc3ce03e134b3b2e37cf8192bff0fb2cc8e14bc51033a7917233acfe87c9029dd151ef70b5ffca6501ce703feb369601dfe45d780d8442c0 SHA512 8ed562896a204d14fd3d421ec64ac75ca5617f53b1b35f1e99cd18da86eb232fe108bdfe99d4adac99fcb2b954f8ccce4c2a3a784b71877514bedc42ea1b8fa2
-EBUILD osinfo-db-tools-1.3.0.ebuild 859 BLAKE2B 5547adb0acf073a8cdb42ce5d618d16acb80ca033244881880ba464116500649a6db03336f61d7df12b6b9fd4571622a57f2d0a132ad88dcd5afe425b5286948 SHA512 4bbc46ead6d769b161568d5be671615cee3488e02820d42ea0862074d8dc96ac0a35e9eebfc94896154a78e4f5940b978140e5d5914790accc0b926c5b32128f
+EBUILD osinfo-db-tools-1.3.0.ebuild 858 BLAKE2B b3f7efbac31b1d8f97053c23a35cb2d6578b82953afbd35328078b026f5b22180387423f9781b7ae91fb14e40532e8333d3b347d5f9b6271c3b52c3f0b7ee8c0 SHA512 6fb3e9311f5c1e9056dd341e30f19cdbb682ba4966e98d948683d35b6620709f17e9476bf38763f1f2a8c1bc6c6a0867f85f02010fb997d78d081f2c6d5d9976
+EBUILD osinfo-db-tools-1.4.0.ebuild 859 BLAKE2B f10102e3647b3886a5f38bb0c93e2039f708d362911a1895b6f7053ffb262bf6b19deaac7c8896bc2425b488f758b6e5e67f8a38723307aa244c81ee7b5731ee SHA512 347a9ba28c4749a5e8f2d6038edcd305ae8a5065d9ee5ac0641cc6de0c761aaed60769292be401979f3bbb4f4f8d3a2677238f81e0c701c7d099b2b80996b6e7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
index f778ca05df0b..9a6db3d47ee5 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Blocker on old libosinfo as osinfo-db-validate was part of it before
 RDEPEND="
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild
new file mode 100644
index 000000000000..12671de923d1
--- /dev/null
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Tools for managing the osinfo database"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Blocker on old libosinfo as osinfo-db-validate was part of it before
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.6.0
+	>=app-arch/libarchive-3.0.0:=
+	dev-libs/json-glib
+	!<sys-libs/libosinfo-1.0.0
+"
+# perl dep is for pod2man (and syntax check but only in git, but configure check exists in release)
+# libxslt is checked for in configure.ac, but never used in 1.1.0
+DEPEND="${RDEPEND}
+	>=dev-libs/libxslt-1.0.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.19.8
+	dev-lang/perl
+"
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index d013fb99dfd7..3b9ccf4782c1 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,7 @@
-DIST osinfo-db-20181203.tar.xz 80044 BLAKE2B 7cdc11afdd4bab83413c1512b9fca7ad0679a486a83d714a14aad8a3718a6c7829286ff7acf5a1e4ccc78289c66f9673a9bdeb9423d7570ac5b26d0756025bfe SHA512 6091a31ecc6e618e29c7161a3e3d78ff0eaafeaa88d5bbe38dce136f8814a4411765e854424bacf87998403ba8fa0afc2b0a744095f691a80207252f21ecd270
 DIST osinfo-db-20190218.tar.xz 82712 BLAKE2B d026b428171127b5048357ae75e2601fc184b9e2e5dd7224a7ba1a439ebf20e567bd910ab4b8a0920d3f8c0e2e8be637086920ab905a8fd8eb98c772a13c234d SHA512 e6b6f0e8b965ecf5a6c38071f3b2d5646123a6d84a5d5ebfb59995f10ae0aa8985bc5caeb1a4de396b92be0466291bc82247f33138f7954c847651eb682fdad3
-EBUILD osinfo-db-20181203.ebuild 669 BLAKE2B d29946d42d126410a729e435b3a96ce0f821c1f04aa303cd1c6e084c3c7b01252a5b093f8c31faaa5ead9e7780bfc8f23a2c304350981520c7154ef574fabbe4 SHA512 32a262472b53e1ac376f395dd6bc79a393f3619234385fc1259423a51951fe73a9b851d584321d373cbc422df09adc9e7265976cf907d117db7d97617b390534
-EBUILD osinfo-db-20190218.ebuild 671 BLAKE2B a50dd6a39f6f582e400ec534a0d8d28f60d850131dde1787b356059a7a8c95530d70fc77c8336ef6da24c6888ad4054574a2a661bb045f6d8a3936a5fef0a957 SHA512 222ea69587a39969f785e84cb346f6e4db2c73f09867b5d10f0b142997ad1ebdd38e88c3154a06476fbaa758589a720039cc036cd865e1e0abe80db3f6a2f1bc
+DIST osinfo-db-20190304.tar.xz 83024 BLAKE2B a0ad9a24f7dd07dc672b2106bf9f767456bc64f0500cb713257eefaa45f1b1a15b1116f0ac6611966ee6750ff519da8d71c746c930ef5e3c5ca54780d247eed8 SHA512 b8a2911da9d84682423ffaf257ffc9e97bc0abf835d6d5929e7e544167a86ca85b882f549e692c1919a49d79815dc32ae86cee99284c7a1c7b9a55de72368ccd
+DIST osinfo-db-20190319.tar.xz 85668 BLAKE2B 9e1d95379c659dc325a0fa5d7d8e6abc6c486839cbf42d78e0964583f19258f2e6669e685bc09cd13f17ecd04cc3d1cf3188d862d12d2825636a76d9d2999b8f SHA512 fb06adeaf639e71b02bec30dafbc405e903d490cd8038d4fe94de63c4d0bb9f617a469e59d11fd4dfc5c1c0d9a6094b888ce5867634c0cbe501e5195316a8e75
+EBUILD osinfo-db-20190218.ebuild 669 BLAKE2B d29946d42d126410a729e435b3a96ce0f821c1f04aa303cd1c6e084c3c7b01252a5b093f8c31faaa5ead9e7780bfc8f23a2c304350981520c7154ef574fabbe4 SHA512 32a262472b53e1ac376f395dd6bc79a393f3619234385fc1259423a51951fe73a9b851d584321d373cbc422df09adc9e7265976cf907d117db7d97617b390534
+EBUILD osinfo-db-20190304.ebuild 671 BLAKE2B a50dd6a39f6f582e400ec534a0d8d28f60d850131dde1787b356059a7a8c95530d70fc77c8336ef6da24c6888ad4054574a2a661bb045f6d8a3936a5fef0a957 SHA512 222ea69587a39969f785e84cb346f6e4db2c73f09867b5d10f0b142997ad1ebdd38e88c3154a06476fbaa758589a720039cc036cd865e1e0abe80db3f6a2f1bc
+EBUILD osinfo-db-20190319.ebuild 671 BLAKE2B a50dd6a39f6f582e400ec534a0d8d28f60d850131dde1787b356059a7a8c95530d70fc77c8336ef6da24c6888ad4054574a2a661bb045f6d8a3936a5fef0a957 SHA512 222ea69587a39969f785e84cb346f6e4db2c73f09867b5d10f0b142997ad1ebdd38e88c3154a06476fbaa758589a720039cc036cd865e1e0abe80db3f6a2f1bc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20190218.ebuild b/sys-apps/osinfo-db/osinfo-db-20190218.ebuild
index 063c9afbf192..2c81e1a380c7 100644
--- a/sys-apps/osinfo-db/osinfo-db-20190218.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20190218.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-apps/osinfo-db/osinfo-db-20181203.ebuild b/sys-apps/osinfo-db/osinfo-db-20190304.ebuild
index 2c81e1a380c7..063c9afbf192 100644
--- a/sys-apps/osinfo-db/osinfo-db-20181203.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20190304.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-apps/osinfo-db/osinfo-db-20190319.ebuild b/sys-apps/osinfo-db/osinfo-db-20190319.ebuild
new file mode 100644
index 000000000000..063c9afbf192
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20190319.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-apps/osinfo-db-tools
+"
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index aa3852246bd6..883f4c968f88 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -3,5 +3,5 @@ AUX pmount-0.9.99_alpha-locale-regex.patch 749 BLAKE2B d1e777c57ba8b261f6fdf4612
 AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
 EBUILD pmount-0.9.99_alpha-r3.ebuild 2018 BLAKE2B 68a02931e5df37140b5afbf5d1059096e7c329d395ed8684042de47d2b192a055338cc11ed79d63ea30f60fb976ee878c9da3a9939791e5c5a4505a5852c067e SHA512 179c2588a00cb8b856899f99078dc21970664407f5b1fb278b91733577d72687429986270db4ea94dcd7cefbfbf9f886be3884a5a1fb4baa3e0d39cfc6a32b06
-EBUILD pmount-0.9.99_alpha-r5.ebuild 2126 BLAKE2B ac91c7e28e4a75d31db968f981a5e9e7d6ba15ff603e21ce758e9cb26ae7db7e3e378c814f86ed8f59edf703f0d3f942bd3b817f671e31604bff765b777fa19f SHA512 29cf93dfdc349229449c1bdb4d064523dd14998677c0361c9332ffa761a8d1c3cbf192c270f632a9399df14be61db7026fb2c1d4546a5e00649aafcff8511322
+EBUILD pmount-0.9.99_alpha-r5.ebuild 2125 BLAKE2B f6898ac31961928ede2efb37673bc0ebf615c576a4a2cec197bdb87ce81fa537a776f07809f936e622e86410bd2fc5bed35a16903aa298c61219906098f72cd3 SHA512 d62feceae9e61190673e3bb9f891e1ce416dbc2d657e89c53b7ff4134df95c4947a5046ce3290f7a595d52b2a227f96392657b28187c9e63be6e86fce2f9d9de
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
index 7486352f4176..1ab89f8962df 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh sparc x86"
 IUSE="crypt"
 
 RDEPEND=">=sys-apps/util-linux-2.17.2
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 3389f375cea7..96e59d3e7728 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -2,10 +2,12 @@ AUX policycoreutils-2.7-0001-newrole-not-suid.patch 351 BLAKE2B 84a67799662e6df3
 DIST policycoreutils-2.7.tar.gz 2796707 BLAKE2B 4b1c03f2d12252b453950c3d6bcde75780926a1b91263d3881f741399c5630c707f0429b9b144c657b017b7b0c1500b63b6463610dea3caaef8c2f7c3f69fd8f SHA512 ce97d659f72058fd23d8dab8db98fc7c0003806a636c521fa15da465d7358d40ccc8e3eaa9675f00a9b0b8aaa1465d3fb650bc0ebbbf00164e121230673256fb
 DIST policycoreutils-2.8.tar.gz 2796775 BLAKE2B 36115cc2faf72a4b647312f8faaf4762d7f2fb56bf0531ccadeb46b100c9e577f3148fe6890925d3fed94ac22803dc61729781e54bd0ddeb1539ccce2ec2a29b SHA512 2b4a70836fd8727a16b8f8d4afcc39c9461ab6f5bc1ba5ce5833d41150da921ebb3c9bdbd1cfa7dd31fd382ba18b5433ca9b63bce58bd290db81fa9bedfe29f3
 DIST policycoreutils-2.9-rc1.tar.gz 2797222 BLAKE2B 25f51cc1b17744e573450245064b8b65e44fff44693d886e89097308c80ed61b2cb46822d581e8b970053a771262722bdb4a59619d6a94e09505b71e476e45b3 SHA512 6a3a7d4652b44e54c287b327ad691dd0575c6a45fbf1f4676b8182e05760defc37dfa6aaf2e6ab5a77e124d76d1f699c4859c0595a3f9e8ade04ff5ad186fb32
+DIST policycoreutils-2.9.tar.gz 2819360 BLAKE2B b0af912e3b4fb2c9598b10ce413c8ffb3f5972a4d5d59270cff40abe8d4e385e0664e24a4f533a95ad2d1657644f3368213f955ac63d9f8c46a661417b07c8b3 SHA512 d8356115671ba66de05f1c13193ab47fab69cc4d09603a92171ed40afafc084dd191591bf336b7d722de637378ad09622ebb6eca85c06063ca9ddd6db10e02a2
 DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346 SHA512 c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
 EBUILD policycoreutils-2.7.ebuild 4966 BLAKE2B 1e252c86aa33e9ac68c14d859ced7e277fc0cf5f5ad6aa335ae7b334b5ff56417ed8ff973a57e2858bae832dde946a7080d1d9eb72e7b2ed0e583b1badf8ccc9 SHA512 f068c7fb1d918bcf305b8f8a72433774e5dcc23e8b5a22fee2e64fbb54cd4e14d897da33c893b948247600350bf4f54ab64f6d81be405d2c6930ea40176dc729
 EBUILD policycoreutils-2.8-r1.ebuild 4864 BLAKE2B 1715247726992270cfcd287fac903d161b049c5c1d098b4c2dad14e0905e909d5cece922de96b118a1096060e5c5766496581e6025ffecb896b894bc2a9296d7 SHA512 88ab065fab0dcd89c104e2deaf61557eda5facd6e15adcce68598314d0c9585a8478edf5877dcbbe0c3e82061b7d384b5f257d5c08c0d981eb67cb6135e99aa9
 EBUILD policycoreutils-2.8.ebuild 4873 BLAKE2B 5e43e9a43917e935d6a34f6756135f4cff6d978963d998d5bbda8bcde273bf3051b575e10e837ea003b99b63f5f0bbb9ada12989fe1e98db558b89706cae5a70 SHA512 1aa16f096647afbeb78218d4b9a1a1f408d8bba250afbfca4f16149d32b20d3e35f08b502df2c441c0775ddc834af1e6e4f015c7cbab137a3dbc825e95a093ef
+EBUILD policycoreutils-2.9.ebuild 4847 BLAKE2B 26adcb0b780d5fe63567dd844c3af85d8d675f99db4f30879adfb934f019a576e081d8f9028f815335c91c33aa8b69a04af3d01786d7632a00879294f2a541e4 SHA512 ceff596c71d37377a10bb351c48786774bef004305fc8f711c197f97c3c17037d2600d4a6abae30e3d97628e1467c9864b7f378179aa07575dbc00143aebcf80
 EBUILD policycoreutils-2.9_rc1.ebuild 4847 BLAKE2B 3b0212ca4408497b8d56373ca6a366ddf46383ab74099d24d1f52fc2829d5282132c800149e2efaa0500e7447c2ff879d36e93e40109d5375b4e226c23a5ec48 SHA512 85f81d41f22a100c296361b383651535f45d9c4f8900de740713a768836227ba63aa446946f6f3d8a1b79b7b911a0a786201439f8e0708abd1777740198aff0d
-EBUILD policycoreutils-9999.ebuild 4847 BLAKE2B 3b0212ca4408497b8d56373ca6a366ddf46383ab74099d24d1f52fc2829d5282132c800149e2efaa0500e7447c2ff879d36e93e40109d5375b4e226c23a5ec48 SHA512 85f81d41f22a100c296361b383651535f45d9c4f8900de740713a768836227ba63aa446946f6f3d8a1b79b7b911a0a786201439f8e0708abd1777740198aff0d
+EBUILD policycoreutils-9999.ebuild 4847 BLAKE2B 26adcb0b780d5fe63567dd844c3af85d8d675f99db4f30879adfb934f019a576e081d8f9028f815335c91c33aa8b69a04af3d01786d7632a00879294f2a541e4 SHA512 ceff596c71d37377a10bb351c48786774bef004305fc8f711c197f97c3c17037d2600d4a6abae30e3d97628e1467c9864b7f378179aa07575dbc00143aebcf80
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-2.9.ebuild b/sys-apps/policycoreutils/policycoreutils-2.9.ebuild
new file mode 100644
index 000000000000..463a7f498dc8
--- /dev/null
+++ b/sys-apps/policycoreutils/policycoreutils-2.9.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit multilib python-r1 toolchain-funcs bash-completion-r1
+
+MY_P="${P//_/-}"
+
+MY_RELEASEDATE="20190315"
+EXTRAS_VER="1.36"
+SEMNG_VER="${PV}"
+SELNX_VER="${PV}"
+SEPOL_VER="${PV}"
+
+IUSE="audit pam dbus"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	SRC_URI="https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	S1="${WORKDIR}/${MY_P}/${PN}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz
+		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	S1="${WORKDIR}/${MY_P}"
+	S2="${WORKDIR}/policycoreutils-extra"
+	S="${S1}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
+	>=sys-libs/libcap-1.10-r10:=
+	>=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}]
+	sys-libs/libcap-ng:=
+	>=sys-libs/libsepol-${SEPOL_VER}:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	dev-python/ipy[${PYTHON_USEDEP}]
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib:=
+	)
+	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
+	pam? ( sys-libs/pam:= )
+	${PYTHON_DEPS}
+	!<sec-policy/selinux-base-policy-2.20151208-r6"
+# 2.20151208-r6 and higher has support for new setfiles
+
+### libcgroup -> seunshare
+### dbus -> restorecond
+
+# pax-utils for scanelf used by rlpkg
+RDEPEND="${DEPEND}
+	app-misc/pax-utils
+	!<sys-apps/openrc-0.14"
+
+PDEPEND="sys-apps/semodule-utils
+	sys-apps/selinux-python"
+
+src_unpack() {
+	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	S="${S1}"
+	cd "${S}" || die "Failed to switch to ${S}"
+	if [[ ${PV} != 9999 ]] ; then
+		# If needed for live ebuilds please use /etc/portage/patches
+		eapply "${FILESDIR}/policycoreutils-2.7-0001-newrole-not-suid.patch"
+	fi
+
+	# rlpkg is more useful than fixfiles
+	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 1 failed"
+	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
+		|| die "fixfiles sed 2 failed"
+
+	eapply_user
+
+	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+	# Our extra code is outside the regular directory, so set it to the extra
+	# directory. We really should optimize this as it is ugly, but the extra
+	# code is needed for Gentoo at the same time that policycoreutils is present
+	# (so we cannot use an additional package for now).
+	S="${S2}"
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			INOTIFYH="$(usex dbus y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	S="${S1}" # Regular policycoreutils
+	python_foreach_impl building
+	S="${S2}" # Extra set
+	python_foreach_impl building
+}
+
+src_install() {
+	# Python scripts are present in many places. There are no extension modules.
+	installation-policycoreutils() {
+		einfo "Installing policycoreutils"
+		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+			AUDIT_LOG_PRIVS="y" \
+			AUDITH="$(usex audit y n)" \
+			PAMH="$(usex pam y n)" \
+			INOTIFYH="$(usex dbus y n)" \
+			SESANDBOX="n" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+
+	installation-extras() {
+		einfo "Installing policycoreutils-extra"
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			install
+		python_optimize
+	}
+
+	S="${S1}" # policycoreutils
+	python_foreach_impl installation-policycoreutils
+	S="${S2}" # extras
+	python_foreach_impl installation-extras
+	S="${S1}" # back for later
+
+	# remove redhat-style init script
+	rm -fR "${D}/etc/rc.d" || die
+
+	# compatibility symlinks
+	dosym /sbin/setfiles /usr/sbin/setfiles
+	bashcomp_alias setsebool getsebool
+
+	# location for policy definitions
+	dodir /var/lib/selinux
+	keepdir /var/lib/selinux
+
+	# Set version-specific scripts
+	for pyscript in rlpkg; do
+	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+}
+
+pkg_postinst() {
+	for POLICY_TYPE in ${POLICY_TYPES} ; do
+		# There have been some changes to the policy store, rebuilding now.
+		# https://marc.info/?l=selinux&m=143757277819717&w=2
+		einfo "Rebuilding store ${POLICY_TYPE} (without re-loading)."
+		semodule -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
+	done
+}
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 09b451dfda96..463a7f498dc8 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -9,7 +9,7 @@ inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20190125"
+MY_RELEASEDATE="20190315"
 EXTRAS_VER="1.36"
 SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 30cf31acbdf7..4c3c2cea24c0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,6 +10,7 @@ DIST portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch 1584 BLAK
 EBUILD portage-2.3.40-r1.ebuild 9684 BLAKE2B 25337738dd51a60f4b8348796348572bc92e95af3178ae4c4097225697923aa14bbc5e206160ed569bf9f84cbe354823c2326eb54173bc455c4d46566050d002 SHA512 20184f3260d3d8c413ea2a87eaec2eda08e94a27290f658c12ae3490712e6773c95e52818b8224882380a55c4eca77b42d9233d23ea64aae6cbdfb43e90bdbe1
 EBUILD portage-2.3.49.ebuild 8681 BLAKE2B b09a5d1c4795765ffe01c31eafe0578b9c6b8177997799c15965b4be5a5d00d69cd0747667384eb4ba33fb2f52f703b3b03ad4e64c4f8581754841ed0979d912 SHA512 737694cb627e10191769e820903a66fa2d74bc0b4a6070c59cdc3c865a20e2d7c1c8ff949417202c97c2e217e0214c251ef956cfa6b99ecd83b71ec607d910bf
 EBUILD portage-2.3.51-r1.ebuild 8934 BLAKE2B 4929d861ef8569848abb8eb79f3326cb23d8ff66eef7895fc1e0cbeb69f0310f97b0b3094610f1d97919c09ecca077273671b5879b3bbbce807ccc7b52b643d4 SHA512 cb55dbc52d5b7af35083e60c83a7085458686ff03f03d8d1f5d03e42c4437bf8c14de026cd11ede70389d0c039320c08fcf901175b40413e09c01a0cd46c43f9
-EBUILD portage-2.3.62.ebuild 8819 BLAKE2B 94e3d0305d1944a6481705e9d5cf31e269c89044bfafebf087b0df77902dbc56b66be4af1795037dd2e2b2325edf4d93c8c1b4d932a64dc41db1a610e26c5c77 SHA512 8f08387f6bc268ea4a75267f428eb9e372f0475a826e4ca8f9813efdbc9a924bb2ec389c7dc41916fe5474d2fd8bf2f3485ba5935cfb2e215463d7c0aac68722
+EBUILD portage-2.3.62-r1.ebuild 8042 BLAKE2B 509833584f8f47b0611ea7bbda01f9c31c6d36c1b025e714f594aa8c66cd16f3d2eb707b65f5d00d02c7e9c39507b1fcfed7b14bd815689f78c0e358d9daf568 SHA512 f1837b32ed8815c47525364179216aeb6a66de0ad1673bc5c3c9fdf760f71b18169e6bff1e0c7a4e8e70f17354c5316e8273c900b48975510a8bc21545046f5b
+EBUILD portage-2.3.62.ebuild 8825 BLAKE2B 3a5416eb637da5fef2523e6bc66994d6cda9e8a91d8f6da61c023bc73ae7e282b2f7ffe6f074271236c84621e9bac073798dc00739384f922d2c370ab1daba1f SHA512 ff45fcb144be1ce4d66951f807738ff2dc53f012f2125b00d9fdb214b4d681eaeaa2086f367f1c5c921749fbb5496442f369f0ea63eb1495d3946614e243196f
 EBUILD portage-9999.ebuild 8686 BLAKE2B 828f8099e038313c4bbf4a17361f1ef42d71c288f8973f59ae18adad176473ff32e869749d48793a5e6e0ae7e139b8560ad06b508718a73d68081520e57ee3ca SHA512 17a3682b8e897219bb29b6ecbc39d2ce53bf7c949ad0ae6faf36f948730bbc25818f59e23622802f09b078f61bb85814dd3ec1c588fef99bd87d057bab129fc9
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.62-r1.ebuild b/sys-apps/portage/portage-2.3.62-r1.ebuild
new file mode 100644
index 000000000000..1d1742200872
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.62-r1.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 epatch linux-info systemd prefix
+
+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-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=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 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=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_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
+
+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 ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		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, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		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.62.ebuild b/sys-apps/portage/portage-2.3.62.ebuild
index 73e3f8d6f6bc..e8c8e0ea9f45 100644
--- a/sys-apps/portage/portage-2.3.62.ebuild
+++ b/sys-apps/portage/portage-2.3.62.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 1fb8f8f2aa3d..cd1a75b13a29 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -2,8 +2,10 @@ AUX restorecond.init 650 BLAKE2B 507c65c11f756d5cf11045ba75d40a39a9fb6a527c9e040
 DIST restorecond-2.7.tar.gz 17753 BLAKE2B 793a41dbfd0a33d79e15c62e79f4fbbacc4208a8f2057813d7c3e2d16a3435c12e0c29ca60a3b45cef33ec13b5aacd28c8ad95ddcbf47a812654d3a59fcb6c89 SHA512 c81950e4f748a729c8951b13a4075ab1003530f8ada7a9d3fbe6428f76070df4819a37daaab557b63fc234aa8c8320ec41757fbdb24b76fa2c11747bde0038ad
 DIST restorecond-2.8.tar.gz 17740 BLAKE2B ad873acbbb7c56c29a8523a42dc053ea79036a15bed71b47a690d01d4012394b5ecf74ae75b27affb4007d754935ec90246f22ef3e0b9611556ec7baf59670db SHA512 5d72336782c3ad095746f8e6fa67e36448e5e76ca29586d8fe4962c64e505fa95c1458e8fc8f7d5bd589fff71b4be3758fb0cee3dacd2ccd0bc8476423e2540e
 DIST restorecond-2.9-rc1.tar.gz 17747 BLAKE2B 0bcccb45b77bd97830f1e17e48c529f08d2e7eb1467f817ecc3520543e89d0f287c755baee53c27d0820d81a18cef34573b5f5e943b5c2d1e827886ce137f906 SHA512 6d0b0e3e36dfe567cf5349801078bc6ff9c6a7e7f2afc13f7ae775c9ae1d74fddfce14f3c83933f386e110ae5b4836c633d8307c9c4bce2000a3230bfcdb64eb
+DIST restorecond-2.9.tar.gz 18893 BLAKE2B fcdae1a4ec489f3f581212cdd3c13c5561feac3ee758f354dca75c97938c62b9ed04aedbd4b3b5cde09a5887247389262718145620d0b9749e364d1614f57241 SHA512 6de9dd4c6b8e5d8275221aba5df27437998f635cfe83a5da75de479e260ceea884a36253eb873a8d71e1a77ed67544d8657fb75fe409af1f630052ce73ec5d8a
 EBUILD restorecond-2.7.ebuild 1250 BLAKE2B 7ae1b18d0eb9906ace64c5e2191c894fe424e69fe4f38f14238b3706c426a8272ea7f35ba5237a3375f7329d2140b78c02161cc855460e70f09d7c3f4850a51a SHA512 c5bbc404f56d756897433561485a6c90d5bdfb70958181cf5b670bb4a3dc9b428f91b8960e0960251d7acdd35f0e9b6141c5f4056f90d934a913b5b5ebfc6af8
 EBUILD restorecond-2.8.ebuild 1165 BLAKE2B 7834d473f312d93be8885bfba2cd3930268bb7a056b6d968253f70259d959699a7246436ed8810e41ade5c24e312b0a9c86a8c078df652bfe032cde7ec03b2c5 SHA512 9f488cf1e460aed3c48e5e453bde2940a6132dec29e5ee599a21928543bd2549c21800603129a0847c5c85071216144c87b45543abbc57f6658e03f3976c2852
+EBUILD restorecond-2.9.ebuild 1147 BLAKE2B 5e8707a3636dec5a806ec1584bc1ca7031567a3e483f48dd086bcd3e67f707252bfa31a6ae89edc25612791a56ea197af5f4ae68c9985639b35d686b53caab0c SHA512 64c5273d79a410b428891504d1ea8e9b163ed43d7a6d18a4eb87a4c9a63cd827a999d4ed89ecb4410a33661c276e6fc7e65a4268ac375c3c280678515bb3cedb
 EBUILD restorecond-2.9_rc1.ebuild 1147 BLAKE2B 155fbcff0c3c613b4dd9fb0dea20a256afc9db266c7231be3a6438e7e5873aab979d0fe4c12f513cccbbe315458e01c58f6960d1260aaca6354a8ec618bf892f SHA512 7ba97dcbe1f5978593bc0e5f96ee544c10ad29d4ce8fa1be3d7f7e3f6e75bbb6b7401bd325f2c4c1d4696706031022922bd7df0118a65112da9851be50b9621c
-EBUILD restorecond-9999.ebuild 1147 BLAKE2B 155fbcff0c3c613b4dd9fb0dea20a256afc9db266c7231be3a6438e7e5873aab979d0fe4c12f513cccbbe315458e01c58f6960d1260aaca6354a8ec618bf892f SHA512 7ba97dcbe1f5978593bc0e5f96ee544c10ad29d4ce8fa1be3d7f7e3f6e75bbb6b7401bd325f2c4c1d4696706031022922bd7df0118a65112da9851be50b9621c
+EBUILD restorecond-9999.ebuild 1147 BLAKE2B 5e8707a3636dec5a806ec1584bc1ca7031567a3e483f48dd086bcd3e67f707252bfa31a6ae89edc25612791a56ea197af5f4ae68c9985639b35d686b53caab0c SHA512 64c5273d79a410b428891504d1ea8e9b163ed43d7a6d18a4eb87a4c9a63cd827a999d4ed89ecb4410a33661c276e6fc7e65a4268ac375c3c280678515bb3cedb
 MISC metadata.xml 460 BLAKE2B d0de63ca5ac8e0c1c061f418ea9dba5472644626bbc5799499ce70ff0c2d1c7e49b023e3855cc7c767e78f5fb6f62429f5aab59dd272d9a906dbe026895e2e46 SHA512 0e4910de5e3932eb2914ddf4ef3250ae919885428337b1939f6827037a4dc5a75b13c97531c7b81748b1c90e3eb2b10a4671c76ede69749dbd1955bc67b5ca0a
diff --git a/sys-apps/restorecond/restorecond-2.9.ebuild b/sys-apps/restorecond/restorecond-2.9.ebuild
new file mode 100644
index 000000000000..b63423494d5c
--- /dev/null
+++ b/sys-apps/restorecond/restorecond-2.9.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20190315"
+
+MY_P="${P//_/-}"
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${PV}:=
+	>=sys-libs/libselinux-${PV}:=
+	dev-libs/dbus-glib
+	dev-libs/libpcre:=
+	>=sys-libs/libcap-1.10-r10:="
+
+RDEPEND="${DEPEND}
+	!<sys-apps/policycoreutils-2.7_pre"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -rf "${D}/etc/rc.d" || die
+
+	newinitd "${FILESDIR}/restorecond.init" restorecond
+}
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild
index 7e54ae96b8d6..b63423494d5c 100644
--- a/sys-apps/restorecond/restorecond-9999.ebuild
+++ b/sys-apps/restorecond/restorecond-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20190125"
+MY_RELEASEDATE="20190315"
 
 MY_P="${P//_/-}"
 IUSE=""
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 461a74c1fe77..6382037ba8ca 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -2,7 +2,6 @@ AUX rng-tools-5-fix-noctty.patch 2069 BLAKE2B 6de4e60b1855b74bfaa528e4dfa3fa2377
 AUX rng-tools-5-fix-textrels-on-PIC-x86.patch 2677 BLAKE2B af3911de5a8d7c91bc8a3065d817497b9f46341a05851bfe8d45de481dc8daaba618e1cc176dd397cd63430b51b582fd880f803d69bba61e00deae91e56e3c87 SHA512 8c7c6bced6e0982069ba6ef99c169609ff452a55c32543c25f198a59f81d4e976caf400867cb52bbe2996363f22943ff73c678427da43ad3a019bbe29bd29ce1
 AUX rng-tools-5-man-fill-watermark.patch 765 BLAKE2B 1e99d4961ba0e132fac5fbc7d5794ff638497662c0f9b16810d42428eb7fbdaa5dfe657ac961115587db2acf0672e67387077a317fe2afdc7eabdd4d1eb83e92 SHA512 8bc7a9903f9f77da2d55321605a2421bef27d8cedd3ea67e5547f4e59b85b3139b3cf269efe4c3abd767d87666e3e28b03e4fbf6984122febf45ea14af3332a0
 AUX rng-tools-5-man-rng-device.patch 398 BLAKE2B 6781f201e9c87143aa56dbb35702e95441cdfc304233be40d9f28c929c18f955d710b32128eede20bee71bab789bc72318cd71af294c2e6bc6d721882c3d030c SHA512 cd4c0cbcc32f6ace0f05c0dca82461c2a676a986c000850a422c3b509d79f22ddb98732749e63a1d9ec6d90db1745b7a163a590ada61f0ebcdde07b160647d3f
-AUX rng-tools-6-fix-noctty.patch 2188 BLAKE2B 73eebe43b950e0ef261208c073f5b6c0fee6b4cabd216373c0973de61604c936200943a4b0574533ec3cacee8701253de55f5d6a730765fcadc9a6e099eed3b6 SHA512 dff3d3ef81e847d378ca45531e4eaa81f4028b2b08adc17c68bba108cb4604f3bf13daa8b0e46ccb8aec2626ff8fd983038544508f3117828cecfbb282762116
 AUX rngd-confd-4.1 562 BLAKE2B 8fe0147a1f9e67541c709f793ed1f34ed173204739973abbb1df629fb79ebf47d78c7d2e0f1aa9a867aff1f77133271325e2dbb2bfe5440921f5c16c2f0e8e5b SHA512 45e0e9cbe0180162f659bf05c15ee99fb8c1b80274cd8744384ba7f791b1c9a46a63e81eea665b4f492c13b7d5cc1fdb6e524a49a25af77f3791f527b31f688b
 AUX rngd-confd-6 2038 BLAKE2B 0f239923693d167a6a53609822d15a92e0c0e98d9c090c17ea3a73ad4a187528cd9a5d4bf071ec544592ef3ce801c2c364ccba193c22940411629b14a486cd69 SHA512 fe58599105fbcf8e1bf5f584aeefa54681dfa9fa2cd73cd682acd348f170ca825b692a1a8d153b438096c580a4b0cdab56a03b32b5f9ae8e73f06c3535c1ea46
 AUX rngd-confd-6.7 2245 BLAKE2B 7643525d9a57479ba1b725ea6f976421c3df990c56d9f694b6fd2d3283c51ccf42e1be403a2208be70bc09dbd946c0cb803bfb303ae3999e97b3c3baa1162aaf SHA512 f16c5bc417e7bae86311397b3bf51927cc2cfbb0b4ee14a835fff5b62f4d12ab194329942e21cae4eec56953e4271b1fc655dcfa0be4ccbff1df1f1defdc70d8
diff --git a/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch b/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch
deleted file mode 100644
index e915150adb58..000000000000
--- a/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Gokturk Yuksek <gokturk@binghamton.edu>
-Subject: [PATCH] Fix rngd to open the entropy source with 'O_NOCTTY' flag
-
-When start-stop-daemon starts a rngd instance configured to use a tty
-device as its entropy source, the application crashes due to not being
-able to read from the entropy device. This is caused by
-start-stop-daemon calling setsid() before executing rngd, which
-disassociates the controlling terminal. When rngd attempts to open a
-hardware entropy source that's a tty device, per POSIX rules, the
-device becomes the controlling terminal for the process. Then rngd
-calls daemon(), which internally calls setsid(), and consequently
-disassociates the controlling terminal for the child. Meanwhile the
-parent rngd process exits. This results in tty device hanging up. By
-looking at the strace logs attached to the bug, it can be observed
-that although the parent rngd process is able to read() from the
-entropy source successfully, further attempts to read() by the child
-rngd process return 0. This complies with the POSIX, which states that
-read() calls on a hung up terminal shall return 0.
-
-Note that when rngd is started without start-stop-daemon, this problem
-does not happen because at the time of opening the entropy source rngd
-already has a controlling terminal.
-
-Prevent the entropy source from becoming the controlling terminal by
-passing 'O_NOCTTY' flag to open() when opening an entropy source. This
-flag prevents a tty device from becoming the controlling terminal for
-a process without a controlling terminal at the time of open().
-
-Thanks to John Bowler <jbowler@acm.org> for debugging the problem and
-pinpointing the issue as well as confirming the fix.
-
-Gentoo-Bug-URL: https://bugs.gentoo.org/556456
-Reported-By: John Bowler <jbowler@acm.org>
-
---- rng-tools-rng-tools-6/rngd_entsource.c
-+++ rng-tools-rng-tools-6/rngd_entsource.c
-@@ -162,7 +162,7 @@
- 	struct sysfs_attribute *rngavail;
- 	char buf[16];
- 
--	ent_src->rng_fd = open(ent_src->rng_fname, O_RDONLY);
-+	ent_src->rng_fd = open(ent_src->rng_fname, O_RDONLY | O_NOCTTY);
- 	if (ent_src->rng_fd == -1) {
- 		message(LOG_DAEMON|LOG_DEBUG, "Unable to open file: %s", ent_src->rng_fname);
- 		return 1;
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index a2a6d5d254de..df53b24d8c94 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,8 +1,10 @@
 DIST secilc-2.7.tar.gz 175733 BLAKE2B dfad83618f3dd14f4a710d27b6ff3dbe188c9e1eecabe29dd16d9b0ba35a2aa2c5777d999fb378159624f7b7af9af152592e69f9212d2ae6dc6e52dbefcba056 SHA512 cd828ad34e80151951f94414d27246b480cd4831d1d57cb35d5958ce23c30fe74f26ec1c4b29b51fe382bf03ec3144311b35ca645ffc6b914b7abfe677684c06
 DIST secilc-2.8.tar.gz 175893 BLAKE2B d1e588c82d8be68efb66abbcedf28b3f99ac58edf58df238d970243b7a9c94109fcfc6958907fd4f614381e9ee4e248796b556a37a283d6f0e602a98349c1dd9 SHA512 70b92802af8bdfbeb458ccaaed74e00e8a1edfcdbb48a0b422cf1e98ce467db1a586c800574ae61b0fbf006330c603b44d022091d7bcb6b0963ef1b1c6e547c1
 DIST secilc-2.9-rc1.tar.gz 175895 BLAKE2B d89eebc1c71663c35f880f264d79e17da477261403cf4394ebf5017d86c64ada12c8d8fd92651e2ca33a0a4d90a4835a846221cab34564167fae66a76c962ebb SHA512 5aeb099fc8afad5dce5c55c171db8ca1e1326bd670f84debdeb679b3e81e3f9943c68bcbbb3beaa9c9c3aa3aceb691f6cf8a13081f0bf28eb921d7b139dfb814
+DIST secilc-2.9.tar.gz 175885 BLAKE2B 0a5fd0adb70ce80574148ac035dcb8c5c80f6779a6a0c696eaba26cb6c4441e58eb161600034102dcb34c87099357bfc66015d245cf2fd49b56e65d782fc8aac SHA512 c552ce65fc23bef1a93b3dc485369d64ad19a3f30707b95d0dd488d1766ab9f5e75884b79e6464997eaafee119193a1fdd5ff8228aee0fa902e426eefa14a4ee
 EBUILD secilc-2.7.ebuild 922 BLAKE2B 0316d98a09d332cc1781f25776e6408fcac8cc4b3d3fa76ed0f1e897a7aa1bd7dcde16ac55f200a04e941d5dec63e6cc8f6c319ae0f2f96d6b828e5ea63b898b SHA512 dc913463e0a5d9c3367712c4e4d7a096b0ae84d0e188086f3328a66d081a92e45f2f12df86e8d5e7e175e9196ac6c3a3acbcf29870ca04f5e23aa8aa46715b28
 EBUILD secilc-2.8.ebuild 922 BLAKE2B 6a6a35a5da397a04f27c69f9f709961290a10c83c544db6ce42e9b5339e80b98ec9e92ec0e6c1dd3c54ac26e767060e07d79eb042d9abe5d064bf2559ce00308 SHA512 67d657753cbe856e9c6afda6fbb1928366acae73d81af547f5bc2838dacd94d3e5bd451f67e79113100049fe13fe6fd0219e3fc5095bb34a4f5751df9d69b28d
+EBUILD secilc-2.9.ebuild 904 BLAKE2B 6ac9759cceb0cfebae9471c7caa39dbabdee53331863bf602dcc63f509e715311cc55854657a0998b5fd1c371c05f7d40b79552d29287ac0ec7afd85fbb295ab SHA512 24577cd2ced50ce9d4203e6219bc74b73a0bbe62eccac4c698264431eef6a43daa165054e01da94c1b8bf7bc2ccbb919e43dbfe1bad4c7fd7f766e1683ae6f46
 EBUILD secilc-2.9_rc1.ebuild 904 BLAKE2B 05f135ebf8b4f9585e67742aea681b4f9fd9e4585074ded6a040db09463a9d42741fc85a8148791a6c5bc38f6bb89479b1d7ce05d68d1032a5133be2b07298cf SHA512 ee0899e6a8265fac11d6d94776e2b8cefcc0c8d47befa896b0003c5992d2ac5693dea24343ad0abbf5d593a7ce743c1eb6b1014bb6b1f309d96f332f0b9ab0bc
-EBUILD secilc-9999.ebuild 904 BLAKE2B 05f135ebf8b4f9585e67742aea681b4f9fd9e4585074ded6a040db09463a9d42741fc85a8148791a6c5bc38f6bb89479b1d7ce05d68d1032a5133be2b07298cf SHA512 ee0899e6a8265fac11d6d94776e2b8cefcc0c8d47befa896b0003c5992d2ac5693dea24343ad0abbf5d593a7ce743c1eb6b1014bb6b1f309d96f332f0b9ab0bc
+EBUILD secilc-9999.ebuild 904 BLAKE2B 6ac9759cceb0cfebae9471c7caa39dbabdee53331863bf602dcc63f509e715311cc55854657a0998b5fd1c371c05f7d40b79552d29287ac0ec7afd85fbb295ab SHA512 24577cd2ced50ce9d4203e6219bc74b73a0bbe62eccac4c698264431eef6a43daa165054e01da94c1b8bf7bc2ccbb919e43dbfe1bad4c7fd7f766e1683ae6f46
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-2.9.ebuild b/sys-apps/secilc/secilc-2.9.ebuild
new file mode 100644
index 000000000000..aead3f36a435
--- /dev/null
+++ b/sys-apps/secilc/secilc-2.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit toolchain-funcs
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20190315"
+
+SEPOL_VER="${PV}"
+
+DESCRIPTION="SELinux Common Intermediate Language (CIL) Compiler"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	app-text/xmlto
+	>=sys-libs/libsepol-${SEPOL_VER}
+	"
+RDEPEND="
+	>=sys-libs/libsepol-${SEPOL_VER}
+	"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild
index d7ad1e7fe883..aead3f36a435 100644
--- a/sys-apps/secilc/secilc-9999.ebuild
+++ b/sys-apps/secilc/secilc-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20190125"
+MY_RELEASEDATE="20190315"
 
 SEPOL_VER="${PV}"
 
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 8ed2d909f302..430290c70a1a 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,9 +1,11 @@
 DIST selinux-python-2.7.tar.gz 2068004 BLAKE2B 57c7f324a8faddf57a576f9ec5c46c8dbbd085a3aff4355df645b0f391a0c2db718e8adb2719515cc4a9c386e11c3df053b5303d3f91ff4958fb91e80d440b51 SHA512 df8645e7ac9ca568f0c9d81c42b93d0abadc43c22f14d38451ab262b52132cfb7abd7742e3a00ab9c153f95dd5b23b3a496d84875debcd9787f75d940eb45c28
 DIST selinux-python-2.8.tar.gz 2068101 BLAKE2B c28f12e4bd453955148a6ba82fd28621d1a4600f872ac63d97372f2e0153091adf1cf871f89765dd300bc6b7b2d610b96f87e3fc5accbfad713ed8a0d8f76f5a SHA512 e695c11122f7f8105b75d1ef98355fd2b82b40d93c2fd9e733dcd95d4d7c392f60b646df81203c43ad2a0e8447f9901083007e1572b78e17368ad2764ffa1aad
 DIST selinux-python-2.9-rc1.tar.gz 2082516 BLAKE2B d1e6e859308739daebd979fd26b3a8b0cbef050f2c69177a93da5b79f103444b0800ce761e5483ba79356b67ce7c6c246c758d19bc85ec7d1061e6b8ab31c6e3 SHA512 afd7686ed21c55aa3fc45934d252da1a7d8a44651ef210bf54d4feeedcb72b9092be2d3becc9ff9c8caba53088d33ad97824e0655e04a47c122b45ea6c3e6455
+DIST selinux-python-2.9.tar.gz 2100185 BLAKE2B 8aad58264197dbf23dfa286ba6530150ca6ae1ddaeb1a58988c05d0b122420cfd7e9be2a1cb7082d73cd41f03c4df00ad81a0fb746b075db24e63f62f86a1bf1 SHA512 1138661128635004fec04dc5e39f035680b5f21beb1b79f3328690a1b93a3984d522a02724af793340112a5e647d363dda8a7d3536de959b34ffd69aa396254d
 EBUILD selinux-python-2.7.ebuild 2673 BLAKE2B 14692ea38d55be1eb9b17dde7b4f1c7195139543347314896527c442931812bdac4524cd75c66b654d9b778ed4d6d213d21f2b8b1f3dc424b4bf8101da08bb07 SHA512 ad6d6047b551c82464d58de569cbe7c4137d0e5c87125164690bab4aac5bb48fa01059e31e1cb6de99a0abfd942c7294fefecced7e4b19d8dc4715b398c788c6
 EBUILD selinux-python-2.8-r1.ebuild 2574 BLAKE2B fd485f85d9131effc46be7741a5aa1fb2d772d71ce3a01108e59ab8885ea6bb02b28ffbe174eeb3a4b6f195424d04eb6a0d42df5f3c2104506c6b26823f36129 SHA512 a0311ff67fd075219d140e8811cf19872d1ddebe0fc51bdeb870d27a58350459559a54b04ac3bf41d3074fc33446f110279710310afbdbbbd1b3c8bbba7c49e5
 EBUILD selinux-python-2.8.ebuild 2583 BLAKE2B db435532e1b00e5dda43f060753be5302b1c3ac490580e56756ee5f65f5ec1477de27afa9368c03f4501c789c071c44dfb926c5c8d26540bd709a6982099d97c SHA512 6a3c712d563d14e0bf203976a4251178bddb08a24725cab1b95c07664fd874631698c9c59c446499d87a2950bb1c29b2bf97e67465e3e2afa07f6cafdac101bf
+EBUILD selinux-python-2.9.ebuild 2557 BLAKE2B 1eb76dfc5459e5918ec524a4daf64f4038e9f5d0eed94f2ae63ec33cd897f358f60c37a95ac2fbd5c1135294bd747c8d9a5a232d7c4de617b3d49c92752fafd0 SHA512 acfb0805be77ba5a86174dafae73e57d057a0d2bc7c8734a5bf0268f15cdec02db431d5ccd9f60f3cb19fbf08731d0132257b66935452d9310c221500372c938
 EBUILD selinux-python-2.9_rc1.ebuild 2557 BLAKE2B 0ad8742188c22fae9207a7de4d5c5e8a58146bae03f140324e3eb1e8fc3acd820d12d8cce21fd65d190c5600b82373dd3be0159d14ae476fb6fb1d6b8b77350c SHA512 897d2283a26663358432ac03cdbe357f582c8d8e36bcd2016259b3d33beaf97e2fffcbc376a996f74e6d6a18d919bf9a6e53cc66a5f054f8213c48e8458e994c
-EBUILD selinux-python-9999.ebuild 2557 BLAKE2B 0ad8742188c22fae9207a7de4d5c5e8a58146bae03f140324e3eb1e8fc3acd820d12d8cce21fd65d190c5600b82373dd3be0159d14ae476fb6fb1d6b8b77350c SHA512 897d2283a26663358432ac03cdbe357f582c8d8e36bcd2016259b3d33beaf97e2fffcbc376a996f74e6d6a18d919bf9a6e53cc66a5f054f8213c48e8458e994c
+EBUILD selinux-python-9999.ebuild 2557 BLAKE2B 1eb76dfc5459e5918ec524a4daf64f4038e9f5d0eed94f2ae63ec33cd897f358f60c37a95ac2fbd5c1135294bd747c8d9a5a232d7c4de617b3d49c92752fafd0 SHA512 acfb0805be77ba5a86174dafae73e57d057a0d2bc7c8734a5bf0268f15cdec02db431d5ccd9f60f3cb19fbf08731d0132257b66935452d9310c221500372c938
 MISC metadata.xml 718 BLAKE2B ca11527a8722aa1c1f74f1731409e950f866094492f15e9345c117622da63f06bb5681e806545083200a494d3b65f0c4f31e1454aea5fed923f438ef01aa91af SHA512 a45a1c3e516dd956e60be67ddce632d055a98ff0fb45b920adfb5d1253da77822286f9742865027a47e94386dad2a1478a5b51f2bf9a97e2c2571470fdb34e04
diff --git a/sys-apps/selinux-python/selinux-python-2.9.ebuild b/sys-apps/selinux-python/selinux-python-2.9.ebuild
new file mode 100644
index 000000000000..eb75834f5ef4
--- /dev/null
+++ b/sys-apps/selinux-python/selinux-python-2.9.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit python-r1 toolchain-funcs
+
+MY_P="${P//_/-}"
+
+MY_RELEASEDATE="20190315"
+SEPOL_VER="${PV}"
+SELNX_VER="${PV}"
+SEMNG_VER="${PV}"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DESCRIPTION="SELinux core utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
+	>=sys-libs/libsemanage-${SEMNG_VER}:=[python]
+	>=sys-libs/libsepol-${SEPOL_VER}:=
+	>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipy[${PYTHON_USEDEP}]
+	!dev-python/sepolgen
+	${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+
+	python_copy_sources
+}
+
+src_compile() {
+	building() {
+		emake -C "${BUILD_DIR}" \
+			CC="$(tc-getCC)" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)"
+	}
+	python_foreach_impl building
+}
+
+src_install() {
+	installation() {
+		emake -C "${BUILD_DIR}" \
+			DESTDIR="${D}" \
+			LIBDIR="\$(PREFIX)/$(get_libdir)" \
+			install
+		python_optimize
+	}
+	python_foreach_impl installation
+
+	# Set version-specific scripts
+	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
+		python_replicate_script "${ED}/usr/bin/${pyscript}"
+	done
+	for pyscript in semanage; do
+		python_replicate_script "${ED}/usr/sbin/${pyscript}"
+	done
+
+	# Create sepolgen.conf with different devel location definition
+	if [[ -f /etc/selinux/config ]];
+	then
+		local selinuxtype=$(awk -F'=' '/^SELINUXTYPE/ {print $2}' /etc/selinux/config);
+		mkdir -p "${D}"/etc/selinux || die "Failed to create selinux directory";
+		echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+	else
+		local selinuxtype="${POLICY_TYPES%% *}";
+		if [[ -n "${selinuxtype}" ]];
+		then
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/${selinuxtype}/include:/usr/share/selinux/${selinuxtype}" > "${D}"/etc/selinux/sepolgen.conf;
+		else
+			echo "SELINUX_DEVEL_PATH=/usr/share/selinux/strict/include:/usr/share/selinux/strict" > "${D}"/etc/selinux/sepolgen.conf;
+		fi
+	fi
+}
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index e68742e64f4f..eb75834f5ef4 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -9,7 +9,7 @@ inherit python-r1 toolchain-funcs
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20190125"
+MY_RELEASEDATE="20190315"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 SEMNG_VER="${PV}"
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 1d576b3c0b93..bd78e342ccfe 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,8 +1,10 @@
 DIST semodule-utils-2.7.tar.gz 15447 BLAKE2B 44c28ad634ef2ab9e478edb58020547c217a01be0aa75cf3a2432be419efb626f0a5742ba1bcec50ba11c132c207a42c05836eb2749e1f80d4a8142fb9e34a9e SHA512 5c7c2a2224949f50c1119edba90d937363e22af52a38f06525e957b29f5310a3e3444d03980b2f808ce995de0f9fc0a9dca8b6167bbfde29c1a33b9bc786d3c8
 DIST semodule-utils-2.8.tar.gz 12536 BLAKE2B 93a2f8fee887eba72b009071549a687fe86045344979e31493b3f17041ddf3f31c29ea3c754a31f6029847798dfe26d63b02fadc1042bc68aa414050b283d208 SHA512 13d79a22115f5448dafc5202dc3dec66b9ad826051d61d7c126defe823407959511db35713d97c7dfe9e79de96193fec91a10b98c13743e06a1213f5734f4ae7
 DIST semodule-utils-2.9-rc1.tar.gz 12548 BLAKE2B 62a4413f23ee8e30a9d60c00814425789362da4b056b03f5b27462534759d08f22c44b30a4d25c69bb5bd7447b5ed9e8cc89efb102e43c437adb4bf18f9a3540 SHA512 2e03dd8c23ad1b2f2492194ccd4a6fc39d4ee2d513778264b794011121c3b6eb896dab4a2236cf3934d1e200ad1f86ba6223bb6ac7aa81b1fd4c2a700dc7081a
+DIST semodule-utils-2.9.tar.gz 14259 BLAKE2B f72630c520504596171ac6f678b1fde2bb8482b620f0d8f6374c59b85d634ee8c407e3e4b268dae4d6cecfa2749b26f8808dd56f7c5391e7d1ba11f4a8a789e5 SHA512 688f1fcb34042b837019302debda76847691657709130b99bf937a85774a0ae69d789ee82b0633a4d2dc661dc6d0a1706a878ac681317df2abe68418bec3f952
 EBUILD semodule-utils-2.7.ebuild 1123 BLAKE2B b94f20dedd85eabdb4cc9ea37ed8060ce68f044e3a463f1d255cdbcda0e0187686d8d3c2b6be0f0339eb034a04e2c42050eb1633ac0e9546f4436e4585a34e4d SHA512 66d018f1a8a2c16f6083972fb80d14806cd2671ab8150fd676fd164d21bfef12d43eb70b1f1e99a972f15cc19ed0c78d518788a79ca8805f9ce31dae9d10a38d
 EBUILD semodule-utils-2.8.ebuild 997 BLAKE2B 90d4e8740267ebc4f9e6bc3453dbe70ebbab54fb9025665c79e46df829fe8df4a754beafab46ad13b32273fa4dd527014ad47692e4858eff85672391dcd9c02d SHA512 689ec194b0852d3eb75f0f618a1cf4db0927718d408e4040a5240b874548169d326ec17be7233f78313ad4c5c8f12e5c02428aaccef12170e8ba3efa2afefdd3
+EBUILD semodule-utils-2.9.ebuild 979 BLAKE2B 883ffc075aab31c03f87630580fc008ebf5849a0ade11e16a0c73a275da09b55d4fd146f49eb817434fca8b57e5ba2922ee3b97a4491662ec22cc57331958167 SHA512 f1e4f5909b1b0781e7573139e3f80f46694bbfefab40bc12357eadc51624e4e3b56de4a58bc5fd397567787957492e17be79af9ab7835babbef02125accc52b8
 EBUILD semodule-utils-2.9_rc1.ebuild 979 BLAKE2B cc4a3f4f9ace03e8fea8d0555fa5cd21f0c5943155235f687a908f694b83199eb911e6ee93511b219cc48a63a96e139cb0cea140ea3b066c117830637bce189c SHA512 eec40e9327cef1e4689d0a618a876be3243665904a836cef064527cf820d6f74b1c1ee52211e6f8b02714f4a1bbafd3c1b10ff49ddcc8a49b9d07696dba99768
-EBUILD semodule-utils-9999.ebuild 979 BLAKE2B cc4a3f4f9ace03e8fea8d0555fa5cd21f0c5943155235f687a908f694b83199eb911e6ee93511b219cc48a63a96e139cb0cea140ea3b066c117830637bce189c SHA512 eec40e9327cef1e4689d0a618a876be3243665904a836cef064527cf820d6f74b1c1ee52211e6f8b02714f4a1bbafd3c1b10ff49ddcc8a49b9d07696dba99768
+EBUILD semodule-utils-9999.ebuild 979 BLAKE2B 883ffc075aab31c03f87630580fc008ebf5849a0ade11e16a0c73a275da09b55d4fd146f49eb817434fca8b57e5ba2922ee3b97a4491662ec22cc57331958167 SHA512 f1e4f5909b1b0781e7573139e3f80f46694bbfefab40bc12357eadc51624e4e3b56de4a58bc5fd397567787957492e17be79af9ab7835babbef02125accc52b8
 MISC metadata.xml 521 BLAKE2B 5785152e6b947a78aa09c12816bdee5f0c93e718d0a3cb9244b1b769dab19bb057db91c49179990d06e8cfc6bac692b5223ddf2137ea043a13ee58c41b2ade1d SHA512 e15b382ddf7059ff9c82887d636522dcc993e580e715d4a822106ed27c7fdb75b32e96c8c32a34cbdbbef4ad0f9c49bfb7c7420ea97852fa82e7740c4044a689
diff --git a/sys-apps/semodule-utils/semodule-utils-2.9.ebuild b/sys-apps/semodule-utils/semodule-utils-2.9.ebuild
new file mode 100644
index 000000000000..bf80b21dfc42
--- /dev/null
+++ b/sys-apps/semodule-utils/semodule-utils-2.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_RELEASEDATE="20190315"
+SEPOL_VER="${PV}"
+SELNX_VER="${PV}"
+
+MY_P="${P//_/-}"
+IUSE=""
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
+	S="${WORKDIR}/${MY_P}/${PN}"
+else
+	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="SELinux policy module utilities"
+HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=sys-libs/libsepol-${SEPOL_VER}:="
+
+RDEPEND="${DEPEND}
+	!<sys-apps/policycoreutils-2.7_pre"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' "${S}"/*/Makefile || die "Failed to remove Werror"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		install
+}
diff --git a/sys-apps/semodule-utils/semodule-utils-9999.ebuild b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
index 2db179e63537..bf80b21dfc42 100644
--- a/sys-apps/semodule-utils/semodule-utils-9999.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit toolchain-funcs
 
-MY_RELEASEDATE="20190125"
+MY_RELEASEDATE="20190315"
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index f3efe68f7062..2398a9025f54 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -4,4 +4,4 @@ AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
 DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
 EBUILD shadow-4.6.ebuild 5349 BLAKE2B de19b3b93257baae9b0f41658b93d0ddd510524ba0f4117435cbad7c12571dc24d4c04747f15e03d9d7fb06cad9166d09d25cbde200dd9caacfe508c6ea2f00b SHA512 a0d849fca5c244ea5e0cc7ea66bea156cf51d5c831712406202877ccd524b44b0227d6d243dcd2ae7e7aefb5877307e689636bb799a86074119d787042ec2cbd
-MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
+MISC metadata.xml 425 BLAKE2B 363f3a5caf1aaf0ddc3852f11191d8c3b9168ea1196ebba22c235942c23411dee2197715a2a52f513323ed845b96c7bc58ce59e5f609449fad5b6e807960ff82 SHA512 23577cff767bb0330e95f0390e3d5b5c2c43096a7103f38a9b91755d443a1f68b6f933d9e5c61feb37926565fb00e00c0b2b2dcef54270d69a77fdd78b143abb
diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml
index 2cabe8fe4fe6..623e134e2752 100644
--- a/sys-apps/shadow/metadata.xml
+++ b/sys-apps/shadow/metadata.xml
@@ -1,14 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>pam-bugs@gentoo.org</email>
-		<name>Pluggable Authentication Method maintenance</name>
-	</maintainer>
 	<!-- only for USE=pam -->
 	<upstream>
 		<remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 10bbd079bf4e..5842e7f8be0e 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -8,6 +8,7 @@ DIST smartmontools-6.6.tar.gz 903847 BLAKE2B 6c18884cf763c146abceed47587de0e77cd
 DIST smartmontools-7.0.tar.gz 944925 BLAKE2B 41b3894efa05471bf358fca4ba87a765e3a54df68c9a617804a9e0853752c57b68fdbaa9d55fa1462a8fa7de1d6cb5630c66929dfe521be38b180944cb80acc9 SHA512 96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512
 EBUILD smartmontools-6.6-r1.ebuild 4187 BLAKE2B 944a9dbe7e8daf1ebb14d8674117bc421d0d87e05877e313f3d3e78178b4a56cf795e3c60d392edc1310cd87c2ae4bfe78a9ebe29928db7643b7e977e905490e SHA512 51a378f9503dafbddf8b64a24cf30abcd5aba982b20ba632967198069fae9f5c65b900e14ad942d74884739aafd5ba24a88c65703c3435522eba4f589c6323b3
 EBUILD smartmontools-6.6.ebuild 4130 BLAKE2B 8128e1ed40b33fedd93a3c0d81d8de7bdc4240753df41779bb571ecae0e68d84e0f257019dc94fa539b4c334edc04e8091f2ee1e88fca4169f4b97391df628eb SHA512 b312edb0993e3c14505be45e08398e3d598d3bbdbd098b4e4fcae866b272b35ba61d9298f652a3437908f06289c64ffcbf4a50ce70e1938c0a710647d8a4ea88
+EBUILD smartmontools-7.0-r1.ebuild 4121 BLAKE2B ae44fb2240efd744cd44f6037b7d2476d3610145b2b5555a99d785904b811cee212d0b44f6450398536a2767933ab8a2c80fcd3eb7da8a4ba14dacfa95bc6e9f SHA512 0dc795252612d83de6e83d57c3ffc7a5341e360ec54ec3744974461cedd88fe09d4b04b3cc4c7d508c635050a38d6673522860851c5e92a6bf6cd9c14c4f8c9d
 EBUILD smartmontools-7.0.ebuild 4183 BLAKE2B 46f268cc66b3222225b78760a6f55e2412ac846e8cfe8c943caad77b89ece5fa9338c458ec00bc7aba4cbebcd42cbb97bb38da283dd8574fdbdea4cc778e4668 SHA512 f8168c32b934e9905290da8ba6f20584a58b8fd3360c81307883ab02c8700b5f3e018337a46cd753dff385cc8461a647e8fa94eea7d58c2b32f627a84a617353
-EBUILD smartmontools-9999.ebuild 4183 BLAKE2B 46f268cc66b3222225b78760a6f55e2412ac846e8cfe8c943caad77b89ece5fa9338c458ec00bc7aba4cbebcd42cbb97bb38da283dd8574fdbdea4cc778e4668 SHA512 f8168c32b934e9905290da8ba6f20584a58b8fd3360c81307883ab02c8700b5f3e018337a46cd753dff385cc8461a647e8fa94eea7d58c2b32f627a84a617353
+EBUILD smartmontools-9999.ebuild 4121 BLAKE2B ae44fb2240efd744cd44f6037b7d2476d3610145b2b5555a99d785904b811cee212d0b44f6450398536a2767933ab8a2c80fcd3eb7da8a4ba14dacfa95bc6e9f SHA512 0dc795252612d83de6e83d57c3ffc7a5341e360ec54ec3744974461cedd88fe09d4b04b3cc4c7d508c635050a38d6673522860851c5e92a6bf6cd9c14c4f8c9d
 MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
diff --git a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
new file mode 100644
index 000000000000..7b807da03226
--- /dev/null
+++ b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools flag-o-matic systemd
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools"
+	ESVN_PROJECT="smartmontools"
+	inherit subversion
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
+HOMEPAGE="https://www.smartmontools.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps +daemon selinux static systemd update_drivedb"
+
+DEPEND="
+	caps? (
+		static? ( sys-libs/libcap-ng[static-libs] )
+		!static? ( sys-libs/libcap-ng )
+	)
+	kernel_FreeBSD? (
+		sys-freebsd/freebsd-lib[usb]
+	)
+	selinux? (
+		sys-libs/libselinux
+	)"
+RDEPEND="${DEPEND}
+	daemon? ( virtual/mailx )
+	selinux? ( sec-policy/selinux-smartmon )
+	systemd? ( sys-apps/systemd )
+	update_drivedb? (
+		app-crypt/gnupg
+		|| (
+			net-misc/curl
+			net-misc/wget
+			www-client/lynx
+			dev-vcs/subversion
+		)
+	)
+"
+
+REQUIRED_USE="( caps? ( daemon ) )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# The build installs /etc/init.d/smartd, but we clobber it
+	# in our src_install, so no need to manually delete it.
+	myeconfargs=(
+		--with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292
+		--with-initscriptdir="${EPREFIX}/etc/init.d"
+		#--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}"
+		$(use_with caps libcap-ng)
+		$(use_with selinux)
+		$(use_with systemd libsystemd)
+		$(use_with update_drivedb gnupg)
+		$(use_with update_drivedb update-smart-drivedb)
+		$(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local db_path="/var/db/${PN}"
+
+	if use daemon; then
+		default
+
+		newinitd "${FILESDIR}"/smartd-r1.rc smartd
+		newconfd "${FILESDIR}"/smartd.confd smartd
+	else
+		dosbin smartctl
+		doman smartctl.8
+
+		local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO )
+		einstalldocs
+	fi
+
+	if use update_drivedb ; then
+		if ! use daemon; then
+			dosbin "${S}"/update-smart-drivedb
+		fi
+
+		exeinto /etc/cron.monthly
+		doexe "${FILESDIR}/${PN}-update-drivedb"
+	fi
+
+	if use daemon || use update_drivedb; then
+		keepdir "${db_path}"
+
+		# Install a copy of the initial drivedb.h to /usr/share/${PN}
+		# so that we can access that file later in pkg_postinst
+		# even when dealing with binary packages (bug #575292)
+		insinto /usr/share/${PN}
+		doins "${S}"/drivedb.h
+	fi
+
+	# Make sure we never install drivedb.h into the db location
+	# of the acutal image so we don't record hashes because user
+	# can modify that file
+	rm -f "${ED%/}${db_path}/drivedb.h" || die
+
+	# Bug #622072
+	find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die
+}
+
+pkg_postinst() {
+	if use daemon || use update_drivedb; then
+		local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h"
+		local db_path="${EPREFIX%/}/var/db/${PN}"
+
+		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
+			# No initial database found
+			cp "${initial_db_file}" "${db_path}" || die
+			einfo "Default drive database which was shipped with this release of ${PN}"
+			einfo "has been installed to '${db_path}'."
+		else
+			ewarn "WARNING: There's already a drive database in '${db_path}'!"
+			ewarn "Because we cannot determine if this database is untouched"
+			ewarn "or was modified by the user you have to manually update the"
+			ewarn "drive database:"
+			ewarn ""
+			ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this"
+			ewarn "   release which can be found in '${initial_db_file}', i.e."
+			ewarn ""
+			ewarn "     cp \"${initial_db_file}\" \"${db_path}\""
+			ewarn ""
+			ewarn "b) Run the following command as root:"
+			ewarn ""
+			ewarn "     /usr/sbin/update-smart-drivedb"
+
+			if ! use update_drivedb ; then
+				ewarn ""
+				ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}"
+				ewarn "with USE='update_drivedb'."
+			fi
+		fi
+	fi
+}
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 46b1cf2cff3f..7b807da03226 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -79,7 +79,6 @@ src_install() {
 
 		newinitd "${FILESDIR}"/smartd-r1.rc smartd
 		newconfd "${FILESDIR}"/smartd.confd smartd
-		systemd_newunit "${FILESDIR}"/smartd.systemd smartd.service
 	else
 		dosbin smartctl
 		doman smartctl.8
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 6e19a9201b24..9f34c12198b2 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -11,7 +11,9 @@ AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f1
 DIST systemd-239-patches-2.tar.gz 33416 BLAKE2B 9602d101cbac65d3b2490f28308e843c28fcaea848dd09005abef0da0bc79ba0766a1cbe7c3cac63f796accddf0295b4eb946e601a201f7e81a48bd1720051ca SHA512 5f5a764d317c43c6b1854171a753eafaca006e12e4f91c81e6ba1d50e80bbbaca23c900fba417264bf9f0d827a73aca71a6da8f2a2043aaaefefed62f5a92b23
 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
+DIST systemd-242-rc3.tar.gz 7818751 BLAKE2B 594555f3ecc39d29f57653614f8f03812cefc759a3faca3cab21aac79820e8851d70e94da7922a02dd0342ff3693c3007b0379cad40d049e55ba3a25c3b72e1c SHA512 89471959adfe8b80f8ae8993463cecbcb4c7115f2bf36d256eff1a1bbbe10ac6ce4301763f98594ee8faf547ec1187ff872b1bed0207e092e300345af92baaad
 EBUILD systemd-239-r4.ebuild 13321 BLAKE2B b08e0379d010f1ea7651239d4261d6138cd06ebb01489fa58185902ad6155ca05d021d147f8b24cfb8aa578cd69e8253bb267d4601e511cf29d02202b7057e0d SHA512 a6f96a05efe7f4152c2ffdb38b606f09bfc22f49ba3df0fba9bd914b3bcbd8cb09c1cb0858d43e94d3b91c2a809c8566b48a3ba6782521042dfa6c0c70512150
-EBUILD systemd-241-r1.ebuild 13564 BLAKE2B 972ed3c9f1ab6c6420193b34f4629cd2b3cd15ee917fc04c2620835fb7d73b78b82ed25319204c26cd1dddfae6978cd688d9a26eea542e6365a808f97aa4bdb2 SHA512 ffa17abc62197ec7ce8342a50feaed31f543c43b2c444ff786d793906bdd89ac5edb9d4b568199aa9a0c7bb27a5f5cfdfda0df9f79dc44b6f3b676954a7d090a
-EBUILD systemd-9999.ebuild 13376 BLAKE2B 02793e42d77682e5a38adcebd52a58ee715ae6c715a4f3c5f910b0b5e94d062217ea20aae017d94ad9bbbaafb2dc5764e68ba3bfa64a06d90982dc62b8b044bb SHA512 5cb2ef13042a7fd1f09fa47c45c64ca0dc57288f4190c69ac6b9972981d23520ee66d7be8242d75fcf905c7859316c60041c0aa5c1f67f31dea38376610008f0
+EBUILD systemd-241-r1.ebuild 13563 BLAKE2B 0b7914e2645f3d850d05f004da037034014e063b714890d7eb5ec14a60ff3f1c17dcf3ef960d093b8eb5d7368d4b8081811b1cc51ab52a2573f65cce1d3b825f SHA512 cd8246d6f81970885259284b5cc385b45e68f6de5871927ce48112eaf9fa6eb3fd9d4a123c8a20c1ca8bdfe42e3231123319dadb1f05304904005fcfab3a2834
+EBUILD systemd-242_rc3.ebuild 13244 BLAKE2B 323d43eab84da1e0ca36d263370c52dbb20e8cc400007e4f0911f07a7f038af46de1f6cf94103674e76dca0a76011ae161aac556b66e447cdddf18f4ccf7840a SHA512 2fdd0dcdc97dd1e2d36af5cef504f19036562279f3b5716f1f3f129bcb2f976b07778a55bf0122ddea3db283d33d8c46cc35ca9e96536e19b28fd4834c52655c
+EBUILD systemd-9999.ebuild 13244 BLAKE2B 323d43eab84da1e0ca36d263370c52dbb20e8cc400007e4f0911f07a7f038af46de1f6cf94103674e76dca0a76011ae161aac556b66e447cdddf18f4ccf7840a SHA512 2fdd0dcdc97dd1e2d36af5cef504f19036562279f3b5716f1f3f129bcb2f976b07778a55bf0122ddea3db283d33d8c46cc35ca9e96536e19b28fd4834c52655c
 MISC metadata.xml 2062 BLAKE2B bcca3d75829a25da2a4b3b987c7b14a5295785987d5e4573c19cd39aa165080d71f9a581190365a595567d5f20b58f054de5631480a8dec34c3a10d04f1498b5 SHA512 287b000a32b1b8ddd8041c8303857249317e74492c22e3ac59d237c9c9b511a612a90ab0fdaa209fc8ee092b00a0db0edc364053c1efc42a28f538dd4c3ee7d1
diff --git a/sys-apps/systemd/systemd-241-r1.ebuild b/sys-apps/systemd/systemd-241-r1.ebuild
index 47f33c6fcff7..fc3afc337548 100644
--- a/sys-apps/systemd/systemd-241-r1.ebuild
+++ b/sys-apps/systemd/systemd-241-r1.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
diff --git a/sys-apps/systemd/systemd-242_rc3.ebuild b/sys-apps/systemd/systemd-242_rc3.ebuild
new file mode 100644
index 000000000000..c167a2fd0b76
--- /dev/null
+++ b/sys-apps/systemd/systemd-242_rc3.ebuild
@@ -0,0 +1,471 @@
+# Copyright 2011-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2:= )
+		!libidn2? ( net-dns/libidn:= )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Defi=$(meson_multilib)
+		-Dima=true
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		#-Dtests=$(meson_multilib_native_use test)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-Dkill-path=/bin/kill
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+	)
+
+	if multilib_is_native_abi && use idn; then
+		myconf+=(
+			-Dlibidn2=$(usex libidn2 true false)
+			-Dlibidn=$(usex libidn2 false true)
+		)
+	else
+		myconf+=(
+			-Dlibidn2=false
+			-Dlibidn=false
+		)
+	fi
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	eninja test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir /var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	local udevdir=/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
+
+	rm -r "${ED}${udevdir}/hwdb.d" || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 852df051610d..c167a2fd0b76 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -336,16 +336,6 @@ multilib_src_install_all() {
 	# Symlink /etc/sysctl.conf for easy migration.
 	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
 
-	# If we install these symlinks, there is no way for the sysadmin to remove them
-	# permanently.
-	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
-	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
-	rm -fr "${ED}"/etc/systemd/system/network-online.target.wants || die
-	rm -fr "${ED}"/etc/systemd/system/sockets.target.wants || die
-	rm -fr "${ED}"/etc/systemd/system/sysinit.target.wants || die
-
 	local udevdir=/lib/udev
 	use split-usr || udevdir=/usr/lib/udev
 
@@ -402,6 +392,20 @@ migrate_locale() {
 	fi
 }
 
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+}
+
 pkg_postinst() {
 	newusergroup() {
 		enewgroup "$1"
@@ -437,6 +441,14 @@ pkg_postinst() {
 
 	systemd_reenable systemd-networkd.service systemd-resolved.service
 
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
 	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
 		ebegin "Reexecuting system manager"
 		systemctl daemon-reexec
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index aecf6d2df64b..96cef9b21b1a 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -5,5 +5,5 @@ DIST texinfo-6.5.tar.xz 4503048 BLAKE2B 9e194115a252500fe6048614a96c6992b6fbf9f3
 DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
 EBUILD texinfo-6.3.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2
 EBUILD texinfo-6.5-r1.ebuild 1268 BLAKE2B 3cc36fe001c216e0b460df0c948ecad98c7635efc35181b950a4ba65896ddd07f04203ff0680515a1ab19fd89e57623902744ab546885483c5a79569a716eed5 SHA512 dabac9043745739d956fc299c59ffca8555c17fe076a1b74cdf880bfdd75a1abb9f0081d812c8c396d0c720537ec6dcdd2c72e670f7001a92d9576e23f72aa99
-EBUILD texinfo-6.6-r1.ebuild 1364 BLAKE2B f5ec4737ddfbd0eb650581ac7ef3fad8eff301eaf770eeeb875d8d947d0a2509c55dd4750fdc321e14deb72140dcc9990cce4324311820dbaaaab531b1f6ad95 SHA512 a62641c9deefc52b52ab27e42491416e300cb3bd89227f1174eb76d36a5e2d4c93256b86039d1f84f38a3219b1d0fd4b029d7bc903bcc3e0f89a03bebb27cd25
+EBUILD texinfo-6.6-r1.ebuild 1361 BLAKE2B 87148363d089c0e5bfea741f6f731a3b53540961924db05a27a9ba0369e346fe12b0e57f278741f505d8428c3d54ce7b6b5463248b5f976733c3682352169b65 SHA512 dc019e9176d76f3eaae7a1b209c43d1929aced640e173e2d2ff6b8479b1ce0ace2eccc40d08e49868a044f6bb46dc455e2a7ad25ab052b0f59a03f95ae2ce89e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/texinfo/texinfo-6.6-r1.ebuild b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
index 8580ac1dfc82..1be412160236 100644
--- a/sys-apps/texinfo/texinfo-6.6-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 8e917a0add22..81ef6b2f351b 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -15,4 +15,4 @@ DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2f
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
 EBUILD ucspi-tcp-0.88-r18.ebuild 2110 BLAKE2B 789fd7dd256b092e47abbb82c59235d1c48b9b0dc416cc703d21e9795a42c270bfab200fbb7f7acead50333f5fe3c42327a29dcd6e9a237755637aace7b7cc4e SHA512 3896478da9e54cdf4199b361fc526523d99226bc685db4792729d2cf28bb3dd266f2774902b8f89b7943c8a185d52ee4274175a06c2b588209c5dd3c5f9c9d61
-MISC metadata.xml 677 BLAKE2B 099199a467eb6f06daeece058d090c48825fecb5474425c4cec45ab90a981608a5948a7c4d11074966e7b72d80bc7d826ec8ebe2a93cb54ae90d91121deb5244 SHA512 cf774ef0c4584905cbac057f7239138025e6a92e55a6ae006a91aa438d9dcf0bd0cb9939b4bc6eb7ac1cc2ae67c7804312b5011da3d91fbe1d95f9205ea456ac
+MISC metadata.xml 600 BLAKE2B eee72034e2adba51553bf32dd54e0ec2026a97fd709cc828f28e22525dc66cbff4bdc8801f7c5b4fa655fdbd682ceeb71639f22094b96150cca02f7db538554a SHA512 8cc6d3b8383d604b971b5cfd48060d5190269beacd1060ca279cb5eb0defc54e36fd1972ccecdff5f3fa912ca0a80e177433226876ba72158e93a5a6c1cadffa
diff --git a/sys-apps/ucspi-tcp/metadata.xml b/sys-apps/ucspi-tcp/metadata.xml
index 544451dafde0..ae89128be25a 100644
--- a/sys-apps/ucspi-tcp/metadata.xml
+++ b/sys-apps/ucspi-tcp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		ucspi-tcp is a replacement for inetd. It consists of tcpserver and
 		tcpclient. tcpserver can listen on sockets and start programs in an
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index e950d82fee31..c7407c601986 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -2,9 +2,10 @@ AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f31680
 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
 AUX util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch 1546 BLAKE2B 11a714486f7c6e4ca3d38adbf59231378ac94a5cd934816d93e46c73e8a9ff3f23909d88c39381b15d0beb4da8dd5c97af72166eec5822dc6a49b67a60eacf5f SHA512 5dfa5bb88e9e454a99c8ff5e8f76b9323729962aa9eba682a4a6ccfadc3af6068714ea3bf0e19abf5cc402dcafeb92057eaf4d25d5c292937d0cb94bbc8d99c2
 AUX util-linux-2.33-sparc-setarch.patch 2353 BLAKE2B 16f3c627096644da973152db4b29d09f6e76d5576d1e9513ae29ed76e1112d71327ceef31b915e58652f8ead0b506819a2c5a996bda0c3670035f13d1f9595eb SHA512 d9e2bbe4a5c0d41dc199406a27187107121294b9bd13794b7f48b558c2dfe3f16b0dfa11e7ef70b6072fd6464d2220f35a0ab032bf6b99e11740056751ec7aed
+AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
 DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
 EBUILD util-linux-2.33-r1.ebuild 8364 BLAKE2B 5c947964d771de3126ae067d91ada70baadc42705eef4757ad51e27258d1fe43757014ea647da40ba5cc2afe313c8e9b5443e9a625618f90b2b1ab6afdeb871c SHA512 4eee994d6fce8689d1237e997ad4813be0db3dd428ae57c963f659958dbaa8754515cac33d6acce5cd65c37f00a3c90135b4d980d693dcfd57e546fcebe60401
-EBUILD util-linux-2.33.1.ebuild 8240 BLAKE2B 5809b713cac06b5b13c9269851327dfef2122789f26059e2ee6980c7cfb9153a2647107264d804a7959fc0b5b10bdab5711e97027a821bf2c7939103d734ac4b SHA512 d17d2959f137216ee08b55e8aab293b4c97be8cd228732b0fb8b70ed0fe9fe11b72594e5f5c9232a22889c950cabe36a562605921426ac96905c9918fe67bfa5
+EBUILD util-linux-2.33.1.ebuild 8628 BLAKE2B ee4d9ac302d514dc99d6cb051d35aeb91290a43d82050b9773dfc488f40091a008d53c6c3f3dc2e90f0a9517e1b76d149a8d9926f264cd87dc5cb5ff90894e20 SHA512 9879577a284d932c67799967cc41f183aaffc825ecae2903316ed304d4c4663211a873470b9cd1c69b52dbfe8ed8f0c92cc5f5b008e4d5291aa797484c3f6c37
 EBUILD util-linux-9999.ebuild 8337 BLAKE2B 253fdd3aeb1b8fc7c883bbaac72d6158cadab391b304bc7eec720e9186283ceab719c8288003cb0b396923194460b978cafd2d1b63d312418636c20b85fed6c5 SHA512 f472e0c9a0e6b445bc8bbb22f1d8a8138d46fecec9d072ebdddcc73b88c9d7aebb3c15fcf6d61247ea297c9bf7240dc564aafd4f3f0395894394f374b92b348f
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch b/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch
new file mode 100644
index 000000000000..df52af45049b
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch
@@ -0,0 +1,30 @@
+From 963413a1adf6767ab17712097e288e1a346f63a7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 4 Jan 2019 22:38:25 -0800
+Subject: [PATCH] ldattach: Check for value of _HAVE_STRUCT_TERMIOS_C_ISPEED
+
+in glibc 2.29+ checking for just existence of _HAVE_STRUCT_TERMIOS_C_ISPEED
+won't be enough, the value has to be checked
+
+see
+https://sourceware.org/git/?p=glibc.git;a=commit;h=e5a50db36eaa6e8c6427b3a971563240b633ca85
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ sys-utils/ldattach.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
+index d33d68535..fb50711eb 100644
+--- a/sys-utils/ldattach.c
++++ b/sys-utils/ldattach.c
+@@ -242,7 +242,7 @@ static int my_cfsetspeed(struct termios *ts, int speed)
+ 	 * -- we have to bypass glibc and set the speed manually (because glibc
+ 	 *    checks for speed and supports Bxxx bit rates only)...
+ 	 */
+-#ifdef _HAVE_STRUCT_TERMIOS_C_ISPEED
++#if _HAVE_STRUCT_TERMIOS_C_ISPEED
+ # define BOTHER 0010000		/* non standard rate */
+ 	dbg("using non-standard speeds");
+ 	ts->c_ospeed = ts->c_ispeed = speed;
+
diff --git a/sys-apps/util-linux/util-linux-2.33.1.ebuild b/sys-apps/util-linux/util-linux-2.33.1.ebuild
index a671878bc149..503832c70fa6 100644
--- a/sys-apps/util-linux/util-linux-2.33.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.1.ebuild
@@ -90,6 +90,13 @@ src_prepare() {
 		configure || die
 
 	elibtoolize
+
+	# In glibc-2.29+, a lot of changes were made to arch-specific
+	# handling of `struct termios', which breaks atleast MIPS.
+	# The below patch from upstream fixes this, and should be
+	# in the next release.
+	# See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7
+	epatch "${FILESDIR}/${P}-fix-struct_termios-check.patch"
 }
 
 lfs_fallocate_test() {
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-05 21:17:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-05 21:17:31 +0100
commit	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
tree	c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /sys-apps
parent	0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)