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

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 30 insertions, 138 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/Manifest b/net-nds/ldapvi/Manifest
index a0b099debf9b..ce63dc9ebdec 100644
--- a/net-nds/ldapvi/Manifest
+++ b/net-nds/ldapvi/Manifest
@@ -4,14 +4,15 @@ Hash: SHA256
 AUX ldapvi-1.7+glibc-2.10.patch 1251 SHA256 512395cea5828a2532c7db4bc369354640482e9cb8fb8b6edec39c2e8b2673f6 SHA512 f69acbdccff7804d1c7ec216bf9f37b09b0077005aea8f8b1e36c1bfd3b29833fd2bb85f83d55fd8031d37d7dd52f373f1e351dd7ea68338ca5cee9f2f419e45 WHIRLPOOL ee55a7f34bcd9b768098c3c2cb960980b3533e99ca7e7bfbd0f190724d6b14d66eb824c3444348bc8531238287fe7fa9b7f556322c82de8e0fe94674374f3be7
 AUX ldapvi-1.7-vim-encoding.patch 396 SHA256 0a08d97ec43b85dab7c0076807880aeeaf74d6fce17b2c060148c409c3a48ee0 SHA512 30c5e36a747f9dfb2b6ccf73a9094f6485c6507436906a5b52b2b685f0ae9e72d16e351e4466cd5f445bb308627bd3255f7b0c29b6daa0bc4bb545091b345a12 WHIRLPOOL 84b2c24574c5c5d4ef610fb9fabef57e8d5103cd454decff667a8e3fc8cddb27eaa21ef47f2ae4a30f3dc367a06515f8a1874c9f54ed0ebc33edffaabf0679fc
 DIST ldapvi-1.7.tar.gz 119503 SHA256 6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153 SHA512 4b38cee0763aa33703afbd5e358a458b1468abf58e43ea885879b2117bc1c0bbc375d91c6a43467ec08035b8b3b7dd4b024f2937c37741c7a5513ea9192aed36 WHIRLPOOL 136b7c21e2438b294d9d7504827f76a18138caa1c71dad6858cf59c2399243da57886792934ebb3e559697490228e89da5a769aa84cd054b95abafbd179527b9
+DIST ldapvi-1.7_p20101214.tar.bz2 1490491 SHA256 a8b805bf29753dd7f758b8f564a40584e930a63549bc0e466db13c828f6be91b SHA512 2d2a744a36364793f406f37ecf6e546914d697457dec37b81544f4979f4c692756b2a1c3ea6fcbaba5e3238b2bf758ab3e0bd9a9a0794c4da734d65286bd5925 WHIRLPOOL 5cd89780b11306f7822f49357e799df8940a1e3417dd0252697dd1be87ce3e2956c344fd5a76169966e4ba35b11981c7c17c503201182c3ef08db84dddde7029
 EBUILD ldapvi-1.7-r1.ebuild 941 SHA256 a7d8c547a458a40abbd764e2152f4682a72433ad51b7d2dc316d42c34acf35b5 SHA512 64bf7c722aa18df304116500ff5475a506b1c998adcd2c7cb6855243f616dea72d1a062dfb94ffd9ba14dc4a4670e151dc7d12292c56532bfc21ce1e05bb5eca WHIRLPOOL 226c5b10e3bb3621a730d0ad0b649c1373cc157dc109da71e70ea2b43d4869029ec40f55f73a7d9254ad7bb09996eeb57502cc3c4ef5d0af4b1d74a087b8f009
-EBUILD ldapvi-1.7-r2.ebuild 1034 SHA256 753e09d3a896ae49e08eaa1f60e7821b2497eed8e5c49066ef609c49025abce6 SHA512 5a55dde4f078e52c358f39ede667eb2e7dc1ed5c8c6422e7e111a98d4a22032369c4324642f2e71b062fa42488027842c17d04661d154b21ea8878137894c257 WHIRLPOOL 1e5afaadbda181e18c9198e7386c8cd452e5b38efb1c72276764b228f40f33290f12a678a15086a6ac4e2697bc8e3bf3783e047371496f1f745d73fb60cb18a4
-MISC ChangeLog 4417 SHA256 0429193f305ed5bd2d2ce631e2ae2fa1a2313cc75b619020ca0c1219efcf15fa SHA512 79d00f42870873ba6d71f883a7f1b861e50d37a8ee1c73873dfdc1b30d06abf1270adea5db6b76d1b1133513c6dc162894f690e372b6b18f051130a4c48bf2f7 WHIRLPOOL ab909fbb1e3985e68704ae6594b0d1a76639e5116635d0dacfe946b7fa9c9e4e5fc5aa392472b110ea4cf22f5921a6c9ad47fa1fd3a424d10a0cad58bf11b097
-MISC metadata.xml 371 SHA256 c355766f58e57dc2ba045fab6b85f590d9eeb6905a09ccf07d758b341ef407b3 SHA512 4e2909fa5e9fbc695ece3c55467076528d560f72c98076bf118ee04620d81a035a7141795545cdcc85092d0cfcb99fce0a30e49ec7b834fb37518dc9c834abc9 WHIRLPOOL 4b5f963ca048646bd0f96a81bfaa564e60cfa019633de3e4de47ae9fcc07a2d8ec91e55976ceabab536f4bb0a33c7c00217c8d83de40ab80c13e44ed1f2583f9
+EBUILD ldapvi-1.7_p20101214.ebuild 1048 SHA256 4fab8e83e1d995b3040feaf55c2cc539cd67eeb43afad78dde9d041d864a7639 SHA512 77aff0a05ea81e0e5d7355bf0a9d78c58afd88c5e8425bda86aae68114a5b50c6dbe78d30e0d933153d0f1e54a63fe324f550ef34f0f3438fe6e57ab74443c9f WHIRLPOOL 9d027050d319041534d312fc084e2a5fa86d77fee6a828cca5aa1189083de7e9d77b73ab01890fe93b8c72e593e7d7b33bb0a4b3b4937cbc15a5421eab05dc74
+MISC ChangeLog 415 SHA256 a77fac9b2e812e37cff5e1ba11112809e1c0f39d60c9c82db2d53d24cd7435b1 SHA512 46a39d7eb7b39b70fd623d5ed054c056b5d2b35f21dcb6a37e00a88bcb1ff6508775c0c99e6e27ab10d3824434c78ab2332216f49897e2c20d4e4c1ae8b8096f WHIRLPOOL 2906c5bf692491d3070a6f9971b628cd5b5441cc227dbf37fac6eb272bf7fb5d7a87e259bfe5a9eaa2e995a66f7b4332eb5ab8bc9d9216ce182d4f086c9a1e05
+MISC metadata.xml 460 SHA256 75754115c8591320b6f0fb4c5cc55aecbb2c96df0e62ea41602574224a61763a SHA512 b9fc977b1a6b79406e1cd89cb949cdd50e3c85e0d52c3cb58948966ad7d323d93569197553f43f06b1c44a1f5692a14d4360078f45f4ac7ac99faba057ceef2b WHIRLPOOL 49c3a876735a3795b4b75c8da5fa3569287ab8138e8af32064d4aaa60bcb811512f0ddb2de3198bac567a444680a8af015dc0d83a7677af15d78789ba7ca0d82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEvI8cACgkQknrdDGLu8JBOdQD/R0V5a3UYq5QMBrN8MpwkIixF
-uiThUUrx1CQizCP4H+YBAJU+LczyUVZxGTog1BhXmhA2c/nHEzJEu3+sL+6jnZDY
-=PZCw
+iF4EAREIAAYFAlEvL8IACgkQknrdDGLu8JATjgD/W7edEM5cyBwFKX7YwS3ATfdA
+wPdgc4aHQyeFaJ6xWsEA/jqn+PrpcmZyFlezFdZcXQXfq9xjxylRJ/ZViecSRqgJ
+=3O6I
 -----END PGP SIGNATURE-----
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>