diff options
| -rw-r--r-- | net-print/splix/ChangeLog | 5 | ||||
| -rw-r--r-- | net-print/splix/Manifest | 16 | ||||
| -rw-r--r-- | net-print/splix/files/fixMakefile.patch | 29 | ||||
| -rw-r--r-- | net-print/splix/splix-0.0.2.ebuild | 22 |
4 files changed, 48 insertions, 24 deletions
diff --git a/net-print/splix/ChangeLog b/net-print/splix/ChangeLog index e075ea56a..fe897236a 100644 --- a/net-print/splix/ChangeLog +++ b/net-print/splix/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 08 Dec 2006; Jakub Moc <jakub@gentoo.org> splix-0.0.2.ebuild, + files/fixMakefile.patch: + Fix patch, fix prestripped binary, fix crosscompile, move patch to + src_unpack(), other QA fixes. + 07 Dec 2006; jakobdettner <gentoo@dettner.de> +splix-0.0.2.ebuild, +files/fixMakefile.patch, +metadata.xml: New Ebuild for bug 157302 thanks. diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest index 0e5d374a3..b20bf38db 100644 --- a/net-print/splix/Manifest +++ b/net-print/splix/Manifest @@ -1,12 +1,12 @@ -AUX fixMakefile.patch 439 RMD160 743f76dc92c72c1d074a62e0713fa69d06aeb37a SHA1 d56f4d992a7062dfed6d396e6ae2f9b455bca81d SHA256 ec3de879389478274d13f7e9efc5c5de8c6adc27f17229012630c9314610b587 -MD5 b0a04be75277226a2f7331c76896dfea files/fixMakefile.patch 439 -RMD160 743f76dc92c72c1d074a62e0713fa69d06aeb37a files/fixMakefile.patch 439 -SHA256 ec3de879389478274d13f7e9efc5c5de8c6adc27f17229012630c9314610b587 files/fixMakefile.patch 439 +AUX fixMakefile.patch 887 RMD160 808cb12b2d704d53ac1ed8afdfa1fa596d6b12c9 SHA1 17a7a920d35a15f95bf165fece4e60ed0bb1f56a SHA256 a146a10895215a940369abd8e1428db3e5007502b4bf4bd731c9bb1d553256e4 +MD5 75b1db5569185bcf14ee3d7d553299f9 files/fixMakefile.patch 887 +RMD160 808cb12b2d704d53ac1ed8afdfa1fa596d6b12c9 files/fixMakefile.patch 887 +SHA256 a146a10895215a940369abd8e1428db3e5007502b4bf4bd731c9bb1d553256e4 files/fixMakefile.patch 887 DIST splix-0.0.2.tar.bz2 27644 RMD160 6d7630c4572c1bcc0d84f20b05f142b83e355343 SHA1 7a390b3ccf45b92718e9af128f37f5792c344e17 SHA256 dbd292b3b429ade3582b3a965c0f1270d46919e461a6b39bfae203ec6c90f90d -EBUILD splix-0.0.2.ebuild 780 RMD160 a49a9f4fe5eb32b10f4d8ecabc7d2f0027e8b0d1 SHA1 2dee15824f1298497518be62c02ce4a35703e1fa SHA256 85da83e31c8c89f527d2f121f45eb961795874edcce63f10327769d18e764e04 -MD5 73f531c0337c9f5df46e77b82b5c713d splix-0.0.2.ebuild 780 -RMD160 a49a9f4fe5eb32b10f4d8ecabc7d2f0027e8b0d1 splix-0.0.2.ebuild 780 -SHA256 85da83e31c8c89f527d2f121f45eb961795874edcce63f10327769d18e764e04 splix-0.0.2.ebuild 780 +EBUILD splix-0.0.2.ebuild 845 RMD160 cbec9ef9cc7906656b381edfdaa8a62076f48862 SHA1 6cba67edc0cfce88f658b5c4c9fe6a78d55ed153 SHA256 beeb4cd171bda952a92641037a171963ff492f11e58354a4c6100e62068d8f2d +MD5 10db4772d548689d8ff3f2cfe7d66a15 splix-0.0.2.ebuild 845 +RMD160 cbec9ef9cc7906656b381edfdaa8a62076f48862 splix-0.0.2.ebuild 845 +SHA256 beeb4cd171bda952a92641037a171963ff492f11e58354a4c6100e62068d8f2d splix-0.0.2.ebuild 845 MISC ChangeLog 265 RMD160 3b156f4ed9adfe10f69ab93956af4b6d340a691d SHA1 679ebaafdf0847d409af654082080d18a6095ea0 SHA256 e6baeb96f34ae0ca1a8fab5e60c7bf6069debc247d4401a903cdc009dd1d42a9 MD5 9831c6677e4c360cb78b4067f26dff6e ChangeLog 265 RMD160 3b156f4ed9adfe10f69ab93956af4b6d340a691d ChangeLog 265 diff --git a/net-print/splix/files/fixMakefile.patch b/net-print/splix/files/fixMakefile.patch index cb07aef32..ea2198938 100644 --- a/net-print/splix/files/fixMakefile.patch +++ b/net-print/splix/files/fixMakefile.patch @@ -1,16 +1,29 @@ ---- a/Makefile.org 2006-12-07 12:44:19.931085197 +0100 -+++ Makefile 2006-12-07 12:44:37.986330756 +0100 -@@ -6,12 +6,10 @@ +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` +-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 ==== --export CXXFLAGS LDFLAGS CUPSFILTER CUPSPPD -+export CXXFLAGS LDFLAGS +--- 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 $< - all: src ppd + install: rastertospl2 +- install -m 755 -s rastertospl2 ${CUPSFILTER} ++ install -m 755 rastertospl2 ${CUPSFILTER} + .PHONY: clean distclean + clean: diff --git a/net-print/splix/splix-0.0.2.ebuild b/net-print/splix/splix-0.0.2.ebuild index 087dd9a37..cfc5b8d26 100644 --- a/net-print/splix/splix-0.0.2.ebuild +++ b/net-print/splix/splix-0.0.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit eutils +inherit eutils toolchain-funcs DESCRIPTION="A set of CUPS printer drivers for SPL (Samsung Printer Language) printers" HOMEPAGE="http://splix.sourceforge.net/" @@ -13,19 +13,25 @@ SLOT="0" KEYWORDS="~x86" IUSE="" -DEPEND="=net-print/cupsddk-1.1.0_p20061207" +DEPEND="~net-print/cupsddk-1.1.0_p20061207" RDEPEND="${DEPEND}" -export CUPSFILTER="${D}`cups-config --serverbin`/filter" -export CUPSPPD="${D}`cups-config --datadir`/model" -src_compile() { +src_unpack() { + unpack ${A} + cd "${S}" epatch "${FILESDIR}"/fixMakefile.patch - emake || die "emake failed" +} + +src_compile() { + emake CXX="$(tc-getCXX)"|| die "emake failed" } src_install() { - mkdir -p "${CUPSFILTER}" - mkdir -p "${CUPSPPD}" + CUPSFILTERDIR="$(cups-config --serverbin)/filter" + CUPSPPDDIR="$(cups-config --datadir)/model" + + dodir "${CUPSFILTERDIR}" + dodir "${CUPSPPDDIR}" emake DESTDIR="${D}" install || die "emake install failed" } |