Fixing creation of metadata.xml. Bug #129533

Package-Manager: portage-2.1-r2

8 files changed, 121 insertions, 20 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/Manifest b/app-vim/gentoo-syntax/Manifest
index c2562c75f26c..8245b504d3ee 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,46 +1,69 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f1356fa619c871210b46df00d0178f86 ChangeLog 11237
-RMD160 c59c987aa3eeff08be34fcdc3fc3d3bc38ead88c ChangeLog 11237
-SHA256 cdbf2f3aac30f01d7d2e56845465bac5d5065c6bb0cd764462cafa53e2fe9058 ChangeLog 11237
-MD5 2dc9234dc95eba7cfcf252e4bef5a538 files/digest-gentoo-syntax-20050325 74
-RMD160 8598a88e7b360b01ae557f96a4d12036d45fa7e3 files/digest-gentoo-syntax-20050325 74
-SHA256 7e38bb361e5bcfbbcd09f666c30361716ecaa6326dda59e8d1ad50def400ce5e files/digest-gentoo-syntax-20050325 74
-MD5 1ba3532364668721658b08c429f67268 files/digest-gentoo-syntax-20050515 74
-RMD160 b20c8672ce5ca0976c86daf0c6f7d3c6967c5a5b files/digest-gentoo-syntax-20050515 74
-SHA256 c4b313cfef04d3c1376dadfb3cb15e981e465b3391fbf67857138d0d72db4133 files/digest-gentoo-syntax-20050515 74
-MD5 e6970a1a669fc8424e2e5706fdfb169b files/digest-gentoo-syntax-20050618 74
-RMD160 a79cec69e6cf20d321362afe754a938d09a17dae files/digest-gentoo-syntax-20050618 74
-SHA256 99941e529498e3a2112ee426b5837865cb6fcc18272d552c617497d3182b1406 files/digest-gentoo-syntax-20050618 74
-MD5 4e89bd41ee3214e01f085de87e7f9584 files/digest-gentoo-syntax-20051221 74
-RMD160 eeed5a66e6e0e3646f2305ab8f892432db27ef73 files/digest-gentoo-syntax-20051221 74
-SHA256 e807b54533ef422030d64254ab65df8409a62d8f4bcc3e4dd5866b56178df7e1 files/digest-gentoo-syntax-20051221 74
+AUX gentoo-syntax-20050211-fix-escapes.patch 558 RMD160 ff46fc951f18c92a6b28d77235665e8116095736 SHA1 6b8790e610b35b7c4f4392771807dc3e2d4d3abc SHA256 e4db624d5e0d587527afaac93c0a723bb4bee2d7846898019630b288fa6222fd
 MD5 2ebb63d791d0b453712e27584f1b1c67 files/gentoo-syntax-20050211-fix-escapes.patch 558
 RMD160 ff46fc951f18c92a6b28d77235665e8116095736 files/gentoo-syntax-20050211-fix-escapes.patch 558
 SHA256 e4db624d5e0d587527afaac93c0a723bb4bee2d7846898019630b288fa6222fd files/gentoo-syntax-20050211-fix-escapes.patch 558
+AUX gentoo-syntax-20050211-fix-xml.patch 2149 RMD160 e1ed9cb5df099ba6b6bc9563312c732c0d2af661 SHA1 febe7ac8db883ef9814f45a0b7531bf4338465c0 SHA256 046fa8ce4aa5d3996e9a5d4b3f4b8cb9791e0525d3c9a0dda6757e5456bdeabc
 MD5 298bb984862016f9d7de0f6861c3fd73 files/gentoo-syntax-20050211-fix-xml.patch 2149
 RMD160 e1ed9cb5df099ba6b6bc9563312c732c0d2af661 files/gentoo-syntax-20050211-fix-xml.patch 2149
 SHA256 046fa8ce4aa5d3996e9a5d4b3f4b8cb9791e0525d3c9a0dda6757e5456bdeabc files/gentoo-syntax-20050211-fix-xml.patch 2149
+AUX gentoo-syntax-20051221-metadata.patch 432 RMD160 61827ef68d01d567750e80bd54cbbbe2461eca0b SHA1 3a3c4885ef57dc4d10899f58cb1716ae8f3879b9 SHA256 c7fb5ed7a44d0213129cb327a25ecdcbf42cd4bf09d3d595608e05bf6275d6a0
+MD5 ced7cfe574d5be2824a321a9d9b189e2 files/gentoo-syntax-20051221-metadata.patch 432
+RMD160 61827ef68d01d567750e80bd54cbbbe2461eca0b files/gentoo-syntax-20051221-metadata.patch 432
+SHA256 c7fb5ed7a44d0213129cb327a25ecdcbf42cd4bf09d3d595608e05bf6275d6a0 files/gentoo-syntax-20051221-metadata.patch 432
+DIST gentoo-syntax-20050325.tar.bz2 17098 RMD160 06e6d1dc013a4cd474f5371bbd381dbc4d43a9d5 SHA1 f90ea43a83705de955acf057fc7c6a8a779b810e SHA256 31a5cb48b0e2700f124c3dd5f3778be0c79bdebc496e9fa51f0ce263bb34f4be
+DIST gentoo-syntax-20050515.tar.bz2 18462
+DIST gentoo-syntax-20050618.tar.bz2 19094 RMD160 4227b38d77437b3cd7c80db6abf86baad4514f2b SHA1 dd7a5b6d2857b97ec6201ae88baf08142fae48f6 SHA256 540bd20f7a0faf63fff3e384384140a9fb93264f9a06f9533138e1c546c68014
+DIST gentoo-syntax-20051221.tar.bz2 19388 RMD160 abe882798aad8b89df0ce376d9b64db708c65fa7 SHA1 69076990be5f47dafcbbfa916808061eafbeed50 SHA256 73c00b2ddee5f87e772bcb5797042e00f7f99d888609068a346ecddada935373
+EBUILD gentoo-syntax-20050325.ebuild 1706 RMD160 5df8464938cf20c900c5b025f844c0cce8d792dc SHA1 cb032f7283e2bef043007263ad8e206a6e4ee87f SHA256 aabb9c9edf9f8f0c6c0dcb7388472e81efb8a7a0ae7f091124376bc9758a7633
 MD5 281f945de86c115d25c786f771a010b0 gentoo-syntax-20050325.ebuild 1706
 RMD160 5df8464938cf20c900c5b025f844c0cce8d792dc gentoo-syntax-20050325.ebuild 1706
 SHA256 aabb9c9edf9f8f0c6c0dcb7388472e81efb8a7a0ae7f091124376bc9758a7633 gentoo-syntax-20050325.ebuild 1706
+EBUILD gentoo-syntax-20050515.ebuild 1718 RMD160 93d321a9cb7f431cc6ec6375ad52f6502f974cd9 SHA1 7117cd42a8e2aa56c4c2b295bc6634a0b22623e1 SHA256 005c8a34c4850a6e498772f6a00a4ad0c7760267c8a595fee684f144de563512
 MD5 eda76e8279b1627896fa1a2278a1b11c gentoo-syntax-20050515.ebuild 1718
 RMD160 93d321a9cb7f431cc6ec6375ad52f6502f974cd9 gentoo-syntax-20050515.ebuild 1718
 SHA256 005c8a34c4850a6e498772f6a00a4ad0c7760267c8a595fee684f144de563512 gentoo-syntax-20050515.ebuild 1718
+EBUILD gentoo-syntax-20050618.ebuild 1721 RMD160 f7a24aebbbe8c5f6cc0b44d12c2699fbdb588083 SHA1 9c700ea9edbb55c3ba3385d0b0b0265791c3a499 SHA256 079b7c6579e1d3330375ed56952d063514d1464dc609c6ca2248098bc39685e5
 MD5 75352365463eb79e506d8701bff81f55 gentoo-syntax-20050618.ebuild 1721
 RMD160 f7a24aebbbe8c5f6cc0b44d12c2699fbdb588083 gentoo-syntax-20050618.ebuild 1721
 SHA256 079b7c6579e1d3330375ed56952d063514d1464dc609c6ca2248098bc39685e5 gentoo-syntax-20050618.ebuild 1721
+EBUILD gentoo-syntax-20051221-r1.ebuild 1697 RMD160 c1b6b51a19c6ab69e09bc7a08560a597397ef1ff SHA1 3b3e5f39ecd10ec87872044d8a545873714eaacc SHA256 dd28f196dff031a4d8d53ba1a0d9900c6970c98f6697142746425cc49a8bf64d
+MD5 93549becec54634353e30c8c59bb0c65 gentoo-syntax-20051221-r1.ebuild 1697
+RMD160 c1b6b51a19c6ab69e09bc7a08560a597397ef1ff gentoo-syntax-20051221-r1.ebuild 1697
+SHA256 dd28f196dff031a4d8d53ba1a0d9900c6970c98f6697142746425cc49a8bf64d gentoo-syntax-20051221-r1.ebuild 1697
+EBUILD gentoo-syntax-20051221.ebuild 1656 RMD160 ee92c68e55addd8d4ea2dc86affebd9dbf347ef5 SHA1 8db4b80add8bf1a7ad100a86fdceafbc2fcfbd4b SHA256 69fe7535c1da07efcd2951f19ec63f5b03355ce59f4134280e8b79c40da593e5
 MD5 1eca70fa67bf62bc8cdd2b7b9e0e05ba gentoo-syntax-20051221.ebuild 1656
 RMD160 ee92c68e55addd8d4ea2dc86affebd9dbf347ef5 gentoo-syntax-20051221.ebuild 1656
 SHA256 69fe7535c1da07efcd2951f19ec63f5b03355ce59f4134280e8b79c40da593e5 gentoo-syntax-20051221.ebuild 1656
+MISC ChangeLog 11453 RMD160 e73922ba8c7fe5ce1a46d39d15cb3b30a90f9897 SHA1 132f318dc578805befc9f456ffc29c61a200b144 SHA256 87bc3770b2bbb79342a1d568d13653874f80c75ef10ee62440645a2cf2244ef6
+MD5 66bf59186a04626739d0cdd73c3700fc ChangeLog 11453
+RMD160 e73922ba8c7fe5ce1a46d39d15cb3b30a90f9897 ChangeLog 11453
+SHA256 87bc3770b2bbb79342a1d568d13653874f80c75ef10ee62440645a2cf2244ef6 ChangeLog 11453
+MISC metadata.xml 157 RMD160 adcd6494e1e562ab5e0bd090e114622782ac753a SHA1 22983b8e9ba3045d8ccbc2b14393423f7f05d2ee SHA256 106c8618581360c66c2b535fcb7a6cb9ff318f1bd8e6c8f40f2f2f2d54e6787a
 MD5 03408b23ff38d83b09d299387892f54d metadata.xml 157
 RMD160 adcd6494e1e562ab5e0bd090e114622782ac753a metadata.xml 157
 SHA256 106c8618581360c66c2b535fcb7a6cb9ff318f1bd8e6c8f40f2f2f2d54e6787a metadata.xml 157
+MD5 b6985d560521c78b6bbbaa1c86523514 files/digest-gentoo-syntax-20050325 268
+RMD160 2b0d022299cb3cb2e2bcf692b94e1cdc28b33ed4 files/digest-gentoo-syntax-20050325 268
+SHA256 63107df7cbd0312f864246be68fa061c5bb61990c6ba071d714d6ae989fdd8be files/digest-gentoo-syntax-20050325 268
+MD5 1ba3532364668721658b08c429f67268 files/digest-gentoo-syntax-20050515 74
+RMD160 b20c8672ce5ca0976c86daf0c6f7d3c6967c5a5b files/digest-gentoo-syntax-20050515 74
+SHA256 c4b313cfef04d3c1376dadfb3cb15e981e465b3391fbf67857138d0d72db4133 files/digest-gentoo-syntax-20050515 74
+MD5 8c062ff07afe7759e44f6ec9f7ba0329 files/digest-gentoo-syntax-20050618 268
+RMD160 3232045f2e1bbda73b2098d05d2410db767a7ee4 files/digest-gentoo-syntax-20050618 268
+SHA256 68bb58ec15c1b54ef27ef869655a46cfa3e20cebf78a682e5e6a7df7143b6221 files/digest-gentoo-syntax-20050618 268
+MD5 1497d833eae6b7495173f62f4b8f7608 files/digest-gentoo-syntax-20051221 268
+RMD160 1c175d4bb5cbb048d10fd16350fca8c46d85107f files/digest-gentoo-syntax-20051221 268
+SHA256 68036a61847d35148a024542a7d00731750195a62e123c145275efec3f06e6c3 files/digest-gentoo-syntax-20051221 268
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFENtx7ugEuf3OQ0akRAu7EAJ9MiGp8YDQtqTf+8xybrttOEBCVoACfegdd
-0X5g9QtV1dNwfhRk2k12otI=
-=1pbr
+iD8DBQFE/0HR2CTtIKiFlQIRArW9AJ9A1kGG5u/hcg9fN5eV/BVAkyFJgQCgg9+I
+bg2ART76jXJb7TkiQ2+7ZiQ=
+=Y0fi
 -----END PGP SIGNATURE-----
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
+}
+