Add patch from upstream to 0.9.11

(Portage version: 2.0.54)

4 files changed, 15 insertions, 4 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 078686f9b653..df892e7fd89a 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.31 2006/05/14 21:21:24 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.32 2006/06/03 22:05:50 vanquirius Exp $
+
+*hplip-0.9.11-r1 (03 Jun 2006)
+
+  03 Jun 2006; Marcelo Goes <vanquirius@gentoo.org> -hplip-0.9.11.ebuild,
+  +hplip-0.9.11-r1.ebuild:
+  Add patch from upstream to 0.9.11.
 
 *hplip-0.9.11 (14 May 2006)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 88283969af99..c3d711e3fb26 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,12 +1,12 @@
 MD5 980cb36acc71e128712a4cc0c50c34f7 ChangeLog 5387
 MD5 e4208fa1c1cf5636ca1dc524fdad0ee7 files/digest-hplip-0.9.10-r1 209
-MD5 15a7bccd23b0356c6b40ff417616ee3e files/digest-hplip-0.9.11 146
+MD5 b6b331bf8521c5aae23e53327b411b25 files/digest-hplip-0.9.11-r1 210
 MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r3 208
 MD5 7bd172767b3400cad05526d58630944b files/digest-hplip-0.9.8-r2 762
 MD5 01f28409596071bcd91355ee676d714d files/digest-hplip-0.9.9 145
 MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948
 MD5 4bbbef16c67839b41baa5e5b0a5d7ca3 hplip-0.9.10-r1.ebuild 3313
-MD5 e066b406a6769eb16b35dfee5cd1eeb1 hplip-0.9.11.ebuild 3225
+MD5 c940ca5f79027a37536f8c7e5745f141 hplip-0.9.11-r1.ebuild 3324
 MD5 4755a63c48b335af440eeb06fa4e722b hplip-0.9.7-r3.ebuild 3329
 MD5 4820c6f2d8fd822eb6ae052f2398bcea hplip-0.9.8-r2.ebuild 3318
 MD5 0f488bfce40521153acd4dfd71552546 hplip-0.9.9.ebuild 3230
diff --git a/net-print/hplip/files/digest-hplip-0.9.11 b/net-print/hplip/files/digest-hplip-0.9.11-r1
index 0f05618717d6..50fe59e70dd1 100644
--- a/net-print/hplip/files/digest-hplip-0.9.11
+++ b/net-print/hplip/files/digest-hplip-0.9.11-r1
@@ -1,2 +1,3 @@
 MD5 1bf699ebd394c9822086c1fef2937836 foomatic-db-hpijs-1.5-20060211.tar.gz 97873
+MD5 673b28ad1e607cfb455bc4a919af49f6 hplip-0.9.11-2.patch 10260
 MD5 5cf362c972d5b1733af4fb8e2ade92e4 hplip-0.9.11.tar.gz 9924094
diff --git a/net-print/hplip/hplip-0.9.11.ebuild b/net-print/hplip/hplip-0.9.11-r1.ebuild
index 6c1c69c8c1d0..6851223b7b60 100644
--- a/net-print/hplip/hplip-0.9.11.ebuild
+++ b/net-print/hplip/hplip-0.9.11-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.11.ebuild,v 1.1 2006/05/14 21:21:24 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.11-r1.ebuild,v 1.1 2006/06/03 22:05:50 vanquirius Exp $
 
 inherit eutils
 
@@ -8,6 +8,7 @@ DB_V=1.5-20060211
 DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
 HOMEPAGE="http://hplip.sourceforge.net/"
 SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+	mirror://sourceforge/hplip/${P}-2.patch
 	foomaticdb? ( mirror://gentoo/foomatic-db-hpijs-${DB_V}.tar.gz )"
 	#http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
 
@@ -42,6 +43,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# patch from upstream
+	epatch "${DISTDIR}"/${P}-2.patch
+
 	sed -i -e "s:(uint32_t)0xff000000) >> 24))):(uint32_t)0xff000000) >> 24):" \
 		"${S}"/scan/sane/mfpdtf.h