diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-12-14 20:53:06 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-12-14 20:53:06 +0000 |
| commit | 731d506ff3721591a34681e70190d5966f944b01 (patch) | |
| tree | 55022eb5a64b04be0789d6630c1b5ba94bc9743f /sys-fs | |
| parent | fix thinko with array handling when injecting args into the cmdline (diff) | |
| download | gentoo-2-731d506ff3721591a34681e70190d5966f944b01.tar.gz gentoo-2-731d506ff3721591a34681e70190d5966f944b01.tar.bz2 gentoo-2-731d506ff3721591a34681e70190d5966f944b01.zip | |
Unify duplicate econf statements with a use_extras helper.
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/udev/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-fs/udev/udev-171-r4.ebuild | 48 |
2 files changed, 15 insertions, 38 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/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() { |