6 files changed, 14 insertions, 227 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/Manifest b/net-misc/ps3mediaserver/Manifest
index f4cabc1da1ef..09e28d9fa5fd 100644
--- a/net-misc/ps3mediaserver/Manifest
+++ b/net-misc/ps3mediaserver/Manifest
@@ -3,20 +3,14 @@ Hash: SHA256
 
 AUX ps3mediaserver.confd 295 RMD160 5cc1d1e4705285c477572e22b56f48f2cf1dd40a SHA1 9e1f38ab0ed06543962e2df404c30db144ace871 SHA256 cc648aa4ccaa6e1abcfe96570f53f539d351415f0e97838e216c68c97d898665
 AUX ps3mediaserver.initd 524 RMD160 308fea859487b1a49b49a2c273ac31935691c9a4 SHA1 46e757adb7ef5c452ebefa172edf15a19b7a5949 SHA256 750d8e1c0ae6b3e6540475fc085f4efdca99302e9be59b4bb95e926e87bd2ee9
-DIST pms-generic-linux-unix-1.20.412.tgz 7900523 RMD160 abd47aad0365da3467d767b7fc0d6afaf9d38462 SHA1 c7b609a27aeab358e870b5c490425206e067bd01 SHA256 079005710f738782194740cbb79e5968e2cad44cd33872a2e2eccba08b504eaf
-DIST pms-generic-linux-unix-1.40.0.tgz 10712683 RMD160 2dab0ddac33b6279eda3eaff1987cc3872f85c74 SHA1 856024890f4e024da32169c1243deba08e597c08 SHA256 7a13184defc89c15d9a2f47c5a32472ba479b9d267fcfecf8224528f9cd59a50
-DIST pms-generic-linux-unix-1.50.0.tgz 12336817 RMD160 8f9fd855a18bdc185f32f691e7a347125bef6a6f SHA1 2bd968a792a4409f45aa4cf25c8796c021fd1dd2 SHA256 22bcb820a89b771ce2ca8455e671b0b8372f29b22e0d9ca9c303d30d58ddbdde
 DIST pms-generic-linux-unix-1.50.1.tgz 12433420 RMD160 9c7255d1ade4b8ed2727aed555f9532f575a0970 SHA1 9def50c8757802ad76e927dc729d2abcb8dd650f SHA256 d2d9c659470af96a6bf7c2ca83b9a25cdc9f2a22f1cac758be71a9f3c9ea23ec
-EBUILD ps3mediaserver-1.20.412-r1.ebuild 1407 RMD160 1163b63dca9218c811296d9c61b21e2d71f71606 SHA1 4eab383ddd250c8bf015ca388b07a774b721b1b3 SHA256 ce168534764353897f1fc1ba84f533d5b44cc16edb93f39a52b61ff23baaacb2
-EBUILD ps3mediaserver-1.40.0.ebuild 1855 RMD160 31f13a5f746ee63e9fcf2d45d0cb43c2ea56c98f SHA1 0329709134e75169b379aa791d73328761f07f75 SHA256 ed36389eeb0df2fe198261777a55beee3a7e22e06c47e3271522f7d6666a3128
-EBUILD ps3mediaserver-1.50.0.ebuild 2287 RMD160 26108063aebbbf59bec808ac5715ecdbaaa48a08 SHA1 d10b5d3b1de8f3120452f7991825264df567a341 SHA256 aeafd3be88739b5eefe776d6b88636b50887221f5c2e1929159f25c042f55d7b
-EBUILD ps3mediaserver-1.50.1.ebuild 2287 RMD160 7e946c57deb55e384b3dca1faf644294b6ebea46 SHA1 47e7261fa839c5b632242540ab1b6229ee69b1c7 SHA256 244ea73330c44f065a355f7030bcba1f2dac67f3df192e93401f2f4a6f5c5704
-MISC ChangeLog 1641 RMD160 3addf5d03ccd2699b5058be3ade584bc7f96ced6 SHA1 39e94e84d7346e92d8376545bb23ee6789b7424b SHA256 294893dd5ff30d759361279dfe217bbcf3b09545b8b1a1078cbd4e03e9869754
+EBUILD ps3mediaserver-1.50.1.ebuild 2310 RMD160 177c7ab0078b6237378b56c28a61615bb9f3a721 SHA1 ab855d14c4ae54e50fff3899da54e489db1835c1 SHA256 eb8a4468fe6dbde364ce335b9b1a5ae27e01dd1e5e0569c39f0069b13b9bd505
+MISC ChangeLog 1910 RMD160 7ba2522264f827f5933c63cffad96909409d0d74 SHA1 e532a47a06fbd5248acc46805c4488b0794e200e SHA256 8c62570f82a6d3b12c871686d500c6b1ea8b6f891bc9b9b29332ff763a993b9a
 MISC metadata.xml 588 RMD160 12c405dfff2c08e3f0cb81d01523b4ec16cf79ae SHA1 72df675f381d1a60ae4325a5f1a232a40af022e7 SHA256 a522310126eb0bec5b6109035983254632ba5802b0942ceea8f036af459666bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9BtYgACgkQC77qH+pIQ6Q91wD/Ss/hW34Ou9W/esx6M+KEaSV0
-Vefw/a1Dm0SwALv0UmAA/1leTQ8hZOSpUNQ89URkGEt8BKqgijq7xvAL/8Nm7xL5
-=CdSV
+iF4EAREIAAYFAk9PnwEACgkQC77qH+pIQ6TTEQEAga5zRh7fDtWFgQdhvwLfE/s/
+35pahrf0tZu86cpVJKYBAJXSMWXfiVc+hk07wf1pzYTfapxErtBBs91Kt06SmglS
+=/ZVt
 -----END PGP SIGNATURE-----
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 )