[gentoo-commits] dev/blueness:master commit in: net-p2p/tribler/files/, net-p2p/tribler/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     24aeeb910cf7335d4f7ce58b4430fc543b4f7075
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 20:54:54 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 20:54:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=24aeeb91

net-p2p/tribler: moved to tree

(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)

---
 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, 0 insertions(+), 167 deletions(-)

diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog
deleted file mode 100644
index 660d066..0000000
--- a/net-p2p/tribler/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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 <blueness@gentoo.org>
-  +tribler-5.5.10-r1.ebuild, +files/tribler-fix-global-declarations.patch,
-  +files/tribler-log2homedir.patch, +metadata.xml:
-  Addressed bug #179384, comment 11
-
-*tribler-5.5.10 (10 Feb 2012)
-
-  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
deleted file mode 100644
index 4ff445b..0000000
--- a/net-p2p/tribler/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX tribler-fix-global-declarations.patch 1745 RMD160 49b39c42d92308839644ab69fd12ef0a7feabcf2 SHA1 a1daea014e14b815ac3857881ebb240ac9e53f90 SHA256 958a18e540f04e7aa5ffb4f0a5bc6eefdfffbfca937362cb6f9d2e2f0a338e94
-AUX tribler-log2homedir.patch 494 RMD160 b4a4ceed309505db9e2536c8c6463c5410fab7bf SHA1 083db33b11f5254828e5eb7200e15f9cdb46c8c5 SHA256 5e81e50bfe5b4272d972f405d5306f09956d0d5f177f7fc05fcd336374fee6d7
-DIST tribler_5.5.10-1ubuntu1_all.deb 2296972 RMD160 89a91ae15a23331366c226140c12a24e334786a0 SHA1 f47287cd70b95040653edbaccb8d7a56d59f34a9 SHA256 b4a3cc0a118f7498cb749116d8fd77f20b228c30e9e897e4b807796e782fbd62
-EBUILD tribler-5.5.10-r1.ebuild 1636 RMD160 c12fad88573f7f8b4019e1c2eb573012d4d3a6e1 SHA1 43ae0b2d786d81b91d6f823b10f217da1e9b1928 SHA256 b7ff52c6da7a0f7b51b28db0196fac6b23fb6af07f4e3b6e479a87fe7a9874df
-MISC ChangeLog 602 RMD160 a14e2b6fe03433749c1758f3ac1ecd32d79a3d93 SHA1 d0d2d7eb83470f883b20aa343d85270ae78dcf62 SHA256 4b40102ba16b84930c1c1e7591765cd7b3c49b2bc1230a2d5a51b924b7d692bc
-MISC metadata.xml 456 RMD160 c23da6949f1a748719d924a5c998efbdee63847a SHA1 83c4d741970af014737f6bfcb2a6791867b56be5 SHA256 de4487feb43cb09d85bf841828694e1c01ea93c405421a45654cdb14569593b9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk82pGYACgkQl5yvQNBFVTXPwQCffE6QMqpZysiNZ2nVAL+0Alhu
-hboAmgP0njOlT2lnqhPbSmEy60IvXIoh
-=Yhe6
------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
deleted file mode 100644
index a87c232..0000000
--- a/net-p2p/tribler/files/tribler-fix-global-declarations.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/pymdht_daemon.py usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/pymdht_daemon.py
---- usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/pymdht_daemon.py	2012-02-11 11:54:10.000000000 -0500
-+++ usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/pymdht_daemon.py	2012-02-11 11:53:15.000000000 -0500
-@@ -155,10 +155,10 @@
-             raise SanitizeError, '? Channel must be a number'
-     
-     def handle(self):
-+        global stop_server
-         while not stop_server:
-             line = self.rfile.readline().strip().upper()
-             if line == 'KILL':
--                global stop_server
-                 stop_server = True
-                 return
-             if line == 'EXIT':
-diff -Naur usr.orig/share/tribler/Tribler/Player/swarmplayer.py usr/share/tribler/Tribler/Player/swarmplayer.py
---- usr.orig/share/tribler/Tribler/Player/swarmplayer.py	2012-02-11 11:54:10.000000000 -0500
-+++ usr/share/tribler/Tribler/Player/swarmplayer.py	2012-02-11 11:53:15.000000000 -0500
-@@ -438,9 +438,9 @@
- 
-     s_play = status.get_or_create_status_element("playable", False)
-     if playable:
-+        global START_TIME
-         if preprogress < 1.0:
-             if s_play.get_value() == True:
--                global START_TIME
-                 status.create_and_add_event("failed_after", [time.time() - START_TIME])
-                 START_TIME = time.time()
-                 
-@@ -448,7 +448,6 @@
- 
-         elif s_play.get_value() == False:
-             s_play.set_value(True)
--            global START_TIME
-             status.create_and_add_event("playable_in", [time.time() - START_TIME])
-             START_TIME = time.time()
- 

diff --git a/net-p2p/tribler/files/tribler-log2homedir.patch b/net-p2p/tribler/files/tribler-log2homedir.patch
deleted file mode 100644
index 204b4f5..0000000
--- a/net-p2p/tribler/files/tribler-log2homedir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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="$PYTHONPATH":$_TRIBLERPATH
- 
- echo "Starting Tribler..."
-+STATEDIR="$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
deleted file mode 100644
index 71c730e..0000000
--- a/net-p2p/tribler/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<longdescription>
-		Python based bittorrent client that does not require an external
-		website or indexing service to discover content.
-	</longdescription>
-	<use>
-		<flag name='vlc'>Enable vlc support.</flag>
-	</use>
-</pkgmetadata>

diff --git a/net-p2p/tribler/tribler-5.5.10-r1.ebuild b/net-p2p/tribler/tribler-5.5.10-r1.ebuild
deleted file mode 100644
index daacf02..0000000
--- a/net-p2p/tribler/tribler-5.5.10-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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="4"
-PYTHON_DEPEND="2:2.5"
-
-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/m2crypto-0.16
-	>=dev-python/wxpython-2.8
-	>=dev-python/apsw-3.6
-	>=dev-libs/openssl-0.9.8
-	vlc? ( >=media-video/vlc-1.0.1 )"
-
-# 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}
-
-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}
-}