Use pstoraster for gs-gpl and -gnu to make them work with gimp-print for example, thanks to nicola.rauseo@gmail.com in bug 163897

Package-Manager: portage-2.1.2.3

4 files changed, 29 insertions, 15 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index e3202bcfdf54..d053cf692629 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.231 2007/04/07 12:22:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.232 2007/04/07 12:41:24 genstef Exp $
+
+  07 Apr 2007; <stefan@gentoo.org> cups-1.2.9.ebuild, cups-1.2.10.ebuild:
+  Use pstoraster for gs-gpl and -gnu to make them work with gimp-print for
+  example, thanks to nicola.rauseo@gmail.com in bug 163897
 
 *cups-1.2.10 (07 Apr 2007)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 509745a41303..d5a0501d8a71 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -58,22 +58,22 @@ EBUILD cups-1.1.23-r8.ebuild 5010 RMD160 dcfafdd38cb6d6ae4457a3d01e320e2ab14c05f
 MD5 2443fd46170a523bf9722e0684ddb257 cups-1.1.23-r8.ebuild 5010
 RMD160 dcfafdd38cb6d6ae4457a3d01e320e2ab14c05fd cups-1.1.23-r8.ebuild 5010
 SHA256 7affefc610bbef90b5024664f692ecec599eba5c3fa7b76266b51f5f972b5a04 cups-1.1.23-r8.ebuild 5010
-EBUILD cups-1.2.10.ebuild 5876 RMD160 7a83efb185a802ebe3d5687f63306e0d3f183e96 SHA1 920f0e06ec8a5c6a0451a491301f4914fa2d3513 SHA256 8d3690323a535ac73d1df38a701c55e2c304a220ce0a62752e9f9efc446e9d52
-MD5 db6e89c318dc30ca1a8b3645d6b53e1d cups-1.2.10.ebuild 5876
-RMD160 7a83efb185a802ebe3d5687f63306e0d3f183e96 cups-1.2.10.ebuild 5876
-SHA256 8d3690323a535ac73d1df38a701c55e2c304a220ce0a62752e9f9efc446e9d52 cups-1.2.10.ebuild 5876
+EBUILD cups-1.2.10.ebuild 6126 RMD160 010e2f6abeb1666c5b0af079f8eecb30b82eec7f SHA1 cbb5fd210344b1ed090fd727611b603ae1e167b3 SHA256 1a4d7eab3c5794c8830df7bfd55b139c887d2a4f1a928b5f569b3a364734e27e
+MD5 9ac8dbee21e55d17a325b1d3a3dfca92 cups-1.2.10.ebuild 6126
+RMD160 010e2f6abeb1666c5b0af079f8eecb30b82eec7f cups-1.2.10.ebuild 6126
+SHA256 1a4d7eab3c5794c8830df7bfd55b139c887d2a4f1a928b5f569b3a364734e27e cups-1.2.10.ebuild 6126
 EBUILD cups-1.2.6.ebuild 5774 RMD160 c367d752f15c0cc79b8363f2d074d4e75ab0926e SHA1 f19af647349ed50db13baf1178f300d560c04e78 SHA256 4b0328c5a2563473491395cd7c29f40fa5e2aefa38ff8b5cb47e681af7555bdb
 MD5 2600c86a8c14db0c09dbbebd56164b12 cups-1.2.6.ebuild 5774
 RMD160 c367d752f15c0cc79b8363f2d074d4e75ab0926e cups-1.2.6.ebuild 5774
 SHA256 4b0328c5a2563473491395cd7c29f40fa5e2aefa38ff8b5cb47e681af7555bdb cups-1.2.6.ebuild 5774
-EBUILD cups-1.2.9.ebuild 5868 RMD160 0ec9a211256c3b5b53d3ceb36e128af1ec38703e SHA1 f91eadafdd58ccdeba3dfed01768d55dd4ba911a SHA256 72f110d16606abe210916ed7949cba93880b25fc7cf40e394e2dab8beed2bd11
-MD5 92e765c5f9826b19ffd095bb719389b8 cups-1.2.9.ebuild 5868
-RMD160 0ec9a211256c3b5b53d3ceb36e128af1ec38703e cups-1.2.9.ebuild 5868
-SHA256 72f110d16606abe210916ed7949cba93880b25fc7cf40e394e2dab8beed2bd11 cups-1.2.9.ebuild 5868
-MISC ChangeLog 32335 RMD160 ea6773f5d1250aa01e951eab607ff9bbbda8b759 SHA1 fc49f5d48304d9aca37ea3fbc12ce04e9510f5f3 SHA256 4e91184aaff77bac049f5cbaba7d31548b0ea356efffe695cb4b8f13a3505b73
-MD5 a37dff244f942d4cf3bda016667c3753 ChangeLog 32335
-RMD160 ea6773f5d1250aa01e951eab607ff9bbbda8b759 ChangeLog 32335
-SHA256 4e91184aaff77bac049f5cbaba7d31548b0ea356efffe695cb4b8f13a3505b73 ChangeLog 32335
+EBUILD cups-1.2.9.ebuild 6117 RMD160 55433b2b96631eb8be9223c0ba4c2bd14e9fb189 SHA1 f5ecedcdaf0dae4d0add64f3b9d5a71a09cdf3f0 SHA256 dc0d9602eb489de0074fc03045f75ec0da59de95dc0815feb6c16b3e6d599cdc
+MD5 266018349216b2a66a3a19cafa1bebe0 cups-1.2.9.ebuild 6117
+RMD160 55433b2b96631eb8be9223c0ba4c2bd14e9fb189 cups-1.2.9.ebuild 6117
+SHA256 dc0d9602eb489de0074fc03045f75ec0da59de95dc0815feb6c16b3e6d599cdc cups-1.2.9.ebuild 6117
+MISC ChangeLog 32544 RMD160 c9f6b0166632dcefd290824f232301505e8d671a SHA1 b9be564b51666dff4e4ea2ce6fa45385f37908eb SHA256 3435d83864fc231397fd222c685f44b7ddfb9fbf3fd6ed5826e76f722daaad80
+MD5 cf08f0a84476abaa8e27e78df3a17188 ChangeLog 32544
+RMD160 c9f6b0166632dcefd290824f232301505e8d671a ChangeLog 32544
+SHA256 3435d83864fc231397fd222c685f44b7ddfb9fbf3fd6ed5826e76f722daaad80 ChangeLog 32544
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
diff --git a/net-print/cups/cups-1.2.10.ebuild b/net-print/cups/cups-1.2.10.ebuild
index e76160e51007..fd610c6bf486 100644
--- a/net-print/cups/cups-1.2.10.ebuild
+++ b/net-print/cups/cups-1.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.10.ebuild,v 1.1 2007/04/07 12:22:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.10.ebuild,v 1.2 2007/04/07 12:41:24 genstef Exp $
 
 WANT_AUTOMAKE=latest
 
@@ -135,6 +135,11 @@ src_install() {
 	exeinto /usr/libexec/cups/filter/
 	newexe ${FILESDIR}/pdftops.pl pdftops
 
+	# only for gs-esp this is correct, see bug 163897
+	if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu; then
+		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" ${D}/etc/cups/mime.convs
+	fi
+
 	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
 		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl
 
diff --git a/net-print/cups/cups-1.2.9.ebuild b/net-print/cups/cups-1.2.9.ebuild
index 9b24617765a8..4259c59e1e6a 100644
--- a/net-print/cups/cups-1.2.9.ebuild
+++ b/net-print/cups/cups-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.9.ebuild,v 1.8 2007/03/29 14:31:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.9.ebuild,v 1.9 2007/04/07 12:41:24 genstef Exp $
 
 WANT_AUTOMAKE=latest
 
@@ -135,6 +135,11 @@ src_install() {
 	exeinto /usr/libexec/cups/filter/
 	newexe ${FILESDIR}/pdftops.pl pdftops
 
+	# only for gs-esp this is correct, see bug 163897
+	if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu; then
+		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" ${D}/etc/cups/mime.convs
+	fi
+
 	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
 		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl