8 files changed, 97 insertions, 95 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a12e18f383f7..5effb60d0766 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 6e2a7b5e1c53..4e147b33d2f9 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,5 +1,7 @@
 DIST dos2unix-7.5.0.tar.gz 957576 BLAKE2B 5a674d61c9f911a2cb9c20c363fdc0e0affd3b6f26531d37a231aedb5e6a7428116b139d4af12ee32f4107f78ea079fb7a8d008c9630375f4afbc2afa0afb39f SHA512 914cbc3255045b1b87ad702c70844b059f9435ccfe636dc67514f092090b86a9f271789fcde28a9ead4d94a869fb92e334aa115d3cfe24133338260ad2233763
 DIST dos2unix-7.5.1.tar.gz 959228 BLAKE2B 4f4a334a295b702d0540e58a0a86dcf091583d6c2b64f6de9bea883dfe0d70bfa05e8e5b9c8fb867bfd5e66b2eba562da1ca45c60f97bac67bdb275d66de0fe0 SHA512 733d163fff4effdf8acb382abec9bcd23f594fa17502e9dde2f24d3326aeb7653eee353bef812090ab8dc055136d236b40c2f778deea4ac026c2eed471e763b5
+DIST dos2unix-7.5.2.tar.gz 991485 BLAKE2B 2d88e88960d5deb6531b6eb52f646d0c8f40c361800e2f26632577e9187999599752d30b0c7e4e1f18c0127578311b8be6910e54535c333e092c3ebb70329173 SHA512 d76d799435dd248850f72cc50af2144a51e99f04ea83a1447c4edd828625c83f0afba367da51aa83defced4cbf34f3b75387a0821010f7b212225571036efbb2
 EBUILD dos2unix-7.5.0.ebuild 2121 BLAKE2B f441106ff8eeb22f0088bb69cd082ea97511a15811854ff52b3016f9a9dc1071651555cb589f15f8307f48d4becc87d4a7c40d5036f16ae15355b52639b465f1 SHA512 c66f7054f2bfcd639454fb877b60cd170e033a77fef07cab0451c743ec08ca3daa2e243e693d2e29c8e1217af17976717eb08bd3532fa7c4538dcd0ab491d08a
 EBUILD dos2unix-7.5.1.ebuild 2121 BLAKE2B f441106ff8eeb22f0088bb69cd082ea97511a15811854ff52b3016f9a9dc1071651555cb589f15f8307f48d4becc87d4a7c40d5036f16ae15355b52639b465f1 SHA512 c66f7054f2bfcd639454fb877b60cd170e033a77fef07cab0451c743ec08ca3daa2e243e693d2e29c8e1217af17976717eb08bd3532fa7c4538dcd0ab491d08a
+EBUILD dos2unix-7.5.2.ebuild 2174 BLAKE2B e7fee10f80c2c4f6151f9000fabc8a8a8911308efbfc1e1a2864f2251f89d47ae2530e32d175f669d7b9941d9c8c50f469482a5d165ad39e051d26df5df5cbe7 SHA512 97c99bcd6be68d5e54d2804df8de8356346d11f2c91231415b6bdfe33a5f227b6b5461a9600df473aec25e16e9e468b9b5f6b8953d33bc1a97d771f386bec64d
 MISC metadata.xml 344 BLAKE2B ec6c66c1693ed09d8434840bb0e5eaf6689d629c787a115eedad537972c06c3aae6d739cd55a9acf85ed21043314e9721030b7c570c85eea4361c083d7db9fe1 SHA512 63d5baa4e84950d6cb2fd604f93e60842bc210af298eef73bc9e59e3d811957b99a95e2538ddd6df7d2ac6a50e30ff5bda66af4d7dbb573cec4ef83a38e42919
diff --git a/app-text/dos2unix/dos2unix-7.5.2.ebuild b/app-text/dos2unix/dos2unix-7.5.2.ebuild
new file mode 100644
index 000000000000..bff0f07b514e
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.5.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PLOCALES="ca da de eo es fr fur hu ja ka ko nb nl pl pt_BR ro ru sr sv uk vi zh_CN zh_TW"
+
+inherit plocale toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="https://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+	https://www.xs4all.nl/~waterlan/${PN}/${P/_/-}.tar.gz
+	https://downloads.sourceforge.net/${PN}/${P/_/-}.tar.gz
+"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="BSD-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug nls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!app-text/hd2u
+	virtual/libintl
+"
+DEPEND="
+	${RDEPEND}
+	test? ( virtual/perl-Test-Simple )
+"
+BDEPEND="
+	dev-lang/perl
+	nls? ( sys-devel/gettext )
+	test? ( elibc_musl? ( sys-apps/musl-locales ) )
+"
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror "po*/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	rm_loc() { rm po*/$1.po || die; }
+	plocale_for_each_disabled_locale rm_loc
+}
+
+src_prepare() {
+	default
+
+	handle_locales
+
+	sed \
+		-e '/^LDFLAGS/s|=|+=|' \
+		-e '/CFLAGS_OS \+=/d' \
+		-e '/LDFLAGS_EXTRA \+=/d' \
+		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+		-i Makefile || die
+
+	if use debug ; then
+		sed -e "/^DEBUG/s:0:1:" \
+			-e "/EXTRA_CFLAGS +=/s:-g::" \
+			-i Makefile || die
+	fi
+
+	tc-export CC
+}
+
+lintl() {
+	# same logic as from virtual/libintl
+	use !elibc_glibc && use !elibc_musl && echo "-lintl"
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr" \
+		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		$(usex nls "" "ENABLE_NLS=") install
+}
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index a1a5e18a0bbf..065653f149bc 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -7,5 +7,5 @@ DIST multitail-7.0.0.tar.gz 152425 BLAKE2B 1afbee9501926b860bd063768e6d20b7e6fe9
 DIST multitail-7.1.2.tar.gz 153409 BLAKE2B 852f7a0f22581b043c65f24bc1a19ffb0e7fa8c91d8152b58a1127a51b1833cded0b22c5430f96417af277927daefeb73d5acef38bdbc54898cc48ec0a4e9436 SHA512 6f006d68a6c0fcfec9f6aada4a1ad0a031b61ea46c60231faa6fd7ea934f6f74ca30f12f8983658c9ae6ae2e08bade9159e3426ed47cd9171d0b190ec9f3e5b5
 EBUILD multitail-6.4.2-r1.ebuild 1319 BLAKE2B 6f2de88afa253831c3da699df35906bf6d2a9ec82ef93bc56c36c1d8de65bceea27d79279a04b06df6c756d55f1cadc33b17c409e76907793eb1ffa3d8316ca9 SHA512 f01e1a8aa850b11ceaee0895758696e398e25e84cb20de3ee57a4373ecddb309ef98ef7193fd726025b2ef1a11f35d4c554ae39f645517b828294ff5685de227
 EBUILD multitail-7.0.0.ebuild 1500 BLAKE2B 15789859a5ba87bb3fcbf637c051c0388fdccf521deee87a754b69c4501f2be14924492c87a2cfbff25dd85f4d9400d77305a52800877f9d57670856a9c8c232 SHA512 a810f2e039a7f78680a430194e94edbe07556085285c3f32c153180f4cceacb868d8fefe04ee9bf0a267f423a1859d99e91aeac536fd70af54ecdae287c9b2a5
-EBUILD multitail-7.1.2.ebuild 1439 BLAKE2B 3cabfe34d67dcee2eb3fa39ca5eb61d8ebe860f63ae3b6944ecb6a7d6e7afa6ba7b8823adf20b4884349a83de7d2bd4e7b2f79798cd6c8e5d2124e1d7e58e601 SHA512 5ea37ac3e3b2e22a75b751b393f6b61395ea15f48381f31de60b37903ba263faf72ecf257623ae275a7b41ffb8bd67c83d4cd8a40cf02d98c49c2c642e24af27
+EBUILD multitail-7.1.2.ebuild 1436 BLAKE2B 18c8fa2c18cbe48cbe96460aedc6ce2db497ba449f339ff616731145e7be1cf355b0bc717508c6ee82ea803c2585b5ae2d048e2a82ac27eff83b01f55b58611f SHA512 d62a39fe5afd4b88dab6886ee9262cf813e45fbfb27ee9a7e5e5cc6f256204ac068ebb7343abd66f65055f706a4f408be3810258cdfddd0544a2c09faf0b21fa
 MISC metadata.xml 358 BLAKE2B febc299cf49a8c7bb3a55c83a95fbce0ceb46a9297f91a8d34e6275fb66f7847b08d0facfdcaacc2d88b97af8cf64244712f424a1bfcd11fa866fab7f4d28702 SHA512 834755fd8e98223a18d1487ad8e182bbdd02094b3b52603f7945099dfb0f525a5f08f1d2162b2a5785ce01fd252e4a6b2f4ad9b7ae775e7922ac560a332ea42c
diff --git a/app-text/multitail/multitail-7.1.2.ebuild b/app-text/multitail/multitail-7.1.2.ebuild
index fabde9ee08d4..0d3b4e9410f1 100644
--- a/app-text/multitail/multitail-7.1.2.ebuild
+++ b/app-text/multitail/multitail-7.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/folkertvanheusden/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples unicode"
 
 RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
diff --git a/app-text/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
index 603b9365b580..766427e71008 100644
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@@ -1,7 +1,4 @@
-DIST zotero-bin-6.0.35-amd64.tar.bz2 69475661 BLAKE2B d66ab95e8cfc954da76e74acf8936785460f8de0a4e204c761b0c32ca42fe1d71051f509f68fe0609751c670c598f74f4567c097b2ce89f0a3ebf3663833bc02 SHA512 f74574ecddba45c15f4cb61015969af0bdbc594e8f7f7707d6e5d6f6f74dca839b1f71cada2f5c66b530da28719a832ed0cc93c0684e948e17591a46fde50297
-DIST zotero-bin-6.0.35-x86.tar.bz2 71115051 BLAKE2B fb756681f6eca8dc45fb9eb44b5a1f0ca69138984cc4c8900d5b03ab4d637bea4d6e63bd6804d83e2aeef0209c4304202c1a0f2cc08c6f94dfcc62ca7152fa53 SHA512 93b11b8357dbb969e859938c604d109ae14b2a10d2bbe5d8096c0bd0cd3a89c65a64cc00d2b9fbff0339e8d2e0d4920701884965baae5bf29e9742049fb4703d
-DIST zotero-bin-7.0.3-amd64.tar.bz2 109081052 BLAKE2B 309a3594d9fd2207327b0902f44f152fc7eb58b4a1687c191514611d310c7ac6d61c9d315c9e5ef96633b13ec2ba3aa8c7f3b35094f703036e4c5e23e0385423 SHA512 3ad626446ee8e4cdcaaf53910776ab66494097f2ba78c3f913c72543094136b6adeb1cf6e1427068e787136388d58086590f34a1392d5d0cf7b738640a57ae20
-DIST zotero-bin-7.0.3-x86.tar.bz2 112911571 BLAKE2B 89fe744bb8f19fb13ae92f8ceebdf9b8026d242c63ad8363fdc30eccd4696187a93194b1d98ac62e9d57a8ad7f6a39abcd9c648fa3b62cfc4940d8f132898920 SHA512 d26c6806239a366f7fec5f6dde7480e5fbedccdd57c7d9b1dba4cb1ba30e5be8a45b347a1cb78aac63019e70dcca6c2d1ad16267433cab2e4105f0f67235a3ec
-EBUILD zotero-bin-6.0.35.ebuild 2123 BLAKE2B 15b5862f41cee1567c000134ec336bacac4ae3b78c1993b58a8e452f3cedaa927a24db8930e7adc3fe1c6143e09d429c23992ee24a38d0033326695101a5a1b8 SHA512 22a917fdb6173fabce5c6e67e518e926dca9d53bb66fecdc1d6bd7294cb01e746ab1052fe7219170d9ee769ed39947701f5fb8bfe2f672defa7bb10b1cfed7c5
-EBUILD zotero-bin-7.0.3.ebuild 1799 BLAKE2B ed50ea78e3d8678a7ab3527e56a3ca45230c2a906c92311daa1c76f6e2ee47009e77cc05ce4a6657551d8dd58f76b81e40cef67badd9fe9c30b9d7b43ec76ba7 SHA512 9e6f7a4c4d507d71d4f3043a855a7b6fb2c17098c1e80f30e41511460796e069b5b310751949e63f172de7580a8725c6185c3477a787af62b60bd706f8a2ad0e
+DIST zotero-bin-7.0.5-amd64.tar.bz2 109076934 BLAKE2B c1c685648a887e57fad7499b7e4adb5a04d0a2f8eaaf248340fea18f60edaf503f7916983b686847e1f2a11fcd655fe908702c0427647086e55eaf06b6b7be4e SHA512 61e3407c75f7c392562909c73b3335872ccfd007f2ec0c2c7c75b478c9071d48803c31c28cbb49c82a7ef7a05016a155a55c2821b5e577ff7c5674a3115bb32b
+DIST zotero-bin-7.0.5-x86.tar.bz2 113004962 BLAKE2B b92719cf66045c7b2ca4c7108822b510583629b6886a0a16676b1cb4ff7302ea303f94410f24f378909a7ff55bb3d459bdedfce0e1de4bd32a8db921548c7bd2 SHA512 21ed0b6fa088ce92699a271ef64171c583fa669e42cb6517e3b0238294ddcfed80a3d001a928dfb3916ad41b04f70d08bad065741e7f4caa98978ad4b1b6fa4f
+EBUILD zotero-bin-7.0.5.ebuild 1799 BLAKE2B ed50ea78e3d8678a7ab3527e56a3ca45230c2a906c92311daa1c76f6e2ee47009e77cc05ce4a6657551d8dd58f76b81e40cef67badd9fe9c30b9d7b43ec76ba7 SHA512 9e6f7a4c4d507d71d4f3043a855a7b6fb2c17098c1e80f30e41511460796e069b5b310751949e63f172de7580a8725c6185c3477a787af62b60bd706f8a2ad0e
 MISC metadata.xml 398 BLAKE2B ef8965041b1ddb5dafacd8d3b913c2c272b50460607018468446993062620044b77ee4033d9811979768aafba6def9b3e06775d48f8f194f7ca95ec6ad048c5c SHA512 5a67ca8cbadcfa83e38f983b3e448073970e71f2d2a3c0756d8cbbe54050382095df564bdd5e52b0976a9588f882d814a71179957e09e429a2881a7f48041e53
diff --git a/app-text/zotero-bin/zotero-bin-6.0.35.ebuild b/app-text/zotero-bin/zotero-bin-6.0.35.ebuild
deleted file mode 100644
index 85c6ac8300be..000000000000
--- a/app-text/zotero-bin/zotero-bin-6.0.35.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop xdg
-
-DESCRIPTION="Helps you collect, organize, cite, and share your research sources"
-HOMEPAGE="https://www.zotero.org"
-SRC_URI="
-	amd64? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}-amd64.tar.bz2 )
-	x86? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-i686&version=${PV} -> ${P}-x86.tar.bz2 )
-"
-S="${WORKDIR}"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="
-	app-accessibility/at-spi2-core
-	dev-libs/dbus-glib
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-"
-
-QA_PREBUILT="opt/zotero/*"
-
-src_prepare() {
-	if use amd64; then
-		cd Zotero_linux-x86_64 || die
-	elif use x86; then
-		cd Zotero_linux-i686 || die
-	fi
-
-	# disable auto-update
-	sed -i -e 's/\(pref("app.update.enabled"\).*/\1, false);/' defaults/preferences/prefs.js || die
-
-	# disable default oo installation questions - manual installation is still possible
-	sed -i -e 's/\(pref("extensions.zoteroOpenOfficeIntegration.skipInstallation"\).*/\1, true);/' \
-		extensions/zoteroOpenOfficeIntegration@zotero.org/defaults/preferences/zoteroOpenOfficeIntegration.js || die
-
-	# fix desktop-file
-	sed -i -e 's#^Exec=.*#Exec=zotero#' zotero.desktop || die
-	sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop || die
-
-	default
-}
-
-src_install() {
-	if use amd64; then
-		cd Zotero_linux-x86_64 || die
-	elif use x86; then
-		cd Zotero_linux-i686 || die
-	fi
-
-	dodir opt/zotero
-	cp -a * "${ED}/opt/zotero" || die
-
-	dosym ../../opt/zotero/zotero usr/bin/zotero
-
-	domenu zotero.desktop
-
-	for size in 16 32 48 256; do
-		newicon -s ${size} chrome/icons/default/default${size}.png zotero.png
-	done
-}
diff --git a/app-text/zotero-bin/zotero-bin-7.0.3.ebuild b/app-text/zotero-bin/zotero-bin-7.0.5.ebuild
index 56e522c44ad2..56e522c44ad2 100644
--- a/app-text/zotero-bin/zotero-bin-7.0.3.ebuild
+++ b/app-text/zotero-bin/zotero-bin-7.0.5.ebuild