Fix -Wl,--as-needed failure with "make check" wrt #305571, thanks to Christian Ruppert for patch.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 29 insertions, 21 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index d2b8e133169f..99fb28be1c86 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.36 2010/01/31 14:57:15 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.37 2010/02/25 18:44:08 ssuominen Exp $
+
+  25 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch,
+  noad-0.7.0.20100119.ebuild:
+  Fix -Wl,--as-needed failure with "make check" wrt #305571, thanks to
+  Christian Ruppert for patch.
 
 *noad-0.7.0.20100119 (31 Jan 2010)
 
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index 8b22456439b7..cc80cb68ca06 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.6.0-r7/confd_vdraddon.noad 1443 RMD160 aa1dd8349139cb1aebfb06a759e57370ca6bf1e8 SHA1 5b2d15efa42a366b89a6ab6271f94618cad3c194 SHA256 6a1728d5b27f7964d0032f1f522f7057d8a5ebd8d6b542ad85fb4fc924b2308d
 AUX 0.6.0-r7/noad-reccmd 145 RMD160 928c85fbd77afa5239ae3c7ef3923e2cfd0f61af SHA1 0ff3d16a7178b7fd47f849a8adcc358584d839e6 SHA256 f9d3c963f1c745cd671925c1a48c5e4785cfc913c416dc0fd5963ff625e4a653
 AUX 0.6.0-r7/reccmds.noad.conf 61 RMD160 c62bdb45da8ae9aabfbd7a688f4600a5af04397f SHA1 d5fe02b78a5abd932fe0d6a5769bc8aa2e3ca54c SHA256 41dbc62f88429710b92f6d7cc45c49a967ae1376fc01b5b485b51f7e077ed20d
@@ -15,6 +12,7 @@ AUX patches-0.6.0/hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38
 AUX patches-0.6.0/lavc.patch 524 RMD160 ba56259bec165aa79bcb5a9b94c8bd5eb5d97d4d SHA1 0583ba0c6dbc7a7fd014af68376ab7eabf49a609 SHA256 bc544218c4894eba6f48b90ea5df12f86fdb38330d93d4d2e0ac305f71a0d5c4
 AUX patches-0.6.0/new-ffmpeg-extern-c.diff 316 RMD160 c90e734ef1b105833a13e1dbd6ea85ece333c4b0 SHA1 10854a6893cb3388876a46e9179140790d051c6e SHA256 bc69d37f89aa5415953dca8480d47db4e34ec4996ef279649c0d7e10c6b3f55e
 AUX patches-0.6.0/series 126 RMD160 8b73b009a02477de8bf24980cab7260036a84c34 SHA1 bf359b445135235a38d5bcd39c7e38a80c542902 SHA256 a74330aed7d138edccfc1477626d830f21844fdd4b7929a5cae6176722f2b60a
+AUX patches-0.7.x/noad-0.7.0.20100119-asneeded.patch 389 RMD160 cab42bdd50b110ee9034abd305a027736bd14009 SHA1 0667e2fa1ea099f2a7a2864e7daa3068778174e2 SHA256 d89f1ba460ab86ee65245c1a9e8d77b260b0b225c2b240c52f956b6356a4b2d4
 AUX patches-0.7.x/noad-0.7.0_gcc-4.4.diff 2023 RMD160 cc199fc64fdbad9f87ac7cb41965208bf5936042 SHA1 8c95de380a16019de7bdfa293a0dff9f584348cf SHA256 bb7d6b7ee1a9275a8dddf3cb5557c7643acf06f1c5cddd415e9ebc1737d96c7b
 AUX pre-shutdown-15-noad.sh 771 RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741 SHA1 052504eea27ea04d10dff671df3929b62a404e15 SHA256 c5a711256fc48bf8edd7b28f23ae61aa365370cec9b0470ca1c017a5e36e66c2
 DIST noad-0.6.0.tar.bz2 151369 RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd SHA1 21ade875f92b5f3a24456fbf6897634966bb0286 SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183
@@ -23,15 +21,7 @@ DIST noad-0.7.0.tar.bz2 172535 RMD160 253e8759b7423c998bae9d5b0409eb3013b0d6aa S
 EBUILD noad-0.6.0-r7.ebuild 2146 RMD160 bb23317285f368cc575cad44c7ccc36b5d8e3847 SHA1 ae0a49fd38b1884dd2fb5b10b1c36c774c113fff SHA256 aa8660ebeb71d09278f85274a3c89b0efe78fbc599a8f05923fdfa8216d67aaa
 EBUILD noad-0.6.0-r8.ebuild 2299 RMD160 4e4f1b28008a8e3ccc25db9476020c8de35cb55d SHA1 8c60d0b3477c51009ecff14d79fea4e7f4bde68d SHA256 7bb7ee37484571c73518b29c79ec6106bcc13e1c2cdc0ba8ff93f971b927819f
 EBUILD noad-0.6.0-r9.ebuild 2646 RMD160 c15910b990adca073f044eb7fafa1781b34aad86 SHA1 c2fffe220aa6fd590ee9b82e334ec6684a6745c2 SHA256 c2ba17500a4959f24147eb90e3d1f4d6c19b675265a87c5fb7607ae090d7fc91
-EBUILD noad-0.7.0.20100119.ebuild 2180 RMD160 99bf27646d4a7111ef9d26308e824600d334f65e SHA1 4e6d33c24ebf661982295b66cd789a7f5d04e03f SHA256 1cab2b4afff03980d815bf59bde290a679a64885696edd9e2af60eee0f0d09ef
+EBUILD noad-0.7.0.20100119.ebuild 2183 RMD160 99b8788531c38bb4d445141366c9581d8e142690 SHA1 970083df9835219e8d4980faf88dcabe2a3968ec SHA256 43ec8b9fd178d2bba1e40ac1ad0acd93cfc931ad2808f07258b721a061e1b62f
 EBUILD noad-0.7.0.ebuild 2318 RMD160 2bb4cbfcac8e32fcf3049fec799a57d8ff71a6f8 SHA1 256fa5322f47dac549a3c097b6a0af1eade6ec95 SHA256 36d6896bea33b9cfb281f4d8bd44cf981313d3ba1723cd5d976b687229a3dcb2
-MISC ChangeLog 7640 RMD160 c3cef6c2de5b6bdb3b1ed5cb37e03cf689499ba8 SHA1 c7d35fa200ef796c707810278193f81ca528dabf SHA256 fdeea2f99cacb1fe6259e53844081f7f765412b7ddfdb4626d708679df36f586
+MISC ChangeLog 7886 RMD160 0ce22866f9b8c62b671641ae44ccabe25d4f9c99 SHA1 0b34d8d9e2d0379489f44b98543a9cc60b12ccc2 SHA256 81c90b73e31b825aa35c21671324fe61be3fde3b6e800e2921f0802125e7e79c
 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
-
-iD8DBQFLZZogdn07HTTCgIoRAklLAKCr4Vy6UUEWEa4TTDRDQFbyCAh8QwCeNOZX
-bDfVv52IKH8b1sj/hdyUtqk=
-=anXv
------END PGP SIGNATURE-----
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch b/media-video/noad/files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch
new file mode 100644
index 000000000000..1d01dad4bedc
--- /dev/null
+++ b/media-video/noad/files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/show_bug.cgi?id=305571
+
+--- Makefile.am
++++ Makefile.am
+@@ -14,8 +14,7 @@ noinst_PROGRAMS=@PICSRC@ @TOOLSRC@
+ EXTRA_PROGRAMS=markpics showindex
+ 
+ markpics_SOURCES=markpics.cpp
+-markpics_LDADD=libnoad.a
+-markpics_LDFLAGS=-lMagick++
++markpics_LDADD=libnoad.a -lMagick++
+ markpics_CXXFLAGS=@markpiccxxflags@
+ showindex_SOURCES=showindex.cpp
+ showindex_LDADD=libnoad.a
diff --git a/media-video/noad/noad-0.7.0.20100119.ebuild b/media-video/noad/noad-0.7.0.20100119.ebuild
index b7263415b4a1..8a593802e8d9 100644
--- a/media-video/noad/noad-0.7.0.20100119.ebuild
+++ b/media-video/noad/noad-0.7.0.20100119.ebuild
@@ -1,12 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.0.20100119.ebuild,v 1.1 2010/01/31 14:57:15 hd_brummy Exp $
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.0.20100119.ebuild,v 1.2 2010/02/25 18:44:08 ssuominen Exp $
 
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-
-inherit eutils autotools
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Mark commercial Breaks in VDR records"
 HOMEPAGE="http://noad.heliohost.org/"
@@ -24,7 +21,8 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 
-	epatch "${FILESDIR}"/patches-0.6.0/hangcheck.diff
+	epatch "${FILESDIR}"/patches-0.6.0/hangcheck.diff \
+		"${FILESDIR}"/patches-0.7.x/${P}-asneeded.patch
 
 	if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then
 		sed -e "s:include/ffmpeg:include/libavcodec:g" -i configure.ac