Version bump to git snapshot, fix USE flags sasl and gnutls.

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

3 files changed, 23 insertions, 132 deletions

diff --git a/net-nds/ldapvi/ChangeLog b/net-nds/ldapvi/ChangeLog
index cb0c27dbd3d6..9242edffcda0 100644
--- a/net-nds/ldapvi/ChangeLog
+++ b/net-nds/ldapvi/ChangeLog
@@ -1,125 +1,10 @@
 # ChangeLog for net-nds/ldapvi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ChangeLog,v 1.31 2013/02/28 09:29:22 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ChangeLog,v 1.32 2013/02/28 10:21:21 xmw Exp $
 
-*ldapvi-1.7-r2 (28 Feb 2013)
+*ldapvi-1.7_p20101214 (28 Feb 2013)
 
-  28 Feb 2013; Michael Weber <xmw@gentoo.org> +ldapvi-1.7-r2.ebuild:
-  Fix ncuses split (bug 459478).
+  28 Feb 2013; Michael Weber <xmw@gentoo.org> -ldapvi-1.7-r2.ebuild,
+  +ldapvi-1.7_p20101214.ebuild, metadata.xml:
+  Version bump to git snapshot, fix USE flags sasl and gnutls.
 
-  30 Jun 2012; Michael Weber <xmw@gentoo.org> -ldapvi-1.7.ebuild:
-  Drop old
-
-  29 Jun 2012; Jeroen Roovers <jer@gentoo.org> ldapvi-1.7-r1.ebuild:
-  Stable for HPPA (bug #420973).
-
-  13 Jun 2012; Michael Weber <xmw@gentoo.org> ldapvi-1.7-r1.ebuild:
-  ppc stable (bug 420973)
-
-  13 Jun 2012; Jeff Horelick <jdhore@gentoo.org> ldapvi-1.7-r1.ebuild:
-  marked x86 per bug 420973
-
-  13 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ldapvi-1.7-r1.ebuild:
-  Stable for amd64, wrt bug #420973
-
-  03 May 2012; Jeff Horelick <jdhore@gentoo.org> ldapvi-1.7.ebuild,
-  ldapvi-1.7-r1.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-  14 Jun 2011; Michael Weber <xmw@gentoo.org> ldapvi-1.7-r1.ebuild:
-  fix src_install, thanks to Nickolaj Stjujsckij (bug 371409)
-
-*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:
-  Add patch to fix build with glibc-2.10. Closes bug #270642.
-
-  12 Nov 2008; Ferris McCormick <fmccor@gentoo.org> ldapvi-1.7.ebuild:
-  Keyword ~sparc at user request (gustavo panizzo <gfa>), Bug #246453 ---
-  builds and works.
-
-  29 Jun 2008; Torsten Veller <tove@gentoo.org> ldapvi-1.7.ebuild:
-  Add missing die: || "..." -> || die "..."
-
-  21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
-  Fix up metadata.xml. If there's no maintainer for the package, the metadata
-  also needs to contain m-needed@g.o.
-
-  07 Jan 2008; David Shakaryan <omp@gentoo.org> ldapvi-1.7.ebuild:
-  Minor cleanup, add missing dev-util/pkgconfig dependency. (bug #204806)
-
-  21 Aug 2007; Michael Hanselmann <hansmi@gentoo.org> -ldapvi-1.5.ebuild:
-  Drop old version.
-
-  21 Aug 2007; René Nussbaumer <killerfox@gentoo.org> ldapvi-1.7.ebuild:
-  Stable on hppa.
-
-  15 Aug 2007; Michael Hanselmann <hansmi@gentoo.org> -ldapvi-1.6.ebuild:
-  Drop old version.
-
-  13 Aug 2007; Michael Hanselmann <hansmi@gentoo.org> ldapvi-1.7.ebuild:
-  Stable on amd64, ppc, x86.
-
-*ldapvi-1.7 (05 May 2007)
-
-  05 May 2007; Michael Hanselmann <hansmi@gentoo.org>
-  -files/1.6-mem-corruption.diff, -ldapvi-1.6-r1.ebuild, +ldapvi-1.7.ebuild:
-  Upstream released new version without need for a patch.
-
-*ldapvi-1.6-r1 (03 May 2007)
-
-  02 May 2007; Michael Hanselmann <hansmi@gentoo.org>
-  +files/1.6-mem-corruption.diff, +ldapvi-1.6-r1.ebuild:
-  Add post-1.6 patch from GIT to fix memory corruption bug (mentioned as
-  "potential FAQ" on ldapvi's website).
-
-  09 Jan 2007; Michael Hanselmann <hansmi@gentoo.org> ldapvi-1.6.ebuild:
-  Stable on ppc, x86.
-
-*ldapvi-1.6 (02 Dec 2006)
-
-  02 Dec 2006; Michael Hanselmann <hansmi@gentoo.org> +ldapvi-1.6.ebuild:
-  Version bump.
-
-  18 Mar 2006; Michael Hanselmann <hansmi@gentoo.org>
-  -files/ldapvi-filter.diff, -ldapvi-1.4-r1.ebuild:
-  Removed old version.
-
-  11 Mar 2006; Michael Hanselmann <hansmi@gentoo.org> ldapvi-1.5.ebuild:
-  Stable on hppa, ppc, x86.
-
-  01 Mar 2006; Michael Hanselmann <hansmi@gentoo.org> -ldapvi-1.1.ebuild,
-  -ldapvi-1.4.ebuild:
-  Removed old versions.
-
-*ldapvi-1.5 (14 Feb 2006)
-
-  14 Feb 2006; Andrea Barisani <lcars@gentoo.org> +ldapvi-1.5.ebuild:
-  Added 1.5 release, this is just like 1.4 with upstream patch (1.4-r1) but
-  I thought it's best to respect the versioning.
-
-  12 Feb 2006; Michael Hanselmann <hansmi@gentoo.org> ldapvi-1.4-r1.ebuild:
-  Stable on hppa, ppc, x86. Bespoken with lcars.
-
-*ldapvi-1.4-r1 (11 Dec 2005)
-
-  11 Dec 2005; Andrea Barisani <lcars@gentoo.org> +files/ldapvi-filter.diff,
-  +ldapvi-1.4-r1.ebuild:
-  New revision, applies patch from the author that fixes a ldap filter bug.
-
-*ldapvi-1.4 (19 Nov 2005)
-
-  19 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> +ldapvi-1.4.ebuild:
-  New version and added to ~hppa.
-
-  19 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> ldapvi-1.1.ebuild:
-  Added to ~ppc.
-
-  19 Sep 2005; Andrea Barisani <lcars@gentoo.org> ChangeLog:
-  Added initial ChangeLog.
diff --git a/net-nds/ldapvi/ldapvi-1.7-r2.ebuild b/net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild
index 7f9af2616037..868f7e95effe 100644
--- a/net-nds/ldapvi/ldapvi-1.7-r2.ebuild
+++ b/net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild
@@ -1,40 +1,43 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ldapvi-1.7-r2.ebuild,v 1.1 2013/02/28 09:29:22 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild,v 1.1 2013/02/28 10:21:21 xmw Exp $
 
 EAPI=5
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Manage LDAP entries with a text editor"
 HOMEPAGE="http://www.lichteblau.com/ldapvi/"
-SRC_URI="http://www.lichteblau.com/download/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="ssl"
+IUSE="gnutls sasl"
 
-RDEPEND="sys-libs/ncurses
-	>=net-nds/openldap-2.2
+RDEPEND="
+	sys-libs/ncurses:5
+	net-nds/openldap
 	dev-libs/popt
-	>=dev-libs/glib-2
+	dev-libs/glib:2
 	sys-libs/readline
-	ssl? ( dev-libs/openssl )"
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl:0 )
+	sasl? ( dev-libs/cyrus-sasl:2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}+glibc-2.10.patch"
-	epatch "${FILESDIR}/${P}-vim-encoding.patch"
+S=${WORKDIR}/${P}/${PN}
 
+src_prepare() {
+	#bug 459478
 	sed -e '/^AC_SEARCH_LIBS/s:curses ncurses:curses ncurses tinfo:' \
 		-i configure.in || die
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_with ssl libcrypto openssl)
+	econf --with-libcrypto=$(usex gnutls gnutls openssl)
 }
 
 src_install() {
diff --git a/net-nds/ldapvi/metadata.xml b/net-nds/ldapvi/metadata.xml
index 6ce622ae3a91..49415441c778 100644
--- a/net-nds/ldapvi/metadata.xml
+++ b/net-nds/ldapvi/metadata.xml
@@ -9,4 +9,7 @@
 		Text based LDAP client which uses your standard editor for viewing and
 		changing entries.
 	</longdescription>
+<use>
+	<flag name="gnutls">Use net-libs/gnutls instead of dev-libs/openssl</flag>
+</use>
 </pkgmetadata>