Version bump

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

3 files changed, 92 insertions, 5 deletions

diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog
index 2260d2ed3636..fd12466b5269 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.20 2012/06/28 11:21:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.21 2012/06/29 18:48:48 blueness Exp $
+
+*tribler-5.9.18 (29 Jun 2012)
+
+  29 Jun 2012; Anthony G. Basile <blueness@gentoo.org> +tribler-5.9.18.ebuild:
+  Version bump
 
 *tribler-5.9.17 (28 Jun 2012)
 
diff --git a/net-p2p/tribler/Manifest b/net-p2p/tribler/Manifest
index 8aad3e7c414e..2b3a6f52e07c 100644
--- a/net-p2p/tribler/Manifest
+++ b/net-p2p/tribler/Manifest
@@ -10,17 +10,19 @@ DIST tribler_5.9.13-1ubuntu1_all.deb 2813762 RMD160 3c4a951e4b6e473a0ae5924a245a
 DIST tribler_5.9.14-1ubuntu1_all.deb 2795918 RMD160 30dc964aed51e62ba901050085cb999e5d1da9ff SHA1 3dd9b7092f3fa8b15129b40118ee5d2a13865482 SHA256 0f456635e5ebc91326207e6320fa425ac4f61761026de015f39cd7e4b14c5808
 DIST tribler_5.9.15-1ubuntu1_all.deb 2796398 RMD160 785a8973c136d2a2c96b02e890510a632fa98750 SHA1 18163b98ea32c56af5a96b8dfb325065062d2605 SHA256 d1f58f0bfc58ca97f5ebb770b831185653591197fb083c63434a4e5723f656ff
 DIST tribler_5.9.17-1ubuntu1_all.deb 5879150 RMD160 15e9fda75a13b670ef4a49ef824fdf67ab125f15 SHA1 c219c0efb253b12b81a59ce8cf2a10533724555e SHA256 b287c011e76fffb54fbd9230efff64202c1fc803ade9173ed9a9634d675bbd70
+DIST tribler_5.9.18-1ubuntu1_all.deb 5879216 RMD160 ca98d1da35732e478d2ed30aa028656a679bc32d SHA1 8555a2df3e64fe778cf9877ba6595cf6f5d68bdf SHA256 0b91e2348ff02e8a2bc5e32ea19b64287b37559fd740f12ea5a9b07e5064a0f5
 EBUILD tribler-5.5.24.ebuild 1764 RMD160 e16213e6800fbe40f5857b502f7d782a02ffe9df SHA1 f1cee628110a9caaec87f05f27acca3195f73b51 SHA256 69451e19f9e807be952afe607653e80f2a27916dc3285d3646455bc2db50913a
 EBUILD tribler-5.9.13.ebuild 1817 RMD160 42d6390ca5e60fb00d620a7aef7a5fbb4e0f60d1 SHA1 67aabce85cf5bb40af95e5716fdc1362b8ba1b70 SHA256 78622f3718511516370dbab7500cdd6256eab18660920d06f1b870110d2cbd8c
 EBUILD tribler-5.9.14.ebuild 1817 RMD160 3fdf0aa5f71fd6216ce31f018a8c177b186f5f80 SHA1 24582d92fac55fedf55f12c98e254d2b22ba34ef SHA256 5ab5d8d6f7620ce127d03d7ec9768609ef207c5e1a992e802652abb4520aa051
 EBUILD tribler-5.9.15.ebuild 1817 RMD160 e3b99cdb6c2cbcdaa895eeb9c4606e7518b2f627 SHA1 5ecfb7518c11baad8a2cd0c08502d3fd2486aba6 SHA256 512f8b9443be66ce1f0c1b231d7d355aba68bbd757aa2e8c12ad8752229edd5b
 EBUILD tribler-5.9.17.ebuild 1785 RMD160 9776a0e655316d27627f6d0be0beb12df7549200 SHA1 2f29211631f6ed9704f883a628dfa620124f700a SHA256 c70439396a7eef7a0a8915a5aa21716e3e0666afae5954bc4dcb84c6a171a729
-MISC ChangeLog 3179 RMD160 6643f6d8f0a9428cd416b9e2194573c0618f6286 SHA1 6f46d3ff909ae6ff86a53bef68cb0d6862d15be5 SHA256 67bc6493323652f014db9b3199684155b53af8cbed04ae66b897d9387d1504d1
+EBUILD tribler-5.9.18.ebuild 1785 RMD160 a6039539886cb74d402f5d04988e3cd07e7d3609 SHA1 ae35678da2f0da1b84bc890cc633a3ed6c3a3a4d SHA256 eb70b9c46ffb5b617cb5bbaff75c2833a77472b1abe4addb8b0bcc93797bd4a3
+MISC ChangeLog 3305 RMD160 26633b628c9177474ec924c3c5ed9e4ed96bf5a7 SHA1 e74a2f8b4abfb6839c0dbda77bd11221ea18e993 SHA256 8deb1f72c04d1bea86c934b5b264de46e61c49cd39cf935da91a3fb2989de0fd
 MISC metadata.xml 456 RMD160 c23da6949f1a748719d924a5c998efbdee63847a SHA1 83c4d741970af014737f6bfcb2a6791867b56be5 SHA256 de4487feb43cb09d85bf841828694e1c01ea93c405421a45654cdb14569593b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAk/sPlIACgkQl5yvQNBFVTWPQQCfedhk1aXTq0SKIJzore7q8z9D
-HE8AoKO62qHt6wCMovpM3S8xQMKwKa3T
-=UHJM
+iEYEAREIAAYFAk/t+JkACgkQl5yvQNBFVTVhuACfeha+lXSzINnuMwq68KyvQOdF
+eiUAn17IZe1Wo5J5dtqfyiZjpfN5OClY
+=Lyg+
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/tribler/tribler-5.9.18.ebuild b/net-p2p/tribler/tribler-5.9.18.ebuild
new file mode 100644
index 000000000000..52dbe2df7608
--- /dev/null
+++ b/net-p2p/tribler/tribler-5.9.18.ebuild
@@ -0,0 +1,80 @@
+# 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.18.ebuild,v 1.1 2012/06/29 18:48:48 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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vlc"
+
+RDEPEND="
+	>=dev-python/apsw-3.6
+	>=dev-python/m2crypto-0.16
+	dev-python/netifaces
+	>=dev-libs/openssl-0.9.8
+	>=dev-python/wxpython-2.8
+	vlc? ( >=media-video/vlc-1.1.0 )"
+
+# Skipping for now:
+# xulrunner-sdk >= 1.9.1.5 < 1.9.2 (optional, to run SwarmTransport)
+# 7-Zip >= 4.6.5 (optional, to build SwarmTransport)
+
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	unpack ./data.tar.gz
+}
+
+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}
+}