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

[Pacho Ramos (pacho)]

pacho       10/09/02 12:36:59

  Modified:             gtk-doc-1.15.ebuild gtk-doc-1.13-r2.ebuild
                        ChangeLog
  Added:                gtk-doc-1.15-r1.ebuild
  Log:
  Fix bug #333313
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  dev-util/gtk-doc/gtk-doc-1.15.ebuild

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

Index: gtk-doc-1.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.15.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk-doc-1.15.ebuild	5 Aug 2010 16:30:15 -0000	1.5
+++ gtk-doc-1.15.ebuild	2 Sep 2010 12:36:59 -0000	1.6
@@ -1,6 +1,6 @@
 # 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.5 2010/08/05 16:30:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.15.ebuild,v 1.6 2010/09/02 12:36:59 pacho Exp $
 
 EAPI="2"
 
@@ -15,6 +15,7 @@
 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
@@ -25,7 +26,8 @@
 	~app-text/docbook-sgml-dtd-3.0
 	>=app-text/docbook-dsssl-stylesheets-1.40
 	emacs? ( virtual/emacs )
-	!!<dev-tex/tex4ht-20090611_p1038-r1"
+	!!<dev-tex/tex4ht-20090611_p1038-r1
+	!!>=app-editors/vim-7.3"
 
 DEPEND="${RDEPEND}
 	~dev-util/gtk-doc-am-${PV}



1.9                  dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild

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

Index: gtk-doc-1.13-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtk-doc-1.13-r2.ebuild	18 Aug 2010 21:06:56 -0000	1.8
+++ gtk-doc-1.13-r2.ebuild	2 Sep 2010 12:36:59 -0000	1.9
@@ -1,6 +1,6 @@
 # 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.13-r2.ebuild,v 1.8 2010/08/18 21:06:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild,v 1.9 2010/09/02 12:36:59 pacho Exp $
 
 EAPI="2"
 
@@ -14,6 +14,7 @@
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="debug doc emacs test"
 
+# 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
@@ -23,7 +24,8 @@
 	app-text/docbook-xsl-stylesheets
 	~app-text/docbook-sgml-dtd-3.0
 	>=app-text/docbook-dsssl-stylesheets-1.40
-	emacs? ( virtual/emacs )"
+	emacs? ( virtual/emacs )
+	!!>=app-editors/vim-7.3"
 
 DEPEND="${RDEPEND}
 	~dev-util/gtk-doc-am-${PV}



1.132                dev-util/gtk-doc/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- ChangeLog	18 Aug 2010 21:06:56 -0000	1.131
+++ ChangeLog	2 Sep 2010 12:36:59 -0000	1.132
@@ -1,6 +1,17 @@
 # ChangeLog for dev-util/gtk-doc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.131 2010/08/18 21:06:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.132 2010/09/02 12:36:59 pacho Exp $
+
+*gtk-doc-1.15-r1 (02 Sep 2010)
+
+  02 Sep 2010; Pacho Ramos <pacho@g.o> gtk-doc-1.13-r2.ebuild,
+  gtk-doc-1.15.ebuild, +gtk-doc-1.15-r1.ebuild,
+  +files/gtk-doc-1.15-fixxref-vim-fixes.patch:
+  Revision bump to fix incompatibility with vim-7.3 reported in bug #333313
+  by Ian Abbott, Ed Catmur and others. Applied upstream patch for fixing
+  this and also replacing gtk-doc-1.13-fixxref-vim-u-NONE.patch. Added a
+  blocker to affected versions to prevent future breakage when vim-7.3
+  reaches stable.
 
   18 Aug 2010; Markus Meier <maekke@g.o> gtk-doc-1.13-r2.ebuild:
   arm stable, bug #314899



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

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

Index: gtk-doc-1.15-r1.ebuild
===================================================================
# 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-r1.ebuild,v 1.1 2010/09/02 12:36:59 pacho 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
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"

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
	# Also fix incompatibility with vim-7.3 (bug #333313)
	epatch "${FILESDIR}/${P}-fixxref-vim-fixes.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
}