Fixing creation of metadata.xml. Bug #129533

(Portage version: 2.1-r2)

7 files changed, 79 insertions, 1 deletions

diff --git a/app-vim/gentoo-syntax/ChangeLog b/app-vim/gentoo-syntax/ChangeLog
index 8d2d38a4bc83..7bb82d62299e 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/ChangeLog,v 1.66 2006/04/07 21:40:59 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gentoo-syntax/ChangeLog,v 1.67 2006/09/06 21:46:45 tupone Exp $
+
+*gentoo-syntax-20051221-r1 (06 Sep 2006)
+
+  06 Sep 2006; <tupone@gentoo.org>
+  +files/gentoo-syntax-20051221-metadata.patch,
+  +gentoo-syntax-20051221-r1.ebuild:
+  Fixing creation of metadata.xml. Bug #129533 by me
 
   07 Apr 2006; Bryan Østergaard <kloeri@gentoo.org metadata.xml:
   Remove ciaranm from metadata.xml.
diff --git a/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20050325 b/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20050325
index 87c83da79a84..25540ea016ce 100644
--- a/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20050325
+++ b/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20050325
@@ -1 +1,3 @@
 MD5 19762221115de406b64c5e5bc3ec7980 gentoo-syntax-20050325.tar.bz2 17098
+RMD160 06e6d1dc013a4cd474f5371bbd381dbc4d43a9d5 gentoo-syntax-20050325.tar.bz2 17098
+SHA256 31a5cb48b0e2700f124c3dd5f3778be0c79bdebc496e9fa51f0ce263bb34f4be gentoo-syntax-20050325.tar.bz2 17098
diff --git a/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20050618 b/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20050618
index f866df251edd..52e95c03f36d 100644
--- a/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20050618
+++ b/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20050618
@@ -1 +1,3 @@
 MD5 e27c372b44fe1ed1d2ba8ac09dbbe481 gentoo-syntax-20050618.tar.bz2 19094
+RMD160 4227b38d77437b3cd7c80db6abf86baad4514f2b gentoo-syntax-20050618.tar.bz2 19094
+SHA256 540bd20f7a0faf63fff3e384384140a9fb93264f9a06f9533138e1c546c68014 gentoo-syntax-20050618.tar.bz2 19094
diff --git a/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20051221 b/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20051221
index 7381a9a7602b..fc02b65e192e 100644
--- a/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20051221
+++ b/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20051221
@@ -1 +1,3 @@
 MD5 4f86ef2d51fbde351137a0ea8d1f70e7 gentoo-syntax-20051221.tar.bz2 19388
+RMD160 abe882798aad8b89df0ce376d9b64db708c65fa7 gentoo-syntax-20051221.tar.bz2 19388
+SHA256 73c00b2ddee5f87e772bcb5797042e00f7f99d888609068a346ecddada935373 gentoo-syntax-20051221.tar.bz2 19388
diff --git a/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20051221-r1 b/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20051221-r1
new file mode 100644
index 000000000000..fc02b65e192e
--- /dev/null
+++ b/app-vim/gentoo-syntax/files/digest-gentoo-syntax-20051221-r1
@@ -0,0 +1,3 @@
+MD5 4f86ef2d51fbde351137a0ea8d1f70e7 gentoo-syntax-20051221.tar.bz2 19388
+RMD160 abe882798aad8b89df0ce376d9b64db708c65fa7 gentoo-syntax-20051221.tar.bz2 19388
+SHA256 73c00b2ddee5f87e772bcb5797042e00f7f99d888609068a346ecddada935373 gentoo-syntax-20051221.tar.bz2 19388
diff --git a/app-vim/gentoo-syntax/files/gentoo-syntax-20051221-metadata.patch b/app-vim/gentoo-syntax/files/gentoo-syntax-20051221-metadata.patch
new file mode 100644
index 000000000000..be0ccb9b0ca5
--- /dev/null
+++ b/app-vim/gentoo-syntax/files/gentoo-syntax-20051221-metadata.patch
@@ -0,0 +1,12 @@
+--- plugin/newmetadata.vim.old	2006-04-10 02:10:19.000000000 +0200
++++ plugin/newmetadata.vim	2006-04-10 23:42:40.000000000 +0200
+@@ -75,8 +75,8 @@
+             if l:name != ""
+                 put ='<name>' . l:name . '</name>'
+             endif
++	    put ='</maintainer>'
+         endif
+-        put ='</maintainer>'
+         put ='<longdescription lang=\"en\">'
+         put ='</longdescription>'
+         put ='</pkgmetadata>'
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20051221-r1.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20051221-r1.ebuild
new file mode 100644
index 000000000000..b95164589fd3
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20051221-r1.ebuild
@@ -0,0 +1,50 @@
+# 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-20051221-r1.ebuild,v 1.1 2006/09/06 21:46:45 tupone 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/"
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 s390 sparc x86 ~x86-fbsd"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+IUSE="ignore-glep31"
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/${P}-metadata.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
+}
+