summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-03-01 17:47:41 +0000
committerMike Gilbert <floppym@gentoo.org>2012-03-01 17:47:41 +0000
commit1d8e3efbbc2a90fff615a7c830882bb4f88830dc (patch)
tree93e12238145fc5d80d8e83ca7608fe16befc0532 /net-misc
parentVersion bump. (diff)
downloadgentoo-2-1d8e3efbbc2a90fff615a7c830882bb4f88830dc.tar.gz
gentoo-2-1d8e3efbbc2a90fff615a7c830882bb4f88830dc.tar.bz2
gentoo-2-1d8e3efbbc2a90fff615a7c830882bb4f88830dc.zip
Add graphicsmagick[imagemagick] as an alternative per ssuominen.
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/ps3mediaserver/ChangeLog5
-rw-r--r--net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/net-misc/ps3mediaserver/ChangeLog b/net-misc/ps3mediaserver/ChangeLog
index e49a69cba04e..d21e57f510ef 100644
--- a/net-misc/ps3mediaserver/ChangeLog
+++ b/net-misc/ps3mediaserver/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-misc/ps3mediaserver
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ChangeLog,v 1.9 2012/03/01 16:08:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ChangeLog,v 1.10 2012/03/01 17:47:41 floppym Exp $
+
+ 01 Mar 2012; Mike Gilbert <floppym@gentoo.org> ps3mediaserver-1.50.1.ebuild:
+ Add graphicsmagick[imagemagick] as an alternative per ssuominen.
01 Mar 2012; Mike Gilbert <floppym@gentoo.org>
-ps3mediaserver-1.20.412-r1.ebuild, -ps3mediaserver-1.40.0.ebuild,
diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild
index 485111d8781f..023a833fea70 100644
--- a/net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild
+++ b/net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild,v 1.2 2012/03/01 16:08:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild,v 1.3 2012/03/01 17:47:41 floppym Exp $
EAPI="4"
@@ -17,7 +17,7 @@ IUSE="multiuser +transcode tsmuxer"
DEPEND="app-arch/unzip"
RDEPEND=">=virtual/jre-1.6.0
- media-gfx/imagemagick
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
media-libs/libmediainfo
media-libs/libzen
tsmuxer? ( media-video/tsmuxer )