Version bump, revert to media-libs/ffmpeg (bug 474368 by Nikoli), drop old.

(Portage version: 2.2.0_alpha183/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 47 insertions, 67 deletions

diff --git a/net-misc/clipgrab/ChangeLog b/net-misc/clipgrab/ChangeLog
index 5a34d90fd8ea..3cfb38b5a137 100644
--- a/net-misc/clipgrab/ChangeLog
+++ b/net-misc/clipgrab/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/clipgrab
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clipgrab/ChangeLog,v 1.15 2013/04/21 07:26:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clipgrab/ChangeLog,v 1.16 2013/06/23 16:15:27 xmw Exp $
+
+*clipgrab-3.2.1.0 (23 Jun 2013)
+
+  23 Jun 2013; Michael Weber <xmw@gentoo.org> +clipgrab-3.2.1.0.ebuild,
+  +files/clipgrab-3.2.1.0-obey.patch, -clipgrab-3.2.0.10.ebuild,
+  -clipgrab-3.2.0.9.ebuild, -files/3.2.0.6-obey.patch, clipgrab-3.2.0.11.ebuild:
+  Version bump, revert to media-libs/ffmpeg (bug 474368 by Nikoli), drop old.
 
 *clipgrab-3.2.0.11 (21 Apr 2013)
 
diff --git a/net-misc/clipgrab/clipgrab-3.2.0.11.ebuild b/net-misc/clipgrab/clipgrab-3.2.0.11.ebuild
index 68cd49de6042..88a721dbd189 100644
--- a/net-misc/clipgrab/clipgrab-3.2.0.11.ebuild
+++ b/net-misc/clipgrab/clipgrab-3.2.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clipgrab/clipgrab-3.2.0.11.ebuild,v 1.1 2013/04/21 07:26:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clipgrab/clipgrab-3.2.0.11.ebuild,v 1.2 2013/06/23 16:15:27 xmw Exp $
 
 EAPI=4
 
@@ -16,8 +16,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-qt/qtwebkit:4"
+# does not work with libav #474368
 RDEPEND="${DEPEND}
-	virtual/ffmpeg"
+	media-video/ffmpeg"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.2.0.10-obey.patch"
diff --git a/net-misc/clipgrab/clipgrab-3.2.0.9.ebuild b/net-misc/clipgrab/clipgrab-3.2.0.9.ebuild
deleted file mode 100644
index 4dc3c9482cce..000000000000
--- a/net-misc/clipgrab/clipgrab-3.2.0.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clipgrab/clipgrab-3.2.0.9.ebuild,v 1.2 2013/03/02 22:59:40 hwoarang 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="dev-qt/qtwebkit:4"
-RDEPEND="${DEPEND}
-	virtual/ffmpeg"
-
-PATCHES=(
-	"${FILESDIR}/3.2.0.6-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.2.0.10.ebuild b/net-misc/clipgrab/clipgrab-3.2.1.0.ebuild
index f728f40c83db..db926be20c00 100644
--- a/net-misc/clipgrab/clipgrab-3.2.0.10.ebuild
+++ b/net-misc/clipgrab/clipgrab-3.2.1.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clipgrab/clipgrab-3.2.0.10.ebuild,v 1.2 2013/03/02 22:59:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clipgrab/clipgrab-3.2.1.0.ebuild,v 1.1 2013/06/23 16:15:27 xmw Exp $
 
-EAPI=4
+EAPI=5
 
 inherit qt4-r2 eutils
 
@@ -16,11 +16,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-qt/qtwebkit:4"
+# does not work with libav #474368
 RDEPEND="${DEPEND}
-	virtual/ffmpeg"
+	media-video/ffmpeg"
 
 PATCHES=(
-	"${FILESDIR}/${P}-obey.patch"
+	"${FILESDIR}/${PN}-3.2.1.0-obey.patch"
 )
 
 src_install() {
diff --git a/net-misc/clipgrab/files/3.2.0.6-obey.patch b/net-misc/clipgrab/files/clipgrab-3.2.1.0-obey.patch
index 3a8fbe3f9543..16eee39e84a3 100644
--- a/net-misc/clipgrab/files/3.2.0.6-obey.patch
+++ b/net-misc/clipgrab/files/clipgrab-3.2.1.0-obey.patch
@@ -1,7 +1,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 @@
+--- clipgrab-3.2.1.0/clipgrab.cpp
++++ clipgrab-3.2.1.0/clipgrab.cpp
+@@ -128,71 +128,10 @@
          }
      }
  
@@ -27,52 +26,55 @@ diff -urN clipgrab-3.2.0.6.old//clipgrab.cpp clipgrab-3.2.0.6/clipgrab.cpp
 -        settings.setValue("firstStarted-" + version, startedDateTime.toTime_t());
 -    }
 -    obeyatorRequest.setUrl("http://clipgrab.de/or.php?version=" + version +"&lang="+QLocale::system().name().split("_")[0]+"&sys="+sys+"&current=" + settings.value("firstStarted-" + version, startedDateTime.toTime_t()).toString()+"&first="+settings.value("firstStarted", startedDateTime.toTime_t()).toString());
--    obeyatorManager->get(obeyatorRequest);;
+-    obeyatorManager->get(obeyatorRequest);
 -    connect(obeyatorManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(obey(QNetworkReply*)));
 -
      connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardChanged()));
--
--}
--
+ 
+ }
+ 
 -void ClipGrab::obey(QNetworkReply* reply)
 -{
--    bool execute = false;
 -    if (reply->bytesAvailable())
 -    {
 -        QStringList commands = QString(reply->readAll()).split("\n");
+-        qDebug() << commands;
 -        for (int i = 0; i < commands.size(); ++i)
 -        {
--            if (commands.at(i).split("|").size() > 0)
+-            QStringList command = commands.at(i).split("|");
+-            if (!command.isEmpty())
 -            {
--                if (commands.at(i).split("|").size() == 3 && settings.value(commands.at(i).split("|").at(2)) == "true")
--                {
--                    execute = false;
--                }
--                else
+-                if (command.at(0) == "url")
 -                {
--                    execute = true;
--                    if (commands.at(i).split("|").size() == 3)
+-                    if (command.size() == 2 || (command.size() == 3 && settings.value(command.at(2)).toString() != "true"))
 -                    {
--                        settings.setValue(commands.at(i).split("|").at(2), "true");
+-                        if  (!(command.at(1).contains("update")  && this->settings.value("DisableUpdateNotifications", false) == true))
+-                        {
+-                            QDesktopServices::openUrl(QUrl(command.at(1)));
+-                        }
+-                        if (command.size() == 3)
+-                        {
+-                            settings.setValue(command.at(2), "true");
+-                        }
 -                    }
 -                }
--
--                if (execute == true)
+-                else if (command.at(0) == "set" && command.size() == 3)
 -                {
--                    if (commands.at(i).split("|").at(0).trimmed() == "url")
--                    {
--                        QDesktopServices::openUrl(QUrl(commands.at(i).split("|").at(1)));
--                    }
+-                    settings.setValue(command.at(1), command.at(2));
 -                }
 -            }
 -        }
 -    }
- }
- 
+-    else {qDebug() << "nothing";
+-    }
+-}
+-
  void ClipGrab::determinePortal(QString url)
-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
+ {
+ 
+diff -ru clipgrab-3.2.1.0.orig/clipgrab.h clipgrab-3.2.1.0/clipgrab.h
+--- clipgrab-3.2.1.0.orig/clipgrab.h	2013-06-20 17:01:28.000000000 +0200
++++ clipgrab-3.2.1.0/clipgrab.h	2013-06-23 17:57:14.187000000 +0200
 @@ -92,7 +92,6 @@
          void errorHandler(QString);
          void errorHandler(QString, video*);