Fixed bug #194052, thanks to Dmitri Pogosian. Removed fix for bug #161926 which isn't necessary anymore.

Package-Manager: portage-2.1.3.11

4 files changed, 20 insertions, 17 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index d169cea94c45..5426f2c21887 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.75 2007/09/20 08:25:31 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.76 2007/09/29 20:31:08 calchan Exp $
+
+*hplip-2.7.7-r3 (29 Sep 2007)
+
+  29 Sep 2007; Denis Dupeyron <calchan@gentoo.org> -hplip-2.7.7-r2.ebuild,
+  +hplip-2.7.7-r3.ebuild:
+  Fixed bug #194052, thanks to Dmitri Pogosian. Removed fix for bug #161926
+  which isn't necessary anymore.
 
   20 Sep 2007; Denis Dupeyron <calchan@gentoo.org> -hplip-2.7.6.ebuild,
   -hplip-2.7.7.ebuild:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index a7e16879fd55..ce2b727f6105 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -18,14 +18,14 @@ EBUILD hplip-1.7.4a-r1.ebuild 3690 RMD160 2205bf20df3371dfb7e17600300c9b866fe746
 MD5 33e0e690f7dddf3786a73ff1ac6c19bd hplip-1.7.4a-r1.ebuild 3690
 RMD160 2205bf20df3371dfb7e17600300c9b866fe746db hplip-1.7.4a-r1.ebuild 3690
 SHA256 adae960db7d1bc4df717b8a53f9e65fcc6011938a2ed9f1526221856c3cd7c96 hplip-1.7.4a-r1.ebuild 3690
-EBUILD hplip-2.7.7-r2.ebuild 3890 RMD160 f634b7b69c3438b61792a7fc7c30fe3b69fa47fc SHA1 e54dbe76bc53582e346688c21cd9b13aa0c71820 SHA256 71be7fe507c7f6d81bcfb1c4e7331505773a61f4e75fc75c7a22ccc9db7428b9
-MD5 d84c25d5daa2c7e4c7fa8c81016c5ad7 hplip-2.7.7-r2.ebuild 3890
-RMD160 f634b7b69c3438b61792a7fc7c30fe3b69fa47fc hplip-2.7.7-r2.ebuild 3890
-SHA256 71be7fe507c7f6d81bcfb1c4e7331505773a61f4e75fc75c7a22ccc9db7428b9 hplip-2.7.7-r2.ebuild 3890
-MISC ChangeLog 12828 RMD160 ce5fcb50325c2836cd0b963073d75f3c50bcb3bc SHA1 efe836690d1caa67658dbdbe2e83580d04bc9d53 SHA256 68f1b87a68ec302b66a0e4800be02b1d492dd25bc1153e240a3df2a2622f3931
-MD5 e4c6a6388c95300972c32d80b3933325 ChangeLog 12828
-RMD160 ce5fcb50325c2836cd0b963073d75f3c50bcb3bc ChangeLog 12828
-SHA256 68f1b87a68ec302b66a0e4800be02b1d492dd25bc1153e240a3df2a2622f3931 ChangeLog 12828
+EBUILD hplip-2.7.7-r3.ebuild 3640 RMD160 ea6608f71a41f451f5170dfbf5baedd461e242f1 SHA1 f8453d091aab87c7a28c8ca2479cac520209bbdc SHA256 cd31a789f69d2ff5297b8f5e3f2b25483421b37c0d34e94ad79c71d244061772
+MD5 c57089ac7c68f7b2cf3e8c311bd326e7 hplip-2.7.7-r3.ebuild 3640
+RMD160 ea6608f71a41f451f5170dfbf5baedd461e242f1 hplip-2.7.7-r3.ebuild 3640
+SHA256 cd31a789f69d2ff5297b8f5e3f2b25483421b37c0d34e94ad79c71d244061772 hplip-2.7.7-r3.ebuild 3640
+MISC ChangeLog 13070 RMD160 c3599d904b53da5997dd798a4c7351ec79c7d080 SHA1 ca98f894911f19371ce85dc8b69a429307dd8d72 SHA256 77836dd3e30ee8688e732eb7c3904d0fa5b73f54a3e94efba8d17da195e6cbe9
+MD5 c9e5763e21c548d932ea6f8a0adb79f6 ChangeLog 13070
+RMD160 c3599d904b53da5997dd798a4c7351ec79c7d080 ChangeLog 13070
+SHA256 77836dd3e30ee8688e732eb7c3904d0fa5b73f54a3e94efba8d17da195e6cbe9 ChangeLog 13070
 MISC metadata.xml 250 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 SHA1 f91d1e6c01026cba252d042ba254f4a4bc61194a SHA256 ab106df12671f3f541e0416f8c0d5a96b6e725ed7b3b111d27af7a584c4bf164
 MD5 a7f39f5758507140c896dcc24a3e0e2f metadata.xml 250
 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 metadata.xml 250
@@ -36,6 +36,6 @@ SHA256 a6a40ef739f13c2b5baf4d46161d709d65d1770a0bef40d472cd3161562c92ef files/di
 MD5 8cdad3401711a59d614863b839c45335 files/digest-hplip-1.7.4a-r1 521
 RMD160 ac859e445b139c0789441184c5af69e1cb75d679 files/digest-hplip-1.7.4a-r1 521
 SHA256 4d98dfc9fec72da07fc2405364c623aaed10c8476d582920a75639e8499cd135 files/digest-hplip-1.7.4a-r1 521
-MD5 f2a0a963b9b861e21a85682d0c052886 files/digest-hplip-2.7.7-r2 241
-RMD160 65b7854d37748cd9132fe9a021cd75af7324e442 files/digest-hplip-2.7.7-r2 241
-SHA256 c0010a4a83dce3e4d7f01acb21db5cf45068c4060a7bc99f3f37554de50e9fba files/digest-hplip-2.7.7-r2 241
+MD5 f2a0a963b9b861e21a85682d0c052886 files/digest-hplip-2.7.7-r3 241
+RMD160 65b7854d37748cd9132fe9a021cd75af7324e442 files/digest-hplip-2.7.7-r3 241
+SHA256 c0010a4a83dce3e4d7f01acb21db5cf45068c4060a7bc99f3f37554de50e9fba files/digest-hplip-2.7.7-r3 241
diff --git a/net-print/hplip/files/digest-hplip-2.7.7-r2 b/net-print/hplip/files/digest-hplip-2.7.7-r3
index 3dbaf8aeb6e1..3dbaf8aeb6e1 100644
--- a/net-print/hplip/files/digest-hplip-2.7.7-r2
+++ b/net-print/hplip/files/digest-hplip-2.7.7-r3
diff --git a/net-print/hplip/hplip-2.7.7-r2.ebuild b/net-print/hplip/hplip-2.7.7-r3.ebuild
index 434e47f3798f..f7c4465e2a7b 100644
--- a/net-print/hplip/hplip-2.7.7-r2.ebuild
+++ b/net-print/hplip/hplip-2.7.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.7-r2.ebuild,v 1.1 2007/08/22 13:35:39 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.7-r3.ebuild,v 1.1 2007/09/29 20:31:08 calchan Exp $
 
 inherit eutils linux-info
 
@@ -53,7 +53,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	sed -i -e "s:toolbox:toolbox.py:" hplip.desktop.in || die "Patching hplip.desktop.in failed"
 	sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed"
 	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
 		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
@@ -62,9 +61,6 @@ src_unpack() {
 	# bug 98428
 	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Patching hpssd.py failed"
 
-	# bug 161926, until fixed by upstream probably in 2.7.7
-	sed -i -e "s:if (!localOnly):if (1):" scan/sane/hpaio.c  || die "Patching scan/sane/hpaio.c failed"
-
 	# Force recognition of Gentoo distro by hp-check
 	sed -i \
 		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \