Add 0.9.8-3 patch from upstream, update foomatic-db-hpijs version.

Package-Manager: portage-2.0.54

5 files changed, 19 insertions, 9 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index dc22aa69e7e5..fa67841ed0b0 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.20 2006/02/06 00:00:31 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.21 2006/02/11 19:03:17 vanquirius Exp $
+
+*hplip-0.9.8-r1 (11 Feb 2006)
+
+  11 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> -hplip-0.9.8.ebuild,
+  +hplip-0.9.8-r1.ebuild:
+  Add 0.9.8-3 patch from upstream, update foomatic-db-hpijs version.
 
 *hplip-0.9.8 (06 Feb 2006)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index a9177865e7ff..6907d1f559c5 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,7 +1,7 @@
-MD5 789f1424876489dca3364a0846764e64 ChangeLog 3337
+MD5 6305562adad8c56ec7b82bcd74387aeb ChangeLog 3537
 MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r3 208
-MD5 49325176fb17fcfc7d0721fc7e840227 files/digest-hplip-0.9.8 145
+MD5 3268e75b85067eb8c5dc3d0e35a830c2 files/digest-hplip-0.9.8-r1 208
 MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948
 MD5 60c7db1370063ff3ea1af7a85f2bbb9b hplip-0.9.7-r3.ebuild 3182
-MD5 f3ab449270eb981a0ab6d74ee1af595d hplip-0.9.8.ebuild 3088
+MD5 683bf4c4ea7e60f7ddca10e5ea1cb249 hplip-0.9.8-r1.ebuild 3170
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
diff --git a/net-print/hplip/files/digest-hplip-0.9.8 b/net-print/hplip/files/digest-hplip-0.9.8
deleted file mode 100644
index 00653d133409..000000000000
--- a/net-print/hplip/files/digest-hplip-0.9.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c6e602ff829b18ea182c8eec445e2a6a foomatic-db-hpijs-1.5-20051126.tar.gz 87836
-MD5 3eae08ec7dbecdc03e7972b132dfdde6 hplip-0.9.8.tar.gz 9298145
diff --git a/net-print/hplip/files/digest-hplip-0.9.8-r1 b/net-print/hplip/files/digest-hplip-0.9.8-r1
new file mode 100644
index 000000000000..cdf0b8e46b93
--- /dev/null
+++ b/net-print/hplip/files/digest-hplip-0.9.8-r1
@@ -0,0 +1,3 @@
+MD5 1bf699ebd394c9822086c1fef2937836 foomatic-db-hpijs-1.5-20060211.tar.gz 97873
+MD5 7c155f8ff42feb671a2d47650f541330 hplip-0.9.8-3.patch 29875
+MD5 3eae08ec7dbecdc03e7972b132dfdde6 hplip-0.9.8.tar.gz 9298145
diff --git a/net-print/hplip/hplip-0.9.8.ebuild b/net-print/hplip/hplip-0.9.8-r1.ebuild
index f8ef3bceeff7..3c30fbc72010 100644
--- a/net-print/hplip/hplip-0.9.8.ebuild
+++ b/net-print/hplip/hplip-0.9.8-r1.ebuild
@@ -1,14 +1,15 @@
 # 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.8.ebuild,v 1.1 2006/02/06 00:00:31 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.8-r1.ebuild,v 1.1 2006/02/11 19:03:17 vanquirius Exp $
 
 inherit eutils
 
-DB_V=1.5-20051126
+DB_V=1.5-20060211
 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
-	foomaticdb? ( mirror://gentoo/foomatic-db-hpijs-${DB_V}.tar.gz )"
+	foomaticdb? ( mirror://gentoo/foomatic-db-hpijs-${DB_V}.tar.gz )
+	mirror://sourceforge/hpinkjet/${P}-3.patch"
 	#http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
 
 LICENSE="GPL-2"
@@ -41,6 +42,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${DISTDIR}"/${P}-3.patch
+
 	sed -i -e "s:(uint32_t)0xff000000) >> 24))):(uint32_t)0xff000000) >> 24):" \
 		"${S}"/scan/sane/mfpdtf.h