gentoo resync : 28.04.2021

5 files changed, 41 insertions, 40 deletions

diff --git a/app-editors/levee/Manifest b/app-editors/levee/Manifest
index 597a44d375db..d2fbc76bcc95 100644
--- a/app-editors/levee/Manifest
+++ b/app-editors/levee/Manifest
@@ -1,6 +1,6 @@
-AUX levee-3.4o-darwin.patch 318 BLAKE2B 910cf037791f260d7c8471f0b8abb9fabdd9c281acf4c27fd8e4985b0700d5e93c7daf783cf6cda0583d16ffa8b681d7bf7c48035129b9782e23ccf331fbec6e SHA512 8f29e675e03ef67922f396950cc7245bd6dda15aa2bdea21fc2b75b3f93d641cc46cd5cdfa878dc5780ff01e66e9d8708a6e67625248bd21fe2679b458f60faf
-AUX levee-3.5-glibc210.patch 2448 BLAKE2B 181bfb232b5ee9356c1a7ee23b54d65f3c73a77589335323c535db96b7160a6bcc00c44f4b5b6cd077c15615e5e02ad0e9f09b06011ebc57ab9301c1f5660b8e SHA512 178e77e6fb88517c0001d95e99164a67d3d6342dc0ff3dd2d355f2b2823d2fbdf2a851909d2c935dc629391a4ccc861c55a6c5ed9ce8d74dd1987c924c9f9307
-AUX levee-3.5a-QA.patch 637 BLAKE2B b98f04d4abd20b8b937d360e809e88c0b86b7b010ed24327cf8243b47f9ec11232865ad41999f5a1ad42ba09a891153452522bc69bebf305ef54218810febbfc SHA512 30878ad11f021fed3912dd06b397c80539c98b0795a39a98134a6466a8d3041162bf9e3d43ede9780e5f415ba481a21b925d16f33297118fb246158607f19227
+AUX levee-3.4o-darwin.patch 265 BLAKE2B c099dca875658567a788cc1bfe3928c7969266b50ec5e8ffb1194e7b88db1f691e0d4b97243198e48402f442914f19c0ef1f269e8df221153950622fa4a43328 SHA512 6b05d59021408fadf044ea388729632e9770780b2206725401aaa19f8151171f9b18f4dfdf60cbc7a74ee344855ce23978cef79978416728342999dd8fc96244
+AUX levee-3.5-glibc210.patch 1683 BLAKE2B dafaf7b7bb8a8d11ef8c74f81800449d54b582ea1ab202539c7e630dd8aca7aa4d5b302a21292a3cfe978163b9c8d5089ec7e5931e43b75448a86faeb77db265 SHA512 8aabe959dc12e551128045cda1027498a4fd0b42eb7fc47888cfaab2f1a2fe15c3e600d1952dc78e43bc58252ff8f4e1552fbb5e7f83aae9ce77681b7e62649a
+AUX levee-3.5a-QA.patch 468 BLAKE2B ba4643a624b64c0a602c3717a1982af7436aa04cd17a05f5b353049fbbda30f08931d329a476ea17572c0c4e6338cb4e798e1105c8ba3f1c7d1cd8f4003c8c47 SHA512 23060c7b452b53ae6b354d4a727bc4e0430ea933ab7124be357432d46bf186a473b72f141406e834a492790057279126db6a60a51f2fd0a5522a7d2e586b4638
 DIST levee-3.5a.tar.gz 67733 BLAKE2B 291b502a8c9581c2c0f2ca6714c17c86692067d5de66e987f8a7b506965a21ff149c6fe445532e9b065e40dd7e519d1ebc6b5ff69c5b4a4129138df224f71dfd SHA512 e95b4fc6370903dda07aff0a612c7f34425ab0b854d05a08f42b7e339d1a86a436316d31f3667748943e2ce2e68be7f2369e4a3b36c0715b00d31b8ab50cdaf1
-EBUILD levee-3.5a.ebuild 1010 BLAKE2B d30c62eb676bb0147ea5c7c1cb2885eece7406ac42ae355ef723d976f34e87a4bf0438a06149424b86295bf5182f4b43799640242cbccf60e5c5d46c8b12b7d9 SHA512 c35a57895a8341e1f4889bb72ac59dc1682132b5ee5eb173f50dd16a3ce9103c12f4993ae2f5c3149e95943acd6ba86ae335b6af9e6cf6cee51f921188dcccb7
+EBUILD levee-3.5a.ebuild 1014 BLAKE2B 6666b02a65fea1f47909faf22d13416375d689222d024e361845dd91924031cc8725fd138c9b36c8257b21007071b671d6dce7aa20cef24d42454da4eb0c2638 SHA512 1de1ca958e5886f005df829d33fd547efea2ae28ce915d523032b8ec117dfc7118a5427f172db7770978bbe21f0432123ebcc24ebabafd9067b95e1a1497c8b0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/levee/files/levee-3.4o-darwin.patch b/app-editors/levee/files/levee-3.4o-darwin.patch
index 9481b1a3ade9..0af6f7994966 100644
--- a/app-editors/levee/files/levee-3.4o-darwin.patch
+++ b/app-editors/levee/files/levee-3.4o-darwin.patch
@@ -1,5 +1,5 @@
---- unixcall.c.orig	2007-03-18 17:46:05 +0100
-+++ unixcall.c	2007-03-18 17:51:13 +0100
+--- a/unixcall.c
++++ b/unixcall.c
 @@ -77,6 +77,13 @@
  static int ioset = 0;
  static struct termios old;
diff --git a/app-editors/levee/files/levee-3.5-glibc210.patch b/app-editors/levee/files/levee-3.5-glibc210.patch
index 51cc829cda25..f290613d2633 100644
--- a/app-editors/levee/files/levee-3.5-glibc210.patch
+++ b/app-editors/levee/files/levee-3.5-glibc210.patch
@@ -1,6 +1,5 @@
-diff -NrU5 levee-3.5.original/editcor.c levee-3.5/editcor.c
---- levee-3.5.original/editcor.c	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/editcor.c	2009-07-21 23:07:21.000000000 +0000
+--- a/editcor.c
++++ b/editcor.c
 @@ -183,11 +183,11 @@
  
      strcpy(scratch, "/tmp/lv.XXXXXX");
@@ -14,9 +13,8 @@ diff -NrU5 levee-3.5.original/editcor.c levee-3.5/editcor.c
      if ( (tf = mkstemp(scratch)) < 0 ) {
  	prints("[tempfile error]");
  	return FALSE;
-diff -NrU5 levee-3.5.original/extern.h levee-3.5/extern.h
---- levee-3.5.original/extern.h	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/extern.h	2009-07-21 23:02:39.000000000 +0000
+--- a/extern.h
++++ b/extern.h
 @@ -195,11 +195,11 @@
  extern exec_type PROC editcore();
  
@@ -30,9 +28,8 @@ diff -NrU5 levee-3.5.original/extern.h levee-3.5/extern.h
  extern bool PROC pushb(),pushi(),pushmem(),uputcmd(), delete_to_undo();
  extern bool PROC ok_to_scroll(), move_to_undo();
  
-diff -NrU5 levee-3.5.original/main.c levee-3.5/main.c
---- levee-3.5.original/main.c	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/main.c	2009-07-21 23:09:52.000000000 +0000
+--- a/main.c
++++ b/main.c
 @@ -251,11 +251,11 @@
  	println();
  
@@ -46,9 +43,8 @@ diff -NrU5 levee-3.5.original/main.c levee-3.5/main.c
  	if (mode == E_VISUAL && zotscreen && noquit) {	/*ask for more*/
  	    prints(" [more]");
  	    if ((ch=peekc()) == 13 || ch == ' ' || ch == ':')
-diff -NrU5 levee-3.5.original/misc.c levee-3.5/misc.c
---- levee-3.5.original/misc.c	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/misc.c	2009-07-21 23:09:10.000000000 +0000
+--- a/misc.c
++++ b/misc.c
 @@ -19,11 +19,11 @@
   */
  #include "levee.h"
@@ -62,9 +58,8 @@ diff -NrU5 levee-3.5.original/misc.c levee-3.5/misc.c
      int len;
      char flag;
      
-diff -NrU5 levee-3.5.original/move.c levee-3.5/move.c
---- levee-3.5.original/move.c	2009-07-21 22:58:18.000000000 +0000
-+++ levee-3.5/move.c	2009-07-21 23:10:26.000000000 +0000
+--- a/move.c
++++ b/move.c
 @@ -158,11 +158,11 @@
      case FSEARCH:
      case BSEARCH:
diff --git a/app-editors/levee/files/levee-3.5a-QA.patch b/app-editors/levee/files/levee-3.5a-QA.patch
index 7e37c76b34ac..f6553813d8ca 100644
--- a/app-editors/levee/files/levee-3.5a-QA.patch
+++ b/app-editors/levee/files/levee-3.5a-QA.patch
@@ -1,6 +1,5 @@
-diff -NrU5 levee-3.5a.original/configure.inc levee-3.5a/configure.inc
---- levee-3.5a.original/configure.inc	2009-08-12 19:51:26.000000000 +0000
-+++ levee-3.5a/configure.inc	2009-08-12 20:13:41.000000000 +0000
+--- a/configure.inc
++++ b/configure.inc
 @@ -1074,11 +1074,11 @@
      else
  	PROG_INSTALL="$DEST"
diff --git a/app-editors/levee/levee-3.5a.ebuild b/app-editors/levee/levee-3.5a.ebuild
index 965d248fd053..e5a02aa046fb 100644
--- a/app-editors/levee/levee-3.5a.ebuild
+++ b/app-editors/levee/levee-3.5a.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit toolchain-funcs eutils
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Really tiny vi clone, for things like rescue disks"
 HOMEPAGE="http://www.pell.chi.il.us/~orc/Code/"
@@ -11,29 +12,35 @@ SRC_URI="http://www.pell.chi.il.us/~orc/Code/levee/${P}.tar.gz"
 LICENSE="levee"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
-DEPEND="!app-text/lv
-	sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
+RDEPEND="
+	!app-text/lv
+	sys-libs/ncurses:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.4o-darwin.patch
-	epatch "${FILESDIR}"/${P}-QA.patch
-	epatch "${FILESDIR}"/${PN}-3.5-glibc210.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4o-darwin.patch
+	"${FILESDIR}"/${P}-QA.patch
+	"${FILESDIR}"/${PN}-3.5-glibc210.patch
+)
 
 src_configure() {
 	export AC_CPP_PROG=$(tc-getCPP)
-	export AC_PATH=${PATH}
+	export AC_PATH="${PATH}"
 	export AC_LIBDIR="$($(tc-getPKG_CONFIG) --libs ncurses)"
-	./configure.sh --prefix="${PREFIX}"/usr || die "configure failed"
+
+	./configure.sh \
+		--prefix="${PREFIX}"/usr || die "configure failed"
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS} -Wall -Wextra ${LDFLAGS}" CC=$(tc-getCC)
+	emake \
+		CFLAGS="${CFLAGS} -Wall -Wextra ${LDFLAGS}" \
+		CC=$(tc-getCC)
 }
 
 src_install() {
-	emake PREFIX="${D}${EPREFIX}" install
+	emake PREFIX="${D}/${EPREFIX}" install
 }