Add additional cupsfilters search paths, bug 420671.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 41 insertions, 12 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index a47f036d905a..f6a6234fdaf4 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/system-config-printer-common
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.70 2012/05/24 13:26:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.71 2012/06/19 22:10:03 reavertm Exp $
+
+  19 Jun 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/system-config-printer-common-1.3.9-cups_filters_path.patch,
+  system-config-printer-common-1.3.9-r1.ebuild:
+  Add additional cupsfilters search paths, bug 420671.
 
   24 May 2012; Samuli Suominen <ssuominen@gentoo.org>
   system-config-printer-common-1.3.9-r1.ebuild:
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index d4217dd7aa25..44d6df9c40e4 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -2,23 +2,20 @@
 Hash: SHA1
 
 AUX system-config-printer-common-1.3.5-split.patch 4624 RMD160 ec78e57b1cb15f0072193a9f31b2331111286840 SHA1 f0a23a1503d0e928d500dabfeeb530933969884f SHA256 fc865303bf8c40b8a2964fed7cad48c6e943312be1be631951cca5b3b81a490d
+AUX system-config-printer-common-1.3.9-cups_filters_path.patch 962 RMD160 4b1fe3331e93a342092067146b410bb6c01a217f SHA1 0fa917600a2a1b763cabec373b4c4a01599d2518 SHA256 ca11a0ab5b9ce124a0433d79b0c4ac9ce995f73ce12c39ca1e886b76e41b29df
 AUX system-config-printer-common-1.3.9-split.patch 4636 RMD160 16e6068c2f26c439fe2a18c1201895e5ab965745 SHA1 4ceb5d0e3847f4922ee2eaa3a0edbdac254f35eb SHA256 bcd20fcd357ce1730e172b753b67a34679342b82881395bc72afc2feded20558
 DIST system-config-printer-1.3.6.tar.xz 988332 RMD160 6981d300468a547877345c7842b5930fbaf4cbb9 SHA1 7c2365b6f3dd0ccdedddcd9788d736227ce7858f SHA256 412f38c45d13763f69872b737f9b7885f0633704a4ef71eaae7b8c30e6dd7013
 DIST system-config-printer-1.3.7.tar.xz 990392 RMD160 26a88af68bd8d376c5aeed2e83a9dadf9b850a5f SHA1 7020aa0f07db4a2d301949468bb67fe4c1867712 SHA256 bd2d16b1b00e94b05178697c566b4434288557df8faf56a65a71fc4994cd5e4a
 DIST system-config-printer-1.3.9.tar.xz 992152 RMD160 ad15cc322eed989232d80c6a30466dc70c6f4720 SHA1 99bbacce31e295f33a72f324e794942219f38397 SHA256 86a655d6599484cafe57f11694d9e2d9767ece03328a8fc8254aa92c8162dfe0
 EBUILD system-config-printer-common-1.3.6.ebuild 2042 RMD160 bb37278a00b8a247789cdf4e490b962bd58e3ce5 SHA1 b61adea03d6e2515fda57463ddf416fc548e661b SHA256 0e5f543aa37a51f5b9f3dc1e3f845a4292cba1253751fe7d62a702a33968544f
 EBUILD system-config-printer-common-1.3.7.ebuild 2051 RMD160 a8b9300c91dfab07e9a32879af1cc314160f9d1c SHA1 f2c28d50890848dcbb40ce016f9dc5eed1596d2f SHA256 61bf233fc1e67e46c6c94723ffa328a2c87b1ccf9afcc9c9f94dac9371c7e842
-EBUILD system-config-printer-common-1.3.9-r1.ebuild 2041 RMD160 a1ba52ee4ec654f21591e690e6c79f43df76c72d SHA1 b23a0bc27a6a0c5008f3746b797633c03da5aebf SHA256 2fb88a8e2d316f5b5b487d98ae4eae12151ca032a1920855a09c3aafabc9061d
-MISC ChangeLog 14228 RMD160 637a1a61e512f4d037cc906afa8610f6a4d7045d SHA1 179b29ca2eb941cbd1bd2d606e2f125df71ea55d SHA256 195b6d4d5a357316c2b1df1e60ac092867c6981b179fd0053eb5e0e20ea15ea8
+EBUILD system-config-printer-common-1.3.9-r1.ebuild 2098 RMD160 a2d543b216bb556152a2e9ae4092ea3acbbb80cf SHA1 53e8c4e372551b344d6c314a8844bf9e479e91e0 SHA256 5400c22624e94fab53effd638f66082433cbbac1e3e787d096d25d8036ffe633
+MISC ChangeLog 14454 RMD160 3a3077f8840ec28b1b26adccd3d9e8f3fba3431b SHA1 05f88ee1e8798bc7e5804b00b9bfbea415ae9f93 SHA256 3414a00ed5fc6b86ce65924529ecebfdb09e5f1ef046df1941c14faa9a05addc
 MISC metadata.xml 269 RMD160 cb38f7cfbdb499867255963abc339ddddf5a76df SHA1 ec25a6b2b03cc49b554ef0e822c1acad1384a3d0 SHA256 4093e60c94c1276d3fce2608e758ed73b067ae7af175d26df104f4df0fbe3e8a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPvjcZAAoJEEdUh39IaPFN4ekIAIgPjUBfXupJaFII9kyQc8lT
-I9ntqEOZ1gOshLL1q2eXoh1/7vuxRoXiQdJCgDnNggwS8qWJPa1OsuT6gMuCBB5H
-dGXSKL65qOPDpGoRH3512tC7r/Y15jfGcyCYBtglm3KIO3VBBRdhlp74D1V0nxi6
-rcMSweSn9Lg++O2MGpf/7hxOi13ZlpmJMaMT2ThSHBWWu4VL2AG+psJ42cFMTnkN
-RKOOYXkC6GuzyNqAPsKCNOTbwBRb5g7rdkaZilD1JmTwx21Kdj0W3qcsBCOojzLu
-PkvSs7B4d72j+hkchC25YTk8JqNzGEYGNW2zjL8bUkg1O69xiY+0l2cqHWpN2g0=
-=K/Qn
+iEYEARECAAYFAk/g+L4ACgkQFuHa/bHpVdvkVgCfYUO1/5+bu2caWp4zDfwI92Ir
+MXEAnjWfXjcMt2SxVlZQTwnbl05LoRtI
+=6E6W
 -----END PGP SIGNATURE-----
diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-cups_filters_path.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-cups_filters_path.patch
new file mode 100644
index 000000000000..0d7c8edade61
--- /dev/null
+++ b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.9-cups_filters_path.patch
@@ -0,0 +1,26 @@
+From a3479278f12ddc905f81050b11c769d74f581aee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
+Date: Sat, 16 Jun 2012 08:43:30 +0200
+Subject: [PATCH] add /usr/libexec/cups/filter to the filter search paths
+
+---
+ cupshelpers/cupshelpers.py |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
+index 3fc138b..d1d32f1 100755
+--- a/cupshelpers/cupshelpers.py
++++ b/cupshelpers/cupshelpers.py
+@@ -812,7 +812,8 @@ def missingExecutables(ppd):
+ 
+                 exepath = pathcheck (exe,
+                                      "/usr/lib/cups/filter:"
+-                                     "/usr/lib64/cups/filter")
++                                     "/usr/lib64/cups/filter:"
++                                     "/usr/libexec/cups/filter")
+                 if not exepath:
+                     add_missing ("/usr/lib/cups/filter/" + exe)
+ 
+-- 
+1.7.8.6
+
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild
index 92e9ed27d217..aebbb13abc1e 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild,v 1.8 2012/05/24 13:26:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r1.ebuild,v 1.9 2012/06/19 22:10:03 reavertm Exp $
 
 EAPI="3"
 
@@ -52,6 +52,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.3.9-split.patch"
+	epatch "${FILESDIR}/${PN}-1.3.9-cups_filters_path.patch"
 	eautoreconf
 }