Version bump

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

3 files changed, 98 insertions, 5 deletions

diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog
index 780a80b389b3..7f7d535614c5 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.27 2012/07/31 23:08:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.28 2012/08/02 19:19:48 blueness Exp $
+
+*tribler-5.9.25 (02 Aug 2012)
+
+  02 Aug 2012; Anthony G. Basile <blueness@gentoo.org> +tribler-5.9.25.ebuild:
+  Version bump
 
 *tribler-5.9.24 (31 Jul 2012)
 
diff --git a/net-p2p/tribler/Manifest b/net-p2p/tribler/Manifest
index 8ad0caa278fb..8745372db211 100644
--- a/net-p2p/tribler/Manifest
+++ b/net-p2p/tribler/Manifest
@@ -9,14 +9,16 @@ DIST tribler-swift_5.9.23-27674_amd64.deb 759236 SHA256 6f7872df612777997d0ae13e
 DIST tribler-swift_5.9.23-27674_i386.deb 738614 SHA256 2d65bda27c3bced9ec196124c40ea84ef48baae5b426bd6870939e6c1551352e SHA512 f0c09367ce9bb3d540d9a80ed378f7b6255b54917d6ffb59a6c58cb9ad2b6bf7cec73d565691d77c6b9d5a7c5ff07a57d69c196083648908e0083ccc0f29ed43 WHIRLPOOL 838cc5f08e7b66127ea0c1a60c204dbb55acd98af76f41b4426c53697d2cb69daebc37abcf8507f5c3f768b4af6a924191274a0085d2e89c8dc2bc09ac03735e
 DIST tribler_5.9.22-1ubuntu1_all.deb 5875284 SHA256 e917a35cb544c3d357890c0a5a2174196a58dc69684cab7623d108f6dbf58763 SHA512 7823f6ec781a2e01a981f7050e4c3826ccd1b232e5a186822e340dbd795d9d41aadb988c483ea26438c4e04ffbddebfd743be338d1f24bdad73d0c4ffbe5ba96 WHIRLPOOL 955ff346e9352d57ad3ee9af33a98f07a51f02a03211025d41de1f9c315570547833eff42add677caed8ba3dc07f3d9fedc9186d4962f154bcdad1c2189d7e9f
 DIST tribler_5.9.24-1ubuntu1_all.deb 5888334 SHA256 4623035ceec69d138a46d0947e8eef3383546b54c1d0eec0970098db67d4fe9f SHA512 942abdc3d1d832381745af96cada276a8dddb248a8940f19d0fadf1d1b7899c1703416f411ed5129879c7d254507a2d72ee7162753e6c89af4503851f83dc641 WHIRLPOOL fd0badae5e6eded404cf7ad9f8730710339b2f284bad4328052de1bc4069683fb8ff55b6a6adde501d70da063c6f62c78adb6b54331f3bbaa8cb41515c6f1616
+DIST tribler_5.9.25-1ubuntu1_all.deb 5890042 SHA256 2444c101e4d077ce188c7dfdbb3ac3927d253bc4c29740322dd88b5b0eab36ae SHA512 dca8efd81a4f4685effe8b2182ac1bdee9f4849a3960d5bc365424341598cf5c84af64c81b2a389889f8df9ff07dd9fdb082e2c913ffb046a559c2fbd38b510a WHIRLPOOL 82552155230f36d72fdd26d41cbe43edbac36bef966e498d130aba465c9107e59a571be347960df490946fb861d0282b895807eb1810470059e29bb6107ccb64
 EBUILD tribler-5.9.22.ebuild 1846 SHA256 a0e5fce33105d1deef6bda286cb08e40fb0f5a162338636670231f8f9c01c807 SHA512 ebc23f1f591a9106f2ac04ea92637701136dd6f79642b11b88bbb9d368b18d95bbb6cb672d1d5930464be11997d072d2070006762d52a8fbb7781c750b6934a8 WHIRLPOOL f4cf1096059f4ec0a79946b63688f7c8a51a43b17966759c46d57c86c43cac33bdd9c0bc3f02c3a9469af30fb72ceed4afa32b080c312f374231420ff20ef296
 EBUILD tribler-5.9.24.ebuild 1846 SHA256 d173909c1dd13ca238b5201f1f8da57c6bfc4a09331e18646e99ed3ff5a0a323 SHA512 0b29ee6448081f2f10c5ce25d2ea2d339362094cc3e83ee0e8915b4630cc4e3f38f37e2f9476c925ad3e33616b205039543acca449aa2a64a550ad2baa295035 WHIRLPOOL 5ae79dd753fba03dcf20ca3814a836473b2e2ea352f3edd3e1d31ca3effb2514b39fb5db6a8bae17a5ff26609f11bb37d4ba264356058e4829cae5e151781680
-MISC ChangeLog 4347 SHA256 8b1c5beac86b288d4c5579ea6a43ffc269ce0ae008b93634a768cc328d536838 SHA512 6430edf83c837dcc555f54fe0dfbdcda0b8305d2f53a7ef94e6597fd88cf45bc5101b00231642e62f472f383a4fd1fed7213413e256e43e02588ecafda91eb68 WHIRLPOOL 8f4728758d2338eba5335e67684ab8d49e657b8eb05e7ae4519929cde9fc485711a312493e9dfbde7c96208d0bf8aebcd40d42f0c562b8144e45b38c2a805964
+EBUILD tribler-5.9.25.ebuild 1846 SHA256 339cb38b4478ff389b61274dc77463272c2b886fb8db20a9826fc27e59542c20 SHA512 1f6cc5f6ade9198ff1ee7e3918a4c5b01f07ec84736cb8b2f99a73bc03f221834179714171a5cc74dd63c00221cc7fe6ef213aabf02b4fc36414e52046720c51 WHIRLPOOL d56839153407261e2ce6fe640cd4c4979dc1067dae29b95230576df54428ff5c9791345992585f0b841ccd33aaf328cd0220877c56cfb51a4a5f97f033416fd5
+MISC ChangeLog 4473 SHA256 ef2446df69e7f0cf1c3e80f4e5bb93c3a84a5d9050dffe5d85403ca11fe3da1c SHA512 a58bbfe245ed7ef19a31703be3821d1767fc770f945b783dfc9b00930b3f9260400fa36c58d9815579f22ed2e0ec6e54b0908c1b804e41bfaf59512d6d58689b WHIRLPOOL 3eeb12296b3bba7db4603d690e0749329a1675d01873c96b37552aec8b2edba09a89b03742c016b5d7a823f73c91ceda98e724e7dcbd98fa6ad7936f55cab719
 MISC metadata.xml 456 SHA256 de4487feb43cb09d85bf841828694e1c01ea93c405421a45654cdb14569593b9 SHA512 ff5df2f76626de16e50cdf2b48eb797a07de5db9f0c7aec5d00c1ba21b42e1beaf9aeb0f91fdea9d202109b94bb4d6a28ba630f5ff81eca73ba60ded527f7940 WHIRLPOOL 3d1bd66e56c68b1f2f579ad047f3bdd6cc59fb095f2008d07b062f32f408123c217f0be82f89345a14dae7256a9c176bb28a8af563a9fb8e34d17828cccd21bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAYZWMACgkQl5yvQNBFVTV/4gCcCL/0dFyRRl8/t8r42DtLBh8t
-1ewAn1KYq6UovoorIkXsnLmQaVjUFOBQ
-=xVXR
+iEUEAREIAAYFAlAa0uMACgkQl5yvQNBFVTWWGQCVGvNGaEx+bTxJ4ccoaXB7U69T
+vgCbBwIQ0vOsf8B6cFFFG/Uj3oB52OM=
+=mlY5
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/tribler/tribler-5.9.25.ebuild b/net-p2p/tribler/tribler-5.9.25.ebuild
new file mode 100644
index 000000000000..8ff51b63a6c7
--- /dev/null
+++ b/net-p2p/tribler/tribler-5.9.25.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-5.9.25.ebuild,v 1.1 2012/08/02 19:19: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
+	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}
+}