From 88ebe56470c37b02a044e1091cad6b2df0f3be8f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 May 2018 16:02:49 +0100 Subject: gentoo resync : 11.05.2018 --- net-nds/ldapvi/Manifest | 6 +--- 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 ---------------------- net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild | 2 +- 5 files changed, 2 insertions(+), 97 deletions(-) delete mode 100644 net-nds/ldapvi/files/ldapvi-1.7+glibc-2.10.patch delete mode 100644 net-nds/ldapvi/files/ldapvi-1.7-vim-encoding.patch delete mode 100644 net-nds/ldapvi/ldapvi-1.7-r1.ebuild (limited to 'net-nds/ldapvi') diff --git a/net-nds/ldapvi/Manifest b/net-nds/ldapvi/Manifest index 2217afd09b00..f87559482b5d 100644 --- a/net-nds/ldapvi/Manifest +++ b/net-nds/ldapvi/Manifest @@ -1,7 +1,3 @@ -AUX ldapvi-1.7+glibc-2.10.patch 1251 BLAKE2B 0daf5e513081524af798ce1bdb2598aa6fc23fcbeeac2d154e786385145db3997eb461ea8b92d3c779f6a0a945c86d73cb65a209038ac6ac9dc95aee4870293a SHA512 f69acbdccff7804d1c7ec216bf9f37b09b0077005aea8f8b1e36c1bfd3b29833fd2bb85f83d55fd8031d37d7dd52f373f1e351dd7ea68338ca5cee9f2f419e45 -AUX ldapvi-1.7-vim-encoding.patch 396 BLAKE2B 80ebd7db9389b9cbea84e0df86ca1cba0ecb45e3e59a68076ce03b42c2b442e7d86d34e1911be21d90ff9cfd67ec6aabd8a0ebfc88d7c3b3ff4be88e6d21efbc SHA512 30c5e36a747f9dfb2b6ccf73a9094f6485c6507436906a5b52b2b685f0ae9e72d16e351e4466cd5f445bb308627bd3255f7b0c29b6daa0bc4bb545091b345a12 -DIST ldapvi-1.7.tar.gz 119503 BLAKE2B a04c52d1d113e4d8afcda12e648cd89d71a6f247ff400bbc7c68597fa4046de58bb0611746df5fb6e9df31ac8a3ad94d1df431d46912185d37d63fa8d24392e3 SHA512 4b38cee0763aa33703afbd5e358a458b1468abf58e43ea885879b2117bc1c0bbc375d91c6a43467ec08035b8b3b7dd4b024f2937c37741c7a5513ea9192aed36 DIST ldapvi-1.7_p20101214.tar.bz2 1490491 BLAKE2B 21bb7b6113e89ce848e7a8efcec063dbfe9c32331c1125456a96dc6edc4e09d17245307a041a7d7804fac20bcce5b38677d719fb53d993fb874134bbd4d4df19 SHA512 2d2a744a36364793f406f37ecf6e546914d697457dec37b81544f4979f4c692756b2a1c3ea6fcbaba5e3238b2bf758ab3e0bd9a9a0794c4da734d65286bd5925 -EBUILD ldapvi-1.7-r1.ebuild 834 BLAKE2B c9407f6a998a12ec642a53dc7cee2464df1a33797c56c6c35c631053cc9a4ac71abed03390382bc6b2a5a113cc9324df331a61eb479094ed7d3a935188f44443 SHA512 106641b5cdb1fa7b274010322b3a1c0941153b9fe9cb828bc9bd4ca233cb80871c7b5f6de6cb1733fe45c85df77850735b469cd5ddf563408549afb86630d6ad -EBUILD ldapvi-1.7_p20101214.ebuild 932 BLAKE2B 2022194c40da83dab6742d7f7713366b9e762effb201d34ac267ff1f538b170ed6f8af1f62a6a695059c0e9f2df0ca5f1643957d63ae4d8cdff18da060505b32 SHA512 5707649f3c820fa2eb9164d3fef072fbd1706e9f1879e7bad805875c95cd73b828dd46ca3f3ca0cea087691f6276d9edfd44c2da972956b8f438f15829cd5eeb +EBUILD ldapvi-1.7_p20101214.ebuild 931 BLAKE2B 45ce069e6a4a5411ba96c1bb2aceb0553b375050d193afd85dec40aa5484f8b5bd712fb398a0bd0e9d5992c6b7a1699948af56ef221154146549ce3cc3df9da5 SHA512 f25907d10aa79f446109e4137c922c175f98c2da3969ada4f029c11e5ada65a9d6097aab1edb01622ac428ae3b210c039bdd7daee2d874f4fdd145b59a3bec25 MISC metadata.xml 474 BLAKE2B 45e25e966ab1b5bf2a4915bc8273a06bceab035e5abeccf8261677d187a8aab25390e65c473a0b1d0dd125ed6a241a4aef4a208c5373af0f5f62fdb15cfbf31a SHA512 840afe9dd11eeda2b3d29387b2043c6973deaad32ffd8f70ccde46eae0dbd1d09a179a6e29cb61e60a0c9ae0bfb13b96298be4cac02a97f444550fadcc34ea9c 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 df2a20c71245..000000000000 --- 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 d9431bed2de1..000000000000 --- 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 0aebcb276659..000000000000 --- 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 -} diff --git a/net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild b/net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild index 9763222901dc..5cad67220358 100644 --- a/net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild +++ b/net-nds/ldapvi/ldapvi-1.7_p20101214.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc ~sparc x86" +KEYWORDS="amd64 ~hppa ppc ~sparc x86" IUSE="gnutls sasl" RDEPEND=" -- cgit v1.2.3