Version bump. Fixes: Bug #122890 and Bug #145999. See Bug #148985 for more details.

Package-Manager: portage-2.1.2_rc1-r3

4 files changed, 73 insertions, 8 deletions

diff --git a/app-vim/gentoo-syntax/ChangeLog b/app-vim/gentoo-syntax/ChangeLog
index 2ff41783a5e1..9b6c2ee0f7a2 100644
--- a/app-vim/gentoo-syntax/ChangeLog
+++ b/app-vim/gentoo-syntax/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-vim/gentoo-syntax
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/ChangeLog,v 1.69 2006/11/05 21:19:25 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/ChangeLog,v 1.70 2006/11/06 06:44:13 pioto Exp $
+
+*gentoo-syntax-20061106 (06 Nov 2006)
+
+  06 Nov 2006; Mike Kelly <pioto@pioto.org> +gentoo-syntax-20061106.ebuild:
+  Version bump. Fixes: Bug #122890 and Bug #145999. See Bug #148985 for more
+  details.
 
   05 Nov 2006; Mike Kelly <pioto@pioto.org>
   -files/gentoo-syntax-20050211-fix-escapes.patch,
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index a5523c353241..3d89d40742f7 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -6,6 +6,7 @@ MD5 ced7cfe574d5be2824a321a9d9b189e2 files/gentoo-syntax-20051221-metadata.patch
 RMD160 61827ef68d01d567750e80bd54cbbbe2461eca0b files/gentoo-syntax-20051221-metadata.patch 432
 SHA256 c7fb5ed7a44d0213129cb327a25ecdcbf42cd4bf09d3d595608e05bf6275d6a0 files/gentoo-syntax-20051221-metadata.patch 432
 DIST gentoo-syntax-20051221.tar.bz2 19388 RMD160 abe882798aad8b89df0ce376d9b64db708c65fa7 SHA1 69076990be5f47dafcbbfa916808061eafbeed50 SHA256 73c00b2ddee5f87e772bcb5797042e00f7f99d888609068a346ecddada935373
+DIST gentoo-syntax-20061106.tar.bz2 19656 RMD160 4c5b70ea9747f06f24dc1c35e832aeab6f25e9da SHA1 7571cd8bf7870c5f7becee1e25d19eed6676b7f4 SHA256 1dd05c3c02bc6449e9e0795471408f744ee4798243bf45cdbb63a131258fb340
 EBUILD gentoo-syntax-20051221-r1.ebuild 1716 RMD160 564639ecaabf69e6e77cb731d1898810dad835c7 SHA1 de80fdc2c4a49e2c25fb2bbc862f0abc16e1fabb SHA256 82967f581e16a612c728a70d2d30f3f3b5b35bd606061e7368a84616d4401eef
 MD5 6cc3a1f19427c010b9fb6fa784cc5abb gentoo-syntax-20051221-r1.ebuild 1716
 RMD160 564639ecaabf69e6e77cb731d1898810dad835c7 gentoo-syntax-20051221-r1.ebuild 1716
@@ -14,10 +15,14 @@ EBUILD gentoo-syntax-20051221.ebuild 1656 RMD160 ee92c68e55addd8d4ea2dc86affebd9
 MD5 1eca70fa67bf62bc8cdd2b7b9e0e05ba gentoo-syntax-20051221.ebuild 1656
 RMD160 ee92c68e55addd8d4ea2dc86affebd9dbf347ef5 gentoo-syntax-20051221.ebuild 1656
 SHA256 69fe7535c1da07efcd2951f19ec63f5b03355ce59f4134280e8b79c40da593e5 gentoo-syntax-20051221.ebuild 1656
-MISC ChangeLog 11835 RMD160 f1661e6a3003818fbd7f91a74fb810ca1e662475 SHA1 24e73df0c8c04191a614b708efe0326ef573a41c SHA256 e8377abf82c5b5596580328cd00dd7ce6652ba777cf33e3c2b4fe57740b145c7
-MD5 5e13bd2035d0c0d8eccb834451b0f72a ChangeLog 11835
-RMD160 f1661e6a3003818fbd7f91a74fb810ca1e662475 ChangeLog 11835
-SHA256 e8377abf82c5b5596580328cd00dd7ce6652ba777cf33e3c2b4fe57740b145c7 ChangeLog 11835
+EBUILD gentoo-syntax-20061106.ebuild 1680 RMD160 469b2b3fb007fe17f7500278fc782ded00e88b47 SHA1 97f13dc44521986b8fb12d38e9645b7cf73d4409 SHA256 9eb0d7a0e42f1c5607eb6540f6196f54722a579c8311df3dbc273e4c67ae4e9c
+MD5 abcd0a40a17c10d579ee75b909bf4ee3 gentoo-syntax-20061106.ebuild 1680
+RMD160 469b2b3fb007fe17f7500278fc782ded00e88b47 gentoo-syntax-20061106.ebuild 1680
+SHA256 9eb0d7a0e42f1c5607eb6540f6196f54722a579c8311df3dbc273e4c67ae4e9c gentoo-syntax-20061106.ebuild 1680
+MISC ChangeLog 12039 RMD160 abcaaf97e85d225a0dc54f7520af9e951dfe18f3 SHA1 e9ab49996af77085b73b0a91c62bc98aa8fe7c68 SHA256 da413fb6fef78a1ae50b94ac501c488a3fb6dd03492f7a90c5dc70c108397701
+MD5 526ae3490805dbce9aca1d6a9042aca5 ChangeLog 12039
+RMD160 abcaaf97e85d225a0dc54f7520af9e951dfe18f3 ChangeLog 12039
+SHA256 da413fb6fef78a1ae50b94ac501c488a3fb6dd03492f7a90c5dc70c108397701 ChangeLog 12039
 MISC metadata.xml 157 RMD160 adcd6494e1e562ab5e0bd090e114622782ac753a SHA1 22983b8e9ba3045d8ccbc2b14393423f7f05d2ee SHA256 106c8618581360c66c2b535fcb7a6cb9ff318f1bd8e6c8f40f2f2f2d54e6787a
 MD5 03408b23ff38d83b09d299387892f54d metadata.xml 157
 RMD160 adcd6494e1e562ab5e0bd090e114622782ac753a metadata.xml 157
@@ -28,10 +33,13 @@ SHA256 68036a61847d35148a024542a7d00731750195a62e123c145275efec3f06e6c3 files/di
 MD5 1497d833eae6b7495173f62f4b8f7608 files/digest-gentoo-syntax-20051221-r1 268
 RMD160 1c175d4bb5cbb048d10fd16350fca8c46d85107f files/digest-gentoo-syntax-20051221-r1 268
 SHA256 68036a61847d35148a024542a7d00731750195a62e123c145275efec3f06e6c3 files/digest-gentoo-syntax-20051221-r1 268
+MD5 6907d42008208f9e4fbf2226785be130 files/digest-gentoo-syntax-20061106 268
+RMD160 b4d677ef2d5dfd260c8fe176586aa7241dfc7352 files/digest-gentoo-syntax-20061106 268
+SHA256 8d2c5950e84e4d4e83f105a33afe8e6e8ee3add87bdf60584142341cb09e486e files/digest-gentoo-syntax-20061106 268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFTlWtokMzJ47YCzoRAkiOAJ4xTDh6wmq6DW/QaC6gubd88IFCCgCeKEAz
-40Ylfzbx8tIVJhBV7tPtGQ4=
-=/2/9
+iD8DBQFFTtnJokMzJ47YCzoRAohhAKCc2RwcgFxWoTEmMltalH6zkR3xaQCcCKML
+kwskimvn5RVFhnfBjKzfprM=
+=E8iL
 -----END PGP SIGNATURE-----
diff --git a/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20061106 b/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20061106
new file mode 100644
index 000000000000..76a0f9f30f51
--- /dev/null
+++ b/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20061106
@@ -0,0 +1,3 @@
+MD5 07f87a250e227968a64c241e28c2633e gentoo-syntax-20061106.tar.bz2 19656
+RMD160 4c5b70ea9747f06f24dc1c35e832aeab6f25e9da gentoo-syntax-20061106.tar.bz2 19656
+SHA256 1dd05c3c02bc6449e9e0795471408f744ee4798243bf45cdbb63a131258fb340 gentoo-syntax-20061106.tar.bz2 19656
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20061106.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20061106.ebuild
new file mode 100644
index 000000000000..0c7a3a9e2df2
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20061106.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/gentoo-syntax-20061106.ebuild,v 1.1 2006/11/06 06:44:13 pioto Exp $
+
+inherit eutils vim-plugin
+
+DESCRIPTION="vim plugin: Gentoo Ebuild, Eclass, GLEP, ChangeLog and Portage Files syntax highlighting, filetype and indent settings"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="ignore-glep31"
+
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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
+}