summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Phillip Brink <binki@gentoo.org>2012-03-10 15:56:06 +0000
committerNathan Phillip Brink <binki@gentoo.org>2012-03-10 15:56:06 +0000
commit84af636e54d038d31f175e57ec9e2e9aabb18598 (patch)
treec25e58296a08f2fd89d01a2ca18689709a49b0d0 /net-print
parentMoving dev-php/phpunit-mockobject to dev-php/PHPUnit_MockObject (diff)
downloadgentoo-2-84af636e54d038d31f175e57ec9e2e9aabb18598.tar.gz
gentoo-2-84af636e54d038d31f175e57ec9e2e9aabb18598.tar.bz2
gentoo-2-84af636e54d038d31f175e57ec9e2e9aabb18598.zip
Drop old c2esp-18.
(Portage version: 2.2.0_alpha90-r1/cvs/Linux x86_64)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/c2esp/ChangeLog6
-rw-r--r--net-print/c2esp/c2esp-18.ebuild48
-rw-r--r--net-print/c2esp/files/c2esp-18-ldflags.patch36
3 files changed, 5 insertions, 85 deletions
diff --git a/net-print/c2esp/ChangeLog b/net-print/c2esp/ChangeLog
index 6e663e46096c..c1afdd92d638 100644
--- a/net-print/c2esp/ChangeLog
+++ b/net-print/c2esp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-print/c2esp
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/c2esp/ChangeLog,v 1.2 2012/03/10 15:53:54 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/c2esp/ChangeLog,v 1.3 2012/03/10 15:56:06 binki Exp $
+
+ 10 Mar 2012; Nathan Phillip Brink <binki@gentoo.org> -c2esp-18.ebuild,
+ -files/c2esp-18-ldflags.patch:
+ Drop old c2esp-18.
*c2esp-24 (10 Mar 2012)
diff --git a/net-print/c2esp/c2esp-18.ebuild b/net-print/c2esp/c2esp-18.ebuild
deleted file mode 100644
index 53b24fca075e..000000000000
--- a/net-print/c2esp/c2esp-18.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/c2esp/c2esp-18.ebuild,v 1.1 2011/08/23 03:59:00 binki Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}${PV}
-
-DESCRIPTION="A cups filter for Kodak ESP printers"
-HOMEPAGE="http://cupsdriverkodak.sf.net/"
-SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=media-libs/jbigkit-2.0-r1
- >=net-print/cups-1.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # Remove embedded media-libs/jbigkit
- rm -f *jbig* || die
-
- # Remove the embedded jbig files from the Makefile's dependencies:
- sed -i \
- -e '/^[a-z0-9.]*:/s/\$(LIBJBG)//g' \
- -e '/^[a-z0-9.]*:/s/jbig[^ ]*\.h//g' \
- Makefile || die
-
- # Use Gentoo-style cups paths
- sed -i -e s,/usr/lib/cups/filter,/usr/libexec/cups/filter,g ppd/*.ppd || die
-
- epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" LIBJBG='-ljbig85 -ljbig'
-}
-
-src_install() {
- emake DESTDIR="${D}" FILTERBIN="${D}"/usr/libexec/cups/filter install
-}
diff --git a/net-print/c2esp/files/c2esp-18-ldflags.patch b/net-print/c2esp/files/c2esp-18-ldflags.patch
deleted file mode 100644
index 2a1e94740f39..000000000000
--- a/net-print/c2esp/files/c2esp-18-ldflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Subject: Do not ignore LDFLAGS when linking.
-
---- a/Makefile
-+++ b/Makefile
-@@ -214,7 +214,7 @@
- #CUPSLIBS_ST = /usr/lib/libcups.a -lgssapi_krb5 -lgnutls -lz -lpthread -lm -lcrypt
-
- c2esptst: c2esptst.o
-- $(CC) $(CFLAGS) -o $@ c2esptst.o -lcupsimage -lcups -lcupsdriver $(LIBJBG)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2esptst.o -lcupsimage -lcups -lcupsdriver $(LIBJBG)
- #last $(CC) $(CFLAGS) -o $@ c2esptst.o -lcupsimage -lcups -lgssapi_krb5 -lgnutls -lz -lpthread -lm -lcrypt $(LIBJBG) libcupsdriver.a
- #was $(CC) $(CFLAGS) -o $@ c2esptst.o -lcupsimage $(LIBJBG) libcupsdriver.a
-
-@@ -222,16 +222,16 @@
- c2esp: c2esp.o
- # /usr/lib/libcupsimage.so.2 replaced by -lcupsimage
- # libcupsdriver.a removed
-- $(CC) $(CFLAGS) -o $@ c2esp.o -lcupsimage -lcups -lcupsdriver $(LIBJBG)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2esp.o -lcupsimage -lcups -lcupsdriver $(LIBJBG)
- # previous version below, simplified version above
- # $(CC) $(CFLAGS) -o $@ c2esp.o -lcups -lgssapi_krb5 -lgnutls -lz -lpthread -lm -lcrypt /usr/lib/libcupsimage.so.2 $(LIBJBG)
-
- command2esp: command2esp.o
- # $(CC) $(CFLAGS) -o $@ command2esp.o -lcups -lcupsdriver
-- $(CC) $(CFLAGS) -o $@ command2esp.o -lcups -lcupsdriver
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ command2esp.o -lcups -lcupsdriver
-
- myopldecode: myopldecode.o
-- $(CC) $(CFLAGS) -g myopldecode.o $(LIBJBG) -o $@
-+ $(CC) $(CFLAGS) -g $(LDFLAGS) myopldecode.o $(LIBJBG) -o $@
-
-
- #
-
-Diff finished. Sat Aug 20 18:40:17 2011