Adding patch for broken gnome-session support until fixed by upstream, #316155

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

diff --git a/x11-terms/terminator/ChangeLog b/x11-terms/terminator/ChangeLog
index e976ec8ed3d76b4a77def9c9c60ef976395a4e29..bdec06e0e6746f475642d861655d81e57ff41133 100644 (file)
--- a/x11-terms/terminator/ChangeLog
+++ b/x11-terms/terminator/ChangeLog
@@ -1,6 +1,11 @@
 # 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.6 2010/04/25 08:43:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/ChangeLog,v 1.7 2010/04/25 11:11:16 jlec Exp $
+
+  25 Apr 2010; Justin Lecher <jlec@gentoo.org> +files/0.93-session.patch,
+  terminator-0.93.ebuild:
+  Adding patch for broken gnome-session support until fixed by upstream,
+  #316155
 
   25 Apr 2010; Justin Lecher <jlec@gentoo.org> -terminator-0.90.ebuild,
   -terminator-0.91.ebuild, -terminator-0.92.ebuild, terminator-0.93.ebuild:

diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index eff741bca76466e6477667da23d83c7ea73c4f6b..c10d3543032d654e14dbd58607f2150e6a0e1b95 100644 (file)
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA1
 
 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
 DIST terminator_0.93.tar.gz 194922 RMD160 62098b1a93e8273c9c993d36ac0afca78780fc09 SHA1 f6131e18c2d23b1cd19a7cdc1e267e3ed43794b4 SHA256 eee742fb43750b49dac9d8ebc341b999f46c69063476df26eddabae0526dd855
-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
+EBUILD terminator-0.93.ebuild 834 RMD160 eb7be597bf8920ec67ee38325ef19fe05cf11d20 SHA1 6e839f45a07ed866c9474b77109ecfda47042a6c SHA256 7735e75d2887c4e058f8453d49685b2d98d586a3b6cf43c502702b3a8f86b9e4
+MISC ChangeLog 1266 RMD160 9f86f5bfd0ea5b69c77baa873e5a980d2cbba2e3 SHA1 73be08a072e6469c52a863fdecd9f445652747fd SHA256 92af5dfb04f05aabc62a33a444ab7bfb135589558f69181c414f73ad3d1adb1b
+MISC metadata.xml 488 RMD160 4f52e650970d08b2431f428eca75df4477fa7914 SHA1 d8eaa69efabac45de16834b35a9b52bfe562b8dc SHA256 69c2aca35e0c0b7b380b3a2096e7159f29de5bd408b6c706238a51898dd855da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvUAKsACgkQgAnW8HDreRb+BgCfXAZY1sI+02PI+ghBF5DFR58M
-de0An0zcKuuC9pH/uzBbn1e+Kd3sNzZ6
-=X05t
+iEYEARECAAYFAkvUI1oACgkQgAnW8HDreRYbiACePRrbaFsLeAToLP7NbirTI2MN
+WowAoLHYLSOH9S7UG/NLtS30QBvG9wC0
+=dFgU
 -----END PGP SIGNATURE-----

diff --git a/x11-terms/terminator/files/0.93-session.patch b/x11-terms/terminator/files/0.93-session.patch
new file mode 100644 (file)
index 0000000..c904a8c
--- /dev/null
+++ b/x11-terms/terminator/files/0.93-session.patch
@@ -0,0 +1,13 @@
+diff --git a/terminatorlib/terminator.py b/terminatorlib/terminator.py
+index 34726cb..5adb7e7 100755
+--- a/terminatorlib/terminator.py
++++ b/terminatorlib/terminator.py
+@@ -60,8 +60,6 @@ class Terminator(Borg):
+             self.doing_layout = False
+         if not self.pid_cwd:
+             self.pid_cwd = get_pid_cwd()
+-        if self.gnome_client is None:
+-            self.attempt_gnome_client()
+ 
+     def attempt_gnome_client(self):
+         """Attempt to find a GNOME Session to register with"""

diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
index 180fb04e9c8658186fe78bc7cf96369b65602e13..406459f344367141df5b4dec258ab46f7d8d9fd8 100644 (file)
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pkgmetadata>
-<herd>gnome</herd>
 <maintainer>
   <email>jlec@gentoo.org</email>
 </maintainer>

diff --git a/x11-terms/terminator/terminator-0.93.ebuild b/x11-terms/terminator/terminator-0.93.ebuild
index 3cd178846888f243b419f50837fee4a1a93a8887..fb01652f7324fef122ee22cb019d59b3ded1e1aa 100644 (file)
--- 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.2 2010/04/25 08:43:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminator/terminator-0.93.ebuild,v 1.3 2010/04/25 11:11:16 jlec Exp $
 
 EAPI="2"
 
@@ -29,5 +29,6 @@ pkg_setup() {
 
 src_prepare() {
        epatch "${FILESDIR}"/0.90-without-icon-cache.patch
+       epatch "${FILESDIR}"/${PV}-session.patch
        distutils_src_prepare
 }