Fix building with media-gfx/imagemagick >= 6.8 wrt #467134. Fix building with recent media-video/ffmpeg (missing -lavutil linkage)

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 32 insertions, 15 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index c404188f2da1..da72febee72d 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.56 2013/04/04 10:49:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.57 2013/04/25 05:03:28 ssuominen Exp $
+
+  25 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> noad-0.7.3-r1.ebuild:
+  Fix building with media-gfx/imagemagick >= 6.8 wrt #467134. Fix building with
+  recent media-video/ffmpeg (missing -lavutil linkage)
 
   04 Apr 2013; Alexis Ballier <aballier@gentoo.org>
   +files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff:
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index c457580dfd9b..7975ddd9343e 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -11,14 +11,18 @@ AUX pre-shutdown-15-noad.sh 771 SHA256 c5a711256fc48bf8edd7b28f23ae61aa365370cec
 AUX reccmds.noad.conf 61 SHA256 41dbc62f88429710b92f6d7cc45c49a967ae1376fc01b5b485b51f7e077ed20d SHA512 953af51444af1e4a853e2a501fe0fb31ef0b982795e8a7b350cf0851f6f572884de87d74b71ce0630fcd59082290ce8b9730e343032fea6512da96f1a934fddb WHIRLPOOL be348899b9a66713b83d5ffc4af414eadecebefa631910826382bcd82efcb20715bb55310173fb77e4980ab110bbd1513acc6c36c6aef65e93f0504ca3b40db7
 AUX record-50-noad.sh 1561 SHA256 aab6b817dfd01664605db4f40352bc8b7ef5d71599375b70288472fad107e017 SHA512 0906f0493c4a5db71584771931cfa8bfcb9577193f9ce6971e700b4baf5c6aaa5a26498f22064ce41b4ad2b06fc097dcf45f144ea233b596509fd204249a8dd0 WHIRLPOOL d93a13e9bc1f181917b6c6f02378da6729948c40282b59b64e97151ad15d905b6a0594831845dcb27ae454a83fd605f3ed4daee41b51137e3806ec02001a6934
 DIST noad-0.7.3.tar.bz2 174036 SHA256 6fb597fb0ae0e4c4c954f2feb89dcc88c4852a0f0845aa214606996abb29f6cb SHA512 0edc81c9b689c49b99cd68b80bf7acbb0af9757b4d5439edd0610ca96bf0ee4783844aa0dfe52e3303b21f5794af3ad9a216371d4e698bbf26f24bc31be43c66 WHIRLPOOL cfa03475dc657502fb4ccd67ddb8139edac4b4693e98c9897eb2ac99b38fc5cbe678f975244cd06a8d9464b5c4da9bd1b4354938d4e833e05fae5c2d7e220be2
-EBUILD noad-0.7.3-r1.ebuild 2096 SHA256 0b3bb10b582e3a0c9b485fd9f41f32549f25a102a8268827670908a0b8570c15 SHA512 f1a6b923a2341551b26e0643e2d4b0ac9a4a2b2f86553904ef15bb3d14fffbe62b830f2c0fc611a1c140d7e09a4bec4748f678a087f76cf553331a0fe5ee914e WHIRLPOOL 648ff77169f2ca3c961ef838eb58eecac3759a81b2c802aa94849ee9f46c7a943c46c692fe6708e072eefe70638fcdf8711a8d2524bd865038d9ef0ac7aec66b
+EBUILD noad-0.7.3-r1.ebuild 2328 SHA256 b0b3860720874472efbae2bfa1aba427f32f3087c6f2528e93f7da97a7eaf76a SHA512 2164e96ee4eba9bf6636c8782e6ae25f9e706226baf3ea3c8f0e40a9cb9384e3052060f1b8a129f8ea03289dd39815faf1580bbc70f9160ef8ac94f08e2b3558 WHIRLPOOL 01384b76b6baf5f60683277ac6ceb93ff44254c1a5f83988372a62a7d8b2734d81102b473d07a038df4eb0e870b15998cd94fc6f1b669e4f687a7178e8b25c90
 EBUILD noad-0.7.3.ebuild 2141 SHA256 aec491adaab8f446d581ab1633687943fff812a65a62ae0e0a957b0eefa95c10 SHA512 806fb4a3f0d78ea999da1aab2593354480f11198ee38846123a37b61a78391562b0c5ca66c9f01a545a18044dcdbe6de97e8cbd460dd4a196bbc211f4886267e WHIRLPOOL 2ba02f725aedeabf84b9475c57c4b5623ba3d426604fc4ad5a1b5cedcd59e9f4e78a0f42afb4b6b0b0cef1a0564fd77f83a5f4e35f3e1d050028bfd78df86014
-MISC ChangeLog 12559 SHA256 d57ef1fccb3bc719ce2da78f0868ffea86a68aee1796f559ebef9495e94e32ab SHA512 20520070a855c0c4b982f3855cc7dda7b639cc8540921c6a315c8b3f56ce7da8b6d82df4b9c20d7ccb66167380a28c38c76c6a0112d4d420e3922eaeb28231ea WHIRLPOOL 0e6131098260cf4bfa350b4d511848f781b8e5e6ec1ff1534b962dac09c7b2efab9ef29fde2640a9e8a1cf88afac179a709e14e50c9f0e38957d31330a2256f4
+MISC ChangeLog 12772 SHA256 7e51e156fc34deed01627e99761d2c9046e5de905deab52188c22e2e87d23067 SHA512 022927102d3d6126c0d58a3b7e866f4974a09ddfaa8183af8747398935672829a7ffe433652fd3f9037681c658a3e8993737ff87e362cbeb03073324858de88b WHIRLPOOL 6c065a9147d46654b3d9045a3fb09e11510713975a6ab820492d499ba6f846df27930182fbb10fd7b47f13762cad1b616b0888077b4ccc1ef28af02293643f5c
 MISC metadata.xml 345 SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4 SHA512 c9a6eab9ba0873c93139d163b3b80bb82a807a11011f99e4a64d302d181f56e8ed8718be3542bc85b37ab589071ba40446d303646b27b5d4d2772f18a1a5c2ce WHIRLPOOL 87f5189838d1e76a4a38a3b61cbbe1ecc397439fc5c64a0f58ff01e3d09c897df06e7a914a4c62ab06675b0756cc5776c8145c96efbc3ecd5eb960bad5da3aee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFdWqcACgkQvFcC4BYPU0r0tgCfVgU6VThpL9NdYP50wSNg+RpI
-8nkAnRqXHqTTxhcZ7Cs3iRnPyGH51koe
-=4Ja0
+iQEcBAEBCAAGBQJReLjSAAoJEEdUh39IaPFNTLcIAJXdA+weFgKHjxGfedZzWw+w
+NPOtPgbQ5YJsjgoEUsUr+g9JEK/IOsw9J5Q2ztL511+B9Crr1sXBpHbrZJV/MKWc
+bN2wm1xH7vSA3+O9F5saqVdmxB0Btr9hZ1SWGk7htc/YWvHHPVFAffdDtS82WZZd
+QYcZklT0iiz9BOtdLOO3mqtAEH4vEtAGiOTPeB5MnDUvbTd3fMwsG9lRiUFGX7kq
+uhZoTiYLmX63YRIwwpqbtUKc9gMdm1xAZHVNOFTtGsn+NUov3tZzM8PM8XDn+oOc
+HYYCRFclpIVZoCNsV5XDUjvwstVwITyUVDJHXqDpeDAPImkeekrC9vTtBVC84zk=
+=gqce
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/noad-0.7.3-r1.ebuild b/media-video/noad/noad-0.7.3-r1.ebuild
index 83363fd61577..c2afe50313c5 100644
--- a/media-video/noad/noad-0.7.3-r1.ebuild
+++ b/media-video/noad/noad-0.7.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3-r1.ebuild,v 1.1 2013/03/29 09:41:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3-r1.ebuild,v 1.2 2013/04/25 05:03:28 ssuominen Exp $
 
 EAPI=5
-inherit autotools eutils
+inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Mark commercial Breaks in VDR records"
 HOMEPAGE="http://noad.heliohost.org/"
@@ -12,13 +12,14 @@ SRC_URI="http://noad.heliohost.org/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg imagemagick"
+IUSE="ffmpeg"
 
-DEPEND="media-libs/libmpeg2:=
+RDEPEND="media-gfx/imagemagick:=
+	media-libs/libmpeg2:=
 	ffmpeg? ( virtual/ffmpeg )
-	imagemagick? ( media-gfx/imagemagick:= )
 	!media-plugins/vdr-markad"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
 	EPATCH_FORCE=yes EPATCH_SUFFIX=diff EPATCH_SOURCE="${FILESDIR}"/patches-${PV%.*}.x epatch
@@ -29,26 +30,34 @@ src_prepare() {
 
 	sed -i -e '/CXXFLAGS.*O3/d' configure.ac || die #426746
 
+	sed -i \
+		-e "s:-lMagick++:$($(tc-getPKG_CONFIG) --libs-only-l Magick++):" \
+		Makefile.am || die #467134
+
 	# FIXME: --with-tools, markpics will compile but showindex won't!
 	sed -i \
 		-e '/^noinst_PROGRAMS/s:@TOOLSRC@::' \
 		-e '/^EXTRA_PROGRAMS/s:showindex::' \
 		Makefile.am || die
 
+	# ld: audiotools.o: undefined reference to symbol 'av_free@@LIBAVUTIL_51'
+	if use ffmpeg; then
+		sed -i -e 's:-lavcodec:& -lavutil:' configure.ac || die
+	fi
+
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_with imagemagick magick) \
+		--with-magick \
 		--with-mpeginclude=/usr/include/mpeg2dec \
 		--with-tools \
 		$(usex ffmpeg '--with-ffmpeg --with-ffmpeginclude=/usr/include' '')
 }
 
 src_install() {
-	dobin noad # showindex
-	use imagemagick && dobin markpics
+	dobin noad markpics # showindex
 
 	dodoc README INSTALL
 	# example scripts are installed as dokumentation