Set PSTORASTER to gstoraster for >=ghostscript-gpl-9.02, force older version in other ebuilds, thanks everyone in bug #367071. Also remove 1.x version

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

7 files changed, 86 insertions, 110 deletions

diff --git a/net-print/splix/ChangeLog b/net-print/splix/ChangeLog
index aa1f81cab400..8e8a26aa874c 100644
--- a/net-print/splix/ChangeLog
+++ b/net-print/splix/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-print/splix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/splix/ChangeLog,v 1.19 2011/04/11 13:50:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/splix/ChangeLog,v 1.20 2011/05/13 22:17:48 voyageur Exp $
+
+*splix-2.0.0_p20110219-r1 (13 May 2011)
+
+  13 May 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/splix-1.1.0-fix-makefile.patch, -splix-1.1.1.ebuild,
+  splix-2.0.0.ebuild, splix-2.0.0_p20110219.ebuild,
+  +splix-2.0.0_p20110219-r1.ebuild:
+  Set PSTORASTER to gstoraster for >=ghostscript-gpl-9.02, force older version
+  in other ebuilds, thanks everyone in bug #367071. Also remove 1.x version
 
   11 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> splix-2.0.0.ebuild:
   x86 stable wrt bug #360567
diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest
index 9019149b45de..1c103b171ac2 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX splix-1.1.0-fix-makefile.patch 1237 RMD160 47393d65c9f10e14c3e1d161ef9e4e065ea79431 SHA1 161e0347c281c06f29b09c7166bc95a93debb41a SHA256 d492d6231b80f5e6dc58dbbd926ca975f41b7c2072cd5d773e68a008e8824a6f
 AUX splix-2.0.0-algo0x0d_one_scanline_over_fix.patch 14016 RMD160 9a2395a4e143504def63ab85698cedd0dfa78666 SHA1 49baf79d47ef2a15553679fe78308f660b051cdb SHA256 1358989dc10673f011bed156b298160a2d6934434b63bcbb7a5e0b068e964187
 AUX splix-2.0.0-gcc45.patch 381 RMD160 2dd2a1f808ee80b9b536e542cdde9f584f6a8467 SHA1 e3586c3ddaa98b33531e4f7a2e70eb69e80ef697 SHA256 17832ef83e46db8c8b9f76011cafb7b697bb61072f55e610f7910531aa774665
 DIST samsung_cms.tar.bz2 2893884 RMD160 fdc92bfe0c2fd0a6d538b9c1e88071aab012ffd3 SHA1 b854cdc4647043e7aae1a4affa5a1813a4d04613 SHA256 b45daf773caba7ab6b66abba667c56be2d78ad60ac3648d4a9a916cd2275a684
-DIST splix-1.1.1.tar.bz2 65233 RMD160 5804ce71147fe50a1c6f75545a841bb5348471ff SHA1 e25486aeb0500f0d1a221b86b96d28b6307f178b SHA256 fb26ef4083dd57cecbee174fe9c7d1b5b1df06f7ccd90e3006cbeb09c6738209
 DIST splix-2.0.0.tar.bz2 101197 RMD160 7f194de23d465a3acbf5c0eec979b194f016a8b5 SHA1 d40b9fcfd03efd7a9b6b2700fbb0af96569f095b SHA256 97f703fc73a2940e63da43130615f3ef2a06d4d1f85fe6edfed0c0cd79de912f
 DIST splix-2.0.0_p20110219.tar.bz2 119512 RMD160 1b333bd0bc53c0ba95aa585c50a69912b76cff9f SHA1 8cf92443dff418b6e2f6cd97c654a24c3e81eb8b SHA256 c01f887bdcfd34b34101819b4aa92ac826b82649424f1fe293a611cad421d723
-EBUILD splix-1.1.1.ebuild 1709 RMD160 902fa3aa5ee815b63cb212e3c06804632f409fb5 SHA1 710603e6153b7ccd790840978fbcf98dbe048005 SHA256 27562dada3cc741edf3fd8d960674408d4a669e66ad104200180ede1da296a79
-EBUILD splix-2.0.0.ebuild 2283 RMD160 e03c5097b677e0f5a4d38d76bea3f6b347dd26ca SHA1 12168dcc82f3356808179baca061e899b0bd8ea6 SHA256 e6ecb8156c1e07066cdaa9496cebd0328455261197e2d623f46e8783e049d960
-EBUILD splix-2.0.0_p20110219.ebuild 2091 RMD160 fa26e7ca2f54256fa7a840e56ef1b8c56241fbce SHA1 5ab18e3d41ccff322404c85b841f403f659b5120 SHA256 9a5c40988c1f54a1174b394663754e8a05013ddb81c8927f8b6b1a5c5d98b8c0
-MISC ChangeLog 3775 RMD160 82cb40822ee35cb4b518340dc8d5abd1721ff695 SHA1 a408caf4f61fbb801690435111b3a20ea7fe7e2d SHA256 42fe3402b5421d336b095186806278e1cbb7548964ad030f8cae0adf4cfe09ad
+EBUILD splix-2.0.0.ebuild 2313 RMD160 fa2754135f816ff03ff2497855f622dbfd5926ac SHA1 c2e3b15f80e5e63ec7392c90331f636883082b8e SHA256 ff35262077ceadd794b38d900db3dc6c1a81007a9d6463c46e47b993608dc700
+EBUILD splix-2.0.0_p20110219-r1.ebuild 2149 RMD160 ab646e980a788e5185c427c3c405194e08a1c4f2 SHA1 cbcfdcb80ad10e3954b56d2e2f0fa8ab68e6755a SHA256 116663f534ef385003697a1c6dbbcc19028e4210a0b1201fcb36778a39f0740b
+EBUILD splix-2.0.0_p20110219.ebuild 2123 RMD160 b9559a9e92438b5d0c6e55fff2229ce27bb3ab23 SHA1 d6e7b1a31812c7f43860542cfec20758e6307df2 SHA256 95510cfb6cc1e87f4ab01cb1c7148759fef649a514ca383971cd6552e1072e16
+MISC ChangeLog 4175 RMD160 67b502faf5fca43a6c4bafefb56b3bf04de5f511 SHA1 a0af2009db232f7c7a13f1911c200e49edba4bc7 SHA256 a6846ff3301d0a9cada7cb471a22f3f41289736a59c050bc0a1994be3ba56e22
 MISC metadata.xml 396 RMD160 786e6f8b392630994fc23e44b999607c4e99e8a3 SHA1 f6d4b6456aff27f7d185d5c29740c795306cf0b4 SHA256 004f0a4b1cd4a60f1772e9418f274af9b552c4ad3026ee9dde5e13a0159e99d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2jBzsACgkQuUQtlDBCeQKk3ACeL3ROvuqGMoyyVQDjtkaJfXPw
-ECoAnjDMoom7W02roC1K7uX8tYIHpQgk
-=YIpy
+iF4EAREIAAYFAk3NrhgACgkQFYEBGcdFJfKLHAD9HvI1L4CmREj/yhlIdabK5ApT
+lVrgJ1vVrwzfHQrVIosA/1owElEi28gcAZSfCn5Bfa+7rXNC3LKx8h29tsyzqoqN
+=IFon
 -----END PGP SIGNATURE-----
diff --git a/net-print/splix/files/splix-1.1.0-fix-makefile.patch b/net-print/splix/files/splix-1.1.0-fix-makefile.patch
deleted file mode 100644
index cd156a780b49..000000000000
--- a/net-print/splix/files/splix-1.1.0-fix-makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN splix-1.1.0.orig/Makefile splix-1.1.0/Makefile
---- splix-1.1.0.orig/Makefile	2007-11-16 03:26:11.000000000 +0100
-+++ splix-1.1.0/Makefile	2007-11-20 00:49:25.000000000 +0100
-@@ -4,10 +4,10 @@
- #  This project has been placed under the GPL Licence.
- #
- 
--CXXFLAGS	:= -O2 `cups-config --cflags` 
--LDFLAGS		:= `cups-config --ldflags`
--CUPSFILTER	:= `cups-config --serverbin`/filter
--CUPSPPD		:= `cups-config --datadir`/model
-+CXXFLAGS	+=
-+LDFLAGS		+=
-+CUPSFILTER	:= $(DESTDIR)`cups-config --serverbin`/filter
-+CUPSPPD		:= $(DESTDIR)`cups-config --datadir`/model
- 
- # === DON'T CHANGE ANYTHING AFTER THIS MESSAGE ====
- 
-diff -urN splix-1.1.0.orig/src/Makefile splix-1.1.0/src/Makefile
---- splix-1.1.0.orig/src/Makefile	2007-11-16 03:35:51.000000000 +0100
-+++ splix-1.1.0/src/Makefile	2007-11-20 00:50:32.000000000 +0100
-@@ -4,7 +4,7 @@
- #  This project has been placed under the GPL Licence.
- #
- 
--CXXFLAGS	+= -I../include -Wall -g -O0 #-DENABLE_DEBUG
-+CXXFLAGS	+= -I../include -Wall
- LDFLAGS		+=
- LIBS		+= -lcups -lcupsimage -ljbig
- 
-@@ -25,7 +25,7 @@
- 	$(CXX) $(CXXFLAGS) -c $<
- 
- install: rastertospl2
--	install -m 755 -s rastertospl2 ${CUPSFILTER}
-+	install -m 755 rastertospl2 ${CUPSFILTER}
- 
- .PHONY: clean distclean
- clean:
diff --git a/net-print/splix/splix-1.1.1.ebuild b/net-print/splix/splix-1.1.1.ebuild
deleted file mode 100644
index c23f59315895..000000000000
--- a/net-print/splix/splix-1.1.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/splix/splix-1.1.1.ebuild,v 1.4 2009/09/13 10:35:07 tgurr Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-${PV/_p/-}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A set of CUPS printer drivers for SPL (Samsung Printer Language) printers"
-HOMEPAGE="http://splix.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-libs/jbigkit
-	|| ( >=net-print/cups-1.4.0 net-print/cupsddk )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.0-fix-makefile.patch
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" || die "emake failed"
-}
-
-src_install() {
-	CUPSFILTERDIR="$(cups-config --serverbin)/filter"
-	CUPSPPDDIR="$(cups-config --datadir)/model"
-
-	dodir "${CUPSFILTERDIR}"
-	dodir "${CUPSPPDDIR}"
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	ebeep 5
-	ewarn ""
-	ewarn "You *MUST* make sure that the PPD files that CUPS is using"
-	ewarn "for actually installed printers are updated if you upgraded"
-	ewarn "from a previous version of splix!"
-	ewarn "Otherwise you will be unable to print (your printer might"
-	ewarn "spit out blank pages etc.)."
-	ewarn "To do that, simply delete the corresponding PPD file in"
-	ewarn "/etc/cups/ppd/, click on 'Modify Printer' belonging to the"
-	ewarn "corresponding printer in the CUPS webinterface (usually"
-	ewarn "reachable via http://localhost:631/) and choose the correct"
-	ewarn "printer make and model, for example:"
-	ewarn "'Samsung' -> 'Samsung ML-1610, 1.0 (en)'"
-	ewarn ""
-}
diff --git a/net-print/splix/splix-2.0.0.ebuild b/net-print/splix/splix-2.0.0.ebuild
index 6fe7174213ed..6f991e88f9bd 100644
--- a/net-print/splix/splix-2.0.0.ebuild
+++ b/net-print/splix/splix-2.0.0.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/splix/splix-2.0.0.ebuild,v 1.4 2011/04/11 13:50:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/splix/splix-2.0.0.ebuild,v 1.5 2011/05/13 22:17:48 voyageur Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -17,7 +17,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+jbig"
 
-DEPEND="|| ( >=net-print/cups-1.4.0 net-print/cupsddk )
+DEPEND="<app-text/ghostscript-gpl-9.02
+	|| ( >=net-print/cups-1.4.0 net-print/cupsddk )
 	jbig? ( media-libs/jbigkit )"
 RDEPEND="${DEPEND}"
 
diff --git a/net-print/splix/splix-2.0.0_p20110219-r1.ebuild b/net-print/splix/splix-2.0.0_p20110219-r1.ebuild
new file mode 100644
index 000000000000..e5a377c2e183
--- /dev/null
+++ b/net-print/splix/splix-2.0.0_p20110219-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/splix/splix-2.0.0_p20110219-r1.ebuild,v 1.1 2011/05/13 22:17:48 voyageur Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A set of CUPS printer drivers for SPL (Samsung Printer Language) printers"
+HOMEPAGE="http://splix.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2
+	http://splix.ap2c.org/samsung_cms.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+jbig"
+
+DEPEND=">=app-text/ghostscript-gpl-9.02
+	|| ( >=net-print/cups-1.4.0 net-print/cupsddk )
+	jbig? ( media-libs/jbigkit )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	# Honor LDFLAGS
+	sed -e "/[a-z]_LDFLAGS/s/:=.*/:= $\{LDFLAGS\}/" -i module.mk \
+		|| die "module.mk sed failed"
+	# Correct link comand, do not strip on install
+	sed -e "s/g++/$\{LINKER\}/" -e "/install/s/-s //" -i rules.mk \
+		|| die "rules.mk sed failed"
+}
+
+src_compile() {
+	local options="MODE=optimized"
+	use jbig || options="${options} DISABLE_JBIG=1"
+	emake ${options} PSTORASTER=gstoraster CXX="$(tc-getCXX)" \
+		OPTIM_CFLAGS="${CFLAGS}" OPTIM_CXXFLAGS="${CXXFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	gzip "${D}"/$(cups-config --datadir)/model/*/*.ppd || die "ppd gzip failed"
+
+	insinto $(cups-config --datadir)/model/samsung
+	doins -r "${WORKDIR}"/cms
+}
+
+pkg_postinst() {
+	ewarn "You *MUST* make sure that the PPD files that CUPS is using"
+	ewarn "for actually installed printers are updated if you upgraded"
+	ewarn "from a previous version of splix!"
+	ewarn "Otherwise you will be unable to print (your printer might"
+	ewarn "spit out blank pages etc.)."
+	ewarn "To do that, simply delete the corresponding PPD file in"
+	ewarn "/etc/cups/ppd/, click on 'Modify Printer' belonging to the"
+	ewarn "corresponding printer in the CUPS webinterface (usually"
+	ewarn "reachable via http://localhost:631/) and choose the correct"
+	ewarn "printer make and model, for example:"
+	ewarn "'Samsung' -> 'Samsung ML-1610, 1.0 (en)'"
+}
diff --git a/net-print/splix/splix-2.0.0_p20110219.ebuild b/net-print/splix/splix-2.0.0_p20110219.ebuild
index 197833d93b1e..d871cb269d9d 100644
--- a/net-print/splix/splix-2.0.0_p20110219.ebuild
+++ b/net-print/splix/splix-2.0.0_p20110219.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/splix/splix-2.0.0_p20110219.ebuild,v 1.1 2011/03/29 10:04:40 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/splix/splix-2.0.0_p20110219.ebuild,v 1.2 2011/05/13 22:17:48 voyageur Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+jbig"
 
-DEPEND="|| ( >=net-print/cups-1.4.0 net-print/cupsddk )
+DEPEND="<app-text/ghostscript-gpl-9.02
+	|| ( >=net-print/cups-1.4.0 net-print/cupsddk )
 	jbig? ( media-libs/jbigkit )"
 RDEPEND="${DEPEND}"