diff options
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/Manifest.gz | bin | 32873 -> 32877 bytes | |||
-rw-r--r-- | app-admin/awscli/Manifest | 2 | ||||
-rw-r--r-- | app-admin/awscli/awscli-1.38.5.ebuild | 95 | ||||
-rw-r--r-- | app-admin/bitwarden-desktop-bin/Manifest | 6 | ||||
-rw-r--r-- | app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.12.0.ebuild | 89 | ||||
-rw-r--r-- | app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2025.2.0.ebuild (renamed from app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2025.1.1.ebuild) | 0 | ||||
-rw-r--r-- | app-admin/keepassxc/Manifest | 6 | ||||
-rw-r--r-- | app-admin/keepassxc/files/keepassxc-2.7.10-tests.patch | 26 | ||||
-rw-r--r-- | app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch | 13 | ||||
-rw-r--r-- | app-admin/keepassxc/keepassxc-2.7.10.ebuild | 115 | ||||
-rw-r--r-- | app-admin/keepassxc/keepassxc-9999.ebuild | 28 |
11 files changed, 259 insertions, 121 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex 3126bf0d0c3f..7e6e3af5491d 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest index ca2977ed878c..c5b98a9a4b8a 100644 --- a/app-admin/awscli/Manifest +++ b/app-admin/awscli/Manifest @@ -1,7 +1,9 @@ DIST aws-cli-1.37.21.gh.tar.gz 2907762 BLAKE2B e42e9aed28ef3cee1b83f2e57f90ce81a9894bc23a960fef487096ce8b8bab16d23121658aed0547070919ae78a0476176f9517d583a84be90bb016c7cdd9bf7 SHA512 3c7b347627b799d7a3edc7a8cae3d6110ec3cc5bfcdecc247876135faebc2235546a514afbdaf95fec50cfe787ca30b125cae7a8e7be84134d83493a0f869b1a DIST aws-cli-1.37.26.gh.tar.gz 2909650 BLAKE2B 77843b52fa77410c9568dcc402774352b839591264f16ce4b27c58f5b52fe159afe029756b702132c1b6e611f2e40d5a27f26d830928c2716ec285e58201ac16 SHA512 0396541bead54c81c9c9219403aa1d7dcf8f0a60b58d8ef33ff1900ae3d44cd362b4d0f2fdd93fee89a068bba1b5afefac44bcd8f5624368b2a02044acd070d9 DIST aws-cli-1.38.4.gh.tar.gz 2908307 BLAKE2B 1dbae7f032e920b950cedaa5223692c88262b32af1fbd7cd5459110e6d987182bb321a2e689d2ba0b74757faa3d5dc8602480fd735ac227de1cf1975414019a8 SHA512 5c255d7b9cd63c49255b53e66f0800d1c7e03a68c18dd11f23f13d3a60dc06ac868f334cf3b1b29ece0cf0f458862a568283729f320bd0095211fc9fac0e7024 +DIST aws-cli-1.38.5.gh.tar.gz 2908778 BLAKE2B 48d146b4e8d64763579e125f82696735de67ff7bff291619097055c17fb6c80ba3916754cfaacf34e05f70d06805b712e33d989719033200c085c00d917bfcda SHA512 59e3905570626dcdc8629039df9c3200d7cc7f1ac42bcc93c6a69fec661d4ad12016f74070e580db34b6325c28f89b7b13b22b48b35351c15f98c466540d31e6 EBUILD awscli-1.37.21.ebuild 3162 BLAKE2B 099b63681a7300c07c777d38f73edb68bb3d6421c65bf17e778a168441dcdd363e259fc399f7a83598e536bf27f534ccfdf960d1b356f180771b4774962df246 SHA512 662f08a57b1fe95a8fed4bd9c477b865526debd60be4d8164ef0a8fdeb7c4ef0cd71aef17b16717fbf189db283c13ddc13a3ee0c25f0541888f829b0449b134f EBUILD awscli-1.37.26.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb EBUILD awscli-1.38.4.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb +EBUILD awscli-1.38.5.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab diff --git a/app-admin/awscli/awscli-1.38.5.ebuild b/app-admin/awscli/awscli-1.38.5.ebuild new file mode 100644 index 000000000000..4a8e0ae852e0 --- /dev/null +++ b/app-admin/awscli/awscli-1.38.5.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) + +inherit bash-completion-r1 distutils-r1 + +MY_P=aws-cli-${PV} +DESCRIPTION="Universal Command Line Environment for AWS" +HOMEPAGE=" + https://github.com/aws/aws-cli/ + https://pypi.org/project/awscli/ +" +SRC_URI=" + https://github.com/aws/aws-cli/archive/${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + +# botocore is x.(y-1).z +BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)" +RDEPEND=" + >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/rsa[${PYTHON_USEDEP}] + >=dev-python/s3transfer-0.11.0[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + !app-admin/awscli-bin +" +BDEPEND=" + test? ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pytest-forked[${PYTHON_USEDEP}] + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +src_prepare() { + # do not rely on bundled deps in botocore (sic!) + find -name '*.py' -exec sed -i \ + -e 's:from botocore[.]vendored import:import:' \ + -e 's:from botocore[.]vendored[.]:from :' \ + {} + || die + # strip overzealous upper bounds on requirements + sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die + distutils-r1_src_prepare +} + +python_test() { + local serial_tests=( + tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success} + tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking + tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows + tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking + tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success + tests/unit/customizations/test_sessionmanager.py + tests/unit/test_compat.py::TestIgnoreUserSignals + tests/unit/test_help.py + tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored + ) + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + EPYTEST_XDIST= epytest "${serial_tests[@]}" + + local EPYTEST_DESELECT=( + "${serial_tests[@]}" + + # flaky (some ordering?) + tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32 + ) + # integration tests require AWS credentials and Internet access + epytest tests/{functional,unit} +} + +python_install_all() { + newbashcomp bin/aws_bash_completer aws + + insinto /usr/share/zsh/site-functions + newins bin/aws_zsh_completer.sh _aws + + distutils-r1_python_install_all + + rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die +} diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest index d8a065ecf656..4d70dbbbcc4a 100644 --- a/app-admin/bitwarden-desktop-bin/Manifest +++ b/app-admin/bitwarden-desktop-bin/Manifest @@ -1,7 +1,5 @@ -DIST Bitwarden-2024.12.0-amd64.deb 84480428 BLAKE2B 3cb771978fd2c0ded6bc79fee0beb23e187a0c2c69fe6213ea982929ffbc085155c147ff8729251f4a840bc871e33e5f7b07499d5a2cf4a16d1146e357a0d8f8 SHA512 649686f4cdd6269fabce9af8a1532ea343ac5cedf7a267818ea4ea173220d24d129019b31641bd98d61a3809a02562ce87b0738d842c53bdfa0374889ba69025 -DIST Bitwarden-2025.1.1-amd64.deb 84562628 BLAKE2B 2f51e747992ff8c86f3b90fcef004b26b93cd4ae4f8d290d39d48044d2ef38f64049379f86cdbe5793af3a1267da7f3cd740f3e00ec29a799fdd18b6cc57f0d2 SHA512 ae85d71b84535196988b2a60918b04e5db0e1512c5405729664251534a3c44c34a7bb81a24548436fe78b3197bae50487fd50cf290e8da2016388f8fb0b125cc DIST Bitwarden-2025.1.4-amd64.deb 84416978 BLAKE2B 4ded129bf6ca49142281968a3197f5e14955b783be6b7087c73e504564d267a71f5d7ecffd3902f003cbaa393396813861add7b253b8ad3b36945c65e2af24b6 SHA512 5f64aa8f36688705e7299d8d3399c80f6815a8e1133a39ec6e4b09ee908d78949e8d8a5ef09e38d6e824ae1d4356871ac3e0b997093186033ad604c1b63aca99 -EBUILD bitwarden-desktop-bin-2024.12.0.ebuild 1787 BLAKE2B f29cb51f98a68d540a4008be21f1f16b605f432206cb99a798d768e08709ca135778708d35b8dbb0ca0778d594ae87c84546b3bb866cb2a953bdc32ffb64b818 SHA512 525f677a03d1602656d937612567acc043b5bff49a80a44fa74f8b759962d2d744ca32377b8905489060fcff4bcac1d4206489b14c0b96c8a7a1f03579b06b16 -EBUILD bitwarden-desktop-bin-2025.1.1.ebuild 1787 BLAKE2B 978231d87de8dbae46d8af22dd4afda78b8fc08a5de4634c4b8a9de148d50cb42b0f2a3f734e4c8c264d0a8c00a8f436f52394840241a3fe29a66f520426a411 SHA512 7951b8cf0e16ae63db3e2ae64068a6de3de38145355496782c16be34d8200c30c2430b73e95d3cd62e4475b2c42b4978f94674f57366755dddbaf28e9dfddd77 +DIST Bitwarden-2025.2.0-amd64.deb 84472930 BLAKE2B 5a41bc9bf888ac5d9f78db2b2f56c168003456fbe72a18612a8937ee5a14532d2a6b652c3ed70ff24cc91b6351e7fe092d19e50bea9c2e906900741fe2ba1477 SHA512 b2075504cfcd0751e20f37b09d167dd86440fe4f97b207608761b16bdb57c4d0362bff47a52acaea5e36cba26267a34aba1236b53605b77894d376e5bab935f8 EBUILD bitwarden-desktop-bin-2025.1.4.ebuild 1787 BLAKE2B 978231d87de8dbae46d8af22dd4afda78b8fc08a5de4634c4b8a9de148d50cb42b0f2a3f734e4c8c264d0a8c00a8f436f52394840241a3fe29a66f520426a411 SHA512 7951b8cf0e16ae63db3e2ae64068a6de3de38145355496782c16be34d8200c30c2430b73e95d3cd62e4475b2c42b4978f94674f57366755dddbaf28e9dfddd77 +EBUILD bitwarden-desktop-bin-2025.2.0.ebuild 1787 BLAKE2B 978231d87de8dbae46d8af22dd4afda78b8fc08a5de4634c4b8a9de148d50cb42b0f2a3f734e4c8c264d0a8c00a8f436f52394840241a3fe29a66f520426a411 SHA512 7951b8cf0e16ae63db3e2ae64068a6de3de38145355496782c16be34d8200c30c2430b73e95d3cd62e4475b2c42b4978f94674f57366755dddbaf28e9dfddd77 MISC metadata.xml 323 BLAKE2B 3f1affe8fb7b242a0ea072faaebcccd37bf005ee68c7519857701c37fe6a11b0dffe1692af141b54218367ee8c8361cb0e6608621453d424d52b061b569563d1 SHA512 95ab28dcb844ac6d2ba4573699e86a4c303aa46b4c2eddf1273ecf37a3bbb751b9a478b535fbdcbc12424bc4f826b4b0781cfb8079e5563ed41f12ce68b35908 diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.12.0.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.12.0.ebuild deleted file mode 100644 index 7e5d69ae8c09..000000000000 --- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.12.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop unpacker xdg-utils - -DESCRIPTION="Bitwarden password manager desktop client" -HOMEPAGE="https://bitwarden.com/" -SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb" -S="${WORKDIR}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - >=app-accessibility/at-spi2-core-2.46.0:2 - app-crypt/libsecret - dev-libs/expat - dev-libs/glib - dev-libs/nspr - dev-libs/nss - dev-libs/wayland - media-libs/alsa-lib - media-libs/mesa - net-print/cups - sys-apps/dbus - sys-apps/util-linux - sys-libs/glibc - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libdrm - 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/libxkbcommon - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libxshmfence - x11-libs/libXtst - x11-libs/pango -" -IDEPEND=" - dev-util/desktop-file-utils - dev-util/gtk-update-icon-cache -" - -QA_PREBUILT=" - opt/Bitwarden/*.so* - opt/Bitwarden/bitwarden - opt/Bitwarden/bitwarden-app - opt/Bitwarden/chrome-sandbox - opt/Bitwarden/chrome_crashpad_handler -" - -src_install() { - insinto /opt - doins -r opt/Bitwarden - fperms 755 /opt/Bitwarden/bitwarden \ - /opt/Bitwarden/bitwarden-app - fperms 4755 /opt/Bitwarden/chrome-sandbox - - domenu usr/share/applications/bitwarden.desktop - - local x - for x in 16 32 64 128 256 512; do - doicon -s ${x} usr/share/icons/hicolor/${x}*/* - done - - dosym -r "/opt/Bitwarden/bitwarden" "usr/bin/${PN}" -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2025.1.1.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2025.2.0.ebuild index 574698433c27..574698433c27 100644 --- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2025.1.1.ebuild +++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2025.2.0.ebuild diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index fab0ab984579..eb0582930053 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,6 +1,8 @@ -AUX keepassxc-2.7.4-tests.patch 402 BLAKE2B d1d88059d70e8c43f51bdd94ba17222a919059efadc68712e4f6b8e72885f3088ed96793c8ad26f53000e76414b13b9ebcd52ea447b17e7822ce7d3245f30414 SHA512 e401e341c34a117395cb5852f561770a1f65904e6f649cdd2904a89f7b068c53f46e8509d2e4cafc3c213e2326a01838f719d360fde21d63f29962969f3d16ef +AUX keepassxc-2.7.10-tests.patch 1215 BLAKE2B f7c478b25ed3b74eacc6f6a06ccd97d484f5115d6cab22c96f5b1ef0754290bc91a76eb664978e6941631680d125f5a887e0bd6e20cca9bef086575489ed134c SHA512 5b32ce1564afa4ee80e759908bd25743931edd8fafad9dfa9ea6091dc9afe8ab15244f9c5dcd757b04f6d75153b91f4daf5fd1a5116acbb5614b5fdfcd8b1b65 AUX keepassxc-2.7.9-tests.patch 473 BLAKE2B 3d260ca4dcd7b5dd67e3c98bc30b5dd0e2b87e9dc508f3b24f418f1a20e9aa45e5c4da375b737833dc88a33c1bc5a2512eb636a5ffd9fbb686360364ac9f346b SHA512 e321d866ecc632756af85324b2e5b9a58db6442c8361c2ce210d223de8a6435eb4233a967314109f3fa0416883ef5fe34827320881a448ddbf0204cbd5111123 +DIST keepassxc-2.7.10.gh.tar.gz 12367110 BLAKE2B 13016a01006cb7c7689e2b1c65a3d245c31cc445def80d8858f6c0f29ce23f0129dadaf5f31bdbdf99d9fbed51e69bc80fbb5f4ba414bb45bfc35512f3d27e3a SHA512 265edbafdfd2951219fac8f28fe72672be798dbd93242d6b6d528a017adfed2f16f98ad753b6cdff0eca3f4d7158c9de87aa626ff7e66d3bac470595e248e271 DIST keepassxc-2.7.9-src.tar.xz 9789312 BLAKE2B d9be3e577ae918160662558bb8bd724b5ca5982cb1bba5cda47f0dff042ea9a5c7393dd76ad195a7ba6c9b9e8371c4416840e4ff89e07c610d7351859586acfa SHA512 255102d3b3723a80cdd5f14cde2130b37807db226b48e985bcc2ab537b482e3fb23afde331e15ed02727e98b526d894aa4567f2e82039a2ad9d33a6ad9ea08a4 +EBUILD keepassxc-2.7.10.ebuild 2505 BLAKE2B b022e26361fd6d6a1b26814a691a7f1bf59ca6a489bfba5fb30ccfd44f03e59293ebfd3f9ffbf6cc0ae77c22954c5d5984b357ae231f4c067c0a449b8c40eadc SHA512 04c248e4ecac601d722a4f30a12557b1258c320592cc534d085a96ce4c6b25d4d1ff14af355db726440598e28eefc3d2881c33b50d993f3586035e91ba57e982 EBUILD keepassxc-2.7.9.ebuild 2510 BLAKE2B e4f981ad36c22a1bf434374b15d7c8cef5f75c7f2e7894d8ef008d1af885f5a7dbfee016ef9266c4fa6489a7ada54bead0cced1a4c8ce40a0f86116bd6383cf5 SHA512 3552e7e57a509d0b562b502f64aef6aa9733d924fbbb042a6e3cba1cf31d2f020d077241facb0c19ce873aaf3b88789ee775a7eb7b9b6c4186846620039c38ef -EBUILD keepassxc-9999.ebuild 2512 BLAKE2B 82e8492bdbdfae5d73a771180151595b24898306cb8b8f1f3b7c5e7736c70bfdc60cf52c185400c353f4112c62d05d5615accb633a55d8a1a47931158a3c3eb5 SHA512 2bad948b3fb58cfa863fd3c15a06a29f607beb9e701c323322548940a262fad9019d6132ffa2db0de3a842d605c720f7d56b8911de7da1cb065d4f8440e1e5cc +EBUILD keepassxc-9999.ebuild 2505 BLAKE2B b022e26361fd6d6a1b26814a691a7f1bf59ca6a489bfba5fb30ccfd44f03e59293ebfd3f9ffbf6cc0ae77c22954c5d5984b357ae231f4c067c0a449b8c40eadc SHA512 04c248e4ecac601d722a4f30a12557b1258c320592cc534d085a96ce4c6b25d4d1ff14af355db726440598e28eefc3d2881c33b50d993f3586035e91ba57e982 MISC metadata.xml 1115 BLAKE2B c174ef9aa298d9dd22e2ed7577659f54829d6901e6a2804e93372e01306afaafc3fe9eafcc174a8a9051aa922226d6c0e73a527f88f8b37aa87211f210790c4a SHA512 1eabe79fc126352adf9d6fe54260fb4b841abf1aff16f6a19a187030d6afb1ce94b0a18706b6feb60b34f6ce21ab201a3ae92c8a172dff3027684b9a7bc9aa8b diff --git a/app-admin/keepassxc/files/keepassxc-2.7.10-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.10-tests.patch new file mode 100644 index 000000000000..b602024b5193 --- /dev/null +++ b/app-admin/keepassxc/files/keepassxc-2.7.10-tests.patch @@ -0,0 +1,26 @@ +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -116,8 +116,8 @@ add_unit_test(NAME testkeys SOURCES TestKeys.cpp mock/MockChallengeResponseKey.c + add_unit_test(NAME testgroupmodel SOURCES TestGroupModel.cpp + LIBS testsupport ${TEST_LIBRARIES}) + +-add_unit_test(NAME testentrymodel SOURCES TestEntryModel.cpp +- LIBS testsupport ${TEST_LIBRARIES}) ++# add_unit_test(NAME testentrymodel SOURCES TestEntryModel.cpp ++# LIBS testsupport ${TEST_LIBRARIES}) + + add_unit_test(NAME testcryptohash SOURCES TestCryptoHash.cpp + LIBS ${TEST_LIBRARIES}) +@@ -246,9 +246,9 @@ if(WITH_XC_NETWORKING OR WITH_XC_BROWSER) + add_unit_test(NAME testurltools SOURCES TestUrlTools.cpp LIBS ${TEST_LIBRARIES}) + endif() + +-add_unit_test(NAME testcli SOURCES TestCli.cpp +- LIBS testsupport cli ${ZXCVBN_LIBRARIES} ${TEST_LIBRARIES}) +-target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>") ++# add_unit_test(NAME testcli SOURCES TestCli.cpp ++# LIBS testsupport cli ${ZXCVBN_LIBRARIES} ${TEST_LIBRARIES}) ++# target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>") + + if(WITH_GUI_TESTS) + add_subdirectory(gui) diff --git a/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch deleted file mode 100644 index ccee26cb5ba9..000000000000 --- a/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -231,10 +231,6 @@ if(WITH_XC_BROWSER) - LIBS ${TEST_LIBRARIES}) - endif() - --add_unit_test(NAME testcli SOURCES TestCli.cpp -- LIBS testsupport cli ${TEST_LIBRARIES}) --target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>") -- - if(WITH_GUI_TESTS) - add_subdirectory(gui) - endif(WITH_GUI_TESTS) diff --git a/app-admin/keepassxc/keepassxc-2.7.10.ebuild b/app-admin/keepassxc/keepassxc-2.7.10.ebuild new file mode 100644 index 000000000000..40ff4a658bf1 --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.7.10.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic xdg + +DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" +HOMEPAGE="https://keepassxc.org/ + https://github.com/keepassxreboot/keepassxc/" + +if [[ "${PV}" = *9999* ]] ; then + inherit git-r3 + + EGIT_BRANCH="develop" + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" +else + if [[ "${PV}" == *_beta* ]] ; then + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz + -> ${P}.gh.tar.gz" + S="${WORKDIR}/${P/_/-}" + else + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz" + fi + + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +fi + +LICENSE="LGPL-2.1 GPL-2 GPL-3" +SLOT="0" +IUSE="X autotype browser doc keeshare +keyring +network +ssh-agent test yubikey" + +RESTRICT="!test? ( test )" +REQUIRED_USE="autotype? ( X )" + +RDEPEND=" + app-crypt/argon2:= + dev-libs/botan:3= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-gfx/qrencode:= + sys-libs/readline:0= + sys-libs/zlib:=[minizip] + X? ( + dev-qt/qtx11extras:5 + ) + autotype? ( + x11-libs/libX11 + x11-libs/libXtst + ) + yubikey? ( + dev-libs/libusb:1 + sys-apps/pcsc-lite + ) +" +DEPEND=" + ${RDEPEND} + dev-qt/qttest:5 +" +BDEPEND=" + dev-qt/linguist-tools:5 + doc? ( + dev-ruby/asciidoctor + ) +" + +PATCHES=( "${FILESDIR}/${PN}-2.7.10-tests.patch" ) + +src_prepare() { + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] ; then + printf '%s' "${PV}" > .version || die + fi + + cmake_src_prepare +} + +src_configure() { + # https://github.com/keepassxreboot/keepassxc/issues/5801 + filter-lto + + local -a mycmakeargs=( + # Gentoo users enable ccache via e.g. FEATURES=ccache or + # other means. We don't want the build system to enable it for us. + -DWITH_CCACHE="OFF" + -DWITH_GUI_TESTS="OFF" + -DWITH_XC_BOTAN3="ON" + -DWITH_XC_UPDATECHECK="OFF" + + -DWITH_TESTS="$(usex test)" + -DWITH_XC_AUTOTYPE="$(usex autotype)" + -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_BROWSER_PASSKEYS="$(usex browser)" + -DWITH_XC_DOCS="$(usex doc)" + -DWITH_XC_FDOSECRETS="$(usex keyring)" + -DWITH_XC_KEESHARE="$(usex keeshare)" + -DWITH_XC_NETWORKING="$(usex network)" + -DWITH_XC_SSHAGENT="$(usex ssh-agent)" + -DWITH_XC_X11="$(usex X)" + -DWITH_XC_YUBIKEY="$(usex yubikey)" + ) + + if [[ "${PV}" == *_beta* ]] ; then + mycmakeargs+=( + -DOVERRIDE_VERSION="${PV/_/-}" + ) + fi + + cmake_src_configure +} diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 59e7e3954042..40ff4a658bf1 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,10 +17,11 @@ if [[ "${PV}" = *9999* ]] ; then else if [[ "${PV}" == *_beta* ]] ; then SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz - -> ${P}.tar.gz" + -> ${P}.gh.tar.gz" S="${WORKDIR}/${P/_/-}" else - SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz" fi KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" @@ -69,12 +70,10 @@ BDEPEND=" ) " -PATCHES=( - "${FILESDIR}/${PN}-2.7.4-tests.patch" -) +PATCHES=( "${FILESDIR}/${PN}-2.7.10-tests.patch" ) src_prepare() { - if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] ; then printf '%s' "${PV}" > .version || die fi @@ -88,26 +87,29 @@ src_configure() { local -a mycmakeargs=( # Gentoo users enable ccache via e.g. FEATURES=ccache or # other means. We don't want the build system to enable it for us. - -DWITH_CCACHE=OFF - -DWITH_GUI_TESTS=OFF + -DWITH_CCACHE="OFF" + -DWITH_GUI_TESTS="OFF" + -DWITH_XC_BOTAN3="ON" + -DWITH_XC_UPDATECHECK="OFF" + -DWITH_TESTS="$(usex test)" -DWITH_XC_AUTOTYPE="$(usex autotype)" - -DWITH_XC_DOCS="$(usex doc)" -DWITH_XC_BROWSER="$(usex browser)" -DWITH_XC_BROWSER_PASSKEYS="$(usex browser)" - -DWITH_XC_BOTAN3=ON + -DWITH_XC_DOCS="$(usex doc)" -DWITH_XC_FDOSECRETS="$(usex keyring)" -DWITH_XC_KEESHARE="$(usex keeshare)" -DWITH_XC_NETWORKING="$(usex network)" -DWITH_XC_SSHAGENT="$(usex ssh-agent)" - -DWITH_XC_UPDATECHECK=OFF - -DWITH_XC_YUBIKEY="$(usex yubikey)" -DWITH_XC_X11="$(usex X)" + -DWITH_XC_YUBIKEY="$(usex yubikey)" ) + if [[ "${PV}" == *_beta* ]] ; then mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) fi + cmake_src_configure } |