Another try to fix plugin installation. This should fix bug #274538 and #316777.

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

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index f3dd38a69c8d53bccf6791d56fb6868bc69ed876..beaf29af18b6c43d565a07f960aacf0d136fcb9e 100644 (file)
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.156 2010/04/17 17:41:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.157 2010/05/04 17:52:11 billie Exp $
+
+  04 May 2010; Daniel Pielmeier <billie@gentoo.org>
+  files/hplip-3.10.2-plugin.patch:
+  Another try to fix plugin installation. This should fix bug #274538 and
+  #316777.
 
   17 Apr 2010; Raúl Porcel <armin76@gentoo.org> hplip-3.9.12-r1.ebuild,
   hplip-3.10.2-r4.ebuild:

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 6ce7a7a12e51cbaeda2a2f6f1619a7fb6afd563c..73fa4ea5ea6707feb011e55b09e80c38e315b243 100644 (file)
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,4 +1,4 @@
-AUX hplip-3.10.2-plugin.patch 358 RMD160 a76e1bee114cc26a9af0d031414aed7f7c453712 SHA1 957a10944194c52fbd1346e201bbad9f06bd97bf SHA256 5f85766990d74a1c26685abfe95b46dc87d7ebc52c9b595f994a81af89284494
+AUX hplip-3.10.2-plugin.patch 455 RMD160 6c2fc64d3932551a24cba3b787889ca0ba6c2029 SHA1 5a5ccbc433459b0cb1fd6ca5100b40a54bc6ef23 SHA256 e5209f254ce551680d58e01def12c67220f780f35f57d90507fac7f5e3c28e39
 AUX hplip-3.10.2-systray-segfault.patch 469 RMD160 df64dea9bcec386a6fe4263377e8f85daa06898f SHA1 3d3d88e1f7b7a2af194e3c33164ce41e6f1f6f05 SHA256 a92efb69afa908875775a501d7b723e3e0d315c81fa52cea25f32b994046598f
 AUX hplip-3.10.2-udev-attrs.patch 13229 RMD160 66993f5103689e136e2d13d28d95f6e4fb1617d3 SHA1 917aa0e1f1569d8235a1b6aed91cad2ff2974f00 SHA256 89ab7c0816b9cd49dd4dd64f2d335e71c1370d96fc2a3c77dadd4702b168934a
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
@@ -10,5 +10,5 @@ DIST hplip-3.10.2.tar.gz 21446275 RMD160 4483bd497bbc272812c31db574b75f6e5c03b39
 DIST hplip-3.9.12.tar.gz 21371447 RMD160 f1717e8bad043b54497489fa1a2764b3ac548094 SHA1 d4d659ae52f01055bfc7060e0d4e3c7354c1dee3 SHA256 1c53febe3101b3718d43c9176c08826a1a46c49a79c9f6445cd16981fbf2a12a
 EBUILD hplip-3.10.2-r4.ebuild 7797 RMD160 44748606b145de88f883403fb8dc7004e3fbf76a SHA1 3078ed2211be99560edcd22f04c5a97f58d169be SHA256 60f15dfae2686ebfce97359a9783418670bb86cf743999adaf24d8306c9182eb
 EBUILD hplip-3.9.12-r1.ebuild 8261 RMD160 d4d3bf3cdfaf8347eeced27cb8acec51b45e668c SHA1 8db52697d26052ce1c7fcef8145c45963fdd1b79 SHA256 b55b69c3962ea6dca8e10550a6c194608ffd1cd3c0fc897bfc530ab025ae190d
-MISC ChangeLog 27517 RMD160 e0b0c2b78e837347cf74f28f8d9413c77dc34768 SHA1 a2cc4edf5b50b051908cbc67048e8be9a1a72307 SHA256 7a45b7e0dc9c5f406dd3a0702cc4434356b53ccf29599adf3316170a8e274484
+MISC ChangeLog 27689 RMD160 7ce7bc379f17490ecd45486ec3b0d9c2dba456a8 SHA1 cf14c6380dc732fe338a35a3aadd10f3b940b548 SHA256 6d8f31c1e2a3e13b9c5641c89dcffe1365bcaef88edd983c84995b822002f60a
 MISC metadata.xml 2075 RMD160 990099b37e4dfcda8764e1ca54a954884e468984 SHA1 f8b0d04ef72322da10f862b4c91c0229f4083b81 SHA256 23d9e48a37f65d90b4c35307ae6989cad4720de180e76b3966bc0a832ad8260a

diff --git a/net-print/hplip/files/hplip-3.10.2-plugin.patch b/net-print/hplip/files/hplip-3.10.2-plugin.patch
index 9958cde5dcf5a7bdfb0c23c53e238b85a08b854b..c59c5a8d4b4fda9b164cefdf42b4028abf086bef 100644 (file)
--- a/net-print/hplip/files/hplip-3.10.2-plugin.patch
+++ b/net-print/hplip/files/hplip-3.10.2-plugin.patch
@@ -1,11 +1,11 @@
---- setup.py.old       2010-03-20 17:38:16.061877304 +0100
-+++ setup.py   2010-03-20 17:40:27.328531289 +0100
-@@ -370,7 +370,7 @@
- 
-             if hp_plugin:
-                 if prop.gui_build:
--                    os.system("hp-plugin -i")
-+                    os.system("hp-plugin --required")
-                 else:
-                     os.system("hp-plugin")
- 
+--- installer/core_install.py.old      2010-02-25 00:07:12.000000000 +0100
++++ installer/core_install.py  2010-05-04 19:25:42.268075063 +0200
+@@ -1990,7 +1990,7 @@
+         if mode == GUI_MODE:\r
+             return os.system("sh %s --nox11 -- -u" % plugin_file) == 0\r
+         else:\r
+-            return os.system("sh %s --nox11 -- -i" % plugin_file) == 0\r
++            return os.system("sh %s --nox11" % plugin_file) == 0\r
+ \r
+ \r
+     def delete_plugin(self):\r