Remove old version. Migrate 0.6.9 to use qt4-r2.eclass (bug #311481).

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 15 insertions, 108 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index e73f58758c61..1860eb0990d4 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/smplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.84 2010/03/22 23:53:54 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.85 2010/03/26 20:20:48 yngwin Exp $
+
+  26 Mar 2010; Ben de Groot <yngwin@gentoo.org> -smplayer-0.6.6.ebuild,
+  smplayer-0.6.9.ebuild:
+  Remove old version. Migrate 0.6.9 to use qt4-r2.eclass (bug #311481).
 
   22 Mar 2010; Ben de Groot <yngwin@gentoo.org> metadata.xml:
   Co-assign to qt herd
diff --git a/media-video/smplayer/smplayer-0.6.6.ebuild b/media-video/smplayer/smplayer-0.6.6.ebuild
deleted file mode 100644
index 19f7b03ff288..000000000000
--- a/media-video/smplayer/smplayer-0.6.6.ebuild
+++ /dev/null
@@ -1,89 +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.ebuild,v 1.9 2009/07/06 22:34:27 jer 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"
-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.9.ebuild b/media-video/smplayer/smplayer-0.6.9.ebuild
index 789da1e00c62..4e6c6e92d9e3 100644
--- a/media-video/smplayer/smplayer-0.6.9.ebuild
+++ b/media-video/smplayer/smplayer-0.6.9.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.9.ebuild,v 1.1 2010/02/24 16:39:28 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.9.ebuild,v 1.2 2010/03/26 20:20:48 yngwin Exp $
 
 EAPI="2"
+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 sk sr sv tr zh_CN zh_TW"
+LANGSLONG="ar_SY el_GR ro_RO ru_RU sl_SI uk_UA vi_VN"
 
-inherit eutils qt4
+inherit eutils qt4-r2
 
 MY_PV=${PV##*_p}
 if [[ "${MY_PV}" != "${PV}" ]]; then
@@ -19,7 +22,7 @@ else
 fi
 
 DESCRIPTION="Great Qt4 GUI front-end for mplayer"
-HOMEPAGE="http://smplayer.sourceforge.net/"
+HOMEPAGE="http://smplayer.berlios.de/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -29,17 +32,6 @@ 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 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() {
 	# Force Ctrl+Q as default quit shortcut
 	epatch "${FILESDIR}/${PN}-0.6.8-quit.patch"
@@ -71,7 +63,7 @@ gen_translation() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake || die
 
 	# Generate translations
 	cd "${S}"/src/translations
@@ -80,8 +72,8 @@ src_compile() {
 		if has ${lang} ${LANGS}; then
 			gen_translation ${lang}
 			continue
-		elif [[ " ${NOLONGLANGS} " == *" ${lang}_"* ]]; then
-			for x in ${NOLONGLANGS}; do
+		elif [[ " ${LANGSLONG} " == *" ${lang}_"* ]]; then
+			for x in ${LANGSLONG}; do
 				if [[ "${lang}" == "${x%_*}" ]]; then
 					gen_translation ${x}
 					continue 2
@@ -103,6 +95,6 @@ src_install() {
 	# remove windows-only files
 	rm "${S}"/*.bat
 
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	prepalldocs
 }