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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 37 insertions, 74 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/Manifest b/x11-terms/gnome-terminal/Manifest
index 155130f9bced..1124dfc9b9e8 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -3,23 +3,18 @@ Hash: SHA256
 
 AUX gnome-terminal-2.22.0-default_shell.patch 491 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892 SHA512 bb3a5b25551d9d2d39dba791d0ff9231ef6f2247faf528ef7d699d5048fe3da26c06748add8b1529be80a7fcbe6f83dffea75fecb20cc68a393eff46a0915615 WHIRLPOOL 3c856ef243be930be1d6ff4f0afc8f464a3d97c8ab1859141b967a95bc583f34ce566352c61ec9105ab90e9ad369679ce5bedd9ebb0893545eae49e6e7a5e136
 DIST gnome-terminal-2.32.1.tar.bz2 2319315 SHA256 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb SHA512 791591ecd219f605ae815c7ef6d464889f628124e077052805a6890508c570d635c8677d2a83262aa2029bdf9db3e6fb3294cb57bd988ac47534dc7023858f66 WHIRLPOOL 11c27188d5e0a8dd29c13130f84695dd30548c0cca263dcc723b4a63a6fd13b0503c439a0e5c9502cf5d335dd60b04f2caec2fb967fc8b13e96dd17b904aef72
-DIST gnome-terminal-3.2.1.tar.xz 1990364 SHA256 c36a6bce466447526cb73779ee8e861f079e86cef68a50f7c8fbed540d5f373e SHA512 fab01bb45babe5d08a7ad9e8ed226c8da403cbabf59537cf53aa4d1d9222137a6b503538950c804789bfb3a8e25e1899f61ecc58a647128aa8d936b037b518ef WHIRLPOOL 81d2bde6c8f35608f4ae9b2e8c8c6422c7025bb6cfd02c9739b131338f8ae6395569aea2fb88d4506133c04ce722aa299b18e9f3de9cd1ef8146a1146bafafb1
 DIST gnome-terminal-3.4.1.1.tar.xz 2015448 SHA256 14d4a252fcbadf0a5fff89f1ff65f0a84d02f5e51c42f8fc14cee73eabc43fdd SHA512 75faad48f8a482df0e069aff391496a00cbebd3b7b90364fa5831c2371d47b0292606fdb73757fa3f01c44a9a012ee9bbb767f994acbdc09960a4354331cde39 WHIRLPOOL bef9c92ce4aa1d19e85d563f32eb50c45e1191b3d8f165c8a34764d4080e9bb6de649c798c4557e468c2d8f09834d49f3dcd7c2cc831f8e120cfec5e2b16f4b0
+DIST gnome-terminal-3.6.1.tar.xz 1648676 SHA256 c6816f77eaae791dadeef89596df811e2fa353088241aa0613bb8e1af63304f6 SHA512 b91c7a1c572e430bdfd9dc66c5c8720e1fb669b0495a278e89417c94788f215c2070b2f16dc5e2d2e1b12c41ab105af221c3816462962b3edb8ca40581598774 WHIRLPOOL f8681c9b4487d9a38287f029f057d6a7a301af091845298d46a0aa6527ce73b2efaf817dd7d8e97d89e6bb1004de9b22d3d44cbae9149071f8d1dbb0e265d58c
 EBUILD gnome-terminal-2.32.1-r1.ebuild 1326 SHA256 1638494982e6c8c121867d130fa0ed46ed79c05a9190cc1876e1a34ca5132c86 SHA512 d8dfa68e83d18dea4055c6a9575973f9f38143ec29485827f3b7c7351b6d1e3999e7e9db38eb647cd70866c9852e95b6f0e34d902763f9d3eea92b94de934af2 WHIRLPOOL f57b96cdbe3c4592d304238b8ec137586d35d1ad8c114e8fc2de8a166ec7a6700a745ea11f3ac0e02885ee257d32d021addf1aabbfd9cddea03651e6fee28a7e
 EBUILD gnome-terminal-2.32.1.ebuild 1110 SHA256 566914823131f191000591113e6701179f7c32a3566d4a140d65fd7a00c65c45 SHA512 69368c042dce5704865f3186f6137f185b236fe3740d5e4374ea65796f52a7003e3210e0c8d19749c2bd520265f699c49100b3016412c096d38184fd86cc7dd0 WHIRLPOOL e2f1d09d5025ca38c0b36b376e8a7a39ab6153751c024904cea66664558a4581bdcfd19928edf381fc7510cf5b1d1c87e49a1e3f7c884609647eb2279677a578
-EBUILD gnome-terminal-3.2.1.ebuild 1320 SHA256 e0b1d34f87f82010214202636d13c48b423ca7885efb98f7ab031d279bf29ef2 SHA512 053d94cd41e8af7fe03b7bc32da394a346f9c466f840f5465668efa1fb9e21d5d7afe70327473209e9b44bd3ec7cdd2625b653afaa48f7de9f6923c855944792 WHIRLPOOL ecbd78ee8dfd19e40d47bf01332c876efb3237e17c45f832c794120d2159456defe62a8502877d166b4a1a99634e45d41732ea0545fb2438e1b6bd30243632db
 EBUILD gnome-terminal-3.4.1.1-r1.ebuild 1598 SHA256 378ed4d7437907af6687b6f61ce5565e5f3ff9d4d7819286e357ada27bc6bf6d SHA512 15b599d651b796857f6c95e493f49a8120e763e156e5bb525edca8f52a4db4a09ecf99c776d8e078cc90f636e10a8ac42df354dc20e037587d931232ca659950 WHIRLPOOL 6d77af6110b4259b755888443b18bc3901bf1b140f74a4519f2df3fa30c32a57b39f5f24865038fabca52d8ed5275ba11b70398f8bee4f2069dfe364ec9a6dd1
-EBUILD gnome-terminal-3.4.1.1.ebuild 1377 SHA256 1a36da51182cf016f0932513896571dc3a36978b0504c25eee46439dfa827f1f SHA512 10c59be0f947ad18150dde5438945a18240a34be6cdbfe9cef9243cba062a86a05ddc6a9507d5001cf28faad7dd76dd37bb9d2006f0f89f2c114e7ef5ae5bbf8 WHIRLPOOL e945e034059e8bbcfca8662e21e3c2fa723b0945f2b841390081f8701256c1b1c972a593b55190ed735a362c26bc8e93257a6be1b7e595b498198f891b938f4e
-MISC ChangeLog 36052 SHA256 03d72e4df9026ce6658b9c7c1f7de3c35185a50d9831ef56f02edd3fe260f8b9 SHA512 04e97570e48a2732e92d59fc8423a608503b453e65ffbdebda512e9b3d158acea1d32a51fe5c36c4ae74ad7357fbdb62e512d5906ffbe8edb6ba8d9f3d7c8357 WHIRLPOOL 63837ae1530c90795399f659073a957cbcc8420013027e3bbbc2a5a6fff31764d37b261df6e0006670ff5a61b7f69ef7decae2c39f97c7c6235a2c8ddca7b7a9
+EBUILD gnome-terminal-3.6.1-r1.ebuild 1621 SHA256 c74c20b7bfd7d314c49c60b5ebac42955febdd5f96323c4b1623882392a2638a SHA512 cae6fdb45437f82d632fa3b8235aa6450ba2ba9ab85dbbad4eb090b411c7b4595771eaf960f464a78d98eb7b2d5ec0f22e9b920bb0805d83391dc18897c3798e WHIRLPOOL 0519bc5d9cadd33a87e261af42d3590d3df247bf549d4ed0e1c7beeac31422d4685d61d78d6e5658d24bae89d864503b38451b3ebbc6e21195f77d28a531a50c
+MISC ChangeLog 36288 SHA256 861dd84679bc13dcde035e3d8b10046a6dde98068c9081cf712da2019474a5e2 SHA512 c2212f46fa8219b420bd66359fd7208571091e65af4ec1a9ca9279abf3ab9c5c22988c29d6c4a0f706016ddc4860efe8fc7573a67d8c82cbe40714250327d5b8 WHIRLPOOL 1583d4ff412636f71a046ba5981bfefec6e7d8961ffa4e05268c0a6e58368c7a3f0be3bcf1aca9d0cbe56d57e27e2a1ef824773007ba4af28b50171aa5fddd91
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQsWSKAAoJEJ0WA1zPCt1hCjcH/jhrAJ/wn6R+q3rpDkHRgLPN
-FuoXCBG76chUn53mF3HqvFhwKPlV7JLVb9OcGcd/gHC3BlfapHtrw18JQicqJ0IL
-AcUOM6iAGnZJv7GlFkIN+tEd97NFMeJORdcCuDpYWmyDurHTFEdWNreRroJ/a+qQ
-t0BFVZ/6z7m9RSjvNL3/lWZUrafAQPey5gjtImDthXc3sRgGcUKSzP3DYaBodeCd
-84NO4yGQ72s8wRwf8rkvIobYaFnI48KapBaUkyoogUNIP65Rp4QEE+86doZ6v1Fo
-PvFQgf2IRQHcZSXHOGK5AwUltVWMjUi1znZ0f9n3goMdpkkx0m3oufJNvyxq1qs=
-=D3+4
+iEYEAREIAAYFAlDYPDwACgkQ1fmVwcYIWAbaSwCg7DcabtXSHvI0lcIv3lbm7LjN
+oMIAmgPlzMvOiiXJUXUcz/nVrYV4efuo
+=qY8a
 -----END PGP SIGNATURE-----
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
 }