Version bump, bug #196795. Replaced udev rules, bug #197726.

Package-Manager: portage-2.1.3.19

5 files changed, 175 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 8ad5baacc016..c2db3bb19591 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,12 @@
 # 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.86 2007/11/18 16:05:18 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.87 2007/11/19 16:39:16 calchan Exp $
+
+*hplip-2.7.10 (19 Nov 2007)
+
+  19 Nov 2007; Denis Dupeyron <calchan@gentoo.org> +files/70-hpmud.rules,
+  +hplip-2.7.10.ebuild:
+  Version bump, bug #196795. Replaced udev rules, bug #197726.
 
   18 Nov 2007; Denis Dupeyron <calchan@gentoo.org> hplip-2.7.9-r1.ebuild:
   Fixed bug #193671 again.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index c0ca245ae83f..13d2826f9c25 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,3 +1,7 @@
+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
+SHA256 6e7f2a0fd5a2111505066a412daea0d29c1ce858f09dbbaa489bb5a2f231e837 files/70-hpmud.rules 763
 AUX hplip-1.7.4a-subprocess_replacement.patch 1820 RMD160 6f98018b72cae4a89fd66352f3d36a7a5ec41665 SHA1 d0f649842585904f6d49a56eb8739ea0ec2dee50 SHA256 eb40787e7e5fceccacc5bcd07ff6625f3788b74cd5524502c10aab8774fc9eb5
 MD5 2cc63e00e608d68c9b3a46a68a51756d files/hplip-1.7.4a-subprocess_replacement.patch 1820
 RMD160 6f98018b72cae4a89fd66352f3d36a7a5ec41665 files/hplip-1.7.4a-subprocess_replacement.patch 1820
@@ -12,19 +16,24 @@ RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c files/hplip.init.d 948
 SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95 files/hplip.init.d 948
 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.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
 RMD160 ba8ce008375c98c393b42d17cccf2e8a39ed6558 hplip-1.7.4a-r2.ebuild 3794
 SHA256 26a74439a246db4e7615c90a3a00cd6838ef6e67d4214d255217dd329117bc5e hplip-1.7.4a-r2.ebuild 3794
+EBUILD hplip-2.7.10.ebuild 3963 RMD160 b67a836c4a87254ca9f6e8ecd1f95d26f6f4bee9 SHA1 bd1a96a726b60669b1ee1f12287887284983f38f SHA256 798d32a3edcde1ac57d7646e4940e26335474994b84b5c1e3d22e9b65cf53f53
+MD5 9aa2b6e46f907747e5f27ad0d6db7660 hplip-2.7.10.ebuild 3963
+RMD160 b67a836c4a87254ca9f6e8ecd1f95d26f6f4bee9 hplip-2.7.10.ebuild 3963
+SHA256 798d32a3edcde1ac57d7646e4940e26335474994b84b5c1e3d22e9b65cf53f53 hplip-2.7.10.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 14702 RMD160 dcd8209cd57fdaac02425ccc8ead93ad2f79be32 SHA1 c6a8b044e10ac1b99c2ce6898ccaf12d4b77bd60 SHA256 54e7206fba5ab936da233ff8d0fb4fa490262dd3662e16d6dfcf444468bdaf92
-MD5 d8439a9f634a4b978bfdb637a0df288b ChangeLog 14702
-RMD160 dcd8209cd57fdaac02425ccc8ead93ad2f79be32 ChangeLog 14702
-SHA256 54e7206fba5ab936da233ff8d0fb4fa490262dd3662e16d6dfcf444468bdaf92 ChangeLog 14702
+MISC ChangeLog 14893 RMD160 4555bdea1ddd20f3fa608e5c38d5e106bb5e9a79 SHA1 0da473edb2997e2b68516c6f1707258f7a8029d4 SHA256 dd208d4ef98a9ad82f88431420a4315eafbd6a3d158b6530f1fd8f4dda106efc
+MD5 e10619c607d6e8e0a283081978b90fec ChangeLog 14893
+RMD160 4555bdea1ddd20f3fa608e5c38d5e106bb5e9a79 ChangeLog 14893
+SHA256 dd208d4ef98a9ad82f88431420a4315eafbd6a3d158b6530f1fd8f4dda106efc ChangeLog 14893
 MISC metadata.xml 250 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 SHA1 f91d1e6c01026cba252d042ba254f4a4bc61194a SHA256 ab106df12671f3f541e0416f8c0d5a96b6e725ed7b3b111d27af7a584c4bf164
 MD5 a7f39f5758507140c896dcc24a3e0e2f metadata.xml 250
 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 metadata.xml 250
@@ -32,6 +41,9 @@ SHA256 ab106df12671f3f541e0416f8c0d5a96b6e725ed7b3b111d27af7a584c4bf164 metadata
 MD5 8cdad3401711a59d614863b839c45335 files/digest-hplip-1.7.4a-r2 521
 RMD160 ac859e445b139c0789441184c5af69e1cb75d679 files/digest-hplip-1.7.4a-r2 521
 SHA256 4d98dfc9fec72da07fc2405364c623aaed10c8476d582920a75639e8499cd135 files/digest-hplip-1.7.4a-r2 521
+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 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
diff --git a/net-print/hplip/files/70-hpmud.rules b/net-print/hplip/files/70-hpmud.rules
new file mode 100644
index 000000000000..1e6ab666d239
--- /dev/null
+++ b/net-print/hplip/files/70-hpmud.rules
@@ -0,0 +1,19 @@
+# Udev rules file for HP printer products.
+
+ACTION!="add", GOTO="hpmud_rules_end"
+
+SUBSYSTEM!="usb|usb_device", GOTO="hpmud_rules_end"
+SUBSYSTEM=="usb", ENV{DEVTYPE}!="usb_device" ,GOTO="hpmud_rules_end"
+
+# Check for AiO products (0x03f0xx11).
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??11", GROUP="lp"
+# Check for Photosmart products (0x03f0xx02).
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??02", GROUP="lp"
+# Check for Business Inkjet products (0x03f0xx12).
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??12", GROUP="lp"
+# Check for Deskjet products (0x03f0xx04).
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??04", GROUP="lp"
+# Check for LaserJet products (0x03f0xx17).
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", GROUP="lp"
+
+LABEL="hpmud_rules_end"
diff --git a/net-print/hplip/files/digest-hplip-2.7.10 b/net-print/hplip/files/digest-hplip-2.7.10
new file mode 100644
index 000000000000..8d5c01699dde
--- /dev/null
+++ b/net-print/hplip/files/digest-hplip-2.7.10
@@ -0,0 +1,3 @@
+MD5 eafb815ca4b4bb5a2f35a76ee3c2dc72 hplip-2.7.10.tar.gz 14441901
+RMD160 1bbfd405eb3d75fa38c0f2fc485438ee064ccce9 hplip-2.7.10.tar.gz 14441901
+SHA256 e289d5f6190caf4596f6770037569638d96915583339933d6c202f35fc02d8c3 hplip-2.7.10.tar.gz 14441901
diff --git a/net-print/hplip/hplip-2.7.10.ebuild b/net-print/hplip/hplip-2.7.10.ebuild
new file mode 100644
index 000000000000..3cba4c5c69f3
--- /dev/null
+++ b/net-print/hplip/hplip-2.7.10.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.10.ebuild,v 1.1 2007/11/19 16:39:16 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."
+}