[gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/

[Alexandre Restovtsev]

commit:     28bce071ba4872b8f134d71e61088a6f4bc2ec23
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 20:36:36 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 29 23:10:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=28bce071

net-libs/webkit-gtk: fix USE=doc build

The special Source/WebKit/gtk/docs handling for src_compile is no longer
needed in 1.7.1. Unfortunately, in 1.7.1 the makefiles have no provision
for actually installing docs; add a patch to fix that.
Fixes build with USE=doc. Thanks to Marien Zwart for reporting on IRC.

---
 .../files/webkit-gtk-1.7.1-install-docs.patch      |   43 ++++++++++++++++++++
 net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild   |   13 +-----
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.1-install-docs.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.1-install-docs.patch
new file mode 100644
index 0000000..b053908
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.7.1-install-docs.patch
@@ -0,0 +1,43 @@
+Enable gtk-doc installation when building with --enable-gtk-doc
+
+--- a/Source/WebKit/gtk/GNUmakefile.gtk-doc.am
++++ b/Source/WebKit/gtk/GNUmakefile.gtk-doc.am
+@@ -180,6 +180,38 @@
+ 	@rm -rf Documentation/xml Documentation/html
+ 	-@rmdir Documentation
+ 
++if ENABLE_GTK_DOC
++install-data-local:
++	@installfiles=`echo $(builddir)/html/*`; \
++	if test "$$installfiles" = '$(builddir)/html/*'; \
++	then echo 1>&2 'Nothing to install' ; \
++	else \
++	  if test -n "$(DOC_MODULE_VERSION)"; then \
++	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
++	  else \
++	    installdir="$(DESTDIR)$(TARGET_DIR)"; \
++	  fi; \
++	  $(mkinstalldirs) $${installdir} ; \
++	  for i in $$installfiles; do \
++	    echo ' $(INSTALL_DATA) '$$i ; \
++	    $(INSTALL_DATA) $$i $${installdir}; \
++	  done; \
++	  if test -n "$(DOC_MODULE_VERSION)"; then \
++	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
++	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
++	  fi; \
++	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
++	fi
++
++uninstall-local:
++	@if test -n "$(DOC_MODULE_VERSION)"; then \
++	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
++	else \
++	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
++	fi; \
++	rm -rf $${installdir}
++endif
++
+ #
+ # Require gtk-doc when making dist
+ #

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild
index a2a1f7a..f79732a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild
@@ -88,6 +88,9 @@ src_prepare() {
 	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
 	mkdir -p DerivedSources/ANGLE
 
+	# Install docs on "make install" when USE=doc
+	epatch "${FILESDIR}/${PN}-1.7.1-install-docs.patch"
+
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }
@@ -130,11 +133,6 @@ src_compile() {
 	# Fix sandbox error with USE="introspection"
 	# https://bugs.webkit.org/show_bug.cgi?id=35471
 	emake XDG_DATA_HOME="${T}/.local"
-
-	# ${PN} neither ships, nor builds documentation on its own
-	if use doc; then
-		emake -C "${S}/Source/WebKit/gtk/docs"
-	fi
 }
 
 src_test() {
@@ -148,11 +146,6 @@ src_test() {
 src_install() {
 	default
 
-	# ${PN} doesn't install documentation on its own
-	if use doc; then
-		emake DESTDIR=${D} -C "${S}/Source/WebKit/gtk/docs" install
-	fi
-
 	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
 	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
 	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore