The tarball now comes with pre-generated documentation; install it when USE=doc since it looks much better than what is built with --enable-gtk-doc. As a side effect, fixes bug #402173 (thanks to Torsten Kaiser for reporting).

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

3 files changed, 19 insertions, 21 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index c430487e2ee7..e434e67b6d50 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.139 2012/02/04 10:04:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.140 2012/02/11 03:04:59 tetromino Exp $
+
+  11 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  webkit-gtk-1.6.3-r300.ebuild:
+  The tarball now comes with pre-generated documentation; install it when
+  USE=doc since it looks much better than what is built with --enable-gtk-doc.
+  As a side effect, fixes bug #402173 (thanks to Torsten Kaiser for reporting).
 
 *webkit-gtk-1.6.3-r200 (04 Feb 2012)
 *webkit-gtk-1.6.3-r300 (04 Feb 2012)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 320d9596812b..9ad633d0d8c9 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX webkit-gtk-1.2.3-fix-pool-sparc.patch 2518 RMD160 48ec89fb42403fae1b1533b54917a3311553cc78 SHA1 8c4e6c5e7c0c957ee1743a0d347b50f992460c17 SHA256 aee1f0d846c1e47c225e421a774fe93c49b71b7d31234fc5515d33922f130434
 AUX webkit-gtk-1.2.5-darwin-quartz.patch 1858 RMD160 a52d2ac9aebe425e455c729be0b30a58def94ea5 SHA1 550ff2ed27f2930ffb43b9c2fd8cc823cfa3f76d SHA256 694ad79c55d737a919f6246566c5c64a0282caf02fbdb6d371152da49bcf233d
@@ -18,13 +18,13 @@ EBUILD webkit-gtk-1.4.3-r300.ebuild 3559 RMD160 a508e11554ad3666d4180e94bfbef671
 EBUILD webkit-gtk-1.6.1-r201.ebuild 4906 RMD160 7d6e6cda401c26a335dbf697cc438e2dc844d279 SHA1 6c4c38abb181d1f58a5bb9293a06b1cc92e0b274 SHA256 e023d17baf382e0f8295fe86658945560de3622ac3ee43ad0fefb81e67952d9f
 EBUILD webkit-gtk-1.6.1-r301.ebuild 4842 RMD160 993c15ff4b3ba94fb74bae68f2eec9a32455fa47 SHA1 981856cdfae646aabe974f2ce6a06b2463365bf0 SHA256 1d78c2d6175660fe05bde35f55e86bdb3cebb13486758ac475cf6c9d2e7718a7
 EBUILD webkit-gtk-1.6.3-r200.ebuild 4672 RMD160 0fb8a14cde8aceca4d8364359a04d1f19617b75d SHA1 1333545bb7529f8fa5cbff6154c1443a4744d64d SHA256 c28294cd67fa5efe980137e3d57070f3d9c71e524a4444d7334ca13d5dab7ab8
-EBUILD webkit-gtk-1.6.3-r300.ebuild 4608 RMD160 1b06849d2fe5946efabd81c4b7fd29fe6fe87ed8 SHA1 605ec8462ef009025fb656b80003bd7c9287badd SHA256 3165f3658f98c6f1dfc58b6ce9111956d6a2d01e06a6275eb32d35cf436cae41
-MISC ChangeLog 27207 RMD160 90745f2d02ad1b538da21a42609501386e476dce SHA1 9f23a7a691700eb4a53b69fd7da1660af2aea7bc SHA256 9b05881899814fd79c7de6ca0db6704d5431691ecd56e20b248c6b5e1d0c1863
+EBUILD webkit-gtk-1.6.3-r300.ebuild 4504 RMD160 e890e1bc23aed80ff71024a7ca2dce633634e9c2 SHA1 3a81f216417f429a55a962e5681c611fa041ffaf SHA256 06b30cb4ee0171c875977384ffa5a45ced751fe3f640be7e6726013d51dd3638
+MISC ChangeLog 27536 RMD160 86f78729e4876f0589c83609cedf781a3536a9eb SHA1 adc7ce4949444cc4e2b1397ef24b03d3e1ee870b SHA256 0de2377b43bafcc7533d536a0998414ee855b07d42f58b4c40316eedf149c58d
 MISC metadata.xml 539 RMD160 422a84bfd5fd0ca7d32825e204b0a435a980ecd5 SHA1 33fe25bdc890c5e034d5dc02a82b028283e0cc03 SHA256 eb78ad3163ace16c943a2620ef1659d33913985b8a9584a2d734f021a82f7887
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8tAsIACgkQCaWpQKGI+9SpDwCfYPhQj3iImyJbEzqawkT85YCa
-uukAnA0eKn+yK+FWzhaLM5lMocqw2qQu
-=o856
+iF4EAREIAAYFAk812uEACgkQdjK8w9WeBnBRbwD8CMqCUTYiskaVxAgjES3auoUW
+ySEEClTBmVdyYQEfomMA/0n+Y8lzoPa8WXPju896vywtJ2Z1nvbZcMUoRvbxOAmV
+=rWy7
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
index bbba7ad67836..eb0e64257088 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild,v 1.1 2012/02/04 10:04:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild,v 1.2 2012/02/11 03:04:59 tetromino Exp $
 
 EAPI="4"
 
@@ -55,7 +55,6 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	dev-util/pkgconfig
 	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.10 )
 	test? ( x11-themes/hicolor-icon-theme )
 "
 
@@ -112,11 +111,12 @@ src_configure() {
 	# XXX: Check Web Audio support
 	# XXX: files for generating DerivedSources/WebKit2/* are missing, see
 	#      https://bugs.webkit.org/show_bug.cgi?id=66527
+	# Do not enable gtk-doc, the results look much worse than the docs that
+	# are shipped with the tarball.
 	myconf="
 		$(use_enable coverage)
 		$(use_enable debug)
 		$(use_enable debug debug-features)
-		$(use_enable doc gtk-doc)
 		$(use_enable spell spellcheck)
 		$(use_enable introspection)
 		$(use_enable gstreamer video)
@@ -131,15 +131,6 @@ src_configure() {
 	econf ${myconf}
 }
 
-src_compile() {
-	default
-
-	# ${PN} neither ships, nor builds documentation on its own
-	if use doc; then
-		emake -C "${S}/Source/WebKit/gtk/docs"
-	fi
-}
-
 src_test() {
 	unset DISPLAY
 	# Tests need virtualx, bug #294691, bug #310695
@@ -152,7 +143,8 @@ src_install() {
 
 	# ${PN} doesn't install documentation on its own
 	if use doc; then
-		emake DESTDIR=${D} -C "${S}/Source/WebKit/gtk/docs" install
+		insinto /usr/share/gtk-doc/html/webkitgtk
+		doins -r html/*
 	fi
 
 	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk