unbreak the udev ebuilds, see changelog

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

4 files changed, 26 insertions, 18 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 220e7d47d860..235e03cd73cb 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.651 2012/03/15 07:58:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.652 2012/03/15 08:21:51 ssuominen Exp $
+
+  15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> udev-181.ebuild,
+  udev-9999.ebuild:
+  Remove use_enable for hwdb which isn't available and use correct bash syntax
+  for += wrt #408287. Quote the result of $(systemd_with_unitdir). Remove
+  useless libtool files in favour of pkg-config files.
 
   15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> udev-171-r5.ebuild,
   udev-181.ebuild, udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index a8cc2b0e30e3..4b52a5182f06 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -130,19 +130,19 @@ EBUILD udev-149.ebuild 16424 RMD160 463967bffcfe474491b5282bf77b8aef249f9b43 SHA
 EBUILD udev-151-r4.ebuild 16663 RMD160 a86faa791d5ecf2d84b53881abae8db6507bd302 SHA1 1d3a1a2a21e70ef33c1c5d9288bbe02c77abf04a SHA256 953c62eda14481446518c51eb7fb7fbb8dc0fe5a2c335c72aee833f12cb0adaf
 EBUILD udev-164-r2.ebuild 15102 RMD160 7ed8900771e83abbd3f2a14dd880d5c7462310f2 SHA1 2533fed6842fc8b3708bcf1ca541a4f13508cb1f SHA256 cca3497d3e06df3da7cc387543f3dc367782755cb504855e50e7900ae99e6b35
 EBUILD udev-171-r5.ebuild 15616 RMD160 31366a2c3bf18913aa13502cdc55510347bddb6e SHA1 05e9cfd2918ab912a68bda47624d801b299a5e5b SHA256 e17f2facb19d520ce1f8e6daf76da0a368fc49d8a525bb12e86d8c34e088c21a
-EBUILD udev-181.ebuild 9996 RMD160 d5df1ec151c3ee80d7b49083bff88cb52f939c0b SHA1 623a10430f92b8ef76b8623c98bdbbef9ee8cfe7 SHA256 6f9360ba8c239c56ba9ff41151d9fb97eb7c478b93c71e0defe35980cd57d7c1
-EBUILD udev-9999.ebuild 9821 RMD160 d53b9a8380d6dcc3bbfe32c56929312ef46fcdba SHA1 3fd07e6db8a0f3c5f43d40b7178923bdc2a716a6 SHA256 b78c0363d81c4f4f7958666f4ccba8220451c01f16e223cd393878db8e1addf5
-MISC ChangeLog 25476 RMD160 cae1c1f1e09284c2b7a89f7459db7cc05937b969 SHA1 a044b9d5f3ef4bd1ef9ebb103273714d958b3280 SHA256 a094d2abe13e72199ddcefef0ffec6700521fb398c30390e9e07448a731565ac
+EBUILD udev-181.ebuild 10026 RMD160 e7e743876b651cde6abfb4d4569250870e9b7dbe SHA1 041f5fb31f4314f635de701d2515b58dc2b3589d SHA256 da0b7ceb6068127e7fe9d4ffd19157ea9a295d45f807431b9f3a8bedd7c46ead
+EBUILD udev-9999.ebuild 9853 RMD160 965a3ae8a87bec2f4aa663e9a6bb26fc0d4afed4 SHA1 f0aa5640434c5adb843cf1a4bb42a875c83d6358 SHA256 6fb4c3144dc3f60d403fb780db716bbfb94c44a0a45d0edb0ca63203c8fa8910
+MISC ChangeLog 25776 RMD160 16cf2f1c8c9e7e74beeff465a9d6330eee4d1d89 SHA1 bc39f985b44ef0891268dfa1b444f551179e1ac5 SHA256 c526783e509eabe58bd9446927c5c4c70fe399a37a12f6e9f1dfaa18b04f7011
 MISC ChangeLog-2009 105929 RMD160 0c1dd5616962702fb0e85e4f9572fa27b0ee9d0f SHA1 d5635636ae54db968b8405a66be7d20c8d3f99ae SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c
 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPYaEjAAoJEEdUh39IaPFNWicH/jnFq4gces0Vk4+ZpV8O2Gvg
-9H2oXoU1muil4Kdz90ss5YJm5tlDmzm14J5Ur8Q0FAjBy16pxPtu8hBnJS81HkD+
-36gOFjjD7x2ZjwLpnFp+qPzcUXaaEGMw5qhSSL947ZMWvJU8L3iTk2m3fPWQCfB2
-gpEIfsDxig4FyufY4ImD7Lz01En/ZAYI5EEpnXr8xGKC8aE/zB9pU2+FnBizazex
-M+4Zc7neeRaKuF2GQ7yfAWdY7gTQWtTcQR26OubNdLPFmjI/H9vj5mhescT2wePf
-VVDw5FhRUtWsRoM+AcrFcQnPZiEqIGp2nL4VTVAsafcxnquKAc8axR+G5hGfS7I=
-=BsqL
+iQEcBAEBAgAGBQJPYaagAAoJEEdUh39IaPFN8iYIAJMfHJCvT/OEMzfT8lK2fByA
+d6uKCbydh+cQ/sGjHXXvzC3hPEQEbb+IowxiVRzWEMOdiPN25Hf1jU3jan16yAL+
+OvTHdMGFOHXi8XgKKCz+vq+Tnp0JCB50FxpKqYrGuPhcAu3Cj6Kq29OwDxy+TlzB
+l8xbgjYYyTw+nayJlcneYSLKBHKsNA9yWdURNUstud6St7xNoBUw8bZYIMniy5Gs
+tiQPqzEYBGNrXAJ4LS3ksRqqId+yYblSsp79LqTteX32E3zjHonQIqRf3h5SnstI
+nUVSrMsUQb84U20UjNbsNSg787i2U4Sq+B1r/NBqQe0JYk/jinnZJGtusTac95o=
+=3JCC
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-181.ebuild b/sys-fs/udev/udev-181.ebuild
index 2136b6c2db2b..f1b1abc14337 100644
--- a/sys-fs/udev/udev-181.ebuild
+++ b/sys-fs/udev/udev-181.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-181.ebuild,v 1.5 2012/03/15 07:58:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-181.ebuild,v 1.6 2012/03/15 08:21:51 ssuominen Exp $
 
 EAPI=4
 
@@ -90,7 +90,7 @@ pkg_setup()
 		~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
 
 	if use acl; then
-		CONFIG_CHECK += " ~TMPFS_POSIX_ACL"
+		CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
 	fi
 
 	linux-info_pkg_setup
@@ -160,7 +160,6 @@ src_configure()
 		$(use_with selinux) \
 		$(use_enable debug) \
 		$(use_enable rule_generator) \
-		$(use_enable hwdb) \
 		--with-pci-ids-path=/usr/share/misc/pci.ids \
 		--with-usb-ids-path=/usr/share/misc/usb.ids \
 		$(use_enable acl udev_acl) \
@@ -170,13 +169,15 @@ src_configure()
 		$(use_enable floppy) \
 		$(use_enable edd) \
 		$(use_enable doc gtk-doc) \
-		$(systemd_with_unitdir)
+		"$(systemd_with_unitdir)"
 }
 
 src_install()
 {
 	emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install
 
+	find "${ED}" -type f -name '*.la' -exec rm -f {} +
+
 	# documentation
 	dodoc ChangeLog README TODO
 
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index d4b82d2d8069..6f34a1e0713e 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.75 2012/03/15 07:58:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.76 2012/03/15 08:21:51 ssuominen Exp $
 
 EAPI=4
 
@@ -154,7 +154,6 @@ src_configure()
 		$(use_with selinux) \
 		$(use_enable debug) \
 		$(use_enable rule_generator) \
-		$(use_enable hwdb) \
 		--with-pci-ids-path=/usr/share/misc/pci.ids \
 		--with-usb-ids-path=/usr/share/misc/usb.ids \
 		$(use_enable gudev) \
@@ -163,13 +162,15 @@ src_configure()
 		$(use_enable floppy) \
 		$(use_enable edd) \
 		$(use_enable doc gtk-doc) \
-		$(systemd_with_unitdir)
+		"$(systemd_with_unitdir)"
 }
 
 src_install()
 {
 	emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install
 
+	find "${ED}" -type f -name '*.la' -exec rm -f {} +
+
 	# documentation
 	dodoc ChangeLog README TODO