Remove obsoleted patches

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

4 files changed, 6 insertions, 111 deletions

diff --git a/media-video/smplayer/ChangeLog b/media-video/smplayer/ChangeLog
index b1394e7b1fd8..bfb1d7015d86 100644
--- a/media-video/smplayer/ChangeLog
+++ b/media-video/smplayer/ChangeLog
@@ -1,6 +1,10 @@
 # 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.114 2012/06/02 06:17:09 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/smplayer/ChangeLog,v 1.115 2012/06/02 06:18:46 yngwin Exp $
+
+  02 Jun 2012; Ben de Groot <yngwin@gentoo.org>
+  -files/smplayer-0.6.8-quit.patch, -files/smplayer-0.6.9-quazip.patch:
+  Remove obsoleted patches
 
   02 Jun 2012; Ben de Groot <yngwin@gentoo.org> -smplayer-0.6.9-r1.ebuild,
   -smplayer-0.6.9-r2.ebuild, -smplayer-0.6.9.ebuild, smplayer-0.8.0.ebuild:
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index a6292c5e9a09..712554ea723d 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,7 +1,5 @@
-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.8.0.tar.bz2 2815007 RMD160 7a1858c8fcde0cd0b2c45848419ee098310a66e1 SHA1 2cb2a50b5e6cc518fb9984a5e4b2c87c8cb98a99 SHA256 208ad155da3bbcb3924549c7ba81aa7280b59adfdb92adbec5ac7ebc2944576f
 EBUILD smplayer-0.8.0.ebuild 2687 RMD160 5e66bb25cb1f9f88ba85fca7e6b503e85acaf843 SHA1 341bb4beac3109405ed93dcf1a60d3c01c6af75c SHA256 8d70c83c4d5b3e0a44013db268e23ffc38f45c49d31c3388bc1373f1ee72be6c
-MISC ChangeLog 15830 RMD160 b05696eba5cd2da1b87b682b5ab04bdff7a902ab SHA1 5636fef0c405c2e8a1146c849facbac5665cad2c SHA256 e5b74f29fd25767e97f8d07dfd82f4cffcf14cb89686ced239d514578e5b50e0
+MISC ChangeLog 15978 RMD160 6e73e31f020e9a737690eb1f2eadb203c477cb3f SHA1 6f28a6df089ba740fe6ba6db8978835cbf59432e SHA256 ebb54899eecfa94e8cb087f94cb159a59759389340c2c402ad1cca973e489444
 MISC metadata.xml 174 RMD160 0a13b88e8a29e1544788c6a992ec89f0596ce194 SHA1 aba42874330898fd11455305dc72f5c3be472565 SHA256 89d4f3510de4db0434e0b3794ed9bef3e603217ca0cb195d3e817c208239f6fa
diff --git a/media-video/smplayer/files/smplayer-0.6.8-quit.patch b/media-video/smplayer/files/smplayer-0.6.8-quit.patch
deleted file mode 100644
index ae470eeede5a..000000000000
--- a/media-video/smplayer/files/smplayer-0.6.8-quit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- smplayer-0.6.8/src/baseguiplus.cpp	2009-08-13 16:07:04.000000000 +0300
-+++ smplayer-0.6.8/src/baseguiplus.cpp	2009-08-13 16:08:22.000000000 +0300
-@@ -67,8 +67,7 @@
- 	tray->setToolTip( "SMPlayer" );
- 	connect( tray, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), 
-              this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason)));
--
--	quitAct = new MyAction(this, "quit");
-+	quitAct = new MyAction(QKeySequence("Ctrl+Q"), this, "quit");
-     connect( quitAct, SIGNAL(triggered()), this, SLOT(quit()) );
- 	openMenu->addAction(quitAct);
diff --git a/media-video/smplayer/files/smplayer-0.6.9-quazip.patch b/media-video/smplayer/files/smplayer-0.6.9-quazip.patch
deleted file mode 100644
index 7e32c4bc014a..000000000000
--- a/media-video/smplayer/files/smplayer-0.6.9-quazip.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 6350ac5b99cccf4e45e334512bc64b5c71b06135 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 21 Sep 2011 14:23:08 +0200
-Subject: [PATCH] Move to system's quazip
-
----
- src/findsubtitles/findsubtitles.pro       |   11 ++---------
- src/findsubtitles/findsubtitleswindow.cpp |    4 ++--
- src/smplayer.pro                          |   11 ++---------
- 3 files changed, 6 insertions(+), 20 deletions(-)
-
-diff --git a/src/findsubtitles/findsubtitles.pro b/src/findsubtitles/findsubtitles.pro
-index bbfa8a1..ad0cefa 100644
---- a/src/findsubtitles/findsubtitles.pro
-+++ b/src/findsubtitles/findsubtitles.pro
-@@ -28,8 +28,8 @@ FORMS += ../filechooser.ui findsubtitleswindow.ui findsubtitlesconfigdialog.ui
- 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
-@@ -38,17 +38,2 @@ contains( DEFINES, DOWNLOAD_SUBS ) {
- 
--	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
- 
-diff --git a/src/findsubtitles/findsubtitleswindow.cpp b/src/findsubtitles/findsubtitleswindow.cpp
-index 6d1d2c7..6defa5d 100644
---- a/src/findsubtitles/findsubtitleswindow.cpp
-+++ b/src/findsubtitles/findsubtitleswindow.cpp
-@@ -36,8 +36,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 <QTemporaryFile>
- #include <QBuffer>
- #endif
-diff --git a/src/smplayer.pro b/src/smplayer.pro
-index 9020e6c..9e995fc 100644
---- a/src/smplayer.pro
-+++ b/src/smplayer.pro
-@@ -249,8 +249,8 @@ TRANSLATIONS = translations/smplayer_es.ts translations/smplayer_de.ts \
-                translations/smplayer_et.ts translations/smplayer_lt.ts
- 
- 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
- 	SOURCES += filedownloader.cpp subchooserdialog.cpp
-@@ -259,17 +259,3 @@ contains( DEFINES, DOWNLOAD_SUBS ) {
- 
--	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 += -lquazip
- 
--- 
-1.7.6.1
-