8 files changed, 28 insertions, 82 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f74222ef25c8..f09110b7853c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index fed0d753b98e..7e94d9004353 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,9 +1,5 @@
-DIST libpaper-2.0.0.tar.gz 1221217 BLAKE2B ef2c08ff7dc537734d080a29560a711b196b05a3b0c4b375c8dc73d4dd9588156d325d233e27940fac96a18dfa6bf523128b53eb4c7098e561aa6054efb88408 SHA512 ca5c79969a8c5d56322a6993917d5aa47089bb396a144edd0d9040b0bdde78c8fb59468a3d4063ae1fb323a1b23fb28169616d153de65f9085351b9c9d47f8c0
-DIST libpaper-2.0.1.tar.gz 1229250 BLAKE2B 67730d6783d8ab9c2f837f8f477ab8ea04be7df2b2f419e81d57834c86bfcdd373ecc29cbea51fee06ca102ea12c18646f96caafe7b7cc53580153d01873a329 SHA512 ccc77e2f7805e7e5f6b3e96acffa9aeb2854a21acbdbb40947251a6a8dca6f9d97db0c8e2859d2056d3b60b06200ef50d9cccae58f961ff77f234ad1ab3c32dc
-DIST libpaper-2.0.2.tar.gz 1287342 BLAKE2B 8044f372205c41834e06eba5c2210fdb57be72867bfe3035c16451c241d659ad18fd42bcb2c1e49074bb4da5d7f7061abdb7e783c4025544e64c093207ec3d62 SHA512 8360dd91b4f0972bd25774ea531037192e7233ffaf4295e4cde906c1085e32d61d35fa2c73636960ea105ab40836b9a505a057633115b287e4e54cd587980424
+DIST libpaper-2.0.3.tar.gz 1286822 BLAKE2B c3ac1628cb44155326626ddd5b7858a8192a4d23e888b152045001f3b8395ca46e0c82000838df13dd391dc187e10f82f843f75497dfb4c13e445f3587dea422 SHA512 c2af8f98a02b772ef3fb86b4f2bc50277f9fb720a070adc7a90da65881a5fc340b0841b198c50066001f4572123435305e0db4404365f9b9362d08280b7f6dd9
 DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
 EBUILD libpaper-1.1.28.ebuild 1148 BLAKE2B b5556a5ae27415083aa89ca18a6f9dc232026a37fae823b9f96ef0325d28f2c1e37e3f34ecee1f4773793fb0b31b7f607ea955c9fa96a88d18a4b90eca8f54be SHA512 07e36537c2278711c602c667e50e72091aef0bbbb79de8a99ed915c7c1f600be4c7d53f7446578b3b1734375a07ab8464e5ab0b342ef50516d1e2b0e7c325d07
-EBUILD libpaper-2.0.0.ebuild 1103 BLAKE2B 814f3db2f19ca6f568b5829633e59c54dac26cd651d9b6f2f53ce3a123b77cf413adacb4ed7191ac26bec12f42d8fe003ad4b9961286f6f18ecbcddfcea6ba79 SHA512 adcebde9da01e686b09366351e49996f4ec823c9b9a5e9aa5f2cbab10270ee4ae8d5bd8b6a00ff97cbc5a8339b10647240fde18daff106bb1e6a81e941fc2ba5
-EBUILD libpaper-2.0.1.ebuild 1010 BLAKE2B af9653d718924d0b605725cff555c28d6d469db03cc09a537b50572a9155f39822bcf3645045c439224c118de9b69dd9d967152ddab9723f0d195a67af26adb4 SHA512 bea85f5f04076f698f4003c2d574baa14b0997ea45f0e450890dfb5fe976b2021512c2dbf6bcee389e2d0a42a7bb0d0bbb35a1b070bc3ccbc0a33e360320d397
-EBUILD libpaper-2.0.2.ebuild 759 BLAKE2B 29d1e8276ec8e816be343c52f4d90a7d93de620f17a5269582b22fe66b24684fbfbf0406a6355862efe3ef4e9560e26bba5e26768766ee19415b74ac7b894d19 SHA512 baecbf23e9f65469784c56dea7efff1e020170a74ab59c98f7c44d234ed3946e40c7dc24d4d1bf121845970e7edbc82fc68920c6c29df29f0cb45de6f0146f34
+EBUILD libpaper-2.0.3.ebuild 871 BLAKE2B 0b2162965d40cf4f9799f3dc18de0f00d443a88049a582bd16c596e61f8a56bb50f4efe2d33b34d7b98e5b928033c314990a39a17002e219f89e225771e954c7 SHA512 5bc6a660603619922f5210ad0f477d98742aa2351f1f2d74f9b2301ba8fe9f785f68a529cc5403c3eb0c5bf83caa64bde394478093ca389211630129bd841152
 MISC metadata.xml 342 BLAKE2B 28767bfca8e43186de0792106c408d3a8e0ef8c9c59836789b045c23f12163e43b9eb547c93f1751f031b8f61bd7940f50ccaa95f2ecc14cdf5a9267be721d0e SHA512 0d16a636e3cce2ee9051bd694f34a072ff13d4ca6f4c9f3e81443cea386f48f5863db03ca9cb050f43a6a1fa483d401969617597d68024fee10058a0c72b3585
diff --git a/app-text/libpaper/libpaper-2.0.0.ebuild b/app-text/libpaper/libpaper-2.0.0.ebuild
deleted file mode 100644
index 4891072cc566..000000000000
--- a/app-text/libpaper/libpaper-2.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Library for handling paper characteristics"
-HOMEPAGE="https://github.com/rrthomas/libpaper"
-SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.gz"
-
-# paperspecs is public-domain
-LICENSE="LGPL-3+ public-domain"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	sys-apps/help2man
-"
-
-# False positive (runs within a conditional)
-QA_AM_MAINTAINER_MODE=".*help2man.*"
-
-src_configure() {
-	econf --enable-relocatable
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	dodir /etc
-	(paperconf 2>/dev/null || echo a4) > "${ED}"/etc/papersize \
-		|| die "papersize config failed"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Run e.g. \"paperconfig -p letter\" as root to use letter-pagesizes"
-	fi
-}
diff --git a/app-text/libpaper/libpaper-2.0.1.ebuild b/app-text/libpaper/libpaper-2.0.1.ebuild
deleted file mode 100644
index 783a81dd4d19..000000000000
--- a/app-text/libpaper/libpaper-2.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Library for handling paper characteristics"
-HOMEPAGE="https://github.com/rrthomas/libpaper"
-SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.gz"
-
-# See README.
-# paperspecs is public-domain
-LICENSE="LGPL-2.1+ GPL-2 public-domain"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-src_configure() {
-	econf --enable-relocatable
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	dodir /etc
-	(paperconf 2>/dev/null || echo a4) > "${ED}"/etc/papersize \
-		|| die "papersize config failed"
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "Run e.g. \"paperconfig -p letter\" as root to use letter-pagesizes"
-	fi
-}
diff --git a/app-text/libpaper/libpaper-2.0.2.ebuild b/app-text/libpaper/libpaper-2.0.3.ebuild
index 0f203901be65..dcf04a114100 100644
--- a/app-text/libpaper/libpaper-2.0.2.ebuild
+++ b/app-text/libpaper/libpaper-2.0.3.ebuild
@@ -13,6 +13,11 @@ LICENSE="LGPL-2.1+ GPL-3+ public-domain"
 SLOT="0/$(ver_cut 1)"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
+BDEPEND="sys-apps/help2man"
+
+# False positive (runs within a conditional)
+QA_AM_MAINTAINER_MODE=".*help2man.*"
+
 src_configure() {
 	econf --enable-relocatable
 }
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index cb8466f20795..d59575f8f44a 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -1,5 +1,6 @@
 AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d96bf5b2f645d2d6706e82ae1767a99fed8f6ca4bd4f1abbc24bf80c4fa00d848f03056b01ac98f5b8a74d3a78c4467 SHA512 dea5fe17ea2662150b201ab6011bb01ba0f0c07689d267ec4086a914cefef3e91967f8db4be0258bac87d3cd73a9b05eb1f879415860552d9853e66e98e16e11
+AUX opensp-1.5.2-configure-clang16.patch 284 BLAKE2B 07015a0a788c946807e911262a96b092f7a791b6c704611438c885b2edd0e66f67aff546f3a0eba5541ec099dffe21114e853716caa0576c6d66624b2ed1113f SHA512 bd523ec04caf6bf14902cc8a98f5db41bb5db6c999cf9951c96361fca6c322733f395b0106e298bc40ee907594324a7c866e459530e0c76fa04eb0e7d0581a5c
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
-EBUILD opensp-1.5.2-r7.ebuild 2098 BLAKE2B 2f08bba773adf3277f0cb55216777d036a3f8612c6798a45965184fa7f855ba6dbf428abb5fe05d6b4f597ab2111bab799de1e22f6e31b07878699e67b8e9f76 SHA512 5b5517bb8ba18cc068e4e9551a79cc72eed2b1423e55f58515e39fcbea2c5ab948cd68bf26b1b964ebc58456dc0aba2e7213aa755aaa445a0af0d2a3fcd8f1d3
+EBUILD opensp-1.5.2-r8.ebuild 2183 BLAKE2B cde0c5c6198aaa4eed8ae0db069df2da8b4056e16d84b9d08be3b80896c0ed35f703f2ac9b4bf4a426722584f55cc13ba15c7052a125e250d327b3a3769db4bf SHA512 d2b6b1705e523ba19970adbdc9e50f67cfaf8a4cdde7b24e0e2ae17db2fb41be694e18b1300ca37e96491b84572d327d20a8049cb5a885c88b75845208ca07f4
 MISC metadata.xml 321 BLAKE2B 5571226bba817c3d5cc47e0bd7d67e82399403e24e7773104f33b13bf40d95113da9613db2bd77408557e6793b9efb6d435402a7b680d07e1e3e6952614bdedd SHA512 95c0d6759a91874b81b707e479eee48bf67ba762584587b4027b583e42d63a83018a3243fe81b6649090d1e0167ab825b591dfccbd3a8db9078b1a80f729de15
diff --git a/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch b/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch
new file mode 100644
index 000000000000..468d0f1d306d
--- /dev/null
+++ b/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch
@@ -0,0 +1,13 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -9,8 +9,9 @@ changequote([, ])dnl
+ AC_MSG_CHECKING(size of $1)
+ AC_CACHE_VAL(AC_CV_NAME,
+ [AC_TRY_RUN([#include <stdio.h>
++#include <stdlib.h>
+ #include <$2>
+-main()
++int main(void)
+ {
+   FILE *f=fopen("conftestval", "w");
+   if (!f) exit(1);
diff --git a/app-text/opensp/opensp-1.5.2-r7.ebuild b/app-text/opensp/opensp-1.5.2-r8.ebuild
index 9f6b4f539bb4..743116acc69e 100644
--- a/app-text/opensp/opensp-1.5.2-r7.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r8.ebuild
@@ -34,11 +34,14 @@ BDEPEND="nls? ( sys-devel/gettext )
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-segfault.patch
 	"${FILESDIR}"/${P}-c11-using.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
 )
 
 src_prepare() {
 	default
-	use prefix && eautoreconf
+
+	# Needed for Clang 16
+	eautoreconf
 }
 
 src_configure() {
@@ -51,6 +54,8 @@ src_configure() {
 	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
 	strip-flags
 
+	append-cxxflags -std=gnu++11
+
 	econf \
 		--enable-http \
 		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \