version bump, fix bug #165210 and bug #181766

Package-Manager: portage-2.1.3.7

7 files changed, 173 insertions, 5 deletions

diff --git a/net-print/splix/ChangeLog b/net-print/splix/ChangeLog
index db76212bf033..e0fc8e8e2967 100644
--- a/net-print/splix/ChangeLog
+++ b/net-print/splix/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-print/splix
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/splix/ChangeLog,v 1.6 2007/02/04 16:54:22 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/splix/ChangeLog,v 1.7 2007/10/14 15:31:24 wschlich Exp $
+
+*splix-1.0.1_p1 (14 Oct 2007)
+
+  14 Oct 2007; Wolfram Schlich <wschlich@gentoo.org>
+  +files/splix-1.0.1_p1-fix-makefile.patch,
+  +files/splix-1.0.1_p1-fix-nocolor-segfault.patch,
+  +files/splix-1.0.1_p1-fix-ppd-parallel-build.patch,
+  +splix-1.0.1_p1.ebuild:
+  version bump, fix bug #165210 and bug #181766
 
 *splix-1.0.1 (04 Feb 2007)
 
diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest
index 91f40a20168a..de3e8e318bf5 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -2,7 +2,20 @@ AUX fixMakefile.patch 887 RMD160 808cb12b2d704d53ac1ed8afdfa1fa596d6b12c9 SHA1 1
 MD5 75b1db5569185bcf14ee3d7d553299f9 files/fixMakefile.patch 887
 RMD160 808cb12b2d704d53ac1ed8afdfa1fa596d6b12c9 files/fixMakefile.patch 887
 SHA256 a146a10895215a940369abd8e1428db3e5007502b4bf4bd731c9bb1d553256e4 files/fixMakefile.patch 887
+AUX splix-1.0.1_p1-fix-makefile.patch 1662 RMD160 2d37da13513c8b4c59db087b088b85fc540a5c0c SHA1 fae61fc0f0f574606f2350795ade07986ab644f5 SHA256 0c645857ca7bdf5f18ad78e1253baf1a3a9b5429a34934a95e243bcf4d471d4e
+MD5 e20dbf14707e18f0f6fb4827c6fd2186 files/splix-1.0.1_p1-fix-makefile.patch 1662
+RMD160 2d37da13513c8b4c59db087b088b85fc540a5c0c files/splix-1.0.1_p1-fix-makefile.patch 1662
+SHA256 0c645857ca7bdf5f18ad78e1253baf1a3a9b5429a34934a95e243bcf4d471d4e files/splix-1.0.1_p1-fix-makefile.patch 1662
+AUX splix-1.0.1_p1-fix-nocolor-segfault.patch 518 RMD160 cddb53af19dfd2cc463a227ac8860d63960412c6 SHA1 e7b2524748fdd61babafabcb90dde4f505d1f080 SHA256 4a69787fa01c0a415e2527ef4457305134fd9bd52b793133c330cae055ac5028
+MD5 3d7fd6f2cefddddb57ffcaf8137e544c files/splix-1.0.1_p1-fix-nocolor-segfault.patch 518
+RMD160 cddb53af19dfd2cc463a227ac8860d63960412c6 files/splix-1.0.1_p1-fix-nocolor-segfault.patch 518
+SHA256 4a69787fa01c0a415e2527ef4457305134fd9bd52b793133c330cae055ac5028 files/splix-1.0.1_p1-fix-nocolor-segfault.patch 518
+AUX splix-1.0.1_p1-fix-ppd-parallel-build.patch 771 RMD160 58b07b9ffc3f8c056e99712a08d032e69a2c8945 SHA1 38ad52a2b83fee933795be7cc5cc30cef1392757 SHA256 901ed1fcfcdb861fcbf0591748f922e45d6e0f12e9a64d3b3236cf6a3861b995
+MD5 d2f0112f316c0120783756f3e27c7764 files/splix-1.0.1_p1-fix-ppd-parallel-build.patch 771
+RMD160 58b07b9ffc3f8c056e99712a08d032e69a2c8945 files/splix-1.0.1_p1-fix-ppd-parallel-build.patch 771
+SHA256 901ed1fcfcdb861fcbf0591748f922e45d6e0f12e9a64d3b3236cf6a3861b995 files/splix-1.0.1_p1-fix-ppd-parallel-build.patch 771
 DIST splix-0.0.2.tar.bz2 27644 RMD160 6d7630c4572c1bcc0d84f20b05f142b83e355343 SHA1 7a390b3ccf45b92718e9af128f37f5792c344e17 SHA256 dbd292b3b429ade3582b3a965c0f1270d46919e461a6b39bfae203ec6c90f90d
+DIST splix-1.0.1-1.tar.bz2 37871 RMD160 5cd84f133af82f322db48facf3241e5dc477cb5b SHA1 34e9ed6860dc463b282ffb25dd0140b231d13366 SHA256 c7301b02a2868fd46eb569eaeca89bc691b90b9b51da7043097778585a8c6277
 DIST splix-1.0.1-beta2.tar.bz2 33474 RMD160 d9264250e3117eb2f2915734651156d581bc0f74 SHA1 c2de61b5948c8358a197434e8ea3fb7459f4251e SHA256 9c762c1f94e80f79252a56ab92c95bc6e9a9aa8af5a88128e236853cc6109999
 DIST splix-1.0.1.tar.bz2 75492 RMD160 dc7fd21f9a11eb8de6cc764044eb176a89896669 SHA1 69c6516a9b1f3f064df7329c7913b46cf661cbd6 SHA256 c4534b5e89282ce4a89922ca97c5b937c671bba4a44e376e684474f2f40daa0f
 EBUILD splix-0.0.2.ebuild 899 RMD160 46522f61bf205fe8365d6bca1978b93870252979 SHA1 c176e26091f93c780a173f6ffdeda2e86aa42c6d SHA256 18d5f0a8216dee1446af95d0619c5d0778b231a2453775f862ee6ba20deec9a0
@@ -17,10 +30,14 @@ EBUILD splix-1.0.1_beta2.ebuild 954 RMD160 1ae70d68d04eef1b1f9816068591386c7e229
 MD5 51f2a6bc243e6a9b334d264e21a65fbc splix-1.0.1_beta2.ebuild 954
 RMD160 1ae70d68d04eef1b1f9816068591386c7e229584 splix-1.0.1_beta2.ebuild 954
 SHA256 f13ff7fdc975fcbafea402d27067353c796f28f7c9e2a51408c204982060d033 splix-1.0.1_beta2.ebuild 954
-MISC ChangeLog 1472 RMD160 fb4b90f65a35ae50fc63a473c81c6f4465ef16e0 SHA1 ef03cded263afb0f235e3dc9bae3b3ebfeb36121 SHA256 669526923c79b4a838a55be972f52898e1f04bd450fb00dc0fb7425c6819f87b
-MD5 55b542a638961ddcee9710d8d0662c3a ChangeLog 1472
-RMD160 fb4b90f65a35ae50fc63a473c81c6f4465ef16e0 ChangeLog 1472
-SHA256 669526923c79b4a838a55be972f52898e1f04bd450fb00dc0fb7425c6819f87b ChangeLog 1472
+EBUILD splix-1.0.1_p1.ebuild 1826 RMD160 d4a0fad149691ae284b0749c8e0bee482252b01a SHA1 266cf0de1d212afc35e1a7d172c82b3d002e99f1 SHA256 7ce876d4db812b512ebf239b3cee230913341d77e62c17e845a2cd73996b2988
+MD5 bc5d27d8a34131596988fc31802704aa splix-1.0.1_p1.ebuild 1826
+RMD160 d4a0fad149691ae284b0749c8e0bee482252b01a splix-1.0.1_p1.ebuild 1826
+SHA256 7ce876d4db812b512ebf239b3cee230913341d77e62c17e845a2cd73996b2988 splix-1.0.1_p1.ebuild 1826
+MISC ChangeLog 1781 RMD160 a6fce84d7cdbab4a4a9f9901e30a8e279c8c35bb SHA1 6de749b027959085652ad8895843e5bb340cf7be SHA256 b4fd8bbe12738e1614e36bd5551fe70edd4e2e11d7f28dff11b8a4e0e1917dde
+MD5 6b976e704bd087de28eb1b0a6c1e48e3 ChangeLog 1781
+RMD160 a6fce84d7cdbab4a4a9f9901e30a8e279c8c35bb ChangeLog 1781
+SHA256 b4fd8bbe12738e1614e36bd5551fe70edd4e2e11d7f28dff11b8a4e0e1917dde ChangeLog 1781
 MISC metadata.xml 300 RMD160 3b9c1cd628f9d7ac94b68543ec737d5c2381a47e SHA1 33c5efd31a8aa789118535b921e211ffb5023ac3 SHA256 bc07a9aecce5770d1ace9af0a6c6af8ff6c7b16eb5e7947a1b178d1970855e43
 MD5 3a0673ad138a1626da8160385475f88e metadata.xml 300
 RMD160 3b9c1cd628f9d7ac94b68543ec737d5c2381a47e metadata.xml 300
@@ -34,3 +51,6 @@ SHA256 ca74075bebea74ea0b18cae40c04950e2448dd027443092a685d4b8792ff9d8b files/di
 MD5 6a413297db3a732e7c5fba695953645a files/digest-splix-1.0.1_beta2 253
 RMD160 7cc1e95c4f45ee0bfd48b5b03481e6be5c220e78 files/digest-splix-1.0.1_beta2 253
 SHA256 c67f322a2d780962eb9ce39643977c1b0e3325b3e48165259790e26be38e9dd5 files/digest-splix-1.0.1_beta2 253
+MD5 6c4a7da7dd62e35f72ac8aa7d3962fbd files/digest-splix-1.0.1_p1 241
+RMD160 32ee807602034c0dab813dbc497162fe2e645f60 files/digest-splix-1.0.1_p1 241
+SHA256 9a6ba04db6572d225a6e2799e1190f5841013b6eaf6b2e2dd49141d3786788a9 files/digest-splix-1.0.1_p1 241
diff --git a/net-print/splix/files/digest-splix-1.0.1_p1 b/net-print/splix/files/digest-splix-1.0.1_p1
new file mode 100644
index 000000000000..5f5eaf264998
--- /dev/null
+++ b/net-print/splix/files/digest-splix-1.0.1_p1
@@ -0,0 +1,3 @@
+MD5 4773d8a451455b5b3d0cec00434cecf7 splix-1.0.1-1.tar.bz2 37871
+RMD160 5cd84f133af82f322db48facf3241e5dc477cb5b splix-1.0.1-1.tar.bz2 37871
+SHA256 c7301b02a2868fd46eb569eaeca89bc691b90b9b51da7043097778585a8c6277 splix-1.0.1-1.tar.bz2 37871
diff --git a/net-print/splix/files/splix-1.0.1_p1-fix-makefile.patch b/net-print/splix/files/splix-1.0.1_p1-fix-makefile.patch
new file mode 100644
index 000000000000..8e659d9c7ccf
--- /dev/null
+++ b/net-print/splix/files/splix-1.0.1_p1-fix-makefile.patch
@@ -0,0 +1,52 @@
+diff -urN splix-1.0.1-1.orig/Makefile splix-1.0.1-1/Makefile
+--- splix-1.0.1-1.orig/Makefile	2007-02-10 15:20:18.000000000 +0100
++++ splix-1.0.1-1/Makefile	2007-10-14 16:18:05.000000000 +0200
+@@ -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.0.1-1.orig/src/Makefile splix-1.0.1-1/src/Makefile
+--- splix-1.0.1-1.orig/src/Makefile	2007-02-10 15:20:18.000000000 +0100
++++ splix-1.0.1-1/src/Makefile	2007-10-14 17:18:31.000000000 +0200
+@@ -4,8 +4,8 @@
+ #  This project has been placed under the GPL Licence.
+ #
+ 
+-CXXFLAGS	+= -I../include -Wall -g -O0
+-LDFLAGS		+= -lcups -lcupsimage
++CXXFLAGS	+= -I../include -Wall
++LDADD		+= -lcups -lcupsimage
+ 
+ OBJECTS		:= spl2.o printer.o band.o compress.o bandanalyser.o
+ HEADERS		:= include/spl2.h include/document.h include/printer.h \
+@@ -15,16 +15,16 @@
+ 
+ all: rastertospl2
+ rastertospl2: $(OBJECTS) rastertospl2.o raster.o
+-	$(CXX) $(LDFLAGS) -o $@ $^
++	$(CXX) $(LDFLAGS) -o $@ $^ $(LDADD)
+ 
+ pbmtospl2: $(OBJECTS) pbmtospl2.o pbmimage.o
+-	$(CXX) $(LDFLAGS) -o $@ $^
++	$(CXX) $(LDFLAGS) -o $@ $^ $(LDADD)
+ 
+ %.o: %.cpp $(HEADERS)
+ 	$(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-1.0.1_p1-fix-nocolor-segfault.patch b/net-print/splix/files/splix-1.0.1_p1-fix-nocolor-segfault.patch
new file mode 100644
index 000000000000..a7dbd2fdb033
--- /dev/null
+++ b/net-print/splix/files/splix-1.0.1_p1-fix-nocolor-segfault.patch
@@ -0,0 +1,12 @@
+--- splix-1.0.1-1-orig/src/printer.cpp	2007-02-10 15:20:18.000000000 +0100
++++ splix-1.0.1-1/src/printer.cpp	2007-03-05 17:02:42.000000000 +0100
+@@ -102,7 +102,8 @@ Printer::Printer(ppd_file_t *ppd)
+ 	if (attr)
+ 		_qpdlVersion = strtol(attr->value, (char **)NULL, 10);
+ 	attr = ppdFindAttr(_ppd, "QPDL", "ColorPrinter");
+-	_color = attr->value[0] == '1' ? true : false;
++	if (attr)
++		_color = attr->value[0] == '1' ? true : false;
+ 
+ 	// Get the resolution
+ 	if ((choice = ppdFindMarkedChoice(_ppd, "Resolution"))) {
diff --git a/net-print/splix/files/splix-1.0.1_p1-fix-ppd-parallel-build.patch b/net-print/splix/files/splix-1.0.1_p1-fix-ppd-parallel-build.patch
new file mode 100644
index 000000000000..3b7ed93db176
--- /dev/null
+++ b/net-print/splix/files/splix-1.0.1_p1-fix-ppd-parallel-build.patch
@@ -0,0 +1,15 @@
+--- ppd/Makefile.orig	2007-10-14 16:40:59.000000000 +0200
++++ ppd/Makefile	2007-10-14 16:52:30.000000000 +0200
+@@ -25,9 +25,10 @@
+ 	ppdc -d ./ $<
+ 
+ $(LANGDRIVERSEXT): $(SOURCE) $(patsubst %, $(PODIR)/%.$(POEXT), $(LANGUAGES))
+-	ppdc -c ${PODIR}/$(patsubst $(MASTERDRIVER)%.$(DRIVERSEXT),%, $@).${POEXT} -l $(patsubst $(MASTERDRIVER)%.$(DRIVERSEXT),%, $@) -d ${PODIR} $<
++	lang=$(patsubst $(MASTERDRIVER)%.$(DRIVERSEXT),%, $@); \
++	ppdc -c ${PODIR}/$$lang.${POEXT} -l $$lang -d ${PODIR}/$$lang $<; \
+ 	for filename in ${DRIVERS}; do \
+-		mv ${PODIR}/`echo $$filename`.${DRIVERSEXT} `echo $$filename`$(patsubst $(MASTERDRIVER)%.$(DRIVERSEXT),%, $@).${DRIVERSEXT}; \
++		mv ${PODIR}/$$lang/$$filename.${DRIVERSEXT} $$filename$$lang.${DRIVERSEXT}; \
+ 	done
+ 
+ .PHONY: update
diff --git a/net-print/splix/splix-1.0.1_p1.ebuild b/net-print/splix/splix-1.0.1_p1.ebuild
new file mode 100644
index 000000000000..9be325516553
--- /dev/null
+++ b/net-print/splix/splix-1.0.1_p1.ebuild
@@ -0,0 +1,57 @@
+# 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_p1.ebuild,v 1.1 2007/10/14 15:31:24 wschlich 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="net-print/cups" # splix will need >=media-libs/jbigkit-1.6 from 1.1.0 on
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/"${P}"-fix-makefile.patch
+	epatch "${FILESDIR}"/${P}-fix-nocolor-segfault.patch
+	epatch "${FILESDIR}"/${P}-fix-ppd-parallel-build.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 ""
+}