Cleaned old versions, Fixed new PYTHON ABI compatibility, #317039

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 10 insertions, 89 deletions

diff --git a/x11-terms/terminator/ChangeLog b/x11-terms/terminator/ChangeLog
index 5766df0784ec..e976ec8ed3d7 100644
--- a/x11-terms/terminator/ChangeLog
+++ b/x11-terms/terminator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/terminator
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/ChangeLog,v 1.5 2010/04/16 06:51:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/ChangeLog,v 1.6 2010/04/25 08:43:17 jlec Exp $
+
+  25 Apr 2010; Justin Lecher <jlec@gentoo.org> -terminator-0.90.ebuild,
+  -terminator-0.91.ebuild, -terminator-0.92.ebuild, terminator-0.93.ebuild:
+  Cleaned old versions, Fixed new PYTHON ABI compatibility, #317039
 
 *terminator-0.93 (16 Apr 2010)
 
diff --git a/x11-terms/terminator/terminator-0.90.ebuild b/x11-terms/terminator/terminator-0.90.ebuild
deleted file mode 100644
index 622dfbbb1bd6..000000000000
--- a/x11-terms/terminator/terminator-0.90.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/terminator-0.90.ebuild,v 1.1 2010/03/31 06:20:08 jlec Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2"
-PYTHON_MODNAME="terminatorlib"
-
-inherit distutils eutils
-
-DESCRIPTION="Multiple GNOME terminals in one window"
-HOMEPAGE="http://www.tenshu.net/terminator/"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	gnome? ( dev-python/gnome-python )
-	>=x11-libs/vte-0.16[python]"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-without-icon-cache.patch
-	distutils_src_prepare
-}
diff --git a/x11-terms/terminator/terminator-0.91.ebuild b/x11-terms/terminator/terminator-0.91.ebuild
deleted file mode 100644
index 4cdae0b94227..000000000000
--- a/x11-terms/terminator/terminator-0.91.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/terminator-0.91.ebuild,v 1.1 2010/04/03 19:23:24 jlec Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2"
-PYTHON_MODNAME="terminatorlib"
-
-inherit distutils eutils
-
-DESCRIPTION="Multiple GNOME terminals in one window"
-HOMEPAGE="http://www.tenshu.net/terminator/"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	gnome? ( dev-python/gnome-python )
-	>=x11-libs/vte-0.16[python]"
-DEPEND="dev-util/intltool"
-
-src_prepare() {
-	epatch "${FILESDIR}"/0.90-without-icon-cache.patch
-	distutils_src_prepare
-}
diff --git a/x11-terms/terminator/terminator-0.92.ebuild b/x11-terms/terminator/terminator-0.92.ebuild
deleted file mode 100644
index 2f7a1ac6517e..000000000000
--- a/x11-terms/terminator/terminator-0.92.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/terminator-0.92.ebuild,v 1.1 2010/04/08 06:15:10 jlec Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2"
-PYTHON_MODNAME="terminatorlib"
-
-inherit distutils eutils
-
-DESCRIPTION="Multiple GNOME terminals in one window"
-HOMEPAGE="http://www.tenshu.net/terminator/"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	gnome? ( dev-python/gnome-python )
-	>=x11-libs/vte-0.16[python]"
-DEPEND="dev-util/intltool"
-
-src_prepare() {
-	epatch "${FILESDIR}"/0.90-without-icon-cache.patch
-	distutils_src_prepare
-}
diff --git a/x11-terms/terminator/terminator-0.93.ebuild b/x11-terms/terminator/terminator-0.93.ebuild
index 60baebb5938d..3cd178846888 100644
--- a/x11-terms/terminator/terminator-0.93.ebuild
+++ b/x11-terms/terminator/terminator-0.93.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/terminator-0.93.ebuild,v 1.1 2010/04/16 06:51:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/terminator-0.93.ebuild,v 1.2 2010/04/25 08:43:17 jlec Exp $
 
 EAPI="2"
 
@@ -23,6 +23,10 @@ RDEPEND="
 	>=x11-libs/vte-0.16[python]"
 DEPEND="dev-util/intltool"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/0.90-without-icon-cache.patch
 	distutils_src_prepare