Version bump, bug 411025 by Ben de Groot <yngwin@gmail.com>.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 217 insertions, 10 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index 4db19ef456f3..3be7e0f775bf 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.108 2012/04/05 09:25:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.109 2012/04/08 23:01:26 pesa Exp $
+
+*smplayer-0.8.0 (08 Apr 2012)
+
+  08 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+  +files/smplayer-0.8.0-quazip.patch, +smplayer-0.8.0.ebuild:
+  Version bump, bug 411025 by Ben de Groot <yngwin@gmail.com>.
 
   05 Apr 2012; Agostino Sarubbo <ago@gentoo.org> smplayer-0.7.1.ebuild:
   Stable for amd64, wrt bug #410731
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 03083c54d132..40dd8c806af4 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -3,22 +3,31 @@ Hash: SHA512
 
 AUX smplayer-0.6.8-quit.patch 559 RMD160 57a13ce73bf1bc42ff84afa93740b2b91979c68a SHA1 cd6747917b8a8a71d46b8841d7924c4e304bb636 SHA256 52bd82633b4561613675121ae10af12ef25a11b7343eea043a3a70dd32aa999a
 AUX smplayer-0.6.9-quazip.patch 3078 RMD160 e45f97595a53ee2eae603ca41d14e680ac504f76 SHA1 dee5b27bf1bf7cb4784d38bfc07cad6c13504a44 SHA256 4f2004a512879e3e0cf8f497a5c9218c662b3e8986e81797b7f3eebe77445c5a
+AUX smplayer-0.8.0-quazip.patch 2915 RMD160 644a1a915a23ad23af56e6740fa5be3460e9f8b0 SHA1 387daa66469a842a64d2cfb65eb88dc6f561a659 SHA256 ac1e7f6301d14df624c13219397958d2f5ebee3c3f89f46cc9651e9413548bd2
 DIST smplayer-0.6.9.tar.bz2 1723032 RMD160 8e47e88b9fddc56d66c338c1886a5079ab279854 SHA1 1879839c229b7ef2dcd6d7e34e2e2057fae5182c SHA256 b91009b6dc2a3cdd5acc2bdacc3cf6870fce8f63d8e6ef9cfe8e199f1acc2e35
 DIST smplayer-0.7.1.tar.bz2 2788634 RMD160 864f227d2dec475368e155255ceec9f929ec1aa8 SHA1 de5a3a8dc3bf38c2fba344d170144656a116b8c3 SHA256 f7be2ed4cd629dd50f21dd64298ba3d4d0a4347c4bb915282a0caceade81087e
+DIST smplayer-0.8.0.tar.bz2 2815007 RMD160 7a1858c8fcde0cd0b2c45848419ee098310a66e1 SHA1 2cb2a50b5e6cc518fb9984a5e4b2c87c8cb98a99 SHA256 208ad155da3bbcb3924549c7ba81aa7280b59adfdb92adbec5ac7ebc2944576f
 EBUILD smplayer-0.6.9-r1.ebuild 2642 RMD160 8c8b7a8f14d97685eb89f56413531379b392c288 SHA1 4a4e4e51da9a8ab38bdae8cd7c0b34aee56d1d74 SHA256 b8e1b6df52dd49a904ce871f325a02732bbe645114f3bd05adfe0f2b6686aa2d
 EBUILD smplayer-0.6.9-r2.ebuild 2742 RMD160 cb17ac66bc9fadd0431b24d4026987590a7a7cab SHA1 cfb42ef0d1a39f275352f96c7e7d7dc9acb4dd9b SHA256 a39b0a00722863e61fdd38dd8cdf978d3c3a3a90d435b866bc7a6bbf3d140085
 EBUILD smplayer-0.6.9.ebuild 2559 RMD160 5dec7b33269b7fef6ade928df0be224232f1a1bc SHA1 838c5877a376b5f3a004175833e3fdbdb037ba00 SHA256 00306f46e88c9c1eaa617b788f9dfc2a99150c8e82ecee54e0b53d9edd0fd1ae
 EBUILD smplayer-0.7.1.ebuild 2677 RMD160 b041d824bc838fed4a6146e3042e36b318fd5736 SHA1 125a128796a9d77c05fb0b480ea8e6aa438f1d41 SHA256 d3065f2c98fac59ea246eb953aafc4afbe98ce3bf4237f7bfae78815846ba9be
-MISC ChangeLog 14896 RMD160 105660418b3ae4c2977d1bf8bf3ea782218a0d52 SHA1 b4178ab229f5637c73d28d25c2b749e795ea8dba SHA256 98744d01cd859827fa87d5b80abf9ff2c28cb7ec9b8d2ccac93d0b7ed69ab62b
+EBUILD smplayer-0.8.0.ebuild 2681 RMD160 e19b1878822807314c4f0b21948436df69f8e2ec SHA1 216187b26b9ddeecbb0ad20fd859b8fe3a70715b SHA256 c1de0a3c70ba9c6064d5791896829f89d16296749ee683a2582b3c81eded6b9c
+MISC ChangeLog 15104 RMD160 589548a63fc9b350c4b1819da8f161fa4aa10e50 SHA1 9edeb69e8736dea75636adac7c884b0fd78e0a9d SHA256 e2854b47963f0999c69f997abbf2016f7251eddb95d09aa6ba8214f4c19097b3
 MISC metadata.xml 174 RMD160 0a13b88e8a29e1544788c6a992ec89f0596ce194 SHA1 aba42874330898fd11455305dc72f5c3be472565 SHA256 89d4f3510de4db0434e0b3794ed9bef3e603217ca0cb195d3e817c208239f6fa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPfWUpAAoJEOTDgjZ80txdWa4H/2ZCRQxGJSkOnFrOMj0Zs8hG
-iDyGYjM4OxfcHF62hZJWbegIIw1BPQCe7q+Vq4WDYoNDAHt9VODFmHzCRgdZaKMe
-ex4LPyo96vyW/m5tD2jRQEWqtiKPGJduflxpimK4cxk1WzlLfRaROPZ7NMVMRBTQ
-NHpUPPIzAzLDlXfaQF76eJIO5SKaYmVXSxd236sBZLSMWjvoBcFEwsQoO/OiNcks
-s7FRk4U+IybPvGbNGqSS0oo5IO8x6+RJF1Jh6RCA8o5vNbX+a+nSFioAkapte37C
-ZsQHX+mjO4aQVH4q6KmFKG6HvvU7IOY9BrYECb++h+qQ3xVTonbmMUVVypPA83k=
-=YVAO
+iQIcBAEBCgAGBQJPghjaAAoJENXLsxwXqFxyh3wP/AgRVKQFq6i7WQeAQvlNJqLA
+Tj6G7OIC5jD7qZFTJRmFjiCupjcfGIdJkSRVjKkSvgDgqGgmPko6pUY2xUYWg9PE
+dWs9KhlyAYeAszqH1R/cNUYDUCm1mNzdl96MTB0Zc9JiNZtfwIcJ3vcCYpEdFKXC
+wElEE03zSMzCGTQ7dihy/EfP799uJMaSt3NVPMrEeG/1mnfys8I8iEn/BqvLUgBb
+eMmjZQrstEf5o7hvq4cIhqgkuwgQepKzXkruwl+lI0XX1NO37umxlAaxvMgHbOGA
+Mfg+pAJlOHpFoBtbDEf9YagTi1j9/Y+EImg6i3mCSTxJWLtB3q3QFQEaOJvZ0lEm
+fPEissChXHYO71g/usR48pwfdf0gvEqYXOX8cdWOabUtbnS+6l7p6iqVBrVW5Vch
+G9ruDKpf2NlSLWMgHEaTVutqElEch4wmrTNPPA7pcAu7j744YrZmCIRQBjZ1zkDv
+ofOyIVnJOU2VzRzu+L/bQVigfgqBwCRVPRtRLBWAAo80Rn2P+YHAtea+HTPWJyJO
+DjqODeokH6aOrvjmB6Qmx/+ldHlEtf/tpw1p012VPNB3Euwbp+SET/Ydr/APWMyF
+bLzu2MP8HtA6QeKCIi1Umz3agXnOqAnpnnbcY4rBiv3dr1X3Rw4RiGTAeAq7I8Ri
+1ye3sML9fYep0Xa6WzvV
+=J0ej
 -----END PGP SIGNATURE-----
diff --git a/media-video/smplayer/files/smplayer-0.8.0-quazip.patch b/media-video/smplayer/files/smplayer-0.8.0-quazip.patch
new file mode 100644
index 000000000000..18ff7f85da41
--- /dev/null
+++ b/media-video/smplayer/files/smplayer-0.8.0-quazip.patch
@@ -0,0 +1,90 @@
+diff -burN ./smplayer-0.8.0.orig/src/findsubtitles/findsubtitles.pro ./smplayer-0.8.0/src/findsubtitles/findsubtitles.pro
+--- ./smplayer-0.8.0.orig/src/findsubtitles/findsubtitles.pro	2012-03-31 20:46:16.000000000 +0800
++++ ./smplayer-0.8.0/src/findsubtitles/findsubtitles.pro	2012-04-07 15:27:47.114937446 +0800
+@@ -34,31 +34,15 @@
+ DEFINES += NO_SMPLAYER_SUPPORT DOWNLOAD_SUBS
+ 
+ contains( DEFINES, DOWNLOAD_SUBS ) {
+-	INCLUDEPATH += filedownloader quazip
+-	DEPENDPATH += filedownloader quazip
++	INCLUDEPATH += filedownloader
++	DEPENDPATH += filedownloader
+ 
+ 	HEADERS += filedownloader.h subchooserdialog.h
+ 	SOURCES += filedownloader.cpp subchooserdialog.cpp
+ 
+ 	FORMS += subchooserdialog.ui
+ 
+-	HEADERS += crypt.h \
+-	           ioapi.h \
+-	           quazip.h \
+-	           quazipfile.h \
+-	           quazipfileinfo.h \
+-	           quazipnewinfo.h \
+-	           unzip.h \
+-	           zip.h
+-
+-	SOURCES += ioapi.c \
+-	           quazip.cpp \
+-	           quazipfile.cpp \
+-	           quazipnewinfo.cpp \
+-	           unzip.c \
+-	           zip.c
+-
+-	LIBS += -lz
++	LIBS += -lquazip -lz
+ 	
+ 	win32 {
+ 		INCLUDEPATH += c:\development\zlib-1.2.3
+diff -burN ./smplayer-0.8.0.orig/src/findsubtitles/findsubtitleswindow.cpp ./smplayer-0.8.0/src/findsubtitles/findsubtitleswindow.cpp
+--- ./smplayer-0.8.0.orig/src/findsubtitles/findsubtitleswindow.cpp	2012-04-02 16:55:25.000000000 +0800
++++ ./smplayer-0.8.0/src/findsubtitles/findsubtitleswindow.cpp	2012-04-07 15:25:41.809593788 +0800
+@@ -37,8 +37,8 @@
+ #ifdef DOWNLOAD_SUBS
+ #include "filedownloader.h"
+ #include "subchooserdialog.h"
+-#include "quazip.h"
+-#include "quazipfile.h"
++#include <quazip/quazip.h>
++#include <quazip/quazipfile.h>
+ #include "fixsubs.h"
+ #include <QTemporaryFile>
+ #include <QBuffer>
+diff -burN ./smplayer-0.8.0.orig/src/smplayer.pro ./smplayer-0.8.0/src/smplayer.pro
+--- ./smplayer-0.8.0.orig/src/smplayer.pro	2012-04-02 17:09:38.000000000 +0800
++++ ./smplayer-0.8.0/src/smplayer.pro	2012-04-07 15:22:53.440501860 +0800
+@@ -258,31 +258,15 @@
+ 
+ # Download subtitles
+ contains( DEFINES, DOWNLOAD_SUBS ) {
+-	INCLUDEPATH += findsubtitles/filedownloader findsubtitles/quazip
+-	DEPENDPATH += findsubtitles/filedownloader findsubtitles/quazip
++	INCLUDEPATH += findsubtitles/filedownloader
++	DEPENDPATH += findsubtitles/filedownloader
+ 
+ 	HEADERS += filedownloader.h subchooserdialog.h fixsubs.h
+ 	SOURCES += filedownloader.cpp subchooserdialog.cpp fixsubs.cpp
+ 
+ 	FORMS += subchooserdialog.ui
+ 
+-	HEADERS += crypt.h \
+-	           ioapi.h \
+-	           quazip.h \
+-	           quazipfile.h \
+-	           quazipfileinfo.h \
+-	           quazipnewinfo.h \
+-	           unzip.h \
+-	           zip.h
+-
+-	SOURCES += ioapi.c \
+-	           quazip.cpp \
+-	           quazipfile.cpp \
+-	           quazipnewinfo.cpp \
+-	           unzip.c \
+-	           zip.c
+-
+-	LIBS += -lz
++	LIBS += -lquazip -lz
+ 	
+ 	win32 {
+ 		INCLUDEPATH += ..\\zlib-1.2.6
diff --git a/media-video/smplayer/smplayer-0.8.0.ebuild b/media-video/smplayer/smplayer-0.8.0.ebuild
new file mode 100644
index 000000000000..f28b43880312
--- /dev/null
+++ b/media-video/smplayer/smplayer-0.8.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.8.0.ebuild,v 1.1 2012/04/08 23:01:26 pesa Exp $
+
+EAPI=4
+LANGS="bg ca cs da de en_US es et eu fi fr gl hr hu it ja ka ko ku lt 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 ~x86-fbsd"
+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.8.0-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,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
+	rm -rf docs/{de,es,nl,ro} || die
+
+	# remove windows-only files
+	rm "${S}"/*.bat || die
+
+	emake DESTDIR="${D}" install
+}