Version bump

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

3 files changed, 98 insertions, 5 deletions

diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog
index 88e5f067db22..c84736caa8ee 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.37 2012/10/18 23:24:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.38 2012/10/30 23:48:55 blueness Exp $
+
+*tribler-6.0.2 (30 Oct 2012)
+
+  30 Oct 2012; Anthony G. Basile <blueness@gentoo.org> +tribler-6.0.2.ebuild:
+  Version bump
 
 *tribler-6.0.1 (18 Oct 2012)
 
diff --git a/net-p2p/tribler/Manifest b/net-p2p/tribler/Manifest
index 637bb5dab69c..c9db6a6c173a 100644
--- a/net-p2p/tribler/Manifest
+++ b/net-p2p/tribler/Manifest
@@ -16,6 +16,7 @@ DIST tribler_5.9.29-1ubuntu1_all.deb 5895004 SHA256 887a9c3edcbc5e729d52de4ec771
 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
 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
@@ -23,12 +24,13 @@ EBUILD tribler-5.9.29.ebuild 1846 SHA256 8e8cecbf17c53421ff06b9dcbca57013fa56435
 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
-MISC ChangeLog 5690 SHA256 e0276ce4207e7196901c172cc8ddbf2a5e91662ef69d41c525aa0160606c7724 SHA512 a6aacb7f86ed85540f3ee07ae0b270d4393ef24dc4265eecc20c2aba9e361037efa44c9f607476126dbe2b9737131c6120556704ab66736f5175dc02f7a44a8e WHIRLPOOL a2c4d072dff8dd70b21d0472325e9739351f080ba262831eb66e58f93812e00154dd2509cbced754074f32a9d9455d6ed8e5378722be2e7cf48f4c300f665bb2
+EBUILD tribler-6.0.2.ebuild 1834 SHA256 a2cb4dfecba9993f75c4677bb2c4bb31293521410c7ca457c3d982ec0a7d99e2 SHA512 22db869431438b05af5485a0b83e9ab54e025849875c4d074774b9a69a9bd6cea93cd8d648003c12d5097b568f828f1762af764fcaea6f0121998a372fce8e86 WHIRLPOOL 17512799f43ad4965b4ec3d125d22fbaed5f029706d4a42346a1794eb6d0a80c0c25b1100b1f0698fe107b29c561c486314b4a8b880e9532fb1c46a378b72d03
+MISC ChangeLog 5814 SHA256 fe2896be402b12ffb77b7a0c3e0a2b39e865d7043eb3c43cc25a2415e8be21f8 SHA512 b383a32e4ede69232450c99c9e646ab8d080fa579b61ceead4d755c491ba5e24dd963d08d889cc7fc5782ce990427c164daea41441b6a0755498e497aa02c154 WHIRLPOOL 173b16771bc35e689362e1d107209ae9899d9e1d99b3975d2fe45268fdea726342dfddf4ea7940b923ad1485e59413961b862eee7064e8381ffdde52b61b5553
 MISC metadata.xml 456 SHA256 de4487feb43cb09d85bf841828694e1c01ea93c405421a45654cdb14569593b9 SHA512 ff5df2f76626de16e50cdf2b48eb797a07de5db9f0c7aec5d00c1ba21b42e1beaf9aeb0f91fdea9d202109b94bb4d6a28ba630f5ff81eca73ba60ded527f7940 WHIRLPOOL 3d1bd66e56c68b1f2f579ad047f3bdd6cc59fb095f2008d07b062f32f408123c217f0be82f89345a14dae7256a9c176bb28a8af563a9fb8e34d17828cccd21bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCAj2gACgkQl5yvQNBFVTUhDgCfXfpWft3zS67wNlRdmjIFKPQ2
-RtwAn2OIsW+6qsN638VVss7DLa96a9zR
-=RC9B
+iEYEAREIAAYFAlCQZ2wACgkQl5yvQNBFVTUS7gCfbQ/Z/02a+q1rPiMdejR1owE/
+2u8Anjc/VGPfwnVP1jj5BtxYlGhgvRrN
+=MviZ
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/tribler/tribler-6.0.2.ebuild b/net-p2p/tribler/tribler-6.0.2.ebuild
new file mode 100644
index 000000000000..e3c6f7cb1101
--- /dev/null
+++ b/net-p2p/tribler/tribler-6.0.2.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.2.ebuild,v 1.1 2012/10/30 23:48:55 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}
+}