Remove
authorDaniel Pielmeier <billie@gentoo.org>
Mon, 12 Jul 2010 20:50:19 +0000 (20:50 +0000)
committerDaniel Pielmeier <billie@gentoo.org>
Mon, 12 Jul 2010 20:50:19 +0000 (20:50 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux i686

net-print/hplip/ChangeLog
net-print/hplip/Manifest
net-print/hplip/files/hplip-3.10.2-systray-segfault.patch [deleted file]
net-print/hplip/files/hplip-3.10.2-udev-attrs.patch [deleted file]
net-print/hplip/hplip-3.10.2-r4.ebuild [deleted file]

index 2f79b0feedad94a65449aee3ae321f7a4c9f8941..5c76f16e548ef487692ec6f35eecdaaccf04fe19 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.163 2010/05/30 18:58:18 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.164 2010/07/12 20:50:19 billie Exp $
+
+  12 Jul 2010; Daniel Pielmeier <billie@gentoo.org> -hplip-3.10.2-r4.ebuild,
+  -files/hplip-3.10.2-systray-segfault.patch,
+  -files/hplip-3.10.2-udev-attrs.patch:
+  Remove old.
 
   30 May 2010; Daniel Pielmeier <billie@gentoo.org>
   files/hplip-3.10.2-plugin.patch:
index f8c71a73636f0abae1607afc7766057004afd4c4..371f7ed24373ae8a7460614140eb315093009a99 100644 (file)
@@ -1,17 +1,13 @@
 AUX hplip-3.10.2-plugin.patch 731 RMD160 0ec8af6f5059a0120dd87549b2ad5ad0355ab789 SHA1 b068035df1c207cb23288382cd7eb910747b090c SHA256 5ee969c5720cf0dcf7e055ed718f334fd65d1b9ba40326e7559e233b65cef7ed
-AUX hplip-3.10.2-systray-segfault.patch 469 RMD160 df64dea9bcec386a6fe4263377e8f85daa06898f SHA1 3d3d88e1f7b7a2af194e3c33164ce41e6f1f6f05 SHA256 a92efb69afa908875775a501d7b723e3e0d315c81fa52cea25f32b994046598f
-AUX hplip-3.10.2-udev-attrs.patch 13229 RMD160 66993f5103689e136e2d13d28d95f6e4fb1617d3 SHA1 917aa0e1f1569d8235a1b6aed91cad2ff2974f00 SHA256 89ab7c0816b9cd49dd4dd64f2d335e71c1370d96fc2a3c77dadd4702b168934a
 AUX hplip-3.10.5-udev-attrs.patch 13716 RMD160 93cfabc5471f56c540f0fafb144ebd3217491802 SHA1 470d632bb2b68e91f96805587e18314d0963fd0c SHA256 7a3958988250d818a35715e3f091e0547599957a9ea34358ee7238b1edddfeb9
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
 AUX hplip-3.9.10-desktop.patch 492 RMD160 52a8bcf1544d0073920e00a383aeb22a9caf5487 SHA1 9394a73448b7b1b3ab1a014ab63b9edc731def66 SHA256 04bb5ef5ee4145eadc5f9e6498ca8a2d3d2277569b179263cb86f0f56231e462
 AUX hplip-3.9.10-htmldir.patch 4444 RMD160 7c960a3049f0b27b761c0f05c4fa9b1484dcd323 SHA1 a9e4af023f23a8990c769158eca08eabd62a5566 SHA256 2ef20d6d8636e22789f48705d9ca219b88cf111d12c54ff0354b18f3b5e20476
 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.10.2.tar.gz 21446275 RMD160 4483bd497bbc272812c31db574b75f6e5c03b391 SHA1 7cdbb879cc122152aa9e3d5dc2d7dd3baf3b0604 SHA256 bb9a3aeda9a8d31f0cc790e629f14d2122f9bff111b0d3cc97ac19a8607d7956
 DIST hplip-3.10.5.tar.gz 21495175 RMD160 080d2b1d763857f88093334d581e44c6376f05de SHA1 4e6e534983311af6991245e99814a44d857cda8d SHA256 1701e32b01eb90ab5e90f301fb115ee4a8e3e48e4739c331230646d5b24dd4d3
 DIST hplip-3.9.12.tar.gz 21371447 RMD160 f1717e8bad043b54497489fa1a2764b3ac548094 SHA1 d4d659ae52f01055bfc7060e0d4e3c7354c1dee3 SHA256 1c53febe3101b3718d43c9176c08826a1a46c49a79c9f6445cd16981fbf2a12a
-EBUILD hplip-3.10.2-r4.ebuild 7744 RMD160 467fdcd36ec9120954d632b7ae27a799bcdb02dd SHA1 c58988f55ce5d9d0994d59122e9406ad1d461d6e SHA256 dd4930a9d6cb3eb6eec6e49e7f82f19d7f66b6a12a7433b4e8f65e971b729c90
 EBUILD hplip-3.10.5.ebuild 7630 RMD160 7ae5ef2e655209e10d62892875ae619a49b32b9c SHA1 f2f7326ef6b27cb607ec44bdafdb063dcc3e33fd SHA256 129938feb6851ae631d2fb34298862b507f40edf3900dac683bdc1aca36b10eb
 EBUILD hplip-3.9.12-r1.ebuild 8208 RMD160 f79073fe4ab4bf42230e36845cbd8c661b312316 SHA1 d89236a53a19d44d360d00627c9ba5ef92ae3856 SHA256 7f058d034d324ea2cd318f453ccbbe29a0d5224a2813bc7d9dc2b925aa0cc3b3
-MISC ChangeLog 28593 RMD160 e8c0bc9cc4451642e53b31e27736764997d30f0b SHA1 50ef4cdaf3b878080f0d2b3ecb2e69eaa969a172 SHA256 c4e6945b26be854a91bd6c48efa6c7d44903892b085a7261d3f22ae27eb7a144
+MISC ChangeLog 28771 RMD160 fbf34c807b5c05f39273501661cd91aa9f11cda6 SHA1 ed7ec82d71bb172afecdb705251921f5a36430e6 SHA256 949967bcb6fc2bd16d760a1ee2c300be0e32ccd4b78b856f00d8798ec26d76d4
 MISC metadata.xml 1958 RMD160 f7cd369924faba500e66b63fef225a0c114d8ec1 SHA1 b123d54310fa7c8fbb0ef3af1e335942938d84ae SHA256 7aa06125ddd13a5533b3d2b4f9349abb4f0b5bc7eda5b73711d9b6bca764903e
diff --git a/net-print/hplip/files/hplip-3.10.2-systray-segfault.patch b/net-print/hplip/files/hplip-3.10.2-systray-segfault.patch
deleted file mode 100644 (file)
index 9e42c1c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up hplip-3.9.8/ui4/systemtray.py.tray-icon-crash hplip-3.9.8/ui4/systemtray.py
---- hplip-3.9.8/ui4/systemtray.py.tray-icon-crash      2010-03-23 16:36:55.545632224 +0000
-+++ hplip-3.9.8/ui4/systemtray.py      2010-03-23 16:37:51.944509885 +0000
-@@ -489,6 +489,7 @@ class SystemTrayApp(QApplication):
-         log.debug("Exiting")
-         self.sendMessage('', '', EVENT_SYSTEMTRAY_EXIT)
-         self.quit()
-+        del self.tray_icon
- 
- 
-     def toolboxTriggered(self):
diff --git a/net-print/hplip/files/hplip-3.10.2-udev-attrs.patch b/net-print/hplip/files/hplip-3.10.2-udev-attrs.patch
deleted file mode 100644 (file)
index 68b9529..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-diff -Naur hplip-3.10.2-old/data/rules/55-hpmud.rules hplip-3.10.2/data/rules/55-hpmud.rules
---- hplip-3.10.2-old/data/rules/55-hpmud.rules 2010-02-25 00:06:35.000000000 +0100
-+++ hplip-3.10.2/data/rules/55-hpmud.rules     2010-03-29 01:43:25.191669512 +0200
-@@ -21,124 +21,124 @@
- 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"
- 
- # 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.10.2-old/data/rules/56-hpmud_support.rules hplip-3.10.2/data/rules/56-hpmud_support.rules
---- hplip-3.10.2-old/data/rules/56-hpmud_support.rules 2010-02-25 00:06:35.000000000 +0100
-+++ hplip-3.10.2/data/rules/56-hpmud_support.rules     2010-03-29 01:45:12.941658101 +0200
-@@ -7,8 +7,8 @@
- 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 &'"
- 
- ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'"
- 
--LABEL="hpmud_rules_end"
-\ No newline at end of file
-+LABEL="hpmud_rules_end"
diff --git a/net-print/hplip/hplip-3.10.2-r4.ebuild b/net-print/hplip/hplip-3.10.2-r4.ebuild
deleted file mode 100644 (file)
index a04913c..0000000
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.2-r4.ebuild,v 1.4 2010/05/04 19:30:24 billie Exp $
-
-EAPI=2
-
-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 System. 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 libnotify minimal parport policykit qt4 scanner snmp static-ppds -udev-acl X"
-
-COMMON_DEPEND="
-       media-libs/jpeg
-       hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-       udev-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? ( || ( 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/policykit
-                       )
-               )
-       )"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (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 .
-
-       # Do not install desktop files if there is no gui
-       # Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
-       epatch "${FILESDIR}"/${PN}-3.9.10-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.9.10-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
-
-       # Make hp-plugin work if gui_mode is disabled
-       # Upstream bug: https://bugs.launchpad.net/hplip/+bug/399522
-       epatch "${FILESDIR}"/${P}-plugin.patch
-
-       # SYSFS deprecated but kept upstream for compatibility reasons
-       # Upstream bug: https://bugs.launchpad.net/hplip/+bug/346390
-       epatch "${FILESDIR}"/${P}-udev-attrs.patch
-
-       # Fix crash when trying to close the systray
-       # Upstream bug: https://bugs.launchpad.net/hplip/+bug/486698
-       epatch "${FILESDIR}"/${P}-systray-segfault.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-htmldir=/usr/share/doc/${P}/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 udev-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 "You should run hp-setup as root if you are installing hplip for the first time,"
-       elog "and may also 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"
-       elog "access it."
-       elog
-       elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search"
-       elog "mechanism. To make use of it you need to activate the zeroconf flag on cups."
-       elog "If you prefer the SLP method you have to choose this when configuring the"
-       elog "device."
-}
-
-pkg_postrm() {
-       use !minimal && python_mod_cleanup /usr/share/${PN}
-       fdo-mime_desktop_database_update
-}