diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-02-11 03:04:59 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-02-11 03:04:59 +0000 |
| commit | ac5b6f5b495bb7e02f8408a98747c0521e671d7b (patch) | |
| tree | d6a5ea8457808991662f8f01ac0a8c921520522e | |
| parent | Bump with various bugfixes and optional support for systemd's logind. (diff) | |
| download | gentoo-2-ac5b6f5b495bb7e02f8408a98747c0521e671d7b.tar.gz gentoo-2-ac5b6f5b495bb7e02f8408a98747c0521e671d7b.tar.bz2 gentoo-2-ac5b6f5b495bb7e02f8408a98747c0521e671d7b.zip | |
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).
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)
| -rw-r--r-- | net-libs/webkit-gtk/ChangeLog | 8 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild | 18 |
2 files changed, 12 insertions, 14 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/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 |