Version bump.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 65 insertions, 16 deletions

diff --git a/app-vim/gentoo-syntax/ChangeLog b/app-vim/gentoo-syntax/ChangeLog
index e4e2bc23d6cf..ce0c95d3839c 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/ChangeLog,v 1.159 2014/06/06 06:06:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/ChangeLog,v 1.160 2014/11/02 22:08:26 radhermit Exp $
+
+*gentoo-syntax-20141102 (02 Nov 2014)
+
+  02 Nov 2014; Tim Harder <radhermit@gentoo.org>
+  +gentoo-syntax-20141102.ebuild:
+  Version bump.
 
   06 Jun 2014; Mike Frysinger <vapier@gentoo.org> gentoo-syntax-20130619.ebuild:
   Add arm64 love.
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index df3c2458a1e0..ebcab94cf76b 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -3,25 +3,21 @@ Hash: SHA256
 
 DIST gentoo-syntax-20120109.tar.bz2 19526 SHA256 dabab1a569ec84286d15feb93652f044888d92c0e0c8c1f298f8dec80fcab4c5 SHA512 cbd0215dc8b5d89f3c0ec2aaa274f05d47891f67a7e5513af04ae53374c4adf6686e7fce2446d329033b951bf0106cc96075015ecaeaa38983b843bbac0119bf WHIRLPOOL 05ea6343ebdf3263392348bc1d0be045915232c58c652f85a2f38b31c612aa3466379329bef735b08e0d74856ff1e8d0139b433e1e3f999b9fde93740912a8c5
 DIST gentoo-syntax-20130619.tar.bz2 24689 SHA256 959f4ac0845d97f01aadc8ee7dffbaebe9d933253de6eba35df530aff2d6ebd2 SHA512 122fdbb644105fd3e4bb24431fe7ed3cc20052336167da9914274040a9ad220b45c5edb04a6b00a019db476e3271023f64248960940276aa3a7785c9a4fbdc98 WHIRLPOOL 92c381de077c8ec2e278023da2d7c3d8c53840e2b0e653a1241b51ec99abebfb32ca123579a70ea5ed8f79cf5a2f94b2c0647c4fca1e1a156045fcfa341a85ce
+DIST gentoo-syntax-20141102.tar.bz2 25082 SHA256 9a12d11ec19e4af9b881071d860888cc6ba2ec0c29c27a632885c1b62768e15c SHA512 fdb17629e352d6a07a599ea23d214b0fba87b9aae545923caf439269eac5dca4c0be4eccba368b5bf0592915a247d2d6c914645cf2aaf98a598f23c846d1095a WHIRLPOOL 370b6b1403e22f7bdf79d16a491b5906d0a09ffe0656bb3badac6d18d1221bec5bae87404a2a69fc65bb207300f7fe1248e9468d9cbb929fd79a1a8d09110af9
 EBUILD gentoo-syntax-20120109.ebuild 1805 SHA256 dcf724e2db6e099aa72c087882cbf4a71a910f56027d145238dc25acb792b40c SHA512 de11cfeffc6346a2eac5c8769f5f32af0856324b0ff85d1e9db3662fe9fa7e6ab3f3ae274fe7de3c0bf8c40d2a030697e19c246ff5a2e098ac5c574546ceec3b WHIRLPOOL 7ce03e3d025f7c6346aa09114c30c7f50ff394f8e8d9a9fc6d895380203f219ea15c63b604b326e14314c75b154461aeb5c2a8af238dd3a4eec8897280976b21
 EBUILD gentoo-syntax-20130619.ebuild 1825 SHA256 ef4a4323e8d5c2eca1801ff994248b51ff4d17b08f7c9738267182629dabc434 SHA512 23047a1b341ee8467794f1d277a0ce7e22be269c3d595ecc119711c1d03237bd3448b6e221bc85022776c7ee4c3e3ee28686ea55f9694ded1015c7c5600b5349 WHIRLPOOL 02a73ab77c542b0c27cc25d1b52665f263adc5db466cc2d14f0d9408a1543e7bf8bad95d74bd9e8b0cc8a791c494de97f0ac1e2ee5326f5ccbac3cc38bb6a8c6
+EBUILD gentoo-syntax-20141102.ebuild 1840 SHA256 59c60050c509934fd0ee53cc1904121426c2567c13945b145267ecc65d3df23a SHA512 7e8b57657a0004931f91da742a9ee8dd5fda99be86566072f7bf71327708e914d877de81592e4704262099ee8f5168c5d079c757d3009685e3d2bf4ef79d4a4a WHIRLPOOL e78930d80e90c8b627c10c76a53a59613d6b33cd972f58ed2fc5ff3723d10d5b3be728e0804cf59a32a85421c9161e63a6bc04d775ce69652b608c2b22d19368
 EBUILD gentoo-syntax-99999999.ebuild 1631 SHA256 df49b0f5295f9bb7be17a96f8fd18c531c4d5feeeb82c60e664413c7874f5a7c SHA512 f706a22354c6a63b80ac5ffa20348f6a0c07c8446593624b46989de3491e0b3262297f37a3aadbc072c3ab6ebcbc79b5279c34f3d50a69fabb6e68c62d98cf62 WHIRLPOOL d4aabc23cca8a09a6b52477d67adb5ca2774a0a4188b37f895ae131995fff8d15a0666e0d21793247028443b5e62d658763a8e0c9a59dd60b96ee86300842fe2
-MISC ChangeLog 23937 SHA256 70859e80c5285c3448f9c761d28028cf8fbbd93e257be2105252ef4f05b040b3 SHA512 ac7bc6ffdb2de2ab0f42fc81709fbcad24c00b09f9e0c6c1df8e9fadfde14ec0c39e0d2b5b049bd9b3b0e2138990ffa92ca0a6a2a8ef723a3a49358fcd636374 WHIRLPOOL 6cd7fc6b42c6c8921f0d5c82d3403917e62dfca2519849a9892b129680480c05baa139d19f55b7ba1d24bf3023237232c930497275f65bca0389cd135c96f578
+MISC ChangeLog 24079 SHA256 e7d009c05a49d2ef5406e8375f66b436e175c1a3026bc85bf224647ba0465bdd SHA512 9ecc1937bbc65fb5b8c81887a30bf861896e04776bb027c5d6f6b4c23c349facd859912413eaf4d2193b140f92259beafa37e7c47ffc81059d1fa16b9a1df65b WHIRLPOOL df2c6e031fb37450808b65adf34ff8e176c7019c4ddc7ed7927a8223da6e43dc2efb7b2828116de26630b9291a804d086594890aede52e25a364decefff9e351
 MISC metadata.xml 358 SHA256 4062f2c550a17433a90c310319f288a458fa89f07a34848c1e8b93e58c8e5c28 SHA512 acec6e2a560223b7daad7b7b589691fa6e937a339f1c4861e4740c939b4269c1ecb4c42561c953069e8d2e468c468e989166882875ab61874a04dba20e241b6e WHIRLPOOL 614a38f901ba866a0df47d95222029c925a4104c09b82e4226fc3e2499fab1239362fdc0bf383b2c15ecc047923898f6cdc460d8204b28efdb7314e6a5d36983
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTkVpkAAoJEPGu1DbS6WIAk3EP/34bO6Chm4eCpmckLimXEfKd
-H00HXxprBk7Wy6i1gRDcYTuo5lYfHEiU/xKJocDCXnslD947KUIwAScukRSxOPtW
-9MiGZKV6heVKsluy1nhbJa1kHYp/xhgQT70V0UJju59YdNX2e1Ubm24JZ6EDzVxE
-5d4INWas0nIVfI8XPfvpnOBCtjHB0Vxv5sFVEDr6O87WO2jDL1DGGl8M4PDWs1vL
-TSRxQ4OiumUp4C70m1e/JwZW0AQivgzkr5+krKqqtBAUFyt5dyRvbyjqS4l8K8JS
-UgKT8B47MHyg3Nf+LpkMNhAtLswiN91O4Mefk9MbgLnrcy/8OzD2T6N8YO78cc6m
-4AhUfbyliFE++sQxIzjutgLYI34YMxgysBVR1bF/8jNeDsfz+Wn6HYGvaZfZxrjL
-1encbSla5pcXXx/ZTvK1UzUqK+1hTXmNfIFM4tiAVbbEUFvBXeLmj2LN/Ba7CuPF
-Dl4KHrDinrbhzx8aur/QykFeYUbY9qinYFcRk5TWUvPmzcMXXwO1nvOV1dYuPJpl
-HAV+RAax0kXFCWz0VsRyJSx4IwZ7amv9GOUiUClkFUt4RpSMMKTEbwXI+gaZbd5b
-vZOEp+dYrYoQ8b7e2pAIsYZSLROM8T3XqDlW+r04Cwu6Y9B+PLtw45ag790vbTpk
-Mdx9K4STe2rAbykaU5T4
-=UygB
+iQEcBAEBCAAGBQJUVqthAAoJEEqz6FtPBkyjAHYIAJHSoP2e7yJAIBXQut+G/+ui
+nDvnKLre1VO43ZKum9lIluTSUfjWrkuhMiIVFAzZrWJT71otfHG1SYA252EynPbP
+KXPbMDMPiW1JDNaQrQPPdRAQSUuvGf7lmISdixiuIf0adBqdMyW4cUpI8EaoQV7+
++R7hpkZDvpGIbU+7tdCQqq4r5sc9j2LG1uMAV7l8OiZ7S9o0zZcCvh7ZNtut1HgC
+lVr9ucYxXVos9Q+nDuUYPeA9yL+k/XJHLC1yBBOXIE47dpcNsXBfo4YGe5rXuWik
+algbb4gd4QZH/UweciO3mjhTCti6o+55ku1qYwE3L04Ttif+B/V6B8Pyza25NT8=
+=khbc
 -----END PGP SIGNATURE-----
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20141102.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20141102.ebuild
new file mode 100644
index 000000000000..48a31c647156
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20141102.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/gentoo-syntax-20141102.ebuild,v 1.1 2014/11/02 22:08:26 radhermit Exp $
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Gentoo and portage related syntax highlighting, filetype, and indent settings"
+HOMEPAGE="http://www.gentoo.org/"
+
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ignore-glep31"
+
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+	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 [[ -z ${REPLACING_VERSIONS} ]] ; then
+		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
+			elog "Note for developers and anyone else who edits ebuilds:"
+			elog "    This release of gentoo-syntax now contains filetype rules to set"
+			elog "    fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31."
+			elog "    If you find this feature breaks things, please submit a bug and"
+			elog "    assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE"
+			elog "    flag to remove these rules."
+		fi
+	fi
+}