x11-terms/terminator: drop old, fix Slot for keybinder

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

4 files changed, 14 insertions, 65 deletions

diff --git a/x11-terms/terminator/ChangeLog b/x11-terms/terminator/ChangeLog
index e76682c387e4..f1b4bc20ed50 100644
--- a/x11-terms/terminator/ChangeLog
+++ b/x11-terms/terminator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/terminator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/ChangeLog,v 1.23 2012/03/09 08:57:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/ChangeLog,v 1.24 2012/06/28 10:24:41 jlec Exp $
+
+  28 Jun 2012; Justin Lecher <jlec@gentoo.org> -terminator-0.95.ebuild,
+  terminator-0.96-r1.ebuild:
+  drop old, fix Slot for keybinder
 
   09 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   terminator-0.96-r1.ebuild:
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 78498c99521c..c2fc2227fc5b 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -4,16 +4,15 @@ Hash: SHA512
 AUX 0.90-without-icon-cache.patch 305 RMD160 281f8a8ae23a67f802fd2b001021a921cf9473bf SHA1 29efc6db37579c263629a4f5df9e24b97b7fe88a SHA256 b20fe414e6a443c0cb52c4da0da4be5c5f8ac8af90d5e9763b43c5383623978b
 AUX 0.93-session.patch 505 RMD160 14045535db3b1bed39914878a86f8dd2ba15b06b SHA1 affb7417fb4ac00580c2738c622d3385c5dad7ce SHA256 977cd4f3bf3cf1f044cb044d40328809836a2414a80af514bfff6f7828f7b7fd
 AUX 0.94-session.patch 496 RMD160 c343de55a3f9532714b30691717c98f1114ec165 SHA1 0b6a52c5bfd6c2946230b0bed485ecec565cce38 SHA256 3db9e1065294e3c47b80b44c6e4cbfd4970fa963386d875ccd92efe02aaba05a
-DIST terminator_0.95.tar.gz 222782 RMD160 6096454c9b27183eff3422d61a01b4a4d2873f61 SHA1 bf764156d6b1f5116a15298b0d69f2cbead060ba SHA256 05178785b0ecdaaa14949fd23fbbf7e355d6582bd11b6bc2996929f292be1e13
 DIST terminator_0.96.tar.gz 264226 RMD160 376ecd9c6f3d0cfdc4c151ebb2e90a5e118fee93 SHA1 bc7d030a96956afea93b95d43cb835143084e63c SHA256 d708c783c36233fcafbd0139a91462478ae40f5cf696ef4acfcaf5891a843201
-EBUILD terminator-0.95.ebuild 1154 RMD160 a95941364566af8e149dfde75e09cbe818b23a67 SHA1 34c9c5f1f9d0f9ad01935000a57925f4f39b793b SHA256 7ebba0c61c8fbdc8c41815bdced5304e560e489041e19cb947108604e116dbf7
-EBUILD terminator-0.96-r1.ebuild 1162 RMD160 132e661297e82b2d005acfc1fb157c291147fa1b SHA1 a954117c6274c468b28687359320c0d555b6a7b4 SHA256 5ab64c7b96de393648bc16bf0adce695dd511e1ae8a80dff101bc32bc43b98a5
-MISC ChangeLog 3375 RMD160 80178527be7cce15d4cc00765a19cfa0e6e2a063 SHA1 1c703b58ff654e62d4781676eed54e0b87a34aca SHA256 7c008158eda2fbe83c943942cbfa3505be6a9c1d467cce72f9c5986246c43ce3
+EBUILD terminator-0.96-r1.ebuild 1158 RMD160 bbc69bc49ad76a37494a9d986e9b2fd12f2d69de SHA1 79eb08b7579717e6cce9a7984e996678288e30aa SHA256 bd9bc28c8f25ec546dd488cd847ecd0a90277874247e3158462c2af864c3956f
+MISC ChangeLog 3506 RMD160 96f34f5dac47701e3deda233a37c558d809be87b SHA1 cba960866aa50fae362133b1aa940d2470e89c27 SHA256 e0c8325ae3fa796133a3a0f6722565a77eeb3305b326825f6ec35b68071a4af5
 MISC metadata.xml 562 RMD160 9379ce08082ad34c9790f181da35153b4a8e0c6d SHA1 3581e997209ba536c8d72fdd720e5772de585c61 SHA256 850953aa1ffc9e27f393d75fcf569cf7e9c830d6f07ce80925bb2b05e54407e0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk9ZxgcACgkQuUQtlDBCeQKAIQCfQQbkU6QGnxxFcBpNbmeeV2eD
-O3sAn1QCl7fGKv9jHSE0XjMjvkzYBxNr
-=NLXW
+iEYEAREKAAYFAk/sMO8ACgkQgAnW8HDreRZloACfadvOQO2QmJhQ0CgHTY++No6v
+mv4AoKysD0oAGWxOxzE8HygoC1zBnhqH
+=jwiC
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/terminator/terminator-0.95.ebuild b/x11-terms/terminator/terminator-0.95.ebuild
deleted file mode 100644
index ce02315771ec..000000000000
--- a/x11-terms/terminator/terminator-0.95.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/terminator-0.95.ebuild,v 1.9 2012/02/20 20:31:01 jlec Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2"
-PYTHON_MODNAME="terminatorlib"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit gnome2 distutils eutils
-
-DESCRIPTION="Multiple GNOME terminals in one window"
-HOMEPAGE="http://www.tenshu.net/p/terminator.html"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus gnome"
-
-RDEPEND="
-	dev-libs/keybinder[python]
-	dev-python/notify-python
-	x11-libs/vte:0[python]
-	dbus? ( sys-apps/dbus )
-	gnome? (
-		dev-python/gconf-python
-		dev-python/libgnome-python
-		dev-python/pygobject:2
-		dev-python/pygtk:2
-		)"
-DEPEND="dev-util/intltool"
-
-src_prepare() {
-	epatch "${FILESDIR}"/0.90-without-icon-cache.patch
-	epatch "${FILESDIR}"/0.94-session.patch
-	distutils_src_prepare
-}
-
-src_configure() {
-:
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	distutils_pkg_postrm
-}
diff --git a/x11-terms/terminator/terminator-0.96-r1.ebuild b/x11-terms/terminator/terminator-0.96-r1.ebuild
index 424bb952d14e..617299ef86f6 100644
--- a/x11-terms/terminator/terminator-0.96-r1.ebuild
+++ b/x11-terms/terminator/terminator-0.96-r1.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/x11-terms/terminator/terminator-0.96-r1.ebuild,v 1.5 2012/03/09 08:57:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/terminator-0.96-r1.ebuild,v 1.6 2012/06/28 10:24:41 jlec Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ KEYWORDS="amd64 x86"
 IUSE="dbus gnome"
 
 RDEPEND="
-	dev-libs/keybinder[python]
+	dev-libs/keybinder:0[python]
 	dev-python/notify-python
 	x11-libs/vte:0[python]
 	dbus? ( sys-apps/dbus )