Avoid useless gnome-doc-utils check (bug #453394, thanks to jeremy). Restore arm keyword since dependencies have been rekeyworded.

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 73 insertions, 6 deletions

diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 5eb832a54e60..3098b499b29e 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.254 2013/01/06 11:23:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.255 2013/01/21 20:25:40 tetromino Exp $
+
+  21 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-terminal-3.6.1-r1.ebuild,
+  +files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch:
+  Avoid useless gnome-doc-utils check (bug #453394, thanks to jeremy). Restore
+  arm keyword since dependencies have been rekeyworded.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> gnome-terminal-3.6.1-r1.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index d10814e72a08..d801dbcb5280 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,10 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gnome-terminal-2.22.0-default_shell.patch 491 SHA256 efcd9d5074cb4653a3725008290d6b6ae5e8835cfbcbc25f3dfcaf3e7aad2892 SHA512 bb3a5b25551d9d2d39dba791d0ff9231ef6f2247faf528ef7d699d5048fe3da26c06748add8b1529be80a7fcbe6f83dffea75fecb20cc68a393eff46a0915615 WHIRLPOOL 3c856ef243be930be1d6ff4f0afc8f464a3d97c8ab1859141b967a95bc583f34ce566352c61ec9105ab90e9ad369679ce5bedd9ebb0893545eae49e6e7a5e136
+AUX gnome-terminal-3.6.1-no-gnome-doc-utils.patch 818 SHA256 e6163f5e2794d238bd0bfe7c1997e423774a4579dcdb7e0d5108bc2247108634 SHA512 9c26ee63497f886b5cb3b779a7b7e08beeac8276349db0141c0544f94193305c640aecc6accb1cd9ce8cc8e0a66250a3bc46f735fededd5c0ceb16710d112ff2 WHIRLPOOL aa8c41d02febc9025d64b7140d93620899e6f4d3cbc55aeac51b15055fd3deebffb670f1e9814287d7e4e8608ab908f10a2a7b0c223d0d53c22b07561ec21a2f
 DIST gnome-terminal-2.32.1.tar.bz2 2319315 SHA256 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb SHA512 791591ecd219f605ae815c7ef6d464889f628124e077052805a6890508c570d635c8677d2a83262aa2029bdf9db3e6fb3294cb57bd988ac47534dc7023858f66 WHIRLPOOL 11c27188d5e0a8dd29c13130f84695dd30548c0cca263dcc723b4a63a6fd13b0503c439a0e5c9502cf5d335dd60b04f2caec2fb967fc8b13e96dd17b904aef72
 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.4.1.1-r1.ebuild 1598 SHA256 378ed4d7437907af6687b6f61ce5565e5f3ff9d4d7819286e357ada27bc6bf6d SHA512 15b599d651b796857f6c95e493f49a8120e763e156e5bb525edca8f52a4db4a09ecf99c776d8e078cc90f636e10a8ac42df354dc20e037587d931232ca659950 WHIRLPOOL 6d77af6110b4259b755888443b18bc3901bf1b140f74a4519f2df3fa30c32a57b39f5f24865038fabca52d8ed5275ba11b70398f8bee4f2069dfe364ec9a6dd1
-EBUILD gnome-terminal-3.6.1-r1.ebuild 1616 SHA256 13d22d6ad7b3cb57667495df3422cb6f07f160b86b32a8c476321e25994a9bdc SHA512 bf24c2c2065c21b18e2c1562b836f746cf708f8349d828aa341a5b03b997e50df833ac7ac2921a21718175d96b5e70a54dee8c495eb5ee8c64b42c060608ce65 WHIRLPOOL 5be4fda8a5d640ae5dea5f6f349e6bafd4bd519cddf8df83ac77ce1258fbaf7a5d84b41605c7e037868f408f528ab647d962a71b9e19612418e071d761ec6ebf
-MISC ChangeLog 36787 SHA256 9bab824b2f60dec2fd9e3ef682f9eb3b676f7e5135e73c715922cc296d85d817 SHA512 7cb00af8c076c972a3a4bcf1a85a769e44ef9829e3fe10ac62a0360ae303ec9af5198e18ed0f94a431ec6acdcc3e38a3b8a2b4f009e769d0bc096efc207a5186 WHIRLPOOL d0d5b12599c321f422c74352dd3eab02bee238f8459e2a3ef3317dba7309497f78c98db1eacddd2946f0eb6406596064a6ea975dca8f1da0902cbe66d8825e9b
+EBUILD gnome-terminal-3.6.1-r1.ebuild 1878 SHA256 56532f6c54dafc86f9caff15c2506cbd3f57fe2ff956b5c27a375cd4d908956a SHA512 3be7fb146b2e32587819163d77be4a2e4108b51a9be048a51f1f3703cf7f449e295bac36c0ce624d921fc700e0cc18769ca9e281c0bf6115f4d23fc539404efb WHIRLPOOL 38b5ce3ed2b30eba4055589053cdcbbb5d492307c059fefb142b8a8b1c79857913bab7415d5519bab7d6a19da987858aa1d28bd9c15817fa97f6980fb0688625
+MISC ChangeLog 37078 SHA256 be68b849c41d7bcb9b162b68d9aa151ee6889a850fc37e44676683e140417534 SHA512 ce58b0b570f1b87895c958a9b42122e2b6a46a7443ce50eae050a09436e0495b8668b41736288c04fee7347171426b2d8339ec5e3cde9fb17cd99e831514ffa6 WHIRLPOOL 138db23c28041e96fcb50201521921ce87d35057658612d8b30f8aa414b3d49764920c590dc50b407e02cf30fd54c17698b3bdfad4ebcfdbd4ba268b5dd68e23
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ/aRFAAoJEJ0WA1zPCt1hIB8H/34qgLO+UWF0UKhEg5nxdhPu
+ilou4va2tH4oox0SgLZyGV6raYmOSSd5BzqKugrAptQKQY9tvuLbUsOmQANzTVSJ
+JfmJTOdD8KzJvR0UnmW4NzphigT8JTX10BUu5weCc3wxDSDK2nZQY6/9pGyu2Cw5
+Usv2d5bhGkyfoE3w2wbGkTeLS5x2FR5cJ2C0AfrS/9HXy562+E8ugWIHtUCcWnn+
+H2DjjVDcBLkbhuGstIUa0Gidr8jQ3tqRRR2DnLWmB3WpUmkUN9XG8rqI7MMscoI0
+lZw2iIxn3u48wIu3cmG9H27bH7SCybfCC/Q1jhEzAandgeBbRsiqOl79iwjDwwY=
+=rttm
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch
new file mode 100644
index 000000000000..369bc9e61064
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch
@@ -0,0 +1,36 @@
+From ce8ba57e66b1e7dca878a446ce13977a33827feb Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 21 Jan 2013 15:11:54 -0500
+Subject: [PATCH] Don't check for gnome-doc-utils, we are no longer using them.
+
+Restore GNOME_COMMON_INIT to match gnome-terminal 3.7.x.
+---
+ configure.ac | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index bfa1c8a..e056d16 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,8 +32,7 @@ AC_HEADER_STDC
+ AM_PROG_LIBTOOL
+ IT_PROG_INTLTOOL([0.40.0])
+ 
+-# User documentation
+-YELP_HELP_INIT
++GNOME_COMMON_INIT
+ 
+ GNOME_DEBUG_CHECK
+ 
+@@ -154,7 +153,7 @@ AC_SUBST([GTK_BUILDER_CONVERT_FLAGS])
+ # Documentation
+ # *************
+ 
+-GNOME_DOC_INIT
++YELP_HELP_INIT
+ 
+ # ****************************
+ 
+-- 
+1.8.1.1
+
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
index 4bf60b521170..4aeadea19661 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r1.ebuild
@@ -1,11 +1,11 @@
 # 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-r1.ebuild,v 1.5 2013/01/06 11:23:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-3.6.1-r1.ebuild,v 1.6 2013/01/21 20:25:40 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="The Gnome Terminal"
 HOMEPAGE="http://www.gnome.org/"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+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="
@@ -32,7 +32,17 @@ DEPEND="${RDEPEND}
 	>=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"