Version bump, thanks to Francisco Lloret <fcolloret@terra.es> in bug 163738

Package-Manager: portage-2.1.2-r9

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index d35114dfa2d1b93254e5e5ee71d026c6dba4a66b..1f585791bc6cc53e8c655a1b80ed31db3b3fdf3f 100644 (file)
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2007/01/07 10:00:03 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.48 2007/02/19 22:49:58 genstef Exp $
+
+*hplip-1.7.1 (19 Feb 2007)
+
+  19 Feb 2007; <genstef@gentoo.org> +files/hplip-1.7.1-1.patch,
+  +hplip-1.7.1.ebuild:
+  Version bump, thanks to Francisco Lloret <fcolloret@terra.es> in bug 163738
 
 *hplip-1.6.12 (07 Jan 2007)
 

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index b20102384cea97fd7c4954cbb688d0679891ae06..2f02b0233a7b33bd2e2722f8bd1364966456432a 100644 (file)
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,3 +1,7 @@
+AUX hplip-1.7.1-1.patch 457 RMD160 83d5eb414adb7c33ec4edac8bed41a2c7049cc96 SHA1 39a2eed44cfdd7317be45dc07f14e6083b7e4977 SHA256 4801178b9c0a236d899363cf5df2d070c76b1770d8299c7e6cc3434154d123f7
+MD5 9e800cb75303808426b9bf148bc15e55 files/hplip-1.7.1-1.patch 457
+RMD160 83d5eb414adb7c33ec4edac8bed41a2c7049cc96 files/hplip-1.7.1-1.patch 457
+SHA256 4801178b9c0a236d899363cf5df2d070c76b1770d8299c7e6cc3434154d123f7 files/hplip-1.7.1-1.patch 457
 AUX hplip.init.d 948 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c SHA1 bc9c9a8767c5f253cd9c0dd40bb7e4248cd13b0b SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95
 MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948
 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c files/hplip.init.d 948
@@ -7,6 +11,7 @@ DIST foomatic-db-hpijs-20060720.tar.gz 98252 RMD160 0c2c09f3cea6fc2a8e5da216bd99
 DIST hplip-0.9.7-2.patch 25718 RMD160 1b29ff9ffe77dd95f6202302e5c26fd18593af24 SHA1 825a134734cee1fc9a06c8de60cfe1825d47fa54 SHA256 7d406c7d77aa4825d4401c3d5c52b6564d49854fc8cf34ba84ce291b5429eb4c
 DIST hplip-0.9.7.tar.gz 9705231 RMD160 5c742564fa42a99fddf0f46ea177a28c22fe7cf6 SHA1 b354a6cf8f5b81f9242c3978c2ab22c752e4f77d SHA256 1aaa494d4297c598dfd85632d55e0942995b44011b580166e5c30df82a749ff6
 DIST hplip-1.6.12.tar.gz 10679971 RMD160 eec181a1edbbb9087118b4f4c9447b042e202814 SHA1 934da62dddfa1c2dbdb38b6b25adf94619e9b55b SHA256 dd7d992c9d79c3ee7b2949a0c68034411e98f16f2a19aecb120f8d03bc5f8b24
+DIST hplip-1.7.1.tar.gz 10874573 RMD160 a6fb08542256408c29fc08974442c89308a7a0a7 SHA1 738f2fbf60d0b6d91e0f813f4a825b464844f166 SHA256 155bddb595466a8008665fb1bbef6ab2a84addfc0cb3e60fa63592dc4525eac8
 EBUILD hplip-0.9.7-r3.ebuild 3346 RMD160 7042a54389c67ac9e36dbae12f5982efbdccf46c SHA1 ab473af0d48815e1d42116cd2c0030b6bf43661a SHA256 eab9867749f733fcc0ddce4480b4029f1158fc21d15561a6cb758288763ed1d5
 MD5 fb6b1a96f35c7cbdda733461183b38a3 hplip-0.9.7-r3.ebuild 3346
 RMD160 7042a54389c67ac9e36dbae12f5982efbdccf46c hplip-0.9.7-r3.ebuild 3346
@@ -15,10 +20,14 @@ EBUILD hplip-1.6.12.ebuild 3206 RMD160 da78f7e364da3fd8da9568d06dad9c0ed713cb40
 MD5 2785394a0cc45f621ff02b35c9d94999 hplip-1.6.12.ebuild 3206
 RMD160 da78f7e364da3fd8da9568d06dad9c0ed713cb40 hplip-1.6.12.ebuild 3206
 SHA256 59beca135049fefc0fe4ccb3916880483c017313e2392b3ab2627f15dbf32703 hplip-1.6.12.ebuild 3206
-MISC ChangeLog 8300 RMD160 a14846b352175eaf3a3a68d351bb469fd821f330 SHA1 9eb1eb2d8875b1838d0d5dcfbf7f14dca7f48c50 SHA256 a604877f6bac199a6edf91a06083b2654fa3d0154e366a78754af3c7278e09d3
-MD5 0b3500de2bfd35ce20c78f32852b1c4f ChangeLog 8300
-RMD160 a14846b352175eaf3a3a68d351bb469fd821f330 ChangeLog 8300
-SHA256 a604877f6bac199a6edf91a06083b2654fa3d0154e366a78754af3c7278e09d3 ChangeLog 8300
+EBUILD hplip-1.7.1.ebuild 3245 RMD160 e11ab4e33130d54888879fecd91751ad840b8ea4 SHA1 03694a370da3a1937f9aa807e2ac9acbb874fdaf SHA256 ad6bd1c10352360a6f86911af70a0cc0d56341a670bf740d13c735325685d271
+MD5 3ad93886963bc1bd98ff22081fdeae43 hplip-1.7.1.ebuild 3245
+RMD160 e11ab4e33130d54888879fecd91751ad840b8ea4 hplip-1.7.1.ebuild 3245
+SHA256 ad6bd1c10352360a6f86911af70a0cc0d56341a670bf740d13c735325685d271 hplip-1.7.1.ebuild 3245
+MISC ChangeLog 8494 RMD160 8518028c8c7fe75bea62297e65516b8ec23785df SHA1 4372e9006ea20711abd7fc2b43733746d6493117 SHA256 7cd5d03a9f114fc158fa3d880edb6ce3fed23085e87cf5ffbaa4cf73a57699a7
+MD5 2ab1e6069a146646560914f922f36a11 ChangeLog 8494
+RMD160 8518028c8c7fe75bea62297e65516b8ec23785df ChangeLog 8494
+SHA256 7cd5d03a9f114fc158fa3d880edb6ce3fed23085e87cf5ffbaa4cf73a57699a7 ChangeLog 8494
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -29,3 +38,6 @@ SHA256 e04252a3484d93417d9e32f27158e97819517e2b0f7408abf49247a7f78b5387 files/di
 MD5 92a093b361728d0faafb11cbc041a406 files/digest-hplip-1.6.12 444
 RMD160 cb3f8399ee283d7e2e7625dbac51146eaff659f8 files/digest-hplip-1.6.12 444
 SHA256 ac7a6173be1afe2adec33b5f1e62f323496f418167155b1a41a40ca6018bee8d files/digest-hplip-1.6.12 444
+MD5 5988013f1847ade951d944734af2da02 files/digest-hplip-1.7.1 441
+RMD160 4c1ab7653265da406cf480ea1b625131d2630e2c files/digest-hplip-1.7.1 441
+SHA256 5ce1bcfc264c89e713749af270e882d642e0c1307adcac8ad42479560c86e676 files/digest-hplip-1.7.1 441

diff --git a/net-print/hplip/files/digest-hplip-1.7.1 b/net-print/hplip/files/digest-hplip-1.7.1
new file mode 100644 (file)
index 0000000..51029e2
--- /dev/null
+++ b/net-print/hplip/files/digest-hplip-1.7.1
@@ -0,0 +1,5 @@
+RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d foomatic-db-hpijs-20060720.tar.gz 98252
+SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e foomatic-db-hpijs-20060720.tar.gz 98252
+MD5 1732a8544413ba8557c8b71929d848fa hplip-1.7.1.tar.gz 10874573
+RMD160 a6fb08542256408c29fc08974442c89308a7a0a7 hplip-1.7.1.tar.gz 10874573
+SHA256 155bddb595466a8008665fb1bbef6ab2a84addfc0cb3e60fa63592dc4525eac8 hplip-1.7.1.tar.gz 10874573

diff --git a/net-print/hplip/files/hplip-1.7.1-1.patch b/net-print/hplip/files/hplip-1.7.1-1.patch
new file mode 100644 (file)
index 0000000..f5c4f61
--- /dev/null
+++ b/net-print/hplip/files/hplip-1.7.1-1.patch
@@ -0,0 +1,12 @@
+diff -uNr hplip-1.7.1_old/prnt/hpijs/dj3320.cpp hplip-1.7.1_new/prnt/hpijs/dj3320.cpp
+--- hplip-1.7.1_old/prnt/hpijs/dj3320.cpp      2007-01-24 15:42:03.000000000 -0800
++++ hplip-1.7.1_new/prnt/hpijs/dj3320.cpp      2007-01-31 13:33:42.000000000 -0800
+@@ -3066,7 +3066,7 @@
+     }
+ 
+     // Send Sync packet
+-    err = pPrinterXBow->Send (pbySync, (DWORD) sizeof (pbySync));
++    err = pPrinterXBow->Send (pbySync, SYNCSIZE);
+     if(err)
+     {
+         return err;

diff --git a/net-print/hplip/hplip-1.7.1.ebuild b/net-print/hplip/hplip-1.7.1.ebuild
new file mode 100644 (file)
index 0000000..47ccdbb
--- /dev/null
+++ b/net-print/hplip/hplip-1.7.1.ebuild
@@ -0,0 +1,117 @@
+# 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-1.7.1.ebuild,v 1.1 2007/02/19 22:49:58 genstef Exp $
+
+inherit eutils
+
+DB_V=20060720
+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
+       foomaticdb? (
+               http://gentooexperimental.org/~genstef/dist/foomatic-db-hpijs-${DB_V}.tar.gz
+               http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
+       )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="foomaticdb snmp X qt3 ppds scanner"
+
+DEPEND=">=dev-lang/python-2.2.0
+       snmp? ( >=net-analyzer/net-snmp-5.0.9 )
+       !net-print/hpijs
+       !net-print/hpoj
+       virtual/ghostscript
+       scanner? (
+               >=media-gfx/sane-backends-1.0.9
+               || (
+                       X? ( >=media-gfx/xsane-0.89 )
+                       >=media-gfx/sane-frontends-1.0.9
+               )
+       )
+       qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
+       >=dev-libs/libusb-0.1.10a
+       sys-apps/hotplug-base
+       net-print/cups
+       foomaticdb? ( net-print/foomatic-db-engine )
+       >=net-print/foomatic-filters-3.0.2"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+       # avoid collisions with cups-1.2 compat symlinks
+       if [ -e ${ROOT}/usr/lib/cups/backend/hp ] && [ -e ${ROOT}/usr/libexec/cups/backend/hp ]; then
+               rm -f ${ROOT}/usr/libexec/cups/backend/hp{,fax};
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch ${FILESDIR}/hplip-1.7.1-1.patch
+
+       # bug 98428
+       sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
+               hpssd.py
+}
+src_compile() {
+       econf \
+               $(use_enable snmp network-build) \
+               $(use_enable cups cups-install) \
+               $(use_enable ppds foomatic-install) \
+               || die "econf failed"
+       emake || die "emake failed"
+
+       if use foomaticdb ; then
+               cd ../foomatic-db-hpijs-${DB_V}
+               econf || die "econf failed"
+               rm -fR data-generators/hpijs-rss
+               emake || die "emake failed"
+       fi
+}
+
+
+src_install() {
+       # cups-1.2 installation paths, make sure that the .desktop is installed
+       sed -i -e "s:/usr/lib/cups:$(cups-config --serverbin):" \
+               -e 's:\(ICON_FILE = \).*:\1hplip.desktop:' \
+               -e 's:\(ICON_PATH = \).*:\1/usr/share/applications:' \
+               Makefile
+
+       emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+       newinitd "${FILESDIR}"/hplip.init.d hplip
+
+       if use scanner; then
+               dodir /usr/$(get_libdir)/sane
+               for i in libsane-hpaio.{la,so{,.1{,.0.0}}}; do
+                       dosym /usr/$(get_libdir)/${i} /usr/$(get_libdir)/sane/${i}; done
+       else
+               rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.{la,so{,.1{,.0.0}}}
+               rm -f "${D}"/etc/sane.d/dll.conf
+       fi
+
+       # bug 106035
+       if ! use qt3 ; then
+               rm -f "${D}"/usr/{bin/hp-,share/hplip/}{print,toolbox}
+               rm -f "${D}"/usr/share/applications/hplip.desktop
+               rm -f "${D}"/usr/lib/menu/hplip
+       fi
+
+       rm -rf ${D}/$(cups-config --serverbin)/filter ${D}/usr/bin/foomatic-rip
+
+       if use foomaticdb ; then
+               cd ../foomatic-db-hpijs-${DB_V}
+               emake DESTDIR="${D}" install || die "emake install failed"
+       fi
+}
+
+pkg_preinst() {
+       if use scanner; then
+               insinto /etc/sane.d
+               [ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf .
+               [ -e ${ROOT}/etc/sane.d/dll.conf ] && cp ${ROOT}/etc/sane.d/dll.conf .
+               grep -q hpaio dll.conf || echo hpaio >> dll.conf
+               doins dll.conf
+       fi
+}