Fix build with forced asneeded, bug #247866, honour ldflags, dont prestrip files

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

5 files changed, 45 insertions, 7 deletions

diff --git a/media-sound/tk707/ChangeLog b/media-sound/tk707/ChangeLog
index 2a4a40cb8fcd..0be482f98972 100644
--- a/media-sound/tk707/ChangeLog
+++ b/media-sound/tk707/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/tk707
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tk707/ChangeLog,v 1.9 2008/12/19 16:04:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tk707/ChangeLog,v 1.10 2008/12/19 16:15:58 aballier Exp $
+
+  19 Dec 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/tk707-0.8-asneeded.patch, +files/tk707-0.8-nostrip.patch,
+  tk707-0.8-r1.ebuild:
+  Fix build with forced asneeded, bug #247866, honour ldflags, dont prestrip
+  files
 
   19 Dec 2008; Alexis Ballier <aballier@gentoo.org> tk707-0.8-r1.ebuild:
   remove useless configure switches, use emake, drop redundant DEPs
diff --git a/media-sound/tk707/Manifest b/media-sound/tk707/Manifest
index bcb07c95a5ec..78c6dbce3491 100644
--- a/media-sound/tk707/Manifest
+++ b/media-sound/tk707/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX tk707-0.8-asneeded.patch 644 RMD160 6af7f44b7401fd9faad1f1167018559c342ea0b6 SHA1 eee508f04ac8b7d4c6fed22df45e061de44f62be SHA256 57f0247254bbcdeb4c46639a98c4f640acec5e5ab1b4cbee1cdeb659a23afd3e
+AUX tk707-0.8-nostrip.patch 501 RMD160 51e9b75993e96e99e23c4549edb9c48f331f7fba SHA1 67b4b3d02f2f9026059397f6ddfa2a9b0963eaf8 SHA256 8931c6c8294f6cf70a607806e799c49b383cba4b494d7cdb082daa18d0b9f66a
 DIST tk707-0.8-updated_tcl2c.patch.gz 7368 RMD160 4061f2e109061f43fd7dd44763c44880011af9a4 SHA1 84e18d72c4f5c34b9d78254b161d841d146d4a9c SHA256 b8b50e392645d3cbdc4d79fd2916f5d0d994e6c235e8de7954409f8d3937dd15
 DIST tk707-0.8.tar.gz 404862 RMD160 f214767e0766c195f72ce223dc43069524b47275 SHA1 5d6d2472735dbeb9cd6abcc9e5c5745646b3895b SHA256 11de4001d19737f7f094ccc9d34b98fe9129714e0cb1f13f995c70775a37b539
-EBUILD tk707-0.8-r1.ebuild 771 RMD160 ec19e221756f76bf66fff84f8ee0a93c75304ed5 SHA1 959e358b6479d4071fa4e4e81d669373d3af2870 SHA256 06f36552158412dba1ce12c6e405597233965a3465207087780def3178b26ff4
-MISC ChangeLog 1350 RMD160 f2a12e98ca5a47505603c779cfd787c5a1557847 SHA1 f1d29d89fbb13e83eb62e5c1027527f7862b06d4 SHA256 42819df687c235f36d75b3018f31b3ec8306e39eca5afe72ad5f95ed40382fb7
+EBUILD tk707-0.8-r1.ebuild 854 RMD160 2a4f92247a4f97a01c38ed5f8b4a940368fd3dd1 SHA1 be491c8ae2e5040e2394893ef5f95167b9a634f0 SHA256 d0d15d4cf367fdc2b2c3f451e1215bfda3b3b53162053af5de4ac623f272a403
+MISC ChangeLog 1579 RMD160 4d78f550577ec3c46a4322f34b9592639c9e12a3 SHA1 6bf7242f3982f1c241a503301bff3f8d8564a0cd SHA256 f3744ec12e6cbff4873759502af4fdfa8aacaa7745fcadc76959384a40568524
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklLxhMACgkQvFcC4BYPU0pA6QCeOYNqq9F65Hz9hQq1Zg+uQjX6
-a8MAn0kMNAoUtebeNd3IWe2jjhzo7brV
-=ANRW
+iEYEARECAAYFAklLyMQACgkQvFcC4BYPU0p7wgCeN/2Met20RddQJTCfeB/yc038
+vjIAnj+z95PQyZnjYSsnX8ieh2Lnly3n
+=Bc4R
 -----END PGP SIGNATURE-----
diff --git a/media-sound/tk707/files/tk707-0.8-asneeded.patch b/media-sound/tk707/files/tk707-0.8-asneeded.patch
new file mode 100644
index 000000000000..a7833fd31d32
--- /dev/null
+++ b/media-sound/tk707/files/tk707-0.8-asneeded.patch
@@ -0,0 +1,15 @@
+Index: tk707-0.8/Makefile.am
+===================================================================
+--- tk707-0.8.orig/Makefile.am
++++ tk707-0.8/Makefile.am
+@@ -42,8 +42,8 @@ tk707tcl_SOURCES  = util707.c util707.h 
+ tcl2c_SOURCES     = tcl2c.c 
+ texi2help_SOURCES = texi2help.l 
+ 
+-tk707bin_LDFLAGS  = $(ALSA_LIBS)   $(TCLTK_LIBS)   $(X_LIBS)
+-tk707tcl_LDFLAGS  = $(ALSA_LIBS)   $(TCLTK_LIBS)   $(X_LIBS)
++tk707bin_LDADD  = $(ALSA_LIBS)   $(TCLTK_LIBS)   $(X_LIBS)
++tk707tcl_LDADD  = $(ALSA_LIBS)   $(TCLTK_LIBS)   $(X_LIBS)
+ INCLUDES          = $(ALSA_CFLAGS) $(TCLTK_CFLAGS) $(X_CFLAGS)
+ 
+ pkgdata_DATA      = 707.map 727.map 7b7.map 7c7.map \
diff --git a/media-sound/tk707/files/tk707-0.8-nostrip.patch b/media-sound/tk707/files/tk707-0.8-nostrip.patch
new file mode 100644
index 000000000000..f0c35fa89702
--- /dev/null
+++ b/media-sound/tk707/files/tk707-0.8-nostrip.patch
@@ -0,0 +1,13 @@
+Index: tk707-0.8/Makefile.am
+===================================================================
+--- tk707-0.8.orig/Makefile.am
++++ tk707-0.8/Makefile.am
+@@ -191,7 +191,7 @@ $(srcdir)/texi2help.c: texi2help.l
+ 
+ install-exec-local: tk707bin tk707.sh
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+-	sh $(srcdir)/install-sh -s -c tk707bin $(DESTDIR)$(bindir)/tk707bin
++	sh $(srcdir)/install-sh -c tk707bin $(DESTDIR)$(bindir)/tk707bin
+ 	$(INSTALL_SCRIPT) tk707.sh $(DESTDIR)$(bindir)/tk707
+ 
+ uninstall-local:
diff --git a/media-sound/tk707/tk707-0.8-r1.ebuild b/media-sound/tk707/tk707-0.8-r1.ebuild
index 1b5627db5dfe..359eb1dca0ca 100644
--- a/media-sound/tk707/tk707-0.8-r1.ebuild
+++ b/media-sound/tk707/tk707-0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tk707/tk707-0.8-r1.ebuild,v 1.7 2008/12/19 16:04:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tk707/tk707-0.8-r1.ebuild,v 1.8 2008/12/19 16:15:58 aballier Exp $
 
 inherit eutils autotools
 
@@ -25,6 +25,8 @@ src_unpack() {
 	EPATCH_SOURCE=${S} epatch ${P}-*.patch
 
 	cd "${S}"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
 	eautoreconf
 }