8 files changed, 127 insertions, 5 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 802ad3b9074f..ca32fba513cd 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index 94fb82d21031..97ff734add79 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,4 +1,5 @@
+AUX 0001-fix-broken-function-signatures-for-5-argument-functi.patch 1601 BLAKE2B 2e10e2dd3b031458ac6ae05771a992a7d0f5a786809bdeadd2b16c4968df936f1f7a29123cd2e792ccd31e10896d09a9b1c69ba4d34d672aaf672ff5a381f411 SHA512 9d18d3c4aaaf6ed732503d4e12191019f36e8dd867e5a556908ef33a7134d305fc239617328cafa026d89a35d2cea80d4531ff12b7baaa54cbf2899b95abaad4
 AUX crm114-20100106-fix-makefile.patch 1796 BLAKE2B 370bc77608f77960be4c4ecb88e3729eb62fb9e46e15fcca673ae8f4e4efcaf4425f30cd6beada25d8eb9fdf741dfa449c4e2a5c3ca9d06eab9ea25524e38136 SHA512 3011a85116510fce131bd3c13b5ec1e4faeefdb1eebf114782d417fb9ce8050ce15cae05f8b651728335233641be1e870fe48702fa620b542a8f1c963853b81c
 DIST crm114-20100106-BlameMichelson.src.tar.gz 724672 BLAKE2B ce5c3078030f2c4e78833edfb107d78e134a02c339d28411f2f60d4a67c333904d2ed0cf32a087997a72d961cbc5dabef46fb6c692d99fb509abd4161bd0094b SHA512 bb95fa50d6feef1a127e39e4005c4964b0096c3c7059f63bbf2293042351cf5ceeb7590fd1bedc64291ba556dfba96856dba8554f2f52a6cbaa3ad65012809c6
-EBUILD crm114-20100106-r1.ebuild 1622 BLAKE2B f0590ead962e413258f25ee026422bb11f38da38f125a0df6c3be6b9702260064b90ffba67145ee3558fa69f16b948d204b14e52293cca6003253da0f8b27f92 SHA512 240852e8a29705ad4057cf3ce6566ab0736bebb8f68bb3cadfbe693d6edb39b845d99b83bb7fcb85fc76ec03a5dc9fdf85d09a4deb5d03886b33cadf14c74a1a
+EBUILD crm114-20100106-r2.ebuild 1804 BLAKE2B f59dc03489074c0f977cc762b51dcd9b5ccb9efa82c9628f8cc82a0a2d5c756db6972869625af215432770e3e22788d8cfbc757abc1c8fb1ea5be68f49ae5574 SHA512 1385f67ad31d9c0c493c1d9311feedd5f8e61b11a9c08200cabf1c71517f55308f967551d61db837a2412d27488de140fe5b7e59cf93a174134a092033a07a13
 MISC metadata.xml 574 BLAKE2B 9ae0b84d7b91d7b8ad87452e924538b3e1a2a90ed743bb62dd5e25795bbbce36d6e1034f5f92cac4320e6a19f07d4f98936c1c98ad705215d3f2dc40555c44f5 SHA512 e83f328a8aea7edf064290209aa35f16238cccce2ce5a27710cf4cbd24509ac8b8f11e3d0cb1d7a64ff0aa2e3b124ffa6c820386c3f63823996ae70d9e633ca1
diff --git a/app-text/crm114/crm114-20100106-r1.ebuild b/app-text/crm114/crm114-20100106-r2.ebuild
index 97d0d5c39cc0..a5d4a7b851d4 100644
--- a/app-text/crm114/crm114-20100106-r1.ebuild
+++ b/app-text/crm114/crm114-20100106-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-makefile.patch
+	# https://bugs.gentoo.org/854897
+	# Upstream is dead since 2009 so no point submitting this to them.
+	"${FILESDIR}"/0001-fix-broken-function-signatures-for-5-argument-functi.patch
+)
 
 src_prepare() {
 	default
diff --git a/app-text/crm114/files/0001-fix-broken-function-signatures-for-5-argument-functi.patch b/app-text/crm114/files/0001-fix-broken-function-signatures-for-5-argument-functi.patch
new file mode 100644
index 000000000000..ab2ebcaa368d
--- /dev/null
+++ b/app-text/crm114/files/0001-fix-broken-function-signatures-for-5-argument-functi.patch
@@ -0,0 +1,43 @@
+From c0cb641ec6c1ab960df91c23b726836add0ca3a5 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Mon, 6 May 2024 00:26:18 -0400
+Subject: [PATCH] fix broken function signatures for 5-argument functions
+
+These are always called before exit() so presumably no one noticed that
+these "log error and exit(-1)" functions were prone to "exiting with an
+error" (our new term for "hello how would you like to have some UB").
+
+However, the LTO optimizer noticed what was being done and died in
+painful agony. Bring it back to life and soothe its hurts.
+---
+ crm_util_errorhandlers.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/crm_util_errorhandlers.c b/crm_util_errorhandlers.c
+index 1f64f3c..cba9d89 100644
+--- a/crm_util_errorhandlers.c
++++ b/crm_util_errorhandlers.c
+@@ -23,17 +23,17 @@ long untrappableerror ( char *str1, char *str2)
+   fprintf (stderr, "ERROR: %s%s \n", str1, str2);
+   exit (-1);
+ }
+-long fatalerror5 ( char *str1, char *str2)
++long fatalerror5 ( char *str1, char *str2, char* myfile, char* myfunction, unsigned myline)
+ {
+   fprintf (stderr, "ERROR: %s%s \n", str1, str2);
+   exit (-1);
+ }
+-long nonfatalerror5 ( char *str1, char *str2)
++long nonfatalerror5 ( char *str1, char *str2, char* myfile, char* myfunction, unsigned myline)
+ {
+   fprintf (stderr, "ERROR: %s%s \n", str1, str2);
+   exit (-1);
+ }
+-long untrappableerror5 ( char *str1, char *str2)
++long untrappableerror5 ( char *str1, char *str2, char* myfile, char* myfunction, unsigned myline)
+ {
+   fprintf (stderr, "ERROR: %s%s \n", str1, str2);
+   exit (-1);
+-- 
+2.43.2
+
diff --git a/app-text/paper-clip/Manifest b/app-text/paper-clip/Manifest
index 5cd5f7b19e7e..dd19bf2855c4 100644
--- a/app-text/paper-clip/Manifest
+++ b/app-text/paper-clip/Manifest
@@ -1,4 +1,6 @@
 DIST paper-clip-5.0.tar.gz 182085 BLAKE2B 07c397218417a5bc87e95aec577465b3f109de4c081bf0f208e0213b71ea7a8f9bac415221a04c8729add7d82adf98c859b60b1b0bd9dbef2db021ee80ff9296 SHA512 2757768414b2177511b61c0a9bde9710b67128a446640bb3ae3bba22a9b30a2b8b036ee32806dc6e4662ffc3d06254006b89e6b63cdc11950b38257e9ea46023
+DIST paper-clip-5.5.tar.gz 183365 BLAKE2B 74b2b893ad7f421eeeb7e6c5bd3921b20b379cebcdb86371a262455fe95a67c0fdddc894b5ecb3da9d7c612a6e9e7ac91ba4d98cc4e2cfb994de388f9f0f8a45 SHA512 880ed9ee81788e1d1f50d0bf5c119ebf2f45a939432f44e363ce0513217a74af7f9fd012f110fc3a38db392341a3529b8785f0130a4bf0fe83f6dbe12d663b19
 EBUILD paper-clip-5.0.ebuild 1437 BLAKE2B e0350179a1e060c710072c5a7a12efd89d6585ba16188bb096c8186c0689aefc50798051e619896d5fe5fda13dbd69ed24a137d5c315672cd41faee27c9bac7f SHA512 448a5ef84d5eedc36da4fb6cf8f6b67b8de130abbbb7ea4533bba705255edea0a5a6f3ca0ec0ab515589c257f58b3b2f0ec23bfc4598c16a8b11fba030c725dc
+EBUILD paper-clip-5.5.ebuild 1438 BLAKE2B 1a14f8e45453220be43f7a87e792ea58fa1c6c378f001f2889f46a5eedfc7c8795b3066df392e2207580f86803d08aca29c24ec6e599b925d4c65b3c3e59aff5 SHA512 3fc7ae135ecb7e409041455be7084aa84a7c1a930758d8dee35b88e8e555bfea8263fab923fbc33338f2c9d309f3fce6cdc949ad089a897148348384ce11aa24
 EBUILD paper-clip-9999.ebuild 1438 BLAKE2B 1a14f8e45453220be43f7a87e792ea58fa1c6c378f001f2889f46a5eedfc7c8795b3066df392e2207580f86803d08aca29c24ec6e599b925d4c65b3c3e59aff5 SHA512 3fc7ae135ecb7e409041455be7084aa84a7c1a930758d8dee35b88e8e555bfea8263fab923fbc33338f2c9d309f3fce6cdc949ad089a897148348384ce11aa24
 MISC metadata.xml 413 BLAKE2B 66acd49c6583aec7c89aa17de477237b5214aefc73b4814eb8170f1af322fd3d1565557060e2fc63027740457c84131e9d6d4be0f1dd4d531ac7da79429e0c91 SHA512 69d713bd2b11742920a25f5db125de72bb44403a049a1969e988b124d2d88ea36d6ac04a8b2091380f9208ad4407f354322e307a433bb58c413353069eb8cccc
diff --git a/app-text/paper-clip/paper-clip-5.5.ebuild b/app-text/paper-clip/paper-clip-5.5.ebuild
new file mode 100644
index 000000000000..8a822daeac38
--- /dev/null
+++ b/app-text/paper-clip/paper-clip-5.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+APP_PN="Paper-Clip"
+
+inherit gnome2-utils meson vala xdg
+
+DESCRIPTION="Edit the title, author, keywords and more details of PDF documents"
+HOMEPAGE="https://github.com/Diego-Ivan/Paper-Clip/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Diego-Ivan/${APP_PN}.git"
+else
+	SRC_URI="https://github.com/Diego-Ivan/${APP_PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${APP_PN}-${PV}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+RESTRICT="test"                      # Only validations, the appdata one fails.
+
+RDEPEND="
+	>=gui-libs/gtk-4.12.5:4
+	>=gui-libs/libadwaita-1.4.2:1[introspection,vala]
+	app-text/poppler:=[cairo,introspection]
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	dev-libs/libportal:=[gtk,introspection,vala]
+	media-libs/exempi
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+"
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	vala_setup
+}
+
+src_install() {
+	meson_src_install
+	einstalldocs
+
+	# Symlink "pdf-metadata-editor" (old name?) to "${PN}".
+	dosym -r /usr/bin/pdf-metadata-editor "/usr/bin/${PN}"
+
+	mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest
index c480d9a90228..0354d325b9cc 100644
--- a/app-text/trang/Manifest
+++ b/app-text/trang/Manifest
@@ -3,4 +3,4 @@ AUX trang-20181222-build-fixes.patch 968 BLAKE2B 5f84f3388133b126c711024750f85af
 AUX trang-20181222-unicode-data-path.patch 627 BLAKE2B 78ed1c0ad5cf4327311ba9a65113bbc38554444625fa1da1ac90586e7cc4b87722458b483219c9c6a1132ffff3076a8d4dec120de772b4191ebf7db8cdc33224 SHA512 51909cfdac55204197478e7484794cd6d4a0892baa94d0a98e46bf1e227b7e21ac544451ff1fe9c4a4fb67fe3dc2b557d98471abc5ba130a92da973aebe41495
 DIST trang-20181222.tar.gz 14847113 BLAKE2B 335722853b2d373fd9a6e9d4478b8248ca49d0559d5a8f60566f5550e60d5a004f26338897617acc617f84d1d55546afb9c51da64b7634514fa2ec508fa7a47a SHA512 fa412a5beeff07a620c4aa5723cf5b73bdb6b1cda561e3bf7764a609110f538da5313bcc79aca4d7742f71b3b071d3537681845d17ece46bc871c0964f4e251d
 EBUILD trang-20181222.ebuild 2222 BLAKE2B beab45edaad346bdf72e21de7e9b14b8a4e6ac792cbea7d01579709443078be1b8231bdf9c47759b5253e32cc2ae3442370280411fe2994488db08e8a377ed11 SHA512 76e9d9de00d100cde4e6641772fe1ab6a591646907752ad4e015b369108799cdcb453910e387c8a3fa35ac64b5e7189e31b0296dc8d5668c11a31ca5b76c271b
-MISC metadata.xml 375 BLAKE2B 0c05bab3ec0ef8605c8422510fea174514ce9fee8e642a2172c6e1eff07ad7cd0f10bacf1478477cf3a94abfca23a48ad2a18d5ed8133c4165694f1bbe930045 SHA512 fdd72c06fc6e618e789ef0bf85e6f4bb566f4bc36032d8d428ea8596d610dc3d0b435b03de0e157ce5cf3402edf4832e9c45c3b4d69401846f004ab69377a00b
+MISC metadata.xml 320 BLAKE2B dbc3c73e63a4eba52a905b023fd13c905a367c50b84f2114f1bee024f6e7787dfb02627aa30c83e17ffd90d763f9a977ad912a4429fe63a957120b7fd63ff34b SHA512 cd56de97d8e9b4439babc24fe21cc1b25f367598de0c4fc819ed24b17bfab70167495b00a065662f79b4315008fb65823dff6e6605d8939f697332f2a01eec36
diff --git a/app-text/trang/metadata.xml b/app-text/trang/metadata.xml
index 35e9588fb69b..582c6fa79201 100644
--- a/app-text/trang/metadata.xml
+++ b/app-text/trang/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">relaxng/jing-trang</remote-id>
-		<remote-id type="google-code">jing-trang</remote-id>
 	</upstream>
 </pkgmetadata>