Migrate src_configure() over to multilib_native_use_enable() function from multilib-build.eclass

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 26 insertions, 40 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index aec6a23cbeca..c01c47ce7b2c 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1080 2014/08/01 15:36:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1081 2014/08/02 00:29:29 ssuominen Exp $
+
+  02 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> udev-9999.ebuild:
+  Migrate src_configure() over to multilib_native_use_enable() function from
+  multilib-build.eclass
 
   01 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> udev-215-r1.ebuild:
   Include more straightforward patch for the last commit after all wrt
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index d166d9ff7b34..96d98d888334 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -15,8 +15,8 @@ EBUILD udev-212-r1.ebuild 15905 SHA256 560a445ae97ba166e964c2d7c2cb58f1810054469
 EBUILD udev-214.ebuild 15547 SHA256 4b4bd620b0ecec3a4911338f2a50a02c59fd0f48ef1b0c09c35a98472b3e0c36 SHA512 448159628e27a07671c72d73d3a41722bf10f0731254f8658c57e2cf17603bf6870ed56837c4d8a3e1b47e00f3c4d938b8884baf891134f236392ad4dbeb6016 WHIRLPOOL df2c6784a545be966b8716d7ec838de5bba2d1f5a639babfa85f590d8c14f98e6bafc3dca7beb7884d96e6f93262d30cb1dfb6c7c0d364bbdede88426d5fd665
 EBUILD udev-215-r1.ebuild 15420 SHA256 85b9e16c366861f09ebfdcfe6138a63504f957fca16cccc8b35683812d62212a SHA512 8e34609c7c7a36ff9d2d5812be1a5727f3959fd0e884b78f92102466638f8b0d2fc25ac027e4bb1fee8832ccb81d327baab6c3b5d48e995b7be83fef9252ed82 WHIRLPOOL 5f565a74132cc7a9a9b4981f1a092ea83e8c189d0e43efa1958a73c0e3d34bd14b06dc30879ad3202c40cf1264caf6d34b6d7ab773161a6c576706e13681937e
 EBUILD udev-215.ebuild 15378 SHA256 834f6a1e8f29046a54692cd8e2e6017b5838957ebd2e931f55c7a67cd65d09b1 SHA512 04c655a98d48be8ac7e09df1c01b68bf8ae6f9ef4256486f154d8c702f8335fc51cc73ce868a3d0a0fbd7924f8a9dfd5443fc078af8a1b0bec441beabeef5a46 WHIRLPOOL 071bbbd7fe39fc4ddc5d167340dc2a48a0941ec96d0b29017b62604f82149c76adf526ffa14ecc41b5d140ea61d14a396406a16762da5dc862af5558a48c4841
-EBUILD udev-9999.ebuild 15374 SHA256 3df1c2acc574a106574cf653efed53e5d9ecc1a203de17579509969e4c82aa73 SHA512 c270fd097acecdc946b206d9f6a25f128cb978899be1cf410a7a38479f0a04c8f665115125a498d56b4096e91e638ff16936949aa6f8c107dfdbb853f29f3a0a WHIRLPOOL 6e2d141fbbf5beb2fef24db0be938921d70b18ccad8423ce6cf570bccef009e36e7bd3fd237374c4474000bdd8c538311e249c8de36b937c2e419f02533f4ef9
-MISC ChangeLog 56044 SHA256 4a37134322e5a38a14820825ef3ebbc7eed8209104e4ab5739d9615eee0bdd64 SHA512 32d5566a34723d3a4aaa36995a4edf7fcae379b8215a713fba28d8bef691c731c56e2992bb873115b2c141b3dc5a5914a0365e6fae442af2c14bacebe3a2aedc WHIRLPOOL 6a13010eead68898ef9a20ff23513e7ddc3e8b867500600ee519781006a321643a83351808fa4cfae86013cfe3217b6071d882b69e72243b7b78433ec9ef4210
+EBUILD udev-9999.ebuild 15246 SHA256 cdae57c4fdcf7120736bd54d1c28760ac0cf603a642c05b49fdec4cd7807f9e6 SHA512 90dfc471b6c9ecc3a7c72d7020c7f5e53f9d4918d39161898be4eaf2fbf2910b69ef4a63630b819680041e49fc0d2add21d893567556a69d92cb567a43d3397f WHIRLPOOL 13f7084dd39b19406ff2ab61202bcc11caa7cfc3adb0bf0cd747850456f815d82280de1e7f74f03df39b4a9b3778060023de661fd9a6eb52c77d2f4f0b90da36
+MISC ChangeLog 56218 SHA256 3961f650b54594c6cc81b5777633011695da38dafd51770eec8df31b6836993f SHA512 22d25b946cb96535e048f78911c82df21c6313c44f1b3e9e90b07c3238b86f131ba83f173cf0188f9c876cfe795096520defa743e58002210d5bb9da5e7df8ff WHIRLPOOL 7c8e271d5fd5c5f3050dfc9a3fb9214dddffda803d8add3d12d40edac1c1e33ec4e6db8f445e4c26517f08318b074b8643cab54ec5f00f78789c80e4ef435048
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
@@ -25,11 +25,11 @@ MISC metadata.xml 610 SHA256 5483522dfe99f75e0f48a38a03338037f8229e8dbdb4b94aaa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT27P1AAoJEEdUh39IaPFNXX8H/i1mF2SITIGeg5hFmWiI0vGx
-fgcX5GwTI5jaKRdCeu7X/MGnvI14YBM43zlNDgo612LxQkjUnOTQb3KAYS96mRNC
-fAHQh/9gRlriSNWbFX6QBsp1c5+WiZmiPOa38TwpZW7+2ILylsifYh+1OSqUHJ3s
-etZ9nEB4YvzJ51+8qnMTYkpWssVd7p8IfT5DUuf+bKynOoSA7D8nZE/mNvI5TTSr
-LGa5VHHsB5stqTWIBE0JfVOGb7A3rf7mplxdJBwLQjnJvxv1xbDBNc40fYb+0/bZ
-xvAc0DpD9Fu05odILV/Y5N5d1mlclXUvLfcSUdkL+mBssMV4GXaTxhyz1CRZewY=
-=OdDy
+iQEcBAEBCAAGBQJT3DDdAAoJEEdUh39IaPFN8o8H/R8+mW0n6VP03T1YKGHrMIsN
+/wTnL244KqTmfmpVbFNavJFxbiQtCzRhFhuQG9tAIktX6vEgnwcqNWnvlBf0BqnF
+Wi+JzKK4NIM3OY/LxQEW/sPbYejI7B6Mw7tPeu8Z7hCPz3nw2KUsRcOcqAEalp9H
+u0rP8CWVkXBl8lxId0bizd1fwavxPyZFnOh3xQYPryOfHXjT2XOR9jSCxWkQY2+H
+xXqhYQi3DIga4ClLExp3bHl6YgcXIo6yeDZmu5AFVzCc5DSnTy5NmBRQszAUatFO
+YXOXo4Jx3S6D3YtkVpsXds5hAljT6IyYGXta8MdSiLU63lCocmVYlbcqj38CoRY=
+=JuTp
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 051168a81cbb..c85ab13397bf 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-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/udev/udev-9999.ebuild,v 1.315 2014/08/01 09:22:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.316 2014/08/02 00:29:29 ssuominen Exp $
 
 EAPI=5
 
@@ -160,12 +160,18 @@ multilib_src_configure() {
 		ac_cv_search_cap_init=
 		--libdir=/usr/$(get_libdir)
 		--docdir=/usr/share/doc/${PF}
+		$(multilib_native_use_enable static-libs static)
 		--disable-nls
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable introspection)
 		--disable-python-devel
 		--disable-dbus
+		$(multilib_native_use_enable kmod)
 		--disable-seccomp
+		$(multilib_native_use_enable selinux)
 		--disable-xz
 		--disable-pam
+		$(multilib_native_use_enable acl)
 		--disable-gcrypt
 		--disable-audit
 		--disable-libcryptsetup
@@ -176,44 +182,20 @@ multilib_src_configure() {
 		--disable-quotacheck
 		--disable-logind
 		--disable-polkit
-		--disable-nls
 		--disable-myhostname
 		$(use_enable gudev)
+		$(multilib_is_native_abi || echo "--disable-manpages")
 		--enable-split-usr
 		--with-html-dir=/usr/share/doc/${PF}/html
 		--without-python
 		--with-bashcompletiondir="$(get_bashcompdir)"
+		$(use firmware-loader && echo "--with-firmware-path=/lib/firmware/updates:/lib/firmware")
 		--with-rootprefix=
+		$(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)")
 	)
+
 	# Use pregenerated copies when possible wrt #480924
-	if ! [[ ${PV} = 9999* ]]; then
-		econf_args+=(
-			--disable-manpages
-		)
-	fi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			$(use_enable static-libs static)
-			$(use_enable doc gtk-doc)
-			$(use_enable introspection)
-			$(use_enable acl)
-			$(use_enable kmod)
-			$(use_enable selinux)
-			--with-rootlibdir=/$(get_libdir)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-acl
-			--disable-kmod
-			--disable-selinux
-			--disable-manpages
-			--with-rootlibdir=/usr/$(get_libdir)
-		)
-	fi
-	use firmware-loader && econf_args+=( --with-firmware-path="/lib/firmware/updates:/lib/firmware" )
+	[[ ${PV} = 9999* ]] || econf_args+=( --disable-manpages )
 
 	ECONF_SOURCE=${S} econf "${econf_args[@]}"
 }