From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 18D8C158083 for ; Mon, 2 Sep 2024 12:11:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E2DFE2A75; Mon, 2 Sep 2024 12:11:17 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 17E5CE2A75 for ; Mon, 2 Sep 2024 12:11:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA438343010 for ; Mon, 2 Sep 2024 12:11:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B8801671 for ; Mon, 2 Sep 2024 12:11:14 +0000 (UTC) From: "Petr Vaněk" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petr Vaněk" Message-ID: <1725278913.2bebd95d0421c9e351075775e32f4d7b24bdb201.arkamar@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/keepass/files/, app-admin/keepass/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/keepass/Manifest app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch app-admin/keepass/keepass-2.49.ebuild app-admin/keepass/keepass-2.53.ebuild app-admin/keepass/keepass-2.56.ebuild X-VCS-Directories: app-admin/keepass/ app-admin/keepass/files/ X-VCS-Committer: arkamar X-VCS-Committer-Name: Petr Vaněk X-VCS-Revision: 2bebd95d0421c9e351075775e32f4d7b24bdb201 X-VCS-Branch: master Date: Mon, 2 Sep 2024 12:11:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 02526be2-67f7-4233-bcbf-2c2873921a2f X-Archives-Hash: 767bd3c5d471e789a33208c3e4331056 commit: 2bebd95d0421c9e351075775e32f4d7b24bdb201 Author: Petr Vaněk gentoo org> AuthorDate: Mon Sep 2 12:08:17 2024 +0000 Commit: Petr Vaněk gentoo org> CommitDate: Mon Sep 2 12:08:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bebd95d app-admin/keepass: drop 2.49, 2.53, 2.56 Bug: https://bugs.gentoo.org/835074 Bug: https://bugs.gentoo.org/908040 Signed-off-by: Petr Vaněk gentoo.org> app-admin/keepass/Manifest | 3 - .../files/keepass-2.36-xsl-path-detection.patch | 43 -------- app-admin/keepass/keepass-2.49.ebuild | 116 --------------------- app-admin/keepass/keepass-2.53.ebuild | 116 --------------------- app-admin/keepass/keepass-2.56.ebuild | 116 --------------------- 5 files changed, 394 deletions(-) diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest index ed8e18a27c30..1fc275a8970b 100644 --- a/app-admin/keepass/Manifest +++ b/app-admin/keepass/Manifest @@ -1,4 +1 @@ -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 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 -}