diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-05 19:38:17 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-05 19:38:17 +0000 |
| commit | 4250a5936560d51baa3e7143cbd7723c6ca4a7a1 (patch) | |
| tree | a93dd5b94af4fc68aa74b88b86f142ef6c73214d /net-print/mtink | |
| parent | remove old (diff) | |
| download | gentoo-2-4250a5936560d51baa3e7143cbd7723c6ca4a7a1.tar.gz gentoo-2-4250a5936560d51baa3e7143cbd7723c6ca4a7a1.tar.bz2 gentoo-2-4250a5936560d51baa3e7143cbd7723c6ca4a7a1.zip | |
EAPI=4; respect LDFLAGS (bug 336125)
(Portage version: 2.1.9.50/cvs/Linux x86_64)
Diffstat (limited to 'net-print/mtink')
| -rw-r--r-- | net-print/mtink/ChangeLog | 8 | ||||
| -rw-r--r-- | net-print/mtink/files/mtink-1.0.16-options.patch | 39 | ||||
| -rw-r--r-- | net-print/mtink/mtink-1.0.16.ebuild | 13 |
3 files changed, 50 insertions, 10 deletions
diff --git a/net-print/mtink/ChangeLog b/net-print/mtink/ChangeLog index f04444f11c84..d1bd9a2ab956 100644 --- a/net-print/mtink/ChangeLog +++ b/net-print/mtink/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/mtink -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/ChangeLog,v 1.32 2010/10/10 18:10:50 ulm Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/ChangeLog,v 1.33 2011/06/05 19:38:17 dilfridge Exp $ + + 05 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> mtink-1.0.16.ebuild, + +files/mtink-1.0.16-options.patch: + EAPI=4; respect LDFLAGS (bug 336125) 10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> mtink-1.0.11.ebuild, mtink-1.0.16.ebuild: diff --git a/net-print/mtink/files/mtink-1.0.16-options.patch b/net-print/mtink/files/mtink-1.0.16-options.patch new file mode 100644 index 000000000000..c173a4c762c1 --- /dev/null +++ b/net-print/mtink/files/mtink-1.0.16-options.patch @@ -0,0 +1,39 @@ +diff -ruN mtink-1.0.16.orig/Makefile.ORG mtink-1.0.16/Makefile.ORG +--- mtink-1.0.16.orig/Makefile.ORG 2007-08-28 12:52:30.000000000 +0200 ++++ mtink-1.0.16/Makefile.ORG 2011-06-05 21:29:23.000000000 +0200 +@@ -4,7 +4,7 @@ + setUid=1 + gimpVersion= + +-DBG = -s -O ++DBG = + + # comment this out for Solaris + +@@ -235,7 +235,7 @@ + + ttink: $(TTYOBJ) $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/model.h $(SRCDIR)/version.h Makefile + @echo Link ttink +- @$(CC) -o ttink $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0 ++ @$(CC) -o ttink $(LDFLAGS) $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0 + + ############# PLUG-IN ####################### + gimp-mtink: $(SRCDIR)/gimp-mtink.c Makefile +@@ -257,7 +257,7 @@ + + mtinkd: $(SVR_OBJ) Makefile + @echo Link mtinkd +- @$(CC) -o mtinkd $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) ++ @$(CC) -o mtinkd $(LDFLAGS) $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) + + ########### Chooser ############## + +@@ -269,7 +269,7 @@ + + $(DETDIR)/askPrinter: $(DETDIR)/askPrinter.c + @echo Compile and link askPrinter.c +- @$(CC) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c -I. -I$(DETDIR) ++ @$(CC) -o $(DETDIR)/askPrinter $(LDFLAGS) $(DETDIR)/askPrinter.c -I. -I$(DETDIR) + + ########### utilities ###################### + diff --git a/net-print/mtink/mtink-1.0.16.ebuild b/net-print/mtink/mtink-1.0.16.ebuild index def03925562b..f29bf67bf1c6 100644 --- a/net-print/mtink/mtink-1.0.16.ebuild +++ b/net-print/mtink/mtink-1.0.16.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/mtink-1.0.16.ebuild,v 1.2 2010/10/10 18:10:50 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/mtink/mtink-1.0.16.ebuild,v 1.3 2011/06/05 19:38:17 dilfridge Exp $ -EAPI="2" -inherit eutils +EAPI=4 +inherit eutils base DESCRIPTION="mtink is a status monitor and inkjet cartridge changer for some Epson printers" HOMEPAGE="http://xwtools.automatix.de/" @@ -22,10 +22,7 @@ DEPEND="X? ( x11-libs/libX11 dev-libs/libusb" RDEPEND="${DEPEND}" -src_prepare() { - #prevent stripping - sed -i -e 's:DBG =.*:DBG =:' Makefile.ORG -} +PATCHES=( "${FILESDIR}/${P}-options.patch" ) src_configure() { ./Configure || die |