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

(Portage version: 2.2.0_alpha33/cvs/Linux x86_64)

6 files changed, 78 insertions, 100 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/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}"