[gentoo-commits] repo/gentoo:master commit in: app-editors/fe/, app-editors/fe/files/

[gentoo-commits] repo/gentoo:master commit in: app-editors/fe/, app-editors/fe/files/

[Ulrich Müller]

commit:     ce7bd659f16863e234001244e3904c145644e49f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 16 19:39:10 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 16 19:39:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce7bd659

app-editors/fe: Fix segmentation fault in ncurses lib

Bug: https://bugs.gentoo.org/818415
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-editors/fe/fe-2.0-r1.ebuild           | 55 +++++++++++++++++++++++++++++++
 app-editors/fe/files/fe-2.0-ncurses.patch | 32 ++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/app-editors/fe/fe-2.0-r1.ebuild b/app-editors/fe/fe-2.0-r1.ebuild
new file mode 100644
index 00000000000..45263fd5ce8
--- /dev/null
+++ b/app-editors/fe/fe-2.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A small and easy to use folding editor"
+HOMEPAGE="http://www.moria.de/~michael/fe/"
+SRC_URI="http://www.moria.de/~michael/fe/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sendmail"
+
+RDEPEND="sys-libs/ncurses:0=
+	sendmail? ( virtual/mta )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8-makefile.patch
+	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${P}-ncurses.patch
+)
+
+src_prepare() {
+	mv configure.{in,ac} || die
+	default
+	AT_NOEAUTOHEADER=yes eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable sendmail) \
+		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake \
+		prefix="${D}"/usr \
+		datadir="${D}"/usr/share \
+		datarootdir="${D}"/usr/share \
+		MANDIR="${D}"/usr/share/man \
+		install
+
+	dodoc NEWS README
+	docinto html
+	dodoc fe.html
+}

diff --git a/app-editors/fe/files/fe-2.0-ncurses.patch b/app-editors/fe/files/fe-2.0-ncurses.patch
new file mode 100644
index 00000000000..8eef06db645
--- /dev/null
+++ b/app-editors/fe/files/fe-2.0-ncurses.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/818415
+
+--- fe-2.0/configure.ac
++++ fe-2.0/configure.ac
+@@ -55,19 +55,6 @@
+ AC_CHECK_FUNCS(strdup)
+ AC_CHECK_FUNCS(strndup)
+ 
+-AC_CHECK_LIB(ncursesw, get_wch, [have_utf8_ncurses=yes; LIBS="-lncursesw $LIBS"])
+-if test "$have_utf8_ncurses" = yes
+-then
+-  AC_DEFINE(HAVE_UTF8_NCURSES)
+-  AC_CHECK_HEADERS(ncurses/ncurses.h,have_ncurses_ncurses_h=yes)
+-  if test "$have_ncurses_ncurses_h" != yes
+-  then
+-    AC_CHECK_HEADERS(ncurses.h,have_ncurses_h=yes)
+-  fi
+-fi
+-
+-if test "$have_utf8_ncurses" != yes
+-then
+ AC_CHECK_LIB(ncurses, get_wch, [have_utf8_ncurses=yes; LIBS="-lncurses $LIBS"])
+ if test "$have_utf8_ncurses" = yes
+ then
+@@ -78,7 +65,6 @@
+     AC_CHECK_HEADERS(ncurses.h,have_ncurses_h=yes)
+   fi
+ fi
+-fi
+ 
+ if test "$have_utf8_ncurses" != yes
+ then

[gentoo-commits] repo/gentoo:master commit in: app-editors/fe/, app-editors/fe/files/

[Ulrich Müller]

commit:     ed1513806780418973a24ced30f333cf128d542f
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri May  6 21:30:31 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri May  6 21:31:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed151380

app-editors/fe: Don't rename configure.in

eautoconf does this for us in EAPI 8.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-editors/fe/fe-2.0-r1.ebuild           | 3 +--
 app-editors/fe/files/fe-2.0-ncurses.patch | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app-editors/fe/fe-2.0-r1.ebuild b/app-editors/fe/fe-2.0-r1.ebuild
index 4fd949e78973..9df4b0b4567a 100644
--- a/app-editors/fe/fe-2.0-r1.ebuild
+++ b/app-editors/fe/fe-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,6 @@ PATCHES=(
 )
 
 src_prepare() {
-	mv configure.{in,ac} || die
 	default
 	AT_NOEAUTOHEADER=yes eautoreconf
 }

diff --git a/app-editors/fe/files/fe-2.0-ncurses.patch b/app-editors/fe/files/fe-2.0-ncurses.patch
index 8eef06db6454..dfe720b02e6e 100644
--- a/app-editors/fe/files/fe-2.0-ncurses.patch
+++ b/app-editors/fe/files/fe-2.0-ncurses.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/818415
 
---- fe-2.0/configure.ac
-+++ fe-2.0/configure.ac
+--- fe-2.0/configure.in
++++ fe-2.0/configure.in
 @@ -55,19 +55,6 @@
  AC_CHECK_FUNCS(strdup)
  AC_CHECK_FUNCS(strndup)