[gentoo-commits] repo/gentoo:master commit in: net-nds/ldapvi/files/, net-nds/ldapvi/

[Mikle Kolyada]

commit:     963eb89009a01bae4a873feb310d6d58998ef887
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed May  9 15:32:37 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed May  9 15:33:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=963eb890

net-nds/ldapvi: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-nds/ldapvi/Manifest                            |  1 -
 net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch   | 39 ----------------------
 net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch | 13 --------
 net-nds/ldapvi/ldapvi-1.7-r1.ebuild                | 39 ----------------------
 4 files changed, 92 deletions(-)

diff --git a/net-nds/ldapvi/Manifest b/net-nds/ldapvi/Manifest
index 7e0a71e91f2..01a179e7e04 100644
--- a/net-nds/ldapvi/Manifest
+++ b/net-nds/ldapvi/Manifest
@@ -1,2 +1 @@
-DIST ldapvi-1.7.tar.gz 119503 BLAKE2B a04c52d1d113e4d8afcda12e648cd89d71a6f247ff400bbc7c68597fa4046de58bb0611746df5fb6e9df31ac8a3ad94d1df431d46912185d37d63fa8d24392e3 SHA512 4b38cee0763aa33703afbd5e358a458b1468abf58e43ea885879b2117bc1c0bbc375d91c6a43467ec08035b8b3b7dd4b024f2937c37741c7a5513ea9192aed36
 DIST ldapvi-1.7_p20101214.tar.bz2 1490491 BLAKE2B 21bb7b6113e89ce848e7a8efcec063dbfe9c32331c1125456a96dc6edc4e09d17245307a041a7d7804fac20bcce5b38677d719fb53d993fb874134bbd4d4df19 SHA512 2d2a744a36364793f406f37ecf6e546914d697457dec37b81544f4979f4c692756b2a1c3ea6fcbaba5e3238b2bf758ab3e0bd9a9a0794c4da734d65286bd5925

diff --git a/net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch b/net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch
deleted file mode 100644
index df2a20c7124..00000000000
--- a/net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: ldapvi-1.7/common.h
-===================================================================
---- ldapvi-1.7.orig/common.h
-+++ ldapvi-1.7/common.h
-@@ -273,7 +273,7 @@ void pipeview_wait(int pid);
- char *home_filename(char *name);
- void read_ldapvi_history(void);
- void write_ldapvi_history(void);
--char *getline(char *prompt, char *value);
-+char *ldapvi_getline(char *prompt, char *value);
- char *get_password();
- char *append(char *a, char *b);
- void *xalloc(size_t size);
-Index: ldapvi-1.7/ldapvi.c
-===================================================================
---- ldapvi-1.7.orig/ldapvi.c
-+++ ldapvi-1.7/ldapvi.c
-@@ -470,7 +470,7 @@ change_mechanism(bind_options *bo)
- 		bo->authmethod = LDAP_AUTH_SASL;
- 		puts("Switching to SASL authentication.");
- 	}
--	bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech);
-+	bo->sasl_mech = ldapvi_getline("SASL mechanism", bo->sasl_mech);
- }
- 
- static int
-Index: ldapvi-1.7/misc.c
-===================================================================
---- ldapvi-1.7.orig/misc.c
-+++ ldapvi-1.7/misc.c
-@@ -315,7 +315,7 @@ write_ldapvi_history()
- }
- 
- char *
--getline(char *prompt, char *value)
-+ldapvi_getline(char *prompt, char *value)
- {
- 	tdialog d;
- 	init_dialog(&d, DIALOG_DEFAULT, prompt, value);

diff --git a/net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch b/net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch
deleted file mode 100644
index d9431bed2de..00000000000
--- a/net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 0aebcb27665..00000000000
--- a/net-nds/ldapvi/ldapvi-1.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}
-	virtual/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() {
-	dobin ldapvi || die
-	doman ldapvi.1 || die
-	dodoc NEWS manual/{bg.png,html.xsl,manual.{css,xml}} || die
-}