From 7184d0d1b3e808e77232f9334120fc68e010e5d2 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 18 Sep 2022 02:34:19 +0100 Subject: app-text/expander: EAPI 8, fix implicit func. declarations Closes: https://bugs.gentoo.org/870898 Signed-off-by: Sam James --- app-text/expander/expander-2.0.5-r2.ebuild | 41 --------------- app-text/expander/expander-2.05-r3.ebuild | 43 ++++++++++++++++ .../expander/files/expander-2.0.5-gentoo.patch | 58 --------------------- .../expander/files/expander-2.05-clang15.patch | 60 ++++++++++++++++++++++ app-text/expander/files/expander-2.05-gentoo.patch | 58 +++++++++++++++++++++ 5 files changed, 161 insertions(+), 99 deletions(-) delete mode 100644 app-text/expander/expander-2.0.5-r2.ebuild create mode 100644 app-text/expander/expander-2.05-r3.ebuild delete mode 100644 app-text/expander/files/expander-2.0.5-gentoo.patch create mode 100644 app-text/expander/files/expander-2.05-clang15.patch create mode 100644 app-text/expander/files/expander-2.05-gentoo.patch (limited to 'app-text/expander') diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.0.5-r2.ebuild deleted file mode 100644 index 6684a72038d5..000000000000 --- a/app-text/expander/expander-2.0.5-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Expander is a utility that acts as a filter for text editors" -HOMEPAGE="http://www.nedit.org" -SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos" - -S="${WORKDIR}/${PN}" - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_compile() { - emake -C src CC="$(tc-getCC)" -} - -src_install() { - dobin src/{expander,boxcomment,align_columns,align_comments,where_is} - dosym boxcomment /usr/bin/unboxcomment - - einstalldocs - dodoc USAGE - doman docs/*.1 - - insinto /usr/share/${P} - doins -r service defs macros misc templates -} - -pkg_postinst() { - elog - elog "Instructions for using expander with NEdit are in /usr/share/doc/${PF}/INSTALL" - elog "Macro, definition and template files can be found in /usr/share/${P}" - elog -} diff --git a/app-text/expander/expander-2.05-r3.ebuild b/app-text/expander/expander-2.05-r3.ebuild new file mode 100644 index 000000000000..ee8a110a01e6 --- /dev/null +++ b/app-text/expander/expander-2.05-r3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Expander is a utility that acts as a filter for text editors" +HOMEPAGE="http://www.nedit.org" +SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_${PV}.tar.gz" +S="${WORKDIR}"/${PN} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-clang15.patch +) + +src_compile() { + emake -C src CC="$(tc-getCC)" +} + +src_install() { + dobin src/{expander,boxcomment,align_columns,align_comments,where_is} + dosym boxcomment /usr/bin/unboxcomment + + einstalldocs + dodoc USAGE + doman docs/*.1 + + insinto /usr/share/${P} + doins -r service defs macros misc templates +} + +pkg_postinst() { + elog + elog "Instructions for using expander with NEdit are in ${EROOT}/usr/share/doc/${PF}/INSTALL" + elog "Macro, definition and template files can be found in ${EROOT}/usr/share/${P}" + elog +} diff --git a/app-text/expander/files/expander-2.0.5-gentoo.patch b/app-text/expander/files/expander-2.0.5-gentoo.patch deleted file mode 100644 index 460a8164cee5..000000000000 --- a/app-text/expander/files/expander-2.0.5-gentoo.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/src/Makefile -+++ b/src/Makefile -@@ -3,15 +3,14 @@ - bindir = $(BINDIR)/ - - copy = ln -fs --CFLAGS += -v -g # -DNEED_GETOPT_PROTO_TYPE --compiler = cc $(CFLAGS) -+compiler = $(CC) $(CFLAGS) - - executables = expander boxcomment align_columns align_comments where_is - - #-------------- - # Build Targets - #-------------- --all: verify $(executables) -+all: $(executables) - - verify: - @if [ "$(bindir)" = "/" ]; then \ -@@ -24,32 +23,31 @@ - # Abbreviation expansion filter program (with NEdit, language sensitive) - #----------------------------------------------------------------------- - expander: expander.c -- $(compiler) -o $(bindir)$@ $? -+ $(compiler) $(LDFLAGS) -o $@ $? - - #-------------------------------------------------------------------------- - # Surround given text with open ended box. (with NEdit, language sensitive) - #-------------------------------------------------------------------------- - boxcomment: boxcomment.c -- $(compiler) -o $(bindir)$@ $? -- @if [ ! -f $(bindir)un$@ ]; then $(copy) $(bindir)$@ $(bindir)un$@; fi -+ $(compiler) $(LDFLAGS) -o $@ $? - - #------------------------------------------------------------------------------- - # Align ragged looking 'C' style comments (good substitute for align_equals too) - #------------------------------------------------------------------------------- - align_comments: align_comments.c -- $(compiler) -o $(bindir)$@ $? -+ $(compiler) $(LDFLAGS) -o $@ $? - - #---------------------------- - # Align given text in columns - #---------------------------- - align_columns: align_columns.c -- $(compiler) -o $(bindir)$@ $? -+ $(compiler) $(LDFLAGS) -o $@ $? - - #---------------------------------------------- - # File locator (substitute for which, where...) - #---------------------------------------------- - where_is: where_is.c -- $(compiler) -o $(bindir)$@ $? -+ $(compiler) $(LDFLAGS) -o $@ $? - - #------------------------------------------------ - # Here is how to uninstall the executables built. diff --git a/app-text/expander/files/expander-2.05-clang15.patch b/app-text/expander/files/expander-2.05-clang15.patch new file mode 100644 index 000000000000..a7ae9bed3ddf --- /dev/null +++ b/app-text/expander/files/expander-2.05-clang15.patch @@ -0,0 +1,60 @@ +https://bugs.gentoo.org/870898 +--- a/src/align_columns.c ++++ b/src/align_columns.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + /*============================================================================*/ + /* SYMBOL DEFINITIONS */ +--- a/src/align_comments.c ++++ b/src/align_comments.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + /*===========================================================================*/ + /* SYMBOL DEFINITIONS */ +--- a/src/boxcomment.c ++++ b/src/boxcomment.c +@@ -59,6 +59,7 @@ + #include + #include + #include ++#include + + /*============================================================================*/ + /* SYMBOL DEFINITIONS */ +--- a/src/expander.c ++++ b/src/expander.c +@@ -114,6 +114,7 @@ + #include + #include + #include ++#include + + /*==========================================================================*/ + /* MACRO DEFINITIONS */ +@@ -1264,7 +1265,7 @@ bool_t locate_definition( + bool_t ignore_definition = FALSE; + int i; + char line[ MAXBUF ]; +- static level = 0; ++ static int level = 0; + + /*--------------------- + * Recursion protection. +--- a/src/where_is.c ++++ b/src/where_is.c +@@ -54,6 +54,7 @@ + #include + #include + #include ++#include + + typedef int bool_t; + diff --git a/app-text/expander/files/expander-2.05-gentoo.patch b/app-text/expander/files/expander-2.05-gentoo.patch new file mode 100644 index 000000000000..460a8164cee5 --- /dev/null +++ b/app-text/expander/files/expander-2.05-gentoo.patch @@ -0,0 +1,58 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -3,15 +3,14 @@ + bindir = $(BINDIR)/ + + copy = ln -fs +-CFLAGS += -v -g # -DNEED_GETOPT_PROTO_TYPE +-compiler = cc $(CFLAGS) ++compiler = $(CC) $(CFLAGS) + + executables = expander boxcomment align_columns align_comments where_is + + #-------------- + # Build Targets + #-------------- +-all: verify $(executables) ++all: $(executables) + + verify: + @if [ "$(bindir)" = "/" ]; then \ +@@ -24,32 +23,31 @@ + # Abbreviation expansion filter program (with NEdit, language sensitive) + #----------------------------------------------------------------------- + expander: expander.c +- $(compiler) -o $(bindir)$@ $? ++ $(compiler) $(LDFLAGS) -o $@ $? + + #-------------------------------------------------------------------------- + # Surround given text with open ended box. (with NEdit, language sensitive) + #-------------------------------------------------------------------------- + boxcomment: boxcomment.c +- $(compiler) -o $(bindir)$@ $? +- @if [ ! -f $(bindir)un$@ ]; then $(copy) $(bindir)$@ $(bindir)un$@; fi ++ $(compiler) $(LDFLAGS) -o $@ $? + + #------------------------------------------------------------------------------- + # Align ragged looking 'C' style comments (good substitute for align_equals too) + #------------------------------------------------------------------------------- + align_comments: align_comments.c +- $(compiler) -o $(bindir)$@ $? ++ $(compiler) $(LDFLAGS) -o $@ $? + + #---------------------------- + # Align given text in columns + #---------------------------- + align_columns: align_columns.c +- $(compiler) -o $(bindir)$@ $? ++ $(compiler) $(LDFLAGS) -o $@ $? + + #---------------------------------------------- + # File locator (substitute for which, where...) + #---------------------------------------------- + where_is: where_is.c +- $(compiler) -o $(bindir)$@ $? ++ $(compiler) $(LDFLAGS) -o $@ $? + + #------------------------------------------------ + # Here is how to uninstall the executables built. -- cgit v1.2.3-65-gdbad