gentoo resync : 21.09.2018

2 files changed, 10 insertions, 12 deletions

diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index bf21d0bd9374..4aba579bc582 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -1,10 +1,10 @@
 AUX 40-gentoo.rules 365 BLAKE2B ac97d87870286b489804d319bbc7ee6fdbc480d0cf811d422b25cc3466542f34e849c3c6aac29f55ad1fbcfebeb943b8782e146f803a0a945f65893300c83806 SHA512 7554879eaeb12869a78835e4ac814b63c41ddd8715ff9b8d1b75e5b13edf697906371eb10d6c4f0a4c6cb9a44b21a4839985811a3357e18d3b8a842181666e0b
 AUX eudev-include-sysmacros-header.patch 4516 BLAKE2B 2c02cece2f2dfc48cff03696a04c854649c44caf30af3d77bae45ce29c3f8cee1d1bbfbe4194eef71f46fbd00c8e23d40f7be3a04ea3ae386ba6654f0256e4ce SHA512 29633fca7e348ef7e69fae7f0fc47a2155b20956dd396205c06032d356ea58269f5ce8e0277ed36aa7108385d0e244a311b53b9490c418c9180986e4742d623f
 AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88
-DIST eudev-3.1.5.tar.gz 1745524 BLAKE2B d030e78f8ef751ac1d677f50200898fb2089940a7d8a828080059fb6330012e615638e47ba21dd6b35fcf89248783d20e47387b8f009f7f4cc1f3fac203e6f58 SHA512 c5192e085ca4230aaac918e701989b712e5bda1558db31eb6ba635c17c4bdff398458d51cefbc5fb77a7c775ec1e04b1dbe019b8314cac3f43a5c1ae61521b5e
 DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c
-EBUILD eudev-3.1.5.ebuild 7039 BLAKE2B 8c2f378a34cacf7e35634b2d60f3a7d73bcb28032f0c21d78782dcbd22ee4d44d321975ad19101dbfc26c6d9e73baf2ea2c9e36e013d30ea2337244bca985a2f SHA512 808ab5e3982ad269847d13d0d1835929a485b74f0de8eaa10fa460f06a088b329f1d0c78a8a9c83cf7c6b4f8da029c93da19e8f1ef02593032d27712cfee14fd
+DIST eudev-3.2.6.tar.gz 1892772 BLAKE2B 7705c1526b043cbef1efcf29c1728639e063845a5ee91b0ad22d43335dce34bf2ebbe4257ca024680759020d4120a8293f62cf8e112fb1191c35f0ec2f96b681 SHA512 874e7c51f4785e9030b09464fc7c1eb729968bec0ef1fda994ba75ce86f89efae5ca964b607d6f8d7c8a279b4c346716e7ba592233e4653f2090c943c438d930
 EBUILD eudev-3.2.5.ebuild 7019 BLAKE2B 39a12a772b0f543cf6c76a988d3c485423da493a695200d6e18a38916e3c1ce0442979549191683c5aee04efa0bbcbbb32e15d1f92381cffe41658438496d634 SHA512 271017380e0713c76126a8a34d53b974cbf657da1b0e31a4fe869cddc6327c992f722acc5f08bf9cc1f49f9d053867a9978cc42b4d481db0021dc8c12715d7fa
+EBUILD eudev-3.2.6.ebuild 7024 BLAKE2B 133a13098ed4b315f96c921d83032a1843d6b9e28d942bfe3aaf209c7795286590522501cd4113d5862d68860b8c63bfac71c1facc4f586779a910bed3010bd6 SHA512 5c0071d81018fe7c1fdca5e4ef4e0085752ad92eb1045f88cb01282a46c823a29884f2fae479a5445ff83836bec7c7af741abbb4bfa7eaf22cadcf2789938679
 EBUILD eudev-4.9999.ebuild 6314 BLAKE2B cb761cf1b967faf8d5ea170beafd0218a8be85d7f599107ee1977f77bae167d86840e7842da4bc6435a984df25470bd6fd10f263df1a326ec97f47799e38d6f5 SHA512 300f700e4ee4e117af85609d64847007b422b9a0ea7a75cb4cfb08882b4da38687d8a498cfdd36d4b1cd0f44e5eda773d24eb1085281fe302a30f978987dd0a2
 EBUILD eudev-9999.ebuild 7024 BLAKE2B 133a13098ed4b315f96c921d83032a1843d6b9e28d942bfe3aaf209c7795286590522501cd4113d5862d68860b8c63bfac71c1facc4f586779a910bed3010bd6 SHA512 5c0071d81018fe7c1fdca5e4ef4e0085752ad92eb1045f88cb01282a46c823a29884f2fae479a5445ff83836bec7c7af741abbb4bfa7eaf22cadcf2789938679
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.2.6.ebuild
index 0efff72af441..9cd4b44b46cc 100644
--- a/sys-fs/eudev/eudev-3.1.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.6.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 KV_min=2.6.39
 
-inherit autotools eutils linux-info multilib multilib-minimal user
+inherit autotools linux-info multilib multilib-minimal user
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -84,9 +84,7 @@ src_prepare() {
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
-	epatch "${FILESDIR}"/${PN}-include-sysmacros-header.patch
-
-	epatch_user
+	eapply_user
 	eautoreconf
 }
 
@@ -104,19 +102,19 @@ multilib_src_configure() {
 		DBUS_LIBS=' '
 		--with-rootprefix=
 		--with-rootrundir=/run
-		--libdir=/usr/$(get_libdir)
-		--with-rootlibexecdir=/lib/udev
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--with-rootlibexecdir="${EPREFIX}"/lib/udev
 		--enable-split-usr
 		--enable-manpages
 		--disable-hwdb
-		--exec-prefix=/
+		--exec-prefix="${EPREFIX}"
 	)
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
 	# that means all options only apply to native_abi
 	if multilib_is_native_abi; then
 		econf_args+=(
-			--with-rootlibdir=/$(get_libdir)
+			--with-rootlibdir="${EPREFIX}"/$(get_libdir)
 			$(use_enable introspection)
 			$(use_enable kmod)
 			$(use_enable static-libs static)