Bump to latest, punt older.

(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

4 files changed, 26 insertions, 42 deletions

diff --git a/net-misc/clipgrab/clipgrab-3.1.3.0.ebuild b/net-misc/clipgrab/clipgrab-3.1.3.0.ebuild
deleted file mode 100644
index b93f7b1b8b03..000000000000
--- a/net-misc/clipgrab/clipgrab-3.1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clipgrab/clipgrab-3.1.3.0.ebuild,v 1.1 2011/12/19 12:04:15 xmw Exp $
-
-EAPI=4
-
-inherit qt4-r2 eutils
-
-DESCRIPTION="Download from various internet video services like Youtube etc."
-HOMEPAGE="http://clipgrab.de/en"
-SRC_URI="http://${PN}.de/download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/qt-webkit:4"
-RDEPEND="${DEPEND}
-	virtual/ffmpeg"
-
-PATCHES=(
-	"${FILESDIR}/obey.patch"
-)
-
-src_install() {
-	dobin ${PN}
-
-	newicon icon.png ${PN}.png
-	make_desktop_entry clipgrab Clipgrab "" "Qt;Video;AudioVideo;"
-}
diff --git a/net-misc/clipgrab/clipgrab-3.1.0.2.ebuild b/net-misc/clipgrab/clipgrab-3.2.0.6.ebuild
index 8cfaa13a8657..7dba637a3505 100644
--- a/net-misc/clipgrab/clipgrab-3.1.0.2.ebuild
+++ b/net-misc/clipgrab/clipgrab-3.2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clipgrab/clipgrab-3.1.0.2.ebuild,v 1.2 2011/11/12 10:17:52 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clipgrab/clipgrab-3.2.0.6.ebuild,v 1.1 2012/05/16 11:25:25 scarabeus Exp $
 
 EAPI=4
 
@@ -20,7 +20,8 @@ RDEPEND="${DEPEND}
 	virtual/ffmpeg"
 
 PATCHES=(
-	"${FILESDIR}/obey.patch"
+	"${FILESDIR}/3.2.0.6-obey.patch"
+	"${FILESDIR}/3.2.0.6-qrc.patch"
 )
 
 src_install() {
diff --git a/net-misc/clipgrab/files/obey.patch b/net-misc/clipgrab/files/3.2.0.6-obey.patch
index 3bfa2a7038ae..3a8fbe3f9543 100644
--- a/net-misc/clipgrab/files/obey.patch
+++ b/net-misc/clipgrab/files/3.2.0.6-obey.patch
@@ -1,7 +1,7 @@
-diff -urN clipgrab-3.1.0.1.old//clipgrab.cpp clipgrab-3.1.0.1//clipgrab.cpp
---- clipgrab-3.1.0.1.old//clipgrab.cpp	2011-04-01 22:19:23.000000000 +0200
-+++ clipgrab-3.1.0.1//clipgrab.cpp	2011-04-01 22:20:32.000000000 +0200
-@@ -70,67 +70,6 @@
+diff -urN clipgrab-3.2.0.6.old//clipgrab.cpp clipgrab-3.2.0.6/clipgrab.cpp
+--- clipgrab-3.2.0.6.old//clipgrab.cpp	2012-05-16 13:11:40.592973547 +0200
++++ clipgrab-3.2.0.6/clipgrab.cpp	2012-05-16 13:13:37.808970927 +0200
+@@ -116,68 +116,7 @@
          }
      }
  
@@ -30,7 +30,8 @@ diff -urN clipgrab-3.1.0.1.old//clipgrab.cpp clipgrab-3.1.0.1//clipgrab.cpp
 -    obeyatorManager->get(obeyatorRequest);;
 -    connect(obeyatorManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(obey(QNetworkReply*)));
 -
--    connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardChanged()));
+     connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardChanged()));
+-
 -}
 -
 -void ClipGrab::obey(QNetworkReply* reply)
@@ -69,10 +70,10 @@ diff -urN clipgrab-3.1.0.1.old//clipgrab.cpp clipgrab-3.1.0.1//clipgrab.cpp
  }
  
  void ClipGrab::determinePortal(QString url)
-diff -urN clipgrab-3.1.0.1.old//clipgrab.h clipgrab-3.1.0.1//clipgrab.h
---- clipgrab-3.1.0.1.old//clipgrab.h	2011-04-01 22:19:23.000000000 +0200
-+++ clipgrab-3.1.0.1//clipgrab.h	2011-04-01 22:19:41.000000000 +0200
-@@ -82,7 +82,6 @@
+diff -urN clipgrab-3.2.0.6.old//clipgrab.h clipgrab-3.2.0.6/clipgrab.h
+--- clipgrab-3.2.0.6.old//clipgrab.h	2012-05-16 13:11:40.593973547 +0200
++++ clipgrab-3.2.0.6/clipgrab.h	2012-05-16 13:11:55.053973226 +0200
+@@ -92,7 +92,6 @@
          void errorHandler(QString);
          void errorHandler(QString, video*);
          void addDownload(video* clip);
diff --git a/net-misc/clipgrab/files/3.2.0.6-qrc.patch b/net-misc/clipgrab/files/3.2.0.6-qrc.patch
new file mode 100644
index 000000000000..82d5aad231bc
--- /dev/null
+++ b/net-misc/clipgrab/files/3.2.0.6-qrc.patch
@@ -0,0 +1,13 @@
+diff -urN clipgrab-3.2.0.6.old/resources.qrc clipgrab-3.2.0.6/resources.qrc
+--- clipgrab-3.2.0.6.old/resources.qrc	2012-05-16 13:11:40.593973547 +0200
++++ clipgrab-3.2.0.6/resources.qrc	2012-05-16 13:18:46.680964145 +0200
+@@ -3,9 +3,6 @@
+         <file>splash.png</file>
+         <file>icon.png</file>
+         <file>logo.png</file>
+-        <file>logo-gpl.png</file>
+-        <file>logo-qt.png</file>
+-        <file>logo-ffmpeg.png</file>
+         <file>paypal.png</file>
+         <file>paypal-logo.png</file>
+     </qresource>