gentoo resync : 23.09.2020

3 files changed, 164 insertions, 14 deletions

diff --git a/dev-lang/regina-rexx/Manifest b/dev-lang/regina-rexx/Manifest
index e1a37593bed6..f8e62866f293 100644
--- a/dev-lang/regina-rexx/Manifest
+++ b/dev-lang/regina-rexx/Manifest
@@ -1,4 +1,5 @@
+AUX regina-rexx-3.9.1-makefile.patch 7808 BLAKE2B ebd6fb3dc0abd5574144cf967abf1be59505018bfc168d7d7e041b1182d13020e3c74203a7227f3029f2a19bc6c530d777d93955272b591b3c6bb3ec40644673 SHA512 51ae3d232419a605c8accdae401ed52b539acb6f64ef2830a06e2a9f25bbf68b63a2e0ecf40b9585df1c3df256bd855dd23ec13f6b31519d39ecde568e23a7a1
 AUX rxstack-r1 268 BLAKE2B 1bec862218eb0ef5087d5859f53adacf6fa22f3fc4b05a04ae89a861f32f800261e07620e1bab97a1aa7548f1232aad86367fc69c1696cd126edc4168064eb2b SHA512 823cc12df4986919b3177590b9da73c76474012361ff41eb93a04376df2efb3445b27da8931b9fdc5d960f5231a34ddaa7724d35d139eb2a1e340b025dfc460c
 DIST Regina-REXX-3.9.1.tar.gz 1358458 BLAKE2B 48a46895fa2a98359f9dc58e8f22cdedd8429459c4ca1680abc6b556d2da19731265666e6259a02d6886167c58273a39e0b7509d5dae31d5b8359ac6a69daaae SHA512 679d146d68598ccca28c4e66a12ab898d5bfb77e2e5d64ce5ffc9159b982dcda419815a83b05e5dfbe3acea84f8f59955726a6466defefe1ac24646c46609677
-EBUILD regina-rexx-3.9.1-r1.ebuild 885 BLAKE2B a4d4bbe82d0fbaa9a1ad9acf6c34046e71d08e7752039bbddd3c2aaec7d7c401cad89a6fb6101e5aec4b966ed8712a8369d728cb33c3b03ab00df26de98c2dce SHA512 d654d3397be510a56e8e4f4c1e6ee1a90e342e4c145e566cd007d1f9c43751b49134dbb10feebaef5b989c0a00dfe1980a929a24756065cb2bdecf18c09d28d8
+EBUILD regina-rexx-3.9.1-r1.ebuild 841 BLAKE2B ea6593534c58e2f92d358ea1840abea1d250c279d4e567c1da97b7dad1d9a0736e66e72a3441cea38f4a155297c740132b64f705eea8fc1e3cfd4110cbef9189 SHA512 0539e2a60efe1ea95ccf4b0a465d2267cf883b7f34bc57b262d14b2c1b4dc1394864c14777c12e5d1a6833f83c3a529f806c8799f02fa69a83ad3b7b01921736
 MISC metadata.xml 621 BLAKE2B 1c2633a537f57bfad970ed33efc01f061466627bf3e3b3136c48c6f4c396a7e5367ba9b7bcab05a5eb5407b89bd5e3484435d250932ec7b3eba0c4d3911f9bff SHA512 a6d00129b209db3dde49a5807fcacf252e381d084d44233240c0d65105d19519943c24220daaa2aa423f63fbc7ecd438ddb359c4a77e261086b8a9bc388c1305
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 000000000000..66d268c91762
--- /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 e3a31db968a8..bc100fa59cf2 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
 }