Version bump & drop some old versions.

(Portage version: 2.2_rc10/cvs/Linux 2.6.26.5 i686)

3 files changed, 27 insertions, 146 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index 7076dc338420..5b36a6e32b0f 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.37 2008/09/18 01:20:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.38 2008/09/26 16:42:03 yngwin Exp $
+
+*smplayer-0.6.3 (26 Sep 2008)
+
+  26 Sep 2008; Ben de Groot <yngwin@gentoo.org> -smplayer-0.6.0.ebuild,
+  -smplayer-0.6.0-r1.ebuild, +smplayer-0.6.3.ebuild:
+  Version bump. Drop some old versions. New ebuild uses EAPI-2 use-deps for
+  mplayer.
 
   18 Sep 2008; Brent Baude <ranger@gentoo.org> smplayer-0.6.1-r1.ebuild:
   stable ppc64, bug 236618
diff --git a/media-video/smplayer/smplayer-0.6.0-r1.ebuild b/media-video/smplayer/smplayer-0.6.0-r1.ebuild
deleted file mode 100644
index 2a9e73d94a73..000000000000
--- a/media-video/smplayer/smplayer-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,108 +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.0-r1.ebuild,v 1.1 2008/09/03 20:42:34 yngwin Exp $
-
-EAPI="1"
-inherit eutils qt4
-
-MY_P="${P}final"
-DESCRIPTION="Great Qt4 GUI front-end for mplayer"
-HOMEPAGE="http://smplayer.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_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 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
-
-S=${WORKDIR}/${MY_P}
-
-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 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 "re-emerge media-video/mplayer before emerging smplayer."
-		echo
-		die "media-video/mplayer needs USE=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="1247"
-	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.0.ebuild b/media-video/smplayer/smplayer-0.6.3.ebuild
index cafc42d085c9..d42617917edf 100644
--- a/media-video/smplayer/smplayer-0.6.0.ebuild
+++ b/media-video/smplayer/smplayer-0.6.3.ebuild
@@ -1,25 +1,24 @@
 # 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.0.ebuild,v 1.9 2008/06/16 19:24:19 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.3.ebuild,v 1.1 2008/09/26 16:42:03 yngwin Exp $
 
-EAPI="1"
+EAPI=2
 inherit eutils qt4
 
-MY_P="${P}final"
-DESCRIPTION="Great front-end for mplayer written in Qt4"
+DESCRIPTION="Great Qt4 GUI front-end for mplayer"
 HOMEPAGE="http://smplayer.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+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"
+	>media-video/mplayer-1.0_rc1[png,srt]"
 
-LANGS="bg 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"
+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 sl sr sv tr zh_CN zh_TW"
+NOLONGLANGS="ar_SY el_GR ro_RO ru_RU uk_UA"
 for X in ${LANGS}; do
 	IUSE="${IUSE} linguas_${X}"
 done
@@ -27,22 +26,8 @@ for X in ${NOLONGLANGS}; do
 	IUSE="${IUSE} linguas_${X%_*}"
 done
 
-S=${WORKDIR}/${MY_P}
-
-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
-}
-
-src_compile() {
-	local MY_SVNREV="1247"
+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
 
@@ -53,8 +38,13 @@ src_compile() {
 		-e '/get_svn_revision.sh/,+2c\
 	cd src && $(DEFS) $(MAKE)' \
 		"${S}"/Makefile || die "sed failed"
+}
 
+src_configure() {
 	eqmake4 src/${PN}.pro -o src/Makefile
+}
+
+src_compile() {
 	emake || die "emake failed"
 
 	# Generate translations
@@ -82,21 +72,13 @@ src_compile() {
 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
+	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
 }
-
-pkg_postinst() {
-	if ! built_with_use media-video/mplayer png; then
-		echo
-		ewarn "SMPlayer needs the media-video/mplayer package built with USE=png."
-		ewarn "To prevent crashes, please rebuild mplayer with png support, or"
-		ewarn "alternatively, clear the Folder for storing screenshots field in"
-		ewarn "the Preferences dialog."
-		echo
-	fi
-}