From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RwGhG-0000jU-DV for garchives@archives.gentoo.org; Sat, 11 Feb 2012 17:25:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93E98E0789; Sat, 11 Feb 2012 17:25:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4C8BBE0789 for ; Sat, 11 Feb 2012 17:25:07 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8A6591B4018 for ; Sat, 11 Feb 2012 17:25:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 50AD1E53FF for ; Sat, 11 Feb 2012 17:25:05 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <615f0e2133027f267285cd3cb8814b149dac5681.blueness@gentoo> Subject: [gentoo-commits] dev/blueness:master commit in: net-p2p/tribler/files/, net-p2p/tribler/ X-VCS-Repository: dev/blueness X-VCS-Files: net-p2p/tribler/ChangeLog net-p2p/tribler/Manifest net-p2p/tribler/files/tribler-fix-global-declarations.patch net-p2p/tribler/files/tribler-log2homedir.patch net-p2p/tribler/metadata.xml net-p2p/tribler/tribler-5.5.10-r1.ebuild X-VCS-Directories: net-p2p/tribler/files/ net-p2p/tribler/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 615f0e2133027f267285cd3cb8814b149dac5681 Date: Sat, 11 Feb 2012 17:25:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 42dd14f0-9510-45cf-85da-27d3c582dc8b X-Archives-Hash: 400d465b53a7e95765d4c9ed369936a0 commit: 615f0e2133027f267285cd3cb8814b149dac5681 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Feb 11 17:24:54 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Feb 11 17:24:54 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3D615f0e21 net-p2p/tribler: addressed bug #179384, comment 11 (Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with= key 0xD0455535) --- net-p2p/tribler/ChangeLog | 17 +++++ net-p2p/tribler/Manifest | 16 +++++ .../files/tribler-fix-global-declarations.patch | 37 ++++++++++ net-p2p/tribler/files/tribler-log2homedir.patch | 12 ++++ net-p2p/tribler/metadata.xml | 15 ++++ net-p2p/tribler/tribler-5.5.10-r1.ebuild | 70 ++++++++++++++= ++++++ 6 files changed, 167 insertions(+), 0 deletions(-) diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog new file mode 100644 index 0000000..660d066 --- /dev/null +++ b/net-p2p/tribler/ChangeLog @@ -0,0 +1,17 @@ +# 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.1 2012/= 02/10 03:19:49 blueness Exp $ + +*tribler-5.5.10-r1 (11 Feb 2012) + + 11 Feb 2012; Anthony G. Basile + +tribler-5.5.10-r1.ebuild, +files/tribler-fix-global-declarations.patc= h, + +files/tribler-log2homedir.patch, +metadata.xml: + Addressed bug #179384, comment 11 + +*tribler-5.5.10 (10 Feb 2012) + + 10 Feb 2012; Anthony G. Basile +tribler-5.5.10.e= build, + +metadata.xml: + Initial commit + diff --git a/net-p2p/tribler/Manifest b/net-p2p/tribler/Manifest new file mode 100644 index 0000000..4ff445b --- /dev/null +++ b/net-p2p/tribler/Manifest @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX tribler-fix-global-declarations.patch 1745 RMD160 49b39c42d923088396= 44ab69fd12ef0a7feabcf2 SHA1 a1daea014e14b815ac3857881ebb240ac9e53f90 SHA2= 56 958a18e540f04e7aa5ffb4f0a5bc6eefdfffbfca937362cb6f9d2e2f0a338e94 +AUX tribler-log2homedir.patch 494 RMD160 b4a4ceed309505db9e2536c8c6463c5= 410fab7bf SHA1 083db33b11f5254828e5eb7200e15f9cdb46c8c5 SHA256 5e81e50bfe= 5b4272d972f405d5306f09956d0d5f177f7fc05fcd336374fee6d7 +DIST tribler_5.5.10-1ubuntu1_all.deb 2296972 RMD160 89a91ae15a23331366c2= 26140c12a24e334786a0 SHA1 f47287cd70b95040653edbaccb8d7a56d59f34a9 SHA256= b4a3cc0a118f7498cb749116d8fd77f20b228c30e9e897e4b807796e782fbd62 +EBUILD tribler-5.5.10-r1.ebuild 1636 RMD160 c12fad88573f7f8b4019e1c2eb57= 3012d4d3a6e1 SHA1 43ae0b2d786d81b91d6f823b10f217da1e9b1928 SHA256 b7ff52c= 6da7a0f7b51b28db0196fac6b23fb6af07f4e3b6e479a87fe7a9874df +MISC ChangeLog 602 RMD160 a14e2b6fe03433749c1758f3ac1ecd32d79a3d93 SHA1 = d0d2d7eb83470f883b20aa343d85270ae78dcf62 SHA256 4b40102ba16b84930c1c1e759= 1765cd7b3c49b2bc1230a2d5a51b924b7d692bc +MISC metadata.xml 456 RMD160 c23da6949f1a748719d924a5c998efbdee63847a SH= A1 83c4d741970af014737f6bfcb2a6791867b56be5 SHA256 de4487feb43cb09d85bf84= 1828694e1c01ea93c405421a45654cdb14569593b9 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEAREIAAYFAk82pGYACgkQl5yvQNBFVTXPwQCffE6QMqpZysiNZ2nVAL+0Alhu +hboAmgP0njOlT2lnqhPbSmEy60IvXIoh +=3DYhe6 +-----END PGP SIGNATURE----- diff --git a/net-p2p/tribler/files/tribler-fix-global-declarations.patch = b/net-p2p/tribler/files/tribler-fix-global-declarations.patch new file mode 100644 index 0000000..a87c232 --- /dev/null +++ b/net-p2p/tribler/files/tribler-fix-global-declarations.patch @@ -0,0 +1,37 @@ +diff -Naur usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pym= dht/pymdht_daemon.py usr/share/tribler/Tribler/Core/DecentralizedTracking= /pymdht/pymdht_daemon.py +--- usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/pym= dht_daemon.py 2012-02-11 11:54:10.000000000 -0500 ++++ usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/pymdht_d= aemon.py 2012-02-11 11:53:15.000000000 -0500 +@@ -155,10 +155,10 @@ + raise SanitizeError, '? Channel must be a number' + =20 + def handle(self): ++ global stop_server + while not stop_server: + line =3D self.rfile.readline().strip().upper() + if line =3D=3D 'KILL': +- global stop_server + stop_server =3D True + return + if line =3D=3D 'EXIT': +diff -Naur usr.orig/share/tribler/Tribler/Player/swarmplayer.py usr/shar= e/tribler/Tribler/Player/swarmplayer.py +--- usr.orig/share/tribler/Tribler/Player/swarmplayer.py 2012-02-11 11:5= 4:10.000000000 -0500 ++++ usr/share/tribler/Tribler/Player/swarmplayer.py 2012-02-11 11:53:15.= 000000000 -0500 +@@ -438,9 +438,9 @@ +=20 + s_play =3D status.get_or_create_status_element("playable", False) + if playable: ++ global START_TIME + if preprogress < 1.0: + if s_play.get_value() =3D=3D True: +- global START_TIME + status.create_and_add_event("failed_after", [time.time(= ) - START_TIME]) + START_TIME =3D time.time() + =20 +@@ -448,7 +448,6 @@ +=20 + elif s_play.get_value() =3D=3D False: + s_play.set_value(True) +- global START_TIME + status.create_and_add_event("playable_in", [time.time() - S= TART_TIME]) + START_TIME =3D time.time() +=20 diff --git a/net-p2p/tribler/files/tribler-log2homedir.patch b/net-p2p/tr= ibler/files/tribler-log2homedir.patch new file mode 100644 index 0000000..204b4f5 --- /dev/null +++ b/net-p2p/tribler/files/tribler-log2homedir.patch @@ -0,0 +1,12 @@ +diff -Naur usr.orig/bin/tribler usr/bin/tribler +--- usr.orig/bin/tribler 2012-02-07 10:33:48.000000000 -0500 ++++ usr/bin/tribler 2012-02-11 12:19:05.000000000 -0500 +@@ -6,5 +6,7 @@ + export PYTHONPATH=3D"$PYTHONPATH":$_TRIBLERPATH +=20 + echo "Starting Tribler..." ++STATEDIR=3D"$HOME/.Tribler" ++[ ! -d $STATEDIR ] && mkdir -p $STATEDIR + cd $_TRIBLERPATH +-exec python -O Tribler/Main/tribler.py "$@" > /tmp/$USER-tribler.log 2>= &1 ++exec python -O Tribler/Main/tribler.py "$@" > $STATEDIR/tribler.log 2>&= 1 diff --git a/net-p2p/tribler/metadata.xml b/net-p2p/tribler/metadata.xml new file mode 100644 index 0000000..71c730e --- /dev/null +++ b/net-p2p/tribler/metadata.xml @@ -0,0 +1,15 @@ + + + + + blueness@gentoo.org + Anthony G. Basile + + + Python based bittorrent client that does not require an external + website or indexing service to discover content. + + + Enable vlc support. + + diff --git a/net-p2p/tribler/tribler-5.5.10-r1.ebuild b/net-p2p/tribler/t= ribler-5.5.10-r1.ebuild new file mode 100644 index 0000000..daacf02 --- /dev/null +++ b/net-p2p/tribler/tribler-5.5.10-r1.ebuild @@ -0,0 +1,70 @@ +# 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.5.10.ebuild= ,v 1.1 2012/02/10 03:19:49 blueness Exp $ + +EAPI=3D"4" +PYTHON_DEPEND=3D"2:2.5" + +inherit eutils python + +MY_PV=3D"${PN}_${PV}-1ubuntu1_all" + +DESCRIPTION=3D"Bittorrent client that does not require a website to disc= over content" +HOMEPAGE=3D"http://www.tribler.org/" +SRC_URI=3D"http://dl.tribler.org/${MY_PV}.deb" + +LICENSE=3D"LGPL-2.1" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"vlc" + +RDEPEND=3D">=3Ddev-python/m2crypto-0.16 + >=3Ddev-python/wxpython-2.8 + >=3Ddev-python/apsw-3.6 + >=3Ddev-libs/openssl-0.9.8 + vlc? ( >=3Dmedia-video/vlc-1.0.1 )" + +# Skipping for now: +# xulrunner-sdk >=3D 1.9.1.5 < 1.9.2 (optional, to run SwarmTransport) +# 7-Zip >=3D 4.6.5 (optional, to build SwarmTransport) + +DEPEND=3D"${RDEPEND} + app-arch/unzip" + +S=3D${WORKDIR} + +src_unpack() { + unpack ${A} + unpack ./data.tar.gz +} + +src_prepare() { + epatch "${FILESDIR}/${PN}-fix-global-declarations.patch" + epatch "${FILESDIR}/${PN}-log2homedir.patch" +} + +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} +}