17 files changed, 45 insertions, 361 deletions
diff --git a/media-video/acidrip/ChangeLog b/media-video/acidrip/ChangeLog
index 79193d897154..044e45f9099b 100644
--- a/media-video/acidrip/ChangeLog
+++ b/media-video/acidrip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/acidrip
 # Copyright 2000-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/ChangeLog,v 1.32 2014/07/27 16:56:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/ChangeLog,v 1.33 2014/07/27 16:57:45 ssuominen Exp $
+
+  27 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> -acidrip-0.14-r1.ebuild:
+  old
 
   27 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> acidrip-0.14-r2.ebuild:
   amd64/x86 stable
diff --git a/media-video/acidrip/Manifest b/media-video/acidrip/Manifest
index bf517c67e87d..e985bdc28442 100644
--- a/media-video/acidrip/Manifest
+++ b/media-video/acidrip/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX acidrip-mplayer.patch 1125 SHA256 eb8eafda2d9e888aa071bfcb780ff86716c7be585cfa12d4a764ab11727f898d SHA512 2dfba813b6b0daf58401bae475562daced785f227f7612c0081866e9bb66d760f423dca1fb56c9a7d3cd74f2df30e629f8f8044677e223ca5893f28f65a72c95 WHIRLPOOL 14100dd638649aecbd03822ddd03fe86829d35ff6cfb3bbb01b25ca756c416c1726e9453cabc45d560237cbb3d28938cff7f0a3e2934e90cda46e2015a7b9b5d
+AUX acidrip-mplayer.patch 1079 SHA256 18638433fc407fc42fcb468a15b0c545581dced034ca5c867adac2b521cafc88 SHA512 ae1b57efbd49de33f60dd0d6daffb4c4ddf6bf726ad5fc2fab485a4af39d5c1326c43471dbbe8a28147e3a0f42e1ea55bd98554a1fbd8ee0fa3a150a180f4f23 WHIRLPOOL b04df065f9486ea315684e9e3242f604a13c3e99353580f332e3c5a57bd221d92bf48e31b42f1cc8fefdd417dfe1c94513b7bda99cb8379b2260f6f22f8b6643
 DIST acidrip-0.14.tar.gz 92086 SHA256 51bb84174e8dae733ddd1f69a16b90d875e4455135ed20a024a79b98ae7d58c1 SHA512 3ee0e329bd7e5eb4067d618fc79a49707084526d53e8c10cd9ec560828cf621e8d7263259cc8bc7944e6f9d7b7fd1fc5b8a42a8f37f18666f1974f240edb99a0 WHIRLPOOL 8aa1f2aeaa8e29a97399f714989be38fc60803a7a3ba3f872750a4a440741c1f2173e88f3a0b3421651e3c86bf64721ec24077165e664cf107ab0e9cefcd2917
-EBUILD acidrip-0.14-r1.ebuild 636 SHA256 c145d8e6abeab82e607983f6620d6dfe65e0bd7b044aed0cdc64e422faee847a SHA512 9383e94c348177f5aa352a102bce51c45df8b555545bffe920947f58265a18d74bf6ff0e58265a7a29f720faeef28c03ca0640fd76ce86a800265350b1115539 WHIRLPOOL 1064a9575e02ea5a44ec6c9264a6d1d7fc311442e30366ae3a5f8dddd755f8e635f9685ed465636cfe55b6ff667521c9a8c4edb9082dc0f9008e67beed157116
 EBUILD acidrip-0.14-r2.ebuild 692 SHA256 c8cc6055cd5f28a4ae7dcb6c6c18bad5738bf922afa214c40db1628cfdf583ca SHA512 4c0122a1b51a4255e45c73bbfaced473f9ac7a1351fd92f22840f6f7762d62ea267627b883c03a894f9c5c4072d7f3a121edc8985abb993cec2193b13e5fff08 WHIRLPOOL 9ba99c48bc4c811976223affc7f8aabdeb094653810894d2d30e480326a423837ed49c1d4866a3b3d33ee09abeeb224e973ef1a12db2b71832d708c85ffdf020
-MISC ChangeLog 4096 SHA256 1956abfaca50387c46c087e664d04682f08bf0c5e914b385af38591f021b19b9 SHA512 d5bfcfef12b26ec3254f796cbc80d37c27115f15f0dc1fea8d82764ac402bf09ccbedd92588ce7903affeb38717593b1038f1f00f64106fcc205fc9acfe92f6f WHIRLPOOL c53c2266d57c542585c41c04291011552dd096cc8c0110bd191442f617d3683ad9113b6680d927bfee86324567615a755b2f56e96ef5a120beb91e399fa9c2f8
+MISC ChangeLog 4182 SHA256 8ff28cb9e616f44a7c9c47393148d628c05071ff0a4084f0b391c9309422d2b0 SHA512 795d46b3f714db2b3fc80432b917e5f21109ad55b47582394ffbc13d1432a5887fb2a5027f12d5a9ea852adde8ec56f3ef37e3097da3def6f233d5feb01e65e4 WHIRLPOOL f93288fd4d401d3b7a9a0026e99aa5266c27649e96ad3446d103bda5808077806561a6eb45487b668193ee5621f1d80587239ce6030184d20267ad80488245e2
 MISC metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 SHA512 cacba929b8688a7270637f34d348216fdeb89e725cdee4b40e5577ca3f626c5f72e73c1c125605a284506aff47265f41e3fedaa76ed4074c540fc1f200e6d494 WHIRLPOOL dcd04d57abcfe2704036097ed68500917f74b7024b46580e9054e1c933d55678992c350fe07ff0efd590b9345fbcdd81665b8ce546f786dd31f5a0f4eb654da3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT1S8nAAoJEEdUh39IaPFNRwoH/3Tb4aVWOujCNaaPRRtjDkpt
-k+DL05ddee/7u+upq6Ju5QzBmuQE8A87ag8UPgQSJ/CAWZgGV5GE4+GMfwTJySyJ
-T20WI9ZwsbZLdfFE2PpXz4L91nL3hd6i0EQB7licaWfHg+KGFq/rh1xyUcpr/GLD
-S7bz/8cqdYZ2guQ3JZ/S2gea4KVbvQ5luo5ANpNrd3UV4nG66cm+G61TDPTj9+XZ
-qOzF4pgJt7KsAwLJAv6+8Yq1airu8Wgzwl7bnC6ixCnJQcsc8nbbi+hW7EU+b8Ei
-iTVleYtqul09Wdn4qBIuFRllqeIlotth7cZGbcLnrB7EcER1ptcTxEFx04UIdYw=
-=UXRz
+iQEcBAEBCAAGBQJT1S9+AAoJEEdUh39IaPFNja8IAKJ4IU+zmdJnewyZ62fGn685
+xsWzSYKhILBa9LacucbquUs8SnVBWLRSIbysbsQbi862MCHptwjT7fmOcrTG6wIX
+l7662BkTTRLvj6TlbQ0IvWEr1MJGpJNvMupdh501BrxZaZSOBf0x+C2IBHNVcKlH
+YDOvElsy8MYJ48ngWp5ocpi0bFAr9NToEpP+MUiXGX+nd86Wf9OW2lOXXa2hKloa
+4MTWBBWufIGd+GESR2k2doV1suH5g+2PIxApBWqxtL2XISstDQ49GoK2RpECPZSD
+a9kCXhpHDng6J3l5644qrQNL0GpAVbb+HoVPaz27056G8eRcIhw/qchwlUcVJLM=
+=joMW
 -----END PGP SIGNATURE-----
diff --git a/media-video/acidrip/acidrip-0.14-r1.ebuild b/media-video/acidrip/acidrip-0.14-r1.ebuild
deleted file mode 100644
index 9a6e7e307ef4..000000000000
--- a/media-video/acidrip/acidrip-0.14-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/acidrip-0.14-r1.ebuild,v 1.7 2014/03/18 15:40:16 beandog Exp $
-
-EAPI="2"
-
-inherit perl-app
-
-DESCRIPTION="A gtk-perl mplayer/mencoder frontend for ripping DVDs"
-HOMEPAGE="http://sourceforge.net/projects/acidrip/"
-SRC_URI="mirror://sourceforge/${P}.tar.gz"
-RESTRICT="mirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="encode"
-
-DEPEND="dev-lang/perl
-	dev-perl/gtk2-perl
-	>=media-video/lsdvd-0.10
-	media-video/mplayer[encode]
-	encode? ( >=media-sound/lame-3.92 )"
diff --git a/media-video/acidrip/files/acidrip-mplayer.patch b/media-video/acidrip/files/acidrip-mplayer.patch
index 2937db939402..5d9c84701d5e 100644
--- a/media-video/acidrip/files/acidrip-mplayer.patch
+++ b/media-video/acidrip/files/acidrip-mplayer.patch
@@ -1,5 +1,7 @@
---- AcidRip/acidrip.pm.orig	2008-06-10 07:33:00.000000000 -0600
-+++ AcidRip/acidrip.pm	2008-06-10 07:34:40.000000000 -0600
+http://bugs.gentoo.org/168012
+
+--- AcidRip/acidrip.pm
++++ AcidRip/acidrip.pm
 @@ -680,7 +680,7 @@
      message( "Running " . get_command("cropdetect") );
      open( CROP, get_command("cropdetect") . " 2>&1 |" );
diff --git a/media-video/cclive/ChangeLog b/media-video/cclive/ChangeLog
index 61488650e8b1..adc9be4a9f13 100644
--- a/media-video/cclive/ChangeLog
+++ b/media-video/cclive/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cclive
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cclive/ChangeLog,v 1.70 2014/02/23 16:09:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cclive/ChangeLog,v 1.71 2014/07/27 17:02:24 ssuominen Exp $
+
+  27 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> -cclive-0.7.12.ebuild,
+  -cclive-0.7.13.ebuild, -cclive-0.7.15.ebuild, -cclive-0.7.16.ebuild,
+  -cclive-0.9.0.ebuild, -cclive-0.9.1.ebuild:
+  old
 
   23 Feb 2014; Pacho Ramos <pacho@gentoo.org> cclive-0.9.3-r1.ebuild:
   x86 stable, bug #500726
diff --git a/media-video/cclive/Manifest b/media-video/cclive/Manifest
index 8887f1e8abf7..1ceea4bda127 100644
--- a/media-video/cclive/Manifest
+++ b/media-video/cclive/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST cclive-0.7.12.tar.xz 266732 SHA256 2b634034c57b239435990e586d1f7662caf31470ca7ac7bd2f133e7a817b0d90 SHA512 ef9c78e60b917eefe0b3ccfde008b308d889725f42894499806dbee017997529d6d87594c9e247af5b7882fb3f5df3a2a3bee06232f5ec06bb765bb6fce38b8a WHIRLPOOL ae4629931624c6b960cd72c3152bb0377713068cd9c51347057158ee8db2fb0928cd07f920b6de2ffe46cee5eb5a30185dfc60f2509bea5db78f87d8ff4fff64
-DIST cclive-0.7.13.tar.xz 286000 SHA256 e90a5bcb7ace0266f880764404c6b757731799deafee3551d66ea2fdb8e61d86 SHA512 47b1bafed957a1cf7a6da844b2b6a2b20d1617c6e818a5e487037b87607c42589804c30abfef2f7a4d7406710a3734efdb99a0ae0816213c11bcb229bde8765b WHIRLPOOL 88374daef37003ae66bb15d898f5184a47517ca7e872b79914d95f76070fa2d2ec5a5abced1ff2a093c1bfc92b3759776940bd7949cdd90f8e67eebda189f3a4
-DIST cclive-0.7.15.tar.xz 287404 SHA256 d745e85175d4a6f32feb2bf038b01fc5eea7f199ea9824b85932bd9d0b1d6c62 SHA512 0b225662dcc7c2b3f898a2be16f43a1141bf6211570131cac65216d51e1bad4421811ea1ad2da22c68ebcb8bee2ae00d0063b4462c62ff9013e9e381a94fd39d WHIRLPOOL b01f25ab5cda3ab4a783529cedb89ddfdb325a140e54847fce4aad1f1b8e8c02236c5a1b02c094bbda13cfa6bae5bc93246baa920769a21f2b43b0ce15514afb
-DIST cclive-0.7.16.tar.xz 287472 SHA256 586a120faddcfa16f5bb058b5c901f1659336c6fc85a0d3f1538882a44ee10e1 SHA512 a7a3f8624bb473deb424d6df6e8a374136f8ce2eaba9d7c84edaddff16da32330c6872008f36533b730d7bacac5ce0e019d361180dc84980bc42e7ff59fbfd67 WHIRLPOOL a4561d1c3f6af2dfb5f4781f5b76d14773ece92471523961a63e10cd228f9a462031258b5f474d5b347cf06326219471294410b90cb7bdce494b4a4b95ca51fc
-DIST cclive-0.9.0.tar.xz 287040 SHA256 f986fce13a201cc87bab001ea43d997a48d04a3d85d04f47107af641a0ec34cb SHA512 daca59668f5a0444dd369e5d2495ea1cde050dc653d0e98d70e71e3af2e16649951716bd9bd56b49b7e7150c3ccaec2edd8d74b1012f7c0ac534b3138894ac7b WHIRLPOOL 809c6259c1017263faff7a8d6e0a593779197efb0635eb41cf81a2c157ee0d84701a30d7bbf646518c3591e33ad7f42ab0e26d61496ca0ef819ef60fe6e900eb
-DIST cclive-0.9.1.tar.xz 290464 SHA256 0c101651f969b29c2796559366dd4d08eae040b4da76e690ebb2f0f78ee8e0b2 SHA512 182cd6cf05bf4dac09b7649b1090a466fade991f97bd05da873322414f03d8594b82e218800ee8ac9f1e97b427ed0a62559f19b1b796ef3eae984fa8c4c4806c WHIRLPOOL ef360d7919e503111bd106c27ffa02e2311efeda65e6aec01387e3deb5b972d86f07bb8a2ce9decf29a8fd0bd1b007bc5792dbe8a98dd97961df40bc3fc6ba9f
 DIST cclive-0.9.3.tar.xz 296720 SHA256 2edeaf5d76455723577e0b593f0322a97f1e0c8b0cffcc70eca8b5d17374a495 SHA512 0d8f6f870e24e2906542c1e02745009597fca2e879261bef7a81e07f8dec016ee200d8a4b37dd0f20b3ad27c12e2445fed1f6a9dc262a6c27e40222048bb5438 WHIRLPOOL 441a3ef5e7c7633c91b4761a1f728998997648ebb6a7984e6a1dafea418a8863be76ffff7dc3e3727ddff81d4ed5f16d5454fb0e0b84c3dcea7e8214f27f8d35
-EBUILD cclive-0.7.12.ebuild 684 SHA256 a13ac798032b6698d0d326cf9d9d410e745406fdfc6593c79e632a59efa1d78e SHA512 c4ddac8225f3953b3f02a40d2278544814dfc63f014ce17d3d8f81f91638c6bf03d5c990743436c87b98dd1deb04afe76cf375a2fa0ffdb528b49eb8b119b210 WHIRLPOOL ba1aab44327abea577837b279453b27ab5890d39ce7b8ff800af63cd475df37626026e09743acc1fd7ea10a0cde87f3c6d5c4c17998e37003896bb520b3af446
-EBUILD cclive-0.7.13.ebuild 692 SHA256 ba42eccfc1b8243dbc70d9f21682375dec28b4140c748ec93185068810fdc4a2 SHA512 4b5f38229fb40b5eb7dc07521bfde7d9f4a280d806e018d340f600129be77a02596ca45f92b7cd29b35ccf24aa0fef3c03b4e178a034691d2074b8a218d68b09 WHIRLPOOL 9020297b69cdda09df0ad0b2ec69b532473f7419441df75bd89f7692c6f6c1c33f5ba498d4abb222e0f9bbb4acc8df9e5ab3b246fdbdb42d137ab683d45012e8
-EBUILD cclive-0.7.15.ebuild 684 SHA256 17609fb96c93d06b02968c2beb9ad620d70c0257d076b850d1143d237baae73f SHA512 b68bc62e9f497fed41081be9b671855e101ae40fb93b4cc037ac2a2a28118650f98c551851bf8360cf7dba8c8cd1295653e21eba61e79e595353461c71453994 WHIRLPOOL c4212f1c86d0a2ed42ffb5d5df55b2be72488b4f43f1f81359ffe012c735011b1c60aed144f0494c3668b6d37a7fee9ec512dba88c5496b959c8930f74218fd1
-EBUILD cclive-0.7.16.ebuild 684 SHA256 45e54a7d290bfe192bcb45fb7d1273a98baeb82e0e04cda7c5218f3b6ffd85a1 SHA512 2855808246da101b45aad975f530b9ff47ee355fe821e4ab5759cf569276c8770767b9bc0ba846b6abed59aabb56f7d2b5081db42d0dd7e978fb3cc2dbb8eb38 WHIRLPOOL 7cb83788cbe7b89eee08cef1e62c1efc456a6a28b06aa6e01dc50b64af349f0f0e51b48b54d514288b6fcb18dc979347167fed8485cbeda9d24315e77dc1ca1b
-EBUILD cclive-0.9.0.ebuild 691 SHA256 ab650eff0036a82da90b2e85c63a98d2e510dbb24f4f674be15399f5bb72fe35 SHA512 4f5b965179add887f9e02086ae45636d9d260e148886f9d7adb780453cc6e2b8cfd9073bb68fbe9bc5d3579d964fd9d831b2ee9050670257c75eb62922c33304 WHIRLPOOL ce521b54cb3c8cff6b162a2f1939fec04e9b29c050ca34b5ea71c734ce4f14404c88cfb912bceb3b93477cd95c68dfe1237d1d4786ff2e633a82c2f4a8c6e079
-EBUILD cclive-0.9.1.ebuild 708 SHA256 d2aaa3c58b6194ddaf1cc957420ebdf7c11ee6766d1d81d63160acfd5891b24c SHA512 1d4e113405f88c427c9a9ae26f0c13a15e6c1e2dda23b1421b82f15fddbd415fad5d1ea591e02a0dd86df7ca7ae5883faa664d831b4e7e883d781eea2af8af2e WHIRLPOOL c0b5f8cbe42eed1826b6012895234c16022ca33bb67056efa350deac53d0c40e75f421253c6edaca27d53d78757bbcdbafd152e37a7db2539b1a2181f6f1ce22
 EBUILD cclive-0.9.3-r1.ebuild 730 SHA256 010a3dd39279389058851e307ccd5fb57eaca58a0e7f8bfc46a92d9067b59806 SHA512 b2eb280f0d5d67c851e93c1149ea1c8c29a5b06c352b33f32e7b51023d1c8d03c08aec76b8755966ec28925faf20b9b89aab859357d4355b6ca718865b3b0ba0 WHIRLPOOL d8aa1596f0faf0bb591d7dac3575d045dd9b449bb2c54faabaa77239072ea2c6a10b15acc52e310e42d22aede7c0a93cddf7b14a235a6c6482090c131a77b2a5
-MISC ChangeLog 9429 SHA256 28eb340ed53c53c45ecfc9cd4073f3a07fd3e34d750d414efe5e9fdfe925367d SHA512 f7d7934c23a06871569d76be2c17fb0cc3af236b14765a70e251a1a411953d135ef0cfb85cad3748925cb14fdc7bc28c0794a91b7f96b83a7e749daf7a059b14 WHIRLPOOL fc5ae292bf959d6e502b10c2bd6020de61d35bd1e513908dd871c7745711477bcdfe2db374e00c647676e77049480d1f7410a7cc3ecccca64413b9b73c2966ed
+MISC ChangeLog 9634 SHA256 ecf17e5b41c12b47690e69b87b9848f08937c08c2ed78f22a7fd622cade81020 SHA512 276239fa17c160254ab9c985ec1d3ca19006218b7dc81f510b8d6d66eab565c10481e462b7e146e6b4e5a6beb51293157547b81e0adeace6593700bc6e246fb6 WHIRLPOOL b788e40eef1f5585afd91209743d02f475f8e2f43fec6f2340657271cd46db93fc549a0e27a99fab5badd7ed61714ae3c350b2652506d82ff723a0cec1c9a8cf
 MISC metadata.xml 326 SHA256 8cde56c1534d535ab7783620c90f2d7a530a882110205a1ceb94f2933caa4bdf SHA512 ab91e6ec0f85973f2f05454a1f28ad6de1abc70a15f29ead8e79adecc38e1de5a19f0f898e47ef6e94470425ebcf26a802d7d22b7ee147aba6ff1b2e7ff2ca14 WHIRLPOOL 95f0691a4e1c313a8df24c3ba4ef1052f1fcfb8b68bfedccc461d1d0b9550bdf0d584ce68aa2826ac2ff270938f3ab612fe22a15ef9fde4dc4254a68d12b1214
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlMKHTkACgkQCaWpQKGI+9TLIQCfcX2kvnl2APjukNtB/2R9x4bB
-Xe4Anj0PvGJNZijKV21LUp0nn2SrypF5
-=t66q
+iQEcBAEBCAAGBQJT1TCUAAoJEEdUh39IaPFNYAQH/3nH9M6r5pKOVlneV+miPJ8S
+JM3R+6HDtPCcAECn/IFK211VJOoz9XpS7bd9MEFLhFroEGf47frwWHPSpkBL9I96
+EI0dIZeYQq6iLN51UxvrvJRUIGAWWgae5lshY48s3qZ861CUqDUp7wVm1+PwOL1K
+gFHJ0zX/TSn942Ex99QZb/olYZZAIOIT2LOHx0aCwfMtHK71AhPoTlVTJF7U1urS
+ojLf0VqtV2RmQALnzqOfEIwZp3Dqq4ZL3DxP+M8cWLcn2Ut+22CsQsJsiiOEGGKL
+xxGSWF94Rx9T6Lp0gDxb0r/jL/wkazWsZgxSJbTT1vS7B+HQUFeNcCgyxn+EzrY=
+=2uR5
 -----END PGP SIGNATURE-----
diff --git a/media-video/cclive/cclive-0.7.12.ebuild b/media-video/cclive/cclive-0.7.12.ebuild
deleted file mode 100644
index 8e84c667fc90..000000000000
--- a/media-video/cclive/cclive-0.7.12.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cclive/cclive-0.7.12.ebuild,v 1.3 2013/03/26 11:41:41 ago Exp $
-
-EAPI=5
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://cclive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libquvi-0.4.0
-	>=dev-libs/boost-1.42
-	>=net-misc/curl-7.20
-	>=dev-libs/libpcre-8.02[cxx]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --disable-ccl
-}
diff --git a/media-video/cclive/cclive-0.7.13.ebuild b/media-video/cclive/cclive-0.7.13.ebuild
deleted file mode 100644
index 646205723840..000000000000
--- a/media-video/cclive/cclive-0.7.13.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cclive/cclive-0.7.13.ebuild,v 1.1 2013/06/25 05:24:39 radhermit Exp $
-
-EAPI=5
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://cclive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libquvi-0.4.0
-	>=dev-libs/boost-1.42
-	>=net-misc/curl-7.20
-	>=dev-libs/libpcre-8.02[cxx]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --disable-ccl
-}
diff --git a/media-video/cclive/cclive-0.7.15.ebuild b/media-video/cclive/cclive-0.7.15.ebuild
deleted file mode 100644
index 8a7deee760cb..000000000000
--- a/media-video/cclive/cclive-0.7.15.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cclive/cclive-0.7.15.ebuild,v 1.1 2013/08/08 07:26:09 radhermit Exp $
-
-EAPI=5
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://cclive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=media-libs/libquvi-0.4.0
-	>=dev-libs/boost-1.42
-	>=net-misc/curl-7.20
-	>=dev-libs/libpcre-8.02[cxx]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --disable-ccl
-}
diff --git a/media-video/cclive/cclive-0.7.16.ebuild b/media-video/cclive/cclive-0.7.16.ebuild
deleted file mode 100644
index abb41cd4f259..000000000000
--- a/media-video/cclive/cclive-0.7.16.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cclive/cclive-0.7.16.ebuild,v 1.1 2013/11/26 17:32:31 radhermit Exp $
-
-EAPI=5
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://cclive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=media-libs/libquvi-0.4.0
-	>=dev-libs/boost-1.42
-	>=net-misc/curl-7.20
-	>=dev-libs/libpcre-8.02[cxx]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --disable-ccl
-}
diff --git a/media-video/cclive/cclive-0.9.0.ebuild b/media-video/cclive/cclive-0.9.0.ebuild
deleted file mode 100644
index 7d2dec3e2e91..000000000000
--- a/media-video/cclive/cclive-0.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cclive/cclive-0.9.0.ebuild,v 1.1 2013/06/25 05:24:39 radhermit Exp $
-
-EAPI=5
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://cclive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libquvi-0.4.0
-	>=dev-libs/boost-1.42
-	>=net-misc/curl-7.20
-	>=dev-libs/libpcre-8.02[cxx]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --disable-ccl
-}
diff --git a/media-video/cclive/cclive-0.9.1.ebuild b/media-video/cclive/cclive-0.9.1.ebuild
deleted file mode 100644
index 10a85716be68..000000000000
--- a/media-video/cclive/cclive-0.9.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cclive/cclive-0.9.1.ebuild,v 1.1 2013/08/08 07:26:09 radhermit Exp $
-
-EAPI=5
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://cclive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=media-libs/libquvi-0.4.0
-	>=dev-libs/boost-1.42
-	>=dev-libs/glib-2.24:2
-	>=net-misc/curl-7.20
-	>=dev-libs/libpcre-8.02[cxx]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --disable-ccl
-}
diff --git a/media-video/clive/ChangeLog b/media-video/clive/ChangeLog
index dd005fb0b6ee..049ba456df8b 100644
--- a/media-video/clive/ChangeLog
+++ b/media-video/clive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/clive
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/clive/ChangeLog,v 1.75 2014/07/27 17:00:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/clive/ChangeLog,v 1.76 2014/07/27 17:01:03 ssuominen Exp $
+
+  27 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> -clive-2.2.26.ebuild,
+  -clive-2.2.28.ebuild, -clive-2.2.6.ebuild:
+  old
 
   27 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> clive-2.3.0.1.ebuild:
   amd64/x86 stable
diff --git a/media-video/clive/Manifest b/media-video/clive/Manifest
index 9f67164e808f..b8fd18d6ce9b 100644
--- a/media-video/clive/Manifest
+++ b/media-video/clive/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST clive-2.2.26.tar.gz 56268 SHA256 fea2437325017da8eb5e96b7dc57a57a95fe9ca2bfaeee924a5264f553628c26 SHA512 6f53094f0931c83baf7e2e09585f9b4b2ae542e8599885578857d290d25a47537e0d6163f3a71c1ca8b46ab81033305529402e95e209aa8aad9a69e3d34b4adb WHIRLPOOL 706a33e920b103ddc2aa8d88f54a94334690799a4de511cfe3a8bb803be6bcae4e17a27bd21660605ed8b4e6541fca61854335b98f397c5d7c5ee8c949858248
-DIST clive-2.2.28.tar.gz 53525 SHA256 df153a71f43ccdb6170e26ba0c7fb307898d55fa9bd38277df25cc7b6d34a490 SHA512 9702dbb5da8f73fbb915690213bc331cffa0682b954463925fdf8f2a61996c4ac58dc9b45776932990f26e776ed8cad26fccfc5b95a4c7df7b861f44c66e5450 WHIRLPOOL b7653d5584a04e59d383fc8ce14ae0de6197108b9e7ef6a8523640de1b0b0a50f5e7585a62880b8ecfe4ea0994070518d8ee30c27b32d26331bae733b9c6595d
-DIST clive-2.2.6.tar.bz2 45285 SHA256 73f40b17a319a46969b791b9521120dcb12cea8a4bfcb26dbc68dbe174e57eba
 DIST clive-2.3.0.1.tar.gz 43551 SHA256 69b5d6014bdb097395b2d2ac945ebb5f6a73aff78d48fd67f533ddf33a615f33 SHA512 7426d6e8f19c358b30a7d33257d7ee536802eb35442d3cac68f6742613696ab1b280457a65d980237b53b692c5cf311725e46a5d8c27c7f2200172d050337cfc WHIRLPOOL 2e0a03dd700932eaf996ef5eea6059fdca197818ebc886fc4a1e1a6a846a1335334397115aed3c616005882e378ddbbcf3802423494f306360087dd74fc3cf5d
-EBUILD clive-2.2.26.ebuild 1422 SHA256 92298650e456c8961060578ad87fbd024e328a5674211bb09f472fa67480bab8 SHA512 8d47f33a94fa1e3820ef87141c382ba7f754f0c0c35bada78673bc2d309cf4120d0a11f431ff92bec51001b0a52452a2898e61f202888ec31bbaef3a711c9f57 WHIRLPOOL 13578ab35088c7a260c2cfba2cf9791f755cb9a5560d062228d3ff0080bd73ec62c3077fb8958f7f0789432adb42eb21ec77a8f7651744f615adc7ce962341d4
-EBUILD clive-2.2.28.ebuild 1422 SHA256 dddebf75198eaa3ef73f8dac4e81c6fd025131797c5246866ef617913c47bd9c SHA512 de5217d6dc4bd5e3fe990f834bce01b43cfc1692b3eab82f80ed529f456e5150370c670c130430482ad0754dde603cbaa9fd5800ecd72e6a3aaea2dbb9f2af27 WHIRLPOOL a93d503b109296821a461a4638cad495f316832343055a1f695bbc40c2babcedb4585cfbacfb122020f51e34316f2dd1b9ff64e9137d980bf8719f6cea422a73
-EBUILD clive-2.2.6.ebuild 1355 SHA256 2943e47880db54decc6d7c202ed7190e192aa43bbc2541eab8d16cc07418b646 SHA512 b41ea0818edeaec6f37eeae7e3505e6e9f953fef912faec9a789390979bde984f3b68411dd1122ddb47b139dda54a3323d33839166d30f1397e70cdfc924a822 WHIRLPOOL bb4bf2fe5ac8f0b5e71d0f6ce2fdec4e407e2e4611670f93bb6c54b7f2b1838563a819eccdb76aa93a1221e236010d0361835ecc7a4a092de120cc02679393c1
 EBUILD clive-2.3.0.1.ebuild 1749 SHA256 fa8fba3091aacad0f87b15a0f8bbd21bb49f55411d879b7012f1745d165df911 SHA512 c66bb586f4d80d59bc29ae994f47a68d044a2cd67ae3f9f1b12915710f9ab42804051fbfe8ce0901fd56dcdca655e2aee58766f49171b7e5c161b9151d10f0b8 WHIRLPOOL 85c0422984e99336517eb6836f98531c9c74ece2388ac63acfc1e4ad4a78e42dd882d91475c489cbfdd26c9755e833aa94eb9eb89a022025f5d62f767bfc9754
-MISC ChangeLog 9258 SHA256 0e75a1d8ee23b0ca48d3a0960dcd12e82cc0517d40ee0e47b77199db8ff07fe4 SHA512 f9b995023f3ae2badff4a230a6759456d53c9c3bb1990e286277cfec9bed364e1d63e45707ec1a42c361e3fced1cdb74566c0e257052d149bb8fc9b0ac7b4910 WHIRLPOOL 59f90945bf172939a0b31f0f9c897d21af80a3c39aa367ac59c2f713c0749023de5703121089c1c22b76f71495112de120a66fee53045ca812fc8319c08dcb64
+MISC ChangeLog 9386 SHA256 3e4cdeb300cebf17fc2a1dd59116378ecc3706269cfeba3c3ecfc24b8945870f SHA512 efbcc01bdcb5f5562cdf70729134fc01b4adbcb7615b319335606786a437790bb92cbf7aeef703cb614461493e5335a266c5721533b1b641e71109512ead15b9 WHIRLPOOL c4afb007eff7a172a78618085fdba50d2a897f060b58163db560c4426e59fd17f6dcf37e599fce6ee047e0cd332a08c41eef0ea1eeee0cd270cf39ad9a244889
 MISC metadata.xml 654 SHA256 779c13ebcd309b5128f2945f47a746f5d6dd313e104ce5bad71b14fb3463c0f9 SHA512 b7ad7411c7b41f71f31bd603a567d3870da12540617d86f4241fc55670463a0ca1a6b53545e9a35f3ecdaaf2c18472324cbe8f61ad3b2675be721006b0fcda45 WHIRLPOOL 1b8f17cda110d4e3ea20f87929184a7addb24b851c409412072560ea6026b998d28810a300f794bc7cd44d459d90e7e1dbdd44069ced594fa6c259b2eb28ef50
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT1TASAAoJEEdUh39IaPFNQuoH/0vReH56TvUJA5A2j0lDcCJP
-/GVdPEdeiXT5g1Ytb+liMMwNUAaEs8QSYyUwbnqCE3+ByFOkgcYwukdbwly6vhHR
-9+kbBPvmKg6O1HGF4ulXWrHXs33cAe/7DTXWRal4fmlljvs/0FWhJY0Jf1uZE3lv
-YimV0/PdVIU0v7Asf4y70GK1R/yGxJpnpsxZCNai0+QZ9cAoYIfZbO7wkDQjpsx4
-HOYXyL9OS/07SiKNxz6k52xwxHmG8o4VXI0RqDSjxeeV78TvazD/emjYDls8EmZj
-S5FDC4B/KzJZqZZeaeylZWcU13E8t5k1GFnDScjkH3a4ti5S2ZmmO65ubSnRlZ8=
-=TjDe
+iQEcBAEBCAAGBQJT1TBEAAoJEEdUh39IaPFNp3sH/0UpuuNTilU9e/RzY9alVT4L
+/04PpsazJf04UT94thcbd5VuouQYlj2L96TciYnn/FXqXSinkE2umr8sE82Ccr+s
+PfSmFlP7vbyVUcKmt2nOraA6FqP/RUw+LrU0rPV7gintzuFwGxrRUcSfXBqgkrdV
+gJ+OSeLgDC9x3DS5yXyJFYf45Plh+3ruFV5JV6gQTaoJi98nOaj7vdSRLPbFgxvS
+lBQojIezmdfExlwjcCPN8KziIa18LbMduLOds0jeAzrYYumCllE42i+dCTOkPBTX
+gsuXC5EsBGw99gp4EMSpySGk6fwTXeQmpRDxeSb2XC1PfGdZn9sUl+P+tNNIMvk=
+=DzjD
 -----END PGP SIGNATURE-----
diff --git a/media-video/clive/clive-2.2.26.ebuild b/media-video/clive/clive-2.2.26.ebuild
deleted file mode 100644
index d68c26784406..000000000000
--- a/media-video/clive/clive-2.2.26.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/clive/clive-2.2.26.ebuild,v 1.1 2011/08/17 06:33:10 radhermit Exp $
-
-EAPI=4
-
-inherit perl-app
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://clive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="clipboard pager password test"
-
-RDEPEND=">=dev-perl/BerkeleyDB-0.34
-	>=dev-perl/Config-Tiny-2.12
-	>=virtual/perl-Digest-SHA-5.47
-	>=dev-perl/HTML-TokeParser-Simple-2.37
-	>=dev-perl/Class-Singleton-1.4
-	>=dev-perl/WWW-Curl-4.05
-	>=dev-perl/XML-Simple-2.18
-	>=dev-perl/Getopt-ArgvFile-1.11
-	dev-perl/URI
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Spec
-	clipboard? ( >=dev-perl/Clipboard-0.09 )
-	pager? ( >=dev-perl/IO-Pager-0.05 )
-	password? ( >=dev-perl/Expect-1.21 )"
-DEPEND="test? ( dev-perl/Test-Pod
-	${RDEPEND} )"
-
-SRC_TEST=do
-mydoc="NEWS"
-
-src_test() {
-	if [ -z "${I_WANT_CLIVE_HOSTS_TESTS}" ] ; then
-		elog "If you wish to run the full testsuite of ${PN}"
-		elog "Please set the variable 'I_WANT_CLIVE_HOSTS_TESTS' variable"
-		elog "Note that the tests try to download some videos from various websites"
-		elog "and thus may randomly fail depending on the site's status."
-		export NO_INTERNET=1
-	fi
-	perl-module_src_test
-}
diff --git a/media-video/clive/clive-2.2.28.ebuild b/media-video/clive/clive-2.2.28.ebuild
deleted file mode 100644
index 913b52ffb7d7..000000000000
--- a/media-video/clive/clive-2.2.28.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/clive/clive-2.2.28.ebuild,v 1.1 2011/10/24 04:39:52 radhermit Exp $
-
-EAPI=4
-
-inherit perl-app
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://clive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="clipboard pager password test"
-
-RDEPEND=">=dev-perl/BerkeleyDB-0.34
-	>=dev-perl/Config-Tiny-2.12
-	>=virtual/perl-Digest-SHA-5.47
-	>=dev-perl/HTML-TokeParser-Simple-2.37
-	>=dev-perl/Class-Singleton-1.4
-	>=dev-perl/WWW-Curl-4.05
-	>=dev-perl/XML-Simple-2.18
-	>=dev-perl/Getopt-ArgvFile-1.11
-	dev-perl/URI
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Spec
-	clipboard? ( >=dev-perl/Clipboard-0.09 )
-	pager? ( >=dev-perl/IO-Pager-0.05 )
-	password? ( >=dev-perl/Expect-1.21 )"
-DEPEND="test? ( dev-perl/Test-Pod
-	${RDEPEND} )"
-
-SRC_TEST=do
-mydoc="NEWS"
-
-src_test() {
-	if [ -z "${I_WANT_CLIVE_HOSTS_TESTS}" ] ; then
-		elog "If you wish to run the full testsuite of ${PN}"
-		elog "Please set the variable 'I_WANT_CLIVE_HOSTS_TESTS' variable"
-		elog "Note that the tests try to download some videos from various websites"
-		elog "and thus may randomly fail depending on the site's status."
-		export NO_INTERNET=1
-	fi
-	perl-module_src_test
-}
diff --git a/media-video/clive/clive-2.2.6.ebuild b/media-video/clive/clive-2.2.6.ebuild
deleted file mode 100644
index 762c758c128d..000000000000
--- a/media-video/clive/clive-2.2.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/clive/clive-2.2.6.ebuild,v 1.6 2009/11/25 10:23:22 maekke Exp $
-
-EAPI=2
-
-inherit perl-app
-
-DESCRIPTION="Command line tool for extracting videos from various websites"
-HOMEPAGE="http://clive.sourceforge.net/"
-SRC_URI="http://clive.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="clipboard pager password"
-
-RDEPEND=">=dev-perl/BerkeleyDB-0.34
-	>=dev-perl/Config-Tiny-2.12
-	>=virtual/perl-Digest-SHA-5.47
-	>=dev-perl/HTML-TokeParser-Simple-2.37
-	>=dev-perl/Class-Singleton-1.4
-	>=dev-perl/WWW-Curl-4.05
-	>=dev-perl/XML-Simple-2.18
-	>=dev-perl/Getopt-ArgvFile-1.11
-	virtual/perl-Getopt-Long
-	virtual/perl-File-Spec
-	clipboard? ( >=dev-perl/Clipboard-0.09 )
-	pager? ( >=dev-perl/IO-Pager-0.05 )
-	password? ( >=dev-perl/Expect-1.21 )"
-DEPEND=""
-
-SRC_TEST=do
-mydoc="TODO"
-
-src_test() {
-	if [ -z "${I_WANT_CLIVE_HOSTS_TESTS}" ] ; then
-		elog "If you wish to run the full testsuite of ${PN}"
-		elog "Please set the variable 'I_WANT_CLIVE_HOSTS_TESTS' variable"
-		elog "Note that the tests try to download some videos from various websites"
-		elog "and thus may randomly fail depending on the site's status."
-		export NO_INTERNET=1
-	fi
-	perl-module_src_test
-}