Version bump. Remove old.

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

4 files changed, 16 insertions, 106 deletions

diff --git a/net-misc/ps3mediaserver/ChangeLog b/net-misc/ps3mediaserver/ChangeLog
index b16eefa16016..50310316500b 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.12 2012/06/17 03:26:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ps3mediaserver/ChangeLog,v 1.13 2012/07/01 00:38:05 floppym Exp $
+
+*ps3mediaserver-1.54.0 (01 Jul 2012)
+
+  01 Jul 2012; Mike Gilbert <floppym@gentoo.org> +ps3mediaserver-1.54.0.ebuild,
+  -ps3mediaserver-1.50.1.ebuild, -ps3mediaserver-1.52.1.ebuild:
+  Version bump. Remove old.
 
 *ps3mediaserver-1.53.0 (17 Jun 2012)
 
@@ -60,4 +66,3 @@
   06 Jan 2011; Mike Frysinger <vapier@gentoo.org>
   +ps3mediaserver-1.20.412.ebuild, +metadata.xml:
   Initial ebuild #264561 by Michael Mathurin.
-
diff --git a/net-misc/ps3mediaserver/Manifest b/net-misc/ps3mediaserver/Manifest
index 079d983ce317..c0fb399d031d 100644
--- a/net-misc/ps3mediaserver/Manifest
+++ b/net-misc/ps3mediaserver/Manifest
@@ -3,18 +3,16 @@ 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.50.1.tgz 12433420 RMD160 9c7255d1ade4b8ed2727aed555f9532f575a0970 SHA1 9def50c8757802ad76e927dc729d2abcb8dd650f SHA256 d2d9c659470af96a6bf7c2ca83b9a25cdc9f2a22f1cac758be71a9f3c9ea23ec
-DIST pms-generic-linux-unix-1.52.1.tgz 12142119 RMD160 2e25cbb72cdb62f39c5ee969bd558b3eeeab9ae8 SHA1 3074918dbd1c6cefe04830e8f58cd10f99d32d6d SHA256 01304a33e2db29cc48d09cd19a716ade7df99c2fd4fff37dc1f198a6b06085a4
 DIST pms-generic-linux-unix-1.53.0.tgz 12137056 RMD160 22436f342558eed0f68eb716bf1464a497855cb7 SHA1 2ef7008468aa4190fee7fe01e0133eb52b75ed90 SHA256 e943030bc5964e932fa1c1c9d37b469aa383f174ffdc8a2d101dc367422b7796
-EBUILD ps3mediaserver-1.50.1.ebuild 2355 RMD160 491ebc14c79613c0cc54fd93ec45c1427babde92 SHA1 72fabac0c91e5222a94d6f4481ee741e958628c5 SHA256 1842883224b48481afca5937e7b943bd94a33301765846df35e6b1ce06596b60
-EBUILD ps3mediaserver-1.52.1.ebuild 2329 RMD160 dfa94dfd7d303966bb43dee50fc148b3af7e3d06 SHA1 7adf1019a859967f833a4239c2fdf19c0979013b SHA256 759f1ec76da0c7b2cfd6bd9398072c81b239f25d63379901f71ea24857387179
+DIST pms-generic-linux-unix-1.54.0.tgz 12554086 RMD160 b04fb8dc22440e1235035e0cfccb1390006602f7 SHA1 31999db2dfa090379cd16bf20e509bb6fd7356b7 SHA256 f8d395e88a6188a18e00feb7e2cd7610045db6652553c1583fcab7e3aa4ed9b0
 EBUILD ps3mediaserver-1.53.0.ebuild 2336 RMD160 186efcf953c8d0607616df103cf50c4fd775e33f SHA1 cdaf8177643c08610edd702ebadbe0c3bd911f33 SHA256 74ddefd384283c2b9ab242182f24fa811d1eb8163c193012efae30d9f1fe2462
-MISC ChangeLog 2353 RMD160 c2ee7bdc03376512748d40309fc42317fde4ad04 SHA1 e63b845ffbe7f405b47bec79b71583ee8219ff9f SHA256 f0eb29d1e1561871b1a6ad6f9ac790f708b91d6ef3ca595009f136d00bc4d231
+EBUILD ps3mediaserver-1.54.0.ebuild 2336 RMD160 99148088ba4c85f9c9f12db94ebbc248e1fb4480 SHA1 b8a9b34da0821a850ba1a13390fb0ae507d481e0 SHA256 51ea9df588c271e253cbbcad605e703b636a92c87fecfee6f89c6eaffb8697fc
+MISC ChangeLog 2563 RMD160 369c8c8dc889452c407746e3fcdc6cf91ea6b831 SHA1 b06047d695a01197663e1536879f06bcfec45e23 SHA256 65cd55b920e95c1097a55d250e2d9d5746aa73632761ad9ebfca4333ed73e693
 MISC metadata.xml 684 RMD160 7da0f57787ca1e7fa08849a7352f6b28bf1cfa43 SHA1 94d92bc08a8d55ab4f38438901ff03b156d749a6 SHA256 2c8aaa6e3ff0785108a219b59f94ec2a36af829c3e9a14ef411863675965ae3c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/dTmAACgkQC77qH+pIQ6Si9gD+LXm+fZp/hXVvxXUWO7Zrj/8s
-Cdb8XNKnk+6vILDvLQ4A/1sK7Sxu+t72l4T67VLlHQ3Kj9ew8WDU1rhwBIMAR1fI
-=37b8
+iF4EAREIAAYFAk/vm/YACgkQC77qH+pIQ6T8PwD/Tsh/JYI+OCfZOKYAf329UZ24
+EiVraeo8h330ryniKQ4BALak1OGtZrKFFUcte/7BpEjA5tHSaxIT3ZNtQI/w4NiQ
+=RkTm
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild
deleted file mode 100644
index 023a833fea70..000000000000
--- a/net-misc/ps3mediaserver/ps3mediaserver-1.50.1.ebuild
+++ /dev/null
@@ -1,93 +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.50.1.ebuild,v 1.3 2012/03/01 17:47:41 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-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.52.1.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.54.0.ebuild
index 8eeba690101d..4a62ba59a933 100644
--- a/net-misc/ps3mediaserver/ps3mediaserver-1.52.1.ebuild
+++ b/net-misc/ps3mediaserver/ps3mediaserver-1.54.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.52.1.ebuild,v 1.1 2012/04/11 05:19:10 floppym Exp $
+# $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"
 
@@ -34,7 +34,7 @@ src_prepare() {
 			echo "Copying ${PMS_HOME} to ~/.${PN}"
 			cp -pPR "${PMS_HOME}" ~/.${PN}
 		fi
-		export PMS_HOME=~/.${PN}
+		export PMS_HOME=\${HOME}/.${PN}
 		exec "\${PMS_HOME}/PMS.sh" "\$@"
 		EOF
 	else