gentoo resync : 22.01.2021

4 files changed, 52 insertions, 13 deletions

diff --git a/app-editors/lpe/Manifest b/app-editors/lpe/Manifest
index 31cfaa17705b..872568a776eb 100644
--- a/app-editors/lpe/Manifest
+++ b/app-editors/lpe/Manifest
@@ -1,4 +1,5 @@
-AUX lpe-1.2.6.13-make-382.patch 794 BLAKE2B 87248819ab6b670a752c394070bca60aaf916deabc0b9ee8e5a8a43a8aa2b8d2bac6b623edbecf1a3937263f2adde3db058c36e49544137cc330746ff05ba8af SHA512 1f40434c9f545fca31461f0fa5bf801478d9c3c96a1a24905425b5471d88ad03178ff72d9a8f9459f3ceb2000a3d857f0d9d38cd2fd745952707991101d8283f
+AUX lpe-1.2.6.13-fno-common.patch 603 BLAKE2B 1c78bf5d7e049d101c890dda5d22833de0489a381ec071760745c53bf8ef72a552010fa1340ba02b262fe67af38d4f858ae472d34e3ff8a55b6325dbfb55beb4 SHA512 6a2ddbc03ca09cbd499f6b471c2eb76db4a78294467e9e73365fd99a3f4a5af3d6d539cf2fbc77261cb57a9aa6751199e6ef19a252e6caf12502a9ad9f136876
+AUX lpe-1.2.6.13-make-382.patch 797 BLAKE2B 548091708e01e3baf9d52eaa7f8638d870f10060b858162ea19d8bb70062ca7883fa16c431c839e939dcfc1917c8b7c675180aaff47424dde326f74866885649 SHA512 442b5dbfb11b002f86d2a67cef1c4f57a5ac6e3965cc0618f0bd7058d14ea79ed4f108c40f25cf94ff6edefa8655d5a46c2bcc2552c60c66322e194117e5ca11
 DIST lpe_1.2.6.13-0.1.tar.gz 600523 BLAKE2B 8866aff63276d5e39ed48b4d9e8b9a23d541c13e196815c29586df83f8c6b5895a8dde8fb16b0929bffc49416907d74d48fdbc5ce736a855f2d2daad6472fb96 SHA512 f02769baca396285fe8f98c934f6274185d2bf8b08f3b007cbfa4e6aadb455abfb7cab13d53a3d1fa71ea0c29c4222784dcbc9a7508501c7d1839671503758ed
-EBUILD lpe-1.2.6.13.ebuild 1229 BLAKE2B 6468643a3833b96a6e2b17fc3f484ef3d9bae46d730d38384c1213f36d610ff8f159d63020fb4f652510afae824a38cb81c7bd75aeeb7d5fb406a100938b623a SHA512 13fed9c9ef2d4cce3d9fc6e322539a1128b3f81057b8b94da504b3b2ff65cfcd844693e04dc8b8fed962c706d99dcae70cd1c6d167a4f1b98b22f01c594d9e71
+EBUILD lpe-1.2.6.13.ebuild 1269 BLAKE2B 4f7a1a3d6518c184ba76f39b4dc427430eb8450feb3a91e736f81448afdfab2e59b6dd3c8f0bff2c7f08b1d4c76c42046e6fba0a5e72865d9314afc8c53c3ea7 SHA512 261ffa5abdecf4d522cfb25eb83333af1770a6d919ec9d99717dbf440bf600500c5b9653ccb18a373f29f3cb4c737f20e464fb6b3be17536c56209a1de910ba7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch b/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch
new file mode 100644
index 000000000000..2cc68157ed53
--- /dev/null
+++ b/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/707188
+--- a/src/cfg.c
++++ b/src/cfg.c
+@@ -22,6 +22,7 @@
+ #include <string.h>
+ #endif
+ 
++extern char *LPE_CONFIG_FILE;
+ int cfg_errno;
+ 
+ void
+--- a/src/lpe.c
++++ b/src/lpe.c
+@@ -25,6 +25,7 @@
+ #include "strfuncs.h"
+ #include "exports.h"
+ 
++char *LPE_CONFIG_FILE;
+ /* A flag indicating a desire to quit the editor.  This is set whenever a
+  * command should cause an exit.
+  */
+--- a/src/options.h
++++ b/src/options.h
+@@ -38,6 +38,6 @@
+ /*
+  * Other things that are used in some places...
+  */
+-char *LPE_CONFIG_FILE;
++extern char *LPE_CONFIG_FILE;
+ 
+ #endif /* LPE_OPTIONS_H */
diff --git a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch b/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch
index f8d96ef087e9..2e93042570aa 100644
--- a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch
+++ b/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch
@@ -1,7 +1,6 @@
 http://bugs.gentoo.org/335324
-
---- intl/Makefile.in
-+++ intl/Makefile.in
+--- a/intl/Makefile.in
++++ b/intl/Makefile.in
 @@ -202,12 +202,12 @@
  # The dependency for intlh.inst is different in gettext and all other
  # packages.  Because we cannot you GNU make features we have to solve
diff --git a/app-editors/lpe/lpe-1.2.6.13.ebuild b/app-editors/lpe/lpe-1.2.6.13.ebuild
index 463f48e14e24..4a9bb25d8011 100644
--- a/app-editors/lpe/lpe-1.2.6.13.ebuild
+++ b/app-editors/lpe/lpe-1.2.6.13.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune multilib toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="a lightweight programmers editor"
 HOMEPAGE="https://packages.qa.debian.org/l/lpe.html"
@@ -13,14 +14,21 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~x86-linux"
 IUSE="nls"
 
-RDEPEND=">=sys-libs/slang-2.2.4
-	>=sys-libs/ncurses-5.7-r7:0="
-DEPEND="${RDEPEND}
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/slang"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make-382.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-make-382.patch
+	default
 
 	# You should add PKG_CHECK_MODULES(NCURSES, ncurses) to configure.in and
 	# replace -lncurses in src/Makefile.am with $(NCURSES_LIBS)
@@ -45,5 +53,5 @@ src_install() {
 		exdir="${ED}/usr/share/doc/${PF}/examples" \
 		install
 
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }