Fix bug 306569 by not loading vim plugins while calling vim in gtkdoc-fixxref

Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 122 insertions, 2 deletions

diff --git a/dev-util/gtk-doc/ChangeLog b/dev-util/gtk-doc/ChangeLog
index 122a4ab4a768..1e870242f391 100644
--- a/dev-util/gtk-doc/ChangeLog
+++ b/dev-util/gtk-doc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.116 2010/02/16 20:06:54 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/ChangeLog,v 1.117 2010/03/06 22:47:06 nirbheek Exp $
+
+*gtk-doc-1.13-r2 (06 Mar 2010)
+
+  06 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +gtk-doc-1.13-r2.ebuild, +files/gtk-doc-1.13-fixxref-vim-u-NONE.patch:
+  Fix bug 306569 by not loading vim plugins while calling vim in
+  gtkdoc-fixxref
 
 *gtk-doc-1.13-r1 (16 Feb 2010)
 
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 9e7bfd399e2f..04060281bf45 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -4,6 +4,7 @@ AUX gtk-doc-1.11-fix-index-id-gen.patch 2580 RMD160 e789564579a1cb8093dcdfd8009f
 AUX gtk-doc-1.11-quote-filenames-with-space.patch 1319 RMD160 7434284f8d94affa463583fb615d4e87e5f101b4 SHA1 f2cda31249b8443754db437cd38a20a518f10ac3 SHA256 e598e0abd05a09bef828ca2fb68b590813433e36c8ea2e889d94750154f530a7
 AUX gtk-doc-1.11-tests-fixes.patch 19569 RMD160 92060264998ece1e04abba7b2a381fb89815277e SHA1 101f1127f206d753ca1b5a562710ebe5272fb1f1 SHA256 24e408830b231d75702ee37d78de2652cfe6f8d18758d32e2b22c5f8ddf5aae8
 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.8-emacs-keybindings.patch 582 RMD160 b424c063ca1c2bb475fd7fa6bd66723230e395bb SHA1 73da3922797febe1c75336f291b72c0a1ad2e7f3 SHA256 e81eb1d06c489e19567277c9a14d84122025b0184e8773db2d421ab074fc8b38
 DIST gtk-doc-1.10.tar.bz2 404379 RMD160 b7f7563ddec9ff140fc6fc6feea5b7f49cb1ff32 SHA1 861c977b011efd1bf91957d1a02fb792f39e5509 SHA256 5aeefd055c47d4e8b906e7f74b7769ebafbe3873d90cb9987b2ec503a9b558eb
@@ -12,6 +13,7 @@ DIST gtk-doc-1.13.tar.bz2 644297 RMD160 36da31b769aa0e9d35c246160489d4c59a6f0e67
 EBUILD gtk-doc-1.10-r2.ebuild 2053 RMD160 3bf1fc4534a98bb2b2b6df51b27fce3ef8dd7104 SHA1 fe4b6a999b23238113c5795b6b6944a74cd0d217 SHA256 b34dc6c2404dc2a39e48127790d57ec1005683ce108d0b6184d93def985b93b4
 EBUILD gtk-doc-1.11.ebuild 2240 RMD160 e6c66b5a225a379e6b3c50bd2adbabd70a3c2179 SHA1 034d114a5970846de4e77d2b769a876f8e2d6c06 SHA256 3e169d4ecd2151e5b7062be3760395a9f4a6f916ab6a877bb5db65f28a65aaa9
 EBUILD gtk-doc-1.13-r1.ebuild 2469 RMD160 98d7df3759918bf34d8369aeed8dbf230eb9ac9c SHA1 dd60b8ca2d214d4bbba75ea9639bf238098836f7 SHA256 8b79f9d132b09121d98c6ab0483a463a2a0ec4eb9ec3248395ade1ac350a69a9
+EBUILD gtk-doc-1.13-r2.ebuild 2642 RMD160 41d09867df5cb62228065ab620c169a5c933861e SHA1 809591ed24afe0eb0179ea902fbed30d481dc07e SHA256 4959bc399628897ed13dd2e68b6ce37cf529c6602e896fd08bced0c4df2d8454
 EBUILD gtk-doc-1.13.ebuild 2048 RMD160 678eabc63c7f95c06e88196c5cce348d4f0179fc SHA1 bdd41a276a17a72e4083ac3bdf41ca309cfe4435 SHA256 be1afd4374c371096db869910f407de2cdd11375ce830483553b2ac37236a140
-MISC ChangeLog 16307 RMD160 b1d123668e732fedfcf98c45bfc9b3ac4f881363 SHA1 d77ed33e58ffce2d744b12dc8569755333b48a03 SHA256 0898222494d4b08b3840bdfab02875f2490061c5659b56fd0d015403940d75f8
+MISC ChangeLog 16550 RMD160 17bd27587462a227f3a2f3cc0933508511412290 SHA1 ae2d55935d5bc642ab8741166b8ae8bdacadbd6c SHA256 806bfa176cc5789356f84d0b8004dfc5d69ab893bc9424d96083816874fb62d1
 MISC metadata.xml 399 RMD160 c36a962162c4c335e5d5c3059b17709481e026c2 SHA1 2584444f5432843239cf7e1b0c4a04375eff1aee SHA256 ce4f066425793550cba43ceaac34ae7d582ff7d7e7ae085042b285479d1a4a57
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-vim-u-NONE.patch b/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-vim-u-NONE.patch
new file mode 100644
index 000000000000..6d608fcd9061
--- /dev/null
+++ b/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-vim-u-NONE.patch
@@ -0,0 +1,16 @@
+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;
+     {
diff --git a/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild
new file mode 100644
index 000000000000..f66e0fc6fcd1
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild
@@ -0,0 +1,95 @@
+# 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.1 2010/03/06 22:47:06 nirbheek 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"
+
+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 )"
+
+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"
+
+	# gtk-doc.make puts $(DOC_MODULE)-overrides.txt in EXTRA_DIST,
+	# so this file must exist to be able to "make dist".
+	# fix bug #305191, upstream ##590625.
+	epatch "${FILESDIR}/${P}-scan-touch-module-overrides.patch"
+	# This restores a compatible behavior with previous versions of gtk-doc,
+	# which is required by many tarballs, fix bug #305191, upstream #605211
+	epatch "${FILESDIR}/${P}-fixxref-compat.patch"
+
+	# Fix bug 306569 by not loading vim plugins while calling vim in
+	# gtkdoc-fixxref for fixing vim syntax highlighting
+	epatch "${FILESDIR}/${P}-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
+}