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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 282B5138334 for ; Thu, 7 Mar 2019 22:43:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12A77E0999; Thu, 7 Mar 2019 22:43:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DF502E0999 for ; Thu, 7 Mar 2019 22:43:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91ABB335D0F for ; Thu, 7 Mar 2019 22:43:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1FDA559 for ; Thu, 7 Mar 2019 22:43:54 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1551998471.c423d5828bbe34733d2e61e43a8634cd59985c4e.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/keepassxc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/keepassxc/keepassxc-9999.ebuild X-VCS-Directories: app-admin/keepassxc/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c423d5828bbe34733d2e61e43a8634cd59985c4e X-VCS-Branch: master Date: Thu, 7 Mar 2019 22:43:54 +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: 2a029fa7-f47f-4c3f-8807-c8b52eefdfeb X-Archives-Hash: ac0a8b476a3b096d9875f8761873363f commit: c423d5828bbe34733d2e61e43a8634cd59985c4e Author: Lars Wendler gentoo org> AuthorDate: Thu Mar 7 22:34:40 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Mar 7 22:41:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c423d582 app-admin/keepassxc: Updated live ebuild. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> app-admin/keepassxc/keepassxc-9999.ebuild | 34 ++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 69a10050827..1b5f2654570 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -1,17 +1,22 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils gnome2-utils xdg-utils +inherit cmake-utils xdg 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" + if [[ "${PV}" == *_beta* ]] ; then + SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${P/_/-}" + else + #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" + fi else inherit git-r3 EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" @@ -47,6 +52,11 @@ DEPEND=" dev-qt/qtconcurrent:5 " +# Not a runtime dependency but still needed (see bug #667092) +PDEPEND=" + x11-misc/xsel +" + src_prepare() { use test || \ sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die @@ -68,14 +78,14 @@ src_configure() { cmake-utils_src_configure } +pkg_preinst() { + xdg_pkg_preinst +} + pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update + xdg_pkg_postinst } pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update + xdg_pkg_postrm }