Fix xml, bug #82789

Package-Manager: portage-2.0.51.16-militant-sandwich

5 files changed, 132 insertions, 13 deletions

diff --git a/app-vim/gentoo-syntax/ChangeLog b/app-vim/gentoo-syntax/ChangeLog
index 4a0c1d6aa008..ec554a0d0ddd 100644
--- a/app-vim/gentoo-syntax/ChangeLog
+++ b/app-vim/gentoo-syntax/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-vim/gentoo-syntax
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/ChangeLog,v 1.36 2005/02/18 20:00:58 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/ChangeLog,v 1.37 2005/02/21 16:26:05 ciaranm Exp $
+
+*gentoo-syntax-20050211-r1 (21 Feb 2005)
+
+  21 Feb 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/gentoo-syntax-20050211-fix-xml.patch,
+  +gentoo-syntax-20050211-r1.ebuild:
+  Fix xml, bug #82789
 
   18 Feb 2005; Tom Martin <slarti@gentoo.org> gentoo-syntax-20041227.ebuild:
   amd64 stable.
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index b7afa9d853c8..5e7b793a207d 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,23 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 051173c8471268a9e661d56c80475b69 ChangeLog 6964
 MD5 9febd4d64d15aa7fbd9917eeda2ecb07 gentoo-syntax-20050211.ebuild 1901
 MD5 2f4abbfc45ac82a91635a4979651f093 gentoo-syntax-20050130.ebuild 1858
-MD5 a43ca03894628c098a86d47c8be49c9a gentoo-syntax-20041202.ebuild 1835
-MD5 9771ca4ff90b56dddc4acfadc6f6a01e metadata.xml 250
-MD5 1ca7fa11ca5cc83b200051ea017b6c59 gentoo-syntax-20041227.ebuild 1851
+MD5 f757b666a3bef6789fff1f6b5aa26a76 gentoo-syntax-20050211-r1.ebuild 1945
+MD5 0e911a5ed13e0560abbd97036fa21ba2 ChangeLog 7166
 MD5 a65dbc644b3668ff6544db0650a6b43f gentoo-syntax-20041009.ebuild 651
-MD5 af854ba426622a145f3f786c605ff98c files/digest-gentoo-syntax-20041009 73
-MD5 06acc20457f894c7ca135be057b31ea4 files/digest-gentoo-syntax-20050130 74
-MD5 2ebb63d791d0b453712e27584f1b1c67 files/gentoo-syntax-20050211-fix-escapes.patch 558
+MD5 1ca7fa11ca5cc83b200051ea017b6c59 gentoo-syntax-20041227.ebuild 1851
+MD5 9771ca4ff90b56dddc4acfadc6f6a01e metadata.xml 250
+MD5 a43ca03894628c098a86d47c8be49c9a gentoo-syntax-20041202.ebuild 1835
+MD5 298bb984862016f9d7de0f6861c3fd73 files/gentoo-syntax-20050211-fix-xml.patch 2149
 MD5 4f56c7de174c5e2aef4d6217acbc46a3 files/digest-gentoo-syntax-20050211 74
-MD5 b5f329b0b88bc9f4ab39100919448b1f files/digest-gentoo-syntax-20041202 74
 MD5 c8e3ac5d8a31716f27516db1f6d138c9 files/digest-gentoo-syntax-20041227 74
+MD5 06acc20457f894c7ca135be057b31ea4 files/digest-gentoo-syntax-20050130 74
+MD5 b5f329b0b88bc9f4ab39100919448b1f files/digest-gentoo-syntax-20041202 74
+MD5 af854ba426622a145f3f786c605ff98c files/digest-gentoo-syntax-20041009 73
+MD5 4f56c7de174c5e2aef4d6217acbc46a3 files/digest-gentoo-syntax-20050211-r1 74
+MD5 2ebb63d791d0b453712e27584f1b1c67 files/gentoo-syntax-20050211-fix-escapes.patch 558
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCFkoZCHk4+ZoBpvsRAmDQAJ9Vba2bcuIe/ZZI9xedqcJV9hStCgCfWwkq
-/cs98MyCFzh+xoyYmqAq+Ps=
-=BzKq
+iD8DBQFCGguXLLFUmVNQ7rkRAvBCAJ4mq9i6p3Sx7wSxwPNO8zv3gHayDQCZAYaH
+RZkazVpKTIFHiOOfs3TobYM=
+=+Qvz
 -----END PGP SIGNATURE-----
diff --git a/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20050211-r1 b/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20050211-r1
new file mode 100644
index 000000000000..dd4e9d63c411
--- /dev/null
+++ b/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20050211-r1
@@ -0,0 +1 @@
+MD5 c72df35c452ced76c2d5a92f4229affd gentoo-syntax-20050211.tar.bz2 16468
diff --git a/app-vim/gentoo-syntax/files/gentoo-syntax-20050211-fix-xml.patch b/app-vim/gentoo-syntax/files/gentoo-syntax-20050211-fix-xml.patch
new file mode 100644
index 000000000000..30f871a4bf45
--- /dev/null
+++ b/app-vim/gentoo-syntax/files/gentoo-syntax-20050211-fix-xml.patch
@@ -0,0 +1,52 @@
+Index: ftdetect/gentoo.vim
+===================================================================
+--- ftdetect/gentoo.vim	(revision 140)
++++ ftdetect/gentoo.vim	(revision 142)
+@@ -84,4 +84,6 @@
+     \        getline(7) =~ "<!DOCTYPE guide " ||
+     \        getline(8) =~ "<!DOCTYPE guide " ||
+     \        getline(9) =~ "<!DOCTYPE guide " |
+-    \     set filetype=guidexml
++    \     set filetype=guidexml		      |
++    \	 endif
++
+Index: doc/gentoo-syntax.txt
+===================================================================
+--- doc/gentoo-syntax.txt	(revision 140)
++++ doc/gentoo-syntax.txt	(revision 142)
+@@ -264,6 +264,13 @@
+ ==============================================================================
+ 3. ChangeLog					     *gentoo-syntax-changelog*
+ 
++	20050221 ka0ttic
++	    * Fixed missing endif in ftdetect/gentoo.vim that caused some XML
++	      ftdetect funkyness.
++
++	20050216 ka0ttic
++	    * Updated cron and eutils eclass functions.
++
+ 	20050211 ciaranm (Release)
+ 
+ 	20050210 ciaranm
+Index: syntax/ebuild.vim
+===================================================================
+--- syntax/ebuild.vim	(revision 140)
++++ syntax/ebuild.vim	(revision 142)
+@@ -52,7 +52,7 @@
+ syn keyword EbuildEutilsKeyword cdrom_locate_file_on_cd strip-linguas epause ebeep built_with_use
+ syn keyword EbuildEutilsKeyword make_session_desktop domenu doicon find_unpackable_file unpack_pdv
+ syn keyword EbuildEutilsKeyword set_arch_to_kernel set_arch_to_portage preserve_old_lib
+-syn keyword EbuildEutilsKeyword preserve_old_lib_notify built_with_use epunt_cxx
++syn keyword EbuildEutilsKeyword preserve_old_lib_notify built_with_use epunt_cxx dopamd newpamd
+ 
+ " flag-o-matic
+ syn keyword EbuildFlagoKeyword setup-allowed-flags filter-flags filter-lfs-flags append-lfs-flags
+@@ -119,7 +119,7 @@
+ syn keyword EbuildToolFuncsKeyword gcc-minor-version gcc-micro-version
+ 
+ " cron
+-syn keyword EbuildCronKeyword docrondir docron docrontab dopamd cron-pkg_postinst
++syn keyword EbuildCronKeyword docrondir docron docrontab cron-pkg_postinst
+ 
+ " games
+ syn keyword EbuildGamesKeyword egamesconf egamesinstall gameswrapper dogamesbin dogamessbin dogameslib
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20050211-r1.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20050211-r1.ebuild
new file mode 100644
index 000000000000..f98a84d7c914
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20050211-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/gentoo-syntax-20050211-r1.ebuild,v 1.1 2005/02/21 16:26:05 ciaranm Exp $
+
+inherit eutils vim-plugin
+
+DESCRIPTION="vim plugin: Gentoo Ebuild, Eclass, GLEP, ChangeLog and Portage
+Files syntax highlighting, filetype and indent settings"
+HOMEPAGE="http://developer.berlios.de/projects/gentoo-syntax"
+LICENSE="vim"
+KEYWORDS="~x86 ~sparc ~mips ~amd64 ~ppc ~ppc64 ~alpha ~ia64 ~arm ~hppa ~s390"
+SRC_URI="http://download.berlios.de/gentoo-syntax/${P}.tar.bz2"
+
+# For gathering stats. Evil, I know, but I need to know whether I can
+# reasonably add this package in as a PDEPEND of vim-core. -- ciaranm
+RESTRICT="primaryuri"
+
+IUSE="ignore-glep31"
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-fix-escapes.patch
+	epatch ${FILESDIR}/${P}-fix-xml.patch
+
+	if use ignore-glep31 ; then
+		for f in ftplugin/*.vim ; do
+			ebegin "Removing UTF-8 rules from ${f} ..."
+			sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
+				|| die "waah! bad sed voodoo. need more goats."
+			eend $?
+		done
+	fi
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+	if use ignore-glep31 1>/dev/null ; then
+		ewarn "You have chosen to disable the rules which ensure GLEP 31"
+		ewarn "compliance. When editing ebuilds, please make sure you get"
+		ewarn "the character set correct."
+	else
+		einfo "Note for developers and anyone else who edits ebuilds:"
+		einfo "    This release of gentoo-syntax now contains filetype rules to set"
+		einfo "    fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31."
+		einfo "    If you find this feature breaks things, please submit a bug and"
+		einfo "    assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE"
+		einfo "    flag to remove these rules."
+	fi
+	echo
+	epause 5
+}
+