version bump thanks to Francisco Lloret <fcolloret@terra.es> and Eric Thibodeau <kyron@neuralbs.com> in bug 143551

Package-Manager: portage-2.1.1_pre5-r1

4 files changed, 143 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 8dbc07ef20d9..7645ef1afcea 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.40 2006/08/05 18:22:23 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.41 2006/08/16 20:06:55 genstef Exp $
+
+*hplip-1.6.7 (16 Aug 2006)
+
+  16 Aug 2006; Stefan Schweizer <genstef@gentoo.org> +hplip-1.6.7.ebuild:
+  version bump thanks to Francisco Lloret <fcolloret@terra.es> and Eric
+  Thibodeau <kyron@neuralbs.com> in bug 143551
 
   05 Aug 2006; Stefan Schweizer <genstef@gentoo.org> hplip-0.9.7-r3.ebuild,
   hplip-1.6.6a.ebuild:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 3fabcd84e7f1..421632d99d4b 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -7,6 +7,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.6a.tar.gz 10447071 RMD160 546d4f86c715f760aebff57ba59f08ef4bd20e36 SHA1 899b2c9ac61e2ee5d00432ff1a5142180f73c9a3 SHA256 e87ab9bc4e4a3229dafc154f91d9860a9ae15532118bfad7fb791331340a9d8d
+DIST hplip-1.6.7.tar.gz 9984016 RMD160 962e3162792d37c544a7e1e189bdc405a2082c1b SHA1 1f69ccb080cdaaea856d2bfb94eaf511e87ad6fb SHA256 27b3703a0d6470e03e1574b481d6d05d652c787a793854f2f0e06d06c998a601
 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 +16,14 @@ EBUILD hplip-1.6.6a.ebuild 3306 RMD160 c4fae13019160a1effa1da2efd2fc95c701cf4e7
 MD5 803fdb84162bef2d5d61d29048673da0 hplip-1.6.6a.ebuild 3306
 RMD160 c4fae13019160a1effa1da2efd2fc95c701cf4e7 hplip-1.6.6a.ebuild 3306
 SHA256 62f100899d0c28282796a067b8a0b70e911f20c2041e60938d40f2f413a62f39 hplip-1.6.6a.ebuild 3306
-MISC ChangeLog 6975 RMD160 395b5f9b9f59f81e5a37a81d7b3b48dde6b2e81a SHA1 e13968bbdb0eea238349faf2d9653b71274838e5 SHA256 45fb84bb8771341815cdaa4ff4af415743740b958f61dda3f38c924c43f14ac1
-MD5 6f4e2b1b644c9787db7c6b0f568ef22a ChangeLog 6975
-RMD160 395b5f9b9f59f81e5a37a81d7b3b48dde6b2e81a ChangeLog 6975
-SHA256 45fb84bb8771341815cdaa4ff4af415743740b958f61dda3f38c924c43f14ac1 ChangeLog 6975
+EBUILD hplip-1.6.7.ebuild 3305 RMD160 f0efde79c219c2622ae08e476cf2c4acd993867d SHA1 6b25939d0fe4670dbff141d3573341d8e87c07c6 SHA256 d52334efbd207a688ad96446844dc1ce1500d7df316ff51b52cf8b4d9d2952f0
+MD5 963eadf4d737b86fccad7de8eeee463e hplip-1.6.7.ebuild 3305
+RMD160 f0efde79c219c2622ae08e476cf2c4acd993867d hplip-1.6.7.ebuild 3305
+SHA256 d52334efbd207a688ad96446844dc1ce1500d7df316ff51b52cf8b4d9d2952f0 hplip-1.6.7.ebuild 3305
+MISC ChangeLog 7197 RMD160 82b46526ffe806c82f027bb741478b18cef8ecb0 SHA1 5fc779a9057dbb93f46c018f3e1c82b03c996031 SHA256 18dd657f18d5c77fa2123d1afc422923df7b3231a874bda21478ec810fb4fcb3
+MD5 473de2ef81728318784f0bdc3de399ff ChangeLog 7197
+RMD160 82b46526ffe806c82f027bb741478b18cef8ecb0 ChangeLog 7197
+SHA256 18dd657f18d5c77fa2123d1afc422923df7b3231a874bda21478ec810fb4fcb3 ChangeLog 7197
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -29,3 +34,6 @@ SHA256 e04252a3484d93417d9e32f27158e97819517e2b0f7408abf49247a7f78b5387 files/di
 MD5 533b6b1b6094d5272c8d4f3d16697b8c files/digest-hplip-1.6.6a 521
 RMD160 118c28df89cf9dc1f1f3f36cdca2f75cfeea809e files/digest-hplip-1.6.6a 521
 SHA256 07a6fcb782f75945214c2ef72bdac193a21a273c36c129dc606477859e0fa2b4 files/digest-hplip-1.6.6a 521
+MD5 f0a864744ea6df612df78bfa9979df22 files/digest-hplip-1.6.7 515
+RMD160 3d9772f94886ad01a9f1896dee0b71464b9e3efa files/digest-hplip-1.6.7 515
+SHA256 bb1989cc71bd9d2d56ad759327954d13f2a313ddea32cfaf62a3c83b365f65b4 files/digest-hplip-1.6.7 515
diff --git a/net-print/hplip/files/digest-hplip-1.6.7 b/net-print/hplip/files/digest-hplip-1.6.7
new file mode 100644
index 000000000000..de55400e6352
--- /dev/null
+++ b/net-print/hplip/files/digest-hplip-1.6.7
@@ -0,0 +1,6 @@
+MD5 1c4b65222333d048450d37082d521b1e foomatic-db-hpijs-20060720.tar.gz 98252
+RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d foomatic-db-hpijs-20060720.tar.gz 98252
+SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e foomatic-db-hpijs-20060720.tar.gz 98252
+MD5 b1e814c7f5ef2a5033e4c3e5162ac694 hplip-1.6.7.tar.gz 9984016
+RMD160 962e3162792d37c544a7e1e189bdc405a2082c1b hplip-1.6.7.tar.gz 9984016
+SHA256 27b3703a0d6470e03e1574b481d6d05d652c787a793854f2f0e06d06c998a601 hplip-1.6.7.tar.gz 9984016
diff --git a/net-print/hplip/hplip-1.6.7.ebuild b/net-print/hplip/hplip-1.6.7.ebuild
new file mode 100644
index 000000000000..f0e01dab0b73
--- /dev/null
+++ b/net-print/hplip/hplip-1.6.7.ebuild
@@ -0,0 +1,118 @@
+# 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-1.6.7.ebuild,v 1.1 2006/08/16 20:06:55 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"
+
+RDEPEND="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
+	${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}"
+
+	# 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
+		insinto /etc/sane.d
+		echo "hpaio" > dll.conf
+		doins dll.conf
+
+		dodir /usr/lib/sane
+		dosym /usr/lib/libsane-hpaio.la /usr/lib/sane/libsane-hpaio.la
+		dosym /usr/lib/libsane-hpaio.so /usr/lib/sane/libsane-hpaio.so
+		dosym /usr/lib/libsane-hpaio.so.1 /usr/lib/sane/libsane-hpaio.so.1
+		dosym /usr/lib/libsane-hpaio.so.1.0.0 /usr/lib/sane/libsane-hpaio.so.1.0.0
+	else
+		rm -f "${D}"/usr/lib/libsane-hpaio.la
+		rm -f "${D}"/usr/lib/libsane-hpaio.so
+		rm -f "${D}"/usr/lib/libsane-hpaio.so.1
+		rm -f "${D}"/usr/lib/libsane-hpaio.so.1.0.0
+	fi
+
+	# bug 106035
+	if ! use qt3 ; then
+		rm -f "${D}"/usr/bin/hp-print
+		rm -f "${D}"/usr/bin/hp-toolbox
+		rm -f "${D}"/usr/share/hplip/print
+		rm -f "${D}"/usr/share/hplip/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
+}