commit: fa52aca0e36bf7ec45d0b6c63648d091e1f1a004 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Sep 19 22:51:05 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Sep 19 22:51:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa52aca0
dev-lang/regina-rexx: Port to EAPI 7 Closes: https://bugs.gentoo.org/723068 Closes: https://bugs.gentoo.org/726906 Closes: https://bugs.gentoo.org/726920 Closes: https://bugs.gentoo.org/729878 Closes: https://bugs.gentoo.org/737082 Closes: https://bugs.gentoo.org/740950 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../files/regina-rexx-3.9.1-makefile.patch | 150 +++++++++++++++++++++ dev-lang/regina-rexx/regina-rexx-3.9.1-r1.ebuild | 25 ++-- 2 files changed, 162 insertions(+), 13 deletions(-) diff --git a/dev-lang/regina-rexx/files/regina-rexx-3.9.1-makefile.patch b/dev-lang/regina-rexx/files/regina-rexx-3.9.1-makefile.patch new file mode 100644 index 00000000000..66d268c9176 --- /dev/null +++ b/dev-lang/regina-rexx/files/regina-rexx-3.9.1-makefile.patch @@ -0,0 +1,150 @@ +--- a/common/incdebug.m4 ++++ b/common/incdebug.m4 +@@ -15,54 +15,6 @@ + cflags_g="`echo $CFLAGS | grep -c '\-g'`" + cflags_O="`echo $CFLAGS | grep -c '\-O'`" + +-if test "$with_debug" = yes; then +- DEBUG="-DDEBUG" +- DEBUGGING="-g" +- if test "$cflags_g" = "0"; then +- CFLAGS="${CFLAGS} -g" +- fi +- if test "$cflags_O" != "0"; then +- CFLAGS="`echo ${CFLAGS} | sed -e s/-O.//`" +- fi +-else +- DEBUG="-DNDEBUG" +- if test "$cflags_O" = "0"; then +- CFLAGS="${CFLAGS} -O" +- fi +- if test "$cflags_g" = "0"; then +- CFLAGS="${CFLAGS} -g" +- fi +-fi +-if test "$ac_cv_prog_CC" = "gcc" -o "$ac_cv_prog_CC" = "g++" -o "$ac_cv_prog_CC" = "clang"; then +- if test "$with_debug" = yes; then +- CFLAGS="${CFLAGS} -Wall" +- else +-# CFLAGS="${CFLAGS} -O3 -Wall -fomit-frame-pointer -fno-strict-aliasing -Wno-char-subscripts" +- CFLAGS="${CFLAGS} -O3 -Wall" +- fi +-fi +-if test "$on_qnx4" = yes; then +- if test "$ac_cv_prog_CC" = "gcc"; then +- QNX4_CFLAGS="" +- else +- QNX4_CFLAGS="-Wc,-r -b -j -Wc,-ei -N4096000 -mf -DNO_REGEX -DQNX -DQNX4 -D__QNX__ -DSTRINGS_ALIGNED -Q" +- fi +- if test "$with_debug" = yes; then +- CFLAGS="-g $QNX4_CFLAGS" +- else +- CFLAGS="-Otax $QNX4_CFLAGS" +- fi +-fi +-if test "$on_beos" = yes; then +- if test "$with_debug" = yes; then +- CFLAGS="${CFLAGS} -Wall" +- else +- CFLAGS="${CFLAGS} -O2 -Wall" +- fi +- if test "$datadir" = "\${prefix}/share"; then +- datadir="/boot/home/config/add-ons" +- fi +-fi + AC_SUBST(DEBUG) + AC_SUBST(DEBUGGING) + +--- a/configure.in ++++ b/configure.in +@@ -25,7 +25,7 @@ + + dnl ---------------------- check for C compiler ----------------- + dnl Checks for one of the C compilers below - change if yours not there. +-MH_PROG_CC ++AC_PROG_CC + + AC_CONFIG_HEADER(config.h) + AC_ISC_POSIX +--- a/Makefile.in ++++ b/Makefile.in +@@ -308,7 +308,7 @@ + # + .SUFFIXES: + +-all : rexx$(binarybitprefix)$(EXE) $(STATICLIB) execiser$(binarybitprefix)$(EXE) $(SHL_TARGETS) $(THREADSAFE_TARGET) rxstack$(binarybitprefix)$(EXE) rxqueue$(binarybitprefix)$(EXE) $(MTBFILES) ++all : rexx$(binarybitprefix)$(EXE) execiser$(binarybitprefix)$(EXE) $(SHL_TARGETS) $(THREADSAFE_TARGET) rxstack$(binarybitprefix)$(EXE) rxqueue$(binarybitprefix)$(EXE) $(MTBFILES) + + $(srcdir)/rexx.h : $(srcdir)/extern.h $(srcdir)/strings.h $(srcdir)/defs.h $(srcdir)/regina_t.h $(srcdir)/mt.h + +@@ -1031,20 +1031,14 @@ + $(INSTALL) -m 755 -d $(DESTDIR)$(sharedir) + $(INSTALL) -m 755 -d $(DESTDIR)$(examplesdir) + $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 +- $(INSTALL) -s -m 755 -c ./rexx$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rexx$(binarybitprefix)$(EXE) +- $(INSTALL) -s -m 755 -c ./rxqueue$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rxqueue$(binarybitprefix)$(EXE) +- $(INSTALL) -s -m 755 -c ./rxstack$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rxstack$(binarybitprefix)$(EXE) ++ $(INSTALL) -m 755 -c ./rexx$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rexx$(binarybitprefix)$(EXE) ++ $(INSTALL) -m 755 -c ./rxqueue$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rxqueue$(binarybitprefix)$(EXE) ++ $(INSTALL) -m 755 -c ./rxstack$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rxstack$(binarybitprefix)$(EXE) + $(INSTALL) -m 755 -c ./regina-config $(DESTDIR)$(bindir)/regina-config +- -$(INSTALL) -m 644 -c ./$(LIBPRE)$(LIBFILE)$(LIBPST) $(DESTDIR)$(libdir)/$(LIBPRE)$(LIBFILE)$(LIBPST) +- -$(RANLIB) $(DESTDIR)$(libdir)/$(LIBPRE)$(LIBFILE)$(LIBPST) + $(INSTALL) -m 644 -c $(srcdir)/regina.1 $(DESTDIR)$(mandir)/man1/regina.1 + $(INSTALL) -m 644 -c $(srcdir)/regina-config.1 $(DESTDIR)$(mandir)/man1/regina-config.1 + $(INSTALL) -m 644 -c $(srcdir)/rxstack.1 $(DESTDIR)$(mandir)/man1/rxstack.1 + $(INSTALL) -m 644 -c $(srcdir)/rxqueue.1 $(DESTDIR)$(mandir)/man1/rxqueue.1 +- gzip -f $(DESTDIR)$(mandir)/man1/regina.1 +- gzip -f $(DESTDIR)$(mandir)/man1/regina-config.1 +- gzip -f $(DESTDIR)$(mandir)/man1/rxstack.1 +- gzip -f $(DESTDIR)$(mandir)/man1/rxqueue.1 + $(INSTALL) -m 644 -c $(srcdir)/rexxsaa.h $(DESTDIR)$(includedir)/rexxsaa.h + $(INSTALL) -m 644 -c ./en.mtb $(DESTDIR)$(sharedir)/en.mtb + $(INSTALL) -m 644 -c ./pt.mtb $(DESTDIR)$(sharedir)/pt.mtb +@@ -1068,33 +1062,33 @@ + -chmod 755 $(DESTDIR)$(examplesdir)/newstr.rexx + + installregina: +- $(INSTALL) -s -m 755 -c ./regina$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/regina$(binarybitprefix)$(EXE) ++ $(INSTALL) -m 755 -c ./regina$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/regina$(binarybitprefix)$(EXE) + $(DESTDIR)$(bindir)/rexx$(binarybitprefix)$(EXE) $(srcdir)/preinst.rexx $(bindir)/regina$(binarybitprefix)$(EXE) $(srcdir)/demo/dynfunc.rexx $(DESTDIR)$(examplesdir)/dynfunc.rexx + -chmod 755 $(DESTDIR)$(examplesdir)/dynfunc.rexx + $(DESTDIR)$(bindir)/rexx$(binarybitprefix)$(EXE) $(srcdir)/preinst.rexx $(bindir)/regina$(binarybitprefix)$(EXE) $(srcdir)/regutil/regutil.rexx $(DESTDIR)$(examplesdir)/regutil.rexx + -chmod 755 $(DESTDIR)$(examplesdir)/regutil.rexx + + installlib: installregina +- $(INSTALL) -s -m 755 -c ./$(SHLPRE)$(SHLFILE)$(SHLPST) $(DESTDIR)$(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST) +- $(INSTALL) -s -m 755 -c ./$(SHLPRE)regutil$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)regutil$(MODPST) +- $(INSTALL) -s -m 755 -c ./$(SHLPRE)rxtest1$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)rxtest1$(MODPST) +- $(INSTALL) -s -m 755 -c ./$(SHLPRE)rxtest2$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)rxtest2$(MODPST) ++ $(INSTALL) -m 755 -c ./$(SHLPRE)$(SHLFILE)$(SHLPST) $(DESTDIR)$(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST) ++ $(INSTALL) -m 755 -c ./$(SHLPRE)regutil$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)regutil$(MODPST) ++ $(INSTALL) -m 755 -c ./$(SHLPRE)rxtest1$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)rxtest1$(MODPST) ++ $(INSTALL) -m 755 -c ./$(SHLPRE)rxtest2$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)rxtest2$(MODPST) + + installabilib: installregina +- -$(INSTALL) -s -m 755 -c ./$(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI) $(DESTDIR)$(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI) ++ -$(INSTALL) -m 755 -c ./$(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI) $(DESTDIR)$(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI) + -rm -f $(DESTDIR)$(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI_MAJOR) + -(cd $(DESTDIR)$(libdir);$(LN_S) $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI) $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI_MAJOR) ) + -rm -f $(DESTDIR)$(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST) + -(cd $(DESTDIR)$(libdir);$(LN_S) $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI_MAJOR) $(SHLPRE)$(SHLFILE)$(SHLPST) ) +- $(INSTALL) -s -m 755 -c ./$(SHLPRE)regutil$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)regutil$(MODPST) +- $(INSTALL) -s -m 755 -c ./$(SHLPRE)rxtest1$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)rxtest1$(MODPST) +- $(INSTALL) -s -m 755 -c ./$(SHLPRE)rxtest2$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)rxtest2$(MODPST) ++ $(INSTALL) -m 755 -c ./$(SHLPRE)regutil$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)regutil$(MODPST) ++ $(INSTALL) -m 755 -c ./$(SHLPRE)rxtest1$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)rxtest1$(MODPST) ++ $(INSTALL) -m 755 -c ./$(SHLPRE)rxtest2$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)rxtest2$(MODPST) + + installcyglib: +- $(INSTALL) -s -m 755 -c ./$(SHLPRE)$(SHLFILE)$(SHLPST) $(DESTDIR)$(bindir)/$(SHLPRE)$(SHLFILE)$(SHLPST) +- $(INSTALL) -s -m 755 -c ./$(SHLPRE)regutil$(MODPST) $(DESTDIR)$(addonsdir)/regutil$(MODPST) +- $(INSTALL) -s -m 755 -c ./$(SHLPRE)rxtest1$(MODPST) $(DESTDIR)$(addonsdir)/rxtest1$(MODPST) +- $(INSTALL) -s -m 755 -c ./$(SHLPRE)rxtest2$(MODPST) $(DESTDIR)$(addonsdir)/rxtest2$(MODPST) ++ $(INSTALL) -m 755 -c ./$(SHLPRE)$(SHLFILE)$(SHLPST) $(DESTDIR)$(bindir)/$(SHLPRE)$(SHLFILE)$(SHLPST) ++ $(INSTALL) -m 755 -c ./$(SHLPRE)regutil$(MODPST) $(DESTDIR)$(addonsdir)/regutil$(MODPST) ++ $(INSTALL) -m 755 -c ./$(SHLPRE)rxtest1$(MODPST) $(DESTDIR)$(addonsdir)/rxtest1$(MODPST) ++ $(INSTALL) -m 755 -c ./$(SHLPRE)rxtest2$(MODPST) $(DESTDIR)$(addonsdir)/rxtest2$(MODPST) + + # + # Can't strip .dylib on OSX diff --git a/dev-lang/regina-rexx/regina-rexx-3.9.1-r1.ebuild b/dev-lang/regina-rexx/regina-rexx-3.9.1-r1.ebuild index e3a31db968a..bc100fa59cf 100644 --- a/dev-lang/regina-rexx/regina-rexx-3.9.1-r1.ebuild +++ b/dev-lang/regina-rexx/regina-rexx-3.9.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit autotools eutils toolchain-funcs +inherit autotools DESCRIPTION="Portable Rexx interpreter" HOMEPAGE="https://regina-rexx.sourceforge.io/"; @@ -12,27 +12,26 @@ SRC_URI="mirror://sourceforge/${PN}/Regina-REXX-${PV}.tar.gz" LICENSE="LGPL-2.1 MPL-1.0" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -S=${WORKDIR}/Regina-REXX-${PV} +S="${WORKDIR}/Regina-REXX-${PV}" -MAKEOPTS+=" -j1" - -DOCS=( BUGS HACKERS.txt README.Unix README_SAFE TODO ) +PATCHES=( "${FILESDIR}"/${PN}-3.9.1-makefile.patch ) src_prepare() { - sed -e 's/CFLAGS=/UPSTREAM_CFLAGS=/' -i common/incdebug.m4 || die - + default + mv configure.{in,ac} || die eautoconf - tc-export CC #don't move it as tc-getCC } src_compile() { - emake LIBEXE="$(tc-getAR)" + emake -j1 } src_install() { - default + emake -j1 DESTDIR="${D}" install + DOCS=( BUGS HACKERS.txt README.Unix README_SAFE TODO ) + einstalldocs + newinitd "${FILESDIR}"/rxstack-r1 rxstack }
