When doing 'make install', look for generated docs in builddir, bug #379415 by Michał Górny. Remove old.

(Portage version: 2.1.10.14/cvs/Linux x86_64)

7 files changed, 51 insertions, 240 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index b8af5b76102a..c50df618cc74 100644
--- a/dev-util/gtk-doc/ChangeLog
+++ b/dev-util/gtk-doc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-util/gtk-doc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.160 2011/08/29 00:02:37 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.161 2011/09/10 17:03:28 pacho Exp $
+
+*gtk-doc-1.17-r1 (10 Sep 2011)
+
+  10 Sep 2011; Pacho Ramos <pacho@gentoo.org>
+  -files/gtk-doc-1.13-fixxref-vim-u-NONE.patch, -gtk-doc-1.15.ebuild,
+  -gtk-doc-1.15-r2.ebuild,
+  -files/gtk-doc-1.15-allow-selection-highlighter.patch,
+  -files/gtk-doc-1.15-fixxref-vim-fixes.patch, +gtk-doc-1.17-r1.ebuild,
+  +files/gtk-doc-1.17-buildir-docs.patch:
+  When doing 'make install', look for generated docs in builddir, bug #379415
+  by Michał Górny. Remove old.
 
   29 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gtk-doc-1.17.ebuild:
   Can use either vim or gvim for the /usr/bin/vim binary, bug 379647
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-vim-u-NONE.patch b/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-vim-u-NONE.patch
deleted file mode 100644
index 6d608fcd9061..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-vim-u-NONE.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Call vim with -u NONE instead of -u /dev/null
-This prevents plugins from being loaded, and fixes
-http://bugs.gentoo.org/show_bug.cgi?id=306569
-
----
---- gtkdoc-fixxref.in
-+++ gtkdoc-fixxref.in
-@@ -455,7 +455,7 @@
-     close (NEWFILE);
- 
-     # format source
--    system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|wa!|qa!' | @HIGHLIGHT@ -n -e -u /dev/null -T xterm >/dev/null";
-+    system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|wa!|qa!' | @HIGHLIGHT@ -n -e -u NONE -T xterm >/dev/null";
- 
-     my $highlighted_source;
-     {
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.15-allow-selection-highlighter.patch b/dev-util/gtk-doc/files/gtk-doc-1.15-allow-selection-highlighter.patch
deleted file mode 100644
index a3b2b9d1835a..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.15-allow-selection-highlighter.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 8506e3b61dca2861b594c3cea2dc4e0470aad4fc Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 26 Sep 2010 18:48:04 +0200
-Subject: [PATCH 01/13] Allow selection of a specific syntax highlighter, bug #628611.
-
----
- configure.ac |   53 +++++++++++++++++++++++++++++++++++++++++++----------
- 1 files changed, 43 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3d7c8e1..9dada11 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -100,26 +100,59 @@ JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/html/ch
- dnl
- dnl Check for syntax highlighters
- dnl
-+AC_ARG_WITH([highlight],
-+	AS_HELP_STRING([--with-highlight], [Select source code syntax highlighter (no|source-highlight|highlight|vim|auto)]),
-+	, [with_highlight=auto])
-+
-+case $with_highlight in
-+	no|source-highlight|highlight|vim|auto) ;;
-+	*) AC_MSG_ERROR([Invalid value for syntax highlighting option.]) ;;
-+esac
-+
- HIGHLIGHT_OPTIONS=""
--AC_PATH_PROG([HIGHLIGHT], [source-highlight])
--if test -n "$HIGHLIGHT"; then
--	HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i"
--else
--	AC_PATH_PROG([HIGHLIGHT], [highlight])
-+if test "$with_highlight" = "auto"; then
-+	AC_PATH_PROG([HIGHLIGHT], [source-highlight])
- 	if test -n "$HIGHLIGHT"; then
--		HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc "
-+		HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i"
- 	else
--		AC_PATH_PROG([HIGHLIGHT], [vim])
-+		AC_PATH_PROG([HIGHLIGHT], [highlight])
- 		if test -n "$HIGHLIGHT"; then
--			dnl vim is useless if it does not support syntax highlighting
-+			HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc "
-+		else
-+			AC_PATH_PROG([HIGHLIGHT], [vim])
-+			if test -n "$HIGHLIGHT"; then
-+				dnl vim is useless if it does not support syntax highlighting
-+				AC_MSG_CHECKING([whether vim has +syntax feature])
-+				if $HIGHLIGHT --version | grep '+syntax' >/dev/null; then
-+					AC_MSG_RESULT([yes])
-+				else
-+					AC_MSG_RESULT([no])
-+					HIGHLIGHT=
-+				fi
-+			fi
-+		fi
-+	fi
-+else
-+	if test "$with_highlight" != "no"; then
-+		AC_PATH_PROG([HIGHLIGHT], [$with_highlight], [no])
-+	fi
-+
-+	case $with_highlight in
-+		source-highlight) HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i";;
-+		highlight) HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc ";;
-+		vim)
- 			AC_MSG_CHECKING([whether vim has +syntax feature])
- 			if $HIGHLIGHT --version | grep '+syntax' >/dev/null; then
- 				AC_MSG_RESULT([yes])
- 			else
- 				AC_MSG_RESULT([no])
--				HIGHLIGHT=
-+				HIGHLIGHT=no
- 			fi
--		fi
-+		;;
-+	esac
-+
-+	if test "$HIGHLIGHT" = "no" && test "$with_highlight" != "no"; then
-+		AC_MSG_ERROR([Could not find requested syntax highlighter])
- 	fi
- fi
- AC_SUBST([HIGHLIGHT_OPTIONS])
--- 
-1.7.3.1
-
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.15-fixxref-vim-fixes.patch b/dev-util/gtk-doc/files/gtk-doc-1.15-fixxref-vim-fixes.patch
deleted file mode 100644
index ae29570487ef..000000000000
--- a/dev-util/gtk-doc/files/gtk-doc-1.15-fixxref-vim-fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0 Mon Sep 17 00:00:00 2001
-From: Stefan Kost <ensonic@users.sf.net>
-Date: Thu, 19 Aug 2010 14:45:54 +0000
-Subject: fixxref: tweak the vim invocation
-
-Use specific output-filename to ensure we get what we'll late use. Use "-u NONE"
-instead of -u /dev/null.
-Fixes #627223
----
-diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
-index 33a31b8..9f53852 100755
---- a/gtkdoc-fixxref.in
-+++ b/gtkdoc-fixxref.in
-@@ -464,7 +464,7 @@ sub HighlightSourceVim {
-     close (NEWFILE);
- 
-     # format source
--    system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|wa!|qa!' | @HIGHLIGHT@ -n -e -u /dev/null -T xterm >/dev/null";
-+    system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|w! $temp_source_file.html|qa!' | @HIGHLIGHT@ -n -e -u NONE -T xterm >/dev/null";
- 
-     my $highlighted_source;
-     {
---
-cgit v0.8.3.1
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.17-buildir-docs.patch b/dev-util/gtk-doc/files/gtk-doc-1.17-buildir-docs.patch
new file mode 100644
index 000000000000..2935f4b68cf4
--- /dev/null
+++ b/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 \
diff --git a/dev-util/gtk-doc/gtk-doc-1.15.ebuild b/dev-util/gtk-doc/gtk-doc-1.15.ebuild
deleted file mode 100644
index a54ec64fdb6f..000000000000
--- a/dev-util/gtk-doc/gtk-doc-1.15.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.15.ebuild,v 1.10 2010/10/17 14:54:14 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils elisp-common gnome2
-
-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"
-IUSE="debug doc emacs test"
-
-# dev-tex/tex4ht blocker needed due bug #315287
-# app-editors/vim blocker needed due bug #333313
-RDEPEND=">=dev-libs/glib-2.6
-	>=dev-lang/perl-5.6
-	>=app-text/openjade-1.3.1
-	dev-libs/libxslt
-	>=dev-libs/libxml2-2.3.6
-	~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 )
-	!!<dev-tex/tex4ht-20090611_p1038-r1
-	!!>=app-editors/vim-7.3"
-
-DEPEND="${RDEPEND}
-	~dev-util/gtk-doc-am-${PV}
-	>=dev-util/pkgconfig-0.19
-	>=app-text/scrollkeeper-0.3.14
-	>=app-text/gnome-doc-utils-0.3.2
-	test? ( app-text/scrollkeeper-dtd )"
-
-SITEFILE=61${PN}-gentoo.el
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove global Emacs keybindings.
-	epatch "${FILESDIR}/${PN}-1.8-emacs-keybindings.patch"
-
-	# Fix bug 306569 by not loading vim plugins while calling vim in
-	# gtkdoc-fixxref for fixing vim syntax highlighting
-	epatch "${FILESDIR}/${PN}-1.13-fixxref-vim-u-NONE.patch"
-}
-
-src_compile() {
-	gnome2_src_compile
-
-	use emacs && elisp-compile tools/gtk-doc.el
-}
-
-src_install() {
-	gnome2_src_install
-
-	# 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 "${D}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase"
-
-	if use doc; then
-		docinto doc
-		dodoc doc/*
-		docinto examples
-		dodoc examples/*
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} tools/gtk-doc.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		elog "gtk-doc does no longer define global key bindings for Emacs."
-		elog "You may set your own key bindings for \"gtk-doc-insert\" and"
-		elog "\"gtk-doc-insert-section\" in your ~/.emacs file."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/gtk-doc/gtk-doc-1.15-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.17-r1.ebuild
index 06e3c3a6469b..08ba7f239620 100644
--- a/dev-util/gtk-doc/gtk-doc-1.15-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.17-r1.ebuild
@@ -1,33 +1,33 @@
 # 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/gtk-doc-1.15-r2.ebuild,v 1.8 2011/01/28 10:25:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.17-r1.ebuild,v 1.1 2011/09/10 17:03:28 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="2"
 
-inherit autotools eutils elisp-common gnome2 python
+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 highlight vim test"
 
 # 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 )
 	highlight? (
-		vim? ( app-editors/vim )
+		vim? ( || ( app-editors/vim app-editors/gvim ) )
 		!vim? ( dev-util/source-highlight )
 	)
 	!!<dev-tex/tex4ht-20090611_p1038-r1"
@@ -48,6 +48,7 @@ pkg_setup() {
 	else
 		G2CONF="${G2CONF} $(use_with highlight highlight source-highlight)"
 	fi
+	G2CONF+=" --with-xml-catalog=${EPREFIX}/etc/xml/catalog"
 	python_set_active_version 2
 }
 
@@ -57,16 +58,8 @@ src_prepare() {
 	# Remove global Emacs keybindings.
 	epatch "${FILESDIR}/${PN}-1.8-emacs-keybindings.patch"
 
-	# Fix bug 306569 by not loading vim plugins while calling vim in
-	# gtkdoc-fixxref for fixing vim syntax highlighting
-	# Also fix incompatibility with vim-7.3 (bug #333313)
-	epatch "${FILESDIR}/${PN}-1.15-fixxref-vim-fixes.patch"
-
-	# Allow selection of specific highlighter, bug #334489
-	# In upstream's master
-	epatch "${FILESDIR}/${PN}-1.15-allow-selection-highlighter.patch"
-
-	eautoreconf
+	# When doing 'make install', look for generated docs in builddir.
+	epatch "${FILESDIR}/${PN}-1.17-buildir-docs.patch"
 }
 
 src_compile() {
@@ -78,17 +71,17 @@ src_compile() {
 src_install() {
 	gnome2_src_install
 
-	python_convert_shebangs 2 "${D}"/usr/bin/gtkdoc-depscan
+	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 "${D}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase"
+	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
+	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