Version bump

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

3 files changed, 100 insertions, 6 deletions

diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog
index 576c39704867..5f8ddabe0cf9 100644
--- a/net-p2p/tribler/ChangeLog
+++ b/net-p2p/tribler/ChangeLog
@@ -1,6 +1,11 @@
 # 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.35 2012/09/13 00:05:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.36 2012/10/13 16:10:49 blueness Exp $
+
+*tribler-6.0.0 (13 Oct 2012)
+
+  13 Oct 2012; Anthony G. Basile <blueness@gentoo.org> +tribler-6.0.0.ebuild:
+  Version bump
 
 *tribler-5.9.30 (13 Sep 2012)
 
@@ -171,4 +176,3 @@
   10 Feb 2012; Anthony G. Basile <blueness@gentoo.org> +tribler-5.5.10.ebuild,
   +metadata.xml:
   Initial commit
-
diff --git a/net-p2p/tribler/Manifest b/net-p2p/tribler/Manifest
index cf70a7eadafa..c95627c0d36d 100644
--- a/net-p2p/tribler/Manifest
+++ b/net-p2p/tribler/Manifest
@@ -7,22 +7,26 @@ DIST tribler-swift_5.9.22-27598_amd64.deb 721744 SHA256 0cc3ffb8729176809f88e86b
 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
 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
-MISC ChangeLog 5443 SHA256 3e15f8b86d41c94d2d808f90de3504dccef8a409d302becf7dfab0952abc45fc SHA512 a0844c77e1bf43d155db446b53813c554fbdc60c14358bf727e2de8ea6136c6b0b19eb28511056f7c92eecc1b4e113b0e8d4186f8515a46d6613272772c1f920 WHIRLPOOL 12779b734ee69ca62f30acccb5886a70ef514d6c936bc8ac5f2d54f35046ef2fc8264ce595707ec1f4624996fb3d50296782da1b233cca24d6733dc4601c6bab
+EBUILD tribler-6.0.0.ebuild 1834 SHA256 d9dddefd78871c6fb8d2e7752dce6c462dbf87adf345b740c9bb3f7fdf38940f SHA512 d0b42593bf8cb9734b80b6225e590e8c22289005ffd659995d9de35666a6823807de0da931c0327ffe41c722bddde9f6407fafdbff8054a261de9de8df62e430 WHIRLPOOL 48283dd93fa17058906e7039afa429d67fed2db480ea2ef4715367dd37feec7d18c54f9201dc6c92ac985e24f4a47d34ee687e5d5f7c786b4b08af9aec1d8dc0
+MISC ChangeLog 5566 SHA256 95b663f87f4f0b5c28faeb35a9aaa198ec15c28543f2475a84803d7b64e96765 SHA512 3ce67b79f362cbd5c7a84167b436703194d3796983b1777a1972b241b83a368cb7b2d6e5af1031c37415a3464dcdfb76a060790a1c3c2d7f45c901742430d9ad WHIRLPOOL ead7a6761c787583438bb2ad0e1053596aa8b106e3d596073795c7f2e72edd7695fe66abcb961edee918e1212ebe8def2e1978ced9748fba0f8fe880560b8626
 MISC metadata.xml 456 SHA256 de4487feb43cb09d85bf841828694e1c01ea93c405421a45654cdb14569593b9 SHA512 ff5df2f76626de16e50cdf2b48eb797a07de5db9f0c7aec5d00c1ba21b42e1beaf9aeb0f91fdea9d202109b94bb4d6a28ba630f5ff81eca73ba60ded527f7940 WHIRLPOOL 3d1bd66e56c68b1f2f579ad047f3bdd6cc59fb095f2008d07b062f32f408123c217f0be82f89345a14dae7256a9c176bb28a8af563a9fb8e34d17828cccd21bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBRIykACgkQl5yvQNBFVTXJxwCgi+gCOajHqecA9bdEQwLtsyGI
-22YAn1xgLLCeXWT3mb4zVRerr0a5BIzb
-=CwC9
+iEYEAREIAAYFAlB5klEACgkQl5yvQNBFVTUMzACdHWmBuqLE3TXRvM65uCLFn+J4
+4PYAoJIyqcqggOo+YvJctdMQs0XBZObp
+=RS0F
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/tribler/tribler-6.0.0.ebuild b/net-p2p/tribler/tribler-6.0.0.ebuild
new file mode 100644
index 000000000000..1c214c44362e
--- /dev/null
+++ b/net-p2p/tribler/tribler-6.0.0.ebuild
@@ -0,0 +1,86 @@
+# 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 $
+
+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}
+}