Version bump. Add Estonian and Vietnamese translations. Remove some old ebuilds.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

8 files changed, 117 insertions, 473 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index cc09044f885a..4d2dd512de0d 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/smplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.71 2009/07/06 22:34:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.72 2009/07/26 13:14:37 yngwin Exp $
+
+*smplayer-0.6.8 (26 Jul 2009)
+
+  26 Jul 2009; Ben de Groot <yngwin@gentoo.org> -smplayer-0.6.1-r1.ebuild,
+  -smplayer-0.6.5-r1.ebuild, -smplayer-0.6.5.1.ebuild,
+  -smplayer-0.6.6_p2776.ebuild, -smplayer-0.6.7_p2872-r1.ebuild,
+  +smplayer-0.6.8.ebuild:
+  Version bump. Add Estonian and Vietnamese translations. Remove some old
+  ebuilds.
 
   06 Jul 2009; Jeroen Roovers <jer@gentoo.org> smplayer-0.6.6.ebuild:
   Stable for HPPA (bug #257852).
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 80b9f01f1695..d741cd6a2d0c 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,17 +1,10 @@
-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.1.tar.bz2 1290836 RMD160 500427b56ea886a561bc24f8b87e90d7f12587ee SHA1 803d679ff60b50c18101678d7ac04de4af581ee0 SHA256 26c3237d4de81c712c1d80f038b68b0f1b1927d60e2825c90c502afd153597e4
-DIST smplayer-0.6.5.tar.bz2 1300271 RMD160 e7dfbdda2c8e03ad65643ba12334f92d985dc7dd SHA1 58c61d5bade169287f837e5d263910e4f4e041f0 SHA256 b2af673a5a26d2699240fe03e3e649ef736a979cb57afd6d9ef48da6744644ce
 DIST smplayer-0.6.6.tar.bz2 1373258 RMD160 b184d8eef9451a220b894bb46a1eca3ee1d95372 SHA1 6b5299c84650a36ddb73951815e09c100f29e3e5 SHA256 8be72ac3870d0be379b130e84c6168f0ca143dd0112bbe4ce79d5a37394acd29
-DIST smplayer-r2776.tar.bz2 1382658 RMD160 c20c276f1de153281e3e8e491fcde855b6fae1d3 SHA1 81046680d7cc355b3519923bf423caf6cc10d722 SHA256 ecce5687b80e9fff56e0d5dfb0c01927cb0d32e4d4535b0f3d78d955dc12e7b6
+DIST smplayer-0.6.8.tar.bz2 1670580 RMD160 10db255b8e21658b03fcff66de5554acaf29782e SHA1 0f7d53babe1fd71ea9eddb448622d112495242e7 SHA256 466b589ee2d3944b2e3b8f3a6dae436f7d31f054912cfe56f8d93454594c4ca2
 DIST smplayer-r2872.tar.bz2 1389799 RMD160 316b907d9036953c5bc8658612e78827e0de79f6 SHA1 ebf398000825561a8f8f29453efa9c0a2811ac2f SHA256 b525d97fe943ad2d7666a1f28b96bb6bc86c1f852a725588baf7ddc3151c1340
-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 2671 RMD160 c681cba09adf1982a7f916758eaab8802279bb4e SHA1 eacd7d41c801303a1fc161243fb578d542875d26 SHA256 8c6e573ca4550fc136b7bcf182479ff620cc238c8587e30fe6eed1f072efcb4e
-EBUILD smplayer-0.6.5.1.ebuild 2488 RMD160 0f2ce62f4097f17c89bdafcbe420db1857b3c940 SHA1 ad5743b88af53d1223d2ef59e4441bbaef43bc82 SHA256 ee45b6bd836454da578722e13069598b574f77d8c4c8a7eff2f12770ecd57469
 EBUILD smplayer-0.6.6.ebuild 2450 RMD160 a8fb8298d16a1e09df0e69bd5b7980fdfb15a866 SHA1 8ea019a3de509fc08072d8203c4987ebe67c1a89 SHA256 552f061b99f150eb75001e9b1fcdf93adde7910e0ed88bc9c8e29744b3178454
-EBUILD smplayer-0.6.6_p2776.ebuild 2220 RMD160 e00a7ed136b48d2ccf5761be659430351b162478 SHA1 e5fb6d785a7df3b10b5fe882cad3d2e3be33944b SHA256 db6e849be3dd7883303dbda05c5392584d3a1cf1ce51a1056cee90f62386b46b
-EBUILD smplayer-0.6.7_p2872-r1.ebuild 2435 RMD160 4c2abb0be16c0cfab508f3544c6d2b0e668bdf06 SHA1 d00062cfd298e846d454bdd5b3a52db68c1de116 SHA256 4fddbbf14ec86b14a77b7c21fa2f100a0318972bb27d1500bd273c29851c63ca
 EBUILD smplayer-0.6.7_p2872-r2.ebuild 2644 RMD160 ab0b7cca2eaab03bee91daf323b80b05372ab3b0 SHA1 ab41a4191a36c0f21430c8454c83348aded40fbf SHA256 e3059fed5d2a2c848c3b1ff80d2920a7dc6c94180bd5ad5a467d293d6290959e
-MISC ChangeLog 10074 RMD160 02c379ea2b77285006d6c5cf8ced087ad9a817e6 SHA1 9fdb86c0c4efdea351c501f097180e5c77501a74 SHA256 989765fc21162cd3ad03cff95515ce556348f67147314de4d7533d844b10b450
+EBUILD smplayer-0.6.8.ebuild 2712 RMD160 561e63cba55402ffc5a96952fccc81376459ddfe SHA1 29f770eeba768b8c056eb94f36b7ba0bda22838c SHA256 8579be52c70ccc7f749baac83fda4c4a0090f4bd24b4ac0e772ee6bd5ba3beaa
+MISC ChangeLog 10415 RMD160 d86ed70afc1603e1b87c60ebc792eb11e77f221c SHA1 a3eb375736d21116bb3f12fa696372f9fc0db98b SHA256 5ac6b4cbde6602118571e3f2d3fe4cfae4ae70df9303e555d47e441ba2da6817
 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
deleted file mode 100644
index ee1a37bd6c53..000000000000
--- a/media-video/smplayer/smplayer-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,106 +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.1-r1.ebuild,v 1.9 2008/12/18 07:44:50 yngwin Exp $
-
-EAPI="1"
-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=""
-DEPEND="|| ( x11-libs/qt-gui:4
-			>=x11-libs/qt-4.3:4 )"
-RDEPEND="${DEPEND}
-	>media-video/mplayer-1.0_rc1"
-
-LANGS="bg ca cs de en_US es eu fi fr hu it ja ka ko mk nl pl pt_BR pt_PT sk sr sv tr zh_CN zh_TW"
-NOLONGLANGS="el_GR ro_RO ru_RU uk_UA"
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-for X in ${NOLONGLANGS}; do
-	IUSE="${IUSE} linguas_${X%_*}"
-done
-
-pkg_setup() {
-	if has_version ">=x11-libs/qt-4.3:4"; then
-		QT4_BUILT_WITH_USE_CHECK="qt3support"
-	else
-		if ! built_with_use "x11-libs/qt-gui:4" qt3support; then
-			eerror "You have to built x11-libs/qt-gui:4 with qt3support."
-			die "qt3support in qt-gui disabled"
-		fi
-	fi
-	qt4_pkg_setup
-
-	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=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=ass or srt enabled"
-	fi
-	if ! built_with_use media-video/mplayer png; then
-		echo
-		ewarn "SMPlayer needs MPlayer built with USE=png for screenshot support."
-		ewarn "Please enable the png USE flag for mplayer and re-emerge"
-		ewarn "media-video/mplayer before emergeing smplayer."
-		echo
-		die "media-video/mplayer needs USE=png enabled"
-	fi
-}
-
-src_compile() {
-	local MY_SVNREV="1304"
-	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"
-
-	eqmake4 src/${PN}.pro -o src/Makefile
-	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
-}
-
-src_install() {
-	# remove unneeded copies of GPL
-	rm Copying.txt docs/en/gpl.html docs/ru/gpl.html
-	for i in de es ja ro ; do
-		rm -rf docs/$i
-	done
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-	prepalldocs
-}
diff --git a/media-video/smplayer/smplayer-0.6.5-r1.ebuild b/media-video/smplayer/smplayer-0.6.5-r1.ebuild
deleted file mode 100644
index 1723767b1aa1..000000000000
--- a/media-video/smplayer/smplayer-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2009 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-r1.ebuild,v 1.9 2009/01/23 17:44:42 ranger 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[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"
-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"
-}
diff --git a/media-video/smplayer/smplayer-0.6.5.1.ebuild b/media-video/smplayer/smplayer-0.6.5.1.ebuild
deleted file mode 100644
index 65c446edc521..000000000000
--- a/media-video/smplayer/smplayer-0.6.5.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2009 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.1.ebuild,v 1.2 2009/01/08 01:20:41 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[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"
-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
-}
diff --git a/media-video/smplayer/smplayer-0.6.6_p2776.ebuild b/media-video/smplayer/smplayer-0.6.6_p2776.ebuild
deleted file mode 100644
index d0f6fbe2ce3c..000000000000
--- a/media-video/smplayer/smplayer-0.6.6_p2776.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.6_p2776.ebuild,v 1.1 2009/02/14 14:45:54 yngwin Exp $
-
-EAPI=2
-inherit eutils qt4
-
-MY_P=${PN}-r${PV##*p}
-
-DESCRIPTION="Great Qt4 GUI front-end for mplayer"
-HOMEPAGE="http://smplayer.sourceforge.net"
-SRC_URI="mirror://gentoo/${MY_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"
-RDEPEND="${DEPEND}
-	media-video/mplayer[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"
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-for X in ${NOLONGLANGS}; do
-	IUSE="${IUSE} linguas_${X%_*}"
-done
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# 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.7_p2872-r1.ebuild b/media-video/smplayer/smplayer-0.6.7_p2872-r1.ebuild
deleted file mode 100644
index d382038064ed..000000000000
--- a/media-video/smplayer/smplayer-0.6.7_p2872-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.7_p2872-r1.ebuild,v 1.1 2009/03/14 10:27:55 yngwin Exp $
-
-EAPI=2
-inherit eutils qt4
-
-MY_P=${PN}-r${PV##*p}
-
-DESCRIPTION="Great Qt4 GUI front-end for mplayer"
-HOMEPAGE="http://smplayer.sourceforge.net"
-SRC_URI="mirror://gentoo/${MY_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"
-RDEPEND="${DEPEND}
-	media-video/mplayer[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"
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-for X in ${NOLONGLANGS}; do
-	IUSE="${IUSE} linguas_${X%_*}"
-done
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Fix paths in Makefile
-	sed -i -e "/^PREFIX=/s:/usr/local:/usr:" \
-		-e "/^CONF_PREFIX=/s:\$(PREFIX)::" \
-		-e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \
-		"${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/cs/gpl.html 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.8.ebuild b/media-video/smplayer/smplayer-0.6.8.ebuild
new file mode 100644
index 000000000000..c2255a4e5f19
--- /dev/null
+++ b/media-video/smplayer/smplayer-0.6.8.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.8.ebuild,v 1.1 2009/07/26 13:14:37 yngwin Exp $
+
+EAPI=2
+inherit eutils qt4
+
+MY_PV=${PV##*_p}
+if [[ "${MY_PV}" != "${PV}" ]]; then
+	# svn snapshot
+	MY_PV=r${MY_PV}
+	MY_P=${PN}-${MY_PV}
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+else
+	# regular upstream release
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+fi
+
+DESCRIPTION="Great Qt4 GUI front-end for mplayer"
+HOMEPAGE="http://smplayer.sourceforge.net"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="x11-libs/qt-gui:4"
+RDEPEND="${DEPEND}
+	media-video/mplayer[ass,png]"
+
+LANGS="bg ca cs de en_US es et 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"
+# langs with long notation in pkg, but no long notation in portage:
+NOLONGLANGS="ar_SY el_GR ro_RO ru_RU sl_SI uk_UA vi_VN"
+for X in ${LANGS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+for X in ${NOLONGLANGS}; do
+	IUSE="${IUSE} linguas_${X%_*}"
+done
+
+src_prepare() {
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/s:/usr/local:/usr:" \
+		-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\):\1:' \
+			"${S}"/src/smplayer.pro || die "sed failed"
+	fi
+}
+
+src_configure() {
+	cd "${S}"/src
+	echo "#define SVN_REVISION \"SVN-${MY_PV} (Gentoo)\"" > svn_revision.h
+	eqmake4
+}
+
+gen_translation() {
+	ebegin "Generating $1 translation"
+	lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	# Generate translations
+	cd "${S}"/src/translations
+	local lang= nolangs= x=
+	for lang in ${LINGUAS}; do
+		if has ${lang} ${LANGS}; then
+			gen_translation ${lang}
+			continue
+		elif [[ " ${NOLONGLANGS} " == *" ${lang}_"* ]]; then
+			for x in ${NOLONGLANGS}; do
+				if [[ "${lang}" == "${x%_*}" ]]; then
+					gen_translation ${x}
+					continue 2
+				fi
+			done
+		fi
+		nolangs="${nolangs} ${lang}"
+	done
+	[[ -n ${nolangs} ]] && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nolangs}
+	# install fails when no translation is present (bug 244370)
+	[[ -z $(ls *.qm 2>/dev/null) ]] && gen_translation en_US
+}
+
+src_install() {
+	# remove unneeded copies of GPL
+	rm -f Copying.txt docs/{cs,en,ja,ru}/gpl.html
+	rm -rf docs/{de,es,nl,ro}
+
+	# remove windows-only files
+	rm "${S}"/*.bat
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+	prepalldocs
+}