1.6.6 version bump. Fixes bug 136937, reported by Kenton Groombridge <kenton.groombridge at us.army dot mil>.

(Portage version: 2.0.54)

4 files changed, 135 insertions, 47 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 0a9ebe370d2a..59ffd01e0da7 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.34 2006/06/04 13:56:38 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.35 2006/06/16 00:44:34 vanquirius Exp $
+
+*hplip-1.6.6 (16 Jun 2006)
+
+  16 Jun 2006; Marcelo Goes <vanquirius@gentoo.org> +hplip-1.6.6.ebuild:
+  1.6.6 version bump. Fixes bug 136937, reported by Kenton Groombridge
+  <kenton.groombridge at us.army dot mil>.
 
   04 Jun 2006; Stefan Schweizer <genstef@gentoo.org> hplip-0.9.7-r3.ebuild,
   hplip-0.9.8-r2.ebuild, -hplip-0.9.9.ebuild, -hplip-0.9.10-r1.ebuild,
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index be1d59f702fb..811bb2b6f09a 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,51 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX hplip.init.d 948 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c SHA1 bc9c9a8767c5f253cd9c0dd40bb7e4248cd13b0b SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95
+MD5 443ec7777dc02e38c51633cf5b83e88b ChangeLog 5802
+MD5 85fb640ceecd949521bef397e8e23d0b files/digest-hplip-0.9.11-r1 768
+MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r3 208
+MD5 7bd172767b3400cad05526d58630944b files/digest-hplip-0.9.8-r2 762
+MD5 85a2fd344ee4765adfc9ba1a5c548295 files/digest-hplip-1.6.6 146
 MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948
-RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c files/hplip.init.d 948
-SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95 files/hplip.init.d 948
-DIST foomatic-db-hpijs-1.5-20051126.tar.gz 87836
-DIST foomatic-db-hpijs-1.5-20060211.tar.gz 97873 RMD160 267fba7b83525042cd3198aa54f6d1cc22fd97dc SHA256 3c95566ef9c4c149325b09dac235b4dacbc28b6c8602016b3a2c702b4df131db
-DIST hplip-0.9.11-2.patch 10260 RMD160 1ea139b7e90120c528ce60ce360bb3dc327d4a01 SHA1 e1afee2afad72ae36d7fffa154fc70728496fc6f SHA256 1b5da9a28f02d55b7e3669e2d9f6f6b83c4680015df7a5bdec6541da8ce5344c
-DIST hplip-0.9.11.tar.gz 9924094 RMD160 c544b61bcdea20a18e76b5bd1072518f16e74e2b SHA1 23fbaa34667ff187e8a91c75c9bad67ccc2b7d05 SHA256 9c6f39863280d74a72bdce632f2453fa5bbbfffd286b1fd0535cfba76dcf5b42
-DIST hplip-0.9.7-2.patch 25718
-DIST hplip-0.9.7.tar.gz 9705231
-DIST hplip-0.9.8-4.patch 31429 RMD160 ebbc0d557fa00a70f8945e51924a3078ded810df SHA256 e28ed1fa1aaa3b55c10ac36ce4c539cb2fa97b5fde59dc6844b044ff000556b3
-DIST hplip-0.9.8.tar.gz 9298145 RMD160 6f3fb9af7bedd3de375554d71ce77bb6cd6a3f3a SHA256 b573e31499920a787f2d6b3eb1e0de732e48d7ba00cb0e7ecd5d3e860e48662a
-EBUILD hplip-0.9.11-r1.ebuild 3334 RMD160 ec2612727fdb490355ac349239aae9fc22ccde27 SHA1 fc8f8833012a4221a7dc5aa014e4faba250db889 SHA256 57c185c97058b234d3ebe2d709f5167c77be66ca3a535d00cde90a5fe9be7961
 MD5 f5607fe7587656f6248c9bde90bc6822 hplip-0.9.11-r1.ebuild 3334
-RMD160 ec2612727fdb490355ac349239aae9fc22ccde27 hplip-0.9.11-r1.ebuild 3334
-SHA256 57c185c97058b234d3ebe2d709f5167c77be66ca3a535d00cde90a5fe9be7961 hplip-0.9.11-r1.ebuild 3334
-EBUILD hplip-0.9.7-r3.ebuild 3336 RMD160 35247f043e4ab2e7f3f0fa1ca6171ef9c9009f62 SHA1 72419c98df0ac0f46b5cd555c32c9c6cbc945d1c SHA256 3a24d57ec2246856bb25704893267dfd23a6877e00372bc5fd0a0cd0c960ce70
 MD5 59049b57d4e2248499c09e11408c2c38 hplip-0.9.7-r3.ebuild 3336
-RMD160 35247f043e4ab2e7f3f0fa1ca6171ef9c9009f62 hplip-0.9.7-r3.ebuild 3336
-SHA256 3a24d57ec2246856bb25704893267dfd23a6877e00372bc5fd0a0cd0c960ce70 hplip-0.9.7-r3.ebuild 3336
-EBUILD hplip-0.9.8-r2.ebuild 3325 RMD160 67e3923e25d285cd3b95f777cd545f76d9fbdfff SHA1 098cb75f31d5cbdcb469f1bf178f351f649194d1 SHA256 f2b8b888c97e4164208f894130a745c47054f90dd6bf3d04ef7ae55111a30e98
 MD5 12340dda48ab3f17a14149a5c797cf67 hplip-0.9.8-r2.ebuild 3325
-RMD160 67e3923e25d285cd3b95f777cd545f76d9fbdfff hplip-0.9.8-r2.ebuild 3325
-SHA256 f2b8b888c97e4164208f894130a745c47054f90dd6bf3d04ef7ae55111a30e98 hplip-0.9.8-r2.ebuild 3325
-MISC ChangeLog 5802 RMD160 8dfa742257a9928d7a413eef87e4cbfe0d8bb745 SHA1 cdb031a414146f56c53aa3c1bfb2a894f2a0ec02 SHA256 5e64816d3aa54ae3a292dd13daf743b4e61bce7299c3d2f8b402092c29ce8d71
-MD5 443ec7777dc02e38c51633cf5b83e88b ChangeLog 5802
-RMD160 8dfa742257a9928d7a413eef87e4cbfe0d8bb745 ChangeLog 5802
-SHA256 5e64816d3aa54ae3a292dd13daf743b4e61bce7299c3d2f8b402092c29ce8d71 ChangeLog 5802
-MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+MD5 9b60ec8a59eb39737806081374d93171 hplip-1.6.6.ebuild 3235
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
-SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
-MD5 85fb640ceecd949521bef397e8e23d0b files/digest-hplip-0.9.11-r1 768
-RMD160 5be0a15eae5e2d919910baded2a70d1d9696f824 files/digest-hplip-0.9.11-r1 768
-SHA256 c9159b89ae9462b8430efca095dc5291db44a1409e61650c4ea8a8321d997001 files/digest-hplip-0.9.11-r1 768
-MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r3 208
-RMD160 d7b115f1f976ff65f4d1ff39a4116f3b28b52c9a files/digest-hplip-0.9.7-r3 208
-SHA256 aef6c585a691ad40bab1d0822f328f0b272e11cc05803ddc3d7ce4c436fd229c files/digest-hplip-0.9.7-r3 208
-MD5 7bd172767b3400cad05526d58630944b files/digest-hplip-0.9.8-r2 762
-RMD160 c64b7394f53159c066f614b52759f07b24f0a2eb files/digest-hplip-0.9.8-r2 762
-SHA256 079f5ac90d4d00f03099796a7f307aebff27f22c546cb44b696cdf33dfb1625b files/digest-hplip-0.9.8-r2 762
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEguacNJowsmZ/PzARAr+zAJ9FXkebGDXAXd4knkT3ZYa4Vz+QsgCg0FzA
-oUsAd0fMsEfMLFEcIYZIIAA=
-=1x4y
------END PGP SIGNATURE-----
diff --git a/net-print/hplip/files/digest-hplip-1.6.6 b/net-print/hplip/files/digest-hplip-1.6.6
new file mode 100644
index 000000000000..1a434ce097e8
--- /dev/null
+++ b/net-print/hplip/files/digest-hplip-1.6.6
@@ -0,0 +1,2 @@
+MD5 1bf699ebd394c9822086c1fef2937836 foomatic-db-hpijs-1.5-20060211.tar.gz 97873
+MD5 292fbcc25b79d273d7280760ce797666 hplip-1.6.6.tar.gz 10429794
diff --git a/net-print/hplip/hplip-1.6.6.ebuild b/net-print/hplip/hplip-1.6.6.ebuild
new file mode 100644
index 000000000000..d1aa7abceca6
--- /dev/null
+++ b/net-print/hplip/hplip-1.6.6.ebuild
@@ -0,0 +1,120 @@
+# 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.6.ebuild,v 1.1 2006/06/16 00:44:34 vanquirius Exp $
+
+inherit eutils
+
+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
+	foomaticdb? ( mirror://gentoo/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 qt ppds scanner cups"
+
+DEPEND="dev-lang/python
+	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
+	!net-print/hpijs
+	!net-print/hpoj"
+
+RDEPEND="virtual/ghostscript
+	>=dev-lang/python-2.2.0
+	scanner? (
+		>=media-gfx/sane-backends-1.0.9
+		|| (
+			X? ( >=media-gfx/xsane-0.89 )
+			>=media-gfx/sane-frontends-1.0.9
+		)
+	)
+	qt? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
+	>=dev-libs/libusb-0.1.10a
+	sys-apps/hotplug
+	net-print/cups
+	foomaticdb? ( net-print/foomatic-db-engine )
+	>=net-print/foomatic-filters-3.0.2
+	${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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"
+
+	use snmp || myconf="${myconf} --disable-network-build"
+
+	econf ${myconf} || die "Error: econf failed!"
+	emake || die "Error: emake failed!"
+}
+
+
+src_install() {
+	make DESTDIR="${D}" install
+
+	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 qt ; 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/hplip/data/hplip.desktop
+		rm -f "${D}"/usr/share/applications/hplip.desktop
+	fi
+
+	if use ppds; then
+		dodir /usr/share
+		mv "${S}"/prnt/hpijs/ppd/* "${D}"/usr/share/ppd
+	fi
+
+	if use cups && use ppds ; then
+		dodir /usr/share/cups/model
+		dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
+	fi
+
+	[ -e /usr/bin/foomatic-rip ] && rm -f "${D}"/usr/bin/foomatic-rip
+
+	if use foomaticdb ; then
+		cd ../foomatic-db-hpijs-${DB_V}
+		econf || die "econf failed"
+		rm -fR data-generators/hpijs-rss
+		make || die
+		make DESTDIR="${D}" install || die
+	fi
+
+	# desktop entry, bug 122758
+	if use qt; then
+		dodir /usr/share/applications
+		mv "${D}"/usr/share/hplip/data/hplip.desktop \
+		"${D}"/usr/share/applications
+	fi
+}