Version bump.

(Portage version: 2.1.10.41/cvs/Linux i686)

3 files changed, 28 insertions, 7 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 3329173e16f7..809795c20961 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.204 2011/12/08 23:35:32 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.205 2011/12/18 10:52:55 billie Exp $
+
+*hplip-3.11.12 (18 Dec 2011)
+
+  18 Dec 2011; Daniel Pielmeier <billie@gentoo.org> -hplip-3.11.10-r2.ebuild,
+  +hplip-3.11.12.ebuild, +files/hplip-3.11.12-udev-rules.patch:
+  Version bump.
 
 *hplip-3.11.10-r2 (08 Dec 2011)
 
diff --git a/net-print/hplip/files/hplip-3.11.12-udev-rules.patch b/net-print/hplip/files/hplip-3.11.12-udev-rules.patch
new file mode 100644
index 000000000000..912b49905705
--- /dev/null
+++ b/net-print/hplip/files/hplip-3.11.12-udev-rules.patch
@@ -0,0 +1,15 @@
+diff -Naur hplip-3.11.12-old/data/rules/56-hpmud_support.rules hplip-3.11.12/data/rules/56-hpmud_support.rules
+--- hplip-3.11.12-old/data/rules/56-hpmud_support.rules	2011-12-16 22:32:05.047473799 +0100
++++ hplip-3.11.12/data/rules/56-hpmud_support.rules	2011-12-16 22:33:45.759355234 +0100
+@@ -7,9 +7,9 @@
+ LABEL="pid_test"
+ 
+ # Check for LaserJet products (0x03f0xx17).
+-ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attrs{product}", ENV{hp_test}="yes"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'"
+ # Check for LaserJet products (0x03f0xx2a).
+-ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$attrs{product}", ENV{hp_test}="yes"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'"
+ ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'"
+ 
+ LABEL="hpmud_rules_end"
diff --git a/net-print/hplip/hplip-3.11.10-r2.ebuild b/net-print/hplip/hplip-3.11.12.ebuild
index bfd854ee3a5b..6aca87169601 100644
--- a/net-print/hplip/hplip-3.11.10-r2.ebuild
+++ b/net-print/hplip/hplip-3.11.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.10-r2.ebuild,v 1.1 2011/12/08 23:35:32 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.12.ebuild,v 1.1 2011/12/18 10:52:55 billie Exp $
 
 EAPI=4
 
@@ -126,9 +126,9 @@ src_prepare() {
 	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/335662
 	epatch "${FILESDIR}"/${PN}-3.9.12-systray.patch
 
-	# SYSFS deprecated but kept upstream for compatibility reasons
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/346390
-	epatch "${FILESDIR}"/${PN}-3.11.10-udev-attrs.patch
+	# Let 56-hpmud_support.rules call hp-mkuri to make it work with newer udev
+	# Upstream bug: None
+	epatch "${FILESDIR}"/${P}-udev-rules.patch
 
 	# CVE-2010-4267 SNMP Response Processing Buffer Overflow Vulnerability
 	# http://secunia.com/advisories/42956/
@@ -243,8 +243,8 @@ src_install() {
 	# Gentoo Bug: #201023
 	rm -f "${D}"/etc/sane.d/dll.conf || die
 
-	rm -f "${D}"/usr/share/doc/hplip-3.11.10-r1/{copyright,README_LIBJPG,COPYING} || die
-	rmdir "${D}"/usr/share/doc/hplip-3.11.10-r1/ >/dev/null
+	rm -f "${D}"/usr/share/doc/${P}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir "${D}"/usr/share/doc/${P}/ >/dev/null
 
 	# Remove hal fdi files
 	rm -rf "${D}"/usr/share/hal  || die