diff options
Diffstat (limited to 'dev-util/gtk-doc')
| -rw-r--r-- | dev-util/gtk-doc/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/gtk-doc/gtk-doc-1.17.ebuild (renamed from dev-util/gtk-doc/gtk-doc-1.15-r1.ebuild) | 47 |
2 files changed, 36 insertions, 19 deletions
diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog index e629d21923f0..da771e48c037 100644 --- a/dev-util/gtk-doc/ChangeLog +++ b/dev-util/gtk-doc/ChangeLog @@ -1,6 +1,12 @@ # 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.148 2011/02/24 18:54:47 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.149 2011/03/03 22:17:17 pacho Exp $ + +*gtk-doc-1.17 (03 Mar 2011) + + 03 Mar 2011; Pacho Ramos <pacho@gentoo.org> -gtk-doc-1.15-r1.ebuild, + +gtk-doc-1.17.ebuild: + Version bump, remove old. 24 Feb 2011; Thomas Kahle <tomka@gentoo.org> gtk-doc-1.16.ebuild: x86 stable per bug 353436 diff --git a/dev-util/gtk-doc/gtk-doc-1.15-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.17.ebuild index 236c6ba1fbe7..49317e60b089 100644 --- a/dev-util/gtk-doc/gtk-doc-1.15-r1.ebuild +++ b/dev-util/gtk-doc/gtk-doc-1.17.ebuild @@ -1,30 +1,35 @@ -# Copyright 1999-2010 Gentoo Foundation +# 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-r1.ebuild,v 1.1 2010/09/02 12:36:59 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.17.ebuild,v 1.1 2011/03/03 22:17:17 pacho Exp $ -EAPI="2" +EAPI="3" +PYTHON_DEPEND="2" -inherit eutils elisp-common gnome2 +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" -IUSE="debug doc emacs test" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~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? ( dev-util/source-highlight ) + ) !!<dev-tex/tex4ht-20090611_p1038-r1" DEPEND="${RDEPEND} @@ -36,18 +41,22 @@ DEPEND="${RDEPEND} SITEFILE=61${PN}-gentoo.el -DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO" +pkg_setup() { + DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO" + if use vim; then + G2CONF="${G2CONF} $(use_with highlight highlight vim)" + else + G2CONF="${G2CONF} $(use_with highlight highlight source-highlight)" + fi + G2CONF+=" --with-xml-catalog=${EPREFIX}/etc/xml/catalog" + python_set_active_version 2 +} 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 - # Also fix incompatibility with vim-7.3 (bug #333313) - epatch "${FILESDIR}/${P}-fixxref-vim-fixes.patch" } src_compile() { @@ -59,15 +68,17 @@ src_compile() { src_install() { gnome2_src_install + 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 |