From 94e37e1ece171dbfc0d136bb2909028cda4f2c96 Mon Sep 17 00:00:00 2001
From: Daniel Pielmeier <billie@gentoo.org>
Date: Mon, 25 Jul 2011 18:17:55 +0000
Subject: Version bump. Remove old.

Package-Manager: portage-2.1.10.3/cvs/Linux i686
---
 net-print/hplip/ChangeLog                          |   8 +-
 net-print/hplip/Manifest                           |  12 +-
 .../hplip/files/hplip-3.11.7-udev-attrs.patch      | 207 ++++++++++++++++
 net-print/hplip/hplip-3.11.5-r1.ebuild             | 264 ---------------------
 net-print/hplip/hplip-3.11.7.ebuild                | 264 +++++++++++++++++++++
 5 files changed, 485 insertions(+), 270 deletions(-)
 create mode 100644 net-print/hplip/files/hplip-3.11.7-udev-attrs.patch
 delete mode 100644 net-print/hplip/hplip-3.11.5-r1.ebuild
 create mode 100644 net-print/hplip/hplip-3.11.7.ebuild

(limited to 'net-print/hplip')

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 5a62eccab327..d903d390c2fc 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.192 2011/07/24 10:42:56 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.193 2011/07/25 18:17:55 billie Exp $
+
+*hplip-3.11.7 (25 Jul 2011)
+
+  25 Jul 2011; Daniel Pielmeier <billie@gentoo.org> -hplip-3.11.5-r1.ebuild,
+  +hplip-3.11.7.ebuild, +files/hplip-3.11.7-udev-attrs.patch:
+  Version bump. Remove old.
 
   24 Jul 2011; Daniel Pielmeier <billie@gentoo.org>
   -files/hplip-3.9.10-desktop.patch, -files/hplip-3.9.10-htmldir.patch,
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 00891b43d835..572fa7fa9571 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -6,18 +6,20 @@ 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.5-cups-1.5.patch 402 RMD160 eb51bd4534a13e905ff7cad95254754622e9e324 SHA1 c518e8e11b26757e822b4c2789a93e578405026c SHA256 e9fcc617da154cf962a728cdcc5bf5d517a2175d01f93679489060c20d99f595
+AUX hplip-3.11.7-udev-attrs.patch 13942 RMD160 3445d39400c08d7d969e2bb1280700eba81e45f3 SHA1 bd8d3e8691a1237e28e558b5f8cd4fe33eb457dd SHA256 6f8ded48f2385fd0df23157b914169cced908a15ee19df39c46a02da02b25a42
 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.5.tar.gz 21227642 RMD160 8a87f201aac95253d0ac1765e21aa094f11389f8 SHA1 e3604752b7a1ab0f492a1b4d470f8fa75e8959e5 SHA256 611f677fc1a0d2d493d44bfe84e5e5aaac4124627e94885f57bc77db9178536c
-EBUILD hplip-3.11.5-r1.ebuild 7656 RMD160 d4b0aed75c9bd5c3103a8233f1f7a93a90e27d77 SHA1 7bc4bdd4a634e6eadc628851eef02b89ffa5a421 SHA256 3d8320a9d4bb57216ee50cdb409b557eb44853c3d71a6fe3d72de17275d2c0fa
+DIST hplip-3.11.7.tar.gz 21286283 RMD160 aa95d10384689d563ebc8eef151faa5d5b2a3c7a SHA1 82a41c3089392ab096a5d373ce8610ff50b004b2 SHA256 820d73bad6dbd8df774e1e234eb27cae9a6e797466e2261c75db51ba38e4001d
 EBUILD hplip-3.11.5.ebuild 7575 RMD160 1b17cb60012f0dbbbaac6cb948b603de7ebca866 SHA1 6e21c89bf4a3988a4d231186e651bdf01173aaa3 SHA256 6f8a901ad60cc628713140fd51fc96261ad6192270f7ae7215412237077570d2
-MISC ChangeLog 33198 RMD160 7896773e196019dfacc9072d00aee79d7554090b SHA1 1297ccee3fed1a7234430be37993778b5943d23a SHA256 732a727ea2766df8c2a39d27439cf1e87855de46e91620985d1565297f667834
+EBUILD hplip-3.11.7.ebuild 7645 RMD160 4dc7178106b44dd6fab657d8edf27247852ddceb SHA1 34120cb7d48f69b58f0a61281502b241fcbe29ac SHA256 664eda71d107de71e22b44f736d64f272952cb7df723e1a31966528694c80aa9
+MISC ChangeLog 33395 RMD160 f3332d19ec81a2a746bb635483dc7f061ec90fcf SHA1 8f1e47095f0395c72eaf2a4f7cb367eab890b85d SHA256 161c3f74e3d8a58af94f522dc5528de4ca77f94496199e23e7d3f0a90b70d5b4
 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk4r91QACgkQlcuUeyFa0U0SaACg/SCjPTF1cA6FMSan+KmHDvEG
-Z9wAnR4+q9d6h43eLtbc3g9k8xtqS4jy
-=wXFT
+iEYEAREIAAYFAk4ts3AACgkQlcuUeyFa0U36jwCgoVUpaUCeu+D6JtI5MJ1qCVX5
+JaMAoJfV8AsrnK2/80F0f+Q2H0+aIoMu
+=g8gw
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/files/hplip-3.11.7-udev-attrs.patch b/net-print/hplip/files/hplip-3.11.7-udev-attrs.patch
new file mode 100644
index 000000000000..4a601fe3aaeb
--- /dev/null
+++ b/net-print/hplip/files/hplip-3.11.7-udev-attrs.patch
@@ -0,0 +1,207 @@
+diff -Naur hplip-3.11.7-old/data/rules/55-hpmud.rules hplip-3.11.7/data/rules/55-hpmud.rules
+--- hplip-3.11.7-old/data/rules/55-hpmud.rules	2011-07-25 18:48:19.353947668 +0200
++++ hplip-3.11.7/data/rules/55-hpmud.rules	2011-07-25 18:50:12.870611434 +0200
+@@ -21,128 +21,128 @@
+ LABEL="hplip_pid_test"
+ 
+ # Check for AiO products (0x03f0xx11).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660"
+ 
+ # Check for Photosmart products without wildcard since cameras and scanners also used (0x03f0xx02). 
+ # The xx02 pid has been retired so this explicit list should not change.
+ # photosmart_d2300_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_100
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_1115
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_1215
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_1218
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_130
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_1315
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_140_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_230
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_240_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_320_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_330_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_370_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_380_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_420_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_470_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_7150
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_7200_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_7345
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_7350 
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_7400_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_7550
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_7600_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_7700_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_7800_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_7900_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_8000_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_8100_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_8200_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_8400_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_8700_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_a310_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_a320_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_a430_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_a440_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_a510_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_a520_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_a530_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_a610_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_a620_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_a630_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_a710_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_a820_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_d5060_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_d5100_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_d6100_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_d7100_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_d7300_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_pro_b8300_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_b8800_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660"
+ # photosmart_pro_b9100_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660"
+ # Photosmart_B8500_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660"
+ # Photosmart_A640_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660"
+ 
+ # Check for Business Inkjet products (0x03f0xx12).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660"
+ # Check for Deskjet products (0x03f0xx04).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660"
+ # Check for LaserJet products (0x03f0xx17).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660"
+ # Check for LaserJet products (0x03f0xx2a).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", OWNER="root", GROUP="lp", MODE="660"
+ # Check for DesignJet product (0x03f0xx14).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="660"
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??14", OWNER="root", GROUP="lp", MODE="660"
+ 
+ # Removed the following rule because FHS states that /etc should be reserved for static files only. This
+ # functionality should be done in a deb/rpm post install script.  2/11/2009, D Suffield
+diff -Naur hplip-3.11.7-old/data/rules/56-hpmud_support.rules /media/system/tmp/portage/net-print/hplip-3.11.7/work/hplip-3.11.7//data/rules/56-hpmud_support.rules
+--- hplip-3.11.7-old/data/rules/56-hpmud_support.rules	2011-07-25 18:48:19.353947668 +0200
++++ hplip-3.11.7/data/rules/56-hpmud_support.rules	2011-07-25 18:51:45.270609071 +0200
+@@ -7,9 +7,9 @@
+ LABEL="pid_test"
+ 
+ # Check for LaserJet products (0x03f0xx17).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{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).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{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.5-r1.ebuild b/net-print/hplip/hplip-3.11.5-r1.ebuild
deleted file mode 100644
index 674925c465e7..000000000000
--- a/net-print/hplip/hplip-3.11.5-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# 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.5-r1.ebuild,v 1.1 2011/06/19 11:34:59 billie Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="!minimal? 2"
-PYTHON_USE_WITH="threads xml"
-PYTHON_USE_WITH_OPT="!minimal"
-
-inherit fdo-mime linux-info python autotools
-
-DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
-HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-# zeroconf does not work properly with >=cups-1.4.
-# Thus support for it is also disabled in hplip.
-IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -acl X"
-
-COMMON_DEPEND="
-	virtual/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	acl? ( || ( >=sys-fs/udev-171[acl] >=sys-fs/udev-145[extras] ) )
-	snmp? (
-		net-analyzer/net-snmp
-		dev-libs/openssl
-	)
-	!minimal? (
-		net-print/cups
-		virtual/libusb:0
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		fax? ( sys-apps/dbus )
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ghostscript-gpl-8.71-r3
-	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
-	!minimal? (
-		dev-python/pygobject
-		kernel_linux? ( >=sys-fs/udev-114 )
-		scanner? (
-			dev-python/imaging
-			X? ( || (
-				kde? ( kde-misc/skanlite )
-				media-gfx/xsane
-				media-gfx/sane-frontends
-			) )
-		)
-		fax? (
-			dev-python/reportlab
-			dev-python/dbus-python
-		)
-		qt4? (
-			dev-python/PyQt4[dbus,X]
-			libnotify? (
-				dev-python/notify-python
-			)
-			policykit? (
-				sys-auth/polkit
-			)
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-pkg_setup() {
-	if ! use minimal; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
-
-	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
-
-	if ! use hpcups && ! use hpijs ; then
-		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
-		ewarn "which is probably not what you want."
-		ewarn "You will almost certainly not be able to print."
-		ewarn "Recommended USE flags: USE=\"hpcups -hpijs\")."
-	fi
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-		ewarn "Depending on the USE flags set for hpcups and/or hpijs the appropiate"
-		ewarn "drivers are installed."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	python_convert_shebangs -q -r 2 .
-
-	# Fix for Gentoo bug #345725
-	sed -i -e "s|/etc/udev/rules.d|/$(get_libdir)/udev/rules.d|" \
-		$(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
-		|| die "sed udev rules"
-
-	# Do not install desktop files if there is no gui
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
-	epatch "${FILESDIR}"/${PN}-3.11.1-desktop.patch
-
-	# Browser detection through xdg-open
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/482674
-	epatch "${FILESDIR}"/${PN}-3.9.10-browser.patch
-
-	# Use cups-config when checking for cupsddk
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483136
-	epatch "${FILESDIR}"/${PN}-3.9.12-cupsddk.patch
-
-	# Htmldocs are not installed under docdir/html so enable htmldir configure
-	# switch
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
-	epatch "${FILESDIR}"/${PN}-3.11.1-htmldir.patch
-
-	# Increase systray check timeout for slower machines
-	# 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.1-udev-attrs.patch
-
-	# CVE-2010-4267 SNMP Response Processing Buffer Overflow Vulnerability
-	# http://secunia.com/advisories/42956/
-	# https://bugzilla.redhat.com/show_bug.cgi?id=662740
-	epatch "${FILESDIR}"/${PN}-3.10.9-cve-2010-4267.patch
-
-	# Fix build with cups-1.5
-	epatch "${FILESDIR}"/${PN}-3.11.5-cups-1.5.patch
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	local i
-	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || die
-		mv ${i}.temp ${i}
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	local gui_build myconf drv_build minimal_build
-
-	if use qt4 ; then
-		gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
-		if use policykit ; then
-			myconf="--enable-policykit"
-		else
-			myconf="--disable-policykit"
-		fi
-	else
-		gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
-	fi
-
-	if use fax || use qt4 ; then
-		myconf="${myconf} --enable-dbus-build"
-	else
-		myconf="${myconf} --disable-dbus-build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${gui_build} \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable acl udev-acl-rules)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# Installed by sane-backends
-	# Gentoo Bug: #201023
-	rm -f "${D}"/etc/sane.d/dll.conf || die
-}
-
-pkg_postinst() {
-	use !minimal && python_mod_optimize /usr/share/${PN}
-	fdo-mime_desktop_database_update
-
-	elog "For more information on setting up your printer please take"
-	elog "a look at the hplip section of the gentoo printing guide:"
-	elog "http://www.gentoo.org/doc/en/printing-howto.xml"
-}
-
-pkg_postrm() {
-	use !minimal && python_mod_cleanup /usr/share/${PN}
-	fdo-mime_desktop_database_update
-}
diff --git a/net-print/hplip/hplip-3.11.7.ebuild b/net-print/hplip/hplip-3.11.7.ebuild
new file mode 100644
index 000000000000..ea7bef57c582
--- /dev/null
+++ b/net-print/hplip/hplip-3.11.7.ebuild
@@ -0,0 +1,264 @@
+# 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.7.ebuild,v 1.1 2011/07/25 18:17:55 billie Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="!minimal? 2"
+PYTHON_USE_WITH="threads xml"
+PYTHON_USE_WITH_OPT="!minimal"
+
+inherit fdo-mime linux-info python autotools
+
+DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+# zeroconf does not work properly with >=cups-1.4.
+# Thus support for it is also disabled in hplip.
+IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -acl X"
+
+COMMON_DEPEND="
+	virtual/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	acl? ( || ( >=sys-fs/udev-171[acl] >=sys-fs/udev-145[extras] ) )
+	snmp? (
+		net-analyzer/net-snmp
+		dev-libs/openssl
+	)
+	!minimal? (
+		net-print/cups
+		virtual/libusb:0
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		fax? ( sys-apps/dbus )
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ghostscript-gpl-8.71-r3
+	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
+	!minimal? (
+		dev-python/pygobject
+		kernel_linux? ( >=sys-fs/udev-114 )
+		scanner? (
+			dev-python/imaging
+			X? ( || (
+				kde? ( kde-misc/skanlite )
+				media-gfx/xsane
+				media-gfx/sane-frontends
+			) )
+		)
+		fax? (
+			dev-python/reportlab
+			dev-python/dbus-python
+		)
+		qt4? (
+			dev-python/PyQt4[dbus,X]
+			libnotify? (
+				dev-python/notify-python
+			)
+			policykit? (
+				sys-auth/polkit
+			)
+		)
+	)"
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+pkg_setup() {
+	if ! use minimal; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+		ewarn "Recommended USE flags: USE=\"hpcups -hpijs\")."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups and/or hpijs the appropiate"
+		ewarn "drivers are installed."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	python_convert_shebangs -q -r 2 .
+
+	# Fix for Gentoo bug #345725
+	sed -i -e "s|/etc/udev/rules.d|/$(get_libdir)/udev/rules.d|" \
+		$(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
+		|| die "sed udev rules"
+
+	# Do not install desktop files if there is no gui
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
+	epatch "${FILESDIR}"/${PN}-3.11.1-desktop.patch
+
+	# Browser detection through xdg-open
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/482674
+	epatch "${FILESDIR}"/${PN}-3.9.10-browser.patch
+
+	# Use cups-config when checking for cupsddk
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483136
+	epatch "${FILESDIR}"/${PN}-3.9.12-cupsddk.patch
+
+	# Htmldocs are not installed under docdir/html so enable htmldir configure
+	# switch
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
+	epatch "${FILESDIR}"/${PN}-3.11.1-htmldir.patch
+
+	# Increase systray check timeout for slower machines
+	# 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}"/${P}-udev-attrs.patch
+
+	# CVE-2010-4267 SNMP Response Processing Buffer Overflow Vulnerability
+	# http://secunia.com/advisories/42956/
+	# https://bugzilla.redhat.com/show_bug.cgi?id=662740
+	epatch "${FILESDIR}"/${PN}-3.10.9-cve-2010-4267.patch
+
+	# Fix build with cups-1.5
+	epatch "${FILESDIR}"/${PN}-3.11.5-cups-1.5.patch
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	local i
+	for i in ppd/hpijs/*.ppd.gz ; do
+		rm -f ${i}.temp
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
+		mv ${i}.temp ${i}
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	local gui_build myconf drv_build minimal_build
+
+	if use qt4 ; then
+		gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
+		if use policykit ; then
+			myconf="--enable-policykit"
+		else
+			myconf="--disable-policykit"
+		fi
+	else
+		gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
+	fi
+
+	if use fax || use qt4 ; then
+		myconf="${myconf} --enable-dbus-build"
+	else
+		myconf="${myconf} --disable-dbus-build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	econf \
+		--disable-dependency-tracking \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${gui_build} \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build) \
+		$(use_enable acl udev-acl-rules)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# Installed by sane-backends
+	# Gentoo Bug: #201023
+	rm -f "${D}"/etc/sane.d/dll.conf || die
+}
+
+pkg_postinst() {
+	use !minimal && python_mod_optimize /usr/share/${PN}
+	fdo-mime_desktop_database_update
+
+	elog "For more information on setting up your printer please take"
+	elog "a look at the hplip section of the gentoo printing guide:"
+	elog "http://www.gentoo.org/doc/en/printing-howto.xml"
+}
+
+pkg_postrm() {
+	use !minimal && python_mod_cleanup /usr/share/${PN}
+	fdo-mime_desktop_database_update
+}
-- 
cgit v1.2.3-65-gdbad