x11-terms/gnome-terminal: moved to gx86

    * Add metadata.xml.
    * Sync live ebuild with gx86 changes.

4 files changed, 17 insertions, 70 deletions

diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
deleted file mode 100644
index d430331d..00000000
--- a/x11-terms/gnome-terminal/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-DIST gnome-terminal-3.6.1.tar.xz 1648676 SHA256 c6816f77eaae791dadeef89596df811e2fa353088241aa0613bb8e1af63304f6 SHA512 b91c7a1c572e430bdfd9dc66c5c8720e1fb669b0495a278e89417c94788f215c2070b2f16dc5e2d2e1b12c41ab105af221c3816462962b3edb8ca40581598774 WHIRLPOOL f8681c9b4487d9a38287f029f057d6a7a301af091845298d46a0aa6527ce73b2efaf817dd7d8e97d89e6bb1004de9b22d3d44cbae9149071f8d1dbb0e265d58c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREKAAYFAlCMYm0ACgkQ1fmVwcYIWAZFBwCgwQwmHpaZYcbDzGzfj1fm1A2E
-+kcAoJnEOk8SlAIgtBbEyaVHe05mm/SN
-=c89B
------END PGP SIGNATURE-----
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r1.ebuild
deleted file mode 100644
index 347f54de..00000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
-
-# FIXME: automagic dependency on gtk+[X]
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	>=x11-libs/gtk+-3.3.17:3[X]
-	>=x11-libs/vte-0.30.0:2.90
-	>=gnome-base/gconf-2.31.3
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	x11-libs/libSM
-	x11-libs/libICE"
-# gtk+:2 needed for gtk-builder-convert, bug 356239
-DEPEND="${RDEPEND}
-	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	# FIXME: leave smclient configure unset until it accepts values from the
-	# switch and not from GDK_TARGET, bug #363033
-	G2CONF="${G2CONF} --with-gtk=3.0"
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if [[ ${REPLACING_VERSIONS} < 3.6.1-r1 && ${REPLACING_VERSIONS} != 2.32.1-r1 &&
-	      ${REPLACING_VERSIONS} != 3.4.1.1-r1 ]]; then
-		elog "Gnome Terminal no longer uses login shell by default, switching"
-		elog "to upstream default. Because of this, if you have some command you"
-		elog "want to be run, be sure to have it placed in your ~/.bashrc file."
-	fi
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
index 9d43bb73..4c8e8f6a 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
@@ -15,37 +15,41 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-3+"
 SLOT="0"
+IUSE="nautilus"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 fi
-IUSE="nautilus"
+
 
 # FIXME: automagic dependency on gtk+[X]
-RDEPEND=">=dev-libs/glib-2.33.2:2
+RDEPEND="
+	>=dev-libs/glib-2.33.2:2
 	>=x11-libs/gtk+-3.5.3:3[X]
 	>=x11-libs/vte-0.33.0:2.90
 	>=gnome-base/dconf-0.13.4
 	>=gnome-base/gconf-2.31.3:2
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	sys-apps/dbus
-	nautilus? ( >=gnome-base/nautilus-3 )"
+	nautilus? ( >=gnome-base/nautilus-3 )
+"
 DEPEND="${RDEPEND}
+	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
 	app-text/yelp-tools
 	dev-libs/libxml2
 	dev-util/gdbus-codegen
-	dev-util/gtk-builder-convert
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-src_prepare() {
+src_configure() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 	G2CONF="${G2CONF}
 		$(use_with nautilus nautilus-extension)"
 
-	gnome2_src_prepare
+	gnome2_src_configure
 }
 
 pkg_postinst() {
diff --git a/x11-terms/gnome-terminal/metadata.xml b/x11-terms/gnome-terminal/metadata.xml
new file mode 100644
index 00000000..6e0e2ecb
--- /dev/null
+++ b/x11-terms/gnome-terminal/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>