Revision bump to fix vim syntax

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

5 files changed, 73 insertions, 11 deletions

diff --git a/net-nds/ldapvi/ChangeLog b/net-nds/ldapvi/ChangeLog
index cd9a6021f66a..9b669202952c 100644
--- a/net-nds/ldapvi/ChangeLog
+++ b/net-nds/ldapvi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/ldapvi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ChangeLog,v 1.22 2009/05/22 15:46:53 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ChangeLog,v 1.23 2011/06/12 15:29:40 xmw Exp $
+
+*ldapvi-1.7-r1 (12 Jun 2011)
+
+  12 Jun 2011; Michael Weber <xmw@gentoo.org> +ldapvi-1.7-r1.ebuild,
+  +files/ldapvi-1.7-vim-encoding.patch, metadata.xml:
+  Revision bump to fix vim syntax, thanks to Denis Seleznyov for the report
+  (bug 368387), taking maint.
 
   22 May 2009; Diego E. Pettenò <flameeyes@gentoo.org> ldapvi-1.7.ebuild,
   +files/ldapvi-1.7+glibc-2.10.patch:
diff --git a/net-nds/ldapvi/Manifest b/net-nds/ldapvi/Manifest
index 1d1d91b9e182..984aac71dad5 100644
--- a/net-nds/ldapvi/Manifest
+++ b/net-nds/ldapvi/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX ldapvi-1.7+glibc-2.10.patch 1251 RMD160 20bed37e12d9ba697dfece31280a9411934d153a SHA1 e0660034ca1b291025dd683b7f2c1bf1192b807b SHA256 512395cea5828a2532c7db4bc369354640482e9cb8fb8b6edec39c2e8b2673f6
+AUX ldapvi-1.7-vim-encoding.patch 396 RMD160 0a66a7c89df5b842227dde00057d7e76d0d9ef5f SHA1 6f32441abca8bcc3ec11314b1e2c3cd713c7127f SHA256 0a08d97ec43b85dab7c0076807880aeeaf74d6fce17b2c060148c409c3a48ee0
 DIST ldapvi-1.7.tar.gz 119503 RMD160 f4cd1c2fcfc87e7a9e912269e60280e9ecd82156 SHA1 d1cde4cbb618180f9ae0e77c56a1520b8ad61c9a SHA256 6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153
+EBUILD ldapvi-1.7-r1.ebuild 907 RMD160 3718bb31f02748a2f373cd471171c76e13a69005 SHA1 4f7e78a8a3b327d45637b6d72421ec57e358624c SHA256 3446c19fb926dd1ac103f84acda4ed9bd4163951d390e83edac1f8f121a7b9f2
 EBUILD ldapvi-1.7.ebuild 895 RMD160 4a3f8bad3a171653c79e94e2c486cfdd1e10db65 SHA1 6dde124d324cfc29801a2b2240a3e200cff10c8d SHA256 6364a74a8092900b844ef51efa608fd009c3a6ded3dcdc5e063c5f21e825c298
-MISC ChangeLog 3280 RMD160 84c4ad3f8d5d39ef390df94b77b20673623907bb SHA1 5e4e3759029e0beaae6558a44e3092620888fb15 SHA256 2a3966a653c2978f318480ab1d77bd4f6ef591919bd5c802c6a55b62b92a86e9
-MISC metadata.xml 432 RMD160 f4c6c3281c7be0926c82e296135fb8fe7df566e0 SHA1 1e1791c3dcfc8c9ad0e245cacf0d058e69796355 SHA256 f6000417d41623cf0aa762caa2c92cdeeec98a87df3e4d7d8339f3febfdaf81b
+MISC ChangeLog 3534 RMD160 206230da51c6a00573c9daf6ac7d2ed06c9fa290 SHA1 e4bef232e01db53e01dc91c2a60e69a3a7cd8e96 SHA256 59f26d95457694360846ddfce46cc4eda760f9ceb41c4e290b00ed49992d8d7e
+MISC metadata.xml 393 RMD160 2956003f06c1dc137c18dec2b9b4067e86911a23 SHA1 6092eb1b7f09ec5d1e99e0de89aa2ac983be9558 SHA256 2fe13fe618602454461fdf1052f9bc953432da7a2e8dd4d84871d13002e864f8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkoWyPMACgkQAiZjviIA2XiISwCePx88eaQVQT3hFwwrDU2ZGSzH
-yjwAn1OzZleS8RD9oM8PquLocZU/rAOK
-=rAv6
+iF4EAREIAAYFAk3022oACgkQknrdDGLu8JDiSQD+NJ93qnXqE+130LmJwDdnY/99
+qGbCnc/H0AVhBCpcAS4A/ixtJog0PitE6fVmunsFQGJGcQBH71PL+3sGpv3MnPUc
+=YCg6
 -----END PGP SIGNATURE-----
diff --git a/net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch b/net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch
new file mode 100644
index 000000000000..d9431bed2de1
--- /dev/null
+++ b/net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch
@@ -0,0 +1,13 @@
+From https://bugzilla.redhat.com/show_bug.cgi?id=691958
+
+--- ldapvi-1.7/ldapvi.c
++++ ldapvi-1.7/ldapvi.c
+@@ -1414,7 +1414,7 @@ write_file_header(FILE *s, cmdline *cmdline)
+ 	int nlines = 0;
+ 
+ 	if (print_binary_mode == PRINT_UTF8 && !cmdline->ldif) {
+-		fputs("# -*- coding: utf-8 -*- vim:encoding=utf-8:\n", s);
++		fputs("# -*- coding: utf-8 -*- \n", s);
+ 		nlines++;
+ 	}
+ 	if (cmdline->ldif) {
diff --git a/net-nds/ldapvi/ldapvi-1.7-r1.ebuild b/net-nds/ldapvi/ldapvi-1.7-r1.ebuild
new file mode 100644
index 000000000000..405b33ee9f16
--- /dev/null
+++ b/net-nds/ldapvi/ldapvi-1.7-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ldapvi-1.7-r1.ebuild,v 1.1 2011/06/12 15:29:40 xmw Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Manage LDAP entries with a text editor"
+HOMEPAGE="http://www.lichteblau.com/ldapvi/"
+SRC_URI="http://www.lichteblau.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="ssl"
+
+RDEPEND="sys-libs/ncurses
+	>=net-nds/openldap-2.2
+	dev-libs/popt
+	>=dev-libs/glib-2
+	sys-libs/readline
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}+glibc-2.10.patch"
+	epatch "${FILESDIR}/${P}-vim-encoding.patch"
+}
+
+src_configure() {
+	econf $(use_with ssl libcrypto openssl) || die
+}
+
+src_install() {
+	emake install || die
+	dobin ldapvi || die
+	doman ldapvi.1 || die
+}
diff --git a/net-nds/ldapvi/metadata.xml b/net-nds/ldapvi/metadata.xml
index 916d5eccef09..1ccab81d80a5 100644
--- a/net-nds/ldapvi/metadata.xml
+++ b/net-nds/ldapvi/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
 	</maintainer>
 	<longdescription lang="en">
 		Text based LDAP client which uses your standard editor for viewing and