6 files changed, 2 insertions, 400 deletions
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 4164fddd2211..fce22d028cc3 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,12 +1,5 @@
-AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45dadb5824f369a454a1126cb61293d55f86f9f01fb659932729dbc205a522aab32343dd87b74662927d60edc50750af602a959cc9 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae
 AUX keepass-2.53-xsl-path-detection.patch 801 BLAKE2B 3b8104dbfc5375358c5d4b73633a9a903db61e8b5790f08deb00b4ad4f1a9e45cea1337c670fbfb15fbd26ef5cad772ad8569afc94602b8a188811a875e72b99 SHA512 46f70c52280f36d566d01ebbaaeb74b16bfb8344788696205938a22b708d07c27f2f4021d1966528d85b29f53a7c651ccb57b4362d443c56c50725795700e27f
 AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
-DIST KeePass-2.49-Source.zip 5135190 BLAKE2B bf5a9aab0065a97545bd1b81a74b5ab113e4c4802873445719ce2a571745b04c69ab5d8be9a67dc59a713947f0955cbcccc782b6628f722a0d564283b943eee6 SHA512 7a25de6acb2637bd8820fb70866ab4ced4ece4b3e64172f616c2fb59d2a4e7a2f340435db10731ed3d7e66db7761487925cf1c7941b0bac12e72c5fcd9e8b7d3
-DIST KeePass-2.53-Source.zip 5201820 BLAKE2B a87918278915f1a54d8f6d6b8ef05d5a86f41a58887a1c80a8217112061fd40d59393012ae7b69d6c2110a7b0b36c57ecce4292a68e9161e99e1762b1622192e SHA512 8d35ec83ada7142e91be6a5889eabb98f1d8fe32140a3b904db76d64f42bed0ce1cc0378f38560b7f1307df545f00a398da599ef9fc44474e8c16722433d4e4e
-DIST KeePass-2.56-Source.zip 5231868 BLAKE2B d7ed0baf6db6a0398ce9bceb9a61088ef7cc14ba0c5b13a01123f9c7fca37e52bf352c438c3100ba32d59cfcfa90de790a07649684a971224bba6eb554cbed34 SHA512 cee9d8569e59a29044760dc94c4ab3ee6f1eb26aaa12d18a36d9e1b87e421291b49a3747fdb340a7af06494d65fe4d37579f16a577b0af2c053504b80e8a1c60
 DIST KeePass-2.57-Source.zip 5238885 BLAKE2B d7015eda056109aa0dc575a21a8ad720db4503a0cbf3124e6e0d0e0cf3d856a5a6509e605b3c1aafe984befa85646d716cdbe74fda936a967fd3da2778e7c455 SHA512 c553d2fa67d6c32b8122959bf222d6edadd79a9784802ac8f391ba0e89163172f431a24140d9dce775130d02374880e432c6958dfa19808f20f617e2f8067a30
-EBUILD keepass-2.49.ebuild 3193 BLAKE2B 9d52bdc9d9f51ffe75e537efa4a74fba79fa11844f3dc38305b8c88a3a640935da1d72d0c7a95ba7dd5a88fd3ecbbf150ef844ab94bbea3225b2b76a68637b10 SHA512 b40be9b2bff28197211a739fd79bd12e23a73eb5515247dc901410772e91006e1ee6442fca1b5e6559e9b73cc66396156b5ebdfc874c6acacb42dcf7ff29c4e2
-EBUILD keepass-2.53.ebuild 3193 BLAKE2B f170c2ca84b5ef87845070f8ee06588aec71acbd91a074ecb3d116d710ec4a0b8e0a3f1ae6470eb31301e9fbaabefbc6727e3201abfb539d56681a12ada16f92 SHA512 119ddbb9f19d48b3c045ff8a9d504e7f0bd64bec5919875307be678f18e5287fa5407576174ad0d2bf570be4fe94f2118531e7f7fe8dee8899f612ced66c3ecb
-EBUILD keepass-2.56.ebuild 3195 BLAKE2B 3f8d3015204ffe325fb6b6fecaa27c60950664a6246009d6be22d437462aa4614cb9ebc32a62c8fbe2d3d0e0639a6d2f3765fcdf2070d4b1270da941fa1a1645 SHA512 af328026cc82cb59784d1ae1505152e932a433ede41c874e21326d69a18000a25ef0f9e67410fcff002564047a595b3f42b4b038d7a275789a0d5ef5f0758248
-EBUILD keepass-2.57.ebuild 3195 BLAKE2B 3f8d3015204ffe325fb6b6fecaa27c60950664a6246009d6be22d437462aa4614cb9ebc32a62c8fbe2d3d0e0639a6d2f3765fcdf2070d4b1270da941fa1a1645 SHA512 af328026cc82cb59784d1ae1505152e932a433ede41c874e21326d69a18000a25ef0f9e67410fcff002564047a595b3f42b4b038d7a275789a0d5ef5f0758248
+EBUILD keepass-2.57.ebuild 3193 BLAKE2B f170c2ca84b5ef87845070f8ee06588aec71acbd91a074ecb3d116d710ec4a0b8e0a3f1ae6470eb31301e9fbaabefbc6727e3201abfb539d56681a12ada16f92 SHA512 119ddbb9f19d48b3c045ff8a9d504e7f0bd64bec5919875307be678f18e5287fa5407576174ad0d2bf570be4fe94f2118531e7f7fe8dee8899f612ced66c3ecb
 MISC metadata.xml 404 BLAKE2B fe98657d555dbc2a9fe393c6815bcf86fba0221d66c21cc61d739928a24346c23465429acfe6bbdb813ea3d16233d1522949c643b011183036b8ce9fe44aeebf SHA512 4fed5e6a3553de56af9c39ae60c51266a18aaf2d747a0521c83d4ff71f06ebfd2c8a1c0743e33eeb3dd277e8c628ce3b634f8ded9b735b9a3832bbd75d850ccc
diff --git a/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch b/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch
deleted file mode 100644
index c17b654d3f35..000000000000
--- a/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-KeePass looks for some resources (XSL files) in the executable directory,
-however under UNIX system this not a good idea, so we look into the
-CommonApplicationData SpecialFolder, which usually maps to "/usr/share/".
-So the final search path should be "/usr/share/KeePass/XSL/".
-
---- a/KeePass/forms/AboutForm.cs
-+++ b/KeePass/Forms/AboutForm.cs
-@@ -31,9 +31,11 @@
- using KeePass.Resources;
- using KeePass.UI;
- using KeePass.Util;
-+using KeePass.Native;
- 
- using KeePassLib;
- using KeePassLib.Utility;
-+using KeePassLib.Native;
- 
- namespace KeePass.Forms
- {
-@@ -98,8 +100,21 @@
- 			m_lvComponents.Items.Add(lvi);
- 
- 			lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
--			string strPath = WinUtil.GetExecutable();
--			strPath = UrlUtil.GetFileDirectory(strPath, true, false);
-+
-+			string strPath;
-+			if (NativeLib.IsUnix())
-+			{
-+				strPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
-+				strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
-+				strPath += PwDefs.ShortProductName.ToLower();
-+				strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
-+			}
-+			else
-+			{
-+				strPath = WinUtil.GetExecutable();
-+				strPath = UrlUtil.GetFileDirectory(strPath, true, false);
-+			}
-+
- 			strPath += AppDefs.XslFilesDir;
- 			strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
- 			bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlFull);
diff --git a/app-admin/keepass/keepass-2.49.ebuild b/app-admin/keepass/keepass-2.49.ebuild
deleted file mode 100644
index 218b7363d31b..000000000000
--- a/app-admin/keepass/keepass-2.49.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature wrapper xdg-utils
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="https://keepass.info/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-${PV}-Source.zip"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="aot"
-
-BDEPEND="app-arch/unzip"
-DEPEND="dev-lang/mono"
-RDEPEND="
-	${DEPEND}
-	dev-dotnet/libgdiplus[cairo]
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
-
-# bug #687052
-# file generated by mono --aot where *FLAGS don't make sense
-QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
-
-src_prepare() {
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
-	# This XSL file will not be upstreamed since the KeePass creator said that
-	# including this patch would break the Portable USB version of KeePass
-	# (which keeps/looks for xsl files in its own folder)
-	default
-
-	# Switch into build dir so the mono prepration script works correctly
-	pushd Build || die
-	source PrepMonoDev.sh || die
-	popd || die
-}
-
-src_compile() {
-	export MONO_REGISTRY_PATH=/dev/null # bug 659808
-
-	# bug 704358
-	export LANG=C LC_ALL=C
-
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto "/usr/share/${PN}/XSL"
-	doins Ext/XSL/*
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	exeinto "/usr/$(get_libdir)/${PN}"
-
-	doins Ext/KeePass.exe.config
-
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-
-	# sed, because patching this really sucks
-	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	optfeature "enables autotype/autofill" x11-misc/xdotool
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-admin/keepass/keepass-2.53.ebuild b/app-admin/keepass/keepass-2.53.ebuild
deleted file mode 100644
index d5f8f014254f..000000000000
--- a/app-admin/keepass/keepass-2.53.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature wrapper xdg-utils
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="https://keepass.info/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-${PV}-Source.zip"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="aot"
-
-BDEPEND="app-arch/unzip"
-DEPEND="dev-lang/mono"
-RDEPEND="
-	${DEPEND}
-	dev-dotnet/libgdiplus[cairo]
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.53-xsl-path-detection.patch" )
-
-# bug #687052
-# file generated by mono --aot where *FLAGS don't make sense
-QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
-
-src_prepare() {
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
-	# This XSL file will not be upstreamed since the KeePass creator said that
-	# including this patch would break the Portable USB version of KeePass
-	# (which keeps/looks for xsl files in its own folder)
-	default
-
-	# Switch into build dir so the mono prepration script works correctly
-	pushd Build || die
-	source PrepMonoDev.sh || die
-	popd || die
-}
-
-src_compile() {
-	export MONO_REGISTRY_PATH=/dev/null # bug 659808
-
-	# bug 704358
-	export LANG=C LC_ALL=C
-
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto "/usr/share/${PN}/XSL"
-	doins Ext/XSL/*
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	exeinto "/usr/$(get_libdir)/${PN}"
-
-	doins Ext/KeePass.exe.config
-
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-
-	# sed, because patching this really sucks
-	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	optfeature "enables autotype/autofill" x11-misc/xdotool
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-admin/keepass/keepass-2.56.ebuild b/app-admin/keepass/keepass-2.56.ebuild
deleted file mode 100644
index 6cde0c268a1d..000000000000
--- a/app-admin/keepass/keepass-2.56.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature wrapper xdg-utils
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="https://keepass.info/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_PN}-${PV}-Source.zip"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="aot"
-
-BDEPEND="app-arch/unzip"
-DEPEND="dev-lang/mono"
-RDEPEND="
-	${DEPEND}
-	dev-dotnet/libgdiplus[cairo]
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2.53-xsl-path-detection.patch" )
-
-# bug #687052
-# file generated by mono --aot where *FLAGS don't make sense
-QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
-
-src_prepare() {
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
-	# This XSL file will not be upstreamed since the KeePass creator said that
-	# including this patch would break the Portable USB version of KeePass
-	# (which keeps/looks for xsl files in its own folder)
-	default
-
-	# Switch into build dir so the mono prepration script works correctly
-	pushd Build || die
-	source PrepMonoDev.sh || die
-	popd || die
-}
-
-src_compile() {
-	export MONO_REGISTRY_PATH=/dev/null # bug 659808
-
-	# bug 704358
-	export LANG=C LC_ALL=C
-
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto "/usr/share/${PN}/XSL"
-	doins Ext/XSL/*
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	exeinto "/usr/$(get_libdir)/${PN}"
-
-	doins Ext/KeePass.exe.config
-
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-
-	# sed, because patching this really sucks
-	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	optfeature "enables autotype/autofill" x11-misc/xdotool
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-admin/keepass/keepass-2.57.ebuild b/app-admin/keepass/keepass-2.57.ebuild
index 6cde0c268a1d..d5f8f014254f 100644
--- a/app-admin/keepass/keepass-2.57.ebuild
+++ b/app-admin/keepass/keepass-2.57.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="aot"
 
 BDEPEND="app-arch/unzip"