Fix as-needed, patch provided by Kacper Kowalik <xarthisius.kk@gmail.com>, Bug #278422.

Package-Manager: portage-2.2_rc46/cvs/Linux i686

4 files changed, 34 insertions, 11 deletions

diff --git a/media-plugins/vdr-wapd/ChangeLog b/media-plugins/vdr-wapd/ChangeLog
index d7f57ef51a75..f22ffeffaaf1 100644
--- a/media-plugins/vdr-wapd/ChangeLog
+++ b/media-plugins/vdr-wapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-wapd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-wapd/ChangeLog,v 1.2 2008/04/28 08:30:31 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-wapd/ChangeLog,v 1.3 2009/10/20 11:39:56 zzam Exp $
+
+  20 Oct 2009; Matthias Schwarzott <zzam@gentoo.org> vdr-wapd-0.9_p1.ebuild,
+  +files/vdr-wapd-0.9-as-needed.patch:
+  Fix as-needed, patch provided by Kacper Kowalik <xarthisius.kk@gmail.com>,
+  Bug #278422.
 
 *vdr-wapd-0.9_p1 (28 Apr 2008)
 
diff --git a/media-plugins/vdr-wapd/Manifest b/media-plugins/vdr-wapd/Manifest
index 15fc7eb9be84..504741262319 100644
--- a/media-plugins/vdr-wapd/Manifest
+++ b/media-plugins/vdr-wapd/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX confd 266 RMD160 ba24f39e8f043dfcc0bba1419761c4eddf28079d SHA1 ab2e447adbcbce23a74a988bd8d133a0e7123910 SHA256 c979e6aa5799a7c9b038ff6a41683d8d6ff74cc68d18e54a773d98d73e174de4
 AUX rc-addon.sh 268 RMD160 d4e9e40616cd3097a4de3f0a60576f42289d238e SHA1 e1472ff425fd430ba5307d8cd178cbd3a57eacfa SHA256 cb308aad536fec2bbf9da69ccfbc317d164d0d38b3aabfb0c47b150376fdc1db
+AUX vdr-wapd-0.9-as-needed.patch 528 RMD160 cc33a60fd7183020c7e1b265af26aafc83ecadda SHA1 7356d38dc04ae4c8cc42a7b77325e19ac2a5c632 SHA256 ee7607a9b33a55aaf0ae8149466bfcb0472bbabc5d002723d2d78db78b1d4622
 AUX vdr-wapd-0.9-gentoo.diff 636 RMD160 60176403b9466c8533c383c3491bcb8f93b0f30e SHA1 76ba4ced01681074bdee4d00a5a2becbb8110149 SHA256 64c8aca191bf60a694cf7fc53f0e953f440ac15addd5ab2ea68a5099f84b1e4a
 AUX vdr-wapd-0.9_gcc-4.1.x.diff 484 RMD160 98f6d5904bf5ddd7758810af1e5accdac742f3ef SHA1 8d5e97343c7d141f26b7a4af12b500f97b9eec9c SHA256 6fbb7127fb35bd7e4e4b76699f155f377fe4fb32228a64b9b3d73685c5bec444
 AUX wapaccess 258 RMD160 c51f7c2e0d311a810ddd00caa5b06b3828f08fcf SHA1 0c2dfa7d9eab38d1819f62cf4d255be3e233ba95 SHA256 192ce221d26cb303da3a4439a067c082949a88442e2fddebf91626add5bd3b10
@@ -10,13 +11,13 @@ AUX waphosts 234 RMD160 b44cd2214f371dc44830ca59e1c294daa7e0a07e SHA1 26cb7cfcfb
 DIST vdr-wapd-0.9.tgz 31975 RMD160 f392c2c252aedb03d7c4081d72cb3683f6edf603 SHA1 b705aa007b9993141879ce2c2cc3225c57769839 SHA256 6d901dd352f2eb142dd070e11726cd74b05bb66f70b169e612b181dde738145e
 DIST wapd-0.9-patch1.diff.gz 3091 RMD160 c78337e8d75ed040c6e396f01252ac52dd651b4c SHA1 cfb5a7dad484c4c9834acfa02ab8fdcf0da741f6 SHA256 e54d67c5090a40fcf1acc6ee4b4999950ecee8714c8db9823af1be59fcbd1931
 EBUILD vdr-wapd-0.9.ebuild 783 RMD160 05b14811f243543da164ae6105f5cf56aaf41ab8 SHA1 05b478069e5b8bbf783de6736d3a421601d65b60 SHA256 d31b70b81ad69911af8fe2000bc76b77576e289af3a9b35ba6aecea0bcb8474c
-EBUILD vdr-wapd-0.9_p1.ebuild 956 RMD160 1869d7cf871f02d9470dce3336e30aea97bac763 SHA1 0643d41c00f10a5032d68cd8b8c7e5af85b5a884 SHA256 36de3579e1739eb7d9e10b7d7a5275bbd1f63014571ee8f32cb98fa8227ac586
-MISC ChangeLog 675 RMD160 3e73be62dcd989dcf10e49aa21774ea38b49c0de SHA1 0c9abe51634258e36abb95138c0240c47fcac744 SHA256 e9225962adff1b1232b8fc6569d471d0c8084c6119ac8fdd52e0bd19b66927ab
+EBUILD vdr-wapd-0.9_p1.ebuild 995 RMD160 a653b15eedc3cc6bf19279073a9c2d0d369e95c7 SHA1 fe8cd3dde2a8820704c8ab3537eb7dc74a8986a9 SHA256 38d0e7e1c44d92e390179a2852ea446f53568b3644639459c0604f5a9259f080
+MISC ChangeLog 884 RMD160 38e24b5171c58955953c9a38b6fed60383ef491a SHA1 ef0df0fdff91fb298313a45a8696985b88848274 SHA256 1944bca9adeb1acc6e009a0b0c9fa328a92b27d1635cf501d359c6e536b01b4a
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkgViy0ACgkQt2vP6XvVdOcjgQCgzF6hxaEjwOrC26VBUfTAlvkB
-2TIAnRYwKCqBeOWJPToz264TUbfWIPmO
-=uDXV
+iEYEARECAAYFAkrdoZYACgkQt2vP6XvVdOckMgCfVhxMcxtNAyiwrpD7cxPds1Ps
+0mAAn1Kl9dCYNas6IlpRHemFHPg6R04U
+=8guJ
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-wapd/files/vdr-wapd-0.9-as-needed.patch b/media-plugins/vdr-wapd/files/vdr-wapd-0.9-as-needed.patch
new file mode 100644
index 000000000000..e31f31a3acbc
--- /dev/null
+++ b/media-plugins/vdr-wapd/files/vdr-wapd-0.9-as-needed.patch
@@ -0,0 +1,16 @@
+--- wapd-0.9.orig/Makefile	2008-01-16 16:29:10.000000000 +0100
++++ wapd-0.9/Makefile	2009-10-20 11:32:24.494591965 +0200
+@@ -76,11 +76,11 @@
+ all: libvdr-$(PLUGIN).so wappasswd
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+-	$(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@
++	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ 	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ wappasswd: wappasswd.c
+-	$(CXX) $(CXXFLAGS) $(LIBS) -o wappasswd wappasswd.c
++	$(CXX) $(CXXFLAGS) -o wappasswd wappasswd.c $(LIBS)
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
diff --git a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1.ebuild b/media-plugins/vdr-wapd/vdr-wapd-0.9_p1.ebuild
index 2aa848f8f7fa..97a01abb06b5 100644
--- a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1.ebuild
+++ b/media-plugins/vdr-wapd/vdr-wapd-0.9_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-wapd/vdr-wapd-0.9_p1.ebuild,v 1.1 2008/04/28 08:30:31 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-wapd/vdr-wapd-0.9_p1.ebuild,v 1.2 2009/10/20 11:39:56 zzam Exp $
 
 inherit vdr-plugin
 
@@ -20,7 +20,8 @@ DEPEND=">=media-video/vdr-1.3.44"
 
 PATCHES=("${FILESDIR}/${MY_P}_gcc-4.1.x.diff"
 	"${FILESDIR}/${MY_P}-gentoo.diff"
-	"${WORKDIR}/${MY_P#vdr-}-patch1.diff")
+	"${WORKDIR}/${MY_P#vdr-}-patch1.diff"
+	"${FILESDIR}/${MY_P}-as-needed.patch")
 
 S="${WORKDIR}/${MY_P#vdr-}"