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 D4023138353 for ; Sat, 22 Feb 2020 20:13:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89101E0905; Sat, 22 Feb 2020 20:13:17 +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 67ABEE0905 for ; Sat, 22 Feb 2020 20:13:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E61C934EEE5 for ; Sat, 22 Feb 2020 20:13:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DEFB1149 for ; Sat, 22 Feb 2020 20:13:13 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1582402357.3f185fb37264ca8d43b5c3f1d8066d501dd9ffd6.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/krop/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/krop/krop-0.5.1-r1.ebuild app-text/krop/krop-0.5.1.ebuild app-text/krop/krop-9999.ebuild X-VCS-Directories: app-text/krop/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 3f185fb37264ca8d43b5c3f1d8066d501dd9ffd6 X-VCS-Branch: master Date: Sat, 22 Feb 2020 20:13:13 +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: 7b6f67e0-ec61-4b7a-8efe-70446c476cc1 X-Archives-Hash: bce0f12774afc50e3dcac60b3a0c0fb4 commit: 3f185fb37264ca8d43b5c3f1d8066d501dd9ffd6 Author: Andreas K. Huettel gentoo org> AuthorDate: Sat Feb 22 20:12:37 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Feb 22 20:12:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f185fb3 app-text/krop: Fix PyQt5 dependency, bug 699112 Closes: https://bugs.gentoo.org/699112 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas K. Huettel gentoo.org> Signed-off-by: David Seifert gentoo.org> .../krop/{krop-0.5.1.ebuild => krop-0.5.1-r1.ebuild} | 16 +++++++++++----- app-text/krop/krop-9999.ebuild | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app-text/krop/krop-0.5.1.ebuild b/app-text/krop/krop-0.5.1-r1.ebuild similarity index 66% rename from app-text/krop/krop-0.5.1.ebuild rename to app-text/krop/krop-0.5.1-r1.ebuild index 8dc3d8371c9..3a3c251466e 100644 --- a/app-text/krop/krop-0.5.1.ebuild +++ b/app-text/krop/krop-0.5.1-r1.ebuild @@ -1,23 +1,29 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_6 ) -inherit eutils distutils-r1 xdg-utils +inherit desktop distutils-r1 xdg-utils + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/arminstraub/krop.git" +else + SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz" + KEYWORDS="amd64 ~x86" +fi DESCRIPTION="A tool to crop PDF files" HOMEPAGE="http://arminstraub.com/software/krop" -SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" IUSE="" RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}] dev-python/PyPDF2[${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP}]" + dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]" src_install() { distutils-r1_src_install diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild index b7f325ef3b8..67c084e81c6 100644 --- a/app-text/krop/krop-9999.ebuild +++ b/app-text/krop/krop-9999.ebuild @@ -23,7 +23,7 @@ IUSE="" RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}] dev-python/PyPDF2[${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP}]" + dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]" src_install() { distutils-r1_src_install