udev-182-r3.patch

udev-182-r3.patch (text/plain), 1.40 KB, created by Konstantin Ivanov on 2012-04-26 06:55:57 UTC

--- udev-182-r3.orig	2012-04-26 09:50:52.787653684 +0400
+++ udev-182-r3.ebuild	2012-04-26 10:14:02.402701664 +0400
@@ -30,14 +30,15 @@
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="build selinux debug +rule_generator hwdb gudev introspection
-	keymap floppy doc static-libs +openrc"
+	keymap floppy doc static-libs +openrc usr"
 
 COMMON_DEPEND="selinux? ( sys-libs/libselinux )
 	gudev? ( dev-libs/glib:2 )
 	introspection? ( dev-libs/gobject-introspection )
 	>=sys-apps/kmod-5
 	>=sys-apps/util-linux-2.20
-	!<sys-libs/glibc-2.10"
+	>=sys-libs/glibc-2.10
+	usr? ( sys-apps/kmod[usr] )"
 
 DEPEND="${COMMON_DEPEND}
 	keymap? ( dev-util/gperf )
@@ -142,11 +143,20 @@
 
 src_configure()
 {
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir)"
+
+	if use usr ; then
+		myconf="--bindir=/bin --libdir=/lib"
+		declare -x KMOD_CFLAGS="-I/usr/include"
+		declare -x KMOD_LIBS="-L/lib -lkmod"
+	fi
+
 	filter-flags -fprefetch-loop-arrays
 	econf \
 		--with-rootprefix=/ \
-		--libdir=/usr/$(get_libdir) \
 		--libexecdir=/lib \
+		$myconf \
 		$(use_enable static-libs static) \
 		$(use_with selinux) \
 		$(use_enable debug) \
@@ -173,7 +183,9 @@
 	use keymap && dodoc src/keymap/README.keymap.txt
 
 	# udevadm is now in /usr/bin.
-	dosym /usr/bin/udevadm /sbin/udevadm
+	if ! use usr ; then
+		dosym /usr/bin/udevadm /sbin/udevadm
+	fi
 
 	# create symlinks for these utilities to /sbin
 	# where multipath-tools expect them to be (Bug #168588)