GCC 4.5 support, thanks to Kacper Kowalik <xarthisius.kk@gmail.com> in bug #318581

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 27 insertions, 127 deletions

diff --git a/net-print/splix/ChangeLog b/net-print/splix/ChangeLog
index c4bf9fed61d7..6c4e2eefd0ba 100644
--- a/net-print/splix/ChangeLog
+++ b/net-print/splix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/splix
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/splix/ChangeLog,v 1.15 2009/11/17 21:26:32 voyageur Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/splix/ChangeLog,v 1.16 2010/05/06 08:53:55 voyageur Exp $
+
+  06 May 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -splix-1.0.1_beta2.ebuild, -splix-1.1.0.ebuild, splix-2.0.0.ebuild,
+  +files/splix-2.0.0-gcc45.patch, -files/fixMakefile.patch:
+  GCC 4.5 support, thanks to Kacper Kowalik <xarthisius.kk@gmail.com> in bug
+  #318581
 
 *splix-2.0.0 (17 Nov 2009)
 
diff --git a/net-print/splix/files/fixMakefile.patch b/net-print/splix/files/fixMakefile.patch
deleted file mode 100644
index ea2198938e06..000000000000
--- a/net-print/splix/files/fixMakefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nau Makefile.orig Makefile
---- Makefile.orig	2006-11-11 14:26:28.000000000 +0100
-+++ Makefile	2006-12-08 02:47:11.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 ====
- 
---- src/Makefile.orig	2006-11-11 14:26:28.000000000 +0100
-+++ src/Makefile	2006-12-08 02:56:14.000000000 +0100
-@@ -20,7 +20,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/files/splix-2.0.0-gcc45.patch b/net-print/splix/files/splix-2.0.0-gcc45.patch
new file mode 100644
index 000000000000..d1ae9ba5172e
--- /dev/null
+++ b/net-print/splix/files/splix-2.0.0-gcc45.patch
@@ -0,0 +1,15 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=318581
+
+--- src/ppdfile.cpp
++++ src/ppdfile.cpp
+@@ -282,7 +282,7 @@
+  * Opérateur d'assignation
+  * Assignment operator
+  */
+-void PPDFile::Value::operator = (const PPDFile::Value::Value &val)
++void PPDFile::Value::operator = (const PPDFile::Value &val)
+ {
+     if (_preformatted)
+         delete[] _preformatted;
diff --git a/net-print/splix/splix-1.0.1_beta2.ebuild b/net-print/splix/splix-1.0.1_beta2.ebuild
deleted file mode 100644
index 67fda1b2b1f3..000000000000
--- a/net-print/splix/splix-1.0.1_beta2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/splix/splix-1.0.1_beta2.ebuild,v 1.4 2007/01/30 05:43:06 beandog Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-${PV/_/-}
-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="net-print/cups"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/fixMakefile.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"
-}
diff --git a/net-print/splix/splix-1.1.0.ebuild b/net-print/splix/splix-1.1.0.ebuild
deleted file mode 100644
index 6fc2ee01a2e9..000000000000
--- a/net-print/splix/splix-1.1.0.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.0.ebuild,v 1.2 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}"/${P}-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 35d7db2ac3b9..7ed0be0dbd69 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-2009 Gentoo Foundation
+# Copyright 1999-2010 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.1 2009/11/17 21:26:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/splix/splix-2.0.0.ebuild,v 1.2 2010/05/06 08:53:55 voyageur Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -24,6 +24,8 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	# http://sourceforge.net/tracker/?func=detail&aid=2880411&group_id=175815&atid=874748
 	epatch "${FILESDIR}"/${P}-algo0x0d_one_scanline_over_fix.patch
+
+	epatch "${FILESDIR}"/${P}-gcc45.patch
 	# Honor LDFLAGS
 	sed -e "/[a-z]_LDFLAGS/s/:=.*/:= $\{LDFLAGS\}/" -i module.mk \
 		|| die "module.mk sed failed"