Use upstream patch to fix bug #274538.

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

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index eb5525695cc00c38f1cb257180969ed66bcc8b07..7d2e61d53fb16222b1b024ff6bd3dd25957607f2 100644 (file)
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # 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.161 2010/05/19 21:21:00 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.162 2010/05/27 20:25:45 billie Exp $
+
+  27 May 2010; Daniel Pielmeier <billie@gentoo.org>
+  files/hplip-3.10.2-plugin.patch:
+  Use upstream patch to fix bug #274538.
 
   19 May 2010; Daniel Pielmeier <billie@gentoo.org>
   files/hplip-3.10.5-udev-attrs.patch:

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 14adfe4cd79ad965812aca34f84585beec0194a0..76d60605af2f0439bfad93e94b1acb7156525e52 100644 (file)
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,4 +1,4 @@
-AUX hplip-3.10.2-plugin.patch 455 RMD160 6c2fc64d3932551a24cba3b787889ca0ba6c2029 SHA1 5a5ccbc433459b0cb1fd6ca5100b40a54bc6ef23 SHA256 e5209f254ce551680d58e01def12c67220f780f35f57d90507fac7f5e3c28e39
+AUX hplip-3.10.2-plugin.patch 674 RMD160 e8c56ca64708fc8d9cff175023d8fe23091a336b SHA1 4d51325287bcea096da9924a684844e5907a57ad SHA256 2d788eeaac411f6a6084e9e9f1415a8ec9259f3bdbe620e45e662ead552c4af1
 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.10.5-udev-attrs.patch 13716 RMD160 93cfabc5471f56c540f0fafb144ebd3217491802 SHA1 470d632bb2b68e91f96805587e18314d0963fd0c SHA256 7a3958988250d818a35715e3f091e0547599957a9ea34358ee7238b1edddfeb9
@@ -13,5 +13,5 @@ DIST hplip-3.9.12.tar.gz 21371447 RMD160 f1717e8bad043b54497489fa1a2764b3ac54809
 EBUILD hplip-3.10.2-r4.ebuild 7744 RMD160 467fdcd36ec9120954d632b7ae27a799bcdb02dd SHA1 c58988f55ce5d9d0994d59122e9406ad1d461d6e SHA256 dd4930a9d6cb3eb6eec6e49e7f82f19d7f66b6a12a7433b4e8f65e971b729c90
 EBUILD hplip-3.10.5.ebuild 7630 RMD160 7ae5ef2e655209e10d62892875ae619a49b32b9c SHA1 f2f7326ef6b27cb607ec44bdafdb063dcc3e33fd SHA256 129938feb6851ae631d2fb34298862b507f40edf3900dac683bdc1aca36b10eb
 EBUILD hplip-3.9.12-r1.ebuild 8208 RMD160 f79073fe4ab4bf42230e36845cbd8c661b312316 SHA1 d89236a53a19d44d360d00627c9ba5ef92ae3856 SHA256 7f058d034d324ea2cd318f453ccbbe29a0d5224a2813bc7d9dc2b925aa0cc3b3
-MISC ChangeLog 28313 RMD160 040ff6ae130af32e8361d305909ac6e483abb9fa SHA1 8d7cb7ccfd2ed93262fae6fc1a4846d5229c0d74 SHA256 9f98af247270039d8922c441da745cda87ae426cee7eb1153a0c3922d912266e
+MISC ChangeLog 28442 RMD160 d5014d557095bf71100becfcd966af08a1fd8636 SHA1 d6987687d0583065695cc623f0eff8f560b56237 SHA256 84eaf2737bdaac7d396ed9b28522fc40d6fb6bbab0ea4e668fb84977a79fd640
 MISC metadata.xml 1958 RMD160 f7cd369924faba500e66b63fef225a0c114d8ec1 SHA1 b123d54310fa7c8fbb0ef3af1e335942938d84ae SHA256 7aa06125ddd13a5533b3d2b4f9349abb4f0b5bc7eda5b73711d9b6bca764903e

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 c59c5a8d4b4fda9b164cefdf42b4028abf086bef..4f0a5b6a5cc3caf03de81c4d296e3f7b0a4f8a6c 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,17 @@
---- 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 @@
+Index: installer/core_install.py\r
+===================================================================\r
+--- installer/core_install.py  (revision 13658)\r
++++ installer/core_install.py  (working copy)\r
+@@ -1990,7 +1990,11 @@\r
          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
++            if os.system("sh %s --nox11 -- -i" % plugin_file) == 0:\r
++                return True\r
++            else:\r
++                log.error("Python gobject/dbus may be not installed")\r
++                return False\r
  \r
  \r
      def delete_plugin(self):\r