Unify duplicate econf statements with a use_extras helper.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

3 files changed, 22 insertions, 45 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index a1dcb557d966..3ed947130ade 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.621 2011/12/14 20:11:33 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.622 2011/12/14 20:53:06 vapier Exp $
+
+  14 Dec 2011; Mike Frysinger <vapier@gentoo.org> udev-171-r4.ebuild:
+  Unify duplicate econf statements with a use_extras helper.
 
   14 Dec 2011; William Hubbs <williamh@gentoo.org> -udev-171-r1.ebuild,
   -udev-171-r2.ebuild, -udev-171-r3.ebuild, -udev-175.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index ff9175076637..63dff96921ac 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 136/shell-compat-KV.sh 1012 RMD160 5bc85047b4237d502f7b0ccc7181f9974c2b0898 SHA1 bbc58d6181f3fc8d623de1537eddcc1ede919202 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b
 AUX 136/shell-compat-addon.sh 930 RMD160 c96a77a2085698e4ca3636994d1b6d07326e4b5f SHA1 d696a1ff942d31b493d385cff27bc9cbacd3fa47 SHA256 94b1fe1f5ba892c82798cec6f15b5c5c76e1902ef2d13701ddfbb54f19079af9
@@ -128,15 +128,15 @@ EBUILD udev-146-r1.ebuild 15455 RMD160 35fec6e1eb5112d852c3e6a0e57b576d13620acc
 EBUILD udev-149.ebuild 16613 RMD160 65d46a5b3188f7bcfcdb9d8a8ff3b6d34829e314 SHA1 5c88835ffd735ea90db62713daba5f08a4551b64 SHA256 a04300cfafd64abd0f67c1d628f4b5d8ebfdf4dca90102f5764b3b739ed41453
 EBUILD udev-151-r4.ebuild 16852 RMD160 e0d2c7041c102e0e5979a1ed5c99d9f4d5820842 SHA1 907db35a89e1ad163c631941e76a5e8105ffd196 SHA256 c2657e3c93dbb8bd3e6dda1c779150aa6127f7a525ed2f04342e33afb4306cfb
 EBUILD udev-164-r2.ebuild 15294 RMD160 2d7299b463cb765a58ec0840c4c86607fbf37e64 SHA1 cb4060adb3235d261f027be37e56272ac8f4755b SHA256 3f1b289c9c9c2d6ee6cd63b8db530240dcc9532dbc3ff273c052679b3062724b
-EBUILD udev-171-r4.ebuild 16191 RMD160 b2effd1be10ab44f4a188777749d84495901eba8 SHA1 f5c0f2a0e8f28bfeae383e5e1cc459937da71782 SHA256 d39b9e9545b0c4ba7993fb5e786d1dff7d912e01a486716d17970806c4715747
+EBUILD udev-171-r4.ebuild 15559 RMD160 74fe6aa5874b266ec6dc1ee9d17b24d8320acaf5 SHA1 cdc7306e50ab0304d5bc8d292a6e3eaf32c01fc7 SHA256 5d523637e1ebf68c4c297362556f2daeda7360c3254c761ccf9a78f1a0fd69bf
 EBUILD udev-175-r1.ebuild 12554 RMD160 6b2042c42100cc226bbd52e4bacb384ddd9ab8b4 SHA1 3ce7f532c80ac5e1d6cc3cd66835fcfe7097e0fe SHA256 58e3bdc7a16d314ab0315029dab844729f2d3521bb017efcd05c2e032b42d8c1
 EBUILD udev-9999.ebuild 12557 RMD160 193f5e9ba3158953a8021c7546ca5674d33e69e1 SHA1 31009ec00f8200d0b3b3397702ca8fad970df3f0 SHA256 b9bfc01f09d5f9afad739ad62ce260b7375b2548a68565ca471c8781505c0ffa
-MISC ChangeLog 126782 RMD160 5ddd5bd0e8e749d1363dafa1cbe266c86de15db7 SHA1 de52554239354995ed08756052ac4186bd992f6b SHA256 7bdc51be7512f16cefef32f227c6c6eb237f2a6f8d7d4783adffb3f798086da1
+MISC ChangeLog 126912 RMD160 53c2f6e2cdad72aa8e4842150dc6dc65f5c1fac0 SHA1 a8fe66b4c61d8352c4a39dd9d6f505a27c81b117 SHA256 75ceb8ffd08060dc1c8007b103d00e9883b087c55dcfbbc7149d71b809b7cd19
 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7pAwwACgkQblQW9DDEZThGoQCdGpwU35Wj+9y1Qkq2GzMvRn0c
-rQoAn2+cq7xxZSWjJmYQZpg0fU5Xifi2
-=B1My
+iF4EAREIAAYFAk7pDLkACgkQaC/OocHi7JY3ZAD+OVU90/brer0EErdBOTJOk9lY
+yMSfc0/LAX38H6VBFs0BAJ4d41NuEg2Cb75kpG0l6Qx1ccdhuq+44tP1/Yda9KeG
+=Um+M
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-171-r4.ebuild b/sys-fs/udev/udev-171-r4.ebuild
index ec923d24a67e..245f37f7bd0d 100644
--- a/sys-fs/udev/udev-171-r4.ebuild
+++ b/sys-fs/udev/udev-171-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r4.ebuild,v 1.1 2011/12/11 04:48:14 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r4.ebuild,v 1.2 2011/12/14 20:53:06 vapier Exp $
 
 EAPI=4
 
@@ -191,9 +191,8 @@ src_prepare() {
 	fi
 }
 
+use_extras() { use extras && echo "--enable-${2:-$1}" || use_enable "$@" ; }
 src_configure() {
-	if ! use extras
-	then
 	econf \
 		--prefix="${EPREFIX}/usr" \
 		--sysconfdir="${EPREFIX}/etc" \
@@ -205,43 +204,18 @@ src_configure() {
 		--enable-static \
 		$(use_with selinux) \
 		$(use_enable debug) \
-		$(use_enable rule_generator) \
-		$(use_enable hwdb) \
+		$(use_extras rule_generator) \
+		$(use_extras hwdb) \
 		--with-pci-ids-path="${EPREFIX}/usr/share/misc/pci.ids" \
 		--with-usb-ids-path="${EPREFIX}/usr/share/misc/usb.ids" \
-		$(use_enable acl udev_acl) \
-		$(use_enable gudev) \
-		$(use_enable introspection) \
-		$(use_enable keymap) \
-		$(use_enable floppy) \
-		$(use_enable edd) \
-		$(use_enable action_modeswitch) \
+		$(use_extras acl udev_acl) \
+		$(use_extras gudev) \
+		$(use_extras introspection) \
+		$(use_extras keymap) \
+		$(use_extras floppy) \
+		$(use_extras edd) \
+		$(use_extras action_modeswitch) \
 		$(systemd_with_unitdir)
-	else
-	econf \
-		--prefix="${EPREFIX}/usr" \
-		--sysconfdir="${EPREFIX}/etc" \
-		--sbindir="${EPREFIX}/sbin" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-rootlibdir="${EPREFIX}/$(get_libdir)" \
-		--libexecdir="${EPREFIX}/lib/udev" \
-		--enable-logging \
-		--enable-static \
-		$(use_with selinux) \
-		$(use_enable debug) \
-		--enable-rule_generator \
-		--enable-hwdb \
-		--with-pci-ids-path="${EPREFIX}/usr/share/misc/pci.ids" \
-		--with-usb-ids-path="${EPREFIX}/usr/share/misc/usb.ids" \
-		--enable-udev_acl \
-		--enable-gudev \
-		--enable-introspection \
-		--enable-keymap \
-		--enable-floppy \
-		--enable-edd \
-		--enable-action_modeswitch \
-		$(systemd_with_unitdir)
-	fi
 }
 
 src_compile() {