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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 30 insertions, 134 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/Manifest b/net-print/splix/Manifest
index 1f7e7cfa3a7e..c17b81120e11 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -1,14 +1,10 @@
-AUX fixMakefile.patch 887 RMD160 808cb12b2d704d53ac1ed8afdfa1fa596d6b12c9 SHA1 17a7a920d35a15f95bf165fece4e60ed0bb1f56a SHA256 a146a10895215a940369abd8e1428db3e5007502b4bf4bd731c9bb1d553256e4
 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.0.1-beta2.tar.bz2 33474 RMD160 d9264250e3117eb2f2915734651156d581bc0f74 SHA1 c2de61b5948c8358a197434e8ea3fb7459f4251e SHA256 9c762c1f94e80f79252a56ab92c95bc6e9a9aa8af5a88128e236853cc6109999
-DIST splix-1.1.0.tar.bz2 63855 RMD160 c2df961fa2a52ae78da678df17790196835f1302 SHA1 3a43615bca43d60c0f2c73ec4a59170a5d766975 SHA256 0210c5015bccd08f0e9c25d40bcd01556a9b10528d40737493c1ef8b16b43491
 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
-EBUILD splix-1.0.1_beta2.ebuild 954 RMD160 1ae70d68d04eef1b1f9816068591386c7e229584 SHA1 567f6e24e2f99fc49bc03e9611d5a5e0884ae322 SHA256 f13ff7fdc975fcbafea402d27067353c796f28f7c9e2a51408c204982060d033
-EBUILD splix-1.1.0.ebuild 1704 RMD160 c23d77188aed7ebab3a7940a399ca15008b54293 SHA1 2ea33ab14ec825214c811ac1487cdfa07892e829 SHA256 f0ff64dce5443448ed98389e67dd1425b36488fd2153f879aabdf693603a412c
 EBUILD splix-1.1.1.ebuild 1709 RMD160 902fa3aa5ee815b63cb212e3c06804632f409fb5 SHA1 710603e6153b7ccd790840978fbcf98dbe048005 SHA256 27562dada3cc741edf3fd8d960674408d4a669e66ad104200180ede1da296a79
-EBUILD splix-2.0.0.ebuild 2243 RMD160 3511acce58b4c7c75298f429ed39faf968dfbabb SHA1 6f9ffc4e40c849851a2438a20a76bdbffeff1dee SHA256 0fe853381a33e0aca5bc452333bf8f5dc36f4fe46fe6e3ece15d073b6b5301da
-MISC ChangeLog 3049 RMD160 9737ab6ee13de7da4df8467455d699a8f20f978b SHA1 bfb1e2103577a6ef0cb031545da61d9c55748449 SHA256 30fc1cd17d89d91282d859d647a39906921aabad07da9800e42aa53b239b5229
+EBUILD splix-2.0.0.ebuild 2283 RMD160 c6af069c3bf9150dd9ec03e3a69dc5a9b0aaf880 SHA1 7bd34214f40f35d4273980d3f2b888b9d2c8c344 SHA256 79638b12c1aeadea3370720d21aaf57f4e12828683a166e378cf572d392ba12c
+MISC ChangeLog 3322 RMD160 bdfdf9d91d4ab8c3f04951c7fdad5b3c44c189ab SHA1 1eb88e36ed58af720ea66fe00ffa2e7ed91100c0 SHA256 b8c6a5c8dc9ba7dd8ca43400a872b590bc9af46f7556d77f753ac2ce173d94dd
 MISC metadata.xml 396 RMD160 786e6f8b392630994fc23e44b999607c4e99e8a3 SHA1 f6d4b6456aff27f7d185d5c29740c795306cf0b4 SHA256 004f0a4b1cd4a60f1772e9418f274af9b552c4ad3026ee9dde5e13a0159e99d4
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"