From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- app-admin/keepass/Manifest | 4 ++-- app-admin/keepass/keepass-2.46.ebuild | 20 ++++++++------------ app-admin/keepass/keepass-2.47.ebuild | 21 ++++++++++----------- 3 files changed, 20 insertions(+), 25 deletions(-) (limited to 'app-admin/keepass') diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest index 0da9b5cf3b64..e4d53421f7af 100644 --- a/app-admin/keepass/Manifest +++ b/app-admin/keepass/Manifest @@ -2,6 +2,6 @@ AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45d AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb DIST KeePass-2.46-Source.zip 5054069 BLAKE2B 81567ab4589e53ae5cc1b75fa42cc61d9d0f390edfa8f8d860dd118a95185a8d2ca417b30b29e2b544b1d4eeeb0069fab2f0be7900fd4d7fb87d41c417b99876 SHA512 ca045cb7363092f948d72243991fe398836b13183cc2685477d7ce5dd629213b5803b4216134c7ba6451726b79ca43d1e93a1934c9cbff46293fa916b9348219 DIST KeePass-2.47-Source.zip 5100005 BLAKE2B 9a71706efbb734244a0de6e1ba705ebaeb550368a77b1e74eaae47ec5a9c7dd12139740d7502dd5ad40e6b90e179f037ca5eae1650c2659a0a64260a93cd595f SHA512 df0f4dc9702198b4d31e78ac4fa1e85746dc7618529ab5ceaae1f6e1cc68a9a574f7892caff99e767f583fe102d87f0bfaf579f375eb227bf6f28fce6253a8f1 -EBUILD keepass-2.46.ebuild 3228 BLAKE2B 58d0e7a54ee7aace849c916e08b45bd6e1e5e838982f54efaccecea3279eee65aefcbbe6a3291828bbb769f938b09ea5a644b4a85667f2420bda90a2743e1c7d SHA512 ea1e5e8addbf66756fe812bddc29d4c8da359bb68f03ba1322f517a36d6839e4e7972628676108efb23ffcec64a42266f848854c55a79a8f7a971a2ac904633c -EBUILD keepass-2.47.ebuild 3230 BLAKE2B b86c31397b4cfd3865ee5ae47f9649724a9c3acc594a4ffbd54c59fc4ecf0b6bb958a579a85635305f2c87db3ed7bc5b48b48bc44a2beebeaf850a03bb7a76c3 SHA512 890c87ca3b874f0c2a35f390feed32ef281233bb339df9bd1c2bf75a49580d52aaca2315f1b1128b8b0db81a6ea31235541bb45b402f9595fa67689f6eab2337 +EBUILD keepass-2.46.ebuild 3134 BLAKE2B e98f684a58e0ab1b9f663ab0dc2805514898f012d4fe7fb0a35e107cbbcd2e065beddcc673ad07f54da8628a08bde9de2b9e56e642ccd747d46318c752ce768c SHA512 cc24dcee297f3732ea2ac9dfd815f5770b4d2f750c7c6b03dbf76086c470e17e01968620183ca98b28fe77e2a9b22617b2611c9340eaae449b8f0749ae401451 +EBUILD keepass-2.47.ebuild 3175 BLAKE2B 878525ed7dde9c0125aa301568436e1825902d6d95091ad89a701db68e769d5f7736f0d98bde52e31beb389b9b1f4e9752931fc24e96afedc041c94115cfebed SHA512 1cbd71474e625077503bcc40ad3492de050be0a64022a39ca61db2e4119aebc5d66002fd618508ec414ae84f5ae620196435b34e34dc27a0557aa661818fa6d8 MISC metadata.xml 681 BLAKE2B 00836c30b633363faed0504c8c4668935fc47cd1e03c951d4de541cdf688fd996410d6ea317019ca2131a1e7e199d5a9f46ebce117c4f1bed343efd9d05647a5 SHA512 6653ac6aa44001d8e518552ead816a5c3212d01b526f385c44b2bd0263122d40f3a7b12d5cc8801d5822c7e2d2e5aeb31315ac3981339c4668eb79b3142a6001 diff --git a/app-admin/keepass/keepass-2.46.ebuild b/app-admin/keepass/keepass-2.46.ebuild index a42724fe8584..550a4da96f43 100644 --- a/app-admin/keepass/keepass-2.46.ebuild +++ b/app-admin/keepass/keepass-2.46.ebuild @@ -1,29 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit desktop eutils xdg-utils +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="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip" +S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" IUSE="aot" -COMMON_DEPEND="dev-lang/mono" -DEPEND="${COMMON_DEPEND} - app-arch/unzip -" -RDEPEND="${COMMON_DEPEND} +BDEPEND="app-arch/unzip" +DEPEND="dev-lang/mono" +RDEPEND=" + ${DEPEND} dev-dotnet/libgdiplus[cairo] " -S="${WORKDIR}" PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" ) # bug #687052 @@ -101,10 +100,7 @@ pkg_postinst() { xdg_desktop_database_update xdg_mimeinfo_database_update - if ! has_version x11-misc/xdotool ; then - elog "Optional dependencies:" - elog " x11-misc/xdotool (enables autotype/autofill)" - fi + 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." diff --git a/app-admin/keepass/keepass-2.47.ebuild b/app-admin/keepass/keepass-2.47.ebuild index af7035cf7b4b..afa3624b3df1 100644 --- a/app-admin/keepass/keepass-2.47.ebuild +++ b/app-admin/keepass/keepass-2.47.ebuild @@ -3,27 +3,26 @@ EAPI=7 -inherit desktop eutils xdg-utils +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="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip" +S="${WORKDIR}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="aot" -COMMON_DEPEND="dev-lang/mono" -DEPEND="${COMMON_DEPEND} - app-arch/unzip -" -RDEPEND="${COMMON_DEPEND} +BDEPEND="app-arch/unzip" +DEPEND="dev-lang/mono" +RDEPEND=" + ${DEPEND} dev-dotnet/libgdiplus[cairo] " -S="${WORKDIR}" PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" ) # bug #687052 @@ -47,6 +46,9 @@ src_prepare() { 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 @@ -101,10 +103,7 @@ pkg_postinst() { xdg_desktop_database_update xdg_mimeinfo_database_update - if ! has_version x11-misc/xdotool ; then - elog "Optional dependencies:" - elog " x11-misc/xdotool (enables autotype/autofill)" - fi + 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." -- cgit v1.2.3