Version bump, removed older bad versions

(Portage version: 2.1.10.65/cvs/Linux x86_64)

5 files changed, 26 insertions, 255 deletions

diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog
index 184870faefee..64474fcc656c 100644
--- a/net-p2p/tribler/ChangeLog
+++ b/net-p2p/tribler/ChangeLog
@@ -1,6 +1,13 @@
 # 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.24 2012/07/14 11:49:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.25 2012/07/19 12:22:17 blueness Exp $
+
+*tribler-5.9.22 (19 Jul 2012)
+
+  19 Jul 2012; Anthony G. Basile <blueness@gentoo.org> -tribler-5.9.17.ebuild,
+  -tribler-5.9.18.ebuild, -tribler-5.9.19.ebuild, -tribler-5.9.21.ebuild,
+  +tribler-5.9.22.ebuild:
+  Version bump, removed older bad versions
 
 *tribler-5.9.21 (14 Jul 2012)
 
diff --git a/net-p2p/tribler/tribler-5.9.17.ebuild b/net-p2p/tribler/tribler-5.9.17.ebuild
deleted file mode 100644
index c6eb356fc606..000000000000
--- a/net-p2p/tribler/tribler-5.9.17.ebuild
+++ /dev/null
@@ -1,80 +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.17.ebuild,v 1.1 2012/06/28 11:21:44 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}
-}
diff --git a/net-p2p/tribler/tribler-5.9.18.ebuild b/net-p2p/tribler/tribler-5.9.18.ebuild
deleted file mode 100644
index 52dbe2df7608..000000000000
--- a/net-p2p/tribler/tribler-5.9.18.ebuild
+++ /dev/null
@@ -1,80 +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.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}
-}
diff --git a/net-p2p/tribler/tribler-5.9.19.ebuild b/net-p2p/tribler/tribler-5.9.19.ebuild
deleted file mode 100644
index 044e80c19c2d..000000000000
--- a/net-p2p/tribler/tribler-5.9.19.ebuild
+++ /dev/null
@@ -1,80 +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.19.ebuild,v 1.1 2012/07/03 21:19:02 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}
-}
diff --git a/net-p2p/tribler/tribler-5.9.21.ebuild b/net-p2p/tribler/tribler-5.9.22.ebuild
index 6428bdcc527d..17cccb77f875 100644
--- a/net-p2p/tribler/tribler-5.9.21.ebuild
+++ b/net-p2p/tribler/tribler-5.9.22.ebuild
@@ -1,6 +1,6 @@
 # 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.21.ebuild,v 1.1 2012/07/14 11:49:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-5.9.22.ebuild,v 1.1 2012/07/19 12:22:17 blueness Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -12,7 +12,10 @@ 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"
+SRC_URI="
+	http://dl.tribler.org/${MY_PV}.deb
+	x86?   ( http://dl.tribler.org/tribler-swift_5.9.22-27598_i386.deb )
+	amd64? ( http://dl.tribler.org/tribler-swift_5.9.22-27598_amd64.deb )"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -20,21 +23,20 @@ KEYWORDS="~amd64 ~x86"
 IUSE="vlc"
 
 RDEPEND="
-	>=dev-python/apsw-3.6
-	>=dev-python/m2crypto-0.16
+	dev-python/apsw
+	dev-python/m2crypto
 	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)
+	dev-libs/openssl
+	dev-python/wxpython
+	vlc? (
+			media-video/vlc
+			media-video/ffmpeg
+		)"
 
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 pkg_setup() {
 	python_set_active_version 2
@@ -42,8 +44,10 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
+	for i in ${A}; do
+		unpack ${i}
+		unpack ./data.tar.gz
+	done
 }
 
 src_prepare() {