Old.

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

6 files changed, 12 insertions, 276 deletions

diff --git a/net-misc/youtube-dl/ChangeLog b/net-misc/youtube-dl/ChangeLog
index eed5c48946a1..892901fdf366 100644
--- a/net-misc/youtube-dl/ChangeLog
+++ b/net-misc/youtube-dl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/youtube-dl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.214 2013/08/18 13:44:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.215 2013/08/18 14:06:31 jer Exp $
+
+  18 Aug 2013; Jeroen Roovers <jer@gentoo.org> -youtube-dl-2013.05.23.ebuild,
+  -files/youtube-dl-2013.05.10-offensive.patch,
+  -files/youtube-dl-2013.06.21-offensive.patch,
+  -files/youtube-dl-2013.06.34.2-offensive.patch:
+  Old.
 
   18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> youtube-dl-2013.08.02.ebuild:
   Stable for x86, wrt bug #480162
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 7bb332aebb8d..1de1fac53ad6 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX youtube-dl-2013.05.10-offensive.patch 1889 SHA256 6085f9ad4c17d565c842582f513d43fbd9e769c493766a725ddb512c83ab7e6c SHA512 bfc24a69519897bff3306fd20630356b21d3674eecd41d00494d526da005c29234c7e5667d07fbd7fbb3cc6468d90b2e3ff7790d44c7bd2292c3e7d907f00426 WHIRLPOOL 80d8546f878d46a14c1be715d0d6db0543fbf11cd1cc798d01055340b95ba69ad729a967ccfd9c3773ec6534a06692923012fd11ddfb84d68f750752a7f8703e
-AUX youtube-dl-2013.06.21-offensive.patch 2995 SHA256 3ec96fe3bd5ec374bf82b1ba9e7b10be77ad81b0fa253a7628a8969555cdb6d9 SHA512 2ce08dccdf3391badbc2c6bd1d11e4e47e396ce5442d7495cc2d4f7214d00e0a41bc628df7a14a1468f60f29d3fca7915e275cfcc2d46bab0387ca6d2e3e801e WHIRLPOOL 17fb96a1f231ea508bbd1eaa6053e3c21c6eb3bd78557a0eb89d23eeadbc7df3a4db454fa8829ebbbad10b964d67e8fd2f3199f86885a1ae98543fe36377df56
-AUX youtube-dl-2013.06.34.2-offensive.patch 1639 SHA256 1c5037e701f60851e953fdecfd4d49e158b58987f38d67353d53c5199ea6182e SHA512 5dabc56b1d92fd3fc9828e28bf9d3d4d3892d7992a02e191a46d6c74c7ed4e98889eb1a6aa4aaf2c38d41caaf3642e7d38a1c193e7933203c153347ef223081b WHIRLPOOL fb255e2107304c0a55fb995375c05233ed1debe5bbe9f5f28a69a135cc4035674406e276229d9ed3e0326dc1e79ea48524965d63e2ec333d7733dc6228d04bb7
-DIST youtube-dl-2013.05.23.tar.gz 170900 SHA256 5d31a5f5371dd7852acf68dd49bfb8068fe73a885fdb544ea28a9055369f6392 SHA512 548a681f404a8086b4f4ef92e9deb9d8de1fe14563e1424589d27fefb2f02f9522389596a79523a3e564a58ba812cbdf5b6af0854a779eac1db83006007c5b06 WHIRLPOOL 8d4679c3f508f8040422c82edb4576fc3ef3893f068afa7cd021aa85aefb561622a3a382afc975423a42562dbddb46d372dd64d8892708d5d13882014c7396d1
 DIST youtube-dl-2013.08.02.tar.gz 303624 SHA256 fb74cc8937ca667b6dd029404bd5d011837f0ed284612188d66729b72796c57f SHA512 b45ff59fdd1626617d38c6b45dd4dca5fd4e696380b2fc5c520ca3a0f2dab2ba653934ce62d3f9c65bd6e49e1157672171331af94dc76c9a5a272abee9e8b035 WHIRLPOOL d63b17725739fee716716b4a8a61937d8760fe17e6915673103ef955ae4086199aa3faa38a5c9e531efd1e22676a024773c1572ad8d0c9646aaac878ca0fe465
 DIST youtube-dl-2013.08.08.1.tar.gz 308668 SHA256 00bd57fc231a21dc428776cc0e9baabf221de255f8f3b30d94bff468172d17f5 SHA512 f1cf6fb8ead2fe80f8a6378985edf6deb0e401c6627ef827c137fe6aa658d535dd5ec761cbbcea6be7d4a76b87d6352965ba56a42a941004c209d18327cbe15a WHIRLPOOL 2dab7802ea08eac83e6149e59b5aacb0fe4d64ba5fe278a155db52dace91777d7a2a490d85f0782dc38dfdd6863114f9ae72f3196e0a56c912c7c4292b3d4dac
 DIST youtube-dl-2013.08.08.tar.gz 308661 SHA256 779d3271ebcbb604e81c5ceccac3426867e79cd0d1351c4bd541394028ee0b19 SHA512 be6d9a1b055a78f5bc2a145a4ec4c9661e828a3924299ad11ec847d6bca319977c28208e8a53de5018d91816921074840d71f4eded5cc9037c16a8249b88b77d WHIRLPOOL e7f49379048e55aa229990bf9cea16e4d12e972b89840e960fcd4c57e0f0a052cfa3a9c62d0bcf25b3b7a8027551e9347d103570f8629e63ec7e448b122b53d2
@@ -12,7 +8,6 @@ DIST youtube-dl-2013.08.09.tar.gz 308715 SHA256 f53db27f8a5bba875117be048206f69d
 DIST youtube-dl-2013.08.14.tar.gz 308849 SHA256 c1436671ed3b07db2bdc3647ac8c3392177db6028771c6df9d7b341e5cbb4a6d SHA512 1962f49d79bf6b0689e1d7d099ce7c77d3316ffefe395ebf34f0f92a529092d44cff0bbb5ee2335dbfabf917de22c477dd80bdc69c23060f20e612420dde9733 WHIRLPOOL 322113d1824db758b66a3f08bd97aaa16f4d2e9e2e5387ff483a420aeaed43d51e0225097a62c889eb712b38881aa3f07f90c1956cfee3dbc38525483902c3b8
 DIST youtube-dl-2013.08.15.tar.gz 308858 SHA256 0fb42abb974fec46f9532b09d547bd9e1468547e7c24f9f15289eae4aca1b5d2 SHA512 11ef42885bee88ca437f8c88df1f5c143ee5e46aadf7deec2d33cd1db5337679ba432f7287cadd8d8d052672db31e35b33084edcd1eb6c674d0241f9a3958f10 WHIRLPOOL 523d060e597dc9aea39fae872a40ca48416880b7dfc0ed8b6eb04504343253b38519c4f60f7a985b1f2b4e5809b23a70a753ebc013e5fa62499f0bbe93e38e42
 DIST youtube-dl-2013.08.17.tar.gz 308834 SHA256 2fac57ca756daaf3c771bb883fa87d99e3818dba6635577ff6079921bd74e1f4 SHA512 aca4b9f2c1177a6d42f9962c6ad3bc9cc0ad3c3e1787063f23e7f570e51cc0ddfcff20ca4c750122a533ac5cd3a68bab75fe9fb2e4909c9a42c3febdbf50472b WHIRLPOOL 2d3bf715d1cd3719e804a033b22c9bf3483ee3deffe096d40ff1a086a252c6a7dffc6178240f2ee611dd51190d0cf028463370d1479bbe450e1ce4003b30c5ef
-EBUILD youtube-dl-2013.05.23.ebuild 1041 SHA256 d05864cc81fe4b7280eab5356517d0648033c101be0c155fda33df9869b0b41a SHA512 d49383f7f5b5b0dfffb2059265da5fbf35434acf6b13938c2aef422416f9b4028acd691aa025bb5638f8fcbffb3b8f5455f0e796394049c36c1553ab3d055e38 WHIRLPOOL be98b0140571f671f04b337752605ac36f124322cd4295fa57f52fd5cb5f9010e4b31b1d869ffab7d686363936ffd5b77e81ac4f8dc57c72e3b0ad625a64c5bd
 EBUILD youtube-dl-2013.08.02.ebuild 1337 SHA256 824645e6257b3ca5c5637b8ee52a925324cb9917e61c67864223ec3df15ca159 SHA512 5b144559df9d1d08ff98ca0ef8e7549a9e3d2d1b8d4fae56a840078543d110b2f90a8197dcfa4cac6dc2f7319ea32d7687631420392f8a0d94d03307305379d0 WHIRLPOOL c7508da653d0b905136b5b072ad78a637de66e2ffbc16028d46f5601b7a15adefc826d6fe3446933f74a4350080ed6a199dd9ebf82f816f4f5bc2555ec2561eb
 EBUILD youtube-dl-2013.08.08.1.ebuild 1344 SHA256 1b0feb8dcf6506434e563e8d8004403f9cfa5f38e81b2045a6862c714d2ae585 SHA512 85bfa9488defcebdc43a8ff89eebc3aff541e6d39cd69851a52a1f132005015e4f611d924b0344558df3656c78d31800d1b244cb2cd9f06609d0f3b7bf1ae353 WHIRLPOOL 89866626fbe24a82762c1d8faa2d75c2114ec90ca94ef21e5517ea3f419e2dc962b21418a30b46a4540281648708aaa6af3674160c958f3b4cd619ba40213caf
 EBUILD youtube-dl-2013.08.08.ebuild 1342 SHA256 6fbf4df22a8f37d45f54ce1b69d66b900bc97d1f92dc5ae84f6615e4ca1411e6 SHA512 fa4c7099d441134a8323fd78cd6c8802426578a11ca8fbf97a6b027a6b6b7b1d6a484e49b1a06e5c5740f04263ccfd3e671a979a6ec450ec24578b49408bd9b8 WHIRLPOOL 3746b2d6a8b168a09e619031511c14be89d469d66b9bb4ba57ff61404dc76b1c1356e15b30683c2335631390cbca31192e658352cbb21e5432f49892b0f6805a
@@ -20,22 +15,12 @@ EBUILD youtube-dl-2013.08.09.ebuild 1342 SHA256 22f665bd6d27ce60049da5b7561375ff
 EBUILD youtube-dl-2013.08.14.ebuild 1342 SHA256 2f82aab61d84036af665e49220937a1add4711fb74765fdae47f7474b85f0462 SHA512 ca0fdd38865a56d56b9a40ed31ea510eb0720f3829a63274cb0b72da0b6e4bbffb45d33872be6145d3d63ddb12f5486703c939b6935f257adee077a67e2c2388 WHIRLPOOL e9b3f86287fbc6acf05918c4f1f9088ba0faccdf3f988c8c71cb25d7aa93ebe562ae54d6ab597290cb85a983d32c5828ddf673678f663ee854b7739ce94a9c13
 EBUILD youtube-dl-2013.08.15.ebuild 1342 SHA256 51aa0d2ff0b6d272d87174a45a62d03d81123a4420ce74e72e64ff49d633c1f1 SHA512 0b1a9ae65d8b44df56458d6a9ff46016a11f6b4a476117eb988a3ccec801a1320cff3938654a1e9e41c45e6fd4c3f17832edbc503ce0617d819cc4eb256e85bb WHIRLPOOL 3b197cae571ee445dfacebbaddff760c864ef108a8356ee6999287292c8045657409955f1b4a37f7b85c2b3e3567642a11a0dca842b0109c8fdccdc136a2ec03
 EBUILD youtube-dl-2013.08.17.ebuild 1342 SHA256 7c618485b325db21f97969ba5e920b3827c98bdd23e8a13a8d3b1a67e148940c SHA512 12d29c04b3985a6717453695a830409e9f8703f7e9ff4446afa48034aef9c70e0755a5c28e61fabda8f4363431f20b32981bdb40b834279c746ace34641031fc WHIRLPOOL 2ee0ebc90986ec84ab438d2c349cac35a5af6644828f754e258bac7f2557b71cb9ed2cc6060a1a0342d400d0d7aaadb2e93a29ccfecf06d77989f4df0fa79aeb
-MISC ChangeLog 30299 SHA256 8642cb773f2cee36f833517e9dff209b72337392466b740dfc715670c0e9f02b SHA512 e7e1ae2f236a8fc91665b92f8f5cb6c7630b15f69d81e94cb7be68a9539a13ab916959a300b5d1cc3036fc608d509bc6a2c8a97ad61092200a9f0f0b52d46bc1 WHIRLPOOL 30663abda95e1e35486f0ed9fa09cea34e7364aadbd147ba12fc035c53799cffebb83f9fb4a5886bc5d3882d0eedc80a566c3984edbfa6d06efb3fdfefd8239d
+MISC ChangeLog 30531 SHA256 6022d05384aa1512285d14d171fac7df6a9999d44fb5c9d97608f890288b9b2e SHA512 f3f8e38c5f8800bf03519ed54b1fddbc727097980665c3a7f33d84809bc8e4d4dbed8974f29b49a8509cf77567c7ec4742c8cd3c5c9ef12cf0a4885509b11396 WHIRLPOOL 5c4eccae1924c3e586c9eb009785eadd5cf6871ca3e889bcb41f8caeed723a3ff26fb8c86ce62c16c802e5d5f685918dfaa8ae144f8bf18e2bc5fe83037043d6
 MISC metadata.xml 274 SHA256 2b4f14b46d21b004377e745db520f7961bc4163b23e6f3d8bbcab508272b1f69 SHA512 acfb3695928ebf2ee87c75f06c7ab47a65f4aa8564b1426ee523a1a5c853ed56df0de4cba186ac003383a27dfa9d21e4f4ff44b48e152c406a918f1b01ca358b WHIRLPOOL 0f245af71a769b0d4eb9bb57a99599a0875ad0373a830ff9e8215a077d3d2f02e916b7b25d275b19b5139810608abddfada68d3d0f2e9191351d26ba716b623b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSEM/SAAoJELp701BxlEWfcvcQALYlDHv1x3C9KIUzhmVR/KZ2
-XnYK8VdlqL8/ngk2Lffr6DrWaA9bAWy8wGcgGciIeFWZ0HI4zJ4OQV4FIZWsDNec
-LG5rV8tL/mpKP77CBPt960LUDlFWzaGpRGKiCSLX0cYH57KozkDI4rF/QjjKBKq6
-WWLEOQSaFg/tahZEcjj9Kd5znx0LN2qAQge2zFimMuXOLLloHHM3lbg1HkUvdp8S
-f5gIkN+PXrtZ49Iskx/h2qJLBr8fdTCUBEo6WObzBVczxfs6vnxBSDkwSpHNPr3a
-5AP1j7xRS2tRbPQQm7wjXHVxYBh73eMpzR7r/ymR+8dt9t6yvjt6LGIyAAvtsEWp
-ZPefFdcej+uOwS4xNnjJtZWcJaP2PZDZ3vH1QZzHjMm35OT0dm2qoJjAkRzhKDL4
-Q/iBFQhSGFEiFZD1jR6FhPsOY/2NgcZCZeGNGt7vXxaBa6lNHUBMhlQcILBpXL2x
-IEQDcMXr2b5d5qlBoXFHvTKQbpfxRj07AwLPAO46s3ON/xThsUwG5QjRVyT6DoCF
-SSWLrHrhfoKRZZANmZ/7Fv0EkkQNwwNyhQk3kbEe05RW82UKkLIdx73qZhRqR+VN
-Pr0YNq6X6B2XuvqSlBXgdPv/PyBh1slWjdhFpPbkstTSnzhgJU4xRgtt1fGn21Ke
-OhpjtF8tse2h72RVWojx
-=gQAr
+iEYEAREIAAYFAlIQ1OgACgkQVWmRsqeSphPgDQCfaloA/tSXX9tf1LvdtqG+Rxi3
+c2YAoIC+/q30ysOsaHznbtAQiIqqosyt
+=yyC/
 -----END PGP SIGNATURE-----
diff --git a/net-misc/youtube-dl/files/youtube-dl-2013.05.10-offensive.patch b/net-misc/youtube-dl/files/youtube-dl-2013.05.10-offensive.patch
deleted file mode 100644
index c46a4f60eff6..000000000000
--- a/net-misc/youtube-dl/files/youtube-dl-2013.05.10-offensive.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/test/tests.json
-+++ b/test/tests.json
-@@ -30,30 +30,6 @@
-     "file":  "5779306.m4v"
-   },
-   {
--    "name": "XVideos",
--    "md5":  "1d0c835822f0a71a7bf011855db929d0",
--    "url":  "http://www.xvideos.com/video939581/funny_porns_by_s_-1",
--    "file":  "939581.flv"
--  },
--  {
--    "name": "YouPorn",
--    "md5": "c37ddbaaa39058c76a7e86c6813423c1",
--    "url": "http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/",
--    "file": "505835.mp4"
--  },
--  {
--    "name": "Pornotube",
--    "md5": "374dd6dcedd24234453b295209aa69b6",
--    "url": "http://pornotube.com/c/173/m/1689755/Marilyn-Monroe-Bathing",
--    "file": "1689755.flv"
--  },
--  {
--    "name": "YouJizz",
--    "md5": "07e15fa469ba384c7693fd246905547c",
--    "url": "http://www.youjizz.com/videos/zeichentrick-1-2189178.html",
--    "file": "2189178.flv"
--  },
--  {
-     "name": "Vimeo",
-     "md5":  "8879b6cc097e987f02484baf890129e5",
-     "url":  "http://vimeo.com/56015672",
-@@ -79,12 +55,6 @@
-     "file":  "PracticalUnix_intro-environment.mp4"
-   },
-   {
--    "name": "XNXX",
--    "md5":  "0831677e2b4761795f68d417e0b7b445",
--    "url":  "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_",
--    "file":  "1135332.flv"
--  },
--  {
-     "name": "Youku",
-     "url": "http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html",
-     "file": "XNDgyMDQ2NTQw_part00.flv",
-@@ -404,15 +374,6 @@
-     }
-   },
-   {
--    "name": "RedTube",
--    "url": "http://www.redtube.com/66418",
--    "file": "66418.mp4",
--    "md5": "7b8c22b5e7098a3e1c09709df1126d2d",
--    "info_dict":{
--      "title":"Sucked on a toilet"
--    }
--  },
--  {
-     "name": "Photobucket",
-     "url": "http://media.photobucket.com/user/rachaneronas/media/TiredofLinkBuildingTryBacklinkMyDomaincom_zpsc0c3b9fa.mp4.html?filters[term]=search&filters[primary]=videos&filters[secondary]=images&sort=1&o=0",
-     "file": "zpsc0c3b9fa.mp4",
diff --git a/net-misc/youtube-dl/files/youtube-dl-2013.06.21-offensive.patch b/net-misc/youtube-dl/files/youtube-dl-2013.06.21-offensive.patch
deleted file mode 100644
index bfb6ada772a8..000000000000
--- a/net-misc/youtube-dl/files/youtube-dl-2013.06.21-offensive.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- a/test/tests.json
-+++ b/test/tests.json
-@@ -47,46 +47,6 @@
-     }
-   },
-   {
--    "name": "XVideos",
--    "md5":  "1d0c835822f0a71a7bf011855db929d0",
--    "url":  "http://www.xvideos.com/video939581/funny_porns_by_s_-1",
--    "file":  "939581.flv",
--    "info_dict": {
--      "title": "Funny Porns By >>>>S<<<<<< -1"
--    }
--  },
--  {
--    "name": "YouPorn",
--    "md5": "c37ddbaaa39058c76a7e86c6813423c1",
--    "url": "http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/",
--    "file": "505835.mp4",
--    "info_dict": {
--      "upload_date": "20101221",
--      "description": "Love & Sex Answers: http://bit.ly/DanAndJenn -- Is It Unhealthy To Masturbate Daily?",
--      "uploader": "Ask Dan And Jennifer",
--      "title": "Sex Ed: Is It Safe To Masturbate Daily?"
--    }
--  },
--  {
--    "name": "Pornotube",
--    "md5": "374dd6dcedd24234453b295209aa69b6",
--    "url": "http://pornotube.com/c/173/m/1689755/Marilyn-Monroe-Bathing",
--    "file": "1689755.flv",
--    "info_dict": {
--      "upload_date": "20090708",
--      "title": "Marilyn-Monroe-Bathing"
--    }
--  },
--  {
--    "name": "YouJizz",
--    "md5": "07e15fa469ba384c7693fd246905547c",
--    "url": "http://www.youjizz.com/videos/zeichentrick-1-2189178.html",
--    "file": "2189178.flv",
--    "info_dict": {
--      "title": "Zeichentrick 1"
--    }
--  },
--  {
-     "name": "Vimeo",
-     "md5":  "8879b6cc097e987f02484baf890129e5",
-     "url":  "http://vimeo.com/56015672",
-@@ -121,15 +81,6 @@
-     }
-   },
-   {
--    "name": "XNXX",
--    "md5":  "0831677e2b4761795f68d417e0b7b445",
--    "url":  "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_",
--    "file":  "1135332.flv",
--    "info_dict": {
--      "title": "lida » Naked Funny Actress  (5)"
--    }
--  },
--  {
-     "name": "Youku",
-     "url": "http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html",
-     "file": "XNDgyMDQ2NTQw_part00.flv",
-@@ -513,15 +464,6 @@
-     "skip": "There is a limit of 200 free downloads / month for the test song"
-   },
-   {
--    "name": "RedTube",
--    "url": "http://www.redtube.com/66418",
--    "file": "66418.mp4",
--    "md5": "7b8c22b5e7098a3e1c09709df1126d2d",
--    "info_dict":{
--      "title":"Sucked on a toilet"
--    }
--  },
--  {
-     "name": "Photobucket",
-     "url": "http://media.photobucket.com/user/rachaneronas/media/TiredofLinkBuildingTryBacklinkMyDomaincom_zpsc0c3b9fa.mp4.html?filters[term]=search&filters[primary]=videos&filters[secondary]=images&sort=1&o=0",
-     "file": "zpsc0c3b9fa.mp4",
-@@ -593,17 +535,6 @@
-     }
-   },
-   {
--    "name": "XHamster",
--    "url": "http://xhamster.com/movies/1509445/femaleagent_shy_beauty_takes_the_bait.html",
--    "file": "1509445.flv",
--    "md5": "9f48e0e8d58e3076bb236ff412ab62fa",
--    "info_dict": {
--      "upload_date": "20121014",
--      "uploader_id": "Ruseful2011",
--      "title": "FemaleAgent Shy beauty takes the bait"
--    }
--  },
--  {
-     "name": "Hypem",
-     "url": "http://hypem.com/track/1v6ga/BODYWORK+-+TAME",
-     "file": "1v6ga.mp3",
diff --git a/net-misc/youtube-dl/files/youtube-dl-2013.06.34.2-offensive.patch b/net-misc/youtube-dl/files/youtube-dl-2013.06.34.2-offensive.patch
deleted file mode 100644
index 264da9025e28..000000000000
--- a/net-misc/youtube-dl/files/youtube-dl-2013.06.34.2-offensive.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/youtube_dl/extractor/__init__.py
-+++ b/youtube_dl/extractor/__init__.py
-@@ -35,9 +35,7 @@
- from .myvideo import MyVideoIE
- from .nba import NBAIE
- from .photobucket import PhotobucketIE
--from .pornotube import PornotubeIE
- from .rbmaradio import RBMARadioIE
--from .redtube import RedTubeIE
- from .soundcloud import SoundcloudIE, SoundcloudSetIE
- from .spiegel import SpiegelIE
- from .stanfordoc import StanfordOpenClassroomIE
-@@ -54,13 +52,8 @@
- from .vine import VineIE
- from .wimp import WimpIE
- from .worldstarhiphop import WorldStarHipHopIE
--from .xhamster import XHamsterIE
--from .xnxx import XNXXIE
--from .xvideos import XVideosIE
- from .yahoo import YahooIE, YahooSearchIE
--from .youjizz import YouJizzIE
- from .youku import YoukuIE
--from .youporn import YouPornIE
- from .youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE
- from .zdf import ZDFIE
- 
-@@ -90,7 +83,6 @@
-         ComedyCentralIE(),
-         EscapistIE(),
-         CollegeHumorIE(),
--        XVideosIE(),
-         SoundcloudSetIE(),
-         SoundcloudIE(),
-         InfoQIE(),
-@@ -98,10 +90,6 @@
-         StanfordOpenClassroomIE(),
-         MTVIE(),
-         YoukuIE(),
--        XNXXIE(),
--        YouJizzIE(),
--        PornotubeIE(),
--        YouPornIE(),
-         GooglePlusIE(),
-         ArteTvIE(),
-         NBAIE(),
-@@ -121,13 +109,11 @@
-         ZDFIE(),
-         TumblrIE(),
-         BandcampIE(),
--        RedTubeIE(),
-         InaIE(),
-         HowcastIE(),
-         VineIE(),
-         FlickrIE(),
-         TeamcocoIE(),
--        XHamsterIE(),
-         HypemIE(),
-         Vbox7IE(),
-         GametrailersIE(),
diff --git a/net-misc/youtube-dl/youtube-dl-2013.05.23.ebuild b/net-misc/youtube-dl/youtube-dl-2013.05.23.ebuild
deleted file mode 100644
index d4851849194f..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2013.05.23.ebuild
+++ /dev/null
@@ -1,35 +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/youtube-dl/youtube-dl-2013.05.23.ebuild,v 1.6 2013/06/25 10:32:48 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=(python{2_5,2_6,2_7})
-
-inherit bash-completion-r1 eutils python-single-r1
-
-DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
-HOMEPAGE="http://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="offensive test"
-
-DEPEND="test? ( dev-python/nose[coverage(+)] )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	use offensive || epatch "${FILESDIR}"/${PN}-2013.05.10-offensive.patch
-}
-
-src_install() {
-	rm -vf youtube_dl/*.py[co]
-	python_domodule youtube_dl
-	dobin bin/${PN}
-	dodoc CHANGELOG README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}