[gentoo-commits] gentoo-x86 commit in media-video/chaplin: ChangeLog chaplin-1.10-r1.ebuild

["Tim Harder (radhermit)" <radhermit@gentoo.org>]

radhermit    11/11/21 21:06:12

  Modified:             ChangeLog chaplin-1.10-r1.ebuild
  Log:
  Update to EAPI 4, add rdep on mjpegtools, add optional rdep on graphicsmagick (bug #314329), and respect LDFLAGS, CFLAGS, and CC (bug #335538).
  
  (Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

Revision  Changes    Path
1.12                 media-video/chaplin/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/chaplin/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/chaplin/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/chaplin/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/chaplin/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog	19 Dec 2009 21:59:26 -0000	1.11
+++ ChangeLog	21 Nov 2011 21:06:11 -0000	1.12
@@ -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:



1.7                  media-video/chaplin/chaplin-1.10-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/chaplin/chaplin-1.10-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/chaplin/chaplin-1.10-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/chaplin/chaplin-1.10-r1.ebuild?r1=1.6&r2=1.7

Index: chaplin-1.10-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/chaplin/chaplin-1.10-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- chaplin-1.10-r1.ebuild	19 Dec 2009 21:59:26 -0000	1.6
+++ chaplin-1.10-r1.ebuild	21 Nov 2011 21:06:11 -0000	1.7
@@ -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 @@
 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 @@
 		"${FILESDIR}"/${P}-asneeded.patch
 }
 
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
 src_install() {
-	dobin chaplin chaplin-genmenu || die
+	dobin chaplin chaplin-genmenu
 }