Version bump.

Package-Manager: portage-2.1.10.41/cvs/Linux i686

4 files changed, 35 insertions, 12 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/Manifest b/net-print/hplip/Manifest
index 70fb8a9e1756..b16ce75570a7 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -6,20 +6,22 @@ AUX hplip-3.11.1-desktop.patch 506 RMD160 eb55a4cbe136fc2105eb6cad21d5fdd69a8539
 AUX hplip-3.11.1-htmldir.patch 4470 RMD160 ab8369b02b3590a19dec6277e03d3e79768ab803 SHA1 b70b07654d9997d4085e32b5a2419a1913c0f611 SHA256 30185a66b033dfdf0db59e600b19454c7680f3fa09ea8c24adf0fff19c15585e
 AUX hplip-3.11.1-udev-attrs.patch 13946 RMD160 3634385078375936692251464ad9d31f76bc1c63 SHA1 abf1f2cfc709c9a46c18b4bff5f08420e50e2ae9 SHA256 a7ce9b86783c94f3c3c5e111364ef7874bbfda4af89137b1e7d158961d084d33
 AUX hplip-3.11.10-udev-attrs.patch 13895 RMD160 e350d51abbf93f20c1829bdeaf01d300b7030bc5 SHA1 e67a3053f12ac84ca496ddfe75d2864a3a257017 SHA256 83a7b126877f49fbfb28e5d9df26607e1f165a74a865030023c081c60e7256cd
+AUX hplip-3.11.12-udev-rules.patch 951 RMD160 29947b36f48b2bce89baf44c215ee044ea916711 SHA1 ef9d4b84520d3ddfdb4f300acc125f86fc47fe0f SHA256 9e461b7f6a264434317fcc83bb53c313f5f9c467bdec8c572b49684f6ddfcfa7
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
 AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490114 SHA1 01ce069ab67277aab9205ea59537ec55362ef1aa SHA256 3050221f497c14ae3a7a093043018d55f4deb2b2ebd81840a8285cec4eb7759d
 AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95dc SHA1 11d85332f0200f14bb4492c1528cebb2af72d6f0 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719
 DIST hplip-3.11.10.tar.gz 21419965 RMD160 d5e7bd065f1fea5f536b4bf47c8962374de95591 SHA1 716dea09c1570356b359e5b6d4a50f8b2654d760 SHA256 1d84fd0e8cf27771b11efa05692e8764fdd758b544df60f23f0c274afea9af81
+DIST hplip-3.11.12.tar.gz 21530771 RMD160 e192446613e13d55bedfd331afd9b08d51071da0 SHA1 4990a7e416b5c75a9cf31604d20e5a0ff2f2f2dd SHA256 dcf05d1261f091a1dba1316a1f4e9034147fecbb1fff3e68179a599eb5ee4a9d
 DIST hplip-3.11.5.tar.gz 21227642 RMD160 8a87f201aac95253d0ac1765e21aa094f11389f8 SHA1 e3604752b7a1ab0f492a1b4d470f8fa75e8959e5 SHA256 611f677fc1a0d2d493d44bfe84e5e5aaac4124627e94885f57bc77db9178536c
-EBUILD hplip-3.11.10-r2.ebuild 7696 RMD160 5b713133f95a813d6fab3945ff7b61001e4c64ca SHA1 c278420c5424e5bb2882505f97b0e90572bae3ef SHA256 7856a5e50eca2c368f4bc1434efe3831172ce6c2d1504e665bfe8c39c0638a6c
 EBUILD hplip-3.11.10.ebuild 7517 RMD160 2f9c8086c7176c8ef826dcecb3ebca74266cdb2d SHA1 af9d666b98dd15a1db1e0c867201590b9ced191d SHA256 124b817b401ea6bd3140eefa2afe14b8e2dd0f438ec529e2734de06e7eb4318e
+EBUILD hplip-3.11.12.ebuild 7632 RMD160 72af7114767f523ea4b053609fb379d3eb8d2e9f SHA1 6dc51d265dcf6d39b6132e85787745f2c7fa23ce SHA256 7e99ff52311f951fb9655db6db008f1f3cc39e28613e5d83677637224cc084d3
 EBUILD hplip-3.11.5.ebuild 7517 RMD160 4ae37df100c2990de5b4da29684eee5ef677a5f5 SHA1 dc9f869e81014b7778e4c6aadcbaf82dc6434a5e SHA256 b3eaf951652f14975d7ba12fc16e1bd9198db86aee40e0c78624f25df658ce34
-MISC ChangeLog 35206 RMD160 108ab854ee241f30717d1a8deb11112a4cb4ca76 SHA1 6127e0a6a9c14699e135c47b51f7b28141b99d1e SHA256 3d357d7d86cc873f609c6a5aa3e906bc028926d93326de4218d5c552af007466
+MISC ChangeLog 35395 RMD160 d4c386e7d157b4ef6b2a4b5c1fe3b3ee81f82c16 SHA1 cd074f833df6fa5099250645f956ca0813177692 SHA256 ea9a0dd25503e98950067f975ef9f1f208c6848c8d8c4ffde793748f904f8989
 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk7hScoACgkQlcuUeyFa0U2bCQCg62xQi6R+VAw8y0KmRJPvp4TH
-MckAn3QzMHtnSFqlq6sPg8miCuhh+qWA
-=dHk4
+iEYEAREIAAYFAk7txhkACgkQlcuUeyFa0U1EFgCfXFc9PQRb5ZtwbIEhOk4QWqqj
+HewAoOJE4Uv5taXu7QHetHPrBD1LgrPS
+=582e
 -----END PGP SIGNATURE-----
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