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

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

3 files changed, 56 insertions, 4 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/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"