Remove hal fdi files. This fixes bug #389645. Thanks to i.Dark_Templar for the report.

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

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index f6bd064547dfa799c1be790ff38882ed7b341d1d..12a424b97c21ad2722b4d5d14937ff40708b074d 100644 (file)
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # 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.201 2011/11/06 19:21:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.202 2011/11/16 19:16:53 billie Exp $
+
+  16 Nov 2011; Daniel Pielmeier <billie@gentoo.org> hplip-3.11.10-r1.ebuild:
+  Remove hal fdi files. This fixes bug #389645. Thanks to i.Dark_Templar for
+  the report.
 
   06 Nov 2011; Brent Baude <ranger@gentoo.org> hplip-3.11.10.ebuild:
   Marking hplip-3.11.10 ppc for bug 388989

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index baf2bf2ab320ad4aa6389fccfb66438f33911a86..50611a618d9b89e1e2a7e3435ff0c35b15a517dc 100644 (file)
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX hplip-3.10.9-cve-2010-4267.patch 405 RMD160 0be8b7d90180d38420dc9991ada4c3b0b19b72d2 SHA1 449062383eb96dcf971a25f37565aadeebc7f451 SHA256 2280fb55a03d61edbd8ff928ae016c2e58e77bede83226f3d8e627e95fa6103f
 AUX hplip-3.11.1-desktop.patch 506 RMD160 eb55a4cbe136fc2105eb6cad21d5fdd69a8539e6 SHA1 14b591e3fab7342d4ddae80c6aaf9819d864f0b4 SHA256 557faf17a05f3707e2918673ed5eff56954feab0d5555b535236c938306f4523
 AUX hplip-3.11.1-htmldir.patch 4470 RMD160 ab8369b02b3590a19dec6277e03d3e79768ab803 SHA1 b70b07654d9997d4085e32b5a2419a1913c0f611 SHA256 30185a66b033dfdf0db59e600b19454c7680f3fa09ea8c24adf0fff19c15585e
@@ -11,9 +14,16 @@ AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95
 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
 DIST hplip-3.11.7.tar.gz 21286283 RMD160 aa95d10384689d563ebc8eef151faa5d5b2a3c7a SHA1 82a41c3089392ab096a5d373ce8610ff50b004b2 SHA256 820d73bad6dbd8df774e1e234eb27cae9a6e797466e2261c75db51ba38e4001d
-EBUILD hplip-3.11.10-r1.ebuild 7644 RMD160 bd809e741c3a2d9ddc7c9f233d22036d017981e5 SHA1 910829d9607ff9eceae2a79fba8928498635dfaa SHA256 8cdb521901e73cdcf3a8e33e7fa1cb199bedb95bcbb94aeae47e052d99ea3410
+EBUILD hplip-3.11.10-r1.ebuild 7706 RMD160 2849a5b0994b04c43edf10249e97e57d742b4f32 SHA1 bfdb1fb57f3413f590515d6bb21bb75bce980920 SHA256 57d49dec778a16ac9a319b0b6e04a039143a76e6b54ea1fe41edd339e466c786
 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
 EBUILD hplip-3.11.7.ebuild 7591 RMD160 a6a83cd0df0fa9b441a9c9468e0f87c016e4297b SHA1 7e4ddafa51a267ed58f7ab2fbe0a0c92500bebfe SHA256 ba5f5759b5c24543d5f8fb71e7912a766103eb1ce174e6e9a358014db1b49410
-MISC ChangeLog 34617 RMD160 4989e80c412416326c0ad2440b95535026a8327b SHA1 008fbaf2e4d87eec75f361677adfbba5ec5a8cce SHA256 402ec3134a75c52b58d4cb6b5ab2569060799830062011fe26dd8d5b1d7d714a
+MISC ChangeLog 34786 RMD160 c24bfbc525edfff88888b818172d4c483bac75d8 SHA1 2d6685c6a117171660b902e5aca8312ccd3fc3d6 SHA256 8c9d511ec67f10bb4bb0bae4606b0ef501aa2dc766fefc3e7797d8b0d7d01be8
 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk7EDDEACgkQlcuUeyFa0U0ExgCg3gljV1XhlHNIVemfgHEiZaDx
+1QYAoLyYmWAN7IkmGjjnTOzTYWfqvBgL
+=632x
+-----END PGP SIGNATURE-----

diff --git a/net-print/hplip/hplip-3.11.10-r1.ebuild b/net-print/hplip/hplip-3.11.10-r1.ebuild
index 99af6f7c529021f2a0a13909cb28027610db28ef..693200b5aadb199add667dddc917492b467768eb 100644 (file)
--- a/net-print/hplip/hplip-3.11.10-r1.ebuild
+++ b/net-print/hplip/hplip-3.11.10-r1.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.2 2011/11/01 15:13:51 billie Exp $
+# $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 $
 
 EAPI=4
 
@@ -246,6 +246,9 @@ src_install() {
        rm -f "${D}"/usr/share/doc/hplip-3.11.10-r1/{copyright,README_LIBJPG,COPYING} || die
        rmdir "${D}"/usr/share/doc/hplip-3.11.10-r1/ >/dev/null
 
+       # Remove hal fdi files
+       rm -rf "${D}"/usr/share/hal  || die
+
        find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die
 }