9 files changed, 210 insertions, 24 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d9bb97686724..abe7502b75a5 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 37d386c4c7fe..20434ff8e831 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,3 +1,4 @@
+AUX kbibtex-0.10.0-cxx17.patch 242 BLAKE2B 0b59543f0bd104d4ce7ede07af846d0377e18eee3d9a7c84812fe1cd5411fd3d99de4a37268acfb05732c961f3f8ab840061add2240317a09a3ba800f5fa77b8 SHA512 579acb65da7bfb0f66188b17e719554a20180790da589c361b618f8b717dfa19c99357352a89dbe21f5e770ef233b57cb612b1eaef771e001d9f61e2442e5473
 DIST kbibtex-0.10.0.tar.xz 3885328 BLAKE2B c417cc3628739e1f3ed3231e9ba5387834a65b4ef78517273b53876ecc89e72194cdbbe14a5a479c5948beb5219d0345b1c22daa6f394b6ad7d664e260c8124d SHA512 37f4e9eb0bd7be8a64bae4076be20a6e59b33f17d59de35dec8833bce027172388aa3a49a8cbdac84c56686ad287a39e0c6f13665ed9e9b696c9ce3a6ec7de1d
-EBUILD kbibtex-0.10.0.ebuild 2016 BLAKE2B a4171016a1527aa393fa73dd6d2a1d6be1e43b6f7277e6ceababa7d9740da97c9b09c7fc816576ff01e5cbef7fd7af2aa0c421cf47d72a78260f49b5ceea21c0 SHA512 f1a1ca429c329aed34ec63e3f1c920ed7198de0b5a97ca651bb811af64dc9985fefdcdb8df814a9edd41f58ae9e466a8530ab7fc1eb465a017311ae6ce768a84
+EBUILD kbibtex-0.10.0.ebuild 2060 BLAKE2B 50de1c14dfbea938806133731a05471c3663effbf12b670203ec4aa53cd44fa50319e19f075fbf8cb53ba1893a2e5b2cc171e4d1c3026a188a22049f258064be SHA512 e5bb71bc975e339c21d2fa2dacd99720cb5176058b6365fc0feb7aa999a0bf8fcf4368dd98d2b991cef1239573fa8cf43ae1f945a010a5b191eee9fe929b41a2
 MISC metadata.xml 475 BLAKE2B 6c3a5245ac69ad2d11b237110b8cde75095e81e3cb0c634e71d83dec5a19c9edd8f6af4875e58dd10ef4dc7916885594b9ad1d1b5408c1665671ce9461558dc3 SHA512 ef88f2dd9bafb66f8091e29b9a7be844a17791a6dde81e4ed565abfebc59224d84f19aa91e4016341e31b6fcdb591d04707fe5f3092f8f777e796387f781e973
diff --git a/app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch b/app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch
new file mode 100644
index 000000000000..33fb8ebb4542
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,7 +10,7 @@
+     LANGUAGES CXX
+ )
+ 
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+ set(QT_MIN_VERSION 5.9.0)
+ # Somewhat arbitrary chosen version number ...
+ set(KF5_MIN_VERSION 5.51)
diff --git a/app-text/kbibtex/kbibtex-0.10.0.ebuild b/app-text/kbibtex/kbibtex-0.10.0.ebuild
index 11a10b600ce5..aa8b9929c2d5 100644
--- a/app-text/kbibtex/kbibtex-0.10.0.ebuild
+++ b/app-text/kbibtex/kbibtex-0.10.0.ebuild
@@ -60,6 +60,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
+PATCHES=( "${FILESDIR}"/${P}-cxx17.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
diff --git a/app-text/rtf2html/Manifest b/app-text/rtf2html/Manifest
index 2fe9b9cc9530..2726aa66e6e9 100644
--- a/app-text/rtf2html/Manifest
+++ b/app-text/rtf2html/Manifest
@@ -1,4 +1,6 @@
+AUX buildsystem-fixes.patch 5541 BLAKE2B 38fdacfe40acf29203c2c10f58eedf7dbbc5d35b2b4e47f3f50bda847911c36695a298154817af9b9fdc0b8788bff195b402eb00a9df124f7215c627b7aa819e SHA512 cb6f5a377a0ef13ab28af06c42bb69845165c328b3d3f97403fc0e5cf8a89c5fbaf80a41cbdd95469fcd986614412ea929f7c37376286dc1b2df3e2cc9f7d219
 AUX rtf2html-0.2.0-gcc43.patch 693 BLAKE2B fac12178580d8114b7429e3da6552c31bd82f5aac174d08276346cfd1e5ccc1181d31d2db524aa78eee83b1d2aff2a27f74adcc3f52f36b8f8300295c06777fa SHA512 e8f4ad4f30ef8b317786a9c6b864245254c9127d5967ffc61c9934a55f0223c2f15ad388b1047ca3aaef11fcf1bad372f515df24c32a52a3abdbb6aaa5afe2d6
+DIST rtf2html-0.2.0-stlport.m4 3292 BLAKE2B 137016c605749aca2bd5c3a1ec69930f36d69fd177b70dc64ba67f932ebada4d9818e33ce7dce60d6935ec472dc1862253443487d45143594996a8d15585cae7 SHA512 8b67424a4fa6b4672620ada1e58de28added11e1c8ced5aee12bb2f478f6f9d31de655af91298a16bf05e1608de4f680dfa976513dcb53eee5a3d8088df7a946
 DIST rtf2html-0.2.0.tar.bz2 75292 BLAKE2B 18cc67ff3642f68ae262aa6e3368be93defe19ceeab07f9e55fcd2390e4c374c7ab315c0c5f8b7644a458e4100a4be3812767b080842d862266083856f5376aa SHA512 7399c98adb4dc0f45e420cd6836c36720d6b19ccbba062d2102b2693a6812642d6193000172ef7eeef5b8a84dcb2d35c1eb99fbf3bffaf8dad43e8ca06c6fe75
-EBUILD rtf2html-0.2.0-r1.ebuild 519 BLAKE2B 7bcd9291d76d214cce4253e5d109b6d5a54de7142c03479ff372c6dbb7b7c0842978cb3063510afaa5de3b1ee588971d1522964cb5fa08c9ff81d95c587f426d SHA512 9dc23293a0ba430dfd5d400272842f1730e252b85101fbcc487a011c6f03062b57cc766af2a14b65685d766ef88417e202cc30b5106a1ea87bf43fa32089dd00
-MISC metadata.xml 319 BLAKE2B 38154d890d2f9068c174e0fd320208ca06bf32ee27ae40c76d8767b4942246c42167eadad3b9abe8ccd6959a2b8d01195ce83e77a73b718d025b7a5e1488f208 SHA512 9715b61daa7906757fb4c9f8e459f0e5a5655ce8092e9b6336bfa72ea852e8d9094a53dda42947415cf47bc627e9be980a351ebfc72bdd1bec9f0a5bd85e3ec9
+EBUILD rtf2html-0.2.0-r2.ebuild 820 BLAKE2B bf3fa057abc479e634f3984642e19d2d8451b8ffed04f5061c73aa224630d4dca9b05ea6a985be811035b0649eb3900465f2145d7381ebb5b69e1b6d9d22e671 SHA512 847a1466d3e7ca1ee079140a7539b1caa641567d1b6fd472663ade6ef98ea5f030bcd9d29c21b67ea696bbf8502b987a5d840e5e73cf8286f2d4dc19da6b8d08
+MISC metadata.xml 371 BLAKE2B 92b55021d3a5ec2bfb6f3b5e324c32beadfc40c9f3481dec594d4fcc0343f9329716afe093d8e41073f04fc87e0699968138d5eb397bf274791d8516abd5e275 SHA512 f55524598ec928677809893ecdba37a776eea515ef9d69044aae8337804419cbb9169781efc166312e610524fe8de2ae3618d0b196a59669b0ff3e4b37c27a4c
diff --git a/app-text/rtf2html/files/buildsystem-fixes.patch b/app-text/rtf2html/files/buildsystem-fixes.patch
new file mode 100644
index 000000000000..24642650f8ac
--- /dev/null
+++ b/app-text/rtf2html/files/buildsystem-fixes.patch
@@ -0,0 +1,157 @@
+From 257c8fd42362f158afdcd7d7709aa3743f894468 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Thu, 23 May 2024 00:00:26 -0400
+Subject: [PATCH 1/2] configure: remove invalid bashism
+
+configure scripts are POSIX /bin/sh scripts and cannot have
+bash-specific syntax. The test `xxx == yyy` construct with double equals
+is a bash-specific alias for single equals. It does exactly the same
+thing as single equals -- it provides no additional functionality, no
+behavior changes, it is exactly the same but with an additional
+alternate spelling. In exchange for doing nothing, it breaks muscle
+memory when writing POSIX sh scripts and tricks developers into writing
+the wrong thing.
+
+It should never be used under any circumstances. Ideally it would be
+removed altogether from GNU bash.
+
+Bug: https://bugs.gentoo.org/903291
+Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
+---
+ configure.in |  4 ++--
+ stlport.m4   | 18 +++++++++---------
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 3207599..f8ba73d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -38,7 +38,7 @@ fi
+ 
+ 
+ AC_LIB_STLPORT(no)
+-if test "$ac_stlport_use" == "no"; then
++if test "$ac_stlport_use" = "no"; then
+    AC_CHECK_LIB(stdc++,main,,AC_MSG_ERROR(rtf2html requires either libstdc++ or libstrloprt))
+ fi
+ 
+@@ -47,5 +47,5 @@ AC_CHECK_FUNCS(floor strtol,,AC_MSG_ERROR(STDLIB funcs missing))
+ AC_CHECK_FUNC(rint,AC_DEFINE(HAVE_RINT,1,Define to 1 if you have rint function))
+ 
+ CXXFLAGS="$CPPFLAGS $CFLAGS"
+-                            
++
+ AC_OUTPUT(Makefile)
+diff --git a/stlport.m4 b/stlport.m4
+index baaf94b..ed7e13e 100644
+--- a/stlport.m4
++++ b/stlport.m4
+@@ -4,19 +4,19 @@
+ #   Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
+ #   `yes'.
+ #
+-# If all tests succeed, CPPFLAGS will be *prepended* with 
++# If all tests succeed, CPPFLAGS will be *prepended* with
+ # -nostdinc++ -I<directory>
+ # and LIBS will be appended with
+ # -l<library>
+ #
+ # directory defaults to /usr/include/stlport, but can be overridden with the
+ # --with-stlport-headers directive;
+-# library defaults to stlport, and can be overridden with the 
++# library defaults to stlport, and can be overridden with the
+ # --with-stlport-libs directive
+ #
+ #   $Id: stlport.m4,v 1.4 2007-07-31 15:39:42 vlavrinenko Exp $
+ #
+-#   This file is (c) 2001 Jasper Spaans, <jasper@spaans.ds9a.nl> 
++#   This file is (c) 2001 Jasper Spaans, <jasper@spaans.ds9a.nl>
+ #   Please send your comments, suggestions and bugfixes to the above
+ #   e-mail address.
+ #
+@@ -38,12 +38,12 @@ AC_DEFUN([AC_LIB_STLPORT],
+  [define([AC_LIB_STLPORT_DEFAULT], ifelse($1, no, no, yes))dnl
+   AC_MSG_CHECKING(whether to use stlport libraries)
+   AC_ARG_WITH(stlport, AC_HELP_STRING(--with-stlport,use sgi stlport headers and libraries),
+-  [ if test "x$withval" == xno ; then
++  [ if test "x$withval" = xno ; then
+       ac_stlport_use="no"
+     fi],
+       ac_stlport_use=AC_LIB_STLPORT_DEFAULT)
+   AC_ARG_WITH(stlport-headers, AC_HELP_STRING(--with-stlport-headers,where to find stlport headers),
+-  [ if test "x$withval" == xno  ; then
++  [ if test "x$withval" = xno  ; then
+       ac_stlport_use="no"
+     else
+       ac_stlport_headers="$with_stlport_headers"
+@@ -52,7 +52,7 @@ AC_DEFUN([AC_LIB_STLPORT],
+      ac_stlport_headers="/usr/include/stlport"
+   ])
+   AC_ARG_WITH(stlport-libs, AC_HELP_STRING(--with-stlport-libs, where to find stlport libraries),
+-  [ if test "x$withval" == xno  ; then
++  [ if test "x$withval" = xno  ; then
+       ac_stlport_use="no"
+     else
+       ac_stlport_libs="$with_stlport_libs"
+@@ -61,7 +61,7 @@ AC_DEFUN([AC_LIB_STLPORT],
+      ac_stlport_libs="stlport"
+   ])
+ 
+-  if test "$ac_stlport_use" == no  ; then
++  if test "$ac_stlport_use" = no  ; then
+     AC_MSG_RESULT(no)
+   else
+     AC_MSG_RESULT(yes)
+@@ -70,7 +70,7 @@ AC_DEFUN([AC_LIB_STLPORT],
+     ac_stlport_save_LIBS="$LIBS"
+     CPPFLAGS="-I$ac_stlport_headers $CPPFLAGS"
+     LIBS="-l$ac_stlport_libs $LIBS"
+-    if test "$MSYSTEM" == "MINGW32"; then
++    if test "$MSYSTEM" = "MINGW32"; then
+       CPPFLAGS="$CPPFLAGS -mthreads"
+     fi
+     AC_LANG_PUSH(C++)
+@@ -80,7 +80,7 @@ AC_DEFUN([AC_LIB_STLPORT],
+     AC_MSG_CHECKING(where to find stlport libraries)
+     AC_TRY_RUN([#include <stl/_stlport_version.h>
+ #include <iostream>
+-int 
++int
+ main()
+ {
+   std::cout << "" << std::ends;
+-- 
+2.44.1
+
+
+From dd1ca6d0867eaca2b9be8d7efa4d957c96b7aa51 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Thu, 23 May 2024 00:24:52 -0400
+Subject: [PATCH 2/2] autotools: ensure aclocal runs successfully by passing
+ -I.
+
+autoreconf -fi can update the autotools files automatically, but if
+aclocal doesn't know where project-local macros are it will delete them
+and then the configure script is malformed and errors out.
+
+This tells autoreconf to pass -I. to aclocal, that is, it should check
+for stlport.m4 in the current directory and use it.
+
+Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
+---
+ Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index e7eb60e..0a5fafd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,3 +2,5 @@ AUTOMAKE_OPTIONS = foreign
+ bin_PROGRAMS = rtf2html
+ rtf2html_SOURCES = fmt_opts.cpp rtf2html.cpp rtf_keyword.cpp rtf_table.cpp config.h fmt_opts.h rtf_table.h common.h dbg_iter.h rtf_keyword.h rtf_tools.h
+ noinst_HEADERS = config.h fmt_opts.h rtf_table.h common.h dbg_iter.h rtf_keyword.h rtf_tools.h README.ru
++
++ACLOCAL_AMFLAGS = -I.
+-- 
+2.44.1
+
diff --git a/app-text/rtf2html/metadata.xml b/app-text/rtf2html/metadata.xml
index ed64c873d352..f45fac9d96b4 100644
--- a/app-text/rtf2html/metadata.xml
+++ b/app-text/rtf2html/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rtf2html</remote-id>
+		<remote-id type="github">lvu/rtf2html</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild b/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild
deleted file mode 100644
index 09aa4b9a8dd4..000000000000
--- a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="RTF to HTML converter"
-HOMEPAGE="http://rtf2html.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/rtf2html/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
-
-src_prepare() {
-	default
-
-	# CFLAGS are incorrectly parsed, so handle this here
-	sed -i -e '/CFLAGS=$(echo $CFLAGS/d' configure || die 'sed on configure failed'
-}
diff --git a/app-text/rtf2html/rtf2html-0.2.0-r2.ebuild b/app-text/rtf2html/rtf2html-0.2.0-r2.ebuild
new file mode 100644
index 000000000000..2855e2bba293
--- /dev/null
+++ b/app-text/rtf2html/rtf2html-0.2.0-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="RTF to HTML converter"
+HOMEPAGE="http://rtf2html.sourceforge.net/"
+SRC_URI="
+	https://downloads.sourceforge.net/rtf2html/${P}.tar.bz2
+	https://github.com/lvu/rtf2html/raw/4b0e5a3cca2d0c81ee50dcfaa7e3d3dd0a89e59b/stlport.m4 -> ${P}-stlport.m4
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	# make autoreconf work
+	# https://github.com/lvu/rtf2html/pull/12
+	"${FILESDIR}"/buildsystem-fixes.patch
+)
+
+src_prepare() {
+	cp "${DISTDIR}"/${P}-stlport.m4 stlport.m4 || die
+	default
+	eautoreconf
+
+	# CFLAGS are incorrectly parsed, so handle this here
+	sed -i -e '/CFLAGS=$(echo $CFLAGS/d' configure || die 'sed on configure failed'
+}