Install udev rules into /lib/udev/rules.d. This fixes bug #393339. Thanks to Jonathan...

Package-Manager: portage-2.1.10.39/cvs/Linux i686

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 178b4f34a1d33276858736ff9d48553c21e7fe28..3329173e16f7c5bd10e3c7ff1d07b5cd8dae407b 100644 (file)
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.203 2011/12/08 23:31:00 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.204 2011/12/08 23:35:32 billie Exp $
+
+*hplip-3.11.10-r2 (08 Dec 2011)
+
+  08 Dec 2011; Daniel Pielmeier <billie@gentoo.org> -hplip-3.11.10-r1.ebuild,
+  +hplip-3.11.10-r2.ebuild:
+  Install udev rules into /lib/udev/rules.d. This fixes bug #393339. Thanks to
+  Jonathan Callen for the report.
 
   08 Dec 2011; Daniel Pielmeier <billie@gentoo.org>
   -files/hplip-3.11.5-cups-1.5.patch, -hplip-3.11.7.ebuild,

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 0700f16e0f4157fc3af23b4a56d4a366e0dfe3e2..70fb8a9e175606fde80e467e1e003fe54a3ed720 100644 (file)
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -11,15 +11,15 @@ AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490
 AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95dc SHA1 11d85332f0200f14bb4492c1528cebb2af72d6f0 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719
 DIST hplip-3.11.10.tar.gz 21419965 RMD160 d5e7bd065f1fea5f536b4bf47c8962374de95591 SHA1 716dea09c1570356b359e5b6d4a50f8b2654d760 SHA256 1d84fd0e8cf27771b11efa05692e8764fdd758b544df60f23f0c274afea9af81
 DIST hplip-3.11.5.tar.gz 21227642 RMD160 8a87f201aac95253d0ac1765e21aa094f11389f8 SHA1 e3604752b7a1ab0f492a1b4d470f8fa75e8959e5 SHA256 611f677fc1a0d2d493d44bfe84e5e5aaac4124627e94885f57bc77db9178536c
-EBUILD hplip-3.11.10-r1.ebuild 7706 RMD160 2849a5b0994b04c43edf10249e97e57d742b4f32 SHA1 bfdb1fb57f3413f590515d6bb21bb75bce980920 SHA256 57d49dec778a16ac9a319b0b6e04a039143a76e6b54ea1fe41edd339e466c786
+EBUILD hplip-3.11.10-r2.ebuild 7696 RMD160 5b713133f95a813d6fab3945ff7b61001e4c64ca SHA1 c278420c5424e5bb2882505f97b0e90572bae3ef SHA256 7856a5e50eca2c368f4bc1434efe3831172ce6c2d1504e665bfe8c39c0638a6c
 EBUILD hplip-3.11.10.ebuild 7517 RMD160 2f9c8086c7176c8ef826dcecb3ebca74266cdb2d SHA1 af9d666b98dd15a1db1e0c867201590b9ced191d SHA256 124b817b401ea6bd3140eefa2afe14b8e2dd0f438ec529e2734de06e7eb4318e
 EBUILD hplip-3.11.5.ebuild 7517 RMD160 4ae37df100c2990de5b4da29684eee5ef677a5f5 SHA1 dc9f869e81014b7778e4c6aadcbaf82dc6434a5e SHA256 b3eaf951652f14975d7ba12fc16e1bd9198db86aee40e0c78624f25df658ce34
-MISC ChangeLog 34953 RMD160 04754a6c5d271242006b24766c2c7628c6350965 SHA1 362da864faeb57be8c12d0e6673b467ac535239f SHA256 10bfef165d087288f35250c87240a2d63503d4fa55ba05fbcf4ab08f1c132916
+MISC ChangeLog 35206 RMD160 108ab854ee241f30717d1a8deb11112a4cb4ca76 SHA1 6127e0a6a9c14699e135c47b51f7b28141b99d1e SHA256 3d357d7d86cc873f609c6a5aa3e906bc028926d93326de4218d5c552af007466
 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk7hSMYACgkQlcuUeyFa0U2M6QCfTeG87eAxwC7Y+hZYxqDRiYta
-aZYAoLvGI5ro3GhiJjNRVcRKKZTiWdsE
-=5N65
+iEYEAREIAAYFAk7hScoACgkQlcuUeyFa0U2bCQCg62xQi6R+VAw8y0KmRJPvp4TH
+MckAn3QzMHtnSFqlq6sPg8miCuhh+qWA
+=dHk4
 -----END PGP SIGNATURE-----

diff --git a/net-print/hplip/hplip-3.11.10-r1.ebuild b/net-print/hplip/hplip-3.11.10-r2.ebuild
similarity index 98%
rename from net-print/hplip/hplip-3.11.10-r1.ebuild
rename to net-print/hplip/hplip-3.11.10-r2.ebuild
index 693200b5aadb199add667dddc917492b467768eb..bfd854ee3a5b663c902c109eaf6ce12fb4b8bf28 100644 (file)
--- a/net-print/hplip/hplip-3.11.10-r1.ebuild
+++ b/net-print/hplip/hplip-3.11.10-r2.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/net-print/hplip/hplip-3.11.10-r1.ebuild,v 1.3 2011/11/16 19:16:53 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.10-r2.ebuild,v 1.1 2011/12/08 23:35:32 billie Exp $
 
 EAPI=4
 
@@ -101,7 +101,7 @@ src_prepare() {
        python_convert_shebangs -q -r 2 .
 
        # Fix for Gentoo bug #345725
-       sed -i -e "s|/etc/udev/rules.d|/$(get_libdir)/udev/rules.d|" \
+       sed -i -e "s|/etc/udev/rules.d|/lib/udev/rules.d|" \
                $(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
                || die