[gentoo-commits] gentoo-x86 commit in dev-util/gtk-doc: ChangeLog gtk-doc-1.17-r1.ebuild gtk-doc-1.15.ebuild gtk-doc-1.15-r2.ebuild

[gentoo-commits] gentoo-x86 commit in dev-util/gtk-doc: ChangeLog gtk-doc-1.17-r1.ebuild gtk-doc-1.15.ebuild gtk-doc-1.15-r2.ebuild

[Pacho Ramos (pacho)]

pacho       11/09/10 17:03:28

  Modified:             ChangeLog
  Added:                gtk-doc-1.17-r1.ebuild
  Removed:              gtk-doc-1.15.ebuild gtk-doc-1.15-r2.ebuild
  Log:
  When doing 'make install', look for generated docs in builddir, bug #379415 by Michał Górny. Remove old.
  
  (Portage version: 2.1.10.14/cvs/Linux x86_64)

Revision  Changes    Path
1.161                dev-util/gtk-doc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/gtk-doc/ChangeLog?rev=1.161&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/gtk-doc/ChangeLog?rev=1.161&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/gtk-doc/ChangeLog?r1=1.160&r2=1.161

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- ChangeLog	29 Aug 2011 00:02:37 -0000	1.160
+++ ChangeLog	10 Sep 2011 17:03:28 -0000	1.161
@@ -1,6 +1,17 @@
 # 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



1.1                  dev-util/gtk-doc/gtk-doc-1.17-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.17-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.17-r1.ebuild?rev=1.1&content-type=text/plain

Index: gtk-doc-1.17-r1.ebuild
===================================================================
# 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.17-r1.ebuild,v 1.1 2011/09/10 17:03:28 pacho Exp $

EAPI="3"
PYTHON_DEPEND="2"

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 ~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:2
	>=dev-lang/perl-5.6
	>=app-text/openjade-1.3.1
	dev-libs/libxslt
	>=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 app-editors/gvim ) )
		!vim? ( dev-util/source-highlight )
	)
	!!<dev-tex/tex4ht-20090611_p1038-r1"

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

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"

	# When doing 'make install', look for generated docs in builddir.
	epatch "${FILESDIR}/${PN}-1.17-buildir-docs.patch"
}

src_compile() {
	gnome2_src_compile

	use emacs && elisp-compile tools/gtk-doc.el
}

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 "${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/* || die
		docinto examples
		dodoc examples/* || die
	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
}