Version bump

Package-Manager: portage-2.1.5.2

4 files changed, 101 insertions, 5 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index d231bc8630cc..58ac8572b749 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.20 2008/05/18 23:09:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.21 2008/05/28 12:00:58 yngwin Exp $
+
+*smplayer-0.6.1 (28 May 2008)
+
+  28 May 2008; Ben de Groot <yngwin@gentoo.org> smplayer-0.6.0.ebuild,
+  +smplayer-0.6.1.ebuild:
+  Version bump to 0.6.1. Inluded new Catalan translation option. Fixed svn
+  revision in 0.6.0 ebuild.
 
   18 May 2008; Jeroen Roovers <jer@gentoo.org> smplayer-0.6.0_rc4.ebuild:
   Stable for HPPA.
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 88cd453e5c8b..d76e3365788a 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,8 +1,10 @@
 DIST smplayer-0.6.0final.tar.bz2 1016544 RMD160 2e68eb660e1ad6e96ae3e058cc08dcc87be61468 SHA1 4415acfabf868c93601fa99187398d65295ab341 SHA256 3111edfac2ad114d6db83f2242de3b69d4e6825ddba985370c615932723908fb
 DIST smplayer-0.6.0rc3.tar.bz2 1011857 RMD160 3678d96c6f5c8808e7c6de7a00d242322deab58e SHA1 71d5efd36f6b0f9b7a612ce00e5224268911fbc6 SHA256 ae37b8a78aed20d1698eaa5359488731d8ccd59d73d15159448861b31e8b3e83
 DIST smplayer-0.6.0rc4.tar.bz2 1017697 RMD160 5d7a66e23985510e21749c211801eafc59bc3459 SHA1 aba53aad0dc1ed2de9d2977b34196df281c650a1 SHA256 41b5e574b44bc632ea6d39a6d3d6ed89a84934b8a598f153c5320ac70a92a893
-EBUILD smplayer-0.6.0.ebuild 2625 RMD160 cc94b1f4b8a5c4d91764e8d047c8806243370209 SHA1 eda911ff19322666a606c59d03c1abfaa480a569 SHA256 0b66a3851e94f0ad607adef9fdb164d3c92107a4a9be94aa48a8f98bdcc6078a
+DIST smplayer-0.6.1.tar.bz2 1029890 RMD160 2859050073d9535d03a16e2dfbb94ad03fbb22f3 SHA1 b9dd657b3fd24bda951ed942d5698ae85a24b52b SHA256 02386148c798bdb60ac412423bab5a8e2d93c15fd84963cf18d2cdb6c1800242
+EBUILD smplayer-0.6.0.ebuild 2624 RMD160 dd35f2c1b956fc118d33dd80429b94bf1fe80b84 SHA1 587c0a8547f5b4371ad46199e92a5a58dc5f0705 SHA256 884e706801a0192d14f34a640f334f657bf5f0ec59707c7cd75073f55c9e1294
 EBUILD smplayer-0.6.0_rc3.ebuild 2924 RMD160 7905cdb9d451a1bd0f6437227f653610b5fcff28 SHA1 24317113c9f830e05b72ac84b3120be79c502e9f SHA256 3ea8b1b2256796d549b3d87a1636026e1deb7cb793c8919695e7f7aa8cba5036
 EBUILD smplayer-0.6.0_rc4.ebuild 2954 RMD160 8194d4d4c9702ca3ac1702e3b7cb428149cd61b6 SHA1 5f0fab94f026feaa2375747e4cb60228ef8d68ce SHA256 15f810270d1e12425e3541bd713ddbe57aef476159309edceed968997eb5f9c8
-MISC ChangeLog 2876 RMD160 4715974664346bca534d9a222d70eab39fe53772 SHA1 a38f78542754e79e4d5e07b000dd8ead5f64c48a SHA256 abbd0503df15583b03b4b7d1dd69ff5c2df669116a84a9a173d695c86de91e27
+EBUILD smplayer-0.6.1.ebuild 2585 RMD160 1809b6ef3f3df99a69f1ef69f4ab35af747dfc17 SHA1 0957f780517c4a5b9bf2adbcd8a6fea356e556e1 SHA256 2d29470e2eb6413df86fa4192233e6361336d535fc9f32898f1ab9fe8ec2d55c
+MISC ChangeLog 3111 RMD160 6f482a2c214ed38b91779b1310fccaea3851cb95 SHA1 756e78959155dbf5f3062559d3171d87a1a49878 SHA256 b3405c44bc6d1b0bdde0e8e6a31a2c95a33028bd4d2cd8c5b18ca00ac6380c0e
 MISC metadata.xml 248 RMD160 3dd3ed866d9de9b9e1e757a75ad74cd04a179a0a SHA1 ee402648473a449107fdc483b2452b655887f15c SHA256 319bbc38f5d834b6230f477c4330ff29d94c9447f563551c977e5c3b038aecaf
diff --git a/media-video/smplayer/smplayer-0.6.0.ebuild b/media-video/smplayer/smplayer-0.6.0.ebuild
index 69c59b751ede..0745ab5e7bac 100644
--- a/media-video/smplayer/smplayer-0.6.0.ebuild
+++ b/media-video/smplayer/smplayer-0.6.0.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.0.ebuild,v 1.1 2008/05/14 15:45:51 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.6.0.ebuild,v 1.2 2008/05/28 12:00:58 yngwin Exp $
 
 EAPI="1"
 inherit eutils qt4
@@ -30,7 +30,7 @@ done
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
-	local MY_SVNREV="26450"
+	local MY_SVNREV="1247"
 	echo "SVN-r${MY_SVNREV}" > svn_revision.txt
 	echo "#define SVN_REVISION \"SVN-r${MY_SVNREV}\"" > src/svn_revision.h
 
diff --git a/media-video/smplayer/smplayer-0.6.1.ebuild b/media-video/smplayer/smplayer-0.6.1.ebuild
new file mode 100644
index 000000000000..45e83cdcee3d
--- /dev/null
+++ b/media-video/smplayer/smplayer-0.6.1.ebuild
@@ -0,0 +1,87 @@
+# 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.1 2008/05/28 12:00:58 yngwin Exp $
+
+EAPI="1"
+inherit eutils qt4
+
+DESCRIPTION="Great front-end for mplayer written in Qt4"
+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
+
+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
+}
+
+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
+}