version bump thanks to Francisco Lloret <fcolloret@terra.es> in bug 152139 and fix san dll.conf thanks to rob miller <rob@janerob.com> in bug 150801

(Portage version: 2.1.2_pre3-r5)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 136 deletions

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 3ecdb6cbfaf2..e29b123522d4 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -6,19 +6,19 @@ DIST foomatic-db-hpijs-1.5-20051126.tar.gz 87836 RMD160 c7073520c3f19d90d19cabf9
 DIST foomatic-db-hpijs-20060720.tar.gz 98252 RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d SHA1 0e4ec08d01cd28bb751bc2e5844f0d0f7b97ba42 SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e
 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.9.tar.gz 10018087 RMD160 d3f8344459830dd9bcced54a1f9e37cd957bb72d SHA1 7c50a59493f592bd53fb92e94c6ced9e98bc2c1d SHA256 03d1a8058dcb595882326010ea57915550ddf6489a34fd204b0ca6efbfcf5018
+DIST hplip-1.6.10.tar.gz 10561620 RMD160 3608757fca36865528565c0c40571d91a936fd3f SHA1 7c877cac132fc8695c693800c7e34322bdc8d858 SHA256 45f4eafd4568a06889bf4b996a3c75ef571a157b921f56b027b567766d8e239f
 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
 SHA256 eab9867749f733fcc0ddce4480b4029f1158fc21d15561a6cb758288763ed1d5 hplip-0.9.7-r3.ebuild 3346
-EBUILD hplip-1.6.9.ebuild 3435 RMD160 3c949bca389e83832832ff02c723ada5fcebd6e5 SHA1 123fa25281f9f727180dd39f705ba6ddfd75e021 SHA256 c1ed747f1df6d761f80b988e3eedcaded4d87e547f2ca654b056effb1298ec2a
-MD5 da8dc30879a5c802f0b4ed58fd5c5cf0 hplip-1.6.9.ebuild 3435
-RMD160 3c949bca389e83832832ff02c723ada5fcebd6e5 hplip-1.6.9.ebuild 3435
-SHA256 c1ed747f1df6d761f80b988e3eedcaded4d87e547f2ca654b056effb1298ec2a hplip-1.6.9.ebuild 3435
-MISC ChangeLog 7612 RMD160 9deb5a682a64a18a250b4741316f62e463d75d54 SHA1 e5726d901258d4032e6072269cdcf71c0ad5e6d3 SHA256 40d1f17f20e718835bf3f145727cf894ed91258d88e6d68b357b40eabb615232
-MD5 bacbfb8a6fcf9e68924c16a6442b963a ChangeLog 7612
-RMD160 9deb5a682a64a18a250b4741316f62e463d75d54 ChangeLog 7612
-SHA256 40d1f17f20e718835bf3f145727cf894ed91258d88e6d68b357b40eabb615232 ChangeLog 7612
+EBUILD hplip-1.6.10.ebuild 3634 RMD160 8ca5a403ad4cef9bdc76353e4e5d803d99276ba9 SHA1 356acd9c4be7b204c913ae966d77b7c92f790493 SHA256 80b4cfcb7e79f073dd51a48c7519eb07c42551f48cc43b131ef4ca6faa5aebd8
+MD5 293ea71daef5204906265ebed24791f6 hplip-1.6.10.ebuild 3634
+RMD160 8ca5a403ad4cef9bdc76353e4e5d803d99276ba9 hplip-1.6.10.ebuild 3634
+SHA256 80b4cfcb7e79f073dd51a48c7519eb07c42551f48cc43b131ef4ca6faa5aebd8 hplip-1.6.10.ebuild 3634
+MISC ChangeLog 7893 RMD160 5f96551f44686f1b37298bafddf76a3d98285205 SHA1 f08927eebf02f39ac726fd3c28202f4508e246a1 SHA256 4f44482d51ed2c5838b126f7c5a05df110affb49e3a2047eac95fc1de704a0ca
+MD5 4a91d4abcee35cdefb87099fc7723f12 ChangeLog 7893
+RMD160 5f96551f44686f1b37298bafddf76a3d98285205 ChangeLog 7893
+SHA256 4f44482d51ed2c5838b126f7c5a05df110affb49e3a2047eac95fc1de704a0ca ChangeLog 7893
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -26,6 +26,6 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata
 MD5 759a2fc253c81dea17ec09d6a7b77f2b files/digest-hplip-0.9.7-r3 762
 RMD160 3d451b250dadfc497f90b1551603db053c24b988 files/digest-hplip-0.9.7-r3 762
 SHA256 e04252a3484d93417d9e32f27158e97819517e2b0f7408abf49247a7f78b5387 files/digest-hplip-0.9.7-r3 762
-MD5 71d3b53688ece125c03af40aaf6f8b11 files/digest-hplip-1.6.9 518
-RMD160 a114c346577b3f55c878ea68e4c28acb36cd86de files/digest-hplip-1.6.9 518
-SHA256 e90c9672c274c0f0e6d36f2d3466233fe672dfef5843c87801caca5880a7c726 files/digest-hplip-1.6.9 518
+MD5 2bbef9d8400c26b5a2bc15636d0db05b files/digest-hplip-1.6.10 521
+RMD160 fdbb47f4de10565f30fc32fcaa11d63def826a41 files/digest-hplip-1.6.10 521
+SHA256 a6a40ef739f13c2b5baf4d46161d709d65d1770a0bef40d472cd3161562c92ef files/digest-hplip-1.6.10 521
diff --git a/net-print/hplip/files/digest-hplip-1.6.9 b/net-print/hplip/files/digest-hplip-1.6.9
deleted file mode 100644
index fb6a376f5b52..000000000000
--- a/net-print/hplip/files/digest-hplip-1.6.9
+++ /dev/null
@@ -1,6 +0,0 @@
-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 38d57f58b48b5b0729d1de507776e7d1 hplip-1.6.9.tar.gz 10018087
-RMD160 d3f8344459830dd9bcced54a1f9e37cd957bb72d hplip-1.6.9.tar.gz 10018087
-SHA256 03d1a8058dcb595882326010ea57915550ddf6489a34fd204b0ca6efbfcf5018 hplip-1.6.9.tar.gz 10018087
diff --git a/net-print/hplip/hplip-1.6.9.ebuild b/net-print/hplip/hplip-1.6.9.ebuild
deleted file mode 100644
index 54bf5b846d97..000000000000
--- a/net-print/hplip/hplip-1.6.9.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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.9.ebuild,v 1.2 2006/09/23 07:55:40 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/$(get_libdir)/sane
-		dosym /usr/$(get_libdir)/libsane-hpaio.la /usr/$(get_libdir)/sane/libsane-hpaio.la
-		dosym /usr/$(get_libdir)/libsane-hpaio.so /usr/$(get_libdir)/sane/libsane-hpaio.so
-		dosym /usr/$(get_libdir)/libsane-hpaio.so.1 /usr/$(get_libdir)/sane/libsane-hpaio.so.1
-		dosym /usr/$(get_libdir)/libsane-hpaio.so.1.0.0 /usr/$(get_libdir)/sane/libsane-hpaio.so.1.0.0
-	else
-		rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.la
-		rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.so
-		rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.so.1
-		rm -f "${D}"/usr/$(get_libdir)/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
-}