1.6.6-r1 version bump - use 1.6.6a tarball from upstream. Also, cleaning up old ebuilds.

Package-Manager: portage-2.1-r1

4 files changed, 138 insertions, 1 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 16a94952f990..ecaf5b0d1149 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,13 @@
 # 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.37 2006/06/24 04:40:36 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.38 2006/07/01 05:25:39 vanquirius Exp $
+
+*hplip-1.6.6-r1 (01 Jul 2006)
+
+  01 Jul 2006; Marcelo Goes <vanquirius@gentoo.org> -hplip-0.9.8-r2.ebuild,
+  -hplip-0.9.11-r1.ebuild, +hplip-1.6.6-r1.ebuild:
+  1.6.6-r1 version bump - use 1.6.6a tarball from upstream. Also, cleaning up
+  old ebuilds.
 
   24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> hplip-0.9.7-r3.ebuild,
   hplip-0.9.8-r2.ebuild, hplip-0.9.11-r1.ebuild, hplip-1.6.6.ebuild:
diff --git a/net-print/hplip/files/digest-hplip-0.9.7-r3 b/net-print/hplip/files/digest-hplip-0.9.7-r3
index baf9a50595f4..cb18db13cfcf 100644
--- a/net-print/hplip/files/digest-hplip-0.9.7-r3
+++ b/net-print/hplip/files/digest-hplip-0.9.7-r3
@@ -1,3 +1,9 @@
 MD5 c6e602ff829b18ea182c8eec445e2a6a foomatic-db-hpijs-1.5-20051126.tar.gz 87836
+RMD160 c7073520c3f19d90d19cabf91562e6f97789f5a7 foomatic-db-hpijs-1.5-20051126.tar.gz 87836
+SHA256 250933116f2517346df609256a7af67d5363c45ac8043eb00f4f2a7aff8bbe2f foomatic-db-hpijs-1.5-20051126.tar.gz 87836
 MD5 f56b7599ada0b072d6a442ea37378c94 hplip-0.9.7-2.patch 25718
+RMD160 1b29ff9ffe77dd95f6202302e5c26fd18593af24 hplip-0.9.7-2.patch 25718
+SHA256 7d406c7d77aa4825d4401c3d5c52b6564d49854fc8cf34ba84ce291b5429eb4c hplip-0.9.7-2.patch 25718
 MD5 d2ee27d7c347f549306a880561c5030a hplip-0.9.7.tar.gz 9705231
+RMD160 5c742564fa42a99fddf0f46ea177a28c22fe7cf6 hplip-0.9.7.tar.gz 9705231
+SHA256 1aaa494d4297c598dfd85632d55e0942995b44011b580166e5c30df82a749ff6 hplip-0.9.7.tar.gz 9705231
diff --git a/net-print/hplip/files/digest-hplip-1.6.6-r1 b/net-print/hplip/files/digest-hplip-1.6.6-r1
new file mode 100644
index 000000000000..e9b1e36b0dc0
--- /dev/null
+++ b/net-print/hplip/files/digest-hplip-1.6.6-r1
@@ -0,0 +1,6 @@
+MD5 5aa44a363ceea0adad2c8fa5db4aa41f foomatic-db-hpijs-20060615.tar.gz 98297
+RMD160 d73b78424259953e1c01dbc11115e93c2dd3c4b9 foomatic-db-hpijs-20060615.tar.gz 98297
+SHA256 e21455a8e2f976118e6cabef633b23fedaa367abe9c1c610008cb3343a10bc6d foomatic-db-hpijs-20060615.tar.gz 98297
+MD5 606704fc8b2fe344e49190b592b438e0 hplip-1.6.6a.tar.gz 10447071
+RMD160 546d4f86c715f760aebff57ba59f08ef4bd20e36 hplip-1.6.6a.tar.gz 10447071
+SHA256 e87ab9bc4e4a3229dafc154f91d9860a9ae15532118bfad7fb791331340a9d8d hplip-1.6.6a.tar.gz 10447071
diff --git a/net-print/hplip/hplip-1.6.6-r1.ebuild b/net-print/hplip/hplip-1.6.6-r1.ebuild
new file mode 100644
index 000000000000..df271eff1f06
--- /dev/null
+++ b/net-print/hplip/hplip-1.6.6-r1.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.6-r1.ebuild,v 1.1 2006/07/01 05:25:39 vanquirius Exp $
+
+inherit eutils
+
+DB_V=20060615
+MY_P="${P}a"
+S="${WORKDIR}/${MY_P}"
+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}a.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
+	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
+}