diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
| commit | 46eedbedafdb0040c37884982d4c775ce277fb7b (patch) | |
| tree | db33a91259730be84999e13a8d8168c799f50ac0 /app-editors/fe | |
| parent | e23a08d0c97a0cc415aaa165da840b056f93c997 (diff) | |
gentoo resync : 20.10.2021
Diffstat (limited to 'app-editors/fe')
| -rw-r--r-- | app-editors/fe/Manifest | 5 | ||||
| -rw-r--r-- | app-editors/fe/fe-2.0-r1.ebuild (renamed from app-editors/fe/fe-2.0.ebuild) | 17 | ||||
| -rw-r--r-- | app-editors/fe/files/fe-2.0-ncurses.patch | 32 |
3 files changed, 47 insertions, 7 deletions
diff --git a/app-editors/fe/Manifest b/app-editors/fe/Manifest index a2636e555d0c..dbd4c3b30c17 100644 --- a/app-editors/fe/Manifest +++ b/app-editors/fe/Manifest @@ -1,5 +1,6 @@ AUX fe-1.8-makefile.patch 370 BLAKE2B f0bfc2c97e30ce35a904394a871b275043ee479392997117f1886cebf57fb1fe9f056fdb0bd94f4130837323fc2c20e94aeb575ad0d0f3a80af7199e2fbd3759 SHA512 09820543f98e166a9692788d0b42f29b6ee60852f0e6197af86b4b8da31c902ff9c8be59e925af21e50241d5ef6e629195190dda6a1d0317e601abb4135e1238 AUX fe-2.0-ar.patch 502 BLAKE2B 4c3beea491ddb03a3adf5923c8fbdc0279ac9e6899216af71018af425f7caa33faa47ec6bc89b6a409d5370ffa0553fe9e7ca744a2ee238c36d2ceac378a1c3f SHA512 1c5ede0c9570f31ba3c42fd43f2c77170dce957a8376f02adaa2b82687e3daef9c8e0a941377de915be968d10e6fa34274b433eba396273cfe20ed1868dbd17b -DIST fe-2.0.tar.gz 217430 BLAKE2B bbc886abdb54d5fe05f031a5e5700907586c4bae8812f4edd5bf6d35fa0ce16edb93a6f988a597e1b4aba69bde4019f3044091ab9285ee6138d913498816453b SHA512 85afa800466376e59aa8de4af06db51c5df8566109a1f632b30a366f944be3237f88a639329d44114360747836ed75c31746c7d6bf1568b7b4ff3e11d595a6e7 -EBUILD fe-2.0.ebuild 859 BLAKE2B 600346c9cd0ea2ffa6795579dfb05eb5af3307e9e63531049b717db05fcd140136d0c8d005cb0fc388e24c24c55cfeb6992cf324b782a9177f137c44f88b5b9f SHA512 d09002589b3c4a279131ce179bdade3772971980ad9bad00d3b9023b49f1a34e237fd083bb1b76001bfaece4608c54cbe26b72e0a9147e922bf9f1289a44513b +AUX fe-2.0-ncurses.patch 784 BLAKE2B 90af3d2e4a402314b8d18bf817e84c7ca2b8f1d0da05d36d8971e31a8e293c016f6217f89d2575c4e3ecd5bab699bc3dd1a29118f7bfc174fa1e547a38be7650 SHA512 aedf564b7083536261d9b90dc3c8b9e247b98e5845c50259f27fe665661245f2454c3a1e3294815e32bb378f4959010ac0d181c9e8d56acbbbfa657a7b58ff3a +DIST fe-2.0.tar.gz 237890 BLAKE2B 9fb2ad310016b52ebc807854c942c248b75a9e543aa919ccee0a1963d9a12b23ad9cbc4df884422654e2efb0b97ba2d590ac2d70be48dec3a19e7a455de5c168 SHA512 6967362b8ff9ce91e0480dfa8538e3d13b43748283423923a4ba19efc76fbe007975318d9fde758f9c9f0b8bd084ff49e45bfd5b9773a79ee85a2153646e0143 +EBUILD fe-2.0-r1.ebuild 999 BLAKE2B 91dd7ef8ba6f9ee2ad5057010ed057d61866bf63e20d50e316ced8e7702dd877e08d21b35ead4963c74cfccccb718c1ea2267d5974c075dc7dedee516c5757ab SHA512 a5a0a5cbe5dea74b17c35309b6ad3a2009f0e8411f5ffe8803e4005d56c94a83f8142189316a917747085bd62dc9e4ac3e24a78ac597ed7be85dcf0e70cd813b MISC metadata.xml 1260 BLAKE2B 50776c6064961af6dea0d9ff8435b5a8e246ae7b1a03f1b9181bd9b6b8cc66d0fd0426df3f323672f3e2b2014a7caf08f0a55da783565a870a16e2cff220b70f SHA512 84d731be9b361299802a4924278e5d7e3288075f7cdc3b8d1f8c78fd11a8f7bf9be58c89b5e5718a11e7c52b7aba1949db6a9f6b9a4cc278428dd292734aeff7 diff --git a/app-editors/fe/fe-2.0.ebuild b/app-editors/fe/fe-2.0-r1.ebuild index 207e9ec3f773..90e47d9c22e4 100644 --- a/app-editors/fe/fe-2.0.ebuild +++ b/app-editors/fe/fe-2.0-r1.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 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" IUSE="sendmail" @@ -22,8 +22,15 @@ 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) \ @@ -37,7 +44,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..8eef06db6454 --- /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 |