Bug: https://bugs.gentoo.org/233589
Signed-off-by: Ulrich Müller
---
As previously discussed [1], add a "live" token to PROPERTIES in all
live eclasses. This can also be used to tag live ebuilds that don't
inherit any live eclass.
Corresponding updates for PMS [2] and Portage [3] are under way.
[1]
https://archives.gentoo.org/gentoo-dev/message/64b83155637bcad67478e2d2af276780
[2]
https://archives.gentoo.org/gentoo-pms/message/1e1b5523a885ef4d90417a6176baa65b
[3]
https://archives.gentoo.org/gentoo-portage-dev/message/8eab171cf105482062dda189ed2b0b59
eclass/bzr.eclass| 4 +++-
eclass/cvs.eclass| 2 ++
eclass/darcs.eclass | 4 +++-
eclass/git-2.eclass | 4 +++-
eclass/git-r3.eclass | 4 +++-
eclass/golang-vcs.eclass | 4 +++-
eclass/mercurial.eclass | 4 +++-
eclass/subversion.eclass | 2 ++
8 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
index cc46be794214..8734f7f2f6af 100644
--- a/eclass/bzr.eclass
+++ b/eclass/bzr.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
#
# @ECLASS: bzr.eclass
@@ -21,6 +21,8 @@
EBZR="bzr.eclass"
+PROPERTIES="live"
+
if [[ ${EBZR_REPO_URI%%:*} = sftp ]]; then
DEPEND=">=dev-vcs/bzr-2.6.0[sftp]"
else
diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index e667b563fb3d..dce52b468a92 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -173,6 +173,8 @@ _CVS_ECLASS=1
# Set this to get a clean copy when updating (passes the
# -C option to cvs update)
+PROPERTIES="live"
+
# add cvs to deps
# ssh is used for ext auth
DEPEND="dev-vcs/cvs"
diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass
index 09b718823670..fed7d1490091 100644
--- a/eclass/darcs.eclass
+++ b/eclass/darcs.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: darcs.eclass
@@ -85,6 +85,8 @@ SRC_URI=""
# --- end ebuild-configurable settings ---
+PROPERTIES="live"
+
case ${EAPI:-0} in
[0-6]) # no need to care about 5-HDEPEND and similar
DEPEND="dev-vcs/darcs
diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
index 5371a612dccf..8860aa6ce19a 100644
--- a/eclass/git-2.eclass
+++ b/eclass/git-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: git-2.eclass
@@ -20,6 +20,8 @@ esac
# This eclass support all EAPIs.
EXPORT_FUNCTIONS src_unpack
+PROPERTIES="live"
+
DEPEND="dev-vcs/git"
# @ECLASS-VARIABLE: EGIT_SOURCEDIR
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index a1ad0d238dc9..df1645364709 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: git-r3.eclass
@@ -25,6 +25,8 @@ EXPORT_FUNCTIONS src_unpack
if [[ ! ${_GIT_R3} ]]; then
+PROPERTIES="live"
+
if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
if [[ ${EAPI:-0} != [0123456] ]]; then
BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
diff --git a/eclass/golang-vcs.eclass b/eclass/golang-vcs.eclass
index 561d1a0c4da1..c8b894c8b6be 100644
--- a/eclass/golang-vcs.eclass
+++ b/eclass/golang-vcs.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: golang-vcs.eclass
@@ -26,6 +26,8 @@ if [[ -z ${_GOLANG_VCS} ]]; then
_GOLANG_VCS=1
+PROPERTIES="live"
+
# @ECLASS-VARIABLE: EGO_PN
# @REQUIRED
# @DESCRIPTION:
diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass
index 9a5bd191c231..e6c4c7495bfc 100644
--- a/eclass/mercurial.eclass
+++ b/eclass/mercurial.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: mercurial.eclass
@@ -18,6 +18,8 @@ inherit eutils
EXPORT_FUNCTIONS src_unpack
+PROPERTIES="live"
+
DEPEND="dev-vcs/mercurial"
# @ECLASS-VARIABLE: EHG_REPO_URI
diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
index 4dd2b48c6ce6..7ba134c519a2 100644
--- a/eclass/subversion.eclass
+++ b/eclass/subversion.eclass
@@ -28,6 +28,8 @@ case ${EAPI:-0} in
;;
esac
+PROPERTIES="live"
+
DEPEND="|| (
dev-vcs/subversion[http]
dev-vcs/subversion[webdav-neon]
--
2.22.0
signature.asc
Description: PGP signature
