gentoo resync : 28.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
commit: a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree: 852c90a4bf354c30ea66504f70bfab5401fba18d /sys-libs
parent: 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)
36 files changed, 906 insertions, 108 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index dfd169144ffa..d5a385d2dc4a 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/fortify-headers/Manifest b/sys-libs/fortify-headers/Manifest
index 2970e0911c5f..8d682f95aeeb 100644
--- a/sys-libs/fortify-headers/Manifest
+++ b/sys-libs/fortify-headers/Manifest
@@ -1,6 +1,6 @@
 DIST fortify-headers-0.6.tar.gz 5339 BLAKE2B 404a20de075551e11750f989e05d78f450b09fc879a7ff4b649773ebc012a93c42432cc7b60c70843a375d64f6aea3ec356cdfafc0133f8cc58dadfea9b982d3 SHA512 6106219332515e7c23354d916383cdac6efccba7eefa13b0c2c221d0fd03be7afb29b3a8622bd29b62ee0b602f9d1f273e1a08c07583bdcd12db9938ef4d7acc
 DIST fortify-headers-0.7.tar.gz 5524 BLAKE2B 76ec4ee5b50bc77db05bf45a4a5550f3a369e5a49e333cd095613acbc04794d074103f3110c353a3283757f12cec866c45ed7d71ef4509667cae49926ee6953a SHA512 9335d5042f973904cf131d4894c71d3d25c84e82427500064a4ed3f798abd8051c3b52375a17c807ca89227115fa5ba9922939f0e86059a9f04fee61f0b69e53
-EBUILD fortify-headers-0.6.ebuild 624 BLAKE2B bf1ee1687beea597ef89744b321520dfefc552c9e6f01a8508a07f3576c510811d1b1606109d30e195c6e18aa1b2eaf677052500afa9b54a9b2ab7defdfdb60c SHA512 f0bb74781d447038dc2f61e0f19f7d6c6eefc97c347f582dd4b4baad13170b35a8677a440716bb02198c0982c80c4b588df366ec62b3976002382c2b0730621f
-EBUILD fortify-headers-0.7.ebuild 624 BLAKE2B bf1ee1687beea597ef89744b321520dfefc552c9e6f01a8508a07f3576c510811d1b1606109d30e195c6e18aa1b2eaf677052500afa9b54a9b2ab7defdfdb60c SHA512 f0bb74781d447038dc2f61e0f19f7d6c6eefc97c347f582dd4b4baad13170b35a8677a440716bb02198c0982c80c4b588df366ec62b3976002382c2b0730621f
-EBUILD fortify-headers-9999.ebuild 624 BLAKE2B bf1ee1687beea597ef89744b321520dfefc552c9e6f01a8508a07f3576c510811d1b1606109d30e195c6e18aa1b2eaf677052500afa9b54a9b2ab7defdfdb60c SHA512 f0bb74781d447038dc2f61e0f19f7d6c6eefc97c347f582dd4b4baad13170b35a8677a440716bb02198c0982c80c4b588df366ec62b3976002382c2b0730621f
+EBUILD fortify-headers-0.6.ebuild 625 BLAKE2B 1e0d1ea9368dbdead0fd55c5b71d6775ab6d926dd97c42fdd8d98d008c8950b3a4d78af79e59a746328ce44e30d15d830ffef5ade90534528b36c9062b3805e6 SHA512 e09ef17f55de8f65149c4a027f82e043f928a3789c1fac7b8194e7e647d2347b763c2fa5eff27c2f90c2e14d46fae973df30d9c4bcb9fa748a37def66b4ab86a
+EBUILD fortify-headers-0.7.ebuild 625 BLAKE2B 1e0d1ea9368dbdead0fd55c5b71d6775ab6d926dd97c42fdd8d98d008c8950b3a4d78af79e59a746328ce44e30d15d830ffef5ade90534528b36c9062b3805e6 SHA512 e09ef17f55de8f65149c4a027f82e043f928a3789c1fac7b8194e7e647d2347b763c2fa5eff27c2f90c2e14d46fae973df30d9c4bcb9fa748a37def66b4ab86a
+EBUILD fortify-headers-9999.ebuild 625 BLAKE2B 1e0d1ea9368dbdead0fd55c5b71d6775ab6d926dd97c42fdd8d98d008c8950b3a4d78af79e59a746328ce44e30d15d830ffef5ade90534528b36c9062b3805e6 SHA512 e09ef17f55de8f65149c4a027f82e043f928a3789c1fac7b8194e7e647d2347b763c2fa5eff27c2f90c2e14d46fae973df30d9c4bcb9fa748a37def66b4ab86a
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/sys-libs/fortify-headers/fortify-headers-0.6.ebuild b/sys-libs/fortify-headers/fortify-headers-0.6.ebuild
index fccc550aeab3..d6ce9396cf99 100644
--- a/sys-libs/fortify-headers/fortify-headers-0.6.ebuild
+++ b/sys-libs/fortify-headers/fortify-headers-0.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
diff --git a/sys-libs/fortify-headers/fortify-headers-0.7.ebuild b/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
index fccc550aeab3..d6ce9396cf99 100644
--- a/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
+++ b/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
diff --git a/sys-libs/fortify-headers/fortify-headers-9999.ebuild b/sys-libs/fortify-headers/fortify-headers-9999.ebuild
index fccc550aeab3..d6ce9396cf99 100644
--- a/sys-libs/fortify-headers/fortify-headers-9999.ebuild
+++ b/sys-libs/fortify-headers/fortify-headers-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 4852884b2817..27d45790c542 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,7 +1,9 @@
 DIST libblockdev-2.14-1.tar.gz 274241 BLAKE2B 64c4c2a298ed95ed24a79716ccef5930f4276faaca02acf883c386b85a662d3fa1dc6f30e00d99bd835832e3c65acb89b445eff6fb35f9090dc949efde737d1a SHA512 fb80e840ed2f247912da93a6cc0cb1846be73dcc16b917f5231f5d7a87eaa7b43d07d5b2110038dd783fefa7ef7df0893785a60079ed02567f1e08bfcbd82343
 DIST libblockdev-2.15-1.tar.gz 279744 BLAKE2B caabeffdc2ee27bec63f0e799c632eab4e02867b866a83b03613e84567dbb0a5a6d8a59b4a34b9130b55a546bfa4a76b439bf901247da2d4d87b88b66c386ed6 SHA512 a58ee6ca75c0ee8706796afb6bf26334cc1716bb3ba9230f35c485643faf4921e70ff3a86ebb2be41b2d0177e68fdc0f8011e198e46d66aca9e9712a228c4ea3
 DIST libblockdev-2.16-1.tar.gz 282247 BLAKE2B 0645ffe9f0cadc6e412de813b32f4e37ead67039a69f7e8938b41f5ea10983a18d31e29653eab50dc41889952b00658b91853908dff3e62b50c1e85a267b4a63 SHA512 d48d4b0e3174ad7b93558534d7f0285b398e47e2c9dce3cc60cbe0a32a78fef32601cca2508f30a882609ceb3cc59efe2761720af191e6394ca1b8c51878b535
+DIST libblockdev-2.17-1.tar.gz 300882 BLAKE2B a7300ecf59a3ea37c2bb3245dcb4c0434ed8292e8fca87634224557112183de5fab2e66428d9b769537eebde341a3858182f9e9b9cefa68654c1d580fe4b63b2 SHA512 e882642e124100abf578699272bf1f0a2618b5eeed3ded4582f8535173238f145f3d4a2ea7dbe4b3b464d646f6e98ef0a891e7dfa7dde7e8c3322c883f7264e6
 EBUILD libblockdev-2.14-r1.ebuild 1504 BLAKE2B 8da60dc425c0b83f6e75705815bc94275937bd1c1d5ace0798c850d04d561910a1f7086f32d131b7aaf0d785cbacfc9179909d0e8909646524f34638a38ae399 SHA512 6e19060b01e9b21f1969d35cfff4a58c20456d4594f22ec4e8ae961480302abb639816f97212956e067b0df921ed17d8c1298ef025598c56aab663cb430e0ad9
 EBUILD libblockdev-2.15-r1.ebuild 1502 BLAKE2B cb40718f826b061ec21624de515eaa213b84f358d98105370a37db5b7065083b14bee73ca8331faf50fd8bbe20284e9bcdaafca44554af510a833425201d0d04 SHA512 413343fcde87c99dddad2301b2cd70c18c986412d605b4105b19cc3e714e0a367132e33a9b5f08ece8884984c0dfc88f304eed2d208c057099b6d940e069fa9c
 EBUILD libblockdev-2.16.ebuild 1508 BLAKE2B 3c68ad36fbfeece628e6580e95c90b8221082f2e778697ab81fcd8205939a8948638439b9035f34f6d5e96b22ff4451273a9460f48d72ebf10dee949fd236db7 SHA512 8d07d63497ddbecdba40fb3a916cbab21a34eebaa611eb3f10b3421314b2b21e5a7faa8b91574e293dff8d9bcb6c700a9c9ea2ecc8c910e7a8901f56853eb92e
-MISC metadata.xml 778 BLAKE2B 947d9ebb0bc42060edb67afe6a1deeaf674fb6be53e8e0f53ba782e01b71e76451eae9a374f949b43f9f7894d560d253cb1d3e19bf3661ea141a7cc995a349f7 SHA512 9cb1e613e6ea196921ad0d047334e70c5a11fe819796cac97ec9bb89f30221c58134f3cc90d24fde1f0d22af8290b8f507bc8145a3e2ca0957603cb6cada6436
+EBUILD libblockdev-2.17.ebuild 1694 BLAKE2B 835076e88046dd4f21aefbc89245e66a2e6e5c318a437a36c2957cc46cc1264a4d04f3e3893c49e3f99f5beeb5ba6d4c8f33b078ca7dd6cb7e3ea575bfb92610 SHA512 9eff7dd1adbce9ea74230aa066ca2f4b0fe368371f666420b337443ebaef1373fc895dc6eba8b1276d0e35eb705117185ddcbd573d2052f3a0c8bd8272cb67b5
+MISC metadata.xml 871 BLAKE2B 2647bb2461cb50f75c8069c924a0b488f37dcf8fc72eb56cb5611acc66adaaf59a159d93d39e333b2c04ad2b977893c7e69d149a1afe9f341c8d875f2455d17b SHA512 f5f3fbe8ae05d8c822275e43f76ab194bad069e94d82302395583098fb95324b5d1230273e8392eb5555f41ac0f260c5533d0530760f47a2d0d678068d00762f
diff --git a/sys-libs/libblockdev/libblockdev-2.17.ebuild b/sys-libs/libblockdev/libblockdev-2.17.ebuild
new file mode 100644
index 000000000000..89b02d4392b0
--- /dev/null
+++ b/sys-libs/libblockdev/libblockdev-2.17.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit autotools python-single-r1
+
+MY_PV="${PV}-1"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A library for manipulating block devices"
+HOMEPAGE="https://github.com/rhinstaller/libblockdev"
+SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bcache +cryptsetup dmraid doc escrow lvm kbd test"
+
+CDEPEND="
+	>=dev-libs/glib-2.42.2
+	dev-libs/libbytesize
+	>=sys-apps/kmod-19
+	>=sys-apps/util-linux-2.27
+	>=sys-block/parted-3.1
+	cryptsetup? (
+		escrow? (
+			>=dev-libs/nss-3.18.0
+			dev-libs/volume_key
+		)
+		>=sys-fs/cryptsetup-1.6.7:=
+	)
+	dmraid? (
+		sys-fs/dmraid
+		sys-fs/lvm2
+	)
+	lvm? (
+		sys-fs/lvm2
+		virtual/udev
+	)
+	${PYTHON_DEPS}
+"
+
+DEPEND="
+	${CDEPEND}
+	>=dev-libs/gobject-introspection-1.3.0
+	doc? ( dev-util/gtk-doc )
+"
+
+RDEPEND="
+	${CDEPEND}
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		escrow? ( cryptsetup )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-btrfs
+		--with-fs
+		--with-part
+		--without-mpath
+		--without-nvdimm
+		$(use_enable test tests)
+		$(use_with bcache)
+		$(use_with cryptsetup crypto)
+		$(use_with dmraid dm)
+		$(use_with doc gtk-doc)
+		$(use_with escrow)
+		$(use_with lvm lvm)
+		$(use_with lvm lvm-dbus)
+		$(use_with kbd)
+		$(use_with python_single_target_python2_7 python2)
+		$(use_with !python_single_target_python2_7 python3)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-libs/libblockdev/metadata.xml b/sys-libs/libblockdev/metadata.xml
index 7fd674aa5a14..4f133ca27fa9 100644
--- a/sys-libs/libblockdev/metadata.xml
+++ b/sys-libs/libblockdev/metadata.xml
@@ -8,6 +8,7 @@
   <use>
     <flag name="bcache">Enable block device cache support.</flag>
     <flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
+    <flag name="escrow">Support for building crypto plugin with escrow device support</flag>
     <flag name="dmraid">Support for dmraid devices, also known as ATA-RAID, or Fake RAID.</flag>
     <flag name="lvm">Enable support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
     <flag name="kbd">Enable kernel block device support.</flag>
diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
index ca60d3a95647..8a838dc337fb 100644
--- a/sys-libs/libcxxrt/Manifest
+++ b/sys-libs/libcxxrt/Manifest
@@ -4,6 +4,6 @@ AUX prepare_snapshot.sh 428 BLAKE2B 5fab8d5ccc8aafbb4c5e9f729dad99b87d45c9973be7
 DIST libcxxrt-0.0_p20170515.tar.xz 60488 BLAKE2B ae605dbd85a619886a3dca4ded06529bf51309d2c12028aaa4d27180efcbb6a6cd40e59fe731511cc920ba1e3c5786a5051a560186923d60c9aa7eae34b1679e SHA512 cf0539ca8f836adadf83195784ad008008faea2b0dd8953191fa1012d542f10f546eb58ecc42fa8e864c1113530a6bceb28a8005aa62276570343a3aaba09266
 DIST libcxxrt-0.0_p20180311.tar.xz 60920 BLAKE2B c75bf5bb88e0f5c448a377a7ae58b33444e644c5e4ce7d6e0f5242c4ee61335be6a8b878bcc06f47bb44f9c48895845b174ca398c95aabb90182ebefd3d31815 SHA512 625aa0fab7d54c584faf4cf1e7f8f694776337fc0c6f441683f035743d00e3d18be3339a8ccfc8b61eb07819e4ccf7b1e5f3e7948fd584eefc5d61b200b32d50
 EBUILD libcxxrt-0.0_p20170515.ebuild 2325 BLAKE2B 59c0d167aca188e5280d8928a142190233f72b3af8a10ee1663f0d8eb96437163ee6fd299cfea65bb6a7311becafd9be8fe6499c606b755467045781378687b1 SHA512 353079acc3e04ca1056f38242814d2858a33b97a297164eaa08ff4c50c3b5e181b96229edb5d2658b2505724382b4f37155a0b49c7ecdf9155d628a077bec54b
-EBUILD libcxxrt-0.0_p20180311.ebuild 2313 BLAKE2B bf025284b1cba517bcc580685d48c754f38df052a82b4df13826068e5d3ee339d820c0eee918557f5af24aa2882fb9e2cc821f3ba0551f724f1a33c88867176e SHA512 450ff6fd64b3022226ee3caf7b56d971aa24904c35c740643e5ded2ea64ba8cca48f0af35cfa08328163d0081f0531f37d42de3551532572987e389ee8bd46b2
-EBUILD libcxxrt-9999.ebuild 2313 BLAKE2B cc8ee4a8d35ef736816f5b6509ed9c2429c4a0e18550cde29ed6de2827a754c7acbbfb21a41d245ca21d735292678390de546e71a29816873ba030c619d0ade7 SHA512 2432a677b870cb17f0677a1b211e09f27ad4472fbd095b9ff2c3fe6accc71511f72fc60d8bc89cfb0347bb3d401419a9ccad9b1374a5b1c0cb120d1f40075693
+EBUILD libcxxrt-0.0_p20180311.ebuild 2318 BLAKE2B 36fc8c6af190ba47f5dc241651deb6d4e2b4d62b9422d1e8e517d67997b2a49eda16fcfe879376ca6d8862854b22d32278cbf17040295c1daf7a482d641290fc SHA512 0cdb8cba7788b7f41cbcd48e65ea27941359ec1b2d96fa604d6aa2172a8f133ab92a638faa3d4223084a387a9a3e120cbc630b827871c0d63e2d12ae4f2c32fb
+EBUILD libcxxrt-9999.ebuild 2318 BLAKE2B fd2c349bf8a84f19a3c76c0523623897797291d85062d2d9a58a9d105c32c65ff9e66a795b657693584256f9f292a4f1fb22c74403870c5fbf54ed0fbcbb5bd5 SHA512 7550563363686af25f2c9c81a795a972fe9b5599e5d2fc7462940b1be463fdddf32faba7e86e8c2d3bd60a6adaf20f400cf5bad3dcf8d814bb2f8feffc9b2c3f
 MISC metadata.xml 772 BLAKE2B 918a0b6a0d5d7c07b86a8157e08d66f1df42d38e74099c3c38a5dcb2757d55637426df7e0b61d893afde5cd15eb9d4ab78920ccde846a781c5e7ee285161f0c1 SHA512 2740f5561f530ec9053c2e3cc1c32af9b11b61d6b9b1e1babc39d135132bd7fbc0670bcdef274408126c9444e93c9e6f964f7c51316cac06b4a64e177263be7a
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
index 0c117aac6bbe..9d7cbbce604a 100644
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
@@ -25,7 +25,7 @@ if [ "${PV%9999}" = "${PV}" ] ; then
 else
 	KEYWORDS=""
 fi
-IUSE="+libunwind +static-libs"
+IUSE="+libunwind +static-libs test"
 
 RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
 		sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )"
diff --git a/sys-libs/libcxxrt/libcxxrt-9999.ebuild b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
index 517004302a8f..df8c353bc556 100644
--- a/sys-libs/libcxxrt/libcxxrt-9999.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-9999.ebuild
@@ -25,7 +25,7 @@ if [ "${PV%9999}" = "${PV}" ] ; then
 else
 	KEYWORDS=""
 fi
-IUSE="+libunwind +static-libs"
+IUSE="+libunwind +static-libs test"
 
 RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
 		sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )"
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 5dc90d1da58b..6888ec56f69c 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,5 +1,5 @@
 DIST libosinfo-1.0.0.tar.gz 896212 BLAKE2B 4bd9df9e1aca1b78595bd3f21dda127f46e44ed47a1a82ce83d23dd02fe5d217b5830a808db9cfa658cfa7d8ff5ff4c138c3420e9500255bace4c1a65e7388df SHA512 962b68b2f6639c70b1ab7377475bbddc99a056075e18d1f281e65188eb8a704b932e7ed26362a36ae805d53137e99b0f8303d18a5a1d7b840fad15eb188ab7d0
 DIST libosinfo-1.1.0.tar.gz 904154 BLAKE2B b34d1aaf2d53ac43613cfbdfd05bc12de505d37a743d64e43af379351f640759ad0ec2f30af74bf82a97b3e12b4a02b097bbdd6e0d3e83f7befa2af5340724a2 SHA512 c4f9e67bb5538e31e7d2ed3d764547ba0a2263da5bbf4d1ef930a32d5953fab59abc672e5f86a1f7f5ac1ebd0c5195986193f699a6b0efbcb6769917c0ed7102
 EBUILD libosinfo-1.0.0-r1.ebuild 1403 BLAKE2B 55a467a893cbb95d0aaf86526c4365e21ec424fa0ba57e2c376175338b3f231a89fc4309bf7462d40f0d6bfdfe905fb6c6d6df2c6e0aac6c0402a4aaaedf83bd SHA512 b5862a22d988a1e19e2074ada987bd0e14ea6600c1331bb719a22566726ddbf5e4f1c65cf8561a2f7a32ccbd9459dff663f9cc8bc46f8ddb3bd753954a918694
-EBUILD libosinfo-1.1.0.ebuild 1445 BLAKE2B 600ded94186514bc6198a50cffbc398021f64af7894b4a4e575998697c53496f8c025cf97c54e7557f8acc7c4edc79fe02b457ee9d08eff1f88a1fb77d5d6095 SHA512 aa7884463595254c83631a5567bd1941d2333b0d53bd04afe827be06e5ed771e581489496fd6ae18751dd5603a3b70d9a02cf79a74393b718d55609222fb7764
+EBUILD libosinfo-1.1.0.ebuild 1443 BLAKE2B 9ba19b6db773c95f760a7e34d98f3eff0e247b8f31bd1914973d0edfc838e0611ad630df2c9deadadb084041f472fd6c14a107bb7e45e9be5ff8f89997ed3b61 SHA512 7d12311500cec2646ca555203fa0c938fec1caae4cfe59069c1dfd7593fe7dbf222e2fe3b50c70f78f64725c4001f3be3cd8b2a21568763154598d87e84d760e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-libs/libosinfo/libosinfo-1.1.0.ebuild b/sys-libs/libosinfo/libosinfo-1.1.0.ebuild
index 65f0c4c2dbc1..d087ca3e5687 100644
--- a/sys-libs/libosinfo/libosinfo-1.1.0.ebuild
+++ b/sys-libs/libosinfo/libosinfo-1.1.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="+introspection +vala test"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Unsure about osinfo-db-tools rdep, but at least fedora does it too
 RDEPEND="
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 3b44c3aea9e6..7f98b6fac66d 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,7 +1,11 @@
 AUX libselinux-2.6-0007-build-related-fixes-bug-500674.patch 3565 BLAKE2B 6e06cce02897a17e549a6fdfea1ecd0c5826c8810893d8ff0167dd72ce3c442ca2c433e4cccf9ed857b0b05bea1bee8dd37d8c212a7a2b10327efbfb4e18dcd5 SHA512 d377c6be001edb874e443d1a3992633bffef8b243ba73757e83b348d9db988be1af1239820471f4d319ea76a308148b5b06c23178910bfd032892ea861a47cd4
 DIST libselinux-2.6.tar.gz 203119 BLAKE2B ee18d11258e8ea1611d46b5c748bd972084809c8c02832a5dc7d58577760330f58ce4a01e26e9e849eb26da7a663bbdaae74112ecbc16820de1b150829bfbc8d SHA512 906e1bf98c669862ab4f4e883d511db8d739a5763dc857c9405ad3cc6c70766a482853d07134698a1a98257a8632cc756d0549a7640c2915d051714f502ff14b
 DIST libselinux-2.7.tar.gz 187574 BLAKE2B cc6ee51d5015943dd73fe16efb2ce2478616f43eaf7da55655de50502010e69973c2de13c8a562c8814a31211a8dbd7200fa2f22761f3d0f81fa3a1d3cd1e998 SHA512 415d10306692d4323455b61fb61d7e56e53b9144276ff206d72760e1df9b04ab07c62a4d6f04bf4e5fa708f9f14b21a9801069b16ece0a0aade886950941ab8d
-EBUILD libselinux-2.6.ebuild 4243 BLAKE2B cf0e39a453f1b7f79bf685dd11e8c9cde44d802622672325fe3e10603480d8955348719a834077269f2c9ae6638b007e1f4f1a2169cf42e7d53597bf491a4e68 SHA512 696a399320ae12e0b1db84558e8470f166b261ad9b16ca28ddcc140957ded2a8ccaffe52bac3f6134e45841ee4bfffd6e8114bc50b57197b05f6644f7d713367
-EBUILD libselinux-2.7.ebuild 4111 BLAKE2B a69d2ed0096b3bda1d8de6d7555620036709750fdf0c05d079a9c57e3439b1ba01cec8391d171907afa19bbb36f781a114d4163c41444f9f4a07483e5b3a5f62 SHA512 ba62e1a04a4c14441b55f4866cbf62a15175585ebf3c82be27940bcf75eee62f23ae9c2224a06d1d2845b27ca321061207d4d9c4ba73b85f996469b30d25183e
-EBUILD libselinux-9999.ebuild 4113 BLAKE2B 1d2b07b937156c4f5b6ff9692c40d4c92381b42e4e89c28e221cb365ba9774e90c543b18306931219b3e8539c26fd912d7f0791616fa2b55cfee171120b9bd4a SHA512 d74dc1b851c8abbadf86d0bd77a798cf1e5a7e2b26fbb4453371c77f2179dcc2e03333522a1ad81ca074a6a83f0a1e3fc06882551badbdcd4d95879a3c058290
+DIST libselinux-2.8-rc1.tar.gz 187670 BLAKE2B b3ea4c32571a78fd535c4144487a5ceb83ab74642fec89effaec992f467b7ed3efd899487173a9b0ebb898b369cc2dadab8add38e27093beab85d21ca0b47e75 SHA512 11f51348d1b743e82b5c01abed4664b3513295436bec109e414df1ed86334422e294109c9563e6552ecab0d16e23c2fb3ea5f420f6ba3f11d35be1d9c8d20477
+DIST libselinux-2.8-rc2.tar.gz 187700 BLAKE2B 51ce916fc40fc8d551f3578d6eff87a53442e75644cb9877aa68e85d7db63057d3c33bb7a860fcb13d0fd094c23c024f9d6668ce6ff9d4294d380b0e5f71519d SHA512 052b86ba717820b482df056de69ce225090f39974b6fcc06d50d669601339deaeb2b507f7c1a18a614edee036e75a0ee59108742bd97fe78d19dda9afcdadf52
+EBUILD libselinux-2.6.ebuild 4151 BLAKE2B b87adca06f48c588d7516ddf0f88dc60cbc3d5a5ce49b35b21116a6c550fefc345c4ff47483a3bd78be2db91aa846e3edb6b1c09b5d3b4c4e2dbe1760ce9853d SHA512 dd49f8961e502b1ad81d0481a70a3b411e9c2d89e54628a099d0dd248f8ec7ec1ade6e19f5b69128f79a89a8c502b33ff368d4af17b9994fc0b1f6f506dcc690
+EBUILD libselinux-2.7.ebuild 4019 BLAKE2B f5dfa22a258e893e7b084196a45e45ee3a9b8ceb2da5ebef5b7d329c4e37149197d0cbdf31e569dfaaf4881120a2ec80d25911bf47c1ec4f8ee9ffa55edf48ea SHA512 62ef94ea79e87533e38a9b98128f65dc8cc7179ba4993f2d346d543db0aa3658fc1741028f7e75a645d6e514fd41ea724ed55cf5a094c71c290f6117235dc677
+EBUILD libselinux-2.8_rc1.ebuild 3939 BLAKE2B 2a485146bf59c420d7af5ea6851c8c7ec39b0475c23a3b5f777631b6c3018b85d0cc74d9266030a1bb967e2c8a12d8ce4e017c59c8ec454788d757ced7b0de53 SHA512 481654bc9d1794d2dc413dd394105ed311e3d6cfbe0bed1b35fecf4b12865e2b048e8065c36d2eb5495a19a2cd4b8fba5af94c0320c598d15fc3ab468f8c20f6
+EBUILD libselinux-2.8_rc2.ebuild 3939 BLAKE2B 7f0e198c1e7d9ea1f2726bf173ef0f1074a9de0a9fcaa93daf89f1740b9160e645b542eb29b0ba64692561a36f04ff4322d62580e9d9888f6bac63793cbed96a SHA512 34249c2d504ffeaab63e09cf210c42dadb23a4c69bb757351a27d26970e75d2185adc41ededccaaf81e4a4b5b17afa14abccf482af49b0a5deb0cdc5cddc26a6
+EBUILD libselinux-9999.ebuild 3899 BLAKE2B af71f80b9ad038c9187139a37881a2ea3fd2e557c4f8ed99a43c710568a3af35f453e5c8f7ac9e135723dbdfd7cb10362679e893282f19193dca6d442d699ade SHA512 2624299d9f3f6de35e7d11db2196d61fe42ba0a5b57895ff9db9ca396fcf5fcf502143e1edcb2be18fe36029a35c8f01e08929a8dda3f71a2737bf7436a2c492
 MISC metadata.xml 676 BLAKE2B 530269a4d717ef305f4b15fe02c54e26f6acb9d73d6c7ac6ecd1f947712912f98120820a362e7cdc8e17019e88bc9c30162d54002bdea6facb2c41931e9c54f2 SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7
diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild b/sys-libs/libselinux/libselinux-2.6.ebuild
index c92bb50d3950..e87f36e1844c 100644
--- a/sys-libs/libselinux/libselinux-2.6.ebuild
+++ b/sys-libs/libselinux/libselinux-2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby23"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 	)"
 DEPEND="${RDEPEND}
diff --git a/sys-libs/libselinux/libselinux-2.7.ebuild b/sys-libs/libselinux/libselinux-2.7.ebuild
index a8ed808fe471..569190768a03 100644
--- a/sys-libs/libselinux/libselinux-2.7.ebuild
+++ b/sys-libs/libselinux/libselinux-2.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby23"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 	)"
 DEPEND="${RDEPEND}
diff --git a/sys-libs/libselinux/libselinux-2.8_rc1.ebuild b/sys-libs/libselinux/libselinux-2.8_rc1.ebuild
new file mode 100644
index 000000000000..b4d9bf189124
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.8_rc1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+USE_RUBY="ruby23"
+
+# No, I am not calling ruby-ng
+inherit multilib python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${P//_/-}"
+SEPOL_VER="${PV}"
+MY_RELEASEDATE="20180419"
+
+DESCRIPTION="SELinux userland library"
+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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
+	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
+	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.9 )"
+
+src_prepare() {
+	eapply_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC PKG_CONFIG RANLIB
+
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
+		USE_PCRE2="$(usex pcre2 y n)" \
+		all
+
+	if multilib_is_native_abi && use python; then
+		building() {
+			emake \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				pywrap
+		}
+		python_foreach_impl building
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		building() {
+			einfo "Calling rubywrap for ${1}"
+			# Clean up .lo file to force rebuild
+			rm -f src/selinuxswig_ruby_wrap.lo || die
+			emake \
+				RUBY=${1} \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			building ${RUBYTARGET}
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		USE_PCRE2="$(usex pcre2 y n)" \
+		install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				install-pywrap
+			python_optimize # bug 531638
+		}
+		python_foreach_impl installation
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		installation() {
+			einfo "Calling install-rubywrap for ${1}"
+			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
+			rm src/selinuxswig_ruby_wrap.lo
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				RUBY=${1} \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				install-rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			installation ${RUBYTARGET}
+		done
+	fi
+
+	use static-libs || rm "${D}"/usr/lib*/*.a || die
+}
+
+pkg_postinst() {
+	# Fix bug 473502
+	for POLTYPE in ${POLICY_TYPES};
+	do
+		mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
+		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
+		# Fix bug 516608
+		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
+			if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
+				sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
+				|| die "Failed to recompile contexts"
+			fi
+		done
+	done
+}
diff --git a/sys-libs/libselinux/libselinux-2.8_rc2.ebuild b/sys-libs/libselinux/libselinux-2.8_rc2.ebuild
new file mode 100644
index 000000000000..7388fc1ec31f
--- /dev/null
+++ b/sys-libs/libselinux/libselinux-2.8_rc2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+USE_RUBY="ruby23"
+
+# No, I am not calling ruby-ng
+inherit multilib python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${P//_/-}"
+SEPOL_VER="${PV}"
+MY_RELEASEDATE="20180426"
+
+DESCRIPTION="SELinux userland library"
+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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
+	!pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}] )
+	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-2.0.9 )"
+
+src_prepare() {
+	eapply_user
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC PKG_CONFIG RANLIB
+
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
+		USE_PCRE2="$(usex pcre2 y n)" \
+		all
+
+	if multilib_is_native_abi && use python; then
+		building() {
+			emake \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				pywrap
+		}
+		python_foreach_impl building
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		building() {
+			einfo "Calling rubywrap for ${1}"
+			# Clean up .lo file to force rebuild
+			rm -f src/selinuxswig_ruby_wrap.lo || die
+			emake \
+				RUBY=${1} \
+				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			building ${RUBYTARGET}
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		USE_PCRE2="$(usex pcre2 y n)" \
+		install
+
+	if multilib_is_native_abi && use python; then
+		installation() {
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				install-pywrap
+			python_optimize # bug 531638
+		}
+		python_foreach_impl installation
+	fi
+
+	if multilib_is_native_abi && use ruby; then
+		installation() {
+			einfo "Calling install-rubywrap for ${1}"
+			# Forcing (re)build here as otherwise the resulting SO file is used for all ruby versions
+			rm src/selinuxswig_ruby_wrap.lo
+			emake DESTDIR="${D}" \
+				LIBDIR="\$(PREFIX)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
+				RUBY=${1} \
+				USE_PCRE2="$(usex pcre2 y n)" \
+				install-rubywrap
+		}
+		for RUBYTARGET in ${USE_RUBY}; do
+			use ruby_targets_${RUBYTARGET} || continue
+
+			installation ${RUBYTARGET}
+		done
+	fi
+
+	use static-libs || rm "${D}"/usr/lib*/*.a || die
+}
+
+pkg_postinst() {
+	# Fix bug 473502
+	for POLTYPE in ${POLICY_TYPES};
+	do
+		mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
+		touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
+		# Fix bug 516608
+		for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
+			if [[ -f "/etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE}" ]]; then
+				sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} \
+				|| die "Failed to recompile contexts"
+			fi
+		done
+	done
+}
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index fdd6f7fd3330..77ada71bdc55 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
 SEPOL_VER="${PV}"
-MY_RELEASEDATE="20170804"
+MY_RELEASEDATE="20180426"
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
@@ -27,7 +27,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby23"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}]
 	pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? (
-		ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
 		ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
 	)"
 DEPEND="${RDEPEND}
@@ -53,7 +52,7 @@ multilib_src_compile() {
 
 	emake \
 		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
 		LDFLAGS="-fPIC ${LDFLAGS} -pthread" \
 		USE_PCRE2="$(usex pcre2 y n)" \
 		all
@@ -63,7 +62,7 @@ multilib_src_compile() {
 			emake \
 				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
 				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
 				USE_PCRE2="$(usex pcre2 y n)" \
 				pywrap
 		}
@@ -79,7 +78,7 @@ multilib_src_compile() {
 				RUBY=${1} \
 				LDFLAGS="-fPIC ${LDFLAGS} -lpthread" \
 				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+				SHLIBDIR="/$(get_libdir)" \
 				USE_PCRE2="$(usex pcre2 y n)" \
 				rubywrap
 		}
@@ -94,8 +93,7 @@ multilib_src_compile() {
 multilib_src_install() {
 	emake DESTDIR="${D}" \
 		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+		SHLIBDIR="/$(get_libdir)" \
 		USE_PCRE2="$(usex pcre2 y n)" \
 		install
 
@@ -103,7 +101,7 @@ multilib_src_install() {
 		installation() {
 			emake DESTDIR="${D}" \
 				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+				SHLIBDIR="/$(get_libdir)" \
 				USE_PCRE2="$(usex pcre2 y n)" \
 				install-pywrap
 			python_optimize # bug 531638
@@ -118,7 +116,7 @@ multilib_src_install() {
 			rm src/selinuxswig_ruby_wrap.lo
 			emake DESTDIR="${D}" \
 				LIBDIR="\$(PREFIX)/$(get_libdir)" \
-				LIBSEPOLA="/usr/$(get_libdir)/libsepol.a" \
+				SHLIBDIR="/$(get_libdir)" \
 				RUBY=${1} \
 				USE_PCRE2="$(usex pcre2 y n)" \
 				install-rubywrap
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index 19c07093df32..54f8950bc934 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -2,7 +2,11 @@ AUX libsemanage-2.6-0001-libsemanage-genhomedircon-only-set-MLS-level-if-MLS-.pa
 AUX libsemanage-2.6-build-paths.patch 1325 BLAKE2B 89806798190f645d1064830775e55f5ddbbc5bfe8615c96e5f603b6d4a3d655987993443d53e44761330480c0713f0dc26a7680a45558fe094b0ca0b3c5c0331 SHA512 06fb96608f27169efde64bf679b8cc3e337857e4b6cf0743953f96be7df382e11ea0a20837d854c73dc5c216cee8f9723e23b17fa1a7844d3a4b7ef4ebe937d2
 DIST libsemanage-2.6.tar.gz 155897 BLAKE2B 503a8c2d6204ad696045c6dc1ed2686eb2b1d9f1fd27c08b95fbd7f022da0df4d4363067e65d6664bf1250f1e6ef8924dae56a3f3b552fc4ed666de97301ecc4 SHA512 38741d6e6f7a2669bfeee362e42d6bfd720cceeaf61331e329b2210fdc070444e529656ce86dd82e94aa248eafcfaea4c5d013d9cce76c1039be6fc6a6b2c790
 DIST libsemanage-2.7.tar.gz 153465 BLAKE2B fb585b8caba394757dbabb7c0825086059578b7449cddd5ff19ffe13d4b2ed3938a03f307cee01d852ce3680485ee58cf0dba59cfbacbb660c988d9542ffdf55 SHA512 6b30ea87f1ab3944935188539bbf869c8e287e05c174ea61cd19722a89cf8156518f336476e23b4117a5a05aec9a99a4db679b58a6952bf0c31ad809e9ab91d9
+DIST libsemanage-2.8-rc1.tar.gz 154131 BLAKE2B c0110cd67f04bf599b491335078af69852f23130ed321f0608fdefc1ba0cd425080fff07a1a267382c2610716d8bc766dd6ed34f5aae78818432542132b0b906 SHA512 befeaf587e36d1bcde068f9c46143b76c075122ed06c9290f9bdb16f5fa5d12dabbd9f190fc2584c87234c44f0778b434bf6cc5ca350a5de390cfec2f9fa1307
+DIST libsemanage-2.8-rc2.tar.gz 154148 BLAKE2B c376ae7b728b50010c9a9dfcb69787667ba2096fb9c4663012a4e33d100bd093f2a9136a0ae08cd2d2dc28ec97c7c25106b9f19bbceb9477fd7d58bce556141d SHA512 0ee4bafa1d407796b0a79794fef92625c54ea72cd861f8426b142f0e80954772f28bf787013514bc1f6f55f31625cf71ef246a81564d1ce97a61bba9fbd81fce
 EBUILD libsemanage-2.6.ebuild 4894 BLAKE2B f2e8f5e3ebe05ebb45ca449330c639e2e72d7d5145f103c38033910b1fbad5f7526a60060675eb7524006e600a0ae424948c365a797ef61e28923fb2c18c5af8 SHA512 8a6483d6fe09dae2bcc901e92476ae4a4cae7c8d585c068ed7b2c9c2bb646bdfc4856e4be81d6f12aabb9d76b38d76076ebce927a0160e7c166e5efcc71486f4
 EBUILD libsemanage-2.7.ebuild 4758 BLAKE2B 3d5c1366e85a5be7ce44394eafc7a698d1721b4a242a03450c16f8cfaae2587c604741b1326123821330b63addcae5343be44dae489663251f0f855567fe7d40 SHA512 38217988193c9c0afe87497548e2d4239337f763a937025b7648435a8bfb1451ba2a2596349afd5acb768bf605f52967694af1f56b964e5ca0f3234cd3f0c1ac
-EBUILD libsemanage-9999.ebuild 4760 BLAKE2B 0bf29c352dd283d2d2aee7d17c54b0a64dec43b073461fc13c463c25983b1b6f192b0ac5c099bb745bea92f59f920ccfa65e27ea05d376330e40d1c28455759e SHA512 6533c7763225194db51f2755f8a275cd3cfb45e1db9d473732c294309ef7123f5e1651919816803d0e17b091aeebac67049e64b56fb4908bcaa393df6fabd38a
+EBUILD libsemanage-2.8_rc1.ebuild 4674 BLAKE2B 7933f68079efe65986aa1017bccaf585109bb68363fcf83a4e7f851397927042fd102849a517926519769f11027221a1e069e998138025001a296ed4d8099161 SHA512 325bac7ec716e2ed2e1f088339d1073f50e2e4a55ffdead28d77bf23e27d909ac634e59d1c3b81b28929fabb6e037c7d1a0d5eedb8cdaaccaef18ffd807e7ac4
+EBUILD libsemanage-2.8_rc2.ebuild 4674 BLAKE2B cf4d27716eb18d87111da254da6ae77dbf4d536a6809a8745b24abb5d6c111992332d7ecbc97cd431c9c66fcf3820af87dc8aeca7bfb23b0f030d327f7ecc298 SHA512 b48a61fd901d950a43e11e66de21031618290ba359fe827f2d05a71f660c8941d83e7af9cb2fdadc323a30d785a1ce1a16e0a75e28da266ebfc9c71f5d2bdd33
+EBUILD libsemanage-9999.ebuild 4674 BLAKE2B cf4d27716eb18d87111da254da6ae77dbf4d536a6809a8745b24abb5d6c111992332d7ecbc97cd431c9c66fcf3820af87dc8aeca7bfb23b0f030d327f7ecc298 SHA512 b48a61fd901d950a43e11e66de21031618290ba359fe827f2d05a71f660c8941d83e7af9cb2fdadc323a30d785a1ce1a16e0a75e28da266ebfc9c71f5d2bdd33
 MISC metadata.xml 406 BLAKE2B c9f83aef9f66b26a895bad604ab829ba1d6b6865cb519ac23be395cfb9b81f06d35a3ac4602d5a0b53f0ca58e50a8ca71efba8dc8d70740294cee2a49ed0e777 SHA512 742aba47cdd9ad8f97fcb03a01cc2552c6e1d715f6b717c9dff2ae86ab34b850745888e4f2e3963ec2c258cf16a33cb161205f4ea72563446eada82f6c298479
diff --git a/sys-libs/libsemanage/libsemanage-2.8_rc1.ebuild b/sys-libs/libsemanage/libsemanage-2.8_rc1.ebuild
new file mode 100644
index 000000000000..c2a6ce67e3ee
--- /dev/null
+++ b/sys-libs/libsemanage/libsemanage-2.8_rc1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit multilib python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20180419"
+
+SEPOL_VER="${PV}"
+SELNX_VER="${PV}"
+
+DESCRIPTION="SELinux kernel and policy management library"
+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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
+	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
+	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
+	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	python? (
+		>=dev-lang/swig-2.0.4-r1
+		virtual/pkgconfig
+	)"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_prepare() {
+	eapply_user
+
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
+	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
+	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
+	echo "save-linked=false" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
+	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
+	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
+	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
+	echo "# would catch." >> "${S}/src/semanage.conf"
+	echo "expand-check=1" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
+	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
+	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
+	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
+	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
+	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
+	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
+	echo "bzip-small=true" >> "${S}/src/semanage.conf"
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		all
+
+	if multilib_is_native_abi && use python; then
+		building_py() {
+			emake \
+				AR="$(tc-getAR)" \
+				CC="$(tc-getCC)" \
+				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+				"$@"
+		}
+		python_foreach_impl building_py swigify
+		python_foreach_impl building_py pywrap
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${ED}" install
+
+	if multilib_is_native_abi && use python; then
+		installation_py() {
+			emake DESTDIR="${ED}" \
+				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+				install-pywrap
+			python_optimize # bug 531638
+		}
+		python_foreach_impl installation_py
+	fi
+}
+
+pkg_postinst() {
+	# Migrate the SELinux semanage configuration store if not done already
+	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
+	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${mcs}/active ] ; then
+		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
+		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
+		ewarn "If there are any issues, it can be done manually by running:"
+		ewarn "/usr/libexec/selinux/semanage_migrate_store"
+		ewarn "For more information, please see"
+		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
+	fi
+
+	# Run the store migration without rebuilds
+	for POLICY_TYPE in ${POLICY_TYPES} ; do
+		if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
+			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
+			"${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
+		fi
+	done
+}
diff --git a/sys-libs/libsemanage/libsemanage-2.8_rc2.ebuild b/sys-libs/libsemanage/libsemanage-2.8_rc2.ebuild
new file mode 100644
index 000000000000..e61629720acd
--- /dev/null
+++ b/sys-libs/libsemanage/libsemanage-2.8_rc2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit multilib python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20180426"
+
+SEPOL_VER="${PV}"
+SELNX_VER="${PV}"
+
+DESCRIPTION="SELinux kernel and policy management library"
+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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
+	>=sys-libs/libselinux-${SELNX_VER}[${MULTILIB_USEDEP}]
+	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
+	>=dev-libs/ustr-1.0.4-r2[${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	python? (
+		>=dev-lang/swig-2.0.4-r1
+		virtual/pkgconfig
+	)"
+
+# tests are not meant to be run outside of the
+# full SELinux userland repo
+RESTRICT="test"
+
+src_prepare() {
+	eapply_user
+
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
+	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
+	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
+	echo "save-linked=false" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Set this to 0 to disable assertion checking." >> "${S}/src/semanage.conf"
+	echo "# This should speed up building the kernel policy" >> "${S}/src/semanage.conf"
+	echo "# from policy modules, but may leave you open to" >> "${S}/src/semanage.conf"
+	echo "# dangerous rules which assertion checking" >> "${S}/src/semanage.conf"
+	echo "# would catch." >> "${S}/src/semanage.conf"
+	echo "expand-check=1" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Modules in the module store can be compressed" >> "${S}/src/semanage.conf"
+	echo "# with bzip2.  Set this to the bzip2 blocksize" >> "${S}/src/semanage.conf"
+	echo "# 1-9 when compressing.  The higher the number," >> "${S}/src/semanage.conf"
+	echo "# the more memory is traded off for disk space." >> "${S}/src/semanage.conf"
+	echo "# Set to 0 to disable bzip2 compression." >> "${S}/src/semanage.conf"
+	echo "bzip-blocksize=0" >> "${S}/src/semanage.conf"
+	echo >> "${S}/src/semanage.conf"
+	echo "# Reduce memory usage for bzip2 compression and" >> "${S}/src/semanage.conf"
+	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
+	echo "bzip-small=true" >> "${S}/src/semanage.conf"
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		all
+
+	if multilib_is_native_abi && use python; then
+		building_py() {
+			emake \
+				AR="$(tc-getAR)" \
+				CC="$(tc-getCC)" \
+				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+				"$@"
+		}
+		python_foreach_impl building_py swigify
+		python_foreach_impl building_py pywrap
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${ED}" install
+
+	if multilib_is_native_abi && use python; then
+		installation_py() {
+			emake DESTDIR="${ED}" \
+				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+				install-pywrap
+			python_optimize # bug 531638
+		}
+		python_foreach_impl installation_py
+	fi
+}
+
+pkg_postinst() {
+	# Migrate the SELinux semanage configuration store if not done already
+	local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' "${EROOT}"/etc/selinux/config 2>/dev/null)
+	if [ -n "${selinuxtype}" ] && [ ! -d "${EROOT}"/var/lib/selinux/${mcs}/active ] ; then
+		ewarn "Since the 2.4 SELinux userspace, the policy module store is moved"
+		ewarn "from /etc/selinux to /var/lib/selinux. The migration will be run now."
+		ewarn "If there are any issues, it can be done manually by running:"
+		ewarn "/usr/libexec/selinux/semanage_migrate_store"
+		ewarn "For more information, please see"
+		ewarn "- https://github.com/SELinuxProject/selinux/wiki/Policy-Store-Migration"
+	fi
+
+	# Run the store migration without rebuilds
+	for POLICY_TYPE in ${POLICY_TYPES} ; do
+		if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
+			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
+			"${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
+		fi
+	done
+}
diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 90f98fe5933f..e61629720acd 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20170804"
+MY_RELEASEDATE="20180426"
 
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
@@ -48,6 +48,9 @@ DEPEND="${RDEPEND}
 RESTRICT="test"
 
 src_prepare() {
+	eapply_user
+
+	echo >> "${S}/src/semanage.conf"
 	echo "# Set this to true to save the linked policy." >> "${S}/src/semanage.conf"
 	echo "# This is normally only useful for analysis" >> "${S}/src/semanage.conf"
 	echo "# or debugging of policy." >> "${S}/src/semanage.conf"
@@ -71,8 +74,6 @@ src_prepare() {
 	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
 	echo "bzip-small=true" >> "${S}/src/semanage.conf"
 
-	eapply_user
-
 	multilib_copy_sources
 }
 
@@ -98,16 +99,13 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake \
-		LIBDIR="${ED}/usr/$(get_libdir)" \
-		SHLIBDIR="${ED}/usr/$(get_libdir)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${ED}" install
 
 	if multilib_is_native_abi && use python; then
 		installation_py() {
 			emake DESTDIR="${ED}" \
-				LIBDIR="${ED}/usr/$(get_libdir)" \
-				SHLIBDIR="${ED}/usr/$(get_libdir)" \
-				LIBSEPOLA="${EPREFIX%/}/usr/$(get_libdir)/libsepol.a" \
+				LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
 				install-pywrap
 			python_optimize # bug 531638
 		}
@@ -131,7 +129,7 @@ pkg_postinst() {
 	for POLICY_TYPE in ${POLICY_TYPES} ; do
 		if [ ! -d "${EROOT}/var/lib/selinux/${POLICY_TYPE}/active" ] ; then
 			einfo "Migrating store ${POLICY_TYPE} (without policy rebuild)."
-			/usr/libexec/selinux/semanage_migrate_store -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
+			"${EROOT}/usr/libexec/selinux/semanage_migrate_store" -n -s "${POLICY_TYPE}" || die "Failed to migrate store ${POLICY_TYPE}"
 		fi
 	done
 }
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 73d9cecdba1d..ce9c29ada5a8 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -1,6 +1,10 @@
 DIST libsepol-2.6.tar.gz 442549 BLAKE2B d56eea07310e0e8338f4ef2de7470db0cda57efcad92bbb2fd7b5df184cd210a316f2f517c227f5d711a5b7ec967908e22e5c687859060e020ae8710e2240724 SHA512 17d007857634e3d581fcc9bafcbb75674a06e382bb258c2c6b3656c141d71493699c42b78c8e1917c628476aeb8ead73bb86e8ccf43d7ce59aa0b7884bea132a
 DIST libsepol-2.7.tar.gz 471147 BLAKE2B 5eea0be27cd14e105c261ce67d46806c60f8454ebcc82c27d060529deb1d36b1d7a3aac7a2c6706e969b0cea9225351e0cbce3149a73c0bbb18242b70d258344 SHA512 1d308c17bfea2659f9dc4877ab685449a5a33dff7260e62b603cde9551bed2010360b71a896c6dfcdb8b9fe86ecebc9f6b3225e6c3573a80fca8578a9d561b47
+DIST libsepol-2.8-rc1.tar.gz 473554 BLAKE2B 274894dfeb1d0dd7ba7b661266e7acdd0dc1c4ae4a51b689f2beb3a838ffebe5f1a9b7ce3f28c421215a68ba9eea57b9a3a5a4cf2a3effefa905bfdb1d71e72a SHA512 79307249604207b52af154ee17c96b90ea31c44d208935a06b276975c7521b84f8c96f9f2dd578478d2baa974fe5777c5f1417073eba828202fa227cf2ea383d
+DIST libsepol-2.8-rc2.tar.gz 473561 BLAKE2B a27526915a02c1a77c49bcb107d164759799835c32ed07a9ca7924d195c4127257fa97325434e6e4edd932564f9c80c5ed122dbd7b597a4749a5cad8fbb76507 SHA512 2e738986e6ddcc86904c5ef605fe03f4a3cbd239b34c76b1a3d06da1c21c327aa835949dbd5b2328d11c6c032d1a8677da21e5c06e2107f1f60a182286a9f2ea
 EBUILD libsepol-2.6.ebuild 1160 BLAKE2B c6df9f8f485a73ea811afd95ae409e1323b5d2293ee8533c5f7bcd912f213964ab23f2bf86c60d9a471530a50c8ad6848e668a0edd5c7ead963796e25c73ac58 SHA512 cdcdd05098775b6ad5ecd293261f6a3e8af7f7178f1a6fa4650844cd3d136c73a0332e73deff98b5f4e1605a3cdc94aab3b283ea867996b38de5178cb5b037dd
 EBUILD libsepol-2.7.ebuild 1160 BLAKE2B bc347feab8e6b530c378ba71c5ac1023cfd781a6339561adf769b29b2c5d5e4537001a402965c285c744ea8964089467734eedf1fbdfd7a7338fc58a5866d0a6 SHA512 5783c3475e553ca8da4885c5122ecc10ed8f7a87857e37840a8e2a9198504ad3d2ffb968ce1df8745db229f001ab4b6adef3bba1d88020b325eedf9f06cf1b36
-EBUILD libsepol-9999.ebuild 1162 BLAKE2B cb0b760894af11aa743de0adc8077e984884a4578e2b2ea4907815f35fad5da722059209a04d843a19170dd5858954bd0e901d156b0e8293899b81227e87232a SHA512 83c0abc60fb1f72880cb1be790b466a7b62a07c73874ca073f379b2e7e445ae1cb78dcfff1c5bd2cce83fb41010ea6bd45f5f504a5f94fad4edba89df8999d15
+EBUILD libsepol-2.8_rc1.ebuild 1123 BLAKE2B 5e27ec591965bc0abbb91d64c0d4a7e7cb26159a32c29759130c8097b2fdb3e786e2e0745c9d495d2ad7a83de01188f157a645e1a68899721ad5f759c5b020d1 SHA512 da09b05eedf8c7287be69577ab4f5d280a9a44ef531eef2dd3df9d6f94e259d53e198d7d20736f490a53a0e987ef0f30b45a39ffe0a0ed1969572bd0ff885dec
+EBUILD libsepol-2.8_rc2.ebuild 1123 BLAKE2B cb07aced7e0a466ddd75dbe94968e8efe0843fc1947eb9f4532d462d9a28cdfd3e2c71989fb4f95a881c6a059366991bc24218deec6a22f080ecc29ecf5c8176 SHA512 96b4eba02a90198691135395758bd15264dce0c0af4c79f69de7d1ba4790beef3e21fc5ceb1d68949515aa6075f3035b7f0db166ac77eff2659978e0a590ad47
+EBUILD libsepol-9999.ebuild 1123 BLAKE2B cb07aced7e0a466ddd75dbe94968e8efe0843fc1947eb9f4532d462d9a28cdfd3e2c71989fb4f95a881c6a059366991bc24218deec6a22f080ecc29ecf5c8176 SHA512 96b4eba02a90198691135395758bd15264dce0c0af4c79f69de7d1ba4790beef3e21fc5ceb1d68949515aa6075f3035b7f0db166ac77eff2659978e0a590ad47
 MISC metadata.xml 428 BLAKE2B 5e3dba085b9d5cf181fd548681975f00f888a6bb02b688eaa088a3668acdfb5def36af8c0e1085ca8785b7c503c3b797474724097fb24ebb1acc9c1a4c4e9a0f SHA512 14093ec1e86ac7b7521ab02ace725347013e11628e22cf3ed5362cfe7f30a180374ab00747b58ae251afbb3fabbeb4e328bda798e512bfac9bad643206835192
diff --git a/sys-libs/libsepol/libsepol-2.8_rc1.ebuild b/sys-libs/libsepol/libsepol-2.8_rc1.ebuild
new file mode 100644
index 000000000000..0b34ccbc1760
--- /dev/null
+++ b/sys-libs/libsepol/libsepol-2.8_rc1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib toolchain-funcs multilib-minimal
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20180419"
+
+DESCRIPTION="SELinux binary policy representation library"
+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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+# tests are not meant to be run outside of the full SELinux userland repo
+RESTRICT="test"
+
+src_prepare() {
+	eapply_user
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC AR RANLIB
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		install
+}
diff --git a/sys-libs/libsepol/libsepol-2.8_rc2.ebuild b/sys-libs/libsepol/libsepol-2.8_rc2.ebuild
new file mode 100644
index 000000000000..abd1362b6316
--- /dev/null
+++ b/sys-libs/libsepol/libsepol-2.8_rc2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib toolchain-funcs multilib-minimal
+
+MY_P="${P//_/-}"
+MY_RELEASEDATE="20180426"
+
+DESCRIPTION="SELinux binary policy representation library"
+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://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+# tests are not meant to be run outside of the full SELinux userland repo
+RESTRICT="test"
+
+src_prepare() {
+	eapply_user
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC AR RANLIB
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		install
+}
diff --git a/sys-libs/libsepol/libsepol-9999.ebuild b/sys-libs/libsepol/libsepol-9999.ebuild
index e68451424fce..abd1362b6316 100644
--- a/sys-libs/libsepol/libsepol-9999.ebuild
+++ b/sys-libs/libsepol/libsepol-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ EAPI="6"
 inherit multilib toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20170804"
+MY_RELEASEDATE="20180426"
 
 DESCRIPTION="SELinux binary policy representation library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
@@ -37,12 +37,15 @@ src_prepare() {
 }
 
 multilib_src_compile() {
-	tc-export RANLIB;
-	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+	tc-export CC AR RANLIB
+	emake \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)"
 }
 
 multilib_src_install() {
-	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
-		emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" \
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		SHLIBDIR="/$(get_libdir)" \
+		install
 }
diff --git a/sys-libs/lwp/Manifest b/sys-libs/lwp/Manifest
index 96b0f86c6ef4..afdf8c342277 100644
--- a/sys-libs/lwp/Manifest
+++ b/sys-libs/lwp/Manifest
@@ -1,8 +1,9 @@
 AUX lwp-2.0-amd64.patch 866 BLAKE2B 231e806f36c17ec0501e0ec646f16093408ecd25bf612a29a0cd34550c966f53b891d1f2522cb810a2fec9661cef2be9747537a17e06f6e8f6e257dc7694eb50 SHA512 f66c3d7111673ddf503a8ebd82fe22db9bf92dcc4bb7d9ce8fbfd3c65fb699a4f240c04700fcdb08c582a4f2be8da7ed870ba07cbc3d81110b2fc29f69028dd0
+AUX lwp-2.8-ia64.patch 523 BLAKE2B d5fd6257a690112cf1a4da4e83035244ca97ca9d306ba7ebdcbe701192ce3b49e93a237d823780abab1ab4bef8c41370d6aecf0d5a9828345121ce14b555dc91 SHA512 5289f26b363a480cf5d22c0c4217384e9d3338b573beaf1b2be5287a039732b1c53d6da024d0a83c4377561e86edf1676d01308971ad331ccaa006fc822443f2
 DIST lwp-2.2.tar.gz 376136 BLAKE2B 2f80ccab5cdc7e910a0ae41416a24a8fd2a6da86799f1393b23fb570d61e6973aa4ebc70fec8d3343465bbc5eea1280fa70d14ca2678d2b2d490333b5cef2f2a SHA512 a5fa52c0483e04fdbface5f0e9cc85bab5db59c4d730a3cb3c538ccaa3a88aaa916b37478e4c5450e77bcc45638987610ba619995a75541d728f138f103c5d7e
 DIST lwp-2.6.tar.gz 372225 BLAKE2B 86b00eee6f2acafd9214c879255936ba40c27a5773d47a1e58375775a80c96b739cc17acf6aacf3b161e53445d947af341a555edbd2cb8783741075bfacaea43 SHA512 ad8374ddf55ef9fddf9ce0b8d7c2ae0dc206e5108a01f278a37486070ab70e5bd7312f057863254b4fc430cfbed2c36f589807813e6a99067933142d5225395b
 DIST lwp-2.8.tar.xz 270008 BLAKE2B 67107f880d5052d42166fe429cda14b4d733bcc3e5905cf48b23898e0da590854ca935ea0350c77be75c3f27d2624134c17159e5f2981ac8806bd78906d7de41 SHA512 c56f3b350e888b5bcb2bffb41086f8926e975aafae236be7f1d2153bb178a37564b77d7598db1aa915714ce8e2ed1904663ce2113f5d0853173cf5e189958bf0
 EBUILD lwp-2.2.ebuild 735 BLAKE2B 8ab25555a35dfa49478fc46d75c7d516b74e396d80537119a4b9e2b98a7082218e7ecb908f88393f2e256178d5e9f7c02d115345fbfaae5479e974062b63abf6 SHA512 c9d778fadd11090b29496c8f57aec1347d5c83140742c0ff19321d859da0715bc72c9200f5a565620e341bf3cd9aae31e51827112fb6dcec64d629e01eb44811
 EBUILD lwp-2.6-r1.ebuild 524 BLAKE2B 542f127237e8ed1b0ef5a2a94820e54efefde2ee98387d588e29a104f4a7f7c7dae122a6221b05292ce81c0648de70bde114fa1a62cb1240abdc9e1185031de4 SHA512 59b622850763aa9e36733f3a72ad037cb94168fa9fe0ffd7e7a3d870601f252a72deecfa457d2a7ae79c5b75d0d011449b940597a8df856b4dae714ff699d3e9
-EBUILD lwp-2.8.ebuild 488 BLAKE2B 0e0c24dd56f5b9235955203bdaa3d05008b52b1a181dbfdcd95841e40628fbab1a12713669b84b39a993813e1c8e3c80bd5c901c5c3bdf6f095ec84b33b2e836 SHA512 26d0e09306c369147ad3777baa0642375233febe76cdfeece2fe4ecfca7ac8101dc8d4f1bf49038c98c82b3e5a002184869affe3838035f65dd0edbf905a25e0
+EBUILD lwp-2.8.ebuild 529 BLAKE2B 14ed1d138ba16b3f1b63335bc3abc84bd65abe7e76562f6773836c37eb7d9d9a82e794a5b51a0f84511beac490e5136a825a9563a3a44aa2b068117c1696e3e7 SHA512 51be560f7d92910e87c8ca20dd90cf9afb1d5ccedf3abcffc2381d8d1e006367840a8856d819db98d15d5b44b3b508948a600f8ed8caa586fa156d6ccdf269bf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/lwp/files/lwp-2.8-ia64.patch b/sys-libs/lwp/files/lwp-2.8-ia64.patch
new file mode 100644
index 000000000000..bb5abe65cc34
--- /dev/null
+++ b/sys-libs/lwp/files/lwp-2.8-ia64.patch
@@ -0,0 +1,18 @@
+diff --git a/src/lwp_ucontext.h b/src/lwp_ucontext.h
+index dfb5465..adc58e5 100644
+--- a/src/lwp_ucontext.h
++++ b/src/lwp_ucontext.h
+@@ -25,6 +25,13 @@ Coda are listed in the file CREDITS.
+ #include <signal.h>
+ #include "lwp_stacktrace.h"
+ 
++// ia64 defines uc_link define as:
++//    /usr/include/sys/ucontext.h:#define uc_link             _u._uc._link
++// undo namespace pollution
++#undef uc_link
++#undef uc_stack
++#undef uc_mcontext
++
+ #ifdef SAVE_SIGMASK
+ #define JMP_BUF sigjmp_buf
+ #define SETJMP(x,y) sigsetjmp(x, y)
diff --git a/sys-libs/lwp/lwp-2.8.ebuild b/sys-libs/lwp/lwp-2.8.ebuild
index 9f58c389b04d..e6fa49ec3e50 100644
--- a/sys-libs/lwp/lwp-2.8.ebuild
+++ b/sys-libs/lwp/lwp-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,9 +10,13 @@ SRC_URI="http://www.coda.cs.cmu.edu/pub/lwp/src/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}"/${P}-ia64.patch
+)
+
 src_configure() {
 	econf --disable-static
 }
diff --git a/sys-libs/rvm/Manifest b/sys-libs/rvm/Manifest
index 5cba2a32373b..a4833bab63eb 100644
--- a/sys-libs/rvm/Manifest
+++ b/sys-libs/rvm/Manifest
@@ -1,5 +1,5 @@
 DIST rvm-1.12.tar.gz 532869 BLAKE2B 5f46c9802f1d07631d4ea15acda379adf5c70a660a9c2901de28bdff10e68189a94254cceee8f8759f6b0817ac1c37fb9d2613e22b8bc7d89b128320e35f7e22 SHA512 34fedf1b6f87b2285417dc9f0ba2f203bd75f9a0fa2e8be280a36e27ab4aba4302b4a19cf7c373b93b22822a32f2104b956777f10b9a341107f66ac34fbab205
 DIST rvm-1.17.tar.gz 558574 BLAKE2B f4fbb7fd71c1c275c43689afa9b58624d8cf7e6f283b296602bd56cb8a1645e32d725561d5cc8934429d29fa20587af4620ca471378a7693936ab731986df372 SHA512 31956541e1e254fe9ecf3310e43f7395c847bab87e57bffe6e4f678a0077a21d0fb6af90e9bd79c599fc7f66255cd25dc99f85439c9e827319ff2c8bff4feb5d
 EBUILD rvm-1.12.ebuild 534 BLAKE2B e1deb117420de422c08f044748f2fd652f6e467b3c7c30ab288ca7d97a7ba1bde8109e379e2ae1e4b1e46f8152265a1a513a53755309e3389d8850d6dcd784e2 SHA512 7212feea8d3ded8a689f58e6a51ed1f733d1647d33dca16581b8cc8d31f99828aa1f2faef851240c9c32e3237fb164ee07913e8d70ddeeba5475930896b21aa5
-EBUILD rvm-1.17-r1.ebuild 453 BLAKE2B 19d818b36ef5b1136c738db5c3730e0603cafae80992d8abcb1d82e093266ff1268dfd02a7b7db2d312cffa2adf66c6f8a1d6398536817da70a47fe4694163e7 SHA512 647207b1b4ff6bb8b0c82237caf1caadffbd4aeb307f0dc64c4bf554164b8b615bb2f5ad048877b9e0fa08d7e11a4c5a59fb56cbfaff16d71976cba1b92156f3
+EBUILD rvm-1.17-r1.ebuild 451 BLAKE2B 09ad979f9f5b7049f36c171ea75bf1e874b6a77c9edd6943da482526e3f3db765eea0f2655a0eaa7ef33a83280f69301363b3089647159c65ca1ae54a2097b87 SHA512 b983f2b45dab2e653b1190708c8336e2e36a0984a240074516aa3bcf1f07ad818d1b95da1a22aeab8857e0eabc8c7b2ebd6f2f29a4f0068efbf21d7bb757f428
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-libs/rvm/rvm-1.17-r1.ebuild b/sys-libs/rvm/rvm-1.17-r1.ebuild
index 155981310f56..5f036225c9ae 100644
--- a/sys-libs/rvm/rvm-1.17-r1.ebuild
+++ b/sys-libs/rvm/rvm-1.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.coda.cs.cmu.edu/pub/rvm/src/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/lwp-2.5"
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index 8c1290f51547..eea4e50afe34 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -1,6 +1,6 @@
 DIST uClibc-0.9.33.2-patches-17.tar.bz2 32437 BLAKE2B c051e8acf4f7d8da219918a5cd7b465865da7e64307b2a1c64b6b86f8381340edf03745301f0b3b358403d56712964c3d57f330b88a3e8ff2da22d898a35c909 SHA512 6a6ad8aef862f742e60965c447e5abee2349886f01bf5e44111b2a6c21e59e4644195cf36e85b8ce0dabbf7b92dc2c36ae27f0b7a02b0f9f4278e46ec5fb5a76
 DIST uClibc-0.9.33.2.tar.bz2 2834029 BLAKE2B a23e7b3a1a8142ef08349179e27f2d47765757829c2a88d4937d02314bc7c07bd36a21d815213f1478b24075bb029112738161bb1be383df08cec5e786aae260 SHA512 1cf18fe5418e12ae12ce995d7455d465bc4737f225afc49512ec69858771e099bead7b18408b01c7e6f845dcc80c3b4f875332eeffdcc04ae4b48474fb29a8dd
-EBUILD uclibc-0.9.33.2-r15.ebuild 9386 BLAKE2B ac8aa826c8b51d9bc6d3a54b35105af17fa3d735cbeeca5283ef1a6312aad80e405100af6078658b51037bbeba3a873846d6244753dcd8c08027eab2f56af19a SHA512 7bdf5a54c1fe8a781c655ec44a8b4f50f7f758b4b7547de0d2a44a2c321291282c427e6d140de581ebb471a377009eec77d8c27f432617b91863bb780ad37d1d
-EBUILD uclibc-0.9.33.9999.ebuild 9348 BLAKE2B 0889fa7e2bc7c86f5a461ad43bfde8b7968e3ab7624ee881da04b11000164f6586683095fcd0773eb6e47d195b48b041450999da67f226939c1ecef6a724fbf5 SHA512 f9f97e41563be062974547c6945c45716edf16433c308bee9593ee051e6fb0d5ce786348d76acc8318db7d48ed27e451eba16a121538ed658218503492938e34
-EBUILD uclibc-9999.ebuild 9329 BLAKE2B c833b8f34dd30ef29c0d843731ded7b8778b9a60c675b5e8c009ed82bd827a9ed3355b7fd613e99b7fa2655f49cefe04147b5b3075e4691a2c74231fb75b7ac7 SHA512 ea49b5e167e624328efa4a145183e500ac916a979216d38e7d642ee3aaad704da70cb0b957bb0161242ce3709d123d701664a43717e38cb172c5b09ff5ef41d8
+EBUILD uclibc-0.9.33.2-r15.ebuild 9391 BLAKE2B 9c4001c6496f450a0870b08d9fdf7e841ae292a71cc7f1d71b696c6fb6f35717ea5922355a07105ad54e4dfd0c1cec1c9c988a37dc27057e8ec68b69539bbafb SHA512 39d7e5a916c8e8b96eb944d52d9bf9b01ff866d19207da63b59101970e025506c2efbb87aea74da862ff0209dc80657f7f0c941fb745be0fd9e175baa181611f
+EBUILD uclibc-0.9.33.9999.ebuild 9334 BLAKE2B dc74b67228433668095b432c366a0be69ff7b43701ff13b23fff9569dbd33d774693ee3f368f0a03e9ebc0cc5aeb5b4f69c851da815c3c65c2abb4bb221d2cb0 SHA512 2d38cdffa1285fa62f9df0092a5df6c9136a29036f14c3e04712cc481bb3b7ec04b58fdcee7d0de13505120ef55ac2284e18d2011151e2cd721762184e98bf44
+EBUILD uclibc-9999.ebuild 9312 BLAKE2B a4edb33fb50e77ec8c1f4411498b62ee4a63f2d62e3c0e0a022e161e5dd39c4ca28439c49f34370c83799b1005cc98f5103941c079c1dc20489497a65e5cfec3 SHA512 57f7fd506b86a650941b174fb96eba4721c15cf2fd7cae1794abbbfe4237897ad3060cfd39f2b1665fc0a198379548f4372a90b3b4d550a2d2a1db60cde984ce
 MISC metadata.xml 1388 BLAKE2B 2c031c5d87aefe90b83a2d0de01ee836b978bf1e89a8b16cbbf71acbc5366a57c3d15423a4beb6a6c51ad6adecc45731b949591fdf6faa5de7a6516ea04d5ce9 SHA512 59111cac2b1c0e2df5ed96d01e6913307915281c8d24019f5a12213dabd0621adfb52e87d344e1de484e1b6dd19014ce695f00b96f27ce26d7632e825863beeb
diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index 32bb54180854..4c712c8a69a8 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -1,10 +1,20 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
+
+MY_P=uClibc-${PV}
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://git.busybox.net/uClibc"
+	EGIT_BRANCH="0.9.33"
+	inherit git-r3
+else
+	PATCH_VER="17"
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -15,15 +25,8 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
-MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="17"
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
-fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -232,8 +235,8 @@ src_config() {
 }
 
 src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
 	else
 		unpack ${A}
 	fi
diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
index fbc8a60a1fc9..d55f0afff6da 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
@@ -1,11 +1,20 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == *9999 ]] ; then
+
+MY_P=uClibc-${PV}
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://git.busybox.net/uClibc"
 	EGIT_BRANCH="0.9.33"
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
+	inherit git-r3
+else
+	PATCH_VER=""
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -16,15 +25,8 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
-MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
-if [[ ${PV} != *9999 ]] ; then
-	PATCH_VER=""
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -231,8 +233,8 @@ src_config() {
 }
 
 src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-2_src_unpack
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
 	else
 		unpack ${A}
 	fi
diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index f5cec3749e75..3e096317babc 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,10 +1,19 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
+
+MY_P=uClibc-${PV}
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://git.busybox.net/uClibc"
+	inherit git-r3
+else
+	PATCH_VER=""
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -15,15 +24,8 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
-MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER=""
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -230,8 +232,8 @@ src_config() {
 }
 
 src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
 	else
 		unpack ${A}
 	fi
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
commit	a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree	852c90a4bf354c30ea66504f70bfab5401fba18d /sys-libs
parent	5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)