From 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Mar 2018 15:59:12 +0000 Subject: gentoo resync : 02.03.2018 --- app-admin/keepassxc/Manifest | 6 +-- app-admin/keepassxc/keepassxc-2.2.2.ebuild | 77 ---------------------------- app-admin/keepassxc/keepassxc-2.3.0.ebuild | 80 ++++++++++++++++++++++++++++++ app-admin/keepassxc/keepassxc-9999.ebuild | 14 +++--- 4 files changed, 90 insertions(+), 87 deletions(-) delete mode 100644 app-admin/keepassxc/keepassxc-2.2.2.ebuild create mode 100644 app-admin/keepassxc/keepassxc-2.3.0.ebuild (limited to 'app-admin/keepassxc') diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index f7760b6be626..a28e792ab612 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,8 +1,8 @@ DIST keepassxc-2.1.4.tar.gz 3345520 BLAKE2B d599321a412abc05ad0a911b8fe4d14e840d491e59d3f33172a5e6b10812fe8e00d03f23abcc9637be1b8c16b5c7ec640bbc2af63059dc0dd25c99f0bdacfce9 SHA512 48030eb6df595c73644f43d6222654c5f76962ae5aa2f44ca4dc9c8e45726380c6be4300af7a8279b07c06b70912da444f2b17c5b6c37a91cb239d695e7518d8 -DIST keepassxc-2.2.2.tar.gz 3885990 BLAKE2B 2eb70217a4b73daac3f8eaf797c2c5c5dc6b2d8b7a76a91f45a036da034335937f3f21e48590d8493dcaa4f6079897440338650f14e75fa1884585d36d946bb4 SHA512 73a167a79af56d4b6dbef7ce4050ca599f2c107a5c8af3b9e28241504572988b2d8b258135b7a34dfceae5a18cbda26b97ed513bbde14fe3d38e3f41b882d34b DIST keepassxc-2.2.4.tar.gz 3895421 BLAKE2B 0de35f394dae8cf8d70f75d73783965826cc03ac9f0921afa547d02e61cb04be167891d92aa0db09f007c47e96a5a7e5793772c50de14bf65a7f80a603ca6611 SHA512 f3308138d63b65a8b384a52f4723507be921d7bbf19031724886fcd12266bf2683326f5531c8f665b0e98ff63cd97251694199ef748191e59a5a8cceb3710025 +DIST keepassxc-2.3.0-src.tar.xz 3803400 BLAKE2B 1e9d72bb71e3db0f7f4662bca22affe68c0ac857ce3b7b67924949622edf3a4d2f54717c1c629d79c2cfeccd29d0f1906a8f43e49483980d11afbb654a132f4f SHA512 44721a4dd9364898c69a10d73ceb3fce9b8e83bbe261d9bc656897bc01f37e9b65b923867e18d3c3269773075ad846a0e1195d8b7bf574fcbce7bef9a5778888 EBUILD keepassxc-2.1.4-r1.ebuild 1540 BLAKE2B f16a6d6a45eca3926735ce4857c8007c421594e1e41a1d87feb75ce6234b92760a9221cd81734f5a8e1a55fef4f36f6faa0acba0b786dfd7c81d9f3f2c9f280c SHA512 7dcda961fda3b3166b2e38a878e2b2782e604c3373b67c358347746fccfa781082ce1c3417aeb8c1b76b8fc5ae94b38bff1442fc2477267b4a5096afdf1803ea -EBUILD keepassxc-2.2.2.ebuild 1544 BLAKE2B b0e6a6a0b5efeee5ca105a7ee9b8bbe674a9c1f0fc7a17a090c07a9287aba00c3c36f7bf8e41fb820d4056a92259151ba047ffa555a10df9639445f6d3083c84 SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8 EBUILD keepassxc-2.2.4.ebuild 1544 BLAKE2B b0e6a6a0b5efeee5ca105a7ee9b8bbe674a9c1f0fc7a17a090c07a9287aba00c3c36f7bf8e41fb820d4056a92259151ba047ffa555a10df9639445f6d3083c84 SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8 -EBUILD keepassxc-9999.ebuild 1659 BLAKE2B 40546fd9968d261d57030c80b997ed2088cee96a773eb53e11b4b35fadcb3ed8786ea0e4c9f27aba90be2109c0c00e0ea3326de78e214a15c957bff2e99284c4 SHA512 c46e86fb182d9218f0b22496a1875f4fa48f3a916556f6e039145be238f2e6c225542cc24170b6618d876e5c31f887afcb12ced36cfbab282743ff064cbdfe38 +EBUILD keepassxc-2.3.0.ebuild 1735 BLAKE2B d563e0a1470e6d2192e1a6741e63ead96638f29093eefd2e2ab15bd06904f17f8a1fd3a4f408180598a3727c10afef31054f7f294de4a18d5121f560482c1385 SHA512 8f29bbe8395d7ead800eea057d515ead2126eeea45e198b4d9d4ed21f4e0b1d3e920a7102cd7c8e05471e4c9511df35316da2cac29af922729a01e4f8b41f519 +EBUILD keepassxc-9999.ebuild 1735 BLAKE2B d563e0a1470e6d2192e1a6741e63ead96638f29093eefd2e2ab15bd06904f17f8a1fd3a4f408180598a3727c10afef31054f7f294de4a18d5121f560482c1385 SHA512 8f29bbe8395d7ead800eea057d515ead2126eeea45e198b4d9d4ed21f4e0b1d3e920a7102cd7c8e05471e4c9511df35316da2cac29af922729a01e4f8b41f519 MISC metadata.xml 937 BLAKE2B 21a284b7ee94184c22cdb740d9a24f8371cfb6f62d97361cb3a2f853409b3044e8ddad30f58f4f8ad27277739533972d22c7009808c7ae9e6a1c4b8e02003d7b SHA512 bd2e47e2ba3911323f0b5bee78e9e394edef7722e934c70a1e7d3509044d566b2e6d46fd77bde2c303d0c97a8ce4f756e0b32b476af253274a3a941b059da3f9 diff --git a/app-admin/keepassxc/keepassxc-2.2.2.ebuild b/app-admin/keepassxc/keepassxc-2.2.2.ebuild deleted file mode 100644 index 15016b6c462e..000000000000 --- a/app-admin/keepassxc/keepassxc-2.2.2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -SCM="" -[[ "${PV}" == 9999 ]] && SCM="git-r3" -inherit cmake-utils gnome2-utils xdg-utils ${SCM} -unset SCM - -DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://keepassxc.org" - -if [[ "${PV}" != 9999 ]] ; then - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -else - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" -fi - -LICENSE="LGPL-2.1 GPL-2 GPL-3" -SLOT="0" -IUSE="autotype debug http test yubikey" - -RDEPEND=" - dev-libs/libgcrypt:= - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - sys-libs/zlib - autotype? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXtst - ) - yubikey? ( sys-auth/ykpers ) -" - -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qtconcurrent:5 - test? ( dev-qt/qttest:5 ) -" - -src_prepare() { - use test || \ - sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_GUI_TESTS=OFF - -DWITH_TESTS="$(usex test)" - -DWITH_XC_AUTOTYPE="$(usex autotype)" - -DWITH_XC_HTTP="$(usex http)" - -DWITH_XC_YUBIKEY="$(usex yubikey)" - ) - cmake-utils_src_configure -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-admin/keepassxc/keepassxc-2.3.0.ebuild b/app-admin/keepassxc/keepassxc-2.3.0.ebuild new file mode 100644 index 000000000000..6207e109fd62 --- /dev/null +++ b/app-admin/keepassxc/keepassxc-2.3.0.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils gnome2-utils xdg-utils + +DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" +HOMEPAGE="https://keepassxc.org" + +if [[ "${PV}" != 9999 ]] ; then + #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" + KEYWORDS="~amd64 ~x86" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" +fi + +LICENSE="LGPL-2.1 GPL-2 GPL-3" +SLOT="0" +IUSE="autotype browser debug network test yubikey" + +RDEPEND=" + app-crypt/argon2:= + dev-libs/libgcrypt:= + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + sys-libs/zlib + autotype? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXtst + ) + browser? ( >=dev-libs/libsodium-1.0.12 ) + yubikey? ( sys-auth/ykpers ) +" + +DEPEND=" + ${RDEPEND} + dev-qt/linguist-tools:5 + dev-qt/qtconcurrent:5 + test? ( dev-qt/qttest:5 ) +" + +src_prepare() { + use test || \ + sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWITH_GUI_TESTS=OFF + -DWITH_TESTS="$(usex test)" + -DWITH_XC_AUTOTYPE="$(usex autotype)" + -DWITH_XC_HTTP=OFF + -DWITH_XC_NETWORKING="$(usex network)" + -DWITH_XC_BROWSER="$(usex browser)" + -DWITH_XC_YUBIKEY="$(usex yubikey)" + ) + cmake-utils_src_configure +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 96bd13881e8c..6207e109fd62 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -3,24 +3,23 @@ EAPI=6 -SCM="" -[[ "${PV}" == 9999 ]] && SCM="git-r3" -inherit cmake-utils gnome2-utils xdg-utils ${SCM} -unset SCM +inherit cmake-utils gnome2-utils xdg-utils DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" HOMEPAGE="https://keepassxc.org" if [[ "${PV}" != 9999 ]] ; then - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" + #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" KEYWORDS="~amd64 ~x86" else + inherit git-r3 EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" fi LICENSE="LGPL-2.1 GPL-2 GPL-3" SLOT="0" -IUSE="autotype browser debug http network test yubikey" +IUSE="autotype browser debug network test yubikey" RDEPEND=" app-crypt/argon2:= @@ -37,6 +36,7 @@ RDEPEND=" x11-libs/libXi x11-libs/libXtst ) + browser? ( >=dev-libs/libsodium-1.0.12 ) yubikey? ( sys-auth/ykpers ) " @@ -59,7 +59,7 @@ src_configure() { -DWITH_GUI_TESTS=OFF -DWITH_TESTS="$(usex test)" -DWITH_XC_AUTOTYPE="$(usex autotype)" - -DWITH_XC_HTTP="$(usex http)" + -DWITH_XC_HTTP=OFF -DWITH_XC_NETWORKING="$(usex network)" -DWITH_XC_BROWSER="$(usex browser)" -DWITH_XC_YUBIKEY="$(usex yubikey)" -- cgit v1.2.3