add temporary support for the extras use flag.

Package-Manager: portage-2.2.0_alpha38/cvs/Linux i686

2 files changed, 43 insertions, 3 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 4485da6d893f..a4ac8fd0b3b5 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.589 2011/06/09 13:18:21 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.590 2011/06/09 13:55:35 williamh Exp $
+
+  09 Jun 2011; William Hubbs <williamh@gentoo.org> udev-171-r1.ebuild:
+  add temporary support for the extras use flag.
 
   09 Jun 2011; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild:
   Fix unpacking with git-2 eclass, bug #370647.
diff --git a/sys-fs/udev/udev-171-r1.ebuild b/sys-fs/udev/udev-171-r1.ebuild
index 0640efc4b246..9714248f370b 100644
--- a/sys-fs/udev/udev-171-r1.ebuild
+++ b/sys-fs/udev/udev-171-r1.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-r1.ebuild,v 1.3 2011/06/09 13:10:45 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r1.ebuild,v 1.4 2011/06/09 13:55:35 williamh Exp $
 
 EAPI="1"
 
@@ -28,9 +28,14 @@ HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="selinux test debug +rule_generator hwdb acl gudev introspection keymap floppy edd action_modeswitch"
+IUSE="selinux test debug +rule_generator hwdb acl gudev introspection keymap
+floppy edd action_modeswitch extras"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
+	extras? ( sys-apps/acl
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		virtual/libusb:0 )
 	acl? ( sys-apps/acl dev-libs/glib:2 )
 	gudev? ( dev-libs/glib:2 )
 	introspection? ( dev-libs/gobject-introspection )
@@ -40,6 +45,7 @@ COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 
 DEPEND="${COMMON_DEPEND}
 	keymap? ( dev-util/gperf )
+	extras? ( dev-util/gperf )
 	dev-util/pkgconfig
 	virtual/os-headers
 	!<sys-kernel/linux-headers-2.6.29
@@ -51,6 +57,11 @@ RDEPEND="${COMMON_DEPEND}
 		>=sys-apps/usbutils-0.82
 		sys-apps/pciutils
 	)
+	extras?
+	(
+		>=sys-apps/usbutils-0.82
+		sys-apps/pciutils
+	)
 	!sys-apps/coldplug
 	!<sys-fs/lvm2-2.02.45
 	!sys-fs/device-mapper
@@ -181,6 +192,7 @@ src_unpack() {
 src_compile() {
 	filter-flags -fprefetch-loop-arrays
 
+	if ! use extras; then
 	econf \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -204,6 +216,31 @@ src_compile() {
 		$(use_enable edd) \
 		$(use_enable action_modeswitch) \
 		$(systemd_with_unitdir)
+	else
+	econf \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--sbindir=/sbin \
+		--libdir=/usr/$(get_libdir) \
+		--with-rootlibdir=/$(get_libdir) \
+		--libexecdir=/lib/udev \
+		--enable-logging \
+		--enable-static \
+		$(use_with selinux) \
+		$(use_enable debug) \
+		--enable-rule_generator \
+		--enable-hwdb \
+		--with-pci-ids-path=/usr/share/misc/pci.ids \
+		--with-usb-ids-path=/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
 
 	emake || die "compiling udev failed"
 }