summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-04-21 19:49:10 +0000
committerTim Harder <radhermit@gentoo.org>2011-04-21 19:49:10 +0000
commit21c09fc9448578698841b4aaa4826e6b2939d35f (patch)
tree81a459d14b49a39b18db229861cbfe05407de3cc /media-video/dvd-slideshow
parentVersion bump and remove old. Use virtual/ffmpeg (bug #362113) and simplify gt... (diff)
downloadgentoo-2-21c09fc9448578698841b4aaa4826e6b2939d35f.tar.gz
gentoo-2-21c09fc9448578698841b4aaa4826e6b2939d35f.tar.bz2
gentoo-2-21c09fc9448578698841b4aaa4826e6b2939d35f.zip
Allow graphicsmagick to statisfy imagemagick dependency (bug #314335), add media-video/mjpegtools dependency (bug #340779), and use virtual/ffmpeg (bug #362125).
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'media-video/dvd-slideshow')
-rw-r--r--media-video/dvd-slideshow/ChangeLog9
-rw-r--r--media-video/dvd-slideshow/dvd-slideshow-0.8.2.2.ebuild11
2 files changed, 14 insertions, 6 deletions
diff --git a/media-video/dvd-slideshow/ChangeLog b/media-video/dvd-slideshow/ChangeLog
index c507a3f0a5ce..bac87a347106 100644
--- a/media-video/dvd-slideshow/ChangeLog
+++ b/media-video/dvd-slideshow/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/dvd-slideshow
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvd-slideshow/ChangeLog,v 1.19 2008/12/21 14:52:16 nixnut Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvd-slideshow/ChangeLog,v 1.20 2011/04/21 19:49:10 radhermit Exp $
+
+ 21 Apr 2011; Tim Harder <radhermit@gentoo.org> dvd-slideshow-0.8.2.2.ebuild:
+ Allow graphicsmagick to statisfy imagemagick dependency (bug #314335), add
+ media-video/mjpegtools dependency (bug #340779), and use virtual/ffmpeg (bug
+ #362125).
21 Dec 2008; nixnut <nixnut@gentoo.org> dvd-slideshow-0.8.2.2.ebuild:
Stable on ppc wrt bug 250664
diff --git a/media-video/dvd-slideshow/dvd-slideshow-0.8.2.2.ebuild b/media-video/dvd-slideshow/dvd-slideshow-0.8.2.2.ebuild
index a477bfabb8d3..f207d82c8f3b 100644
--- a/media-video/dvd-slideshow/dvd-slideshow-0.8.2.2.ebuild
+++ b/media-video/dvd-slideshow/dvd-slideshow-0.8.2.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 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/dvd-slideshow/dvd-slideshow-0.8.2.2.ebuild,v 1.3 2008/12/21 14:52:16 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvd-slideshow/dvd-slideshow-0.8.2.2.ebuild,v 1.4 2011/04/21 19:49:10 radhermit Exp $
+
+EAPI=2
inherit versionator
@@ -18,10 +20,11 @@ KEYWORDS="amd64 ppc x86"
IUSE="examples mp3 themes vorbis"
RDEPEND="media-sound/sox
- >media-gfx/imagemagick-5.5.4
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+ media-video/mjpegtools
>media-video/dvdauthor-0.6.11
virtual/cdrtools
- >=media-video/ffmpeg-0.4.9
+ virtual/ffmpeg
app-cdr/dvd+rw-tools
mp3? ( media-sound/lame )
vorbis? ( media-libs/libvorbis )