public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/krop/
Date: Sat, 22 Feb 2020 20:13:13 +0000 (UTC)	[thread overview]
Message-ID: <1582402357.3f185fb37264ca8d43b5c3f1d8066d501dd9ffd6.soap@gentoo> (raw)

commit:     3f185fb37264ca8d43b5c3f1d8066d501dd9ffd6
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 22 20:12:37 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> 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 <dilfridge <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> 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


             reply	other threads:[~2020-02-22 20:13 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-22 20:13 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-28 20:49 [gentoo-commits] repo/gentoo:master commit in: app-text/krop/ Sam James
2024-04-28  8:13 Andreas K. Hüttel
2023-06-09 14:28 Andreas K. Hüttel
2023-06-09 14:28 Andreas K. Hüttel
2023-06-09 14:28 Andreas K. Hüttel
2023-05-02 15:47 Andreas K. Hüttel
2023-04-10  3:38 Sam James
2022-07-04 15:47 Andreas K. Hüttel
2021-05-24 14:33 Andreas K. Hüttel
2021-02-28 21:07 Andreas K. Hüttel
2021-02-28 21:07 Andreas K. Hüttel
2020-10-09 18:57 Andreas K. Hüttel
2020-04-25 13:34 Andreas K. Hüttel
2020-02-05 19:53 Michał Górny
2019-12-20  8:51 Andreas K. Hüttel
2018-12-25 16:52 Andreas K. Hüttel
2018-12-25 16:45 Andreas K. Hüttel
2018-12-25 16:44 Andreas K. Hüttel
2018-01-07 14:51 Andreas Sturmlechner
2018-01-07 14:51 Andreas Sturmlechner
2018-01-07 14:51 Andreas Sturmlechner
2017-12-27 18:28 Andreas Hüttel
2017-12-04 14:43 Manuel Rüger
2017-07-31  2:28 Andreas Hüttel
2017-07-31  2:28 Andreas Hüttel
2017-05-17 11:28 Manuel Rüger
2017-05-17 11:28 Manuel Rüger
2016-09-01 13:18 Manuel Rüger
2015-11-07 13:02 Manuel Rüger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1582402357.3f185fb37264ca8d43b5c3f1d8066d501dd9ffd6.soap@gentoo \
    --to=soap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox