EAPI=4; respect LDFLAGS (bug 336125)

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

4 files changed, 68 insertions, 17 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/Manifest b/net-print/mtink/Manifest
index 1016efdd548f..20b56962a3c0 100644
--- a/net-print/mtink/Manifest
+++ b/net-print/mtink/Manifest
@@ -1,18 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX mtink-1.0.16-options.patch 1424 RMD160 eb36205ecd3bb314e913912238569913743e9df0 SHA1 e9239ab7ba44e60c6713347ce86ee99d1936010f SHA256 e5444b1ba75551b0e3db115b83bc099e7f96517e07695f27ba332d7c4cbd31ee
 AUX mtinkd.confd 494 RMD160 c80040ef3454c8dc5bbb8b7f0a9967ed08103958 SHA1 d9e992153830acd0a81a4b3e07a89cfb523321bb SHA256 ec29de5a78956f9aa7e10a9aa035892a5d8cc8f31553975ac4212a711b719b5d
 AUX mtinkd.rc 439 RMD160 1f7337e129d61406de2a18b758325d9a3e717afa SHA1 477af109e8ae6f671e60d07de77d0c990d62aa03 SHA256 d7cf5e343d3a1fef40d650854d969510d236c9b0117c378fabc8efa647c74fbf
 DIST mtink-1.0.11.tar.gz 905081 RMD160 15afc62fe20663093af165c48e338a9172b5ae73 SHA1 83cee0cc93a5e3949478901bd2dc18ee190f8719 SHA256 e3c9e0fff5ea805a1d66e516082fdaf97d3c4f01cdaeeebee0151587da36962f
 DIST mtink-1.0.16.tar.gz 916315 RMD160 e23b4472b13aa10389d2e990335b018a0e223691 SHA1 f838c746ab88297b5e01e347fa958a44d622ff86 SHA256 187e8d145e818b4b56be203403f5fe28c02f899d30d92c58e82bcef311555ba2
 EBUILD mtink-1.0.11.ebuild 1621 RMD160 bf143fde91587d793dd8866b68023b958a8e2dd2 SHA1 23245f3ffa4fc9d93b57dff891793e25cc1f3267 SHA256 6015c2ff321eca60df648f29d6719040bde95fa8a4e5746026748c1766007919
-EBUILD mtink-1.0.16.ebuild 1655 RMD160 caa33ca75966b548a4d87d51a6c56ce91ad18dd1 SHA1 2149f6614c99ab43a9d56d24f2584c65ad4ae023 SHA256 6021710a44734fc8c48e2042fed6cad1fb5a2b15df9234cf20d19a54fa2f4e9d
-MISC ChangeLog 4097 RMD160 4718a79658b15cb3b2ed5124656e6b3f6fa3d362 SHA1 8ef351146bb1527b3bbcb01666c9a13d57c3d665 SHA256 5b5b20678e1c759345c6b3ab5628a9bf1da1b6b2ea5a271eadd0ca29e6256d89
+EBUILD mtink-1.0.16.ebuild 1628 RMD160 fd4a55a8151ae08ba0193e9127652e145fb52f19 SHA1 c548b2b8056f1cef54cdd91aaf0e31376845fb24 SHA256 1f78bea91ad48fde64597a0a5cbee7b0302badfc936876888e09ea81e22d4b51
+MISC ChangeLog 4258 RMD160 b6f168013540b392fa1404f5373b8b2cac47b70d SHA1 436461b2a33d6b0a98fa7ab5794a97c193687f94 SHA256 2914845519a1a34d89b7ec477a2b52ab5833716efdd9095adf0cb6aa293df140
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyyAh4ACgkQOeoy/oIi7uxvXwCfSqyk4lrg3nW0NDoYpoThOMxQ
-RdAAoJjg2k0len63yBLsPbdNiHVtenpe
-=aBXx
+iQIcBAEBCgAGBQJN69swAAoJENwGBM22xffeLxEP/ioFPQOn/KrWaLDSPlBfKZfd
+NpLjjff7AijKdSZkgs1nj5vWWsOfvH7VpZ6MlwuQgxYwXkJCZRhBf0nD17IAv0S4
+lz3h66IZsifiMK1u6Z8BIH3RR/jWHQqMGRpugB3zCjA+WyIeVhkQA/IbWXjrsv1w
+m3QndgBI/qZlDiTpZiLdc3Wh5wtviyYrZIUgycfvvX2+rGBKSEXX1u08i+tgRpib
+7eFAB59yytbFL1VMbFz31Uc5359u9w/UGzXfyY54mDDs+yeTSkV3rKTQ79gfDp1g
+a42q+kjPSz7170X5Y5OAOwfU0oaa9FRfYkEiWFKJOFbtm1H2TwWqEqVRjUziu+QG
+rlyr9Y3aPeOxHPkuQ1R3PZiRK8JV3Qso4VQSA4KLURuG8vwyQvgALpJ6cwYulT1M
+2ITFHYdpvueosySj8Yd06tP3afo/XBjwJqtCSSx3hamJ/Gc3DKiE8b03Ko/4R07o
+jE+TX4UzWjHPjlv3DpN9q1TtsjGT27pk9PkUXQONMUnsgmnyd0Vr2VT9D0UFZf5c
+Zbb1cNTxUHoDXOuPsMiuFeflwHU9XfguqDNDsKXVBg4mzTeoLN5RB7Jzs5AG2NFl
+yZcKRzqwTYA3gATczSw9kpNAQxIzalLEmw+jO36Dp7foZ9Uacd5NVC0MYaSXKgd3
+el/hUrDumiLGbvVls54k
+=Np2M
 -----END PGP SIGNATURE-----
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