gentoo resync : 20.03.2021

4 files changed, 20 insertions, 71 deletions

diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index f0a9a168d9a0..00f2857cf4a3 100644
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -1,5 +1,3 @@
-DIST ne-3.1.1.tar.gz 1219488 BLAKE2B 6d778c1b2e9e18154322a6b327cc4a2711619c353eb82073ad00f3e40b3b8e61f7ee7ce6fee3f0e02b38d001dc26365f44b63f70ddd6089f186a52bdf4c69a17 SHA512 e572ca2a0cd39a59adaea911c80e083872103d90a586117efcabbc3881cf1a48d0c3d06f20eebcd9254177afafef15fd581778cd251b1b25b64ad68a5f8afc37
 DIST ne-3.3.0.tar.gz 1173159 BLAKE2B a4be3fd37a0a79b440290846184bc50551cfb9b73dc50c0376110f3603233879b396f67a87e2f9defe9c0cbc42c963e66bc43ab5396f8ccb27e5b6182c429006 SHA512 73a1bbc5a9f62354834288e25b8f4bf2b0d2ff6faf3408108b217305e2c9d8fed768b5a3c3fd21df7b3bf75a3f9c71ea899a8b3f528b560a8e5e66accd442919
-EBUILD ne-3.1.1.ebuild 1107 BLAKE2B fcbe4b009d66a096013ab8f1460166aa94987bbbd2f2cd9b193aa071193df850c46504e530479844c3550a4023510e2bd0297bb04ef8b57c1492e3df0dfd4099 SHA512 6c87ce4bcaada04ae7d7518d4773f4362711313612d4d93ce477321b0d0cc7668dd08c9b885ed774a5e31b0f913c6f1b3ef5e54bafb23c6f9bc8d5188230d5e9
-EBUILD ne-3.3.0.ebuild 1003 BLAKE2B 120daab562298b35f1ccdad4293ce6ce9e50426c88471b876d75e97d85bd3f7e8472a82a6a9460e57a042ed6ede3e4a333ee87555653d843a14b536ffc8f8b1f SHA512 0b80373e820a5509844015362b3a1113c0f703a2b3dfb412b0609efe0019ac17d319f9ee52fe54c568782c0e44a5c9e47fd495f820fa24a76e6dfaa25864044e
-MISC metadata.xml 249 BLAKE2B bd3f8cd51cd7f93c68a6ae940a7ac6a572bbd81ce9a4011bede9117025d2ec55636679e49269ca3df422ac132cc7fbfc1c982a707e30a70479b33fa0a21b0350 SHA512 40160ace781dd306147377e882be12701aa73684143080278ac55ba434185e3673aeadad11224743eefa70962ed005db0337e2ef2b5dbe6eb9fdec01bf72283c
+EBUILD ne-3.3.0.ebuild 1091 BLAKE2B 78860027854e0c4e21491f82c3a749775553ebdda8da81f72cdcc543dc44bb969f01126347376ef2df50663f7e9b0635ec9c383314177871c9ae4f971cee7d4d SHA512 2fdb544933a70387450e0ae2e601cacbe3642f3a06f1586254196738745390fac2086ac0b982674a209655478914320fbda1e95e9628c06ef4e8373a1e1c4c75
+MISC metadata.xml 240 BLAKE2B 66f22dc22855e2086bbf7552dbe1a29c682be5bf7a30efa46f67bd4712236518cfa5f0bf4ceba02f06112648d90cddb46404c7f41cdac60235d22d3abd42d5bc SHA512 db38760572568e6042b2c06fb8ee82bb69af218555c781df2f5463ab4923212bdc2f71e65d5dcc839961634373302b7a6863acef18b01c869fb1c26932b01315
diff --git a/app-editors/ne/metadata.xml b/app-editors/ne/metadata.xml
index 1d1325e157ac..f213fcf21705 100644
--- a/app-editors/ne/metadata.xml
+++ b/app-editors/ne/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="tinfo">Link against libtinfo from sys-libs/ncurses</flag>
-</use>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">vigna/ne</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-editors/ne/ne-3.1.1.ebuild b/app-editors/ne/ne-3.1.1.ebuild
deleted file mode 100644
index 37edf3c0de09..000000000000
--- a/app-editors/ne/ne-3.1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="http://ne.di.unimi.it/"
-SRC_URI="http://ne.di.unimi.it/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="tinfo"
-
-DEPEND="sys-libs/ncurses:0=[tinfo?]"
-
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-"
-
-HTML_DOCS=( doc/html/. )
-
-src_prepare() {
-	default
-	sed -i -e 's/-O3//' src/makefile || die
-}
-
-src_configure() {
-	local sedflags="s|-lcurses|-lncurses|g"
-	use tinfo && sedflags="s|-lcurses|-ltinfo|g"
-	sed -i -e "${sedflags}" src/makefile || die
-}
-
-src_compile() {
-	append-cflags -std=c11
-	emake -C src CC="$(tc-getCC)" \
-		NE_GLOBAL_DIR="/usr/share/${PN}" \
-		OPTS="${CFLAGS}" \
-		"${PN}"
-}
-
-src_install() {
-	dobin "src/${PN}"
-
-	insinto "/usr/share/${PN}/syntax"
-	doins syntax/*.jsf
-
-	doman "doc/${PN}.1"
-	dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.*
-}
diff --git a/app-editors/ne/ne-3.3.0.ebuild b/app-editors/ne/ne-3.3.0.ebuild
index c1c60d57ba1e..87aaff065bf8 100644
--- a/app-editors/ne/ne-3.3.0.ebuild
+++ b/app-editors/ne/ne-3.3.0.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
-DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="http://ne.di.unimi.it/"
-SRC_URI="http://ne.di.unimi.it/${P}.tar.gz"
+DESCRIPTION="The nice editor, easy to use for the beginner and powerful for the wizard"
+HOMEPAGE="https://ne.di.unimi.it/"
+SRC_URI="https://ne.di.unimi.it/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0=[tinfo]"
 
+BDEPEND="virtual/pkgconfig"
+DEPEND="sys-libs/ncurses:="
 RDEPEND="
 	${DEPEND}
 	dev-lang/perl
@@ -25,8 +24,13 @@ HTML_DOCS=( doc/html/. )
 
 src_prepare() {
 	default
-	#sed -i -e 's/-O3//' src/makefile || die
-	sed -i -e "s|-lcurses|-ltinfo|g" src/makefile || die
+
+	sed -i -e 's/-O3//' src/makefile || die
+}
+
+src_configure() {
+	# bug #776799
+	sed -i -e "s/-lcurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" src/makefile || die
 }
 
 src_compile() {