Change srt useflag to ass useflag for >=media-video/mplayer-1.0_rc2_p28058

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-hh6 i686

4 files changed, 17 insertions, 100 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index 8c0871cba11e..eac4c036ecbe 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/smplayer
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.48 2008/11/13 20:52:57 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.49 2008/12/02 13:14:34 yngwin Exp $
+
+*smplayer-0.6.5-r1 (02 Dec 2008)
+
+  02 Dec 2008; Ben de Groot <yngwin@gentoo.org> -smplayer-0.6.3.ebuild,
+  -smplayer-0.6.4.ebuild, +smplayer-0.6.5-r1.ebuild:
+  Change srt useflag to ass useflag for >=media-video/mplayer-1.0_rc2_p28058
+  and remove a couple of old ebuilds. Fixes bug 249588.
 
   13 Nov 2008; Ben de Groot <yngwin@gentoo.org> smplayer-0.6.5.ebuild:
   Add einfo about moved config file location
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index c51093731b5e..c94a8f86851d 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,12 +1,9 @@
 DIST smplayer-0.6.1.tar.bz2 1029890 RMD160 2859050073d9535d03a16e2dfbb94ad03fbb22f3 SHA1 b9dd657b3fd24bda951ed942d5698ae85a24b52b SHA256 02386148c798bdb60ac412423bab5a8e2d93c15fd84963cf18d2cdb6c1800242
 DIST smplayer-0.6.2.tar.bz2 1132234 RMD160 6b229eb19173c298a331f675eb34bb6a5261b80b SHA1 902b86242ff483f603dbb52d39f342093a50e5d8 SHA256 0b75ef8bb2c8ac6374ca05cdcffc4634d772b858356caeca9effad0c1775dbb3
-DIST smplayer-0.6.3.tar.bz2 1157827 RMD160 ee34f9f35c123707f17c7b73caf75e964096ee92 SHA1 03c42f134dc9e3d0d4cec652e75351043e8ca015 SHA256 54ddd5761ccf0b020c6cae679f2ade6d96b315bb586e14421a45d4fc8c56ffce
-DIST smplayer-0.6.4.tar.bz2 1285946 RMD160 75328da08af63b348b49e25bd10ea6d73a22ebe5 SHA1 19dbd15de548538eadadc14e548507a7215ad0c4 SHA256 37f75b558c311c6a2a9a6199aab12333beb1ebb6a9988c8931a537198d7dc025
 DIST smplayer-0.6.5.tar.bz2 1300271 RMD160 e7dfbdda2c8e03ad65643ba12334f92d985dc7dd SHA1 58c61d5bade169287f837e5d263910e4f4e041f0 SHA256 b2af673a5a26d2699240fe03e3e649ef736a979cb57afd6d9ef48da6744644ce
 EBUILD smplayer-0.6.1-r1.ebuild 3162 RMD160 717c82abf170e9902f3360890fbe98a5f5c9f0a1 SHA1 41baf19c21613ff8f49efbcf59650b6b6de512d4 SHA256 3ef5d3fe155e1e3bcf1664a48e198c981204806b98005320e06c195dc46e370c
 EBUILD smplayer-0.6.2-r1.ebuild 2939 RMD160 d26320b2c9adb0c1de06ee71f5cb42a6ff15e3b7 SHA1 80de7f8fc2c3430014ff19004c46fed9a07daba0 SHA256 40923d5331f6e79b31d851a4f8ba9f48466ecbbcb3226e7dd7c9931d9ba661b1
-EBUILD smplayer-0.6.3.ebuild 2636 RMD160 f1a0ef0bb355f62f3dcc521e81c9fe83e08cfd1b SHA1 8833f753a6b607d8a7c894bd04dc1d90fdaad052 SHA256 94c40540be4df5595640c149da167e33e9c5aac5ca7ab0fd819131dff260814b
-EBUILD smplayer-0.6.4.ebuild 2495 RMD160 414dc4ceffd238bfdfc1fd071b49900fbd4b6b26 SHA1 41077be940dce26e452e8aee58b15060c9113eec SHA256 abdd8ec3d28db1d11d7cc8622404aaaaea798d9e21a63937745b39c6f138c62d
+EBUILD smplayer-0.6.5-r1.ebuild 2741 RMD160 d9bab08be34b86aa1d6621083fd8d17684c6496d SHA1 0555c7974c010a1234db2bd84014a96ec1c6214e SHA256 f73d00c23a5f2086f293ecafd819d7176cebd36b2fea207bb280a2fd397c104c
 EBUILD smplayer-0.6.5.ebuild 2683 RMD160 207e405d2c548309a28cc494ea2a5b2811f0921a SHA1 794c164cc6ba6ea7e14332240ddb843b9136d5e6 SHA256 f67d3a560b8e58794c51354dc7bf77a799d06ca28411c502e9b38ee91214603b
-MISC ChangeLog 6822 RMD160 fcfb8b3dbf8027817be60f5699a138ae322b8b0f SHA1 2dbab4d2a8176464bda82b1c4c8a20311a4232eb SHA256 7bd1dac2567b9328fe38d208c814a9daa67356f2f81437cd05b275c11597e259
+MISC ChangeLog 7115 RMD160 f5f13c416d157ffffeee37dba19022112d61f350 SHA1 ae60f1ce32d1059eb1fe34b05933a33a3d053681 SHA256 10a4e17319290a26d36135bf94acb70788f19c1e79f6f433adc8141d65d8848e
 MISC metadata.xml 248 RMD160 3dd3ed866d9de9b9e1e757a75ad74cd04a179a0a SHA1 ee402648473a449107fdc483b2452b655887f15c SHA256 319bbc38f5d834b6230f477c4330ff29d94c9447f563551c977e5c3b038aecaf
diff --git a/media-video/smplayer/smplayer-0.6.3.ebuild b/media-video/smplayer/smplayer-0.6.3.ebuild
deleted file mode 100644
index cf68017e9371..000000000000
--- a/media-video/smplayer/smplayer-0.6.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.3.ebuild,v 1.4 2008/11/06 00:35:00 yngwin Exp $
-
-EAPI=2
-inherit eutils qt4
-
-DESCRIPTION="Great Qt4 GUI front-end for mplayer"
-HOMEPAGE="http://smplayer.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
-DEPEND="|| ( x11-libs/qt-gui:4
-			>=x11-libs/qt-4.3:4 )"
-RDEPEND="${DEPEND}
-	>media-video/mplayer-1.0_rc1[png,srt]"
-
-LANGS="bg ca cs de en_US es eu fi fr hu it ja ka ko ku mk nl pl pt_BR pt_PT sk sr sv tr zh_CN zh_TW"
-NOLONGLANGS="ar_SY el_GR ro_RO ru_RU sl_SI uk_UA"
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-for X in ${NOLONGLANGS}; do
-	IUSE="${IUSE} linguas_${X%_*}"
-done
-
-src_prepare() {
-	local MY_SVNREV="1882"
-	echo "SVN-r${MY_SVNREV}" > svn_revision.txt
-	echo "#define SVN_REVISION \"SVN-r${MY_SVNREV}\"" > src/svn_revision.h
-
-	# Fix paths in Makefile and allow parallel building
-	sed -i -e "/^PREFIX=/s:/usr/local:/usr:" \
-		-e "/^CONF_PREFIX=/s:\$(PREFIX)::" \
-		-e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
-		-e '/get_svn_revision.sh/,+2c\
-	cd src && $(DEFS) $(MAKE)' \
-		"${S}"/Makefile || die "sed failed"
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		sed -i "s:#DEFINES += NO_DEBUG_ON_CONSOLE:DEFINES += NO_DEBUG_ON_CONSOLE:" \
-		"${S}"/src/smplayer.pro || die "sed failed"
-	fi
-}
-
-src_configure() {
-	eqmake4 src/${PN}.pro -o src/Makefile
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	# Generate translations
-	cd "${S}"/src/translations
-	local LANG=
-	for LANG in ${LINGUAS}; do
-		if has ${LANG} ${LANGS}; then
-			einfo "Generating ${LANG} translation ..."
-			lrelease ${PN}_${LANG}.ts || die "Failed to generate ${LANG} translation!"
-			continue
-		elif [[ " ${NOLONGLANGS} " == *" ${LANG}_"* ]]; then
-			local X=
-			for X in ${NOLONGLANGS}; do
-				if [[ "${LANG}" == "${X%_*}" ]]; then
-					einfo "Generating ${X} translation ..."
-					lrelease ${PN}_${X}.ts || die "Failed to generate ${X} translation!"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA."
-	done
-	# install fails when no translation is present (bug 244370)
-	[[ -f *.qm ]] || lrelease ${PN}_en_US.ts
-}
-
-src_install() {
-	# remove unneeded copies of GPL
-	rm Copying.txt docs/en/gpl.html docs/ru/gpl.html
-	for i in de es ja nl ro ; do
-		rm -rf docs/$i
-	done
-
-	# remove windows-only files
-	rm "${S}"/*.bat
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-	prepalldocs
-}
diff --git a/media-video/smplayer/smplayer-0.6.4.ebuild b/media-video/smplayer/smplayer-0.6.5-r1.ebuild
index c99700ec4326..a66584873892 100644
--- a/media-video/smplayer/smplayer-0.6.4.ebuild
+++ b/media-video/smplayer/smplayer-0.6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.4.ebuild,v 1.2 2008/11/06 00:35:00 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.5-r1.ebuild,v 1.1 2008/12/02 13:14:34 yngwin Exp $
 
 EAPI=2
 inherit eutils qt4
@@ -15,7 +15,8 @@ IUSE="debug"
 DEPEND="|| ( x11-libs/qt-gui:4
 			=x11-libs/qt-4.3* )"
 RDEPEND="${DEPEND}
-	>media-video/mplayer-1.0_rc1[png,srt]"
+	|| ( >media-video/mplayer-1.0_rc1[png,srt]
+		>=media-video/mplayer-1.0_rc2_p28058[ass,png] )"
 
 LANGS="bg ca cs de en_US es eu fi fr gl hu it ja ka ko ku mk nl pl pt_BR pt_PT sk sr sv tr zh_CN zh_TW"
 NOLONGLANGS="ar_SY el_GR ro_RO ru_RU sl_SI uk_UA"
@@ -85,4 +86,8 @@ src_install() {
 
 	emake DESTDIR="${D}" install || die "emake install failed"
 	prepalldocs
+
+	einfo "Note that the default configuration files location has changed"
+	einfo "since 0.6.4. You may want to move your existing configuration:"
+	einfo "mv ~/.smplayer ~/.config/smplayer"
 }