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

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

6 files changed, 56 insertions, 78 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/Manifest b/net-misc/clipgrab/Manifest
index f944652afc7c..d50d440b0453 100644
--- a/net-misc/clipgrab/Manifest
+++ b/net-misc/clipgrab/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 3.2.0.6-obey.patch 3160 SHA256 790f7e3719572c4af6e284eb33efca569cf051f18300db40abdcd6e3ce219903 SHA512 808666aec56c189cf9294e9f433b1d55370a3528e68543be9facc2e33faf5c1c8990dfdea7ccd835970239a8699803359a22d561cc22f07bc1c89b4de6d4eb32 WHIRLPOOL e2b1f4e5015bb923d342989224a393b51205c28c06bc01e772993a60e5f22a14c2b31d96b5ef61198f4101491ea6659a1796d5be27baf99dffd785298af49224
 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
+AUX clipgrab-3.2.1.0-obey.patch 3198 SHA256 e4651c5a6172d998620a23e63fdeeecc847204ec9d95952f6f00db7a4208efdf SHA512 8eb338ff11ecc780e97c97d86933ef517bbad03ba1eace8889f61ed5e122f1a16057d0f0e783433c353a2b9ee2b06bdccd187edbec5b618d2b216cc7ebe4c7cc WHIRLPOOL 97f974000106d8e7ac8db495f2b815199dcc0fec7d18b316b5c96027a6d8e146932fdad0385b83b044a9574c4b27519355ae7e7a13f2da6c89a0f48acecaed5b
 DIST clipgrab-3.2.0.11.tar.bz2 461653 SHA256 7887a75b66e194de9341a3f23f5618f5e3bd913ffed4cd2fd42dee08e34d0461 SHA512 f03235daf7a3985479cbf08feca28160994dba1e9955198f6ae6123c4820cc92f6d6dacd8299910841d859e0c2ab871403e654bcff878b51dbbda6b2a0dc5625 WHIRLPOOL 5a1e85fb0ab155e52513b4e7c4e038477e6620ce26b90ba5b36135de0000276558b063b85bb7d57cf1e568d84b869e4b9028ea59e374ede40e1cba2158052d16
-DIST clipgrab-3.2.0.9.tar.bz2 308856 SHA256 ff08365ba4f078bca339f7e6e3a659d573d769f1a2951e81f3d074fbb2118b0c SHA512 f832f846f33794da4c908b9d3e4faf8add3af6049a18808658f91bdd630fc0d2d3c081d8249f6bbbc1bb765dda8f14f3a371d1d6d1d60560bc2194d86ec0a9e3 WHIRLPOOL add4edd95e789133a615d92fb879748b469c4724d7382376d3e1ca534b808e2d28288b25912bbb790b159e700a61f8f3a8d307ee9a0056adb7753d151896548d
-EBUILD clipgrab-3.2.0.10.ebuild 707 SHA256 b2d0443061bf3188d9c3233b8d8fda0765484d125dce6ada729d169db75c180b SHA512 a561bdc8223e1718a74f6ce995b33244a0cad02ae83e6dd833504674b526c46cf25cd9919a5902c8eeb9522a4cf0e7045dfd9d22e42f25ed1fc8dfbe20020b3d WHIRLPOOL 47937c44aaf53851617592b4f767a14f72ef75673627d0ed3c6d90e0e29d74d078eb40a95041492cb25ece0f4b88aae0a07df185fee0b86a0d9d751ee2915e42
-EBUILD clipgrab-3.2.0.11.ebuild 712 SHA256 e4c67c4dc3467c29cea9d35253eefe66db1fad1a463aa0947b2f12bd2adf4f0b SHA512 bda0ae1de02933dbdbf1dd8e080938c6ad5268098cd203a552835dffc4255ab12698b369d8735177ee4c7936b202e2cf03f04f63f4e6f12b3d0f7cec7917a5da WHIRLPOOL ef20625380c66ab42bc20cae9591af3cabf6d8285aad2a7ccdca98272de6a9f2d686edc68bd32137708ef747c3464afa21181cc4bfb5515ed45525b393bc6b6a
-EBUILD clipgrab-3.2.0.9.ebuild 709 SHA256 f60248b10919af410910f7a5a4c5217015d6af0ff3df21c44efbc021e9f416c4 SHA512 fa1222ae58bc0e0fbaff90653ad2244ad1acbe1ac4a6980fa480f98ac75aa1921f1b2c6f84a7cc277ff041164fad1a44c21c43279e212852fb85bfd458a8e86e WHIRLPOOL 7d4cce1018455cd117c5e9ee7efb380bf9610b277f1378aa6e884060bc932b89b8d670de667f30092dcd54aeb99c89faa435f83326c0c3e6ee3a3d3db98d6eda
-MISC ChangeLog 2670 SHA256 5025d5f89721884070a61f24894861dd86443f8e25bfb46d224f361b2118d20e SHA512 bed55ccd862d164774de1154ad3394513c0caba47a4c237939d091ee58bdb6f7807abce8ae0fc888d98f1f2b5a1e7664816540fbe20d822786aac83be85a6e05 WHIRLPOOL 96e43d849a0ab79443989a59ef6b2633aef662ae173d41d89e3dcdb568ca67bef431e29eace258e24dc0fd50369612f2b328b403e5b005607462877a4ef3a680
+DIST clipgrab-3.2.1.0.tar.bz2 460525 SHA256 ca595d5e0183a7c2b3998fc3112f53945ffd1b84cca529893657827bc8f62e19 SHA512 6ec81748c6b51cdfd5d1d0244ec1b99f9a8b4414d6dc254f32f6ad70f5d6aef98f002f3e7d95567c23348cdb4dff5e3e682a93786917bde4eb90375037ff69f2 WHIRLPOOL 70239f8900c80bdb96661cd4ad91fc878aa16f72736549c150480616c2318cf1eb7f4bcf540f835b681ad0ac1e2b108ce0aa0df5d6d77f5bfdedd6c4b01c448d
+EBUILD clipgrab-3.2.0.11.ebuild 751 SHA256 8d65a59a2b60e81d02fa993f78c0607a3b5140eba8e79a04bcefe07951cd7dd3 SHA512 6fbfe8e15fe59e652d88f92d3ccb260230b0799f561ad778b13ab20aaebbba9a017bd9ccb117147fff99fc7bae162d645fe052f79e307072a7d8559473bfe06e WHIRLPOOL 97d5f659d7172bfcc459420d6dbeac5158598a7d7d06fae067f70a08a599c3d69969b2c2776a291537c19055c67d62edb57fe43c5b03fabedd5dff19799f67af
+EBUILD clipgrab-3.2.1.0.ebuild 749 SHA256 b4cb4d38bc291ea4cf0256ddef9205b195dd237f9a175eea2f1293b22c4940fe SHA512 fdb69e4be79a4e13be678fbc92b3d6e240bd0de3c7d2af8824820a7aa53f85e162b8fd946143032eb4c027787c4a4ae573d9bb6fb34117b42b39de5128e39365 WHIRLPOOL 0f7de95039bd10ec5fcb9b7b9a6e5423b5c1ed9fd1e670da03fab3d1f5c1b2f15c2b5d64ba512346014d0edacb31641e2239eb35e92f26bbff464976daee6a66
+MISC ChangeLog 3000 SHA256 0d48a9b074adbd76296f82475231782f6a990539f8ce4a8e42ea5ff78296499e SHA512 c652d121b47fdccccc216759d60961bd78ca8bfb6ecc6246be0f2ee9ca8d95cb6e3cc0ecc4a74dcfda5f1b963f20353d069d11cd07cc62963418fc60c1c5a289 WHIRLPOOL d50248aef93051d5103d65334068f589d3ea97873cfd55e53b72d3ddb8401e005370cdebc5f650ef0c629c656a96fdabb8169210af5933c25971e696ea0ca0f2
 MISC metadata.xml 227 SHA256 fcb66e58430a86927d7db32c22b24050d6761fa06b8aef883ee15f2d8d8a17fa SHA512 2bb3e7a49e89349c825af6c46460240a559aa9098802088ad0e4cfc49ae4c66031ad1d5f4d6b35f4e886356448448c29c6c6315a19aa94a22cd0fcae00e4b2f7 WHIRLPOOL f090333c1f8ccbbc7cf160828e1f4cc176562f63bcb26b7d69202a9e6e929c1e497c86b2f64d14b32d5786b9bbfc18d4cd5429f0a06e320969d67997a2ef5ad5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlFzlMkACgkQknrdDGLu8JDYgwD+JfuorL9b0tvNjJ99yl52jsAX
-fRlYh59zjyHfl1+acUMA/jbMTbMNG0e1foEcDJmykpYCt891sA1uKOOZQ26S0hjh
-=9pIz
+iF4EAREIAAYFAlHHH5cACgkQknrdDGLu8JACTwD/ct58/VIhgzPRrVkp+olI4MWi
+Z0FtHBGQjWwQ5vLEZtIA/1nVjjgEl3sQ3Y+tdDVbStYi60R66hysf8zYhacr8mKX
+=GLZh
 -----END PGP SIGNATURE-----
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*);