Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/euscan/
Date: Wed, 21 Mar 2018 18:13:03
Message-Id: 1521655958.96fc64387fd387eadcfa2438afa65dacf695c844.mgorny@gentoo
1 commit: 96fc64387fd387eadcfa2438afa65dacf695c844
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 21 17:07:36 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 21 18:12:38 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fc6438
7
8 app-portage/euscan: Support sys-apps/portage-mgorny
9
10 .../euscan/{euscan-0.1.1-r1.ebuild => euscan-0.1.1-r2.ebuild} | 8 ++++++--
11 app-portage/euscan/euscan-9999.ebuild | 8 ++++++--
12 2 files changed, 12 insertions(+), 4 deletions(-)
13
14 diff --git a/app-portage/euscan/euscan-0.1.1-r1.ebuild b/app-portage/euscan/euscan-0.1.1-r2.ebuild
15 similarity index 83%
16 rename from app-portage/euscan/euscan-0.1.1-r1.ebuild
17 rename to app-portage/euscan/euscan-0.1.1-r2.ebuild
18 index 19345bf907e..27566cc7555 100644
19 --- a/app-portage/euscan/euscan-0.1.1-r1.ebuild
20 +++ b/app-portage/euscan/euscan-0.1.1-r2.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2017 Gentoo Foundation
23 +# Copyright 1999-2018 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=5
27 @@ -18,7 +18,11 @@ IUSE=""
28
29 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
30
31 -DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
32 +DEPEND="
33 + || (
34 + sys-apps/portage[${PYTHON_USEDEP}]
35 + sys-apps/portage-mgorny[${PYTHON_USEDEP}]
36 + )"
37 RDEPEND="${DEPEND}
38 >=app-portage/gentoolkit-0.2.8[${PYTHON_USEDEP}]
39 dev-python/setuptools[${PYTHON_USEDEP}]
40
41 diff --git a/app-portage/euscan/euscan-9999.ebuild b/app-portage/euscan/euscan-9999.ebuild
42 index 2cf8630bb3c..c71e1ee07ef 100644
43 --- a/app-portage/euscan/euscan-9999.ebuild
44 +++ b/app-portage/euscan/euscan-9999.ebuild
45 @@ -1,4 +1,4 @@
46 -# Copyright 1999-2017 Gentoo Foundation
47 +# Copyright 1999-2018 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49
50 EAPI=5
51 @@ -18,7 +18,11 @@ IUSE=""
52
53 KEYWORDS=""
54
55 -DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
56 +DEPEND="
57 + || (
58 + sys-apps/portage[${PYTHON_USEDEP}]
59 + sys-apps/portage-mgorny[${PYTHON_USEDEP}]
60 + )"
61 RDEPEND="${DEPEND}
62 >=app-portage/gentoolkit-0.2.8[${PYTHON_USEDEP}]
63 dev-python/setuptools[${PYTHON_USEDEP}]