Update to EAPI 4, add rdep on mjpegtools, add optional rdep on graphicsmagick (bug #314329), and respect LDFLAGS, CFLAGS, and CC (bug #335538).

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

4 files changed, 39 insertions, 14 deletions

diff --git a/media-video/chaplin/ChangeLog b/media-video/chaplin/ChangeLog
index 840817964d24..687684ac3ef8 100644
--- a/media-video/chaplin/ChangeLog
+++ b/media-video/chaplin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/chaplin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/ChangeLog,v 1.11 2009/12/19 21:59:26 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/ChangeLog,v 1.12 2011/11/21 21:06:11 radhermit Exp $
+
+  21 Nov 2011; Tim Harder <radhermit@gentoo.org> chaplin-1.10-r1.ebuild,
+  files/chaplin-1.10-asneeded.patch:
+  Update to EAPI 4, add rdep on mjpegtools, add optional rdep on graphicsmagick
+  (bug #314329), and respect LDFLAGS, CFLAGS, and CC (bug #335538).
 
   19 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
   chaplin-1.10-r1.ebuild, +files/chaplin-1.10-asneeded.patch:
diff --git a/media-video/chaplin/Manifest b/media-video/chaplin/Manifest
index 1d199aa6596a..2d3c6211aa36 100644
--- a/media-video/chaplin/Manifest
+++ b/media-video/chaplin/Manifest
@@ -1,6 +1,20 @@
-AUX chaplin-1.10-asneeded.patch 782 RMD160 aa8d599793af952de733ef8770c2d46f9fcc4dd2 SHA1 37d6bf772daa49db74e45f5ab669072ef60fa55d SHA256 032a17abd6c524beb9a336dcd207c56820c5b9e898ce1bb91cef6310452357a2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX chaplin-1.10-asneeded.patch 828 RMD160 7219740f418a26467390eeb0f68c2867476086ea SHA1 0e696aeb20c0c47af868a0509b06abbd91443411 SHA256 b048bdaa35f1d0e447b96f4783b744733c89623a036af99a0f0c82950a126514
 AUX chaplin-1.10-libdvdread-0.9.6.patch 334 RMD160 04df4270c6f0a4e87a9cfc7e77f7b90c63968f03 SHA1 de79ffe2de1e2e96f77cdbd36b69a21eda73ef47 SHA256 853967d7caa5a0921f3147ab0ae23f99e8fd1933906711fe028ad2c5463d5cdb
 DIST chaplin-1.10.tgz 23843 RMD160 2a24075486edd52b5ed24254b5ff9a8d845bf4fc SHA1 864fe0942998f79044f3cb3ce8decc8831edbcfe SHA256 064d3226d003477ae81273cee3870b5797f647623f67eb05e5c1e2e910d89228
-EBUILD chaplin-1.10-r1.ebuild 847 RMD160 0dee2f4a421997997246dcdf0c3391ef78bd4b69 SHA1 270519cd19ff0c275bcf489c2389ce932b4ffdc7 SHA256 3baefe33cb4b44705c460c9d0da42ac22b83450bb4afcea03387a1ebf3c6bc5f
-MISC ChangeLog 1562 RMD160 5e0e62932be08a2abd49d853db3476d6e62c9d17 SHA1 72ae70650d3ed10b848bb8950303064cbfd964fb SHA256 962d4b0fbfdb64841454aa3ef6067ee2af6c4fd2bd4c9d0db427e166ecd8be2c
+EBUILD chaplin-1.10-r1.ebuild 977 RMD160 bb123a0cfc1d701100d7fb0628797f17a48c79e0 SHA1 e0ad2aaf399594fa8e543610a8bc16143f8986e0 SHA256 6ff7f6498f689b077cb200ae94114ad9ac82f46c641e8b0ce823d815f0d0e143
+MISC ChangeLog 1821 RMD160 0cdc108c6c0fc88ac97a76dcb01cc145603f3d06 SHA1 aff121be71fab44cb7c216eaf13ddb199346b850 SHA256 4e82217c19774e4398ced470525852b39aa729bf3e250a0624652f492ea30e02
 MISC metadata.xml 319 RMD160 347e166237c6dbaf43e3c060ccbf82bb33184608 SHA1 b1ace8cd78829ade1b9692e5847f34d3a90e15c8 SHA256 c429c431ff61616b46b358272418e09e2878aa69e407ac8190710a436fde34ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOyr1JAAoJEEqz6FtPBkyjfSUH/2GsmrA+vmzzb6qirwRTQNUs
+KSI0ds1/FyFMVD2WZyhUHHF8dQD9DZNqp8WPian59PcUUGEY7B/pHvmZSCm9jiW0
+pqw9TgxevnoF1TiXBoh7KzhZ5ABStK5foqj73Xh7Jl9dFK3gx/n2YDmkYExOvKxB
+SxD3Ce+q3MPOfc9esMRhlGNQ/NGxtSM2/5pq70bCUXVadKBtSvHO1XJdCLhmGdsk
+qk2liK85IOiBGkkzpALEK5IcjHxkGx1KdhUkIXghHCTIFKxWD5W603oUrldq0u9u
+gTZ93DNCQhFQnTx47UibPnGZNOAoHAPSUQh13e+JAmpLeaJWEcWxo9AyzVkhkcc=
+=oK99
+-----END PGP SIGNATURE-----
diff --git a/media-video/chaplin/chaplin-1.10-r1.ebuild b/media-video/chaplin/chaplin-1.10-r1.ebuild
index 6d743ed90770..d022be24345e 100644
--- a/media-video/chaplin/chaplin-1.10-r1.ebuild
+++ b/media-video/chaplin/chaplin-1.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/chaplin-1.10-r1.ebuild,v 1.6 2009/12/19 21:59:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/chaplin/chaplin-1.10-r1.ebuild,v 1.7 2011/11/21 21:06:11 radhermit Exp $
 
-EAPI=2
-inherit eutils
+EAPI=4
+inherit eutils toolchain-funcs
 
 DESCRIPTION="This is a program to raw copy chapters from a dvd using libdvdread"
 HOMEPAGE="http://www.lallafa.de/bp/chaplin.html"
@@ -14,8 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="transcode vcd"
 
-DEPEND=">=media-libs/libdvdread-0.9.4
-	>=media-gfx/imagemagick-5.5.7.14
+DEPEND=">=media-libs/libdvdread-0.9.4"
+RDEPEND="${DEPEND}
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	media-video/mjpegtools
 	transcode? ( >=media-video/transcode-0.6.2 )
 	vcd? ( >=media-video/vcdimager-0.7.2 )"
 
@@ -26,6 +28,10 @@ src_prepare() {
 		"${FILESDIR}"/${P}-asneeded.patch
 }
 
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
 src_install() {
-	dobin chaplin chaplin-genmenu || die
+	dobin chaplin chaplin-genmenu
 }
diff --git a/media-video/chaplin/files/chaplin-1.10-asneeded.patch b/media-video/chaplin/files/chaplin-1.10-asneeded.patch
index 46acde6666cb..f7cb499407a8 100644
--- a/media-video/chaplin/files/chaplin-1.10-asneeded.patch
+++ b/media-video/chaplin/files/chaplin-1.10-asneeded.patch
@@ -5,11 +5,11 @@
  
  build:
 -	gcc -DNDEBUG -Wall -I$(LIBDVDREAD)/include -L$(LIBDVDREAD)/lib -ldvdread -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -lm
-+	gcc -DNDEBUG -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -DNDEBUG -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm
  
  debug:
 -	gcc -Wall -I$(LIBDVDREAD)/include -L$(LIBDVDREAD)/lib -ldvdread -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -lm
-+	gcc -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wall -I$(LIBDVDREAD)/include -Wl,-rpath,$(LIBDVDREAD)/lib -o chaplin chaplin.c -L$(LIBDVDREAD)/lib -ldvdread -lm
  
  dist:
  	cd .. ; tar cvfz chaplin.tgz chaplin/Makefile chaplin/chaplin.c chaplin/chaplin-genmenu chaplin/chaplin