Add x11-terms/gnome-terminal-2.33.4, live version

* Fix multiple gdk targets problem with a bad hack

5 files changed, 184 insertions, 0 deletions

diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
new file mode 100644
index 00000000..5be0394a
--- /dev/null
+++ b/x11-terms/gnome-terminal/Manifest
@@ -0,0 +1,5 @@
+AUX gnome-terminal-2.22.0-default_shell.patch 491 RMD160 211ce1834251f5e4c80ba7511a2cacf8c4c43424 SHA1 47b5cad036c28fc0e750684c42582b9c13609d26 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892
+AUX gnome-terminal-2.33.4-fix-gdk-targets.patch 1634 RMD160 ca1337becf8dbbfb4b43f2fb9fc4f0249e03c183 SHA1 26bba8b422fb841e28f6f52d26c8578398dcb14e SHA256 80f9cc1982cadc82c36e6363071f4d7e4ad9fca109dca17235d857914e8254c0
+DIST gnome-terminal-2.33.4.tar.bz2 2346375 RMD160 629b1d6e7e39aafdaca16e8a51114b7984dfbfa2 SHA1 396ef1d540660882a9cd61374c3f50894b53082e SHA256 7d99eafe7877978ebf41fc3ae589d1ba81c6ee49cbd6bad11f7431e52c385612
+EBUILD gnome-terminal-2.33.4.ebuild 1325 RMD160 f75f5bef8d2aec046234c6defbbb423af2e60f72 SHA1 2206c16276450a75f8f99d5edbf0ea1212156219 SHA256 d08599f80a1a54405de2c093545884c05f10e9a1501f091a49699ae95a278718
+EBUILD gnome-terminal-9999.ebuild 1325 RMD160 f75f5bef8d2aec046234c6defbbb423af2e60f72 SHA1 2206c16276450a75f8f99d5edbf0ea1212156219 SHA256 d08599f80a1a54405de2c093545884c05f10e9a1501f091a49699ae95a278718
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.22.0-default_shell.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.22.0-default_shell.patch
new file mode 100644
index 00000000..84bac04f
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.22.0-default_shell.patch
@@ -0,0 +1,11 @@
+--- src/gnome-terminal.schemas.in	2003-02-21 20:06:56.000000000 -0600
++++ src/gnome-terminal.schemas.in	2003-02-21 20:07:13.000000000 -0600
+@@ -341,7 +341,7 @@
+       <applyto>/apps/gnome-terminal/profiles/Default/login_shell</applyto>
+       <owner>gnome-terminal</owner>
+       <type>bool</type>
+-      <default>false</default>
++      <default>true</default>
+       <locale name="C">
+          <short>Whether to launch the command in the terminal as a login shell</short>
+          <long>
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.33.4-fix-gdk-targets.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.33.4-fix-gdk-targets.patch
new file mode 100644
index 00000000..2c9932c4
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.33.4-fix-gdk-targets.patch
@@ -0,0 +1,62 @@
+Gdk-3.0/Gtk-3.0 supports multiple targets now, and the "target" variable 
+no longer works. So, sort of hack around it for now?
+
+---
+--- configure.ac
++++ configure.ac
+@@ -53,25 +53,28 @@
+   [with_gtk=2.0])
+ AC_MSG_RESULT([$with_gtk])
+ 
++GDK_TARGETS=
+ case "$with_gtk" in
+   2.0) GTK_API_VERSION=2.0
+        GTK_REQUIRED=2.18.0
+        VTE_PC_VERSION=
+        VTE_REQUIRED=0.26.0
++       GDK_TARGETS=$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)
+        ;;
+   3.0) GTK_API_VERSION=3.0
+        GTK_REQUIRED=2.91.6
+        VTE_PC_VERSION=-2.90
+        VTE_REQUIRED=0.27.3
++       GDK_TARGETS=$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION)
+        ;;
+ esac
+ 
+-GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)"
+-
+-case "$GDK_TARGET" in
+-  x11) PLATFORM_DEPS="x11" ;;
+-  *) PLATFORM_DEPS="" ;;
+-esac
++PLATFORM_DEPS=
++for i in $GDK_TARGETS; do
++  if test "$i" = "x11"; then
++    PLATFORM_DEPS="x11"
++  fi
++done
+ 
+ PKG_CHECK_MODULES([TERM],
+   [vte$VTE_PC_VERSION >= $VTE_REQUIRED
+@@ -92,11 +95,15 @@
+ AC_ARG_WITH([smclient],
+   [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (xsmp/win32/quartz)])],
+   [],
+-  [case "$GDK_TARGET" in
+-    x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
+-    win32|quartz) with_smclient=$GDK_TARGET ;;
+-    *) with_smclient=no ;;
+-   esac])
++  [for i in $GDK_TARGETS; do
++    if test "$i" = "x11"; then
++      with_smclient=xsmp SMCLIENT_PKGS="sm"
++    elif test "$i" = "win32" -o "$i" = "quartz"; then
++      with_smclient=$i
++    else
++      with_smclient=no
++    fi
++  done])
+ AC_MSG_RESULT([$with_smclient])
+ 
+ if test "$with_smclient" != "no"; then
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.33.4.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.33.4.ebuild
new file mode 100644
index 00000000..a14ed06e
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.33.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild,v 1.1 2010/11/19 22:17:31 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+fi
+
+# libgnome needed for some monospace font schema, bug #274638
+RDEPEND=">=dev-libs/glib-2.25.12:2
+	>=x11-libs/gtk+-2.91.6:3
+	>=gnome-base/gconf-2.31.3
+	>=x11-libs/vte-0.27.3:2.90
+	x11-libs/libSM
+	x11-libs/libX11
+	gnome-base/libgnome"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2
+	>=app-text/scrollkeeper-0.3.11
+	sys-devel/gettext"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+src_prepare() {
+	G2CONF="${G2CONF}
+		--with-smclient-backend=xsmp
+		--with-gtk=3.0"
+
+	# Use login shell by default (#12900)
+	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
+
+	epatch "${FILESDIR}"/${PN}-2.33.4-fix-gdk-targets.patch
+
+	[[ ${PV} != 9999 ]] && eautoreconf
+
+	gnome2_src_prepare
+}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
new file mode 100644
index 00000000..a14ed06e
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild,v 1.1 2010/11/19 22:17:31 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+fi
+
+# libgnome needed for some monospace font schema, bug #274638
+RDEPEND=">=dev-libs/glib-2.25.12:2
+	>=x11-libs/gtk+-2.91.6:3
+	>=gnome-base/gconf-2.31.3
+	>=x11-libs/vte-0.27.3:2.90
+	x11-libs/libSM
+	x11-libs/libX11
+	gnome-base/libgnome"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2
+	>=app-text/scrollkeeper-0.3.11
+	sys-devel/gettext"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+src_prepare() {
+	G2CONF="${G2CONF}
+		--with-smclient-backend=xsmp
+		--with-gtk=3.0"
+
+	# Use login shell by default (#12900)
+	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
+
+	epatch "${FILESDIR}"/${PN}-2.33.4-fix-gdk-targets.patch
+
+	[[ ${PV} != 9999 ]] && eautoreconf
+
+	gnome2_src_prepare
+}