Gentoo Archives: gentoo-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH] eclass: Assign PROPERTIES="live" in live eclasses.
Date: Fri, 26 Jul 2019 09:18:38
Message-Id: w6gimrpxifu.fsf@kph.uni-mainz.de
1 Bug: https://bugs.gentoo.org/233589
2 Signed-off-by: Ulrich Müller <ulm@g.o>
3 ---
4
5 As previously discussed [1], add a "live" token to PROPERTIES in all
6 live eclasses. This can also be used to tag live ebuilds that don't
7 inherit any live eclass.
8
9 Corresponding updates for PMS [2] and Portage [3] are under way.
10
11 [1] https://archives.gentoo.org/gentoo-dev/message/64b83155637bcad67478e2d2af276780
12 [2] https://archives.gentoo.org/gentoo-pms/message/1e1b5523a885ef4d90417a6176baa65b
13 [3] https://archives.gentoo.org/gentoo-portage-dev/message/8eab171cf105482062dda189ed2b0b59
14
15 eclass/bzr.eclass | 4 +++-
16 eclass/cvs.eclass | 2 ++
17 eclass/darcs.eclass | 4 +++-
18 eclass/git-2.eclass | 4 +++-
19 eclass/git-r3.eclass | 4 +++-
20 eclass/golang-vcs.eclass | 4 +++-
21 eclass/mercurial.eclass | 4 +++-
22 eclass/subversion.eclass | 2 ++
23 8 files changed, 22 insertions(+), 6 deletions(-)
24
25 diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
26 index cc46be794214..8734f7f2f6af 100644
27 --- a/eclass/bzr.eclass
28 +++ b/eclass/bzr.eclass
29 @@ -1,4 +1,4 @@
30 -# Copyright 1999-2018 Gentoo Foundation
31 +# Copyright 1999-2019 Gentoo Authors
32 # Distributed under the terms of the GNU General Public License v2
33 #
34 # @ECLASS: bzr.eclass
35 @@ -21,6 +21,8 @@
36
37 EBZR="bzr.eclass"
38
39 +PROPERTIES="live"
40 +
41 if [[ ${EBZR_REPO_URI%%:*} = sftp ]]; then
42 DEPEND=">=dev-vcs/bzr-2.6.0[sftp]"
43 else
44 diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
45 index e667b563fb3d..dce52b468a92 100644
46 --- a/eclass/cvs.eclass
47 +++ b/eclass/cvs.eclass
48 @@ -173,6 +173,8 @@ _CVS_ECLASS=1
49 # Set this to get a clean copy when updating (passes the
50 # -C option to cvs update)
51
52 +PROPERTIES="live"
53 +
54 # add cvs to deps
55 # ssh is used for ext auth
56 DEPEND="dev-vcs/cvs"
57 diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass
58 index 09b718823670..fed7d1490091 100644
59 --- a/eclass/darcs.eclass
60 +++ b/eclass/darcs.eclass
61 @@ -1,4 +1,4 @@
62 -# Copyright 1999-2018 Gentoo Authors
63 +# Copyright 1999-2019 Gentoo Authors
64 # Distributed under the terms of the GNU General Public License v2
65
66 # @ECLASS: darcs.eclass
67 @@ -85,6 +85,8 @@ SRC_URI=""
68
69 # --- end ebuild-configurable settings ---
70
71 +PROPERTIES="live"
72 +
73 case ${EAPI:-0} in
74 [0-6]) # no need to care about 5-HDEPEND and similar
75 DEPEND="dev-vcs/darcs
76 diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
77 index 5371a612dccf..8860aa6ce19a 100644
78 --- a/eclass/git-2.eclass
79 +++ b/eclass/git-2.eclass
80 @@ -1,4 +1,4 @@
81 -# Copyright 1999-2018 Gentoo Foundation
82 +# Copyright 1999-2019 Gentoo Authors
83 # Distributed under the terms of the GNU General Public License v2
84
85 # @ECLASS: git-2.eclass
86 @@ -20,6 +20,8 @@ esac
87 # This eclass support all EAPIs.
88 EXPORT_FUNCTIONS src_unpack
89
90 +PROPERTIES="live"
91 +
92 DEPEND="dev-vcs/git"
93
94 # @ECLASS-VARIABLE: EGIT_SOURCEDIR
95 diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
96 index a1ad0d238dc9..df1645364709 100644
97 --- a/eclass/git-r3.eclass
98 +++ b/eclass/git-r3.eclass
99 @@ -1,4 +1,4 @@
100 -# Copyright 1999-2018 Gentoo Foundation
101 +# Copyright 1999-2019 Gentoo Authors
102 # Distributed under the terms of the GNU General Public License v2
103
104 # @ECLASS: git-r3.eclass
105 @@ -25,6 +25,8 @@ EXPORT_FUNCTIONS src_unpack
106
107 if [[ ! ${_GIT_R3} ]]; then
108
109 +PROPERTIES="live"
110 +
111 if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
112 if [[ ${EAPI:-0} != [0123456] ]]; then
113 BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
114 diff --git a/eclass/golang-vcs.eclass b/eclass/golang-vcs.eclass
115 index 561d1a0c4da1..c8b894c8b6be 100644
116 --- a/eclass/golang-vcs.eclass
117 +++ b/eclass/golang-vcs.eclass
118 @@ -1,4 +1,4 @@
119 -# Copyright 1999-2015 Gentoo Foundation
120 +# Copyright 1999-2019 Gentoo Authors
121 # Distributed under the terms of the GNU General Public License v2
122
123 # @ECLASS: golang-vcs.eclass
124 @@ -26,6 +26,8 @@ if [[ -z ${_GOLANG_VCS} ]]; then
125
126 _GOLANG_VCS=1
127
128 +PROPERTIES="live"
129 +
130 # @ECLASS-VARIABLE: EGO_PN
131 # @REQUIRED
132 # @DESCRIPTION:
133 diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass
134 index 9a5bd191c231..e6c4c7495bfc 100644
135 --- a/eclass/mercurial.eclass
136 +++ b/eclass/mercurial.eclass
137 @@ -1,4 +1,4 @@
138 -# Copyright 1999-2014 Gentoo Foundation
139 +# Copyright 1999-2019 Gentoo Authors
140 # Distributed under the terms of the GNU General Public License v2
141
142 # @ECLASS: mercurial.eclass
143 @@ -18,6 +18,8 @@ inherit eutils
144
145 EXPORT_FUNCTIONS src_unpack
146
147 +PROPERTIES="live"
148 +
149 DEPEND="dev-vcs/mercurial"
150
151 # @ECLASS-VARIABLE: EHG_REPO_URI
152 diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
153 index 4dd2b48c6ce6..7ba134c519a2 100644
154 --- a/eclass/subversion.eclass
155 +++ b/eclass/subversion.eclass
156 @@ -28,6 +28,8 @@ case ${EAPI:-0} in
157 ;;
158 esac
159
160 +PROPERTIES="live"
161 +
162 DEPEND="|| (
163 dev-vcs/subversion[http]
164 dev-vcs/subversion[webdav-neon]
165 --
166 2.22.0

Attachments

File name MIME type
signature.asc application/pgp-signature

Replies