gentoo auto-resync : 21:02:2023 - 02:22:31

17 files changed, 114 insertions, 296 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index bdf46b0a2d6e..18e70cf733fc 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/dnd/Manifest b/x11-libs/dnd/Manifest
index 18c0e5210f26..a94f726e2681 100644
--- a/x11-libs/dnd/Manifest
+++ b/x11-libs/dnd/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile-fix.patch 1139 BLAKE2B b8e6a2e3d7c91eaccde9cb47228a7a810d313e5f0e38fe999451a50078ef86ae66e22dc6df8a2430c1d1e6d4c6b84897f2894158bfddb53325c12ebaba6add50 SHA512 57785cec0adfef150f9560be79cad9f6170c0476060b7653705fc8a2e17e81c93996a4ca1cfa11cece609950e8d4afcae113f2169a6b5d622494c3ae36cd6c26
 AUX dnd-1.1-gentoo.diff 1532 BLAKE2B 5bc035212d46f712b0f8ad016a0fc649f0b36f19674e8c90eec0b2a54a7a6a8e735bfdcf4d4afc0d5792236623a9c43b34775053704e8ad4916488fe55458edb SHA512 68e3fe2a8c36a1b9b8bfdf57ef4eef1e5abb11debd160633cc0d323cf90b1ba579ee87aad82fa8e29b086cbbcfe19326f2202f6191749059cfe638fa7940ec5f
 DIST dnd.1.1.tgz 227598 BLAKE2B 3d6bc4644d492cdfcb9160b87b1c8d2a0f0fa3ae30bfbc948e4327b390f80247c4e4fac562c14972ede2f807e11503d78edc845bac53ad5c5a42ce0439e60c6b SHA512 8644d669ea6553b4e99469f30144286e262fd64379a00b8595d1574d0f4f0e504799ed18979a9036cfc89d74074d325ffca94b4147e350969f3a1c5ff9cf0ff8
-EBUILD dnd-1.1-r3.ebuild 731 BLAKE2B df98219d0c177e3bd30c5cfe613867444ae665d77d39142024ca83a4c55d2c055f708d8f05432a936f7a51360fa48be67ef944eaa8f8a993dfd4b13222fdf54e SHA512 34d54077b673ad452cfcf25a0e3d74f1aaa7f7a7f15cea0769968e35dc54b911367e0338f338071224d99e82aa68b067a41b344a62f2507e83a3e97d411d192f
+EBUILD dnd-1.1-r4.ebuild 725 BLAKE2B 5426935c1f62e554148ac2670a8360a81eb8c30234a94b5fda7bf1a7b8e68478dec28ba084fa629b78acc87b8e36035cd689d7a9895b37954e37de684c2959b3 SHA512 1ec16fabcc41e1d3a95eed4464fbb993a6657a1490ade4466ac28475d9ac8de7ecdb0a2991ad16b371fc769b24f2ed0d0902cc390f01447f1557e0e5b3b7b51d
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-libs/dnd/dnd-1.1-r3.ebuild b/x11-libs/dnd/dnd-1.1-r4.ebuild
index 09bc04cde8f6..4a703c80c2b6 100644
--- a/x11-libs/dnd/dnd-1.1-r3.ebuild
+++ b/x11-libs/dnd/dnd-1.1-r4.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="OffiX' Drag'n'drop library"
 HOMEPAGE="http://leb.net/offix"
 SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz"
+S="${WORKDIR}/DND/DNDlib"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
-RDEPEND="x11-libs/libICE
+RDEPEND="
+	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXaw
@@ -27,13 +29,12 @@ PATCHES=(
 	"${FILESDIR}"/Makefile-fix.patch
 )
 
-S="${WORKDIR}/DND/DNDlib"
+DOCS=(
+	# README is useless
+	CHANGELOG
+)
 
 src_configure() {
 	tc-export CC CXX RANLIB AR
 	econf --with-x
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index 985dfccf16f1..5023d6bc7098 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -8,5 +8,5 @@ AUX gtkmathview-0.8.0-gcc6.patch 2043 BLAKE2B 5534acd718f3b4423a1325c109483de311
 AUX gtkmathview-0.8.0-gcc7.patch 1150 BLAKE2B 28c122d1ac04cdbe6b232325da3e5994e9680c670ad51387c0d0f7cd67618fca11d54163b563431c3ae3853ea05ada400627c6dc45b8e00f79f07c050d118073 SHA512 550646e134f43a47dd185b9ac2bb7c1713682685c78feca43fd6371d3e6455d06cb105fac9cc69f624cc8c3fef14d06aeabe91dae35ecdd096901cea9c802b17
 AUX gtkmathview-0.8.0-underlinking.patch 1926 BLAKE2B 6f50638ebb9c2a6af55e3b0f13b438b97a2e606fc7639a2aa6d7e3467bfcdeb4661c6b18db200b727a3de87c457ea99013f32e49b76ebaaf0a5d9793828f280b SHA512 9f0f4404ad60d8318f6feaae81db5ff4d331509145874926667eb9274a83ae278b08a078830cfd98ae85a602fd1ac7ea13b676f5dcd70a77e8b45e9e5fe5aa0d
 DIST gtkmathview-0.8.0.tar.gz 987328 BLAKE2B 1c8403fcfab828153911a40850bdfcfdd15c8c19da5dc1d7c015a8718c647b4adde2f7201ee0abc72d6c2b5acc79b8c852d6aa4f09021bbeaa827291d963b646 SHA512 aa7eb4aa031f9b9727be3fd8635fdac0e912585de9b91c5e71400edc5fa0b3257724244f796fea0122e32318d00701e63ee7fb12b97b7abbb7940a5439d31adb
-EBUILD gtkmathview-0.8.0-r4.ebuild 1969 BLAKE2B 1e97398bf9df5f6adca7725bda0d0599f3304d1364b72b2775a6fbe5eb7522b133531794aa3e37e32534035a23f47ad9514ebed7d68fc0b813f026811c8c8a0a SHA512 cecd8b7e03670bb58288fa910901d302e751b9204efb74b5003e377c91d4b7610c338d758cf4f73e6938a5d134562996f0a59aae0c75fd12e6ee1d7e00b98c8d
+EBUILD gtkmathview-0.8.0-r5.ebuild 1947 BLAKE2B 79a87c8eadd79ef83b3b5db9edab35b216cd11d6756ccc6635ba2fbd651a9c01498a6faca107d8b9abd9dc5a74e0852549cb98a440f79d5794327b11ae1defa7 SHA512 893b31bd012b13bf9547959ed6d2103148455b71e8cc1472b292dffc21c59a00bc74d0a8ad86c226815f506abe95b0db77d1d8e0eaa9685d5d693c7439b636c0
 MISC metadata.xml 527 BLAKE2B a3cb6f03478419aefd9060d13c8cbd94e620ae7d726cc175f7cd56edb0a35b7d0a5bf2d02ff9f5b47ff57ad5f332633ea6cc07fb0beaa4bc945fcdc7fe41634a SHA512 b1ff4752cf93c87fcff4ad026f8e9b3a4d8d843b13bd5ab9de494eeec48aef2582e5f0a4c7b96f6c3891e6864c42210b9240dc23d97e199a4cd7d1f00556661d
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r5.ebuild
index b2a9406e64ee..1159f5c61a22 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r4.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools
 
 DESCRIPTION="Rendering engine for MathML documents"
@@ -9,7 +10,6 @@ HOMEPAGE="http://helm.cs.unibo.it/mml-widget/"
 SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
 
 LICENSE="LGPL-3"
-
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="mathml svg t1lib"
@@ -21,13 +21,12 @@ RDEPEND="
 	mathml? ( media-fonts/texcm-ttf )
 	t1lib?	( >=media-libs/t1lib-5:5 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-libs/libxslt
 	virtual/pkgconfig
 "
 
-DOCS=( ANNOUNCEMENT AUTHORS BUGS ChangeLog CONTRIBUTORS HISTORY NEWS README TODO )
-
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc43.patch
 	"${FILESDIR}"/${P}-gcc44.patch
@@ -52,6 +51,7 @@ src_prepare() {
 	fi
 
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	rm README.MacOSX || die
 
 	AT_M4DIR=ac-helpers eautoreconf
 }
@@ -59,7 +59,9 @@ src_prepare() {
 src_configure() {
 	# --disable-popt will build only the library and not the frontend
 	# TFM is needed for SVG, default value is 2
-	econf --disable-gtk \
+	econf \
+		--disable-gmetadom \
+		--disable-gtk \
 		$(use_enable svg) \
 		$(use_with t1lib) \
 		--with-popt \
@@ -69,12 +71,12 @@ src_configure() {
 		--enable-tfm=2 \
 		--enable-builder-cache \
 		--enable-breaks \
-		--enable-boxml \
-		--disable-gmetadom \
-		--disable-static
+		--enable-boxml
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	dodoc ANNOUNCEMENT CONTRIBUTORS HISTORY
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index a83719691655..61a6ec158849 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,4 +1,3 @@
-AUX libX11-1.8.2-reentrancy.patch 4077 BLAKE2B 6888f6185a03c9c5fbe79a3ce6d2b2a78ee951038a7c5cdbcd94e72a6c24d7aca3289c724b0c940a245cd352e3f50bf064fef5c00c02321e7cb67b94a39cd13d SHA512 6d8e9f578e33cb36236757127634899f71c7c194d536fd5ba7617f96fc38928f5d402aa9adb57a2939cd6dad041ba0431a2281aaec7e5b25395b67355a10bbce
 AUX libX11-1.8.3-reentrancy-again.patch 4713 BLAKE2B e2d308bd011120655009e5af1e5cbbefa217c3de1c7e78d3ddc64d0ce02535cc63903696ec21cb5743b49ee016a3c8ded22ee62a2f1256b71c0f245c51108de5 SHA512 a6a2f504fe7b860a86ac140c2b1ad7ca3c4a8fc2170535a5cac365bf8de40fa576f0d05134b1eb316192b4acb909bba473298704b18c7c1e1602e2a4f56e592f
 AUX libX11-1.8.3-revert-XPutBackEvent.patch 1772 BLAKE2B b60d6cb535d6557fb2ba84a962af77481c6ebd1780d23869172cb331a09f7638fee75deeb73b02a5c37f658f5d04d2b90a6f5c9d91121c187f9d98a311c3c718 SHA512 df965ba65ca448686e200feaee11f8f9fb90b27fd2def30aee930d21b03682ed83613d3630b024fe6d1fd2894e76fa35ff8d04afc6e958981ed9b3e8f51e834c
 DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
diff --git a/x11-libs/libX11/files/libX11-1.8.2-reentrancy.patch b/x11-libs/libX11/files/libX11-1.8.2-reentrancy.patch
deleted file mode 100644
index 784adaeb008f..000000000000
--- a/x11-libs/libX11/files/libX11-1.8.2-reentrancy.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/a9e845809bcaae22496bc8aa3ca252b410d5f39b
-https://bugs.gentoo.org/862115
-
-From a9e845809bcaae22496bc8aa3ca252b410d5f39b Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu@herrb.eu>
-Date: Fri, 11 Nov 2022 18:55:23 +0100
-Subject: [PATCH] Fix 797755 Allow X*IfEvent() to reenter libX11
-
-- the activation logic is reversed
-- there is also _XInternalLockDisplay() that needs protection
-- I've found cases (in fvwm2) where the callback calls XCheckIfEvent()
-  recursively. So the flag needs to be a counter.
-
-Reviewed-by: Adam Jackson <ajax@redhat.com>
---- a/include/X11/Xlibint.h
-+++ b/include/X11/Xlibint.h
-@@ -207,7 +207,7 @@ struct _XDisplay
- 
- 	XIOErrorExitHandler exit_handler;
- 	void *exit_handler_data;
--        Bool in_ifevent;
-+        CARD32 in_ifevent;
- };
- 
- #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n)
---- a/src/ChkIfEv.c
-+++ b/src/ChkIfEv.c
-@@ -49,8 +49,8 @@ Bool XCheckIfEvent (
- 	unsigned long qe_serial = 0;
- 	int n;			/* time through count */
- 
-+        dpy->in_ifevent++;
-         LockDisplay(dpy);
--        dpy->in_ifevent = True;
- 	prev = NULL;
- 	for (n = 3; --n >= 0;) {
- 	    for (qelt = prev ? prev->next : dpy->head;
-@@ -80,7 +80,7 @@ Bool XCheckIfEvent (
- 		/* another thread has snatched this event */
- 		prev = NULL;
- 	}
--        dpy->in_ifevent = False;
-+        dpy->in_ifevent--;
- 	UnlockDisplay(dpy);
- 	return False;
- }
---- a/src/IfEvent.c
-+++ b/src/IfEvent.c
-@@ -48,8 +48,8 @@ XIfEvent (
- 	register _XQEvent *qelt, *prev;
- 	unsigned long qe_serial = 0;
- 
-+        dpy->in_ifevent++;
-         LockDisplay(dpy);
--        dpy->in_ifevent = True;
- 	prev = NULL;
- 	while (1) {
- 	    for (qelt = prev ? prev->next : dpy->head;
-@@ -60,7 +60,7 @@ XIfEvent (
- 		    *event = qelt->event;
- 		    _XDeq(dpy, prev, qelt);
- 		    _XStoreEventCookie(dpy, event);
--                    dpy->in_ifevent = False;
-+                    dpy->in_ifevent--;
- 		    UnlockDisplay(dpy);
- 		    return 0;
- 		}
---- a/src/OpenDis.c
-+++ b/src/OpenDis.c
-@@ -189,7 +189,7 @@ XOpenDisplay (
- 	dpy->xcmisc_opcode	= 0;
- 	dpy->xkb_info		= NULL;
- 	dpy->exit_handler_data	= NULL;
--        dpy->in_ifevent         = False;
-+        dpy->in_ifevent         = 0;
- 
- /*
-  * Setup other information in this display structure.
---- a/src/PeekIfEv.c
-+++ b/src/PeekIfEv.c
-@@ -49,8 +49,8 @@ XPeekIfEvent (
- 	register _XQEvent *prev, *qelt;
- 	unsigned long qe_serial = 0;
- 
-+        dpy->in_ifevent++;
- 	LockDisplay(dpy);
--        dpy->in_ifevent = True;
- 	prev = NULL;
- 	while (1) {
- 	    for (qelt = prev ? prev->next : dpy->head;
-@@ -64,7 +64,7 @@ XPeekIfEvent (
- 			_XStoreEventCookie(dpy, &copy);
- 			*event = copy;
- 		    }
--                    dpy->in_ifevent = False;
-+                    dpy->in_ifevent--;
- 		    UnlockDisplay(dpy);
- 		    return 0;
- 		}
---- a/src/locking.c
-+++ b/src/locking.c
-@@ -465,17 +465,33 @@ static void _XIfEventLockDisplay(
-     /* assert(dpy->in_ifevent); */
- }
- 
-+static void _XInternalLockDisplay(
-+    Display *dpy,
-+    Bool wskip
-+    XTHREADS_FILE_LINE_ARGS
-+    );
-+
-+static void _XIfEventInternalLockDisplay(
-+    Display *dpy,
-+    Bool wskip
-+    XTHREADS_FILE_LINE_ARGS
-+    )
-+{
-+    /* assert(dpy->in_ifevent); */
-+}
-+
- static void _XIfEventUnlockDisplay(
-     Display *dpy
-     XTHREADS_FILE_LINE_ARGS
-     )
- {
--    if (dpy->in_ifevent)
-+    if (dpy->in_ifevent == 0) {
-+        dpy->lock_fns->lock_display = _XLockDisplay;
-+        dpy->lock_fns->unlock_display = _XUnlockDisplay;
-+        dpy->lock->internal_lock_display = _XInternalLockDisplay;
-+        UnlockDisplay(dpy);
-+    } else
-         return;
--
--    dpy->lock_fns->lock_display = _XLockDisplay;
--    dpy->lock_fns->unlock_display = _XUnlockDisplay;
--    UnlockDisplay(dpy);
- }
- 
- static void _XLockDisplay(
-@@ -507,6 +523,7 @@ static void _XLockDisplay(
-     if (dpy->in_ifevent) {
-         dpy->lock_fns->lock_display = _XIfEventLockDisplay;
-         dpy->lock_fns->unlock_display = _XIfEventUnlockDisplay;
-+        dpy->lock->internal_lock_display = _XIfEventInternalLockDisplay;
-     }
- }
- 
-GitLab
diff --git a/x11-libs/librfm/Manifest b/x11-libs/librfm/Manifest
index 80f8f6929867..7aebceea6f58 100644
--- a/x11-libs/librfm/Manifest
+++ b/x11-libs/librfm/Manifest
@@ -1,3 +1,5 @@
+AUX librfm-5.3.16.3-C99-decls.patch 1029 BLAKE2B 7ad2decb4a30b61f787959b889c3189dad21878b6bf07e68e159745dd2d935e719fc9975d93a602866a0326426fe7209a25ebb1fe31a7de26f5022e6d23060f3 SHA512 9f76202437d22ac6137de2cdc2c2d5345fb992cb2d2f1b4296b8fce8040231248aa7161241dd7870a17dc95b5baa3f3030bc9368b6659dd6b52a15483307a418
+AUX librfm-5.3.16.3-autotools.patch 183 BLAKE2B 9e462495e62bbb65b445cd3f96a225cfa415f890cd972c7d05e4fe18cf321f1832251e642e0cd5b161aab5c323f8fcc66d3f4da6c0d630e4a6c05432ed7bec3b SHA512 36eb2355aa54d5ba627309572937cc1e1ef57918f966d3565d33a441fc70a510b85fec0e7c5c80cefb3e27e9288bdfd0c54b666d15ab241f956c4e5386334c5f
 DIST librfm5-5.3.16.3.tar.bz2 3304424 BLAKE2B 6651ef8a3967956e1858d4c94af055bddee1b0f2278fe3c0323232e1824e77d8d5d56533d23af3770a9641a2c8ea64eea35157e2cd02cd73f6bcbddd99ea9da8 SHA512 e3d00b0337c9368bbe939bcb2d7f6b1c3f3b6b5a810074c5d6bc7afccd938c5284075231a0326b5be2b93436bee346871fb47ee30c130e6ce00756148d214000
-EBUILD librfm-5.3.16.3-r1.ebuild 909 BLAKE2B 2388116837748847d05dc379cbc1b3553f3a041a0e96125d1e3cfaed97949ac5ae8ab3b6b89d8f78f3f75d80546b9042666616aae347f596ae928d62bd0e5c17 SHA512 a19b226fa80dc06b7316310f2c9cac512f36d5759910f8b5c34aef0da042b026c4ea3d97a3d394203f9c29447296acd895f18545ed4dc62ffeea27ef4317ac07
+EBUILD librfm-5.3.16.3-r2.ebuild 933 BLAKE2B 7e02ef4dc764062efb1000df3081b3a75fb036e6aa1a952a16dbfa19d95521a8c08170e0c3fd220ee9634ddf69bcd58bafd62c7e00078e9e43a3c36596c8045b SHA512 22fb7beaf7d8ca25def46ae5f4018ac43b261b778628d289a1a0bbc7c606c72904584aad8a62424bb86a144c0e17cac9b97a0a4388242b21d7f84bbccf5fa931
 MISC metadata.xml 240 BLAKE2B a5193cf983552811b78bd72f125986ab478c1204169c2798994021bda72e76bb1103643d6f030e18c6ccc73adad6acf0c3eec4a24843a0c64588df9dd0775d69 SHA512 2ef3bc56ce598ee3f34fdf992e7f642ab80b88eb20fe7a92b02a57203bbbf2964cde9b8e1f28a8bdf744f66932640939cf388c1474e69a64ed817bc8e537e8fe
diff --git a/x11-libs/librfm/files/librfm-5.3.16.3-C99-decls.patch b/x11-libs/librfm/files/librfm-5.3.16.3-C99-decls.patch
new file mode 100644
index 000000000000..784647ca92f1
--- /dev/null
+++ b/x11-libs/librfm/files/librfm-5.3.16.3-C99-decls.patch
@@ -0,0 +1,42 @@
+--- a/modules/settings-module.i
++++ b/modules/settings-module.i
+@@ -36,7 +36,7 @@
+ #define SHRED_OPTIONS rfm_void(RFM_MODULE_DIR, "callbacks","get_shred_options")
+ */
+ 
+-static GtkWidget *rfm_check_button_new(){
++static GtkWidget *rfm_check_button_new(void){
+ 	return gtk_check_button_new ();
+ }
+ static void
+@@ -374,7 +374,7 @@
+ }
+ 
+ 
+-static gchar **get_program_options(i){
++static gchar **get_program_options(gint i){
+     if (i >= RFM_OPTIONS) return NULL;
+     environ_t *environ_v = rfm_get_environ();
+     return environ_v[i].env_options;
+--- a/primary/primary-icons.i
++++ b/primary/primary-icons.i
+@@ -181,7 +181,7 @@
+ 	
+ 
+ static void
+-init_lite_hash () {
++init_lite_hash (void) {
+     // g_once init
+     static gsize initialized = 0;
+     if (g_once_init_enter (&initialized)){
+--- a/primary/primary.c
++++ b/primary/primary.c
+@@ -1405,7 +1405,7 @@
+ }
+ 
+ static 
+-gint get_paste_length(){
++gint get_paste_length(void){
+     gint fd = shm_open (PASTE_SHM_NAME, O_RDONLY, S_IRUSR | S_IWUSR);
+     if(fd < 0){
+ 	return 0;
diff --git a/x11-libs/librfm/files/librfm-5.3.16.3-autotools.patch b/x11-libs/librfm/files/librfm-5.3.16.3-autotools.patch
new file mode 100644
index 000000000000..4913468741d1
--- /dev/null
+++ b/x11-libs/librfm/files/librfm-5.3.16.3-autotools.patch
@@ -0,0 +1,10 @@
+--- a/m4/rfm-conditionals.m4
++++ b/m4/rfm-conditionals.m4
+@@ -174,7 +174,6 @@
+ else
+ 	AC_SUBST(WITH_DEBUG) WITH_DEBUG=no
+ 	AC_MSG_NOTICE([No debug for you.])
+-	CFLAGS="-O2"
+ fi
+ ])
+ 
diff --git a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild b/x11-libs/librfm/librfm-5.3.16.3-r2.ebuild
index cdb51d846231..55991898b946 100644
--- a/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
+++ b/x11-libs/librfm/librfm-5.3.16.3-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools
 
 MY_P="${PN}5-${PV}"
@@ -9,11 +10,11 @@ MY_P="${PN}5-${PV}"
 DESCRIPTION="The basic library used by some rfm applications, such as Rodent filemanager"
 HOMEPAGE="http://xffm.org/libxffm.html"
 SRC_URI="mirror://sourceforge/xffm/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-libs/glib-2.22.5:2
@@ -24,18 +25,19 @@ RDEPEND="
 	>=gnome-base/librsvg-2.26:2
 	>=x11-libs/cairo-1.12.6[X]
 	>=x11-libs/gtk+-3.12:3[X]
-	>=x11-libs/pango-1.28.0[X]
-	!<x11-misc/rodent-5
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+	>=x11-libs/pango-1.28.0[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-C99-decls.patch
+)
 
 src_prepare() {
 	default
-	sed -i -e "s|-O2|${CFLAGS}|" m4/rfm-conditionals.m4 || die
 	eautoreconf
 }
 
diff --git a/x11-libs/libtinynotify-cli/Manifest b/x11-libs/libtinynotify-cli/Manifest
index 2b49831d6ed4..ec52eba7b80c 100644
--- a/x11-libs/libtinynotify-cli/Manifest
+++ b/x11-libs/libtinynotify-cli/Manifest
@@ -1,4 +1,3 @@
 DIST tinynotify-send-1.2.1.tar.bz2 266078 BLAKE2B ac3c9510d89fdfd50f70fbfad14476e95e14616cfff9d29c9976af5459e2c73a8ddcf5cb578284b177e78743c46594126343933ae87f78a380bca3ce2350aaa9 SHA512 f416db09fa95f04d771610af7ae8953192027b8606c53f54efe514c4d33b59e8dc362676004a036c2dd7e7c7cf03b077ee9b753839efbcb181c5724f43efa58d
-EBUILD libtinynotify-cli-1.2.1.ebuild 796 BLAKE2B aae8a0dc76e6e0c7100794155d28b87ad5be6e67683d203cc3452d005865a968304dedec197dfedc944c1f6b72fbfe9ea7407f50a9ef4401c717dca54ecc164d SHA512 0aaaf4316558cc08459a351ec8ad71b7a0b1c424843d72c671106e522439635637ee14e9259226eb5d0e8fe801ac5570d4b197ccd46404dfdfd020417256daf7
-EBUILD libtinynotify-cli-9999.ebuild 834 BLAKE2B 7518a22b4baa94199ce738c6045ffdcd1da3d9b2bbd6891dbbdd83ecb8cc4188c0da22b456df0e29fd75c045bb91b5ec014b3944e4d0cf089c21a45cf73a494e SHA512 bae0bb8c77f1804efd0ab9281366ad3063a319b2692185d10ea634a8ce6e10df21f0563ef650d3b7e4357ba3689ceaf1275abe927978e52ef83fc3059b269a68
+EBUILD libtinynotify-cli-1.2.1-r1.ebuild 761 BLAKE2B 429c80e389d632e738ba4484095f8e4ff367ed2a01731b7cc2f3a6bb221aa93a25d8a7adbc42048ed8b9727f1c0f139a2e5d026b771d7a4ae0f5f12c4cc46d1c SHA512 a1543644329510fa938286a187f226aa23df0ded51c8c9df9e02a586185e70bc2c8db74c03a32dd9772c8c1b9eef14d9607c41cac99f8fae3af8d43da8c9df66
 MISC metadata.xml 520 BLAKE2B acd97ac285da04f2f4a02ca3b8821799ccc23e9c56f93cf88ef327114d56ec1e4bddf1e11d80a27d76e558f3aa8b4490c73681b3d28e7cd98f9ed493cc2e975d SHA512 4ba749bfd980bb59862f015f72c42ef33ceb8c65978193dd869a84d59b73906a9b38466d6be08737a0d3de577b2df6c9a89187aaf7e917086abaa6ad1e866a19
diff --git a/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1-r1.ebuild
index d71dbc25ec9e..dbe4aa355e0b 100644
--- a/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild
+++ b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1-r1.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
+MY_P="tinynotify-send-${PV}"
 
-MY_P=tinynotify-send-${PV}
 DESCRIPTION="Common CLI routines for tinynotify-send & sw-notify-send"
 HOMEPAGE="https://github.com/mgorny/tinynotify-send/"
 SRC_URI="https://github.com/mgorny/tinynotify-send/releases/download/${MY_P}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
+IUSE="doc"
 
-RDEPEND="x11-libs/libtinynotify:0="
-DEPEND="${RDEPEND}
+RDEPEND="x11-libs/libtinynotify:="
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )"
 
-S=${WORKDIR}/${MY_P}
-
 src_configure() {
 	local myconf=(
 		$(use_enable doc gtk-doc)
-		$(use_enable static-libs static)
 		--disable-regular
 		--disable-system-wide
 	)
@@ -33,5 +33,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild b/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild
deleted file mode 100644
index 101e5c636161..000000000000
--- a/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/mgorny/tinynotify-send.git"
-inherit autotools git-r3
-
-MY_P=tinynotify-send-${PV}
-DESCRIPTION="Common CLI routines for tinynotify-send & sw-notify-send"
-HOMEPAGE="https://github.com/mgorny/tinynotify-send/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc static-libs"
-
-RDEPEND="x11-libs/libtinynotify:0="
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-1.18
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable doc gtk-doc)
-		$(use_enable static-libs static)
-		--disable-regular
-		--disable-system-wide
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-libs/libtinynotify-systemwide/Manifest b/x11-libs/libtinynotify-systemwide/Manifest
index 2e303a5810df..0ca9891f1855 100644
--- a/x11-libs/libtinynotify-systemwide/Manifest
+++ b/x11-libs/libtinynotify-systemwide/Manifest
@@ -1,4 +1,3 @@
 DIST libtinynotify-systemwide-0.1.tar.bz2 270071 BLAKE2B 154dbdee157ea43e35cb89c71e0cb75397f3d5a9244f0ff5bd89e647826d5870bbe854ab929305628bb48f8c81d8f251502c637de559ba5d2db30dd7508f4bb0 SHA512 95516208485ed46e4702806bca467af509b9756a738f5f345cec712d878f14f4d9c84b78c33f0e4a41e0bf7be3b6e8e50dcd230da753c2827ae75793ca1c74aa
-EBUILD libtinynotify-systemwide-0.1.ebuild 734 BLAKE2B d916cf48aa36e558db18b391d6ef819c14c17c841fda45a95015343c66141d6ae309930740b70f514dbdea4d071e0d5091dc644547a7891b5a28694c54d01729 SHA512 eea53d38f575434dfd3644739d61e4ec809a24406d4af2f790b7bcabe399f08451bc315e94c2cb28dbdc928166a09d7c26c4f6c0810601a55750044e3c01cd8a
-EBUILD libtinynotify-systemwide-9999.ebuild 781 BLAKE2B 0d7ce411430dc652dbe6cf436b86c425f1602a8da4e4905045326c0eee79e756bd099c14c98495501230ff463be05c1378cdc0893e0a456bcd5e4c3da39c7a66 SHA512 c2714ac7278600a487112bf7e61427a0124e9d892871c7ce32151bef56bfe2f9926b9e95df369c74568edf96ac5787b4e4a5cf51d14702d8224dd02279fe4ad6
+EBUILD libtinynotify-systemwide-0.1-r1.ebuild 659 BLAKE2B 83ddb95991f94c048747149dc705c5028f4b75f4010ab0fea5833f002131a9fc3a11ca75d5052620f5a0df2f239e6139b0b765a74fd4cf037d1c78398990598c SHA512 40b3ad4872ad8ab9e8da33d7dd2b26d831d32ec5f8f9d7070edf19f4d41b18960d5266b9dc4bca1cbc5dc432cfca02f32f0d4e18fa34990e2db783437c5ed694
 MISC metadata.xml 538 BLAKE2B 401ed14596bdb3929f58ed6b58367312354e3eec5b9fdab9ff0e81fc63c077e44c68e718852bf6a6b898c37d3fac02748e443573790b82f47c8b15f25b6445e6 SHA512 c822c304e26d7206dec63d31ced8dc3d93fad4ccd6f493f30baaf929b6ca859367e27cd95fbac26fd6e776ac9d2d9a1a12220c9959dfcbac906a6bb4b2b73374
diff --git a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1.ebuild b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1-r1.ebuild
index 4543af991c3e..3fd392196e9c 100644
--- a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1.ebuild
+++ b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A system-wide notifications module for libtinynotify"
 HOMEPAGE="https://github.com/mgorny/libtinynotify-systemwide/"
@@ -10,24 +10,21 @@ SRC_URI="https://github.com/mgorny/libtinynotify-systemwide/releases/download/${
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
+IUSE="doc"
 
-RDEPEND="sys-process/procps:0=
-	x11-libs/libtinynotify:0="
-DEPEND="${RDEPEND}
+RDEPEND="
+	sys-process/procps:=
+	x11-libs/libtinynotify:="
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )"
 
 src_configure() {
-	local myconf=(
-		$(use_enable doc gtk-doc)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
+	econf $(use_enable doc gtk-doc)
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild
deleted file mode 100644
index d4effe7755cf..000000000000
--- a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-inherit autotools git-r3
-
-DESCRIPTION="A system-wide notifications module for libtinynotify"
-HOMEPAGE="https://github.com/mgorny/libtinynotify-systemwide/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc static-libs"
-
-RDEPEND="sys-process/procps:0=
-	x11-libs/libtinynotify:0="
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-1.18
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable doc gtk-doc)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}