Version bump by Ben de Groot <yngwin@gmail.com>. This version fixes bug #345653. Drop quit.patch, now applied upstream. Add mplayer[X], bug #377343.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686

3 files changed, 119 insertions, 15 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index 830086b44dd7..8e45d53288e0 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/smplayer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.99 2012/01/22 19:38:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.100 2012/02/04 00:11:12 johu Exp $
+
+*smplayer-0.7.0 (04 Feb 2012)
+
+  04 Feb 2012; Johannes Huber <johu@gentoo.org> +smplayer-0.7.0.ebuild:
+  Version bump by Ben de Groot <yngwin@gmail.com>. This version fixes bug
+  #345653. Drop quit.patch, now applied upstream. Add mplayer[X], bug #377343.
 
 *smplayer-0.6.10 (22 Jan 2012)
 
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 95c77f3a1fac..43c430f96268 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -6,27 +6,23 @@ AUX smplayer-0.6.9-quazip.patch 3078 RMD160 e45f97595a53ee2eae603ca41d14e680ac50
 DIST smplayer-0.6.10.tar.bz2 2204068 RMD160 9397e693152cf92c92d237b1cbadbb2e1f4c3236 SHA1 d75945e39074928b9f9e760ba7cfec1722c71fbe SHA256 734029cba461439bb1e1b6db841d06c4f696a7a22851d3227ea70af4d8871bdf
 DIST smplayer-0.6.8.tar.bz2 1670580 RMD160 10db255b8e21658b03fcff66de5554acaf29782e SHA1 0f7d53babe1fd71ea9eddb448622d112495242e7 SHA256 466b589ee2d3944b2e3b8f3a6dae436f7d31f054912cfe56f8d93454594c4ca2
 DIST smplayer-0.6.9.tar.bz2 1723032 RMD160 8e47e88b9fddc56d66c338c1886a5079ab279854 SHA1 1879839c229b7ef2dcd6d7e34e2e2057fae5182c SHA256 b91009b6dc2a3cdd5acc2bdacc3cf6870fce8f63d8e6ef9cfe8e199f1acc2e35
+DIST smplayer-0.7.0.tar.bz2 2280593 RMD160 0b00f2ab537047e8922e078add64bec5853dabed SHA1 961589618cb3708598e64480da0bb9b3b56550c2 SHA256 f22f3fb63749f82a2f5d604ea195870cdd30296ca18ebc3f384bb5b7ea2a90df
 EBUILD smplayer-0.6.10.ebuild 2734 RMD160 11d2a87f0159eaca0cfb4e591724cff9aaecd8e6 SHA1 2d0360a0cb9bfe201f6e456273ac82266d674ab9 SHA256 4333074d2c99a29a6b2f0ba02b5146a8e8509601d1de034626e31896baaba7e1
 EBUILD smplayer-0.6.8.ebuild 2786 RMD160 04e67cf905669d4a708ec51b1b0572767750fa1c SHA1 590323851d451026bd18fa51c2ca5cba7ab69952 SHA256 c7a407f5e0c93acf87d5c22670f079311a65cc04d938e40d26a93ad71e709ebe
 EBUILD smplayer-0.6.9-r1.ebuild 2642 RMD160 8c8b7a8f14d97685eb89f56413531379b392c288 SHA1 4a4e4e51da9a8ab38bdae8cd7c0b34aee56d1d74 SHA256 b8e1b6df52dd49a904ce871f325a02732bbe645114f3bd05adfe0f2b6686aa2d
 EBUILD smplayer-0.6.9-r2.ebuild 2732 RMD160 7fd4d4a42f1a390c189ddc6b4305ad84ee0f066e SHA1 9c22cfe23052d5676dca41e33e669f2c7a8b650f SHA256 f3aba971170d17e47c594e5bd89ba1a0cfc7939f777cd7ca10a8f08e51348460
 EBUILD smplayer-0.6.9.ebuild 2559 RMD160 5dec7b33269b7fef6ade928df0be224232f1a1bc SHA1 838c5877a376b5f3a004175833e3fdbdb037ba00 SHA256 00306f46e88c9c1eaa617b788f9dfc2a99150c8e82ecee54e0b53d9edd0fd1ae
-MISC ChangeLog 13720 RMD160 d0bb7f930a92f919952074c0a52f4e0e3d4d74f9 SHA1 3c096ea0bc7bfd2487d4f8cbc3df4615d50b7fc5 SHA256 502cb39b56c4656dc15e2285497eadbb1560b7c9018bd558780d3fdb742dc031
+EBUILD smplayer-0.7.0.ebuild 2653 RMD160 fbb3b3289010548508c616955e6466aca9059743 SHA1 47462a837416a5c27d2582b834deadbbeb2a32b7 SHA256 d5a50d2effce87cd9206d1b1b7ab2de7f9483f5d86ca73aa5bdb2221f3ad036f
+MISC ChangeLog 13974 RMD160 152474807e84c2a8ea1038ea9abb2626dcca78ee SHA1 a744a0470a9ff92256628a092cc29bfb5ae1099d SHA256 b5630395a4d31b2d75be360ce5b36d3263a40231020eee1ecbad45045345037d
 MISC metadata.xml 174 RMD160 0a13b88e8a29e1544788c6a992ec89f0596ce194 SHA1 aba42874330898fd11455305dc72f5c3be472565 SHA256 89d4f3510de4db0434e0b3794ed9bef3e603217ca0cb195d3e817c208239f6fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPHGW8AAoJEPqDWhW0r/LCojgP/ih2b0j5ITQpfwtaK/ZYzgVB
-7p+Pv+fYxNXm66ULqSpD8JoImT+/pZ1hOgEFC7KbLulFJtk+/wKBNWLivNIvHMz4
-m69LR6BEbDaDbk8FLNy3CWRTF6rs+ahb6TRgfm/lKYv/Pu8s4CcI+8ZD1blZQblI
-D8hsSCUF0odvALe+40wyWE8imT2bMSJgVN9nUMbm740tIJGnTPwv5za4bKO3NIqt
-quhHARWBDwKoh4DyUQeryojOjUcKUoF+UtIwp+853Ik0VJOJaNdui2yfm+eiKQb5
-TjB4Du92lyz8ynxYpbsWlKWBu5vbdGsxt3aYoi5EzVypnJP6D37+5gHiAYU+Ic53
-gYE8ylANaAIoYf9NoCDfcjWqQVbWhC1bel0SzRfvuz1sgZmof8Abz0FCXEGqk1Vk
-E1n77JedfR0DT4xKADVwz8s+X3OjhzGAejt3ccOkj7v/lv95yyCykOBqwy42Zv5A
-fMZ7rZmGutttwqo6QU8KQM+TmjHHP6gIfM8iclmvFPHKC9ewufhyhTMgNHs+L/RD
-nhpp8oepyviBK7oqdIckTAcG3aXWM2tS/SsBF/inEcVUiqRQZfIPDVopHVc4sEPH
-I/8sFW01sSgpr+hKB22cpNb0LPE95qNCs9EFcvCi1JZyBpzLQD+LFpJ0b1A7Rhec
-v4CTKOUeydhZgIkbCsnz
-=HmgW
+iQEcBAEBCgAGBQJPLHihAAoJEO+t9ga+3I3aLugIALudDnsJY2kOumHNqqP/v3zP
+Eqav59XFO4nYs5FIb7n6sm9Aofr4QUVzlapj1vGVE2KyCNQjmZcmTMwjXwhQo0Al
+Sddd7fFbhu025aVbaWzXvW+SswnPHLIyT2l3dzJrT1M8B84nYd35IFDFW5XrJnWk
+nlFpH++svE8QMeWqVZTDfwGnYBKXzaKeGDWx7KiVQCLb/VPl++cTPv1nFxZr64rr
+hsI4ftGKHaqqCSaSTA+e21jm27hBsVhwnZC/kLthQh5trGADF/OubkYogDF5Iyy9
+b8AUfo0LHB9RrppKsHcb5WCZDn7W0MPcjgyOiSnWGf5gsQ5yk6AzwueXelYUpE0=
+=v40r
 -----END PGP SIGNATURE-----
diff --git a/media-video/smplayer/smplayer-0.7.0.ebuild b/media-video/smplayer/smplayer-0.7.0.ebuild
new file mode 100644
index 000000000000..72ac966a1026
--- /dev/null
+++ b/media-video/smplayer/smplayer-0.7.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.7.0.ebuild,v 1.1 2012/02/04 00:11:12 johu Exp $
+
+EAPI=4
+LANGS="bg ca cs da de en_US es et eu fi fr gl hr 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-r2
+
+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="~amd64 ~arm ~hppa ~x86"
+IUSE="debug"
+
+DEPEND="x11-libs/qt-gui:4
+	dev-libs/quazip"
+MPLAYER_USE="[ass,png,X]"
+RDEPEND="${DEPEND}
+	|| ( media-video/mplayer${MPLAYER_USE} media-video/mplayer2${MPLAYER_USE} )"
+
+src_prepare() {
+	# Unbundle dev-libs/quazip
+	rm -R src/findsubtitles/quazip/ || die
+	epatch "${FILESDIR}"/${PN}-0.6.9-quazip.patch
+
+	# 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
+
+	# 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 [[ " ${LANGSLONG} " == *" ${lang}_"* ]]; then
+			for x in ${LANGSLONG}; 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 || die
+	rm -rf docs/{de,es,nl,ro} || die
+
+	# remove windows-only files
+	rm "${S}"/*.bat || die
+
+	emake DESTDIR="${D}" install
+}