Version bump for Gnome 3.6. Switch to EAPI=5.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 31 insertions, 63 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 24993fbf1926..d0bf280d9bd6 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.249 2012/11/25 00:21:22 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.250 2012/12/24 11:27:55 eva Exp $
+
+*gnome-terminal-3.6.1-r1 (24 Dec 2012)
+
+  24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-terminal-3.2.1.ebuild, -gnome-terminal-3.4.1.1.ebuild,
+  +gnome-terminal-3.6.1-r1.ebuild:
+  Version bump for Gnome 3.6. Switch to EAPI=5.
 
   25 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-terminal-2.32.1-r1.ebuild, gnome-terminal-3.4.1.1-r1.ebuild:
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild
deleted file mode 100644
index bebd7e23aa15..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.2.1.ebuild
+++ /dev/null
@@ -1,46 +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/gnome-terminal/gnome-terminal-3.2.1.ebuild,v 1.3 2012/05/03 07:11:33 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	>=x11-libs/gtk+-3.0:3
-	>=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 )
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.3.11
-	sys-devel/gettext"
-
-pkg_setup() {
-	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"
-}
-
-src_prepare() {
-	# Use login shell by default (#12900)
-	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
-
-	gnome2_src_prepare
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.4.1.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r1.ebuild
index 9c670cf0f87f..fa10d0f0326e 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.4.1.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r1.ebuild
@@ -1,47 +1,54 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.4.1.1.ebuild,v 1.3 2012/05/28 12:38:09 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r1.ebuild,v 1.1 2012/12/24 11:27:55 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="The Gnome Terminal"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-3"
+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=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X]
-RDEPEND=">=dev-libs/glib-2.26.0:2
+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"
+	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
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.3.11
-	sys-devel/gettext"
+"
 
-pkg_setup() {
+src_configure() {
 	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"
-}
 
-src_prepare() {
-	# Use login shell by default (#12900)
-	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
+	gnome2_src_configure
+}
 
-	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
 }