From a0fbc2effad1ac204d6857905cb35a7f1c958882 Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Mon, 14 Jan 2013 11:36:54 +0000 Subject: Version bump (thanks euscan), drop old (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) --- net-misc/clipgrab/ChangeLog | 11 ++- net-misc/clipgrab/clipgrab-3.2.0.10.ebuild | 31 ++++++++ net-misc/clipgrab/clipgrab-3.2.0.6.ebuild | 32 --------- net-misc/clipgrab/files/3.2.0.6-qrc.patch | 13 ---- .../clipgrab/files/clipgrab-3.2.0.10-obey.patch | 82 ++++++++++++++++++++++ 5 files changed, 122 insertions(+), 47 deletions(-) create mode 100644 net-misc/clipgrab/clipgrab-3.2.0.10.ebuild delete mode 100644 net-misc/clipgrab/clipgrab-3.2.0.6.ebuild delete mode 100644 net-misc/clipgrab/files/3.2.0.6-qrc.patch create mode 100644 net-misc/clipgrab/files/clipgrab-3.2.0.10-obey.patch (limited to 'net-misc/clipgrab') diff --git a/net-misc/clipgrab/ChangeLog b/net-misc/clipgrab/ChangeLog index 4caddaba84fa..a03ffaac4976 100644 --- a/net-misc/clipgrab/ChangeLog +++ b/net-misc/clipgrab/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/clipgrab -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/clipgrab/ChangeLog,v 1.12 2012/10/06 19:59:58 xmw Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/clipgrab/ChangeLog,v 1.13 2013/01/14 11:36:54 xmw Exp $ + +*clipgrab-3.2.0.10 (14 Jan 2013) + + 14 Jan 2013; Michael Weber -files/3.2.0.6-qrc.patch, + -clipgrab-3.2.0.6.ebuild, +clipgrab-3.2.0.10.ebuild, + +files/clipgrab-3.2.0.10-obey.patch: + Version bump (thanks euscan), drop old *clipgrab-3.2.0.9 (06 Oct 2012) diff --git a/net-misc/clipgrab/clipgrab-3.2.0.10.ebuild b/net-misc/clipgrab/clipgrab-3.2.0.10.ebuild new file mode 100644 index 000000000000..39408c65855b --- /dev/null +++ b/net-misc/clipgrab/clipgrab-3.2.0.10.ebuild @@ -0,0 +1,31 @@ +# 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.1 2013/01/14 11:36:54 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}/${P}-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.6.ebuild b/net-misc/clipgrab/clipgrab-3.2.0.6.ebuild deleted file mode 100644 index 7dba637a3505..000000000000 --- a/net-misc/clipgrab/clipgrab-3.2.0.6.ebuild +++ /dev/null @@ -1,32 +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.2.0.6.ebuild,v 1.1 2012/05/16 11:25:25 scarabeus 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}/3.2.0.6-obey.patch" - "${FILESDIR}/3.2.0.6-qrc.patch" -) - -src_install() { - dobin ${PN} - - newicon icon.png ${PN}.png - make_desktop_entry clipgrab Clipgrab "" "Qt;Video;AudioVideo;" -} diff --git a/net-misc/clipgrab/files/3.2.0.6-qrc.patch b/net-misc/clipgrab/files/3.2.0.6-qrc.patch deleted file mode 100644 index 82d5aad231bc..000000000000 --- a/net-misc/clipgrab/files/3.2.0.6-qrc.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 @@ - splash.png - icon.png - logo.png -- logo-gpl.png -- logo-qt.png -- logo-ffmpeg.png - paypal.png - paypal-logo.png - diff --git a/net-misc/clipgrab/files/clipgrab-3.2.0.10-obey.patch b/net-misc/clipgrab/files/clipgrab-3.2.0.10-obey.patch new file mode 100644 index 000000000000..9ffee8a94fb0 --- /dev/null +++ b/net-misc/clipgrab/files/clipgrab-3.2.0.10-obey.patch @@ -0,0 +1,82 @@ +--- clipgrab-3.2.0.10/clipgrab.cpp ++++ clipgrab-3.2.0.10/clipgrab.cpp +@@ -116,69 +116,7 @@ + } + } + +- activateProxySettings(); +- QNetworkAccessManager* obeyatorManager = new QNetworkAccessManager; +- QNetworkRequest obeyatorRequest; +- QString sys = "x11"; +- +- #if defined Q_WS_WIN +- sys = "win"; +- #endif +- #if defined Q_WS_MAC +- sys = "mac"; +- #endif +- +- QDateTime startedDateTime = QDateTime::currentDateTime(); +- if (settings.value("firstStarted", 0).toInt() == 0) +- { +- settings.setValue("firstStarted", startedDateTime.toTime_t()); +- } +- if (settings.value("firstStarted-" + version, 0) == 0) +- { +- settings.setValue("firstStarted-" + version, startedDateTime.toTime_t()); +- } +- obeyatorRequest.setUrl("http://clipgrab.de/or.php?version=" + version +"&lang="+QLocale::system().name().split("_")[0]+"&sys="+sys+"¤t=" + settings.value("firstStarted-" + version, startedDateTime.toTime_t()).toString()+"&first="+settings.value("firstStarted", startedDateTime.toTime_t()).toString()); +- 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"); +- for (int i = 0; i < commands.size(); ++i) +- { +- if (commands.at(i).split("|").size() > 0) +- { +- if (commands.at(i).split("|").size() == 3 && settings.value(commands.at(i).split("|").at(2)) == "true") +- { +- execute = false; +- } +- else +- { +- execute = true; +- qDebug() << commands.at(i).split("|").size(); +- if (commands.at(i).split("|").size() == 3) +- { +- settings.setValue(commands.at(i).split("|").at(2), "true"); +- } +- } +- +- if (execute == true) +- { +- if (commands.at(i).split("|").at(0).trimmed() == "url") +- { +- QDesktopServices::openUrl(QUrl(commands.at(i).split("|").at(1))); +- } +- } +- } +- } +- } + } + + void ClipGrab::determinePortal(QString url) +--- clipgrab-3.2.0.10/clipgrab.h ++++ clipgrab-3.2.0.10/clipgrab.h +@@ -92,7 +92,6 @@ + void errorHandler(QString); + void errorHandler(QString, video*); + void addDownload(video* clip); +- void obey(QNetworkReply* reply); + void cancelDownload(int item); + void clipboardChanged(); + void pauseDownload(int); -- cgit v1.2.3-65-gdbad