Clean out older unstable versions

(Portage version: 2.1.10.65/cvs/Linux x86_64)

7 files changed, 7 insertions, 379 deletions

diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog
index 933bb5285387..6a056736ac18 100644
--- a/net-p2p/tribler/ChangeLog
+++ b/net-p2p/tribler/ChangeLog
@@ -1,6 +1,12 @@
 # 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.22 2012/07/03 21:19:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.23 2012/07/07 15:48:44 blueness Exp $
+
+  07 Jul 2012; Anthony G. Basile <blueness@gentoo.org> -tribler-5.5.24.ebuild,
+  -files/tribler-5.9.12-remove-garbage.patch, -tribler-5.9.13.ebuild,
+  -tribler-5.9.14.ebuild, -tribler-5.9.15.ebuild,
+  -files/tribler-fix-global-declarations.patch:
+  Clean out older unstable versions
 
 *tribler-5.9.19 (03 Jul 2012)
 
diff --git a/net-p2p/tribler/files/tribler-5.9.12-remove-garbage.patch b/net-p2p/tribler/files/tribler-5.9.12-remove-garbage.patch
deleted file mode 100644
index 150a736d63aa..000000000000
--- a/net-p2p/tribler/files/tribler-5.9.12-remove-garbage.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/extract_routing_table.py usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/extract_routing_table.py
---- usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/extract_routing_table.py	2012-06-01 12:25:28.000000000 +0200
-+++ usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/extract_routing_table.py	2012-06-02 00:32:09.656471960 +0200
-@@ -41,7 +41,7 @@
-             
-             exp_obj = ExpObj()
- 
--             exp_obj.reg_status_of_node(msg.src_node, STATUS_ON_PROCESS)
-+            exp_obj.reg_status_of_node(msg.src_node, STATUS_ON_PROCESS)
-             
-             
-             log_distance = exp_obj.next_log_dist()           
-diff -ur usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice.py usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice.py
---- usr.orig/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice.py	2012-06-01 12:25:28.000000000 +0200
-+++ usr/share/tribler/Tribler/Core/DecentralizedTracking/pymdht/plugins/routing_nice.py	2012-06-02 00:35:34.163153478 +0200
-@@ -106,10 +106,7 @@
-                     queries_to_send = [self._get_maintenance_query(node_)]
-                     # This task did do some work. We are done here!
-                     break
--<<<<<<< HEAD
--=======
- #        print 'nice', _MAINTENANCE_DELAY[self._maintenance_mode]
-->>>>>>> d7bed531d0bbfa54c481422b96243221bf18e2ff
-         return (_MAINTENANCE_DELAY[self._maintenance_mode],
-                 queries_to_send, maintenance_lookup_target)
- 
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 a87c232e58ab..000000000000
--- 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/tribler-5.5.24.ebuild b/net-p2p/tribler/tribler-5.5.24.ebuild
deleted file mode 100644
index b8ca43c9edeb..000000000000
--- a/net-p2p/tribler/tribler-5.5.24.ebuild
+++ /dev/null
@@ -1,78 +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.24.ebuild,v 1.1 2012/03/29 13:26:28 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-lang/python-2.5[sqlite]
-	>=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}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-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}
-}
diff --git a/net-p2p/tribler/tribler-5.9.13.ebuild b/net-p2p/tribler/tribler-5.9.13.ebuild
deleted file mode 100644
index 51a64bbdd961..000000000000
--- a/net-p2p/tribler/tribler-5.9.13.ebuild
+++ /dev/null
@@ -1,79 +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.9.13.ebuild,v 1.1 2012/06/05 16:45:16 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/m2crypto-0.16
-	>=dev-python/wxpython-2.8
-	>=dev-python/apsw-3.6
-	>=dev-libs/openssl-0.9.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}-5.9.12-remove-garbage.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}
-}
diff --git a/net-p2p/tribler/tribler-5.9.14.ebuild b/net-p2p/tribler/tribler-5.9.14.ebuild
deleted file mode 100644
index 91f2ad495102..000000000000
--- a/net-p2p/tribler/tribler-5.9.14.ebuild
+++ /dev/null
@@ -1,79 +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.9.14.ebuild,v 1.1 2012/06/07 10:17:39 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/m2crypto-0.16
-	>=dev-python/wxpython-2.8
-	>=dev-python/apsw-3.6
-	>=dev-libs/openssl-0.9.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}-5.9.12-remove-garbage.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}
-}
diff --git a/net-p2p/tribler/tribler-5.9.15.ebuild b/net-p2p/tribler/tribler-5.9.15.ebuild
deleted file mode 100644
index f4940dd0c3fb..000000000000
--- a/net-p2p/tribler/tribler-5.9.15.ebuild
+++ /dev/null
@@ -1,79 +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.9.15.ebuild,v 1.1 2012/06/09 17:49:00 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/m2crypto-0.16
-	>=dev-python/wxpython-2.8
-	>=dev-python/apsw-3.6
-	>=dev-libs/openssl-0.9.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}-5.9.12-remove-garbage.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}
-}