Bug #361429: Use pkg-config libudev to get libudev libraries, so that -lrt is brought in for linking correctly with new udev.

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

4 files changed, 38 insertions, 4 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 0955846f06e6..85f3600b78cf 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.242 2011/02/09 20:38:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.243 2011/04/09 23:48:26 robbat2 Exp $
+
+  09 Apr 2011; Robin H. Johnson <robbat2@gentoo.org> lvm2-2.02.84.ebuild,
+  +files/lvm2-2.02.84-udev-pkgconfig.patch:
+  Bug #361429: Use pkg-config libudev to get libudev libraries, so that -lrt is
+  brought in for linking correctly with new udev.
 
 *lvm2-2.02.84 (09 Feb 2011)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index fe2d471c632f..109a7c263b26 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -46,6 +46,8 @@ AUX lvm2-2.02.70-locale-muck.patch 477 RMD160 60d3e1f1e49c6f27a20a0a0b6962d0791b
 AUX lvm2-2.02.72-dynamic-static-ldflags.patch 2912 RMD160 37a8b4261e63885e52fc82e4a42892cd299480d9 SHA1 ff4b6d6040a52b5d877f664f1e7c56d99f36d9c9 SHA256 536f57d7860ea078a4cc7f025d86c3b37befe2db9df7802d58b506bbeefa79d8
 AUX lvm2-2.02.73-asneeded.patch 640 RMD160 c3ac9b14d7bf6492461e4adb35dfb590000a2e9f SHA1 0e32b2eb0512d64372596eecc8ac3d663e75a0fa SHA256 f17df1abf6e36b7383b460eafa472f4395bc6bccee46c22c655a3381bd2ad306
 AUX lvm2-2.02.73-locale-muck.patch 605 RMD160 1f13c9e1c2d5ca4f7c47787089c488e2c7c170c5 SHA1 fa5ca4dabc530c4708655d753fbf28aef9a1eb3f SHA256 7e888d9c5dc9944c933ffd03755310bda48b5abcd686ec9c45fe852caa06d88f
+AUX lvm2-2.02.84-udev-pkgconfig.patch 1027 RMD160 9209452199af318ea05533e2513df3f5f8d67e6b SHA1 6bc062abe1a770c7c28c8cd44958a9a2c0e540da SHA256 62af214b1926b31205988dbed7ae7e7f2db825648e73eaed708042a9741edb95
+AUX lvm2-2.02.84-udev-pkgconfig.patch.old 951 RMD160 d59ec7aea4e3759d72e4948a72d34944b52ed872 SHA1 18107458094f2c8cfc943ab9929443e7b5b51c3c SHA256 1e588d3b0551d51a631e16b6cfe21ac643b9836db60b08c6e2c75fe8d90894ee
 AUX lvm2-start.sh 1025 RMD160 fa27385e4640d59c33f2ca42db9d38f80def3977 SHA1 83a86ff292192b3f62e4686b70bbbfcc39158b53 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c5f1d6b0a775039
 AUX lvm2-start.sh-2.02.28-r2 1180 RMD160 3ec85899a19c56d4d49e4654e1b05f53bc7d9c93 SHA1 80fce53cc1925990fbb103e57314b3c1740de6ed SHA256 a891855ed04d4c59f17fc0b19dc61813a4ca3cc183166867606d92cb58498460
 AUX lvm2-start.sh-2.02.49-r1 1200 RMD160 b88e37e7e228fecdedf359c1132723077a3d4c94 SHA1 85eb83a83c598b3ea405ec4c597a9c77364e7fb4 SHA256 94d15b5dbeabb275b4d91b284b3113cd812b7e7c90ec3018693803b3e91d9535
@@ -115,6 +117,6 @@ EBUILD lvm2-2.02.73-r1.ebuild 8698 RMD160 299597b5253fd879cbe5735b59deb84fe2a89c
 EBUILD lvm2-2.02.73.ebuild 8614 RMD160 257fc6784c5c027f487dad7e3c5e4e8fc077976d SHA1 e41bcb1e550b5077b56bb67b36989d13f4fe9d7f SHA256 a09f80dfb1008a9299a7db74c085512ea911ea32690fbc4d76bbdf875556b1e5
 EBUILD lvm2-2.02.74.ebuild 8706 RMD160 495c5b9bc446eabfb6e485e9c010effc24358623 SHA1 814c9db645c74500b6e84d057b3b97e1f937b1c2 SHA256 f85a1bb5cff58280af40e37fea329ecbe6a3c7760d8987cef827a0bb68a3a8fb
 EBUILD lvm2-2.02.83.ebuild 8726 RMD160 63e4b84622f240b67fe877957563de0e068c3647 SHA1 d8fefdc661cd86febfd9454f9e2087b1596665e5 SHA256 cc18cdd6d63e6ca445fc470a054e887740f3d91c2235e13a631bb38a52a108e2
-EBUILD lvm2-2.02.84.ebuild 8726 RMD160 e88733f068577bcb07dbbbc53fdf110d6954de43 SHA1 a22949f79bcaded58d8e78cee16e6ead445198e8 SHA256 4c514ea9da963de287a405316e626d7a8714e8f1964e207cb9093f3d160c9869
-MISC ChangeLog 42899 RMD160 6cc818029835b83e19a70f15197b67a286f3387c SHA1 89bca5074b8fb2b5ed31031668a87e65db42ac89 SHA256 a1d73d67b372da86e61c4f562cd3a174e09889d5b575eddbd84a068f005cc56d
+EBUILD lvm2-2.02.84.ebuild 8797 RMD160 524b85dedef94030590e4bc6a5b9b2e9f31a6633 SHA1 3e4edeccee6693ed15d4f80260d8d492c960c5fb SHA256 d973bd93ea11ae47fac023841668e0563c3a3921560a62d49a9d5f9cdf1d134e
+MISC ChangeLog 43148 RMD160 5a899300a297e18bf04c8afdb9480d38f8ee1557 SHA1 9e22931765ee1cdd389a79b3f3cc6a53fbdc0d57 SHA256 9e6757db1ece00f96a53253b39a552f6ba652a2f96d47af7d4c3f22e372a7a21
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
diff --git a/sys-fs/lvm2/files/lvm2-2.02.84-udev-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.84-udev-pkgconfig.patch
new file mode 100644
index 000000000000..d371ddd343f6
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.84-udev-pkgconfig.patch
@@ -0,0 +1,25 @@
+diff -Nuar LVM2.2.02.84.orig/configure.in LVM2.2.02.84/configure.in
+--- LVM2.2.02.84.orig/configure.in	2011-02-04 22:17:54.000000000 +0000
++++ LVM2.2.02.84/configure.in	2011-04-09 23:42:27.134617541 +0000
+@@ -803,9 +803,18 @@
+ AC_MSG_RESULT($UDEV_SYNC)
+ 
+ if test x$UDEV_SYNC = xyes; then
+-	AC_CHECK_LIB(udev, udev_queue_get_udev_is_active,
+-		     [UDEV_PC="libudev"; UDEV_LIBS="-ludev"],
+-		     [AC_MSG_ERROR([bailing out... libudev library is required])])
++	if  test x$PKGCONFIG_INIT != x1; then
++		pkg_config_init
++	fi
++	PKG_CHECK_MODULES(UDEV, libudev, [UDEV_PC="libudev" HAVE_UDEV=yes],
++		[NOTFOUND=0
++		AC_CHECK_HEADERS(libudev.h,,$bailout)
++		check_lib_no_libs udev udev_queue_get_udev_is_active
++		if test $NOTFOUND = 0; then
++			AC_CHECK_LIB(udev, udev_queue_get_udev_is_active,
++				     [UDEV_PC="libudev"; UDEV_LIBS="-ludev"],
++				     [AC_MSG_ERROR([bailing out... libudev library is required])])
++		fi])
+ 	AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
+ fi
+ 
diff --git a/sys-fs/lvm2/lvm2-2.02.84.ebuild b/sys-fs/lvm2/lvm2-2.02.84.ebuild
index 4f88c4e81074..e15da1994a4a 100644
--- a/sys-fs/lvm2/lvm2-2.02.84.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.84.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/lvm2/lvm2-2.02.84.ebuild,v 1.1 2011/02/09 20:38:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.84.ebuild,v 1.2 2011/04/09 23:48:26 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -83,6 +83,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
 	# bug 332905
 	epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.patch
+	# bug 361429
+	epatch "${FILESDIR}"/${PN}-2.02.84-udev-pkgconfig.patch
 
 	# Merged upstream
 	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch