From 8b4349b75818953123e2d4b80963181a9640c8e3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 11 Mar 2024 12:45:52 +0000 Subject: gentoo auto-resync : 11:03:2024 - 12:45:51 --- app-admin/keepassxc/Manifest | 4 +- app-admin/keepassxc/keepassxc-2.7.7-r1.ebuild | 109 +++++++++++++++++++++++++ app-admin/keepassxc/keepassxc-2.7.7.ebuild | 111 -------------------------- app-admin/keepassxc/keepassxc-9999.ebuild | 20 +++-- 4 files changed, 124 insertions(+), 120 deletions(-) create mode 100644 app-admin/keepassxc/keepassxc-2.7.7-r1.ebuild delete mode 100644 app-admin/keepassxc/keepassxc-2.7.7.ebuild (limited to 'app-admin/keepassxc') diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index ed28274caca9..6d17006ae802 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -2,6 +2,6 @@ AUX keepassxc-2.7.4-tests.patch 402 BLAKE2B d1d88059d70e8c43f51bdd94ba17222a9190 DIST keepassxc-2.7.6-src.tar.xz 8474624 BLAKE2B 2ecdd387a7bc70aeeaef6eeabdfeed6aaf1d779056580375c011aa71d62459d38258617a4cb46fc3b215a2b6e1e3326cc8c62b228bee0be674923399421b0cbe SHA512 58bdf731e1ce15e4a9db5aae27b7740372c4b28e2998b9acf2d1be6ee5b4eead37149ddd3de039d1cb70d34f11b09f43969d36ce4241b3fe3af4adf53d8ba812 DIST keepassxc-2.7.7-src.tar.xz 9734460 BLAKE2B d94c42334bbfde46f14f4b14612f4297c500da76ba8a82de26c4a450ee1cacb9a15517a84ef445441651dc33a71f9ca7bca63bb04d0a4e8eeb0380eded6e5477 SHA512 fd82e377bf6e57623c65f2bdd463ea59c6465fbe009552e1030ce0fe9d9177fc448b7b36a90a0da9ed2a2ed161c017d13cef618ae785f89110c038e1d9396926 EBUILD keepassxc-2.7.6.ebuild 2445 BLAKE2B f9c77b86135647269ba4e811fb9c1bc8099c569bd7aa4fcef000646844bc8e16e07849448d1a7b40b2e1210018c6aac10ebca862eca8607cea290e7dfb69938d SHA512 d463f50715d1c40b3422ca15e3ec7a5b6865caf332a6c4b5f28af3f6e96625cd32d35c7055e275a5b7a8c14cfc8d77dffda75e2f738368a9525e9b461487a896 -EBUILD keepassxc-2.7.7.ebuild 2462 BLAKE2B 7f9590f50771dd46b60721ebcea175a451ccf5be227a0a1c4b1a9da554ef61d6fa8742005228c9d21c9d4852f8a72e6a7c608305794a563fe38378f6c19257c7 SHA512 6250941b81149be32ecf4db1134d5c73c122e7d52fbe5d84af14155911af838d7fcbf719bb1140621b1909e8b79fefb6734cb9fd8404ecac9f1bde017b793725 -EBUILD keepassxc-9999.ebuild 2396 BLAKE2B 0523cac18e769bb4d772a52340d4d118b8e349648f69a81de30ad3d8d76697349a1df025d0459811aa12057177efe69587265c940b6cb128756953826f9f4d5b SHA512 54435013e756bddb3fa39ba368af0b9961e2089f6801872db103d2078ba256304f30a57a52885c8c23329566140b47f6021ee97b52a096d8e50da4ab276c39c9 +EBUILD keepassxc-2.7.7-r1.ebuild 2430 BLAKE2B a40bffd5a094153918ac2921ae118a0310cd8e403fd512b674f3e40a3a126c58ecf17ba767137abf1d0501219ea14f59aa2afb997fb77930aefb81367552fb83 SHA512 cede4d9f5b438615368f7b0d9ad70f1fdf83c5d0314b8afcfef6e19e7fc001b0b84a7523947db18cb505f5c8a03397392891d0c22bbe298794df97f493985bbb +EBUILD keepassxc-9999.ebuild 2378 BLAKE2B e55dea5e89824e32b3413a17e10db58f1efc5ad98069f0843f32223f1d8201f5f597f02b2b9fa0f60d23daed0bb32ef48b3782ce1f313d212548927ec325fe09 SHA512 0f697b681b485b4db0f12ccf304c63fef3eaf97abab1ae64d7a8404c717b60f367587e0325de316560d38b2c8832847a7569d0aee265c88d76dfccafe556fd19 MISC metadata.xml 1077 BLAKE2B 410793b2f278ccbddceb10a72e4a010f4b2d6fc81bd8a472b867e1230d43a0e6f461ff6459095d334536d462e2297c4978dbb247e3a5ccb82c36fd70c6f44b51 SHA512 d338787a7ea319d752c19314ee53ee1306293ae2dddeedd22bd010e990a1680fdd1b96c5173c653b4dbbe336d713a07f9fc1a771951fca8636b3973361787f20 diff --git a/app-admin/keepassxc/keepassxc-2.7.7-r1.ebuild b/app-admin/keepassxc/keepassxc-2.7.7-r1.ebuild new file mode 100644 index 000000000000..843ec9b56c6f --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.7.7-r1.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2024 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 + if [[ "${PV}" == *_beta* ]] ; then + SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P/_/-}" + else + SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" + + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + fi +else + inherit git-r3 + + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" + [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" +fi + +LICENSE="LGPL-2.1 GPL-2 GPL-3" +SLOT="0" +IUSE="X autotype browser doc keeshare +network 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.4-tests.patch" +) + +src_prepare() { + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; 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_TESTS="$(usex test)" + -DWITH_XC_AUTOTYPE="$(usex autotype)" + -DWITH_XC_DOCS="$(usex doc)" + -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_BOTAN3=ON + -DWITH_XC_FDOSECRETS=ON + -DWITH_XC_KEESHARE="$(usex keeshare)" + -DWITH_XC_NETWORKING="$(usex network)" + -DWITH_XC_SSHAGENT=ON + -DWITH_XC_UPDATECHECK=OFF + -DWITH_XC_YUBIKEY="$(usex yubikey)" + -DWITH_XC_X11="$(usex X)" + ) + if [[ "${PV}" == *_beta* ]] ; then + mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) + fi + cmake_src_configure +} diff --git a/app-admin/keepassxc/keepassxc-2.7.7.ebuild b/app-admin/keepassxc/keepassxc-2.7.7.ebuild deleted file mode 100644 index 6d0f3d1266b4..000000000000 --- a/app-admin/keepassxc/keepassxc-2.7.7.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2024 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 - if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P/_/-}" - else - SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" - - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" - fi -else - inherit git-r3 - - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" - [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" -fi - -LICENSE="LGPL-2.1 GPL-2 GPL-3" -SLOT="0" -IUSE="X autotype browser doc keeshare +network 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:= - X? ( - dev-qt/qtx11extras:5 - ) - autotype? ( - x11-libs/libX11 - x11-libs/libXtst - ) - keeshare? ( - sys-libs/zlib:=[minizip] - ) - 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.4-tests.patch" -) - -src_prepare() { - if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; 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_TESTS="$(usex test)" - -DWITH_XC_AUTOTYPE="$(usex autotype)" - -DWITH_XC_DOCS="$(usex doc)" - -DWITH_XC_BROWSER="$(usex browser)" - -DWITH_XC_BOTAN3=ON - -DWITH_XC_FDOSECRETS=ON - -DWITH_XC_KEESHARE="$(usex keeshare)" - -DWITH_XC_NETWORKING="$(usex network)" - -DWITH_XC_SSHAGENT=ON - -DWITH_XC_UPDATECHECK=OFF - -DWITH_XC_YUBIKEY="$(usex yubikey)" - -DWITH_XC_X11="$(usex X)" - ) - 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 186c07c60416..4b24b9ee85b7 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,10 +15,12 @@ if [[ "${PV}" != *9999 ]] ; then S="${WORKDIR}/${P/_/-}" else SRC_URI="https://github.com/keepassxreboot/${PN}/releases/download/${PV}/${P}-src.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi else inherit git-r3 + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" [[ "${PV}" != 9999 ]] && EGIT_BRANCH="master" fi @@ -42,24 +44,28 @@ RDEPEND=" dev-qt/qtwidgets:5 media-gfx/qrencode:= sys-libs/readline:0= - sys-libs/zlib:= - X? ( dev-qt/qtx11extras:5 ) + sys-libs/zlib:=[minizip] + X? ( + dev-qt/qtx11extras:5 + ) autotype? ( x11-libs/libX11 x11-libs/libXtst ) - keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite ) " -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} dev-qt/qttest:5 " BDEPEND=" dev-qt/linguist-tools:5 - doc? ( dev-ruby/asciidoctor ) + doc? ( + dev-ruby/asciidoctor + ) " src_prepare() { @@ -74,7 +80,7 @@ src_configure() { # https://github.com/keepassxreboot/keepassxc/issues/5801 filter-lto - local mycmakeargs=( + 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 -- cgit v1.2.3