Add python fix for bug 98428 and upstream patch for bug 116952

(Portage version: 2.0.53)

4 files changed, 26 insertions, 6 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index a2f4791f09ce..c103b82d1245 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-print/hplip
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.11 2005/12/04 15:17:36 vanquirius Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.12 2006/01/14 18:23:03 vanquirius Exp $
+
+*hplip-0.9.7-r1 (14 Jan 2006)
+
+  14 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -hplip-0.9.7.ebuild,
+  +hplip-0.9.7-r1.ebuild:
+  Add python fix for bug 98428, thanks to Sridhar Dhanapalan <lists dot
+  sridhar at dhanapalan dot com>, William Keaney <keaneyw at gmail dot com>,
+  boris faure <billiob at gmail dot com> and others. Add upstream patch for
+  bug 116952, thanks to Keri Harris <harriskeri at mcs dot vuw dot ac dot nz>.
 
   04 Dec 2005; Marcelo Goes <vanquirius@gentoo.org> hplip-0.9.7.ebuild:
   Use mirrors to host foomatic-db-hpijs tarball. This should fix bug 114033,
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index c23622f2534e..13ad3dbc6169 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -2,10 +2,10 @@ MD5 d93043f3934cf49fdc6355bd8a6cc978 ChangeLog 1537
 MD5 ce4ebffecf6776bf8b594d515f151b0e files/digest-hplip-0.9.3 146
 MD5 6d67b8483b9c21c792fda3ed690cb26a files/digest-hplip-0.9.4 145
 MD5 cbf1b3a3716e0de9faef1b950ad93b9d files/digest-hplip-0.9.5 145
-MD5 8671891d67472ead728696c8c1fdd2fc files/digest-hplip-0.9.7 145
+MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r1 208
 MD5 5243cb60063760c1f71d7d026720421e files/hplip.init.d 898
 MD5 f3a777f2c6eeebb99f32e02b52b65a70 hplip-0.9.3.ebuild 2570
 MD5 39df325ae3f38e64a979900d6c54d24f hplip-0.9.4.ebuild 2575
 MD5 b8797d3c934c32f6ad30b83ac842356b hplip-0.9.5.ebuild 2709
-MD5 c049a318119bb589eda1ec1898d3fa66 hplip-0.9.7.ebuild 2865
+MD5 4a6d169c2acee953af656e0e8352257c hplip-0.9.7-r1.ebuild 3057
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
diff --git a/net-print/hplip/files/digest-hplip-0.9.7 b/net-print/hplip/files/digest-hplip-0.9.7-r1
index c1e0df7a011c..baf9a50595f4 100644
--- a/net-print/hplip/files/digest-hplip-0.9.7
+++ b/net-print/hplip/files/digest-hplip-0.9.7-r1
@@ -1,2 +1,3 @@
 MD5 c6e602ff829b18ea182c8eec445e2a6a foomatic-db-hpijs-1.5-20051126.tar.gz 87836
+MD5 f56b7599ada0b072d6a442ea37378c94 hplip-0.9.7-2.patch 25718
 MD5 d2ee27d7c347f549306a880561c5030a hplip-0.9.7.tar.gz 9705231
diff --git a/net-print/hplip/hplip-0.9.7.ebuild b/net-print/hplip/hplip-0.9.7-r1.ebuild
index ba775cfd46d7..1e8a759ec3e0 100644
--- a/net-print/hplip/hplip-0.9.7.ebuild
+++ b/net-print/hplip/hplip-0.9.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.7.ebuild,v 1.2 2005/12/04 15:17:36 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.7-r1.ebuild,v 1.1 2006/01/14 18:23:03 vanquirius Exp $
 
 inherit eutils
 
@@ -8,6 +8,7 @@ DB_V=1.5-20051126
 DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
 HOMEPAGE="http://hpinkjet.sourceforge.net/"
 SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz
+	mirror://sourceforge/hpinkjet/${P}-2.patch
 	foomaticdb? ( mirror://gentoo/foomatic-db-hpijs-${DB_V}.tar.gz
 	http://dev.gentoo.org/~vanquirius/files/foomatic-db-hpijs-${DB_V}.tar.gz )"
 	#http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
@@ -39,8 +40,17 @@ RDEPEND="virtual/ghostscript
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+
+	# bug 116952
+	epatch "${DISTDIR}"/${P}-2.patch
+
 	sed -i -e "s:(uint32_t)0xff000000) >> 24))):(uint32_t)0xff000000) >> 24):" \
 		"${S}"/scan/sane/mfpdtf.h
+
+	# bug 98428
+	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
+		"${S}"/hpssd.py
 }
 src_compile() {
 	myconf="${myconf} --disable-cups-install --disable-foomatic-install"