Fix bug #333313

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

6 files changed, 142 insertions, 11 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index 30d1e51aa0a3..4f6de7b8c3f0 100644
--- a/dev-util/gtk-doc/ChangeLog
+++ b/dev-util/gtk-doc/ChangeLog
@@ -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@gentoo.org> 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@gentoo.org> gtk-doc-1.13-r2.ebuild:
   arm stable, bug #314899
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index d2cc7acef698..73c6e49062c7 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -9,19 +9,21 @@ AUX gtk-doc-1.11-tests-fixes.patch 19569 RMD160 92060264998ece1e04abba7b2a381fb8
 AUX gtk-doc-1.13-fixxref-compat.patch 2262 RMD160 a3700d7a6e6310dc152e5307b6a7ec6201c82268 SHA1 3a8af73749d6447f1bdfe0411ce91acae4fac1cc SHA256 7532a8ffdc6a7b814e90269a069433d949a6f5c34928e56ca5af5a2ec3ad237f
 AUX gtk-doc-1.13-fixxref-vim-u-NONE.patch 672 RMD160 d0b542ede146bcbdc5d1ec0feec5d897d5931c01 SHA1 f8c8a7c2309bcd6f637adb7c1c27125108708c1f SHA256 49c4704f9d8130c55c33bedeea043ca4026b71cd39d1403ecb05cd2671ea05e4
 AUX gtk-doc-1.13-scan-touch-module-overrides.patch 1041 RMD160 7f10f662b0b8d1a618491b5e5541f99870f50277 SHA1 29efa4a1f6d580ff933a6b50e8e4766c21906c17 SHA256 4ed735326d5038b8bb4f9a6a2c698eec2f974088277c5242b70e74c371ca6ff0
+AUX gtk-doc-1.15-fixxref-vim-fixes.patch 991 RMD160 d1425a549acb7e808c15fd340b7b8728c3d1c857 SHA1 d66784718684d5c16efdce201091c775fe09efe6 SHA256 3fb764d102aa75ea2e51e016e2dc1e1da7bec86b93e7f7dbb7ce66e775996d48
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 RMD160 b424c063ca1c2bb475fd7fa6bd66723230e395bb SHA1 73da3922797febe1c75336f291b72c0a1ad2e7f3 SHA256 e81eb1d06c489e19567277c9a14d84122025b0184e8773db2d421ab074fc8b38
 DIST gtk-doc-1.11.tar.bz2 453459 RMD160 802c61e4e2072f5e91fe65d6f40587313b7bd23b SHA1 685823e269cc08fdef50828b0a68697222877b1c SHA256 92135cdf89c48a52baa8920f69d702b22d1a7556af410709d2172b90ec33ff23
 DIST gtk-doc-1.13.tar.bz2 644297 RMD160 36da31b769aa0e9d35c246160489d4c59a6f0e67 SHA1 8c6b157e594072aaf598bc7e68562ec02e50b651 SHA256 25c7fbfcd7a08995c665abe304c4da4ee6d1ea34db880f21b46fa9edb268b706
 DIST gtk-doc-1.15.tar.bz2 787687 RMD160 142ad9dca015ba69261fe44847f3a27721e06551 SHA1 fc1c593e8107cbe33451e3e938ca14b59104e999 SHA256 59cc73babf0db3a89d1a71f7ef5394a42ec1d3447d3a0a1539057a7b0ce44831
 EBUILD gtk-doc-1.11.ebuild 2240 RMD160 e6c66b5a225a379e6b3c50bd2adbabd70a3c2179 SHA1 034d114a5970846de4e77d2b769a876f8e2d6c06 SHA256 3e169d4ecd2151e5b7062be3760395a9f4a6f916ab6a877bb5db65f28a65aaa9
-EBUILD gtk-doc-1.13-r2.ebuild 2628 RMD160 464c77ffd21fa94fe1a17ca2d8cef93ab4cffb82 SHA1 59fab637bdb4c33d26699e0d065607a3714bcd60 SHA256 77dd879d9b5ed49cb8f79fb55c58094312a6e00f282b2ba4516a9f057f06c580
-EBUILD gtk-doc-1.15.ebuild 2308 RMD160 14b1f94e859b81c169baa8b77f47c53714056ba7 SHA1 5ab225082844e5a192c9e9c1422697ce4c28696a SHA256 3934cc672cdfa2de9193327ed3b8cc7cf594cedfb205bff860cad14422dbfa02
-MISC ChangeLog 18163 RMD160 2d243c5c2aca758e76b1634de95bba1837405e62 SHA1 21e80b3294dd8cb81e74a98c5217cdc675dca292 SHA256 414423507e0dbee658d0d7f71e230ef992af7602b238ebedc311965ff04d15fe
+EBUILD gtk-doc-1.13-r2.ebuild 2701 RMD160 620f2755246be418a08cd415eb88f8e17837a9e7 SHA1 bfe247d06a55b4cf5feeecc67619b24fad72c49a SHA256 4aa6867f4799d4624b15ac2a3908f37d743983f2990a44faccfe2b7b6db11c38
+EBUILD gtk-doc-1.15-r1.ebuild 2364 RMD160 6ec447fa8c4ff28dd4681af8674030be71aa692e SHA1 b5b47e46b850a6bd2f7927571b2df431636838fa SHA256 fa2c55971bf81a70ef80428b61e07581aba54062b9a6a097c3405d70fe68bfed
+EBUILD gtk-doc-1.15.ebuild 2384 RMD160 76710a3091556b1e5b073de338d941556b16633a SHA1 6041354db456a471ef3a6d7c79f290309f4e5fc7 SHA256 57df2693c5c2179a6d64135d84c6f6e9c63622940bf5801fb6b7b9433028bdb7
+MISC ChangeLog 18671 RMD160 13aa7e66d6cea9bb470294f1c031d97716fb2375 SHA1 027f4990232c0e6fb78f657c673083a2a491c3ab SHA256 9399c9d4db5858b28e44f29962df31a4659940221ff8dd8e9a79ec9df9478a0f
 MISC metadata.xml 399 RMD160 c36a962162c4c335e5d5c3059b17709481e026c2 SHA1 2584444f5432843239cf7e1b0c4a04375eff1aee SHA256 ce4f066425793550cba43ceaac34ae7d582ff7d7e7ae085042b285479d1a4a57
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxsSxAACgkQkKaRLQcq0GKNmwCfZdrjgmRKFT2LrjyB7w33/wVN
-gQ0An3/KwEUH4AzRaF+uWMMGkK/L3z73
-=LXxF
+iEYEARECAAYFAkx/mnQACgkQCaWpQKGI+9TKHwCfeAGxVNoJGu6fBJlPGzkUSWCo
+RkEAn0ppavBdFkMkb5gDv6N1ChCJMtf9
+=tGpL
 -----END PGP SIGNATURE-----
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.15-fixxref-vim-fixes.patch b/dev-util/gtk-doc/files/gtk-doc-1.15-fixxref-vim-fixes.patch
new file mode 100644
index 000000000000..ae29570487ef
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.15-fixxref-vim-fixes.patch
@@ -0,0 +1,24 @@
+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
diff --git a/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild
index b30b33eeb7c5..c06e60b3d005 100644
--- a/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild
@@ -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 @@ 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"
 
+# 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 @@ RDEPEND=">=dev-libs/glib-2.6
 	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}
diff --git a/dev-util/gtk-doc/gtk-doc-1.15-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.15-r1.ebuild
new file mode 100644
index 000000000000..236c6ba1fbe7
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.15-r1.ebuild
@@ -0,0 +1,90 @@
+# 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
+}
diff --git a/dev-util/gtk-doc/gtk-doc-1.15.ebuild b/dev-util/gtk-doc/gtk-doc-1.15.ebuild
index b2ebd5f84c54..601aa59cf394 100644
--- a/dev-util/gtk-doc/gtk-doc-1.15.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.15.ebuild
@@ -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 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 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 @@ RDEPEND=">=dev-libs/glib-2.6
 	~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}