[gentoo-commits] gentoo-x86 commit in sys-fs/udev: metadata.xml ChangeLog udev-9999.ebuild

[Matthias Schwarzott (zzam)]

zzam        09/06/18 09:27:50

  Modified:             metadata.xml ChangeLog udev-9999.ebuild
  Log:
  Make extras a use-flag and add all necessary depends. Change way doc is handled for autotools.
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.7                  sys-fs/udev/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/metadata.xml?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/metadata.xml?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/metadata.xml?r1=1.6&r2=1.7

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml	10 Jun 2009 20:10:01 -0000	1.6
+++ metadata.xml	18 Jun 2009 09:27:50 -0000	1.7
@@ -7,5 +7,6 @@
 </maintainer>
 <use>
   <flag name="devfs-compat">Install rules for devfs compatible device names</flag>
+  <flag name="extras">Compile udev-extras requiring external dependencies</flag>
 </use>
 </pkgmetadata>



1.472                sys-fs/udev/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.472&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.472&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.471&r2=1.472

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -r1.471 -r1.472
--- ChangeLog	17 Jun 2009 13:52:39 -0000	1.471
+++ ChangeLog	18 Jun 2009 09:27:50 -0000	1.472
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.471 2009/06/17 13:52:39 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.472 2009/06/18 09:27:50 zzam Exp $
+
+  18 Jun 2009; Matthias Schwarzott <zzam@g.o> udev-9999.ebuild,
+  +files/udev-9999-disable-doc.diff, metadata.xml:
+  Make extras a use-flag and add all necessary depends. Change way doc is
+  handled for autotools.
 
   17 Jun 2009; Matthias Schwarzott <zzam@g.o> udev-9999.ebuild:
   Update to level of udev-141-r1. Update for changed configure-script. Patch



1.10                 sys-fs/udev/udev-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.9&r2=1.10

Index: udev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- udev-9999.ebuild	17 Jun 2009 13:52:39 -0000	1.9
+++ udev-9999.ebuild	18 Jun 2009 09:27:50 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.9 2009/06/17 13:52:39 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.10 2009/06/18 09:27:50 zzam Exp $
 
 EAPI="1"
 
@@ -19,27 +19,36 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="selinux +devfs-compat -doc"
+IUSE="selinux +devfs-compat -extras"
 
-COMMON_DEPEND="selinux? ( sys-libs/libselinux )"
+COMMON_DEPEND="selinux? ( sys-libs/libselinux )
+	extras? (
+		sys-apps/acl
+		>=sys-apps/usbutils-0.82
+		dev-libs/libusb
+		sys-apps/pciutils
+		dev-libs/glib:2
+	)
+	>=sys-apps/util-linux-2.16"
 # >=sys-apps/util-linux-2.16 should provide libblkid
 
-# for compiling the extras udev needs a lot more depends (see README)
+DEPEND="${COMMON_DEPEND}
+	extras? ( dev-util/gperf )"
 
-DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/coldplug
+	!<sys-fs/device-mapper-1.02.19-r1
+	>=sys-apps/baselayout-1.12.5"
 
 if [[ ${PV} == "9999" ]]; then
 	# for documentation processing with xsltproc
 	DEPEND="${DEPEND}
 		app-text/docbook-xsl-stylesheets
-		app-text/docbook-xml-dtd"
+		app-text/docbook-xml-dtd
+		doc? ( dev-util/gtk-doc )"
+	IUSE="${IUSE} -doc"
 fi
 
-RDEPEND="${COMMON_DEPEND}
-	!sys-apps/coldplug
-	!<sys-fs/device-mapper-1.02.19-r1
-	>=sys-apps/baselayout-1.12.5"
-
 # We need the lib/rcscripts/addon support
 PROVIDE="virtual/dev-manager"
 
@@ -126,13 +135,10 @@
 		|| die "sed failed"
 
 	if [[ ${PV} == 9999 ]]; then
-		if ! use doc; then
-			sed -e '/docs\/Makefile/d' \
-				-e '/GTK_DOC_CHECK/d' \
-				-i.orig configure.ac
-			sed -e 's/SUBDIRS =.*/SUBDIRS =/' \
-				-e 's/docs//' \
-				-i.orig libudev/Makefile.am
+		if use doc; then
+			gtkdocize --copy
+		else
+			epatch "${FILESDIR}/udev-9999-disable-doc.diff"
 		fi
 		eautoreconf
 	fi
@@ -150,7 +156,7 @@
 		--libexecdir="${udev_libexec_dir}" \
 		--enable-logging \
 		$(use_with selinux) \
-		--disable-extras
+		$(use_enable extras)
 
 	emake || die "compiling udev failed"
 }