Bringing mplayer png usecheck up to pkg_setup, adding mplayer srt usecheck

to fix bug 235183. Adjusting description. Dropping old ~arch revisions.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-hh1 i686
RepoMan-Options: --force

5 files changed, 165 insertions, 32 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index 50a3b18140ff..8dc0b2e6e298 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,13 +1,23 @@
 # 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.29 2008/08/16 13:38:41 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.30 2008/09/03 20:42:34 yngwin Exp $
+
+*smplayer-0.6.2-r1 (03 Sep 2008)
+*smplayer-0.6.1-r1 (03 Sep 2008)
+*smplayer-0.6.0-r1 (03 Sep 2008)
+
+  03 Sep 2008; Ben de Groot <yngwin@gentoo.org> +smplayer-0.6.0-r1.ebuild,
+  -smplayer-0.6.1.ebuild, +smplayer-0.6.1-r1.ebuild, -smplayer-0.6.2.ebuild,
+  +smplayer-0.6.2-r1.ebuild:
+  Bringing mplayer png usecheck up to pkg_setup, adding mplayer srt usecheck
+  to fix bug 235183. Adjusting description. Dropping old ~arch revisions.
 
 *smplayer-0.6.2 (16 Aug 2008)
 
   16 Aug 2008; Ben de Groot <yngwin@gentoo.org> -smplayer-0.6.0_rc3.ebuild,
   -smplayer-0.6.0_rc4.ebuild, +smplayer-0.6.2.ebuild:
   Version bump. Dropping qt3support check, as this is no longer needed
-  according to upstream (hopefully it's really true this time). 
+  according to upstream (hopefully it's really true this time).
   Dropping old RCs.
 
   16 Jun 2008; Ben de Groot <yngwin@gentoo.org> smplayer-0.6.0.ebuild,
@@ -100,7 +110,7 @@
   19 Feb 2008; Ben de Groot <yngwin@gentoo.org>
   -smplayer-0.5.62.ebuild, -smplayer-0.6.0_rc1.ebuild,
   smplayer-0.6.0_rc2.ebuild:
-  Removing old versions. Updating current ebuild with warning about 
+  Removing old versions. Updating current ebuild with warning about
   mplayer png support, fixes #209521.
 
 *smplayer-0.6.0_rc2 (17 Feb 2008)
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 7af9146425a4..e210c346754a 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,8 +1,9 @@
 DIST smplayer-0.6.0final.tar.bz2 1016544 RMD160 2e68eb660e1ad6e96ae3e058cc08dcc87be61468 SHA1 4415acfabf868c93601fa99187398d65295ab341 SHA256 3111edfac2ad114d6db83f2242de3b69d4e6825ddba985370c615932723908fb
 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
+EBUILD smplayer-0.6.0-r1.ebuild 3201 RMD160 bd515d102627b02a9c5cca68d5967f37aff13f8b SHA1 bb6f44fe9b1617b08d2e276f0d133cb653a51719 SHA256 42fb23280e8e94c7be91fb9755d7541723a42e7229b82d4ed95e6ea65fe7ed0d
 EBUILD smplayer-0.6.0.ebuild 2911 RMD160 5a1889a3a5cc2b4208cbbf0a867fd616d1d698ce SHA1 503dea9b3807b4db01723cccbd073b9e2ea3b205 SHA256 f24657fa12be296b93b50b856f7b230c76750d559c3edb0b3e1198dd5fa76bb6
-EBUILD smplayer-0.6.1.ebuild 2879 RMD160 bfe06e0224e080d1c0dd73f852135bf016a43a74 SHA1 9e623864184879b9d1ad5510d4a588d4d0371ce0 SHA256 d37175acffe7bb8d26318b5a2552a2b30178cc0f85863e69587fe31fc0cdb163
-EBUILD smplayer-0.6.2.ebuild 2635 RMD160 22904cccc8a191c00330f2d4c0340a5db246d37c SHA1 83e14659bfe23fda5daa99a0360c5fab08dc4cf8 SHA256 701830e44aaf625ae60586c181199d83a211ef7b90dd1cf47e77a2082994cc9d
-MISC ChangeLog 4231 RMD160 ad1e1e04362403772255b4962f94f85576a58b88 SHA1 3317760133194f9fc44f73e4430acae0db1fcd12 SHA256 b5100605e7659bf6107e6685604102ba59aeb0c573325c66db6034875116d985
+EBUILD smplayer-0.6.1-r1.ebuild 3169 RMD160 f54cfe24330493ce75ec8e95c6322fe4f3cca627 SHA1 791d3a68c436c28cb748ef48ea6f625d290763e4 SHA256 b519554c03cfe2ccb489a52fa1190e34d2e7cdac3e0e94502c24bc079726c99d
+EBUILD smplayer-0.6.2-r1.ebuild 2941 RMD160 d229714d70791e6bf84f8485517e7fe2dd7f8687 SHA1 130c0eb7c78c7827dd07a4af2a7c22b61f328e82 SHA256 3cf9ed9540621f0bcd4c060e7902ee644db44d7e52c390cd6ec75d2478a57b30
+MISC ChangeLog 4662 RMD160 d3de984a5112780efe11f241030f3daa82518004 SHA1 3693bd5a3a0bcf5a4ffb52cd9c9ab1fb403c4e1c SHA256 c31b66892a737780ba710e5bb23aa02636dc172a3f26709692d8d95d153f831b
 MISC metadata.xml 248 RMD160 3dd3ed866d9de9b9e1e757a75ad74cd04a179a0a SHA1 ee402648473a449107fdc483b2452b655887f15c SHA256 319bbc38f5d834b6230f477c4330ff29d94c9447f563551c977e5c3b038aecaf
diff --git a/media-video/smplayer/smplayer-0.6.0-r1.ebuild b/media-video/smplayer/smplayer-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..2a9e73d94a73
--- /dev/null
+++ b/media-video/smplayer/smplayer-0.6.0-r1.ebuild
@@ -0,0 +1,108 @@
+# 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.1.ebuild b/media-video/smplayer/smplayer-0.6.1-r1.ebuild
index c884628c7709..7895cba452ae 100644
--- a/media-video/smplayer/smplayer-0.6.1.ebuild
+++ b/media-video/smplayer/smplayer-0.6.1-r1.ebuild
@@ -1,11 +1,11 @@
 # 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.ebuild,v 1.2 2008/06/16 19:24:19 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.1-r1.ebuild,v 1.1 2008/09/03 20:42:34 yngwin Exp $
 
 EAPI="1"
 inherit eutils qt4
 
-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}/${P}.tar.bz2"
 LICENSE="GPL-2"
@@ -36,6 +36,23 @@ pkg_setup() {
 		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() {
@@ -86,14 +103,3 @@ src_install() {
 	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
-}
diff --git a/media-video/smplayer/smplayer-0.6.2.ebuild b/media-video/smplayer/smplayer-0.6.2-r1.ebuild
index ea8544049ab9..9c1f96f98a14 100644
--- a/media-video/smplayer/smplayer-0.6.2.ebuild
+++ b/media-video/smplayer/smplayer-0.6.2-r1.ebuild
@@ -1,11 +1,11 @@
 # 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.ebuild,v 1.1 2008/08/16 13:38:41 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.2-r1.ebuild,v 1.1 2008/09/03 20:42:34 yngwin Exp $
 
 EAPI="1"
 inherit eutils qt4
 
-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}/${P}.tar.bz2"
 LICENSE="GPL-2"
@@ -26,6 +26,25 @@ for X in ${NOLONGLANGS}; do
 	IUSE="${IUSE} linguas_${X%_*}"
 done
 
+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="1661"
 	echo "SVN-r${MY_SVNREV}" > svn_revision.txt
@@ -77,14 +96,3 @@ src_install() {
 	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
-}