Upgraded the gtk-doc Portage package

Upgraded dev-util/gtk-doc to version 1.18 on amd64

BUG=chromium-os:24927
TEST=Run gtkdocize

Change-Id: I0889bbc429d43e3d1ebbbf5f3f48bc626f7b31b4
Reviewed-on: https://gerrit.chromium.org/gerrit/14103
Commit-Ready: Nathan J. Williams <njw@chromium.org>
Tested-by: Nathan J. Williams <njw@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

sdk_container/src/third_party/portage-stable/dev-util/gtk-doc/Manifest

@@ -1 +0,0 @@
-DIST gtk-doc-1.13.tar.bz2 644297 RMD160 36da31b769aa0e9d35c246160489d4c59a6f0e67 SHA1 8c6b157e594072aaf598bc7e68562ec02e50b651 SHA256 25c7fbfcd7a08995c665abe304c4da4ee6d1ea34db880f21b46fa9edb268b706

sdk_container/src/third_party/portage-stable/dev-util/gtk-doc/files/61gtk-doc-gentoo.el

@@ -0,0 +1,9 @@
+
+;;; gtk-doc site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'gtk-doc-insert "gtk-doc"
+  "Add a documentation header to the current function." t)
+(autoload 'gtk-doc-insert-section "gtk-doc"
+  "Add a section documentation header at the current position." t)

sdk_container/src/third_party/portage-stable/dev-util/gtk-doc/files/gtk-doc-1.17-buildir-docs.patch

@@ -0,0 +1,24 @@
+--- gtk-doc.make~	2011-02-02 23:11:15.000000000 +0100
++++ gtk-doc.make	2011-09-10 18:55:53.441311194 +0200
+@@ -208,8 +208,8 @@
+ 	rm -rf xml html
+ 
+ install-data-local:
+-	@installfiles=`echo $(srcdir)/html/*`; \
+-	if test "$$installfiles" = '$(srcdir)/html/*'; \
++	@installfiles=`echo $(builddir)/html/*`; \
++	if test "$$installfiles" = '$(builddir)/html/*'; \
+ 	then echo '-- Nothing to install' ; \
+ 	else \
+ 	  if test -n "$(DOC_MODULE_VERSION)"; then \
+--- gtk-doc.notmpl.make~	2011-02-02 23:11:09.000000000 +0100
++++ gtk-doc.notmpl.make	2011-09-10 18:57:06.305169389 +0200
+@@ -187,7 +187,7 @@
+ 
+ install-data-local:
+ 	@installfiles=`echo $(builddir)/html/*`; \
+-	if test "$$installfiles" = '$(srcdir)/html/*'; \
++	if test "$$installfiles" = '$(builddir)/html/*'; \
+ 	then echo '-- Nothing to install' ; \
+ 	else \
+ 	  if test -n "$(DOC_MODULE_VERSION)"; then \

sdk_container/src/third_party/portage-stable/dev-util/gtk-doc/files/gtk-doc-1.8-emacs-keybindings.patch

@@ -0,0 +1,17 @@
+--- gtk-doc-1.8-orig/tools/gtk-doc.el	2007-01-03 16:04:14.000000000 +0100
++++ gtk-doc-1.8/tools/gtk-doc.el	2007-07-29 21:56:45.000000000 +0200
+@@ -262,7 +262,7 @@
+ 
+ ;; set global binding for this key (follows the format for
+ ;;   creating a changelog entry ...)
+-(global-set-key "\C-x4h"  'gtk-doc-insert)
++;;(global-set-key "\C-x4h"  'gtk-doc-insert)
+ 
+ 
+ ;; Define another function for inserting a section header.
+@@ -280,4 +280,4 @@
+ 	  " */\n"))
+ 
+ ;; Set the key binding.
+-(global-set-key "\C-x4s" 'gtk-doc-insert-section)
++;;(global-set-key "\C-x4s" 'gtk-doc-insert-section)

sdk_container/src/third_party/portage-stable/dev-util/gtk-doc/gtk-doc-1.18.ebuild

@@ -1,31 +1,38 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/Attic/gtk-doc-1.13-r2.ebuild,v 1.10 2010/11/14 15:40:27 eva dead $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.18.ebuild,v 1.7 2011/10/30 15:35:30 armin76 Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
+GNOME_TARBALL_SUFFIX="xz"
+PYTHON_DEPEND="2"
 
-inherit eutils elisp-common gnome2
+inherit eutils elisp-common gnome2 python
 
 DESCRIPTION="GTK+ Documentation Generator"
 HOMEPAGE="http://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="debug doc emacs test"
+IUSE="debug doc emacs highlight vim test"
 
-# app-editors/vim blocker needed due bug #333313
+# dev-tex/tex4ht blocker needed due bug #315287
-RDEPEND=">=dev-libs/glib-2.6
+RDEPEND=">=dev-libs/glib-2.6:2
 	>=dev-lang/perl-5.6
 	>=app-text/openjade-1.3.1
 	dev-libs/libxslt
-	>=dev-libs/libxml2-2.3.6
+	>=dev-libs/libxml2-2.3.6:2
 	~app-text/docbook-xml-dtd-4.3
 	app-text/docbook-xsl-stylesheets
 	~app-text/docbook-sgml-dtd-3.0
 	>=app-text/docbook-dsssl-stylesheets-1.40
 	emacs? ( virtual/emacs )
-	!!>=app-editors/vim-7.3"
+	highlight? (
+		vim? ( || ( app-editors/vim app-editors/gvim ) )
+		!vim? ( dev-util/source-highlight )
+	)
+	!!<dev-tex/tex4ht-20090611_p1038-r1"
 
 DEPEND="${RDEPEND}
 	~dev-util/gtk-doc-am-${PV}
@@ -34,27 +41,25 @@ DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.3.2
 	test? ( app-text/scrollkeeper-dtd )"
 
+pkg_setup() {
 	SITEFILE=61${PN}-gentoo.el
-
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
 
+	if use vim; then
+		G2CONF="${G2CONF} $(use_with highlight highlight vim)"
+	else
+		G2CONF="${G2CONF} $(use_with highlight highlight source-highlight)"
+	fi
+	G2CONF+=" --with-xml-catalog=${EPREFIX}/etc/xml/catalog"
+
+	python_set_active_version 2
+}
+
 src_prepare() {
 	gnome2_src_prepare
 
 	# Remove global Emacs keybindings.
 	epatch "${FILESDIR}/${PN}-1.8-emacs-keybindings.patch"
-
-	# gtk-doc.make puts $(DOC_MODULE)-overrides.txt in EXTRA_DIST,
-	# so this file must exist to be able to "make dist".
-	# fix bug #305191, upstream ##590625.
-	epatch "${FILESDIR}/${P}-scan-touch-module-overrides.patch"
-	# This restores a compatible behavior with previous versions of gtk-doc,
-	# which is required by many tarballs, fix bug #305191, upstream #605211
-	epatch "${FILESDIR}/${P}-fixxref-compat.patch"
-
-	# Fix bug 306569 by not loading vim plugins while calling vim in
-	# gtkdoc-fixxref for fixing vim syntax highlighting
-	epatch "${FILESDIR}/${P}-fixxref-vim-u-NONE.patch"
 }
 
 src_compile() {
@@ -66,15 +71,17 @@ src_compile() {
 src_install() {
 	gnome2_src_install
 
+	python_convert_shebangs 2 "${ED}"/usr/bin/gtkdoc-depscan
+
 	# Don't install those files, they are in gtk-doc-am now
-	rm "${D}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
+	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
-	rm "${D}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase"
+	rm "${ED}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase"
 
 	if use doc; then
 		docinto doc
-		dodoc doc/*
+		dodoc doc/* || die
 		docinto examples
-		dodoc examples/*
+		dodoc examples/* || die
 	fi
 
 	if use emacs; then