diff options
Diffstat (limited to 'app-editors/fe')
-rw-r--r-- | app-editors/fe/Manifest | 2 | ||||
-rw-r--r-- | app-editors/fe/fe-2.0-r1.ebuild (renamed from app-editors/fe/fe-2.0.ebuild) | 18 | ||||
-rw-r--r-- | app-editors/fe/files/fe-2.0-ncurses.patch | 32 |
3 files changed, 45 insertions, 7 deletions
diff --git a/app-editors/fe/Manifest b/app-editors/fe/Manifest index b6eecacc98f8..048e137f607a 100644 --- a/app-editors/fe/Manifest +++ b/app-editors/fe/Manifest @@ -1 +1 @@ -DIST fe-2.0.tar.gz 217430 BLAKE2B bbc886abdb54d5fe05f031a5e5700907586c4bae8812f4edd5bf6d35fa0ce16edb93a6f988a597e1b4aba69bde4019f3044091ab9285ee6138d913498816453b SHA512 85afa800466376e59aa8de4af06db51c5df8566109a1f632b30a366f944be3237f88a639329d44114360747836ed75c31746c7d6bf1568b7b4ff3e11d595a6e7 +DIST fe-2.0.tar.gz 237890 BLAKE2B 9fb2ad310016b52ebc807854c942c248b75a9e543aa919ccee0a1963d9a12b23ad9cbc4df884422654e2efb0b97ba2d590ac2d70be48dec3a19e7a455de5c168 SHA512 6967362b8ff9ce91e0480dfa8538e3d13b43748283423923a4ba19efc76fbe007975318d9fde758f9c9f0b8bd084ff49e45bfd5b9773a79ee85a2153646e0143 diff --git a/app-editors/fe/fe-2.0.ebuild b/app-editors/fe/fe-2.0-r1.ebuild index 207e9ec3f773..9df4b0b4567a 100644 --- a/app-editors/fe/fe-2.0.ebuild +++ b/app-editors/fe/fe-2.0-r1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs +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" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" IUSE="sendmail" RDEPEND="sys-libs/ncurses:0= @@ -22,8 +22,14 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.8-makefile.patch "${FILESDIR}"/${P}-ar.patch + "${FILESDIR}"/${P}-ncurses.patch ) +src_prepare() { + default + AT_NOEAUTOHEADER=yes eautoreconf +} + src_configure() { econf \ $(use_enable sendmail) \ @@ -37,7 +43,7 @@ src_compile() { src_install() { emake \ prefix="${D}"/usr \ - datadir="${D}"/usr/share \ + datarootdir="${D}"/usr/share \ MANDIR="${D}"/usr/share/man \ install 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 000000000000..dfe720b02e6e --- /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.in ++++ fe-2.0/configure.in +@@ -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 |