Revision bump to fix vim syntax

(Portage version: 2.1.9.42/cvs/Linux x86_64)

4 files changed, 64 insertions, 4 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/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