Version bump, thanks to Francisco Lloret (bug #203095).

Package-Manager: portage-2.1.4_rc11

4 files changed, 151 insertions, 15 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 449fb40b9606..ba88f64a7b70 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.89 2007/12/22 20:10:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.90 2007/12/23 10:29:11 calchan Exp $
+
+*hplip-2.7.12 (23 Dec 2007)
+
+  23 Dec 2007; Denis Dupeyron <calchan@gentoo.org> +hplip-2.7.12.ebuild:
+  Version bump, thanks to Francisco Lloret (bug #203095).
 
   22 Dec 2007; Markus Meier <maekke@gentoo.org> hplip-2.7.10.ebuild:
   x86 stable, bug #202916
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 13008861d66a..87ea8f26b211 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70-hpmud.rules 763 RMD160 b8326b26658b8e8355ae3d74423b51e2e15001e2 SHA1 fdb6b4937a814db50dc3ac3ca9b9c04cb44a6590 SHA256 6e7f2a0fd5a2111505066a412daea0d29c1ce858f09dbbaa489bb5a2f231e837
 MD5 b129358def166ef5d36f893984c10573 files/70-hpmud.rules 763
 RMD160 b8326b26658b8e8355ae3d74423b51e2e15001e2 files/70-hpmud.rules 763
@@ -20,6 +17,7 @@ SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95 files/hp
 DIST foomatic-db-hpijs-20060720.tar.gz 98252 RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d SHA1 0e4ec08d01cd28bb751bc2e5844f0d0f7b97ba42 SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e
 DIST hplip-1.7.4a.tar.gz 13566965 RMD160 e2777b8b065abe385bfe557b9eed86848029e2c9 SHA1 98fcb0ce13ee7d9f17cc6c61c568528dd9cbf71d SHA256 903957b1b1aa86438d546a205a3d526a600b1e56754a5ba5ce99228a26cc475e
 DIST hplip-2.7.10.tar.gz 14441901 RMD160 1bbfd405eb3d75fa38c0f2fc485438ee064ccce9 SHA1 722e95d0a2b5e4b9535a68c94ed3aef0f3c28ab6 SHA256 e289d5f6190caf4596f6770037569638d96915583339933d6c202f35fc02d8c3
+DIST hplip-2.7.12.tar.gz 14543662 RMD160 6d278ccd3d19df46c6d7fc6bd1b9a6b995749f88 SHA1 4a80e46a633674db53d8063349b8bbb3f9070d49 SHA256 22c1b626c633acac74ab5f7994060304570a81a038f2be5b9e35e44e938a30a0
 DIST hplip-2.7.9.tar.gz 14488632 RMD160 007a4c888bde277e86b1a78628062774a43ff2f7 SHA1 1ac491fd2b49f8a5a658532fd44e2aa0b008e072 SHA256 e8867529434411f6c44ef6224405f92fd6be25f04513946621bf209b2e81baaf
 EBUILD hplip-1.7.4a-r2.ebuild 3794 RMD160 ba8ce008375c98c393b42d17cccf2e8a39ed6558 SHA1 8a67ed262fbc377397733cd35a5d7e3a974bb264 SHA256 26a74439a246db4e7615c90a3a00cd6838ef6e67d4214d255217dd329117bc5e
 MD5 e27607de9f35581472a1b62c4c6e43ee hplip-1.7.4a-r2.ebuild 3794
@@ -29,14 +27,18 @@ EBUILD hplip-2.7.10.ebuild 3960 RMD160 db93d3af88f1074871337bc8afddfe7c3daffe11
 MD5 41a63839bd9f1b10853ce4e067106cde hplip-2.7.10.ebuild 3960
 RMD160 db93d3af88f1074871337bc8afddfe7c3daffe11 hplip-2.7.10.ebuild 3960
 SHA256 81726d3c76e17544c8e7191e681e289bf1b2ec9d0f8214abdccf59121f33e48f hplip-2.7.10.ebuild 3960
+EBUILD hplip-2.7.12.ebuild 3963 RMD160 7ee396f484137fceb8f9c2ab3cf2a54127b791f9 SHA1 4bd50e81488a9b536f4b4900ffc095f56fc9f042 SHA256 652485a6feec8f921770625b5efba9c8c371bf935c1781a1cb5afbc6c4ac3fc8
+MD5 831a44ab31031cdd01cb03f572e6a94f hplip-2.7.12.ebuild 3963
+RMD160 7ee396f484137fceb8f9c2ab3cf2a54127b791f9 hplip-2.7.12.ebuild 3963
+SHA256 652485a6feec8f921770625b5efba9c8c371bf935c1781a1cb5afbc6c4ac3fc8 hplip-2.7.12.ebuild 3963
 EBUILD hplip-2.7.9-r1.ebuild 3886 RMD160 8dff714b43cf635e8bd55818dcb94b7f330c83b0 SHA1 b4873d09e87353cf014bb56f570baf43ac4ccab0 SHA256 b48ef178e13801d1a6d7c1396b9aebef0a25d2572ab73d72ab55c6495652bfa4
 MD5 03ee11ccb49ee9e9ed0be4b24d8c621a hplip-2.7.9-r1.ebuild 3886
 RMD160 8dff714b43cf635e8bd55818dcb94b7f330c83b0 hplip-2.7.9-r1.ebuild 3886
 SHA256 b48ef178e13801d1a6d7c1396b9aebef0a25d2572ab73d72ab55c6495652bfa4 hplip-2.7.9-r1.ebuild 3886
-MISC ChangeLog 15092 RMD160 8603f32c2f825d6cffff90f922195d71a1dafb3c SHA1 16c04846ffdb3535caa997bf66f255ec4b45a90c SHA256 5a120653ce2380b607028eef3e4dbc06801e1453920f4488cfb621932059dcf2
-MD5 7ece0d5f1ef9ae6ee32f5c73dc6a701f ChangeLog 15092
-RMD160 8603f32c2f825d6cffff90f922195d71a1dafb3c ChangeLog 15092
-SHA256 5a120653ce2380b607028eef3e4dbc06801e1453920f4488cfb621932059dcf2 ChangeLog 15092
+MISC ChangeLog 15254 RMD160 4f09500bdcd90c8f723150f0fbc8a1614829aeeb SHA1 b9ed9be5bda6537b63896fe5f803a53bac691cfc SHA256 8cb8fd10435c2677fa606ecab4cf8d0ce020598e40f000e515d2673e151208a3
+MD5 23424b9e0f89e3a9a266d16cce00a9a9 ChangeLog 15254
+RMD160 4f09500bdcd90c8f723150f0fbc8a1614829aeeb ChangeLog 15254
+SHA256 8cb8fd10435c2677fa606ecab4cf8d0ce020598e40f000e515d2673e151208a3 ChangeLog 15254
 MISC metadata.xml 250 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 SHA1 f91d1e6c01026cba252d042ba254f4a4bc61194a SHA256 ab106df12671f3f541e0416f8c0d5a96b6e725ed7b3b111d27af7a584c4bf164
 MD5 a7f39f5758507140c896dcc24a3e0e2f metadata.xml 250
 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 metadata.xml 250
@@ -47,13 +49,9 @@ SHA256 4d98dfc9fec72da07fc2405364c623aaed10c8476d582920a75639e8499cd135 files/di
 MD5 e4edcab0496cb2a685dd21f2c5a3ea30 files/digest-hplip-2.7.10 244
 RMD160 f6106e2a03c8e6b2593f7002cfc64726a223635e files/digest-hplip-2.7.10 244
 SHA256 c4fa739a676eb7d8cf4e54ab52a34d014caf6b16acba1c2277e9a3ab71d7e1c5 files/digest-hplip-2.7.10 244
+MD5 909f378e538cb8b9553fc7408bf76667 files/digest-hplip-2.7.12 244
+RMD160 97ccff9f243b3930ca137cc44ae971c70f5882d7 files/digest-hplip-2.7.12 244
+SHA256 a6b4e59e84f9a1e72082c590c35c42eb3de020f3a5f29d6a46bfbd8b4e0969c3 files/digest-hplip-2.7.12 244
 MD5 f68fb8f4981ef3faecff859da377ddb1 files/digest-hplip-2.7.9-r1 241
 RMD160 1c32e9bb5148d9cafb89f9c096e793197fc76485 files/digest-hplip-2.7.9-r1 241
 SHA256 6854a0c055d17b18ecdf0d14a071a5c01b818a85a2fcc47fef928fb4aa1cb2f7 files/digest-hplip-2.7.9-r1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkdtb4gACgkQkKaRLQcq0GJUNQCggxWy2gX6IMdMu+Pf6tthDbCl
-CBUAn2vkUgx3DsVnIIyN0omfZn2Fd9H5
-=faNJ
------END PGP SIGNATURE-----
diff --git a/net-print/hplip/files/digest-hplip-2.7.12 b/net-print/hplip/files/digest-hplip-2.7.12
new file mode 100644
index 000000000000..f976a9f5ae48
--- /dev/null
+++ b/net-print/hplip/files/digest-hplip-2.7.12
@@ -0,0 +1,3 @@
+MD5 ba00337ccf1b520509518bffbec960db hplip-2.7.12.tar.gz 14543662
+RMD160 6d278ccd3d19df46c6d7fc6bd1b9a6b995749f88 hplip-2.7.12.tar.gz 14543662
+SHA256 22c1b626c633acac74ab5f7994060304570a81a038f2be5b9e35e44e938a30a0 hplip-2.7.12.tar.gz 14543662
diff --git a/net-print/hplip/hplip-2.7.12.ebuild b/net-print/hplip/hplip-2.7.12.ebuild
new file mode 100644
index 000000000000..caa97d8a2beb
--- /dev/null
+++ b/net-print/hplip/hplip-2.7.12.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.12.ebuild,v 1.1 2007/12/23 10:29:11 calchan Exp $
+
+inherit eutils linux-info
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X doc fax minimal parport ppds scanner snmp"
+
+DEPEND="!net-print/hpijs
+	!net-print/hpoj
+	virtual/ghostscript
+	>=media-libs/jpeg-6b
+	net-print/foomatic-filters
+	!minimal? (
+		>=net-print/cups-1.2
+		dev-libs/libusb
+		scanner? ( >=media-gfx/sane-backends-1.0.9 )
+		snmp? (
+			net-analyzer/net-snmp
+			dev-libs/openssl
+		)
+	)"
+
+RDEPEND="${DEPEND}
+	!minimal? (
+		!<sys-fs/udev-114
+		fax? ( dev-python/reportlab )
+		scanner? (
+			dev-python/imaging
+			X? ( >=media-gfx/xsane-0.89 )
+			!X? ( >=media-gfx/sane-frontends-1.0.9 )
+		)
+		X? ( >=dev-python/PyQt-3.14 )
+	)"
+
+CONFIG_CHECK="PARPORT"
+ERROR_PARPORT="Please make sure Device Drivers -> Parallel port support is enabled in your kernel"
+
+pkg_setup() {
+	if ! use ppds ; then
+		ewarn "Not installing built-in PPD files, which is probably not what you want."
+		ewarn "You need USE=ppds if you want to install them."
+	fi
+	if use minimal ; then
+		ewarn "Installing hpijs driver only, make sure you know what you are doing."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+
+	# 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}"
+
+	sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed"
+	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
+		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
+		base/utils.py  || die "Patching base/utils.py failed"
+
+	# bug 98428
+	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Patching hpssd.py failed"
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die "sed core_install.py"
+
+	# Replace udev rules, see bug #197726.
+	rm data/rules/55-hpmud.rules
+	cp "${FILESDIR}"/70-hpmud.rules data/rules
+	sed -i -e "s/55-hpmud.rules/70-hpmud.rules/g" Makefile.* */*.html */*/*.html
+}
+
+src_compile() {
+	econf \
+		--disable-cups11-build \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		$(use_enable minimal hpijs-only-build) \
+		$(use_enable doc doc-build) \
+		$(use_enable snmp network-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable scanner scan-build) \
+		$(use_enable X gui-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable ppds foomatic-ppd-install) \
+		--disable-foomatic-xml-install \
+		|| die "econf failed"
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	# bug 106035
+	use X || rm -Rf "${D}"/usr/share/applications
+
+	use minimal && rm -rf "${D}"/usr/lib
+}
+
+pkg_preinst() {
+	if ! use minimal && 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 >> "${T}"/dll.conf
+		doins "${T}"/dll.conf
+	fi
+}
+
+pkg_postinst() {
+	elog "You should run hp-setup as root if you are installing hplip for the first time, and may also"
+	elog "need to run it if you are upgrading from an earlier version."
+	elog
+	elog "If your device is connected using USB, users will need to be in the lp group to access it."
+	elog
+	elog "This release doesn't use an init script anymore, so you should probably do a"
+	elog "'rc-update del hplip' if you are updating from an old version."
+}