gentoo auto-resync : 02:01:2023 - 20:24:39

5 files changed, 243 insertions, 128 deletions

diff --git a/dev-cpp/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest
index 5b26d213aab4..04ee10f6517a 100644
--- a/dev-cpp/antlr-cpp/Manifest
+++ b/dev-cpp/antlr-cpp/Manifest
@@ -1,7 +1,7 @@
+AUX 2.7.7-autotools.patch 6273 BLAKE2B cff9b2f6d071438e49eab2ee042d5ec5501d9fa926925b7d365b36e4b39e4cab88e2e140c1ca74a9ac92195c5c12f515d802dbe7ba51d2d13a0fda51dd9bc3cf SHA512 a80590e2751242b816c01d9bddd682642fa858f2824c11ca346c22e5f90950784143fefea936e603fc81fc6cc716f8be6882207510979213440ab11eef84f517
 AUX 2.7.7-gcc.patch 402 BLAKE2B be143ebbf062aa2ed59630424e7741ac8105eb3575494639d05fe21471d2764c12fc5c5aa95f7297ed9ad67df7af8c107582f008c5372205fa4bfc991b87d14e SHA512 c94a8fcdce09f5a7cb32c2594728954775812a5eb2487aebe4f1e9203e5db75e391a2214fdb173f33f8616ac5b666e2d4653bc00a3a98b09005333ed2a3b27fd
-AUX 2.7.7-libtool.patch 621 BLAKE2B a0e48b7911bf016dbf1422768cd73e887cded6a9795d8f38d522e3e13b4f0a81f94653d61fb688db4ee1c6d3170035380fc9763b83ae68c28d88ef1902a3b715 SHA512 3f1d68eff40fac13a4f482724456cb8ed801feff71a254871368f22ab98024431c718f3fb35f13da4183bdebe62ece26908a341fe1a945118bf0d78f5d8ea622
 DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
 DIST antlr-cpp-4.7.2.zip 1494927 BLAKE2B 007aac6655dc3c4e3a0c2073ca9c8c016b46bdf97dca4494d4ea2c44d27a458bfbb09811b3beb0aec1ce2873c3b62ad6789c6a9e3e7ddc62cde51c8357e9123b SHA512 3298b83a06ddd8d8852462401e46fe2eb83d20af4ba14c722cb31b33d929d1c5a4ffb694ee084495a4ae26ed3246b6781ca6045d11253c94efc09729fa001090
-EBUILD antlr-cpp-2.7.7-r1.ebuild 2804 BLAKE2B c03a8989fc0e0d9ca8409ec82676405f37e2041f1fc9f40d8a823ed5aaea940144b5855d64311f2f9ea29ccc54fbeaa42b958a147eac47c12ce21917a4908422 SHA512 12674af8eed6304c0ebac94e1216bc4ef7c3e2cb8935d21319a4a3a15c3912c3be23b0e9a399cb245a028f370c5f3507856a7cf82e8e3a451ee586fb0f53084e
+EBUILD antlr-cpp-2.7.7-r2.ebuild 1875 BLAKE2B 68b0add6d2f97edb9f678307e71227f5c6543e61d76f4a50e9bb424039c909a7654c6b25a8b81c1c89c061f5bedce76c19f0a84997127ac2486e612f85c76edf SHA512 16793b8dd3c3bfbdfb928bf286a6c665823cae7c47c6e32ea41a6646b8dbe779747caaaa2acd072e696790ff201a9e380e156d4d33768d895fac923ec36d399d
 EBUILD antlr-cpp-4.7.2.ebuild 636 BLAKE2B 871b5616e3c8286e79e43448e99dc795e82e6e88717bc9f457b993093e930f173227485836132738d45963bc83fdb776375ce1221b82c4164cdd4bfa5714efb9 SHA512 73c8d0dbf898eb7086b290f86c82055b203cc6f5d3bbf389fb4c4921d3527ecb7acbe71908217405d75deeec65611e9b941b423349c0661734456342420ce826
 MISC metadata.xml 314 BLAKE2B 44614e69318b15302910048bed9f1a4acd92a1eb737e1861563d855aeec4e6f8f1a201f0bcbc039420a820e17f15d7deef68fb54b104d0c621def437c0457da3 SHA512 d03626431b434fe0b4fbbaaf7c860fd55390a1511c1f93f95747cc6a058795f166b73846b038bba3e843b6afdde2655ac3b7776a33276230efbaaa6d7b469d84
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild
deleted file mode 100644
index c6fa2c9550b5..000000000000
--- a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Upstream only installs a static library. The original antlr ebuild
-# built a shared library manually, which isn't so great either. This
-# ebuild applies libtool instead and therefore an autoreconf is
-# required. A couple of errors concerning tr have been seen but the
-# final result still looks good. This also sidesteps bug #554344 plus
-# the need to call einstall.
-
-inherit autotools multilib-minimal
-
-MY_P="${PN%-cpp}-${PV}"
-DESCRIPTION="The ANTLR 2 C++ Runtime"
-HOMEPAGE="https://www.antlr2.org/"
-SRC_URI="https://www.antlr2.org/download/${MY_P}.tar.gz"
-LICENSE="public-domain"
-SLOT="2"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="doc examples static-libs"
-RESTRICT="test" # No tests but test target blows up!
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="!dev-java/antlr:0[cxx]"
-
-S="${WORKDIR}/${MY_P}"
-ECONF_SOURCE="${S}"
-PATCHES=( "${FILESDIR}"/${PV}-{gcc,libtool}.patch )
-DOCS=( lib/cpp/AUTHORS lib/cpp/ChangeLog lib/cpp/README lib/cpp/TODO )
-
-src_prepare() {
-	# Turn Makefile.in files into libtool-style Makefile.am
-	# files. Countable.hpp is actually missing.
-	local HPP=$(grep -E -o "\w+\.hpp" lib/cpp/antlr/Makefile.in | grep -v "Countable\.hpp" | tr "\n" " " || die)
-	local CPP=$(grep -E -o "\w+\.cpp" lib/cpp/src/Makefile.in | tr "\n" " " || die)
-
-	cat <<EOF > lib/cpp/antlr/Makefile.am || die
-antlr_includedir = \$(includedir)/antlr
-antlr_include_HEADERS = ${HPP}
-EOF
-
-	cat <<EOF > lib/cpp/src/Makefile.am || die
-AM_CPPFLAGS = -I\$(abs_top_srcdir)/lib/cpp
-lib_LTLIBRARIES = libantlr.la
-libantlr_la_LDFLAGS = -version-info 2
-libantlr_la_SOURCES = ${CPP}
-EOF
-
-	default
-
-	mv -v configure.in configure.ac || die
-	mv -v aclocal.m4 acinclude.m4 || die
-
-	# These silly test -z lines break badly under recent autoconfs.
-	sed -i '/AC_PATH_PROG/s/test -z "\$[^"]*" *&& *//' configure.ac || die
-
-	# Delete build files from examples.
-	find examples -name Makefile.in -delete || die
-
-	# Fix make invocations. See bug #256880.
-	find -name "*.in" -exec sed -i 's/@MAKE@/$(MAKE)/g' {} + || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	CONFIG_SHELL="${BASH}" econf \
-		--disable-csharp \
-		--enable-cxx \
-		--disable-examples \
-		--disable-java \
-		--disable-python \
-		--enable-shared \
-		--enable-verbose \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use doc; then
-		cd "${S}/lib/cpp" || die
-		doxygen -u doxygen.cfg || die
-		doxygen doxygen.cfg || die
-	fi
-}
-
-multilib_src_install() {
-	# We only care about the C++ stuff.
-	emake -C lib/cpp install DESTDIR="${D}"
-}
-
-src_install() {
-	multilib-minimal_src_install
-
-	cd "${S}" || die
-	use doc && dohtml -r lib/cpp/gen_doc/html/
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/cpp/*
-	fi
-}
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r2.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r2.ebuild
new file mode 100644
index 000000000000..525a0ee06a08
--- /dev/null
+++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+MY_P="${PN%-cpp}-${PV}"
+
+DESCRIPTION="The ANTLR 2 C++ Runtime"
+HOMEPAGE="https://www.antlr2.org/"
+SRC_URI="https://www.antlr2.org/download/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="public-domain"
+SLOT="2"
+KEYWORDS="amd64 ~arm ppc x86"
+IUSE="doc examples"
+RESTRICT="test" # No tests but test target blows up!
+
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gcc.patch
+
+	# Upstream only installs a static library. The original antlr ebuild
+	# built a shared library manually, which isn't so great either. This
+	# ebuild applies libtool instead and therefore an autoreconf is
+	# required. A couple of errors concerning tr have been seen but the
+	# final result still looks good. This also sidesteps bug #554344 plus
+	# the need to call einstall.
+	"${FILESDIR}"/${PV}-autotools.patch
+)
+
+src_prepare() {
+	default
+
+	mv -v {aclocal,acinclude}.m4 || die
+
+	# Delete build files from examples
+	find examples -name Makefile.in -delete || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	CONFIG_SHELL="${BASH}" ECONF_SOURCE="${S}" econf \
+		--disable-csharp \
+		--disable-examples \
+		--disable-java \
+		--disable-python \
+		--enable-cxx \
+		--enable-verbose
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_native_use doc; then
+		cd "${S}"/lib/cpp || die
+		doxygen -u doxygen.cfg || die
+		doxygen doxygen.cfg || die
+		HTML_DOCS=( "${S}"/lib/cpp/gen_doc/html/. )
+	fi
+}
+
+multilib_src_install() {
+	# We only care about the C++ stuff
+	emake -C lib/cpp DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc lib/cpp/AUTHORS lib/cpp/ChangeLog lib/cpp/README lib/cpp/TODO
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/cpp/.
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-cpp/antlr-cpp/files/2.7.7-autotools.patch b/dev-cpp/antlr-cpp/files/2.7.7-autotools.patch
new file mode 100644
index 000000000000..5992c06c6ff7
--- /dev/null
+++ b/dev-cpp/antlr-cpp/files/2.7.7-autotools.patch
@@ -0,0 +1,159 @@
+- use libtool+automake for creating shared libraries
+- respect CXXFLAGS/LDFLAGS (#735708)
+- respect nested $(MAKE) (#256880)
+
+--- a/configure.in
++++ b/configure.in
+@@ -13,6 +13,9 @@
+ AC_CONFIG_SRCDIR([LICENSE.txt])
+ AC_CONFIG_AUX_DIR(scripts)
+ 
++LT_INIT
++AM_INIT_AUTOMAKE
++
+ ## This shall be the very first config file. Do not change
+ ## this.
+ AC_CONFIG_FILES([scripts/config.vars])
+@@ -404,7 +407,7 @@
+ esac
+ 
+ ## Test whether we have cygpath
+-test -z "$CYGPATH"    && AC_PATH_PROGS(CYGPATH, cygpath$EXEEXT )
++AC_PATH_PROGS([CYGPATH], [cygpath$EXEEXT])
+ 
+ AC_SUBST([CYGPATH_M])
+ AC_SUBST([CYGPATH_W])
+@@ -448,7 +451,7 @@
+   ]
+ )
+ 
+-## @MAKE@ shall contain absolut path name of make program found.
++## $(MAKE) shall contain absolut path name of make program found.
+ 
+ ## Search for well known make programs - take user given MAKE
+ ## into account. The result will be a list of valid make prog-
+@@ -714,7 +717,6 @@
+     ## just  overrule what autoconf figured out - we never asked for
+     ## this anyway. Our  handling  of compiler options is done below
+     ## in the fine tuning section.
+-    CXXFLAGS=""
+ 
+     ## 'cxx'  shall  be  the canonical compiler name. For example, gcc
+     ## cl, bcc, CC, etc. Note that this is in general not equal to CXX.
+@@ -807,7 +809,6 @@
+         ;;
+     esac
+ 
+-    LDFLAGS=
+     AX_VAR_HEAD([AR])
+ 
+     ##xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx##
+@@ -832,7 +833,7 @@
+ esac
+ 
+ ##
+-test -z "$DOXYGEN" && AC_PATH_PROG(DOXYGEN, doxygen, doxygen,  )
++AC_PATH_PROG([DOXYGEN], [doxygen], [doxygen], [])
+ 
+ # This seems to convince configure to use an absolute path to the backup
+ # install-sh script.
+@@ -840,8 +841,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ 
+-test -z "$MKDIR" && AC_PATH_PROG(MKDIR, mkdir$EXEEXT, mkdir$EXEEXT )
+-test -z "$RM"    && AC_PATH_PROG(RM,    rm$EXEEXT, rm$EXEEXT )
++AC_PATH_PROG([MKDIR], [mkdir$EXEEXT], [mkdir$EXEEXT])
+ 
+ AX_PATH_PROGS(
+   [TAR],
+@@ -855,10 +855,10 @@
+   [AX_VAR_HEAD([TOUCH])]
+ )
+ 
+-test -z "$CHMOD" && AC_PATH_PROG(CHMOD, chmod$EXEEXT, chmod$EXEEXT )
+-test -z "$SED"   && AC_PATH_PROG(SED,   sed$EXEEXT, sed$EXEEXT )
+-test -z "$CAT"   && AC_PATH_PROG(CAT,   cat$EXEEXT, cat$EXEEXT )
+-test -z "$GREP"  && AC_PATH_PROG(GREP,  grep$EXEEXT, grep$EXEEXT )
++AC_PATH_PROG([CHMOD], [chmod$EXEEXT], [chmod$EXEEXT])
++AC_PATH_PROG([SED],   [sed$EXEEXT],   [sed$EXEEXT])
++AC_PATH_PROG([CAT],   [cat$EXEEXT],   [cat$EXEEXT])
++AC_PATH_PROG([GREP],  [grep$EXEEXT],  [grep$EXEEXT])
+ 
+ #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#
+ #                             PYTHON                                 #
+--- /dev/null
++++ b/lib/cpp/antlr/Makefile.am
+@@ -0,0 +1,2 @@
++antlr_includedir = $(includedir)/antlr
++antlr_include_HEADERS = ANTLRException.hpp ANTLRUtil.hpp ASTArray.hpp ASTFactory.hpp AST.hpp ASTNULLType.hpp ASTPair.hpp ASTRefCount.hpp BaseAST.hpp BitSet.hpp CharBuffer.hpp CharInputBuffer.hpp CharScanner.hpp CharStreamException.hpp CharStreamIOException.hpp CircularQueue.hpp CommonAST.hpp CommonASTWithHiddenTokens.hpp CommonHiddenStreamToken.hpp CommonToken.hpp config.hpp InputBuffer.hpp IOException.hpp LexerSharedInputState.hpp LLkParser.hpp MismatchedCharException.hpp MismatchedTokenException.hpp NoViableAltException.hpp NoViableAltForCharException.hpp Parser.hpp ParserSharedInputState.hpp RecognitionException.hpp RefCount.hpp SemanticException.hpp String.hpp TokenBuffer.hpp Token.hpp TokenRefCount.hpp TokenStreamBasicFilter.hpp TokenStreamException.hpp TokenStreamHiddenTokenFilter.hpp TokenStream.hpp TokenStreamIOException.hpp TokenStreamRecognitionException.hpp TokenStreamRetryException.hpp TokenStreamRewriteEngine.hpp TokenStreamSelector.hpp TokenWithIndex.hpp TreeParser.hpp TreeParserSharedInputState.hpp
+--- /dev/null
++++ b/lib/cpp/src/Makefile.am
+@@ -0,0 +1,4 @@
++AM_CPPFLAGS = -I$(abs_top_srcdir)/lib/cpp
++lib_LTLIBRARIES = libantlr.la
++libantlr_la_LDFLAGS = -version-info 2
++libantlr_la_SOURCES = ANTLRUtil.cpp ASTFactory.cpp ASTNULLType.cpp ASTRefCount.cpp BaseAST.cpp BitSet.cpp CharBuffer.cpp CharScanner.cpp CommonAST.cpp CommonASTWithHiddenTokens.cpp CommonHiddenStreamToken.cpp CommonToken.cpp InputBuffer.cpp LLkParser.cpp MismatchedCharException.cpp MismatchedTokenException.cpp NoViableAltException.cpp NoViableAltForCharException.cpp Parser.cpp RecognitionException.cpp String.cpp Token.cpp TokenBuffer.cpp TokenStreamBasicFilter.cpp TokenStreamHiddenTokenFilter.cpp TokenStreamSelector.cpp TokenStreamRewriteEngine.cpp TreeParser.cpp TokenRefCount.cpp
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -31,7 +31,7 @@
+ 
+ test clean distclean install ::
+ 	@ if test -f examples/Makefile ; then \
+-		@MAKE@ -C examples $@ ; \
++		$(MAKE) -C examples $@ ; \
+ 	fi
+ 
+ # Rule  to  remove  all objects, cores, ANTLR generated,
+--- a/scripts/config.deps.in
++++ b/scripts/config.deps.in
+@@ -119,7 +119,7 @@
+ 	  $$subdir ) ;; \
+ 	  * ) d="@abs_this_builddir@/$$subdir" ; \
+         test -f "$$d/Makefile" && {  \
+-         @MAKE@ -C "$$d" $@ ; \
++         $(MAKE) -C "$$d" $@ ; \
+         } 	\
+         ;; \
+     esac
+@@ -130,7 +130,7 @@
+ 	  $$subdir ) ;; \
+ 	  * ) d="@abs_this_builddir@/$$subdir" ; \
+         test -f "$$d/Makefile" && {  \
+-         @MAKE@ -C "$$d" $@ ; \
++         $(MAKE) -C "$$d" $@ ; \
+         } 	\
+         ;; \
+     esac
+@@ -142,7 +142,7 @@
+ 	  $$subdir ) ;; \
+ 	  * ) d="@abs_this_builddir@/$$subdir" ; \
+         test -f "$$d/Makefile" && {  \
+-         @MAKE@ -C "$$d" $@ ; \
++         $(MAKE) -C "$$d" $@ ; \
+         } 	\
+         ;; \
+     esac
+@@ -154,7 +154,7 @@
+ 	  $$subdir ) ;; \
+ 	  * ) d="@abs_this_builddir@/$$subdir" ; \
+         test -f "$$d/Makefile" && {  \
+-         @MAKE@ -C "$$d" $@ ; \
++         $(MAKE) -C "$$d" $@ ; \
+         } 	\
+         ;; \
+     esac
+--- a/scripts/config.make.in
++++ b/scripts/config.make.in
+@@ -47,9 +47,9 @@
+ 		*) \
+ 		if test -f "$${d}/Makefile" ; then \
+ 		  echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \
+-		  echo ">> @MAKE@ -C $(subdir)/$${d} $@                          " ; \
++		  echo ">> $(MAKE) -C $(subdir)/$${d} $@                          " ; \
+ 			echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \
+-			@MAKE@ -C "$$d" $@ || exit 1 ;\
++			$(MAKE) -C "$$d" $@ || exit 1 ;\
+ 		fi ; \
+ 		;; \
+ 		esac ; \
diff --git a/dev-cpp/antlr-cpp/files/2.7.7-libtool.patch b/dev-cpp/antlr-cpp/files/2.7.7-libtool.patch
deleted file mode 100644
index ea5e809f473f..000000000000
--- a/dev-cpp/antlr-cpp/files/2.7.7-libtool.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur antlr-2.7.7.orig/configure.in antlr-2.7.7/configure.in
---- antlr-2.7.7.orig/configure.in	2006-11-01 21:37:18.000000000 +0000
-+++ antlr-2.7.7/configure.in	2015-10-11 13:49:09.166308712 +0100
-@@ -13,6 +13,9 @@
- AC_CONFIG_SRCDIR([LICENSE.txt])
- AC_CONFIG_AUX_DIR(scripts)
- 
-+LT_INIT
-+AM_INIT_AUTOMAKE
-+
- ## This shall be the very first config file. Do not change
- ## this.
- AC_CONFIG_FILES([scripts/config.vars])
-@@ -841,7 +844,6 @@
- AC_PROG_RANLIB
- 
- test -z "$MKDIR" && AC_PATH_PROG(MKDIR, mkdir$EXEEXT, mkdir$EXEEXT )
--test -z "$RM"    && AC_PATH_PROG(RM,    rm$EXEEXT, rm$EXEEXT )
- 
- AX_PATH_PROGS(
-   [TAR],