commit: 5488fb56c417da75dc533d0452e8348c178df5a7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Mar 17 03:29:18 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 17 03:29:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5488fb56
app-editors/ne: correctly detect ncurses libs in 3.1.1 Closes: https://bugs.gentoo.org/776799 Signed-off-by: Sam James <sam <AT> gentoo.org> app-editors/ne/metadata.xml | 3 --- app-editors/ne/ne-3.1.1.ebuild | 12 +++++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app-editors/ne/metadata.xml b/app-editors/ne/metadata.xml index 1d1325e157a..6f49eba8f49 100644 --- a/app-editors/ne/metadata.xml +++ b/app-editors/ne/metadata.xml @@ -2,7 +2,4 @@ <!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> </pkgmetadata> diff --git a/app-editors/ne/ne-3.1.1.ebuild b/app-editors/ne/ne-3.1.1.ebuild index 37edf3c0de0..702fb854d32 100644 --- a/app-editors/ne/ne-3.1.1.ebuild +++ b/app-editors/ne/ne-3.1.1.ebuild @@ -1,7 +1,7 @@ # 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 @@ -12,10 +12,9 @@ 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?]" +BDEPEND="virtual/pkgconfig" +DEPEND="sys-libs/ncurses:0=" RDEPEND=" ${DEPEND} dev-lang/perl @@ -29,9 +28,8 @@ src_prepare() { } src_configure() { - local sedflags="s|-lcurses|-lncurses|g" - use tinfo && sedflags="s|-lcurses|-ltinfo|g" - sed -i -e "${sedflags}" src/makefile || die + # bug #776799 + sed -i -e "s/-lcurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" src/makefile || die } src_compile() {
