Version bump, drop old

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 22 insertions, 63 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 17ff8824af3d..73f35df2364e 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.269 2013/04/09 16:45:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.270 2013/04/18 19:35:46 pacho Exp $
+
+*gnome-terminal-3.8.1 (18 Apr 2013)
+
+  18 Apr 2013; Pacho Ramos <pacho@gentoo.org> +gnome-terminal-3.8.1.ebuild,
+  -gnome-terminal-2.32.1.ebuild, -gnome-terminal-3.6.1-r2.ebuild:
+  Version bump, drop old
 
   09 Apr 2013; Agostino Sarubbo <ago@gentoo.org>
   gnome-terminal-2.32.1-r1.ebuild:
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild
deleted file mode 100644
index baffba90af77..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-2.32.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 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.12 2013/03/30 17:22:27 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha sh sparc"
-IUSE=""
-
-# libgnome needed for some monospace font schema, bug #274638
-RDEPEND=">=dev-libs/glib-2.25.12:2
-	>=x11-libs/gtk+-2.18:2
-	>=gnome-base/gconf-2.31.3
-	>=x11-libs/vte-0.26.0:0
-	x11-libs/libSM
-	gnome-base/libgnome"
-DEPEND="${RDEPEND}
-	|| ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.3.11"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Use login shell by default (#12900)
-	epatch "${FILESDIR}"/${PN}-2.22.0-default_shell.patch
-}
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.8.1.ebuild
index e97e570e66bd..e2cf1c8a5b84 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.8.1.ebuild
@@ -1,63 +1,56 @@
 # Copyright 1999-2013 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.6.1-r2.ebuild,v 1.2 2013/02/25 09:14:40 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.8.1.ebuild,v 1.1 2013/04/18 19:35:46 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="The Gnome Terminal"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
+IUSE="+nautilus"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
 
 # 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
+	>=dev-libs/glib-2.33.2:2
+	>=x11-libs/gtk+-3.6:3[X]
+	>=x11-libs/vte-0.34.0:2.90
 	>=gnome-base/gconf-2.31.3
+	>=gnome-base/dconf-0.12
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	x11-libs/libSM
 	x11-libs/libICE
+	nautilus? ( >=gnome-base/nautilus-3 )
 "
 # 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
+	>=gnome-base/dconf-0.14.0
 	sys-devel/gettext
 	virtual/pkgconfig
-
-	gnome-base/gnome-common
 "
-# eautoreconf needs gnome-base/gnome-common
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=692233
-	epatch "${FILESDIR}/${PN}-3.6.1-no-gnome-doc-utils.patch"
-	# annoying window auto-resize behavior; fixed in 3.7.x
-	epatch "${FILESDIR}/${PN}-3.6.1-window-resize.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-}
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	DOCS="AUTHORS ChangeLog HACKING NEWS"
 	# FIXME: leave smclient configure unset until it accepts values from the
 	# switch and not from GDK_TARGET, bug #363033
-	gnome2_src_configure --with-gtk=3.0
+	gnome2_src_configure \
+		--enable-migration \
+		$(use_with nautilus nautilus-extension)
 }
 
 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
+		  ${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."