Version bump (thanks euscan), drop old

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 101 insertions, 26 deletions

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 <xmw@gentoo.org> -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/Manifest b/net-misc/clipgrab/Manifest
index 55b7003082a4..2c71d5528f9b 100644
--- a/net-misc/clipgrab/Manifest
+++ b/net-misc/clipgrab/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 AUX 3.2.0.6-obey.patch 3160 SHA256 790f7e3719572c4af6e284eb33efca569cf051f18300db40abdcd6e3ce219903 SHA512 808666aec56c189cf9294e9f433b1d55370a3528e68543be9facc2e33faf5c1c8990dfdea7ccd835970239a8699803359a22d561cc22f07bc1c89b4de6d4eb32 WHIRLPOOL e2b1f4e5015bb923d342989224a393b51205c28c06bc01e772993a60e5f22a14c2b31d96b5ef61198f4101491ea6659a1796d5be27baf99dffd785298af49224
-AUX 3.2.0.6-qrc.patch 529 SHA256 6a80e385f62ca638ee6c5d1e16d1132ab6d40999d1c80b351e33e4944d89c32d SHA512 f9c103dbc69b85c21e0a10eb13b841efbfdec3076f5c201248d7106c394c51f4e1d1e6ef87d0c65ff76304cca1f71fe57c629e501305a7790cc845c9fcd2b919 WHIRLPOOL 23263faa6644b70a4ba793f947aee5d187fa8c2c13d13500d59aaabe0bcbf8564105337756751e2303df2f8ee7d2158144b908c44df18ea9b8e6aa51fec117a5
-DIST clipgrab-3.2.0.6.tar.bz2 173195 SHA256 7a8040e5caef931975b2b59a5fa41fdc6365a6dca583201dd9ab85faefdb8fba SHA512 997719f3927189ed624dd4ef95f47c7fb17c2c52cfecd5db0a5d25a18c3391176114e26cb1648d4cf5deb935ebba5a2c2d78d5b4215e22b0af9c203321adf839 WHIRLPOOL 4248b88d0c30569a804046bad945f2cd36a8b1e552fb6ab70284d52610776d3048d4ad8b723f1417a9460696926d78d6dd65f10f51cc216d04087d6ff87de027
+AUX clipgrab-3.2.0.10-obey.patch 2931 SHA256 bb642dcfd1270e52530a4653437e03366df773a82396b0282855ce91408b6e02 SHA512 b6eeedf9a6150a07fe928107c1dfc36a88bd703e5c904ba03f5ab62d70db663b71e450773e1e257d38a45ae60148ce5ce18edbf69e4fd16323503069fa9b2158 WHIRLPOOL dee27cc572b710d41eade75ab38990f4dfa788095241328ba6f9c5efb8a734e217f90d75c1df49c7f679ca0cbfcebbc2a19353e030a01e8cea2073dac227f429
+DIST clipgrab-3.2.0.10.tar.bz2 308821 SHA256 0d3f62c43d94e829aad60c1be94350b1c6577e4259172fd7bae214d4fee4f25e SHA512 62f9cd2165b1df992e51ebbe0046857832506251b37afbeaf65dccab82944eb8a03ab3281e32e77f278ff10ba11f8c1bc00f9389f1538dabd68bae28a1be1bcd WHIRLPOOL f4ad2dc49df94bb98d2a0a0fda0f467e865c7fba53a357e9926dedbc65ec5fa8659149f90072df70a07ac526ce695267b8442a588d886cf590943c168cf84742
 DIST clipgrab-3.2.0.9.tar.bz2 308856 SHA256 ff08365ba4f078bca339f7e6e3a659d573d769f1a2951e81f3d074fbb2118b0c SHA512 f832f846f33794da4c908b9d3e4faf8add3af6049a18808658f91bdd630fc0d2d3c081d8249f6bbbc1bb765dda8f14f3a371d1d6d1d60560bc2194d86ec0a9e3 WHIRLPOOL add4edd95e789133a615d92fb879748b469c4724d7382376d3e1ca534b808e2d28288b25912bbb790b159e700a61f8f3a8d307ee9a0056adb7753d151896548d
-EBUILD clipgrab-3.2.0.6.ebuild 746 SHA256 aed0811817c9527124997837d0c80ee3c44437ccca81c97b9f62da17a16f0df2 SHA512 06ce3d1e7025c3270f831c7e3973756d59b38ed5683b0852610d7ddb04df29ea27f64b70c26119d7083f86d6b2f0d3123d339c837c543603e3420e8ccf5d1e68 WHIRLPOOL 8c05b0018fcf32dbf94351662e93b95b1fe96503ad8bb0b60bfeb9df61ac548568016a482acfefc8239a67cd47f56cf19ee439cb9fc237938a64ca8d18fcd4e5
+EBUILD clipgrab-3.2.0.10.ebuild 705 SHA256 5f4d77b836b9c89ce5029a4d5843d23753143375dbb2e3ded67f25c4a55224fa SHA512 531f31ab1fc57fea4ea208f89b3c634f1315213bf59571d18943e4ae08968668e992ae506f8d95a178f82de613f1fb08c9a51c0f974d68d80b7e4275ab984c1f WHIRLPOOL f708d50c3cb1077946f2098382f4a82c55c71b88019125233277f654aca5f50a247bc36defcf1ff7b689642efc88590a0b522816cb402d55d5290f1c171a8731
 EBUILD clipgrab-3.2.0.9.ebuild 707 SHA256 dc532e0dd26a6308d6fa7892ba41182676d177c6a941d7c04b20620849b7bf3f SHA512 7a333a0ac8d18a3a909741910446f92b8e93e61dfa3bf1488b6db5666cf04e180be9fb976ac2846d0d9c9e5bc76aa91c69a1e1335087597bace802a2418e6241 WHIRLPOOL 422ebaccb580e8dd01c791f1b6fbca8471eb824f42ba88fb6c0eeab622284fd1e9fe136182d284c9a1d209ddb314262dce5592836f4e9e8ee25321f955b70389
-MISC ChangeLog 2156 SHA256 507b7265dc771436b67c3a528dceb83f1b5241edc7a14ceb1993939923362143 SHA512 730f1609ad9e9e4d60297facf687c52f8da7dc5443f908e2a5da15b670b31f9f41d64312ce9937f3c8a4d13ed4dc6c64cf1e091a6c6489a3e6d3e5ef3de2c4fa WHIRLPOOL f6fd2bb1d72dc30feb152cc8e30a597e19796aa6fe05d16a95bea319dcf1970920f7eef40e944f71177c25a4e56a6768a8fdc8a381d11a35650d8baa02366f0f
+MISC ChangeLog 2398 SHA256 ca776486573dcb33b736fda842fec0055964c720ac525606e9241017c1a6b448 SHA512 d63e24895597ddd967ae5af34e8757fb09c28f791983e5909a88f9e624b782cdc994e01eef2d700518c123f1773d9a356db66c8b6f8b9fdfcaed20312e799862 WHIRLPOOL f690c8fabf3bc1330748aac7d70ff3b25014be73c2dda5d5c29d432a2b891af774347f5a39748612d9458fd45091cde075f24d99fcec5d18dc9c98b737d1a225
 MISC metadata.xml 227 SHA256 fcb66e58430a86927d7db32c22b24050d6761fa06b8aef883ee15f2d8d8a17fa SHA512 2bb3e7a49e89349c825af6c46460240a559aa9098802088ad0e4cfc49ae4c66031ad1d5f4d6b35f4e886356448448c29c6c6315a19aa94a22cd0fcae00e4b2f7 WHIRLPOOL f090333c1f8ccbbc7cf160828e1f4cc176562f63bcb26b7d69202a9e6e929c1e497c86b2f64d14b32d5786b9bbfc18d4cd5429f0a06e320969d67997a2ef5ad5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlBwjd8ACgkQknrdDGLu8JDiVQD/VdLkKmDsR4uZohsFaC6zsoEp
-WV2tAKjz65w+KmL3ZtwA/2EzShoMQwbz+G/iYsE5PF2pksCigpZrFstHtHwDjc6/
-=Ecjr
+iF4EAREIAAYFAlDz7dsACgkQknrdDGLu8JCjoQD+PcStRHMp92EqfmXZTpl+7UA6
+sJvyDniY4WJFKVTl3hwA/0chQ6YGYsPYvoXyrdx8MwrkZLqopDs9AIq8LUDWSCsl
+=Y6Im
 -----END PGP SIGNATURE-----
diff --git a/net-misc/clipgrab/clipgrab-3.2.0.6.ebuild b/net-misc/clipgrab/clipgrab-3.2.0.10.ebuild
index 7dba637a3505..39408c65855b 100644
--- a/net-misc/clipgrab/clipgrab-3.2.0.6.ebuild
+++ b/net-misc/clipgrab/clipgrab-3.2.0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.6.ebuild,v 1.1 2012/05/16 11:25:25 scarabeus Exp $
+# $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
 
@@ -20,8 +20,7 @@ RDEPEND="${DEPEND}
 	virtual/ffmpeg"
 
 PATCHES=(
-	"${FILESDIR}/3.2.0.6-obey.patch"
-	"${FILESDIR}/3.2.0.6-qrc.patch"
+	"${FILESDIR}/${P}-obey.patch"
 )
 
 src_install() {
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 @@
-         <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>
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+"&current=" + 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);