old

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

3 files changed, 5 insertions, 176 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index dbd061dc60d5..2de50b521ebc 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/smplayer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.149 2014/09/29 10:05:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.150 2014/09/29 13:06:01 pesa Exp $
+
+  29 Sep 2014; Davide Pesavento <pesa@gentoo.org>
+  -files/smplayer-0.8.0-quazip.patch, -smplayer-0.8.5.ebuild:
+  old
 
   29 Sep 2014; Agostino Sarubbo <ago@gentoo.org> smplayer-14.3.0.ebuild:
   Stable for x86, wrt bug #523402
diff --git a/media-video/smplayer/files/smplayer-0.8.0-quazip.patch b/media-video/smplayer/files/smplayer-0.8.0-quazip.patch
deleted file mode 100644
index 18ff7f85da41..000000000000
--- a/media-video/smplayer/files/smplayer-0.8.0-quazip.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-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.5.ebuild b/media-video/smplayer/smplayer-0.8.5.ebuild
deleted file mode 100644
index 2fa03cb8f1a2..000000000000
--- a/media-video/smplayer/smplayer-0.8.5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/smplayer-0.8.5.ebuild,v 1.4 2013/07/04 14:25:37 jer Exp $
-
-EAPI=4
-PLOCALES="ar_SY bg ca cs da de el_GR en_US es et eu fi fr gl he_IL hr hu it ja
-ka ko ku lt mk ms_MY nl pl pt pt_BR ro_RO ru_RU sk sl_SI sr sv th tr uk_UA vi_VN
-zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit eutils l10n 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 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="debug"
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-libs/quazip"
-MPLAYER_USE="[libass,png,X]"
-RDEPEND="${DEPEND}
-	|| ( media-video/mplayer2${MPLAYER_USE} media-video/mplayer${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
-
-	# l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts'
-}
-
-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
-
-	cd "${S}"/src/translations
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of licenses
-	rm -f Copying* docs/{cs,en,hu,it,ja,pt,ru,zh_CN}/gpl.html || die
-	rm -rf docs/{de,es,nl,ro} || die
-
-	emake DESTDIR="${D}" install
-}