Version bump for bug 434608.

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

3 files changed, 10 insertions, 99 deletions

diff --git a/net-misc/ps3mediaserver/ChangeLog b/net-misc/ps3mediaserver/ChangeLog
index b8f42689733a..fe47ea522987 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.14 2012/08/05 03:29:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ChangeLog,v 1.15 2012/09/11 00:13:38 floppym Exp $
+
+*ps3mediaserver-1.70.0 (11 Sep 2012)
+
+  11 Sep 2012; Mike Gilbert <floppym@gentoo.org> +ps3mediaserver-1.70.0.ebuild,
+  -ps3mediaserver-1.53.0.ebuild, -ps3mediaserver-1.54.0.ebuild:
+  Version bump for bug 434608.
 
 *ps3mediaserver-1.60.0 (05 Aug 2012)
 
diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.54.0.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.54.0.ebuild
deleted file mode 100644
index 4a62ba59a933..000000000000
--- a/net-misc/ps3mediaserver/ps3mediaserver-1.54.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.54.0.ebuild,v 1.1 2012/07/01 00:38:05 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-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	media-libs/libmediainfo
-	media-libs/libzen
-	tsmuxer? ( media-video/tsmuxer )
-	transcode? ( media-video/mplayer[encode] )"
-
-S=${WORKDIR}/pms-${PV}
-PMS_HOME=/opt/${PN}
-
-src_prepare() {
-	if use multiuser; then
-		cat > ${PN} <<-EOF
-		#!/bin/sh
-		if [ ! -e ~/.${PN} ]; then
-			echo "Copying ${PMS_HOME} to ~/.${PN}"
-			cp -pPR "${PMS_HOME}" ~/.${PN}
-		fi
-		export PMS_HOME=\${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.md
-
-	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.53.0.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.70.0.ebuild
index cdf6f1e8793e..d515f6c4386c 100644
--- a/net-misc/ps3mediaserver/ps3mediaserver-1.53.0.ebuild
+++ b/net-misc/ps3mediaserver/ps3mediaserver-1.70.0.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.53.0.ebuild,v 1.1 2012/06/17 03:26:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ps3mediaserver-1.70.0.ebuild,v 1.1 2012/09/11 00:13:38 floppym Exp $
 
 EAPI="4"
 
@@ -17,7 +17,6 @@ IUSE="multiuser +transcode tsmuxer"
 
 DEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.6.0
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
 	media-libs/libmediainfo
 	media-libs/libzen
 	tsmuxer? ( media-video/tsmuxer )
@@ -69,10 +68,8 @@ src_install() {
 	use tsmuxer && dosym /opt/tsmuxer/bin/tsMuxeR ${PMS_HOME}/linux/tsMuxeR
 	dodoc CHANGELOG README.md
 
-	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
+	newicon -s 32 icon-32.png ${PN}.png
+	newicon -s 256 icon-256.png ${PN}.png
 
 	domenu ${PN}.desktop