Install multilib libgudev, bug #506002

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 34 insertions, 26 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index e5bb540030b9..660a5a6b7532 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.94 2014/03/22 23:29:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.95 2014/03/27 22:57:43 blueness Exp $
+
+  27 Mar 2014; Anthony G. Basile <blueness@gentoo.org> eudev-9999.ebuild:
+  Install multilib libgudev, bug #506002
 
 *eudev-1.5.3 (22 Mar 2014)
 
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index cd9ea8567e95..7acaed850a61 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -12,23 +12,23 @@ DIST eudev-1.5.3.tar.gz 1724415 SHA256 8e4362979572719562f600bfd7decd42d4e21506d
 EBUILD eudev-1.3.ebuild 7934 SHA256 8e5b74693deaab4c4951e53052f9f13d66373dff7096887c9b7e3fd7ae171bd1 SHA512 339118158dddac94ec550ff82c4bc402f7820e9d74e8ac0bc0ccb665095537e8d533872196998fc1b4412d4bef75651825749b7077783612fe30c5e238100f3d WHIRLPOOL fb2b7a7121e0fa31403d061ee3c7c39119daf960a5ad10ea115cca38e5b2f187d4c3de9ff1e764d15c50f00a3e9919f2deff6aeb7da940a78b13b7dd94115755
 EBUILD eudev-1.4-r1.ebuild 7951 SHA256 8c3534cc148093f506f403a2d148de4b2218d70e177816a4052a35f09b3231e5 SHA512 f76bd152ea192c954448631a8d2f48cfc01d47b80893e5686271da7910cec1cba8669fec149aa5d7366702e77dab9df2fd19c6d403f4690b4eecfd7c067d9827 WHIRLPOOL 6a6f751ada95d1be23f4cef16acb793c2d1d16e0556cfb8fba0c0c4a142c6dc540c08d40e51c32c191709a156bc13bbb9540a73b0738c1417e4fba85689e8107
 EBUILD eudev-1.5.3.ebuild 7950 SHA256 126707f322176a4c4c267631172134ee4dbda0452b4358f815bcdc96de7e19e5 SHA512 c18c1cdc52f1c81732d0ce40849389d803bf7a102c99e8e751845da7d7cf5acf37eae9a9b3fd55310096d3e1097fb476044a03eea96bf0a36a9c86ff2e9a2fde WHIRLPOOL 00b76ce78fa06cf429e3b3f7ca1482ebd859e1527ee89b30d4daebfcb6bdf1744411c813dbf626fbdde98fb049a4ebc9a20abf688e3c036cfadfd3409af7e4e1
-EBUILD eudev-9999.ebuild 7950 SHA256 27876275702b6ddf3af6b68dd7df50fc093c553deb7d51715e095271c12c0cc2 SHA512 492eaa88f95b31c8d2c5d7b018960d4a06256358afd64b32f232eac418109c89241cf8f73bac8763918b5369455ae68d70f95ae778db6763e77fc4943efa5109 WHIRLPOOL 20b58257342c4c3b1cacd951b2fe4dd54d6011ec48c569238de96bbb84b22771a6e0d6eb4075dab41d9c4686da25ee8d67e85540e08a214f791d09dbac1428e2
-MISC ChangeLog 14333 SHA256 c8f558994798eb8d6706c3e1a053cbe76cc3fca775bb963d13e688691b5f7ca0 SHA512 9492de4f930ae6efdd32dcc864aef87f862ec9047bf87aab3677140a36f25fccf7c1052862cdc433bafbd5ac1f239576556bd7fce1e65434b17a82407fbfa13a WHIRLPOOL 6f6ba97789620de870083c8a22691e90e741da61ee5b4dc5898ff4867eb7d179eb97fae696f8cbdabd4cca99197fa827a38d99272ea394c941bd1c6d36caa402
+EBUILD eudev-9999.ebuild 8003 SHA256 d7233b0821ed9e8a626b80c21e4dd3f74e468d13d00e3ef3db411df7fb7ff6af SHA512 50ea92dccf49e833c9b621b1d6ffed15aa4174085df64acdde2511bde6339fe6207b17ef4f60b46294f09381279b78bffc7a63b320f440664338ab22474eda4b WHIRLPOOL 6333ce303ead0e59af48b8fb8aea61c64e6123cde2e96de8d1b780d7dff707a48e1425619e97213fffe1099355cd23e7d14f80771c7198d562400570c69d877e
+MISC ChangeLog 14449 SHA256 3e90c1ccb3d656eae2026a07360786a529b4014de6cba15c857a5751372d5682 SHA512 2dafa765b33e77ab12b6b65e72c4343afb89e29b94b06e57b1db1343d993924ea75ece46559826d7ee3947c9a669e362abc87ff397a2b3165260645a24063709 WHIRLPOOL 224f766dfd57aacaf49ded739537f00455e71a9369ade3824eccdcf9384201cb8c1056ab7fbf40abe679a5d7104f9f696ab37e28e74135dfb5c1b47c68f82926
 MISC metadata.xml 978 SHA256 273446e57cfba7f612e72c3dcc2e1b93ac0003f878c504aa72daa762f2cdbba5 SHA512 244dc230cf7123afef2c4c0f0caa418bbc621f3da0e6303f7cecfb4f3cc53290fcf0adddf2d176ff208991a5bb27801c5c9f6ad5ea3bada513f7ebb22d02d06a WHIRLPOOL e39a5caec32bcd404eb2fdb54e3abff5631f7115786d039a6f2f04a8503e445f971a993dedd0564022e148133e2f15c4579b3cc664ffd393003a858ac77166c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLh0CAAoJEJOE+m71LUu6rXYQAJ85dZkQdOJjLgmrQ1AMT2OS
-4DkSjEhQzQ5Nr3zoFI+rtpPeWVhE6bLAYlSuF6yTNJ8Eq7DZSevL0qGo0M+T3EYD
-B5PUzkH7uBOCFf9kpO6qC7Kngnn2EpJbkEUXoTofYAliJENvEIevFfBa80Un5tC4
-MeZfLF4mEzvqE4mkiemIQFRDTL3dLA6j5JDmw1q2/WsFOOl68JY2sRAM/I2+Ajtc
-RBJFXQOYcWIiu/uL/Zdk4F9d2LT3/L8L+PHZ5FzLjcqstXAZaLZlio6BPFoQjDtf
-Yn8pvV04OFQ9X064p+Z26Yz25F3NJPTbSBFZccq9Ow2hlhbuVterCtb7W8FsjgrP
-lduGDCYnOC0mKPO+c9bzipVheb3CeDy8sySkc2MpEdrY9dMOJLFSv7DoJqgtUk7P
-7pwspMzu8cqx7h8dWKd2xdwrBo/T23owjLK/rud1mMquOZVXzL2sqiig4/Y76AhO
-5r4FsOC+5E27hpFdkClOJM69XyGzAwI1wf+5NEOBc7hq9uL0k6c7L9BR51JJwZaZ
-jJpgSO3JV1GvLqxsNCtlrZOuvIjU2CrdBet8/8OLXH22EpaNuCewo7svvDPvGvdC
-1eg0NS6vnEliX8gLyigKBVf53Mk2pf9GrnyZQ6Ij/3Prh7SDSb6zQV7Uo/9fGtwO
-DwAMY1InCxdum/O3d/7f
-=b8zN
+iQIcBAEBCAAGBQJTNK0ZAAoJEJOE+m71LUu64TgP/2j+pnymAzUAn6JILawMCzhs
+xZpJbAorgZQqF2CmS1yIgUE95hNBUl54E29PRLApi6txuq5ZqAlHH65Fc86uI7m9
+v1ZnK2vdO+Iriwzd4E/6v2PhTn1CuRSjTKxokqenEeTfwHxeuuqjKcbeZ7RWwXlM
+AhQwZ8g4bIZxTFLYWJl4q1OAYHTYMFFHO3iD1x9h51blkYt5jFzQX0s7leKB14m1
+mUN9DQrmEEwKbln7yUZN+RmLW+zxcvqgrF05Po8GQ+9M2rDcvptoS7d2uLj08gLQ
+3Ek8W7DrfqzYOiyaYUrgBdI4tejq4EVpvt4YQPscr8hxvUUorZcdKI39gby/cYKc
+p99Ja7gmefzdSx/x6suve4Xq2GxLhbvzJf7tWEK+9uv0PMHF4z14+5dIuAoNNVww
+SriR6rah/GaoI3NZxqXCpYkmbzw/YV0qS+MQhYO+FHXMdBWzfYrxoFatcFOpBnuY
+SJ0IfxkYMKSiDusWu24vMh/Z73PWL6qX0rFGhHTbv/HUO5rsxjz//g2xMYuE8oFs
+CNLm5Hd9MZnPYuZRTMBT2hxzCgCtopCCaQEzc9VTVEUUssTlrG+T39LAh+4ynHHb
+3dzGSGmf+sP521ihxKmv/4fwcmj98eRUMygYbguu2L/8cio/pz4w2CUFahDTjmJP
+Dh/LOHPkbGuo1ge/SZFv
+=QKzu
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index f6cfa2e80cc6..b0eaabb132db 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.43 2014/01/25 17:27:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.44 2014/03/27 22:57:43 blueness Exp $
 
 EAPI="5"
 
@@ -24,7 +24,7 @@ LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
 IUSE="doc gudev +hwdb kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test"
 
-COMMON_DEPEND="gudev? ( dev-libs/glib:2 )
+COMMON_DEPEND="gudev? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
 	kmod? ( sys-apps/kmod )
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 	selinux? ( sys-libs/libselinux )
@@ -135,6 +135,8 @@ multilib_src_configure()
 		--with-html-dir="/usr/share/doc/${PF}/html"
 		--enable-split-usr
 		--exec-prefix=/
+
+		$(use_enable gudev)
 	)
 
 	# Only build libudev for non-native_abi, and only install it to libdir,
@@ -142,7 +144,6 @@ multilib_src_configure()
 	if multilib_build_binaries; then econf_args+=(
 		--with-rootlibdir=/$(get_libdir)
 		$(use_enable doc gtk-doc)
-		$(use_enable gudev)
 		$(use_enable introspection)
 		$(use_enable keymap)
 		$(use_enable kmod libkmod)
@@ -152,7 +153,7 @@ multilib_src_configure()
 		$(use_enable rule-generator)
 		)
 	else econf_args+=(
-		$(echo --disable-{gtk-doc,gudev,introspection,keymap,libkmod,modules,static,selinux,rule-generator})
+		$(echo --disable-{gtk-doc,introspection,keymap,libkmod,modules,static,selinux,rule-generator})
 		)
 	fi
 	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
@@ -160,18 +161,22 @@ multilib_src_configure()
 
 multilib_src_compile()
 {
-	if ! multilib_build_binaries; then
-		cd src/libudev || die "Could not change directory"
+	if multilib_build_binaries; then
+		emake
+	else
+		emake -C src/libudev
+		emake -C src/gudev
 	fi
-	emake
 }
 
 multilib_src_install()
 {
-	if ! multilib_build_binaries; then
-		cd src/libudev || die "Could not change directory"
+	if multilib_build_binaries; then
+		emake DESTDIR="${D}" install
+	else
+		emake -C src/libudev DESTDIR="${D}" install
+		emake -C src/gudev DESTDIR="${D}" install
 	fi
-	emake DESTDIR="${D}" install
 }
 
 multilib_src_test()