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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 15 insertions, 100 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/Manifest b/x11-terms/terminator/Manifest
index 45efec283c38..eff741bca764 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -2,20 +2,14 @@
 Hash: SHA1
 
 AUX 0.90-without-icon-cache.patch 305 RMD160 281f8a8ae23a67f802fd2b001021a921cf9473bf SHA1 29efc6db37579c263629a4f5df9e24b97b7fe88a SHA256 b20fe414e6a443c0cb52c4da0da4be5c5f8ac8af90d5e9763b43c5383623978b
-DIST terminator_0.90.tar.gz 191486 RMD160 54e9c3a058aac7c28528bcf73bd66c9e274435e5 SHA1 22dd706e09f7ee5e36965fea8299011c636f9416 SHA256 a41e466a4fd316c7806430a4c185234b2dbd2ac63254cd6829229f043ee5fd42
-DIST terminator_0.91.tar.gz 189241 RMD160 f76f6f37e8663cd0496f8dcb8aa603ac7ff01fdc SHA1 c33ed246363b205ce46d4ab33c2a7516f4d47361 SHA256 5930d7397e42b2d8f15f614b857d9a41680cbcc6eb3d8335bd9e583b87470c6a
-DIST terminator_0.92.tar.gz 194234 RMD160 7dbba67098ae3de54bbbd0db81045697e6bc5418 SHA1 95b6ef28e10aaa58de1692b2280a2052426846c2 SHA256 516539b69c1439c35efab19ca3fc95c3e19e6bf9db23a44ab0b57a557e84c0e4
 DIST terminator_0.93.tar.gz 194922 RMD160 62098b1a93e8273c9c993d36ac0afca78780fc09 SHA1 f6131e18c2d23b1cd19a7cdc1e267e3ed43794b4 SHA256 eee742fb43750b49dac9d8ebc341b999f46c69063476df26eddabae0526dd855
-EBUILD terminator-0.90.ebuild 730 RMD160 bce07a060d9d19b2933fab59041cd28166e5b3f7 SHA1 1e68c1b155c1b6b0ba9402721ed38abd6d0fba07 SHA256 e663d4336be727ce9228fe227aedebb934d989515cc021659aee0e632bb61149
-EBUILD terminator-0.91.ebuild 746 RMD160 c9303658039edcbe77705370f076d529b982e606 SHA1 54e2679edd74142e1c14b4dc647adf8e024b2211 SHA256 757e69f09c5e69706ada9141f77bfa752e7be533a324f50779d37fef5dc838c9
-EBUILD terminator-0.92.ebuild 746 RMD160 57c67fb4583bfa89c521687f15abd439c2239f08 SHA1 6bf2b36e6fb0f2c8f9a2d75840109320ed8c17d6 SHA256 1c5dab1fa9791aff7bccc7e375019baba1f02becb5bcd8865a90b6fdc9a56c42
-EBUILD terminator-0.93.ebuild 746 RMD160 83d73674c876e0e3120e7067648633033e9d2449 SHA1 26412062e9b8e664ae2cd81bb44c7e1f8ef265c1 SHA256 d6daa5d841769eb63ba5c61eddbe364d4ef42e4a36d5b28f10208670390aee00
-MISC ChangeLog 865 RMD160 29cd4b9fc02f5795583e29a60a84cf6f4cf9aff3 SHA1 0fade3e099673e6ff3efaba7ff9a2bc76e6e72e7 SHA256 f974167a31dde3b7d30dd9a571b4baf9ac12eb80253383ebd3c9c23f31eba8dd
+EBUILD terminator-0.93.ebuild 792 RMD160 218da9dd94e28cd0b4f386c6895f9555abe79993 SHA1 c46fef0e1dae0a0174841d7f227c9acc3098da48 SHA256 8cfd137f8585eefd3964f1d40e9dbdf0f639f98739e4cd67226306232ac136a9
+MISC ChangeLog 1082 RMD160 7c6dc7b574355c905ef9c840af1c0c74d12984b1 SHA1 6246d824a8fbbffc475e7225ce859ca946186624 SHA256 13945a3e84aee9c7a461f45b2895b80f685d561ddbac9ca3f013844e79dc4a97
 MISC metadata.xml 507 RMD160 bac1efd3c7a15b8b384913ae8c413ac9d4847480 SHA1 3e27f557040be016cdfb4e8d8ccb9203a52aeb30 SHA256 fe88f30c2403ff5401c9631957e5188d72a66eafa9fa564c97f784c2eeadae05
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvICQ0ACgkQgAnW8HDreRaApACfbI/+1Q+sCt4Keqru1M3CFO5L
-n/YAoM9/qswZnN1i1aTYBst7/gTVnIex
-=zyfw
+iEYEARECAAYFAkvUAKsACgkQgAnW8HDreRb+BgCfXAZY1sI+02PI+ghBF5DFR58M
+de0An0zcKuuC9pH/uzBbn1e+Kd3sNzZ6
+=X05t
 -----END PGP SIGNATURE-----
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