Version bump for Gnome 3.10

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 19 insertions, 78 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index d894050337e1..06c369583b3c 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.277 2013/12/08 19:51:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.278 2013/12/24 17:44:09 pacho Exp $
+
+*gnome-terminal-3.10.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gnome-terminal-3.10.2.ebuild,
+  -gnome-terminal-3.6.2.ebuild, -gnome-terminal-3.8.3.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-terminal-3.8.4.ebuild:
   x86 stable, bug #478252
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 3d781f96cade..85c874516ce1 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -4,19 +4,17 @@ Hash: SHA256
 AUX gnome-terminal-3.6.1-no-gnome-doc-utils.patch 818 SHA256 e6163f5e2794d238bd0bfe7c1997e423774a4579dcdb7e0d5108bc2247108634 SHA512 9c26ee63497f886b5cb3b779a7b7e08beeac8276349db0141c0544f94193305c640aecc6accb1cd9ce8cc8e0a66250a3bc46f735fededd5c0ceb16710d112ff2 WHIRLPOOL aa8c41d02febc9025d64b7140d93620899e6f4d3cbc55aeac51b15055fd3deebffb670f1e9814287d7e4e8608ab908f10a2a7b0c223d0d53c22b07561ec21a2f
 AUX gnome-terminal-3.6.1-window-resize.patch 986 SHA256 1ce91e6d4bf7ab8220ddadf1875a0ca065a2ff5a76653c5e7883bb45152522f2 SHA512 3df4ff654bdfbd12527bfc7c86da09bdcd064f4abd5eb53c1293e409c88fa279541857b06183581ec4b3bcee1a73af0d59f86218bad84be280bdd8ae6ca335ee WHIRLPOOL 50efc479dc2f8bc229c307d5717a11b8cd07d5d058f13d807d50fab359803b7201a698bcca79019ddf718197d15f0bf353bc8dfe121fe15281f8e9749c01bd22
 DIST gnome-terminal-2.32.1.tar.bz2 2319315 SHA256 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb SHA512 791591ecd219f605ae815c7ef6d464889f628124e077052805a6890508c570d635c8677d2a83262aa2029bdf9db3e6fb3294cb57bd988ac47534dc7023858f66 WHIRLPOOL 11c27188d5e0a8dd29c13130f84695dd30548c0cca263dcc723b4a63a6fd13b0503c439a0e5c9502cf5d335dd60b04f2caec2fb967fc8b13e96dd17b904aef72
-DIST gnome-terminal-3.6.2.tar.xz 1648532 SHA256 2df2f07c5dae9b2bb85ab75be249a285f97197ca954e9b80d8babf65832c416c SHA512 63c7c5a16850296fc1f5e01f2994c6ada516b1e0f4e399ca3aed780a77af2a4b49ee0dcf3b572b12736fe4fdc485abe2838e8707d60a07e422fffd5e664b82af WHIRLPOOL f0046e4f1ea7967422bec6636a655c5a2665c7a49e453bedc9f72048f0d4e862952b7fd3e97b46f3dbdd80781809757c6edbd4dd42a10791ea40729ce4db0af9
-DIST gnome-terminal-3.8.3.tar.xz 1614300 SHA256 b368a9220f9a50fecdb57ba8ce7008c65e3c236bc700325a45ecb806f3ab4651 SHA512 f1438175e6f143f1672897f9fe97b5bc3786437d40af8f41f12f63568a2a6101b95b2ea4d7d08bc3f4b680fc659c75883f12708e6f08b3574ac23ce6e5f7ba1e WHIRLPOOL 67ebfc815562e8752655475133c103fad6dab60b4a81d0dbab3f198dc587b42d0d43a195f84e9be40849c40101684e00e75abd553628fdd147c16e37c28f0514
+DIST gnome-terminal-3.10.2.tar.xz 1698184 SHA256 e02827c29de45c09973483d821ab29ea60ab3fbba34b62a81d67b8304a9ad913 SHA512 82a7667ccfdfc5e7d71827cea180c5381d8323d64c89de9916c104d3ef3d35d77b02e7a4af99f32437eeefa03e550ffd7cd7b1ac1b39a8a166e2e4db2239a169 WHIRLPOOL b0999d86230efa3eae390ed2b80c67bc3c1463b0552e574692f72246c7b4062176cf589624b1d88b5cd3a3346d3427c99df9113c8560623fcd1f5a1cd976f076
 DIST gnome-terminal-3.8.4.tar.xz 1625708 SHA256 5c1a1db9b4c5eb5780137bed5ed6a05afd82053bd5b2ad41180d4617c56a3f22 SHA512 456aff753fca2c7b6fad972dc9df4a3b8fd32e7bf02a2374e66bbf95c7c8cfdb80c480449a16d580abce061de6eb22e65636d1c4248fd1f2fa132240bac856e8 WHIRLPOOL c3a482b4d147f90349c6647eb463bdefd35545b6c7a56d0300254dc89c30c3bc3e1e76cf67d9c2d5ccaa415afc127d9b7d5daa3eb1484a2789ffcef37f2e85fd
 EBUILD gnome-terminal-2.32.1-r1.ebuild 1312 SHA256 e9bbcce3297ee86cb67fcf113a4c5b22125207f6b3bfcbe87852a785d12f93bf SHA512 8757a69065ad0e4b4d4f7ee78bd927b86e42143d63f500b45e9c1ae2975e5225c7dc7871ad2904f3108a3d0680cc2ab3054fac5ba696e78ee8d31fc7baed2a5e WHIRLPOOL c14d301dacf2cc42824d35a485c24778bd99937f54d2c177e5b183457bb2c41e813a6721167bf64230e08280d573e911ad1963b4b057d096369c040cadad7de9
-EBUILD gnome-terminal-3.6.2.ebuild 1860 SHA256 9b7451278d07e973c23191596f0dcd08599eef35ee50cfad25e72fedf1a7f1d4 SHA512 2605b4dba183dbf18874b6971a41e018297fe636e079102523564edb4a7fc300cb0c42277351f5cae89d66bfea7103bb75908672941ed69dd494548f163dff74 WHIRLPOOL 80bf63e85af4eab0059548a210dc257badbb19867e8416e2a52515061da598ea7e57b208e05bd95b233c123fd81c1aa3adf14e0b2aae6cfa26cb132bbdf6f269
-EBUILD gnome-terminal-3.8.3.ebuild 2117 SHA256 e9d81392e34e576b7ff1d70ae7f789dea377e0857e395e62ea495b135d2953b6 SHA512 b5b3a710378f1b48848ed305ef36b414f7b774c3e7ddcc6acac01881d25dbe5038a8aadb2b317350f4fd279a4df4d5b171ada7a3b69c31867ca2ffceef141f01 WHIRLPOOL ace31e7752e608ffe3adde6da99dc25e4c36abdb057c385fe2f0529dd081505501e643f25f16ef55f052906a7df5289295f3e5961df911de819f5516b3022134
+EBUILD gnome-terminal-3.10.2.ebuild 2127 SHA256 7a1d090f6c10d730cf189b8916a8381b4c274fb21da185b613c40515583e5abb SHA512 20b241162643cfa361fd9b1126d7d8198ac2903bc3b4bc79af300be09b120159bc738cbe00a0a5e73b0f26e71b8fc45f14800655c3b854ee12558f30a124448d WHIRLPOOL 49e063304578d6909bdc648fdbe5493d00a5bd48a2a773a1ae4c861a0b0ed78eee63421212e0150b03e6187718396e4628622ba986225f0fb1b409ccdfcf3235
 EBUILD gnome-terminal-3.8.4.ebuild 2117 SHA256 8695b777c6a6e6ec5363a47faf505ed8e0fac5436b427139890f0aad11883f70 SHA512 b9635f9ae1eb643eebca12d58c9ddc2e8ef59b5e74eb244fe028417d582c29599f67573a64926ea0f57fcc61772e7ef0e056423594f07090d6d53950dfbc8612 WHIRLPOOL becf1b76a2835e7845d3b9759214e11d54606ed8ebc47ded87b5da0329d0a2d0c9b63b7347683ce16b332be03c66440830243d7a90b52d8fbe7e8c1cfbe4279f
-MISC ChangeLog 40372 SHA256 3e313b71d397cd2f552690b71a6646912af9dc3795cdb9921efccf82a4b7c8a3 SHA512 53b5fb6fe7a3bed73077206a811aa9935f5b49736243b1d5c9a87df41df5aadc1265c4bcea815cd7f940513bcbe1906049eaa31892b7528c00cb18bfe92e7c0a WHIRLPOOL ae3b44a8da47a1ca56d666d1a69c58e98f40326e76c821b585e8d4ce8b7ea4c77373878ce584f8022ed7a7d075a4ba899eb364f091e5f7aea8377cf25ce6c635
+MISC ChangeLog 40580 SHA256 eef06b5c5754ecd952d3bdf7bce1ce360a425202db7938c99be361e875a1d416 SHA512 dbb18e1ecfef6a44aeeb848470483802956c365ad43add89f7af08453ef235573d5bc411143b7933f2a648d580876843d74b2d797dd2eef4cf7e4e25759d4bbb WHIRLPOOL 15fc83329f316905257846878ddd978786c232ae3155a6319e19b3c055695dea7e8bd485e669ce462cdba6289417d8f2be0157a11fb4082deb0f2ea8ceee02a5
 MISC metadata.xml 236 SHA256 52438878641b84b1b1c969ebdc240f8d350fb89cecfb53cd4ec717db936b99e2 SHA512 297d39a91b7518ae511e2144c83891f4f1410adb57aa0c3bebdf1f63c7071571c2e681051d12aa26ff55fca3f53670ebf81900db79eb391700d8730db30841fa WHIRLPOOL 3d97a2de485fc202f0e6b25bb188398a385284a63a4eff38a48fc0ba14565b650f7bc31b7ec70467c1dfda63ccfe1a862c56b76cee5e151e9d0023f8f32a8763
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkzbIACgkQCaWpQKGI+9QKoACfZC4WjliHkxu3aF+YlstKbslG
-pvoAnRcLLP+XY3oJFV7pYnn8skVm6mCJ
-=OCcW
+iEYEAREIAAYFAlK5x+oACgkQCaWpQKGI+9SBpQCeLAyBE45LPJ5gJnrQ6Ugld/CN
+LpkAnjmn6HoYnMsTkpiPkjnUJ6f4UVb7
+=C9lw
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.8.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild
index 0908fcd7519c..60c2d06a697d 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.8.3.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild
@@ -1,6 +1,6 @@
 # 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.8.3.ebuild,v 1.2 2013/06/30 21:36:40 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild,v 1.1 2013/12/24 17:44:09 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -20,9 +20,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~
 RDEPEND="
 	>=dev-libs/glib-2.33.2:2
 	>=x11-libs/gtk+-3.6:3[X]
-	>=x11-libs/vte-0.34.6:2.90
-	>=gnome-base/gconf-2.31.3
+	>=x11-libs/vte-0.34.9:2.90
 	>=gnome-base/dconf-0.12
+	>=gnome-base/gconf-2.31.3
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	sys-apps/util-linux
 	x11-libs/libSM
@@ -32,7 +32,6 @@ RDEPEND="
 # 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
@@ -44,16 +43,17 @@ DOC_CONTENTS="To get previous working directory inherited in new opened
 	. /etc/profile.d/vte.sh"
 
 src_configure() {
-	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 \
 		--disable-static \
 		--enable-migration \
-		$(use_with nautilus nautilus-extension)
+		$(use_with nautilus nautilus-extension) \
+		ITSTOOL=$(type -P true)
 }
 
 src_install() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS"
 	gnome2_src_install
 	readme.gentoo_create_doc
 }
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.6.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.6.2.ebuild
deleted file mode 100644
index bacabfb09ea8..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.6.2.ebuild
+++ /dev/null
@@ -1,63 +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-3.6.2.ebuild,v 1.1 2013/03/31 18:29:34 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="The Gnome Terminal"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-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
-	>=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
-
-	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"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-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
-	gnome2_src_configure --with-gtk=3.0
-}
-
-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
-}