version bump thanks to Francisco Lloret <fcolloret@terra.es> in bug 158909

(Portage version: 2.1.2_rc4-r4)
 (Unsigned Manifest commit)

3 files changed, 12 insertions, 142 deletions

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index b79030e96bd0..b20102384cea 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.10.tar.gz 10561620 RMD160 3608757fca36865528565c0c40571d91a936fd3f SHA1 7c877cac132fc8695c693800c7e34322bdc8d858 SHA256 45f4eafd4568a06889bf4b996a3c75ef571a157b921f56b027b567766d8e239f
+DIST hplip-1.6.12.tar.gz 10679971 RMD160 eec181a1edbbb9087118b4f4c9447b042e202814 SHA1 934da62dddfa1c2dbdb38b6b25adf94619e9b55b SHA256 dd7d992c9d79c3ee7b2949a0c68034411e98f16f2a19aecb120f8d03bc5f8b24
 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.10.ebuild 3671 RMD160 5a1f0bec72f71fb5f316152a3f5d216db1a4df89 SHA1 157a8d981f66d780df3c5ba1f038ea7bb2cd2928 SHA256 c69e2998578da0bb535b39ad9a4a77ae5d18a66950b1dfa1f752aba1806e6c3b
-MD5 8c38161ff4d993f8e8725d2a2b7b2c33 hplip-1.6.10.ebuild 3671
-RMD160 5a1f0bec72f71fb5f316152a3f5d216db1a4df89 hplip-1.6.10.ebuild 3671
-SHA256 c69e2998578da0bb535b39ad9a4a77ae5d18a66950b1dfa1f752aba1806e6c3b hplip-1.6.10.ebuild 3671
-MISC ChangeLog 8111 RMD160 69cc7658cb9ae17f60c703ec329191b58d687921 SHA1 1006dfbe19e1589d5d8df40012da90443723d5d6 SHA256 ced800a3311581bd435899e3b8aed58e918ba4d9fd885234d6de6553049fe0de
-MD5 1929b21d195a5ca4366d1738cf46bdfc ChangeLog 8111
-RMD160 69cc7658cb9ae17f60c703ec329191b58d687921 ChangeLog 8111
-SHA256 ced800a3311581bd435899e3b8aed58e918ba4d9fd885234d6de6553049fe0de ChangeLog 8111
+EBUILD hplip-1.6.12.ebuild 3206 RMD160 da78f7e364da3fd8da9568d06dad9c0ed713cb40 SHA1 f0d881832645444b6c0ef3c3bcfc72b4586c8c55 SHA256 59beca135049fefc0fe4ccb3916880483c017313e2392b3ab2627f15dbf32703
+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
 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 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
+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
diff --git a/net-print/hplip/files/digest-hplip-1.6.10 b/net-print/hplip/files/digest-hplip-1.6.10
deleted file mode 100644
index 0ebd3f0dbc26..000000000000
--- a/net-print/hplip/files/digest-hplip-1.6.10
+++ /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 01519018343978776fe4acfbdb7cb6df hplip-1.6.10.tar.gz 10561620
-RMD160 3608757fca36865528565c0c40571d91a936fd3f hplip-1.6.10.tar.gz 10561620
-SHA256 45f4eafd4568a06889bf4b996a3c75ef571a157b921f56b027b567766d8e239f hplip-1.6.10.tar.gz 10561620
diff --git a/net-print/hplip/hplip-1.6.10.ebuild b/net-print/hplip/hplip-1.6.10.ebuild
deleted file mode 100644
index 7cf32ffc318d..000000000000
--- a/net-print/hplip/hplip-1.6.10.ebuild
+++ /dev/null
@@ -1,124 +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.10.ebuild,v 1.3 2006/11/28 21:51:36 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}"
-
-	# 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
-		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
-		rm -f "${D}"/etc/sane.d/dll.conf
-	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
-}
-
-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
-}