Make stable ebuilds depend on mplayer with either ass or srt useflag. Fixes bug 249588 again.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-hh8 i686

5 files changed, 21 insertions, 107 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index eac4c036ecbe..d6839340a2cd 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.49 2008/12/02 13:14:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.50 2008/12/18 07:44:50 yngwin Exp $
+
+  18 Dec 2008; Ben de Groot <yngwin@gentoo.org> smplayer-0.6.1-r1.ebuild,
+  smplayer-0.6.2-r1.ebuild, -smplayer-0.6.5.ebuild:
+  Make stable ebuilds depend on mplayer with either ass or srt useflag.
+  Fixes bug 249588 again. Remove older testing revision.
 
 *smplayer-0.6.5-r1 (02 Dec 2008)
 
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index c94a8f86851d..654044c4bc49 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,9 +1,8 @@
 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.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.1-r1.ebuild 3260 RMD160 d36f49a53ca965c14d659fd6a5d64e926fbeed8f SHA1 e0b486c0a6d8d868504d9781fbc5a193f1ded3d0 SHA256 6974e51dde6df072896807ee310c083442dd4a0a1cd6b6de38d23bc4ee07a242
+EBUILD smplayer-0.6.2-r1.ebuild 3037 RMD160 4edd22ca03553ef86d3a6204ee60567920733daa SHA1 88334c987774e8c732ec1851f2f6afb64ddbf351 SHA256 e11283338e0b395a289af2955176ff3d85de3141d46023864162a53945720557
 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 7115 RMD160 f5f13c416d157ffffeee37dba19022112d61f350 SHA1 ae60f1ce32d1059eb1fe34b05933a33a3d053681 SHA256 10a4e17319290a26d36135bf94acb70788f19c1e79f6f433adc8141d65d8848e
+MISC ChangeLog 7371 RMD160 85e81374edd5e4641839eb66ab6df8ca032559d9 SHA1 f57ec51a4ae420e7ca7a3e4254cc50b867cf5b51 SHA256 95bb3b9f11923e9e36a70f0e2078d73a4e8de359b0dda075443e716899abb82b
 MISC metadata.xml 248 RMD160 3dd3ed866d9de9b9e1e757a75ad74cd04a179a0a SHA1 ee402648473a449107fdc483b2452b655887f15c SHA256 319bbc38f5d834b6230f477c4330ff29d94c9447f563551c977e5c3b038aecaf
diff --git a/media-video/smplayer/smplayer-0.6.1-r1.ebuild b/media-video/smplayer/smplayer-0.6.1-r1.ebuild
index e0951d7edf5a..ee1a37bd6c53 100644
--- a/media-video/smplayer/smplayer-0.6.1-r1.ebuild
+++ b/media-video/smplayer/smplayer-0.6.1-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.1-r1.ebuild,v 1.8 2008/09/18 01:20:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.1-r1.ebuild,v 1.9 2008/12/18 07:44:50 yngwin Exp $
 
 EAPI="1"
 inherit eutils qt4
@@ -37,13 +37,14 @@ pkg_setup() {
 	fi
 	qt4_pkg_setup
 
-	if ! built_with_use media-video/mplayer srt ; then
+	if ! built_with_use --missing true media-video/mplayer ass \
+		|| ! built_with_use --missing true media-video/mplayer srt; then
 		echo
-		ewarn "SMPlayer needs MPlayer to be built with USE=srt for subtitle"
-		ewarn "support. Please enable the srt USE flag for mplayer and"
+		ewarn "SMPlayer needs MPlayer to be built with USE=ass or srt for subtitle"
+		ewarn "support. Please enable the ass or srt USE flag for mplayer and"
 		ewarn "re-emerge media-video/mplayer before emerging smplayer."
 		echo
-		die "media-video/mplayer needs USE=srt enabled"
+		die "media-video/mplayer needs USE=ass or srt enabled"
 	fi
 	if ! built_with_use media-video/mplayer png; then
 		echo
diff --git a/media-video/smplayer/smplayer-0.6.2-r1.ebuild b/media-video/smplayer/smplayer-0.6.2-r1.ebuild
index 26f40352c2a0..a972fa0bc106 100644
--- a/media-video/smplayer/smplayer-0.6.2-r1.ebuild
+++ b/media-video/smplayer/smplayer-0.6.2-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.2-r1.ebuild,v 1.5 2008/09/28 16:15:16 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.2-r1.ebuild,v 1.6 2008/12/18 07:44:50 yngwin Exp $
 
 EAPI="1"
 inherit eutils qt4
@@ -27,13 +27,14 @@ for X in ${NOLONGLANGS}; do
 done
 
 pkg_setup() {
-	if ! built_with_use media-video/mplayer srt ; then
+	if ! built_with_use --missing true media-video/mplayer ass \
+		|| ! built_with_use --missing true media-video/mplayer srt; then
 		echo
-		ewarn "SMPlayer needs MPlayer to be built with USE=srt for subtitle"
-		ewarn "support. Please enable the srt USE flag for mplayer and"
+		ewarn "SMPlayer needs MPlayer to be built with USE=ass or srt for subtitle"
+		ewarn "support. Please enable the ass or srt USE flag for mplayer and"
 		ewarn "re-emerge media-video/mplayer before emerging smplayer."
 		echo
-		die "media-video/mplayer needs USE=srt enabled"
+		die "media-video/mplayer needs USE=ass or srt enabled"
 	fi
 	if ! built_with_use media-video/mplayer png; then
 		echo
diff --git a/media-video/smplayer/smplayer-0.6.5.ebuild b/media-video/smplayer/smplayer-0.6.5.ebuild
deleted file mode 100644
index aba4b1de7726..000000000000
--- a/media-video/smplayer/smplayer-0.6.5.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.5.ebuild,v 1.2 2008/11/13 20:52:57 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* )"
-RDEPEND="${DEPEND}
-	>media-video/mplayer-1.0_rc1[png,srt]"
-
-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"
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-for X in ${NOLONGLANGS}; do
-	IUSE="${IUSE} linguas_${X%_*}"
-done
-
-src_prepare() {
-	# 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
-
-	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"
-}