Need imagemagick for convert utility, bug 406395 by Brad Allen. Drop old versions.

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

5 files changed, 9 insertions, 216 deletions

diff --git a/net-misc/ps3mediaserver/ChangeLog b/net-misc/ps3mediaserver/ChangeLog
index 5f42e4a0982f..e49a69cba04e 100644
--- a/net-misc/ps3mediaserver/ChangeLog
+++ b/net-misc/ps3mediaserver/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2012/02/20 02:52:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ChangeLog,v 1.9 2012/03/01 16:08:27 floppym Exp $
+
+  01 Mar 2012; Mike Gilbert <floppym@gentoo.org>
+  -ps3mediaserver-1.20.412-r1.ebuild, -ps3mediaserver-1.40.0.ebuild,
+  -ps3mediaserver-1.50.0.ebuild, ps3mediaserver-1.50.1.ebuild:
+  Need imagemagick for convert utility, bug 406395 by Brad Allen. Drop old
+  versions.
 
   20 Feb 2012; Mike Gilbert <floppym@gentoo.org> files/ps3mediaserver.initd,
   ps3mediaserver-1.50.1.ebuild:
diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.20.412-r1.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.20.412-r1.ebuild
deleted file mode 100644
index bd9350c7ff7e..000000000000
--- a/net-misc/ps3mediaserver/ps3mediaserver-1.20.412-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ps3mediaserver-1.20.412-r1.ebuild,v 1.1 2011/01/07 17:03:11 vapier Exp $
-
-EAPI="2"
-
-DESCRIPTION="DLNA compliant UPNP server for streaming media to Playstation 3"
-HOMEPAGE="http://code.google.com/p/ps3mediaserver"
-SRC_URI="http://ps3mediaserver.googlecode.com/files/pms-generic-linux-unix-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+transcode tsmuxer"
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.6.0
-	tsmuxer? ( media-video/tsmuxer )
-	transcode? ( media-video/mplayer[encode] )"
-
-S=${WORKDIR}/pms-linux-${PV}
-
-src_prepare() {
-	rm linux/tsMuxeR* || die
-	cat <<-EOF > ${PN}
-	#!/bin/sh
-	echo "Setting up ~/.${PN} based on /usr/share/${PN}/"
-	if [ ! -e ~/.${PN} ] ; then
-		mkdir -p ~/.${PN}
-		cp -pPR /usr/share/${PN}/* ~/.${PN}/
-	fi
-	cd ~/.${PN}
-	PMS_HOME=\$PWD
-	EOF
-	cat PMS.sh >> ${PN}
-}
-
-src_install() {
-	dobin ${PN} || die
-	insinto /usr/share/${PN}
-	doins -r pms.jar *.conf linux plugins renderers || die
-	use tsmuxer && { dosym /opt/bin/tsMuxeR /usr/share/${PN}/linux/ || die ; }
-	dodoc CHANGELOG FAQ README
-}
-
-pkg_postinst() {
-	ewarn "Don't forget to disable transcoding engines for software"
-	ewarn "that you don't have installed (such as having the VLC"
-	ewarn "transcoding engine enabled when you only have mencoder)."
-}
diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.40.0.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.40.0.ebuild
deleted file mode 100644
index 70a6e944dbf9..000000000000
--- a/net-misc/ps3mediaserver/ps3mediaserver-1.40.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ps3mediaserver-1.40.0.ebuild,v 1.1 2011/11/04 04:16:52 floppym Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="DLNA compliant UPNP server for streaming media to Playstation 3"
-HOMEPAGE="http://code.google.com/p/ps3mediaserver"
-SRC_URI="http://ps3mediaserver.googlecode.com/files/pms-generic-linux-unix-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+transcode tsmuxer"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6.0
-	media-libs/libmediainfo
-	media-libs/libzen
-	tsmuxer? ( media-video/tsmuxer )
-	transcode? ( media-video/mplayer[encode] )"
-
-S=${WORKDIR}/pms-linux-${PV}
-
-src_prepare() {
-	cat > ${PN} <<-EOF
-	#!/bin/sh
-	echo "Setting up ~/.${PN} based on /usr/share/${PN}/"
-	if [ ! -e ~/.${PN} ] ; then
-		mkdir -p ~/.${PN}
-		cp -pPR /usr/share/${PN}/* ~/.${PN}/
-	fi
-	cd ~/.${PN}
-	PMS_HOME=\$PWD
-	EOF
-	cat PMS.sh >> ${PN}
-
-	cat > ${PN}.desktop <<-EOF
-	[Desktop Entry]
-	Name=PS3 Media Server
-	GenericName=Media Server
-	Exec=${PN}
-	Icon=${PN}
-	Type=Application
-	Categories=Network;
-	EOF
-
-	unzip -j pms.jar resources/images/icon-{32,256}.png || die
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r pms.jar *.conf documentation plugins renderers *.xml
-	use tsmuxer && { dosym /opt/tsmuxer/bin/tsMuxeR /usr/share/${PN}/linux/tsMuxeR; }
-	dodoc CHANGELOG README
-
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins icon-32.png ${PN}.png
-	insinto /usr/share/icons/hicolor/256x256/apps
-	newins icon-256.png ${PN}.png
-
-	domenu ${PN}.desktop
-}
-
-pkg_postinst() {
-	ewarn "Don't forget to disable transcoding engines for software"
-	ewarn "that you don't have installed (such as having the VLC"
-	ewarn "transcoding engine enabled when you only have mencoder)."
-}
diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.50.0.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.50.0.ebuild
deleted file mode 100644
index 618feba89273..000000000000
--- a/net-misc/ps3mediaserver/ps3mediaserver-1.50.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ps3mediaserver-1.50.0.ebuild,v 1.2 2011/11/30 07:28:28 floppym Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="DLNA compliant UPNP server for streaming media to Playstation 3"
-HOMEPAGE="http://code.google.com/p/ps3mediaserver"
-SRC_URI="http://ps3mediaserver.googlecode.com/files/pms-generic-linux-unix-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="multiuser +transcode tsmuxer"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.6.0
-	media-libs/libmediainfo
-	media-libs/libzen
-	tsmuxer? ( media-video/tsmuxer )
-	transcode? ( media-video/mplayer[encode] )"
-
-S=${WORKDIR}/pms-linux-${PV}
-PMS_HOME=/opt/${PN}
-
-src_prepare() {
-	if use multiuser; then
-		echo multiuser is on
-		cat > ${PN} <<-EOF
-		#!/bin/sh
-		if [ ! -e ~/.${PN} ]; then
-			echo "Copying ${PMS_HOME} to ~/.${PN}"
-			cp -pPR "${PMS_HOME}" ~/.${PN}
-		fi
-		export PMS_HOME=~/.${PN}
-		exec "\${PMS_HOME}/PMS.sh" "\$@"
-		EOF
-	else
-		cat > ${PN} <<-EOF
-		#!/bin/sh
-		export PMS_HOME=${PMS_HOME}
-		exec "\${PMS_HOME}/PMS.sh" "\$@"
-		EOF
-	fi
-
-	cat > ${PN}.desktop <<-EOF
-	[Desktop Entry]
-	Name=PS3 Media Server
-	GenericName=Media Server
-	Exec=${PN}
-	Icon=${PN}
-	Type=Application
-	Categories=Network;
-	EOF
-
-	unzip -j pms.jar resources/images/icon-{32,256}.png || die
-}
-
-src_install() {
-	dobin ${PN}
-
-	exeinto ${PMS_HOME}
-	doexe PMS.sh
-
-	insinto ${PMS_HOME}
-	doins -r pms.jar *.conf documentation plugins renderers *.xml
-	use tsmuxer && dosym /opt/tsmuxer/bin/tsMuxeR ${PMS_HOME}/linux/tsMuxeR
-	dodoc CHANGELOG README
-
-	insinto /usr/share/icons/hicolor/32x32/apps
-	newins icon-32.png ${PN}.png
-	insinto /usr/share/icons/hicolor/256x256/apps
-	newins icon-256.png ${PN}.png
-
-	domenu ${PN}.desktop
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-}
-
-pkg_postinst() {
-	ewarn "Don't forget to disable transcoding engines for software"
-	ewarn "that you don't have installed (such as having the VLC"
-	ewarn "transcoding engine enabled when you only have mencoder)."
-	if use multiuser; then
-		echo
-		ewarn "Make sure to refresh the .${PN} in your home directory if you are"
-		ewarn "upgrading from a previous version."
-	fi
-}
diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild
index ff224cbe7926..485111d8781f 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.1 2012/02/17 04:14:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild,v 1.2 2012/03/01 16:08:27 floppym Exp $
 
 EAPI="4"
 
@@ -17,6 +17,7 @@ IUSE="multiuser +transcode tsmuxer"
 
 DEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.6.0
+	media-gfx/imagemagick
 	media-libs/libmediainfo
 	media-libs/libzen
 	tsmuxer? ( media-video/tsmuxer )