Version bump and remove older unstable

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 8 insertions, 88 deletions

diff --git a/net-p2p/tribler/ChangeLog b/net-p2p/tribler/ChangeLog
index 7f7d535614c5..0dfa26665832 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.28 2012/08/02 19:19:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/ChangeLog,v 1.29 2012/08/03 14:22:35 blueness Exp $
+
+*tribler-5.9.26 (03 Aug 2012)
+
+  03 Aug 2012; Anthony G. Basile <blueness@gentoo.org> -tribler-5.9.24.ebuild,
+  -tribler-5.9.25.ebuild, +tribler-5.9.26.ebuild:
+  Version bump and remove older unstable
 
 *tribler-5.9.25 (02 Aug 2012)
 
diff --git a/net-p2p/tribler/tribler-5.9.25.ebuild b/net-p2p/tribler/tribler-5.9.25.ebuild
deleted file mode 100644
index 8ff51b63a6c7..000000000000
--- a/net-p2p/tribler/tribler-5.9.25.ebuild
+++ /dev/null
@@ -1,86 +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.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}
-}
diff --git a/net-p2p/tribler/tribler-5.9.24.ebuild b/net-p2p/tribler/tribler-5.9.26.ebuild
index e3faf316ca2f..173ad9b8ceb1 100644
--- a/net-p2p/tribler/tribler-5.9.24.ebuild
+++ b/net-p2p/tribler/tribler-5.9.26.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.24.ebuild,v 1.1 2012/07/31 23:08:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-5.9.26.ebuild,v 1.1 2012/08/03 14:22:35 blueness Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"