Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/linux-wbfs-manager/
Date: Sat, 09 Jan 2021 10:36:18
Message-Id: 1610188566.ddee0ea6bac14700ae16f192b6e80fae00f96cdd.sam@gentoo
1 commit: ddee0ea6bac14700ae16f192b6e80fae00f96cdd
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 9 10:15:52 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 9 10:36:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddee0ea6
7
8 games-util/linux-wbfs-manager: fix DuplicateEclassInherits
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild | 11 +++++++----
14 games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild | 11 +++++++----
15 2 files changed, 14 insertions(+), 8 deletions(-)
16
17 diff --git a/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild b/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
18 index ac70b1fc110..b0344682aec 100644
19 --- a/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
20 +++ b/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
21 @@ -1,14 +1,16 @@
22 -# Copyright 1999-2015 Gentoo Foundation
23 +# Copyright 1999-2021 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=5
27 +
28 +inherit toolchain-funcs
29 +
30 if [[ "${PV}" == "9999" ]]; then
31 ESVN_REPO_URI="https://linux-wbfs-manager.googlecode.com/svn/trunk/"
32 - inherit toolchain-funcs subversion
33 + inherit subversion
34 SRC_URI=""
35 #KEYWORDS=""
36 else
37 - inherit toolchain-funcs
38 SRC_URI="https://linux-wbfs-manager.googlecode.com/files/${P}.tar.gz"
39 KEYWORDS="~amd64 ~x86"
40 fi;
41 @@ -23,7 +25,8 @@ IUSE=""
42 RDEPEND="dev-libs/glib:2
43 gnome-base/libglade:2.0"
44 DEPEND="${RDEPEND}
45 - virtual/pkgconfig"
46 + virtual/pkgconfig
47 +"
48
49 if [[ ${PV} == "9999" ]] ; then
50 S=${WORKDIR}/${ECVS_MODULE}
51
52 diff --git a/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild b/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild
53 index 59c3678a99f..b0344682aec 100644
54 --- a/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild
55 +++ b/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild
56 @@ -1,14 +1,16 @@
57 -# Copyright 1999-2013 Gentoo Foundation
58 +# Copyright 1999-2021 Gentoo Authors
59 # Distributed under the terms of the GNU General Public License v2
60
61 EAPI=5
62 +
63 +inherit toolchain-funcs
64 +
65 if [[ "${PV}" == "9999" ]]; then
66 ESVN_REPO_URI="https://linux-wbfs-manager.googlecode.com/svn/trunk/"
67 - inherit toolchain-funcs subversion
68 + inherit subversion
69 SRC_URI=""
70 #KEYWORDS=""
71 else
72 - inherit toolchain-funcs
73 SRC_URI="https://linux-wbfs-manager.googlecode.com/files/${P}.tar.gz"
74 KEYWORDS="~amd64 ~x86"
75 fi;
76 @@ -23,7 +25,8 @@ IUSE=""
77 RDEPEND="dev-libs/glib:2
78 gnome-base/libglade:2.0"
79 DEPEND="${RDEPEND}
80 - virtual/pkgconfig"
81 + virtual/pkgconfig
82 +"
83
84 if [[ ${PV} == "9999" ]] ; then
85 S=${WORKDIR}/${ECVS_MODULE}