Fix parallel make issue, Bug #176918. Added forgotten backslash causing udev to fail on selinux, Bug #176957.

Package-Manager: portage-2.1.2.5

4 files changed, 38 insertions, 14 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 3a242e4a0f37..0aae4b7c76c6 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.299 2007/05/03 14:43:37 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.300 2007/05/04 07:05:24 zzam Exp $
+
+  04 May 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/udev-110-makefile-depend.diff, udev-110.ebuild:
+  Fix parallel make issue, Bug #176918. Added forgotten backslash causing udev
+  to fail on selinux, Bug #176957.
 
   03 May 2007; Matthias Schwarzott <zzam@gentoo.org>
   files/udev-start-110.sh:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 7c4ab286a87a..2066e31e50a6 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -129,6 +129,10 @@ AUX udev-109-respect-CFLAGS.diff 644 RMD160 b881a4cf7bc54f2ff8df8e1ec28d210f6b0f
 MD5 e710c187a4fa44330046b9f9d5264347 files/udev-109-respect-CFLAGS.diff 644
 RMD160 b881a4cf7bc54f2ff8df8e1ec28d210f6b0f0446 files/udev-109-respect-CFLAGS.diff 644
 SHA256 fddadf459f05e8cbcd78d38b47cf6b3ed1fbfbc25bc868644c62dc8181919676 files/udev-109-respect-CFLAGS.diff 644
+AUX udev-110-makefile-depend.diff 378 RMD160 a47dd9f29a9b80440f11a4db98d9c79fb5938772 SHA1 48cd6a610512e5aa61c592c993177ceb94378e25 SHA256 50d4e19c89d20354fb52521b6a43228bf9dcb48aff808359f9b56c68e6e6d390
+MD5 8d95ca4e4f9b3c4eaf7f5b4bbe3775e8 files/udev-110-makefile-depend.diff 378
+RMD160 a47dd9f29a9b80440f11a4db98d9c79fb5938772 files/udev-110-makefile-depend.diff 378
+SHA256 50d4e19c89d20354fb52521b6a43228bf9dcb48aff808359f9b56c68e6e6d390 files/udev-110-makefile-depend.diff 378
 AUX udev-parisc-path_id-again.patch 524 RMD160 d305615a2f5ae0ab6b468400e95ad3332a2bcb38 SHA1 574d12600292d5cd1acb3b1be2bc24d337581a88 SHA256 a1b40d1bf3f8a7e0d6787d310218b44916c79a4f94a39287bc00f8ae058b67ff
 MD5 2f18f7560f7667fa98179c6084396453 files/udev-parisc-path_id-again.patch 524
 RMD160 d305615a2f5ae0ab6b468400e95ad3332a2bcb38 files/udev-parisc-path_id-again.patch 524
@@ -428,14 +432,14 @@ EBUILD udev-109.ebuild 9854 RMD160 a75a5676d1f25dc7d9c85f7f83d31861c335884c SHA1
 MD5 4edd51d72db2d07d5aeceee955996ad0 udev-109.ebuild 9854
 RMD160 a75a5676d1f25dc7d9c85f7f83d31861c335884c udev-109.ebuild 9854
 SHA256 c71970cc99f0033209198bfbc6707f96f86fc216d27ffe64991b2248767cc390 udev-109.ebuild 9854
-EBUILD udev-110.ebuild 9780 RMD160 e5e5c8d55473109a0372fe3fe20a37f8e31c4255 SHA1 7e43a7a9a0a2c58b13973a39eba79b20780cd0be SHA256 d7b9c8a645d4c705cf3c956ea9d6684cfad8d4317a4fd56b4f7e56c6c95fe39c
-MD5 02eda921b21fdf61e2e440cd7435fae8 udev-110.ebuild 9780
-RMD160 e5e5c8d55473109a0372fe3fe20a37f8e31c4255 udev-110.ebuild 9780
-SHA256 d7b9c8a645d4c705cf3c956ea9d6684cfad8d4317a4fd56b4f7e56c6c95fe39c udev-110.ebuild 9780
-MISC ChangeLog 57493 RMD160 00f26040b5b1805f6f53ee254df0246a4489c255 SHA1 0fb244ab9eba0e52c6c2db3a8189ac20a0506b57 SHA256 cc12da8ac096ec7528fe6182266c9636f7d5d9f2ff18d10e006760a95ccf9adb
-MD5 531233d1abbc9ea97319650e19fab9ed ChangeLog 57493
-RMD160 00f26040b5b1805f6f53ee254df0246a4489c255 ChangeLog 57493
-SHA256 cc12da8ac096ec7528fe6182266c9636f7d5d9f2ff18d10e006760a95ccf9adb ChangeLog 57493
+EBUILD udev-110.ebuild 9829 RMD160 3452835fc9d94da4b5266498509c84ee8ea79811 SHA1 9f21acee9aebf5818012245561d4e7ca1377892f SHA256 5677205d17d3401184e097d04ec97ddfcff0cc6c9bd73cfac400a457a1ddb204
+MD5 d3bf2a664ff303283108edd767cae6a5 udev-110.ebuild 9829
+RMD160 3452835fc9d94da4b5266498509c84ee8ea79811 udev-110.ebuild 9829
+SHA256 5677205d17d3401184e097d04ec97ddfcff0cc6c9bd73cfac400a457a1ddb204 udev-110.ebuild 9829
+MISC ChangeLog 57718 RMD160 e6575d5111bcce1d1e0216702ca83e1e4b1918b3 SHA1 a439bea673129b10f5d9c96a9c6937b7233824fa SHA256 8db6f9939f171472021cf331b20e6cfad96aaf2e38b188f20e2f4e8ac0a800ed
+MD5 eb7abeb2144653a83ed522f1ca7ccfd2 ChangeLog 57718
+RMD160 e6575d5111bcce1d1e0216702ca83e1e4b1918b3 ChangeLog 57718
+SHA256 8db6f9939f171472021cf331b20e6cfad96aaf2e38b188f20e2f4e8ac0a800ed ChangeLog 57718
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -512,7 +516,7 @@ SHA256 69a1572d54ff5ba74652f37125d187171cc62f7d1cce3a09c4c11be16112a482 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGOfUft2vP6XvVdOcRAufXAKCKQKIxwNCuTu/bWOsbPg4pqf59lwCcDQK3
-jlAEeoBVibKpbFqArVXd5jo=
-=WEv5
+iD8DBQFGOts6t2vP6XvVdOcRAg0DAKDCn8/WwxXJgqM7Vb5hwNzfhzkLlQCgpM9G
+XHlo57WEWelJt2objo23sRA=
+=PhHG
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/udev-110-makefile-depend.diff b/sys-fs/udev/files/udev-110-makefile-depend.diff
new file mode 100644
index 000000000000..8b7cb295f07e
--- /dev/null
+++ b/sys-fs/udev/files/udev-110-makefile-depend.diff
@@ -0,0 +1,13 @@
+diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
+index fafcc52..5618b96 100644
+--- a/extras/volume_id/lib/Makefile
++++ b/extras/volume_id/lib/Makefile
+@@ -69,7 +69,7 @@ all: libvolume_id.a $(SHLIB) libvolume_id.pc
+ .shlib:
+ 	$(Q) mkdir .shlib
+ 
+-.shlib/%.o: %.c
++.shlib/%.o: %.c .shlib
+ 	$(E) "  CC      " $@
+ 	$(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
+ 
diff --git a/sys-fs/udev/udev-110.ebuild b/sys-fs/udev/udev-110.ebuild
index 77fb8c3e06b8..884018c7e562 100644
--- a/sys-fs/udev/udev-110.ebuild
+++ b/sys-fs/udev/udev-110.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-110.ebuild,v 1.1 2007/05/02 13:53:25 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-110.ebuild,v 1.2 2007/05/04 07:05:24 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -29,6 +29,8 @@ src_unpack() {
 	#epatch ${FILESDIR}/${P}-udev_volume_id.patch
 	epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch
 
+	epatch ${FILESDIR}/${P}-makefile-depend.diff
+
 	# No need to clutter the logs ...
 	sed -ie '/^DEBUG/ c\DEBUG = false' Makefile
 	# Do not use optimization flags from the package
@@ -71,7 +73,7 @@ src_compile() {
 		EXTRAS="${extras}" \
 		udevdir="/dev/" \
 		CROSS_COMPILE=${mycross} \
-		OPTFLAGS=""
+		OPTFLAGS="" \
 		${myconf} || die
 }