-DIST gtk-doc-1.15.tar.bz2 787687 RMD160 142ad9dca015ba69261fe44847f3a27721e06551 SHA1 fc1c593e8107cbe33451e3e938ca14b59104e999 SHA256 59cc73babf0db3a89d1a71f7ef5394a42ec1d3447d3a0a1539057a7b0ce44831
-DIST gtk-doc-1.16.tar.bz2 831330 RMD160 d9c3bbe9b86a424bd2d1a6af3f197ec3d14b925e SHA1 151036314302a0393f484bacabc120e456337a61 SHA256 552fd0a5e2bb104a9d8d5afebcf2292fbee83cd115e9f903df89e4518343eefb
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST gtk-doc-1.17.tar.bz2 832128 RMD160 d5da89f92d671992797908357dcfa71286fac6df SHA1 15be7bf929c62d4ad7c335436617295bb5f4d735 SHA256 911ff8c620743cea7b40156f1947f9470da5e723f35a9d8fb683e50c61830d1f
-EBUILD gtk-doc-am-1.15.ebuild 1420 RMD160 9f0244c0961c6f693169691f19fd2904a296cbfd SHA1 3458a25c6e1853d799f1a778518535350ce68efa SHA256 c264e2c5d9255056f545ef50110c6af9336d0366637d164b7d241da4a7b6f479
-EBUILD gtk-doc-am-1.16.ebuild 1424 RMD160 9d65f9cd4be46f4e94a6b6ab8fba8d4c9cbe864d SHA1 6d8bf0e5946dd7a73f03d805e4034a140003e9a3 SHA256 059bc0549296b8a677c129e81f0c500ab06cddb9e41cfb020f0d7e54d6db61a3
EBUILD gtk-doc-am-1.17.ebuild 1781 RMD160 016f6d5b7bf7a41e95ae7a818f37c00d62ef6dc5 SHA1 e488484437da68628f1ea6d9535f259952e1768e SHA256 d58a642b16abff9489f6a495a8ebd24351585f5be7df513f292bc73f74b7479a
-MISC ChangeLog 8111 RMD160 d35f18ffe645b9456bd25e010da205a5cc893af7 SHA1 5a331d76a02d80c2e45c5113c03fbc6bfe88bf47 SHA256 ff9c92252d5f2926ee7f10eb051411b895e9b9904f2fc559facbee3cdeac0c36
+MISC ChangeLog 8223 RMD160 441a7245a25264997d4e783219a1475cc54ab7d6 SHA1 8e154f2e37d6ce114475be9b49b7b1f494b1d5d7 SHA256 45f16ecdbb7584039c667d0c5fea93a345b59a085f486064ac6e6e1b064f724e
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5rmMwACgkQCaWpQKGI+9QXxACferwRE+KUwulutOfRbD07GiRh
+vtoAnA6lTjjvHHpRbFLc7CUSlbGMZKnK
+=usDq
+-----END PGP SIGNATURE-----
# 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
Hash: SHA1
AUX 61gtk-doc-gentoo.el 283 RMD160 9adc999d70cd5da21b0f02de2ecabca831d9e5cc SHA1 b5857c1b6a11fda687aa6aebb12c34daca2efcc3 SHA256 211c75484f2a4651a1e65a00c066640c3bf782030cfff5872a7af51bafd027c8
-AUX gtk-doc-1.13-fixxref-vim-u-NONE.patch 672 RMD160 d0b542ede146bcbdc5d1ec0feec5d897d5931c01 SHA1 f8c8a7c2309bcd6f637adb7c1c27125108708c1f SHA256 49c4704f9d8130c55c33bedeea043ca4026b71cd39d1403ecb05cd2671ea05e4
-AUX gtk-doc-1.15-allow-selection-highlighter.patch 2693 RMD160 8f06d9c8cfe759a8ba5f4bdc38992f6e9dcab72d SHA1 8940b7a45ccf413c2ea3df9fff989b451636f1fb SHA256 f71ca41839d9d5a1f4f2d648b303d4de1d434a909508e73dadc3cb160de96411
-AUX gtk-doc-1.15-fixxref-vim-fixes.patch 991 RMD160 d1425a549acb7e808c15fd340b7b8728c3d1c857 SHA1 d66784718684d5c16efdce201091c775fe09efe6 SHA256 3fb764d102aa75ea2e51e016e2dc1e1da7bec86b93e7f7dbb7ce66e775996d48
+AUX gtk-doc-1.17-buildir-docs.patch 865 RMD160 1a87d8ec2b6ef711657997280b622f0dcb634164 SHA1 89977f4d1c12464e1cea455bdd99216dbe0af31e SHA256 4ef59551df293293bb182e99f29be92969618e3f791ea4f274cdb9b9c4ccf70d
AUX gtk-doc-1.8-emacs-keybindings.patch 582 RMD160 b424c063ca1c2bb475fd7fa6bd66723230e395bb SHA1 73da3922797febe1c75336f291b72c0a1ad2e7f3 SHA256 e81eb1d06c489e19567277c9a14d84122025b0184e8773db2d421ab074fc8b38
-DIST gtk-doc-1.15.tar.bz2 787687 RMD160 142ad9dca015ba69261fe44847f3a27721e06551 SHA1 fc1c593e8107cbe33451e3e938ca14b59104e999 SHA256 59cc73babf0db3a89d1a71f7ef5394a42ec1d3447d3a0a1539057a7b0ce44831
DIST gtk-doc-1.16.tar.bz2 831330 RMD160 d9c3bbe9b86a424bd2d1a6af3f197ec3d14b925e SHA1 151036314302a0393f484bacabc120e456337a61 SHA256 552fd0a5e2bb104a9d8d5afebcf2292fbee83cd115e9f903df89e4518343eefb
DIST gtk-doc-1.17.tar.bz2 832128 RMD160 d5da89f92d671992797908357dcfa71286fac6df SHA1 15be7bf929c62d4ad7c335436617295bb5f4d735 SHA256 911ff8c620743cea7b40156f1947f9470da5e723f35a9d8fb683e50c61830d1f
-EBUILD gtk-doc-1.15-r2.ebuild 2918 RMD160 7d7c6c20ba0319870788022928c9daac2938bf9b SHA1 3714d54c7d553ad0034abd7783036e15db3efb5e SHA256 a48bf71c8aa8c8a678acb8f4ae50c4388c23471913dcf1bd2ef90774be315332
-EBUILD gtk-doc-1.15.ebuild 2378 RMD160 6ceb7165d045621acdcb3f479e1942775bfaf43e SHA1 67bd719b58278684135ed4b3d53bc0dbec7548b8 SHA256 230815023c10b333a3d7ebdc7e8bfdc7dc367a6ec4bbb7db146c1f94a9427935
EBUILD gtk-doc-1.16.ebuild 2670 RMD160 97cd5a4bc506bbc96d3e37264d42e4522a3b9d2d SHA1 1a70c80adc14adbde804edae4701acbb88bfe5dc SHA256 eb1c999a3317cc5d282c9e7c7ffe2c85cff4a9638da4f34e3c7db26609614ccf
+EBUILD gtk-doc-1.17-r1.ebuild 2828 RMD160 749f978ca9a81daa4a8eea535bde9976f787c73c SHA1 89fdd9900d38f70ce3713bcd23b35f5ebee99b8d SHA256 1be70393eafa076138ae57828200b0e163660f906956324898b06f4e8dc50ae0
EBUILD gtk-doc-1.17.ebuild 2698 RMD160 97929d1cb1363b9fb60ef02c5bf2d19b11cbe6de SHA1 7570783e2fd8dd519a8e9fd68ac88eb01b53cc7d SHA256 3482748ff6c0bcb2cfa4946211d31cd819e183e2adc200d32211b93b02811a5a
-MISC ChangeLog 22408 RMD160 8cafdde5c43c36520877eec1ca26a9524f9b80d0 SHA1 2fe5c4496708403a85b48d9e4795477637b4b9fd SHA256 83480ab353ec337decb7a203c054a83204ac448653e2f277dda34ab08fba16f9
+MISC ChangeLog 22863 RMD160 f634873eac8c836ed13155e39da1bbf7205f32d1 SHA1 389127381406089d8bdf18cf17e82d066e730dbc SHA256 fab3291aa6856d0c56ff605a9cfb58b729430ec18c2b5839e49cfd9be34d535a
MISC metadata.xml 568 RMD160 5fe3388f9787ccf8fda03317819d95da8758afba SHA1 3fb6c943baad4eec93070b6063b1ba1d8c48cc89 SHA256 351bf17354d07b9bc14055c0092cb0368387437cdf5c1707bdb5120e35419326
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJOWtbdAAoJEO/kOhxWD91kRTcP/RVZk7Hc5MfRg4Gec07zLjhi
-kWiO19a9PmnrW9no78TATiTZhMFej5J8yBP6dUEDjrc2JmE8r43/pVISX8LvYus+
-dorGx95qaHklKsFl7wKRLHXeMmdkck6ZN0ZUK4Lm5zwWTl5i8I7A6IRFxEqwDEYn
-Pb0XnasKrroowqtmacaNWlft5Zv3otjgoOtPEuE+4lzrWuUfv9pfSK8zddVPSsFM
-SfhT5Gi2vgZljTp544OjCsH7YHlYo8uQ5a6s474NVYUSvjCMdL4AKCtu0tgqystt
-7K74ZKsyswZCzPEEz3l5snHlNTrqvkv2MHzF4freoy4anh9qc07ZlLzHYXSyzvsl
-inYM+37E3KV9kqiTu+XoCp0v50NfrdqkKPsTPPdTmdIMdM+M5xVO0LyGA4Xdaf7s
-tejKGbO4RilqKKMOulIL3NeT0dQICzs3ZHG/IAFYy4PjNsLaRkRloUeQlLHhazri
-YlOFGr7ZE+Bn/o12dGQzmT2rewqItgd6m7RZrs11P8+n3oNyYXJmtD+iGcTwxp8B
-l1wjIb4cIt1CAm0LQ6br+ijRWIwNUnGEfqOcrDjFnF8k2jt3UAhntIMzveccn1qH
-TulvxHor9HZGeXUMxsVJG0gPOMpzlls8xSw8UbPXCoMPoQGHPyQ73Z2/sjDPmO8Q
-ThRjMQCIivpEN2pj8H7D
-=6hOr
+iEYEARECAAYFAk5rmGYACgkQCaWpQKGI+9R7EQCfdzkM55HRQDWJRB5GChMUSKv7
+b7AAnjOsNoVnm2rO/WPn9zrKXSdn8EtF
+=0j4A
-----END PGP SIGNATURE-----
+++ /dev/null
-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;
- {
+++ /dev/null
-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
-
+++ /dev/null
-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
--- /dev/null
+--- 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 \
+++ /dev/null
-# 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
-}
# 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"
else
G2CONF="${G2CONF} $(use_with highlight highlight source-highlight)"
fi
+ G2CONF+=" --with-xml-catalog=${EPREFIX}/etc/xml/catalog"
python_set_active_version 2
}
# 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() {
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
projects / gentoo.git / commitdiff