Version bump, remove older unstable

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

8 files changed, 25 insertions, 450 deletions

diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog
index c84736caa8ee..ec4955b442f0 100644
--- a/net-p2p/tribler/ChangeLog
+++ b/net-p2p/tribler/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/tribler
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.38 2012/10/30 23:48:55 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.39 2012/12/08 21:01:16 blueness Exp $
+
+*tribler-6.0.3 (08 Dec 2012)
+
+  08 Dec 2012; Anthony G. Basile <blueness@gentoo.org> +tribler-6.0.3.ebuild,
+  -tribler-5.9.27.ebuild, -tribler-5.9.28.ebuild, -tribler-5.9.29.ebuild,
+  -tribler-5.9.30.ebuild, -tribler-6.0.0.ebuild, -tribler-6.0.1.ebuild:
+  Version bump, remove older unstable
 
 *tribler-6.0.2 (30 Oct 2012)
 
diff --git a/net-p2p/tribler/Manifest b/net-p2p/tribler/Manifest
index c9db6a6c173a..fa9064066da8 100644
--- a/net-p2p/tribler/Manifest
+++ b/net-p2p/tribler/Manifest
@@ -5,32 +5,30 @@ AUX tribler-5.9.12-fix-global-declarations.patch 944 SHA256 499d0f5869b0cf5e30df
 AUX tribler-log2homedir.patch 495 SHA256 2eb5028822b3e50775804386d7ea233868f9a3b8b4c8e56b422f715c60f56f69 SHA512 d518cf8917c89ae6e9ae777230ff2c6914ef6c08390aac7ce599e25941a51bfad3a68f28123916948cfc64a34c3631ad4f82cac6448bc87006e4ee55a4b67137 WHIRLPOOL 1d5158c5b612d71df09c938b07bd74adf6f19b695eeef751939d5af3142b858a14b47b4bfb438c6716b3ed5cae16ec8557a3522fa2424b4f9c1d68293aeed4ff
 DIST tribler-swift_5.9.22-27598_amd64.deb 721744 SHA256 0cc3ffb8729176809f88e86bdad6e381cdbc3dabaf28937f7f2b952311951701 SHA512 88d0155ecf80a26a365ab4959870fc2c4181a9f9e923b8051ef24947fd4cac27380ff467bf255a431fd8d7ca0fe2b8c1650b0cc9f51f50c5b3f69e5f99f8d4da WHIRLPOOL 0a38dd6bb952035b0a688a0736cd44b818e93845e2a704747410685ac6bcf57cf80a00cfe87697e36ad50417ed7cd9d853dc95e37fa9c55e97b9e0deb8676827
 DIST tribler-swift_5.9.22-27598_i386.deb 738614 SHA256 64602cff4df9598d4da1a038729cb8ccd9d63be3a6cd22be286abfcb4e9de063 SHA512 3ef8a7d50cdec29bea4fbfe01e95791473cdb2431c2ff5cbd7af6388b78b31023f33b578e69ebf656298ba790a03d166fa0a9f4240cec347b2e766f127003a94 WHIRLPOOL c09382c558866a6d9418e8d246b7fdc76668dab44d4a5c5247725e821d95e58b60c39df7f9486a85d6231770610f5413a0e9fadb736948743fc482d3d8cb7521
-DIST tribler-swift_5.9.23-27674_amd64.deb 759236 SHA256 6f7872df612777997d0ae13e680d08eee79e100f36f33ac244519897bfe2a67b SHA512 8d9ae7223c737c780229a43435747465ef8decd1b0dee43a9c24f3fee2f81ca71adf12715dde77b97a5e37882756685cca8cd0d7910a6ba8dc867781ee0ad769 WHIRLPOOL 194b92cd505d2f07c9c6d6f8ad26d8df2a5e396061709ea0fcf9756326bfe146a0c7d8e2d9963a95e262c9041c772c928c2a2cee1af64b4fe8d1d64a8e427dc9
-DIST tribler-swift_5.9.23-27674_i386.deb 738614 SHA256 2d65bda27c3bced9ec196124c40ea84ef48baae5b426bd6870939e6c1551352e SHA512 f0c09367ce9bb3d540d9a80ed378f7b6255b54917d6ffb59a6c58cb9ad2b6bf7cec73d565691d77c6b9d5a7c5ff07a57d69c196083648908e0083ccc0f29ed43 WHIRLPOOL 838cc5f08e7b66127ea0c1a60c204dbb55acd98af76f41b4426c53697d2cb69daebc37abcf8507f5c3f768b4af6a924191274a0085d2e89c8dc2bc09ac03735e
 DIST tribler-swift_6.0.0-28795_amd64.deb 718596 SHA256 b3bfe52eebc37539d6adb62f49a439d8794635c10e4d52d66bec663b6abc2467 SHA512 9f9734c2574b6d205e885c0621dcac5f5f3dcd45e1b6764017d6b6aaba5a346c242e44b1d69ea8dc47611cf6993c44e5e0e57bca150c81f5ca5b7635464d7c50 WHIRLPOOL 65933467ab002f91d1b4f81353170b5c05cec731a91bb89f28dc82fec2edee5f351b16e704a0eab5784111cab8d95670c6dc6d65747da59fbdafdaa20db46abc
 DIST tribler-swift_6.0.0-28795_i386.deb 736976 SHA256 1cd339fbb0b5e1f26c6ee75e2300c423ffe21ef8729e0f2a112a394ebf8469ac SHA512 a6458d49d1fb5c7b5d3db844cc614eaf77f72dca53809529c431e97b8fb5b4dcadce5d45a32a38853dbb4a29a9190a8486ce8ea1d1613637236d8244a312573e WHIRLPOOL fafce3fce9c0e6fcc322973bfb3701aba693a53cb301a236cbde1f5c6a8a0c22e5244f47b3be048803b1f264362a1bd5ac01ca27c1f54f706584cfadf986b040
 DIST tribler_5.9.22-1ubuntu1_all.deb 5875284 SHA256 e917a35cb544c3d357890c0a5a2174196a58dc69684cab7623d108f6dbf58763 SHA512 7823f6ec781a2e01a981f7050e4c3826ccd1b232e5a186822e340dbd795d9d41aadb988c483ea26438c4e04ffbddebfd743be338d1f24bdad73d0c4ffbe5ba96 WHIRLPOOL 955ff346e9352d57ad3ee9af33a98f07a51f02a03211025d41de1f9c315570547833eff42add677caed8ba3dc07f3d9fedc9186d4962f154bcdad1c2189d7e9f
-DIST tribler_5.9.27-1ubuntu1_all.deb 5890792 SHA256 2a1f0bc583ac7ec5ab860f289296128f7f2133a72eb8b75ecd0a1391e3f18b29 SHA512 b2ec99870814555049e554659e0b74bffa3277e1bf2cb98db7922925fe70613ec62f0be45d44ace05904a2f49013a51f75a25221e991129f4c20450c1d77cfec WHIRLPOOL 8f1c636f412f093279c2b393356782ae82f66ef1383b000e18e6d7dad33fc5eea78b21e27052990b696a654583a25d36bdf70053829d1252605dff36a506c28f
-DIST tribler_5.9.28-1ubuntu1_all.deb 5892520 SHA256 a43ff7306dec9c002b37ebfc495f2f649e3397328353431664e7f0fa938dd469 SHA512 807d4be5ba781a665d51db0fef368052df19610b6f0dbd21c09e673558b561338cff0e223089146313a4d8acf84f978585a1f13217ea360636a256261061e548 WHIRLPOOL 151618c99347d8bc77d6a489ec820badf9e33147c1c450b4588a2d65c0705bd429a92043733373e93652cb6331b39e86f45f325574514679eb5807bc1be61da6
-DIST tribler_5.9.29-1ubuntu1_all.deb 5895004 SHA256 887a9c3edcbc5e729d52de4ec7719351e74c2dca6be926ed5ea0f0a504960c72 SHA512 fa8b7cd935340988715a4960290019874018fe2a38d598b2a1ec85636408629622d904563dc9a5871ff13f03ae81277981538278aa6caad5838af381d35ccbe5 WHIRLPOOL 78eddf564e29c8e9044cdacd24bef9d337408a42a5e250e1cdec28159bc577b7e88dd43e6198c83d7b9c4049da7a8851688c9729c1bfa4bce6c6a57743241e3c
-DIST tribler_5.9.30-1ubuntu1_all.deb 5889954 SHA256 d1f5ce7ad924ae3409872ac5ac83ecf0387d33840ae74aa9d4524b64bf089157 SHA512 712ca1a8bf78c5d569fd21bc16f05667729c49bb3e758c9056fdd69e7ca7e7b5bc4be7084d4b8fb98a2e276a3d1477077b157c2f51da4c28862b04ab45e9c6f4 WHIRLPOOL 53cd62480f3b512cedeb0e78dd2e55ed10c243ed9eb81696659cb65926a3a52cf6deee820338caba4aec98b1f8c388a3ba01488e87aedf631a5ed431c63f86c5
-DIST tribler_6.0.0_all.deb 5842992 SHA256 11c1101acaf074f28ff2ebe2c91cf98bb256f18f0b1530cef97d2f6829e4e3f6 SHA512 85ea85146b297c9bb5354eb1a16cc1c7043108abb83b34956f15595666ee362cf6dbfa8a6881f276c8ccb97321788c634dde8c591b6d00cedc9ebd773f68d947 WHIRLPOOL 4d37ef0a0469e42092bae3c96abf933402d767285f3623923af51dfc95f7d775c813b8b8b12aeddf655c5aad7d1d9f4df3cfcac1b8b36a3e16ffa4eb72bc8bf6
-DIST tribler_6.0.1_all.deb 5844330 SHA256 5b8be50edf123f98cf7829efca18d5ce1df293d5b24ae068d83b0a4c5a6cb2a7 SHA512 e4c58e0e9bc76ecba6d8411c49a69731007e1b04dd082de193c647fac3b1a6502df8d8747de9221e32a7ee86d4fed858f01d434997f273046ef97e0dd2826bf2 WHIRLPOOL 5894c7d97b36fdc0cd1ef05306096fe1d2d417078add55cee8b7fc1a9c923b28e343cbc2a5aaae0cc15dfd1d73e8034b9f698a5b7709aaa3f0fc98f1698aaa5b
 DIST tribler_6.0.2_all.deb 5846598 SHA256 8a0a4e8b4b0564ec4c96302fded678d85aef62fdcf0ee0e109cf92ed2b7434b8 SHA512 e8ba600600e5ca3933d88d7d369af56ba567999de3ba445ef38ab8d05b5d4847578604292a197ee1f9f7b566968aec72a5525854612ba2cb4f68845b992bec20 WHIRLPOOL 10e5aa6dc484ff0f8a27e4333b283381dd42c2aee2d7a5af50567fe264ad4c0469775e82401bb5036e5de809c09ccbc480e672f128a50147953c606407f80a18
+DIST tribler_6.0.3_all.deb 5848674 SHA256 bf6173e2162602133e93a0ca06026f33d5a95edcefc57ff41c3a59f14a19e835 SHA512 fc4a165d0ae7460a3805fe4fde86150a21152a7cff92c226186f475d690cf4a7a3366767b1da4119b2222b3b83e8c07c9a1c23300abd0b7e01ea642d0e413551 WHIRLPOOL b13f5dbc2bdf9b980dc1195b77a19aff66f26a9d2d27adfbfa0ccb0373d62fd3c8769d7e64aeb842a7fd5eddb33774129732463f6ad88ec36e520d895465f21f
 EBUILD tribler-5.9.22.ebuild 1840 SHA256 bc7cf39d11f52e180ed49e7b0e793248f20f22e91039c71d7df8abe4325fbd35 SHA512 b6ee6ec2f96aefa92e5a89ae292c5afa0b94e1059059b60ab12a41081c90ed1e63083ec802b8e4456867b2c31c7c8b24bdf7b969a7c789f18a053276e7402597 WHIRLPOOL ef3d4582e34a3c0e27870b42fb9cfdc1eff842a9283ad4fa42f1f0f52b4ef4504fcc648622cf48b6fe6b15ff94fd2df8e2a16ab5da5c1775239cf726ecea00b3
-EBUILD tribler-5.9.27.ebuild 1846 SHA256 242270ceb0dc70489f03ebd0f178aff7e7164f59b3dc6640208797648bf3ba7e SHA512 967f65fe636165cdca93cde0ef5159d9eb3e45b3f6f4c56080252f443eb670866f01c3034b7a6d51bc8f8cd1113919aa9b63b59b4dc2cb69c4efddc935396e9e WHIRLPOOL 2f7ce9793670e5a16a2e8b9a0505d8299229eab36eef764f67ed041cb3b120c704a5d6e9262603aec3ac690e2ee3adeef88aaaba50fcbbe28d330dea688aa05f
-EBUILD tribler-5.9.28.ebuild 1846 SHA256 8bd4043b57b2d342e1479ec4737b5684e560e536f7a86e72c339ac73fd48a242 SHA512 881d032233126b45c50cea79bfb4dbc1460cfb123a605e5b98b20fa600f5fc45e413de9d2df8f8d4c4978b017d33fee0ed8577662b3fae8126300c85d1ee0471 WHIRLPOOL e4e711bd6462616f061fd079f204eb91e6ff0f7e2fac8b9454a7975f00cc24b9fd24ac714ab5da321ce11fbb7e33dbede78b4bd8c45b0fed7f33835eec6414ee
-EBUILD tribler-5.9.29.ebuild 1846 SHA256 8e8cecbf17c53421ff06b9dcbca57013fa56435b522ef52bc9f604c582b8bce3 SHA512 79cf459c96de08d474cabcd7a252db9dffe68a5714c75c7248f296a714f109e2b44b5ce93bd4ca3db34db69bac361f65430ee2cd3d9a58f61380c02e6a500cfd WHIRLPOOL 9254d60f5a8e36e14aabc8f781d1e3a81b237fe687f0f8ad0bab88181b06eaf0d32cdd2200a841e07e1149dea3c3cb75580afb25d6c6e057b7fa14eee5db870a
-EBUILD tribler-5.9.30.ebuild 1846 SHA256 8e8d4b8b8a52710f61bd5b499213a08ffd3b425e3cd8437e3a4d91efb1c99b79 SHA512 7e12a84194ddb2fcf4436079a1bc98bf38927d3428d8f062b237830933b974554881054e413bf1545756187b2953557e6cf3d656b1cb5ad56c264fb9ce43788c WHIRLPOOL a530e6981c0ec5b0b76837a50a3bee311c9dfa1bcca219eaaaac0ce0f38fdbe462be24b434630fd3f5d47ede85b68b041dacddcb7643341ef9f411e43a3c687d
-EBUILD tribler-6.0.0.ebuild 1834 SHA256 d9dddefd78871c6fb8d2e7752dce6c462dbf87adf345b740c9bb3f7fdf38940f SHA512 d0b42593bf8cb9734b80b6225e590e8c22289005ffd659995d9de35666a6823807de0da931c0327ffe41c722bddde9f6407fafdbff8054a261de9de8df62e430 WHIRLPOOL 48283dd93fa17058906e7039afa429d67fed2db480ea2ef4715367dd37feec7d18c54f9201dc6c92ac985e24f4a47d34ee687e5d5f7c786b4b08af9aec1d8dc0
-EBUILD tribler-6.0.1.ebuild 1834 SHA256 63b3989eff81baf0c3227645917a9efbae209cbe7ff89570d779bad719b4f19b SHA512 52fff57db8dabf9e81764bb7c4de9ae5c5b5db40a93945716c1b9bbf3c72490666ba370a4afcc31db9ee56e380f63d1c4d3a47b5caf27da58fc27b2d070d77ce WHIRLPOOL 861f543cefa13216e13efc143549ec8cd212d1ab5fb2db112182b18974730a66a7f4f6e30c21d2d4635171d4d1f56d03faa564cae8e0c8b9d705391b9a8a596e
 EBUILD tribler-6.0.2.ebuild 1834 SHA256 a2cb4dfecba9993f75c4677bb2c4bb31293521410c7ca457c3d982ec0a7d99e2 SHA512 22db869431438b05af5485a0b83e9ab54e025849875c4d074774b9a69a9bd6cea93cd8d648003c12d5097b568f828f1762af764fcaea6f0121998a372fce8e86 WHIRLPOOL 17512799f43ad4965b4ec3d125d22fbaed5f029706d4a42346a1794eb6d0a80c0c25b1100b1f0698fe107b29c561c486314b4a8b880e9532fb1c46a378b72d03
-MISC ChangeLog 5814 SHA256 fe2896be402b12ffb77b7a0c3e0a2b39e865d7043eb3c43cc25a2415e8be21f8 SHA512 b383a32e4ede69232450c99c9e646ab8d080fa579b61ceead4d755c491ba5e24dd963d08d889cc7fc5782ce990427c164daea41441b6a0755498e497aa02c154 WHIRLPOOL 173b16771bc35e689362e1d107209ae9899d9e1d99b3975d2fe45268fdea726342dfddf4ea7940b923ad1485e59413961b862eee7064e8381ffdde52b61b5553
+EBUILD tribler-6.0.3.ebuild 1834 SHA256 f8218153f6960dc247cd9d2c1330386f17fd925230c6ea277653734051becf63 SHA512 af27a28368fc84237adbe769ec81bdad96c96c4311300bba53a49997d4ce1968c1c7a9b766ba290b26893c862cd5cb049bb9ef95bd6a4184f027e82707e720a0 WHIRLPOOL bda3de35bc84c37508e0c43ee67fc705537682b283552bb5562a60e1cdac83caaf1a87b83d1363765f9a535574194df8bf8a85e79124b14b3bedce6c2b1cc9b5
+MISC ChangeLog 6107 SHA256 cc4ea8a2343ec2b5f83dc9eaf0b41752f626c133f6f6fedbbd49fa332be9c029 SHA512 630fb9d570063902a3a108c0b7eeb3ddfc053fb1fc9c11a48a9f80c25b9ccfe108be3a62adc628d43a7c3ac88baf2cc26355d1bde63dd7d4617e67fdb3363974 WHIRLPOOL 518488870ef6b2e39f89c65451294885ec20922570a4021652b5bacbc9edb3b4aac9698b14a7bac1acbca73605b3a83108ccf1a375097442366930b0d15e1877
 MISC metadata.xml 456 SHA256 de4487feb43cb09d85bf841828694e1c01ea93c405421a45654cdb14569593b9 SHA512 ff5df2f76626de16e50cdf2b48eb797a07de5db9f0c7aec5d00c1ba21b42e1beaf9aeb0f91fdea9d202109b94bb4d6a28ba630f5ff81eca73ba60ded527f7940 WHIRLPOOL 3d1bd66e56c68b1f2f579ad047f3bdd6cc59fb095f2008d07b062f32f408123c217f0be82f89345a14dae7256a9c176bb28a8af563a9fb8e34d17828cccd21bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCQZ2wACgkQl5yvQNBFVTUS7gCfbQ/Z/02a+q1rPiMdejR1owE/
-2u8Anjc/VGPfwnVP1jj5BtxYlGhgvRrN
-=MviZ
+iQIcBAEBCAAGBQJQw6qgAAoJEJOE+m71LUu6YcEQAKAI2S7xyYqi//aB8Y4e5N0f
+/olxckIU/+PXbnUj6j78+bsk0cDZFTMOv6iVxreXfmgIOnmvBsRZUtwSZCXLK89u
+UHM+z63QFxTmz0q/CGdZB/pnfUGSTX3tFyzsxl46FERLwOiHEo5eCqUXOZmFCstG
+JUZj/b+dmxu8DECUFj6zfHf1t1Q7AruLGDRL990QTLbBesEVD7c8nWB2OcP/gW2m
+RtRsl9TIpXdx0hIQFxhydVUpphWZC6RJ1EdK6z2egvemq4CJHo4I+cH/dhwVrUGJ
+PlSVSlucAJNNT36zbYhJxBSIoafqvwIfEFAezpgz82DD12WQyjj1d0OOfhNT1pAL
+LqLyGq39rNbm9SzqIAu+R8i85zrOPCiSDarvC2mO4y80q136Ov/9VmU6bzBzZPim
+YIRMPQS8iGLqVyrmH75n/8QblwUjk1VFGwD5Z3bnLMFHs1krlvjD7qV37CFvlelL
+qb63+pQqOHNFKpo8ZdW0mAryuorpbQ7AD/DDBdRLJczZ95uxvIc09tVVqjbOfmH6
+BJfFpTYvU0a7lg2jgCDXTg/dQF0JHvfCkRV8U++X48B6VFWTrXPJJAAr7XOgWU2D
+/IIgnEyeZRwU41m0aPIO9bn83tYP7h9Kp7D87nD2g+OI2aT7no92cqK4YXl08fEX
+s2y4D0ftxVsyzTMlvTnj
+=AuYa
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/tribler/tribler-5.9.27.ebuild b/net-p2p/tribler/tribler-5.9.27.ebuild
deleted file mode 100644
index 099e9f4566df..000000000000
--- a/net-p2p/tribler/tribler-5.9.27.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-5.9.27.ebuild,v 1.1 2012/08/05 13:40:25 blueness Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite"
-
-inherit eutils python
-
-MY_PV="${PN}_${PV}-1ubuntu1_all"
-
-DESCRIPTION="Bittorrent client that does not require a website to discover content"
-HOMEPAGE="http://www.tribler.org/"
-SRC_URI="
-	http://dl.tribler.org/${MY_PV}.deb
-	x86?   ( http://dl.tribler.org/tribler-swift_5.9.23-27674_i386.deb )
-	amd64? ( http://dl.tribler.org/tribler-swift_5.9.23-27674_amd64.deb )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vlc"
-
-RDEPEND="
-	dev-python/apsw
-	dev-python/m2crypto
-	dev-python/netifaces
-	dev-libs/openssl
-	dev-python/wxpython
-	vlc? (
-			media-video/vlc
-			media-video/ffmpeg
-		)"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/share/tribler/swift"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	for i in ${A}; do
-		unpack ${i}
-		unpack ./data.tar.gz
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.9.12-fix-global-declarations.patch"
-	epatch "${FILESDIR}/${PN}-log2homedir.patch"
-
-	python_convert_shebangs -r 2 .
-}
-
-src_compile() { :; }
-
-src_install() {
-	#Rename the doc dir properly
-	mv usr/share/doc/${PN} usr/share/doc/${P}
-
-	#Move the readme to the doc dir
-	mv usr/share/${PN}/Tribler/readme.txt usr/share/doc/${P}
-
-	#Remove the licenses scattered throughout
-	rm usr/share/doc/${P}/copyright
-	rm usr/share/${PN}/Tribler/*.txt
-	rm usr/share/${PN}/Tribler/Core/DecentralizedTracking/pymdht/{LGPL-2.1.txt,LICENSE.txt}
-
-	#Copy the rest over
-	cp -pPR usr/ "${ED}"/
-}
-
-pkg_postinst() {
-	python_mod_optimize "${ROOT}"usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${ROOT}"usr/share/${PN}
-}
diff --git a/net-p2p/tribler/tribler-5.9.28.ebuild b/net-p2p/tribler/tribler-5.9.28.ebuild
deleted file mode 100644
index 596c50237bf5..000000000000
--- a/net-p2p/tribler/tribler-5.9.28.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-5.9.28.ebuild,v 1.1 2012/08/23 14:58:57 blueness Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite"
-
-inherit eutils python
-
-MY_PV="${PN}_${PV}-1ubuntu1_all"
-
-DESCRIPTION="Bittorrent client that does not require a website to discover content"
-HOMEPAGE="http://www.tribler.org/"
-SRC_URI="
-	http://dl.tribler.org/${MY_PV}.deb
-	x86?   ( http://dl.tribler.org/tribler-swift_5.9.23-27674_i386.deb )
-	amd64? ( http://dl.tribler.org/tribler-swift_5.9.23-27674_amd64.deb )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vlc"
-
-RDEPEND="
-	dev-python/apsw
-	dev-python/m2crypto
-	dev-python/netifaces
-	dev-libs/openssl
-	dev-python/wxpython
-	vlc? (
-			media-video/vlc
-			media-video/ffmpeg
-		)"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/share/tribler/swift"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	for i in ${A}; do
-		unpack ${i}
-		unpack ./data.tar.gz
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.9.12-fix-global-declarations.patch"
-	epatch "${FILESDIR}/${PN}-log2homedir.patch"
-
-	python_convert_shebangs -r 2 .
-}
-
-src_compile() { :; }
-
-src_install() {
-	#Rename the doc dir properly
-	mv usr/share/doc/${PN} usr/share/doc/${P}
-
-	#Move the readme to the doc dir
-	mv usr/share/${PN}/Tribler/readme.txt usr/share/doc/${P}
-
-	#Remove the licenses scattered throughout
-	rm usr/share/doc/${P}/copyright
-	rm usr/share/${PN}/Tribler/*.txt
-	rm usr/share/${PN}/Tribler/Core/DecentralizedTracking/pymdht/{LGPL-2.1.txt,LICENSE.txt}
-
-	#Copy the rest over
-	cp -pPR usr/ "${ED}"/
-}
-
-pkg_postinst() {
-	python_mod_optimize "${ROOT}"usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${ROOT}"usr/share/${PN}
-}
diff --git a/net-p2p/tribler/tribler-5.9.29.ebuild b/net-p2p/tribler/tribler-5.9.29.ebuild
deleted file mode 100644
index ee23618a69fb..000000000000
--- a/net-p2p/tribler/tribler-5.9.29.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-5.9.29.ebuild,v 1.1 2012/08/29 23:09:49 blueness Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite"
-
-inherit eutils python
-
-MY_PV="${PN}_${PV}-1ubuntu1_all"
-
-DESCRIPTION="Bittorrent client that does not require a website to discover content"
-HOMEPAGE="http://www.tribler.org/"
-SRC_URI="
-	http://dl.tribler.org/${MY_PV}.deb
-	x86?   ( http://dl.tribler.org/tribler-swift_5.9.23-27674_i386.deb )
-	amd64? ( http://dl.tribler.org/tribler-swift_5.9.23-27674_amd64.deb )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vlc"
-
-RDEPEND="
-	dev-python/apsw
-	dev-python/m2crypto
-	dev-python/netifaces
-	dev-libs/openssl
-	dev-python/wxpython
-	vlc? (
-			media-video/vlc
-			media-video/ffmpeg
-		)"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/share/tribler/swift"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	for i in ${A}; do
-		unpack ${i}
-		unpack ./data.tar.gz
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.9.12-fix-global-declarations.patch"
-	epatch "${FILESDIR}/${PN}-log2homedir.patch"
-
-	python_convert_shebangs -r 2 .
-}
-
-src_compile() { :; }
-
-src_install() {
-	#Rename the doc dir properly
-	mv usr/share/doc/${PN} usr/share/doc/${P}
-
-	#Move the readme to the doc dir
-	mv usr/share/${PN}/Tribler/readme.txt usr/share/doc/${P}
-
-	#Remove the licenses scattered throughout
-	rm usr/share/doc/${P}/copyright
-	rm usr/share/${PN}/Tribler/*.txt
-	rm usr/share/${PN}/Tribler/Core/DecentralizedTracking/pymdht/{LGPL-2.1.txt,LICENSE.txt}
-
-	#Copy the rest over
-	cp -pPR usr/ "${ED}"/
-}
-
-pkg_postinst() {
-	python_mod_optimize "${ROOT}"usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${ROOT}"usr/share/${PN}
-}
diff --git a/net-p2p/tribler/tribler-5.9.30.ebuild b/net-p2p/tribler/tribler-5.9.30.ebuild
deleted file mode 100644
index 03a1a8849d44..000000000000
--- a/net-p2p/tribler/tribler-5.9.30.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-5.9.30.ebuild,v 1.1 2012/09/13 00:05:20 blueness Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite"
-
-inherit eutils python
-
-MY_PV="${PN}_${PV}-1ubuntu1_all"
-
-DESCRIPTION="Bittorrent client that does not require a website to discover content"
-HOMEPAGE="http://www.tribler.org/"
-SRC_URI="
-	http://dl.tribler.org/${MY_PV}.deb
-	x86?   ( http://dl.tribler.org/tribler-swift_5.9.23-27674_i386.deb )
-	amd64? ( http://dl.tribler.org/tribler-swift_5.9.23-27674_amd64.deb )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vlc"
-
-RDEPEND="
-	dev-python/apsw
-	dev-python/m2crypto
-	dev-python/netifaces
-	dev-libs/openssl
-	dev-python/wxpython
-	vlc? (
-			media-video/vlc
-			media-video/ffmpeg
-		)"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/share/tribler/swift"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	for i in ${A}; do
-		unpack ${i}
-		unpack ./data.tar.gz
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.9.12-fix-global-declarations.patch"
-	epatch "${FILESDIR}/${PN}-log2homedir.patch"
-
-	python_convert_shebangs -r 2 .
-}
-
-src_compile() { :; }
-
-src_install() {
-	#Rename the doc dir properly
-	mv usr/share/doc/${PN} usr/share/doc/${P}
-
-	#Move the readme to the doc dir
-	mv usr/share/${PN}/Tribler/readme.txt usr/share/doc/${P}
-
-	#Remove the licenses scattered throughout
-	rm usr/share/doc/${P}/copyright
-	rm usr/share/${PN}/Tribler/*.txt
-	rm usr/share/${PN}/Tribler/Core/DecentralizedTracking/pymdht/{LGPL-2.1.txt,LICENSE.txt}
-
-	#Copy the rest over
-	cp -pPR usr/ "${ED}"/
-}
-
-pkg_postinst() {
-	python_mod_optimize "${ROOT}"usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${ROOT}"usr/share/${PN}
-}
diff --git a/net-p2p/tribler/tribler-6.0.1.ebuild b/net-p2p/tribler/tribler-6.0.1.ebuild
deleted file mode 100644
index 8911a538d61e..000000000000
--- a/net-p2p/tribler/tribler-6.0.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.0.1.ebuild,v 1.1 2012/10/18 23:24:20 blueness Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite"
-
-inherit eutils python
-
-MY_PV="${PN}_${PV}_all"
-
-DESCRIPTION="Bittorrent client that does not require a website to discover content"
-HOMEPAGE="http://www.tribler.org/"
-SRC_URI="
-	http://dl.tribler.org/${MY_PV}.deb
-	x86?   ( http://dl.tribler.org/tribler-swift_6.0.0-28795_i386.deb )
-	amd64? ( http://dl.tribler.org/tribler-swift_6.0.0-28795_amd64.deb )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vlc"
-
-RDEPEND="
-	dev-python/apsw
-	dev-python/m2crypto
-	dev-python/netifaces
-	dev-libs/openssl
-	dev-python/wxpython
-	vlc? (
-			media-video/vlc
-			media-video/ffmpeg
-		)"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/share/tribler/swift"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	for i in ${A}; do
-		unpack ${i}
-		unpack ./data.tar.gz
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.9.12-fix-global-declarations.patch"
-	epatch "${FILESDIR}/${PN}-log2homedir.patch"
-
-	python_convert_shebangs -r 2 .
-}
-
-src_compile() { :; }
-
-src_install() {
-	#Rename the doc dir properly
-	mv usr/share/doc/${PN} usr/share/doc/${P}
-
-	#Move the readme to the doc dir
-	mv usr/share/${PN}/Tribler/readme.txt usr/share/doc/${P}
-
-	#Remove the licenses scattered throughout
-	rm usr/share/doc/${P}/copyright
-	rm usr/share/${PN}/Tribler/*.txt
-	rm usr/share/${PN}/Tribler/Core/DecentralizedTracking/pymdht/{LGPL-2.1.txt,LICENSE.txt}
-
-	#Copy the rest over
-	cp -pPR usr/ "${ED}"/
-}
-
-pkg_postinst() {
-	python_mod_optimize "${ROOT}"usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${ROOT}"usr/share/${PN}
-}
diff --git a/net-p2p/tribler/tribler-6.0.0.ebuild b/net-p2p/tribler/tribler-6.0.3.ebuild
index 1c214c44362e..e8f4e480d192 100644
--- a/net-p2p/tribler/tribler-6.0.0.ebuild
+++ b/net-p2p/tribler/tribler-6.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.0.0.ebuild,v 1.1 2012/10/13 16:10:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-6.0.3.ebuild,v 1.1 2012/12/08 21:01:16 blueness Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"