summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog4
-rw-r--r--eclass/monotone.eclass9
-rw-r--r--eclass/mv_mozextension-r1.eclass13
3 files changed, 19 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 9a5d4909..69063c6f 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,5 +1,4 @@
# ChangeLog for eclass directory
-# Copyright 2012-2018 Gentoo Foundation; Distributed under the GPL v2
12 May 2012; Martin Väth <martin@mvath.de>:
Created ChangeLog
@@ -80,3 +79,6 @@
14 Apr 2018; Martin Väth <martin@mvath.de>:
mv_mozextension-r1.eclass: remove support for legacy extensions
+
+ 07 May 2018; Martin Väth <martin@mvath.de>:
+ monotone.eclass, mv_mozextension-r1.eclass: Support EAPI=7
diff --git a/eclass/monotone.eclass b/eclass/monotone.eclass
index 54c7cbae..d07ba97d 100644
--- a/eclass/monotone.eclass
+++ b/eclass/monotone.eclass
@@ -1,4 +1,4 @@
-# Copyright 2016 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: monotone.eclass
@@ -191,6 +191,11 @@ monotone_src_unpack() {
monotone_finish
}
-[ -n "${EMTN_DISABLE_DEPENDENCIES}" ] || DEPEND='dev-vcs/monotone'
+[ -n "${EMTN_DISABLE_DEPENDENCIES}" ] || case ${EAPI:-0} in
+0|1|2|3|4|5|6)
+ DEPEND='dev-vcs/monotone';;
+*)
+ BDEPEND='dev-vcs/monotone';;
+esac
EXPORT_FUNCTIONS src_unpack
diff --git a/eclass/mv_mozextension-r1.eclass b/eclass/mv_mozextension-r1.eclass
index 8d99800c..0042bf1a 100644
--- a/eclass/mv_mozextension-r1.eclass
+++ b/eclass/mv_mozextension-r1.eclass
@@ -18,7 +18,7 @@
# inherit mv_mozextension-r1
#
# MOZ="<firefox-57 seamonkey"
-# DEPEND=${MOZ_DEPEND}
+# BDEPEND=${MOZ_BDEPEND}
# RDEPEND=$(moz_rdepend ${MOZ})
# IUSE=$(moz_iuse ${MOZ})
# REQUIRED_USE=$(moz_required_use ${MOZ})
@@ -65,7 +65,12 @@ moz_variables() {
esac
done
shift $(( ${OPTIND} - 1 ))
- DEPEND=${MOZ_DEPEND}
+ case ${EAPI} in
+ 6)
+ DEPEND=${MOZ_BDEPEND};;
+ *)
+ BDEPEND=${MOZ_BDEPEND};;
+ esac
RDEPEND=$(moz_rdepend "${@}")
IUSE=$(moz_iuse ${o} "${@}")
REQUIRED_USE=$(moz_required_use "${@}")
@@ -101,10 +106,10 @@ moz_install$quoteargs
}"
}
-# @ECLASS-VARIABLE: MOZ_DEPEND
+# @ECLASS-VARIABLE: MOZ_BDEPEND
# @DESCRIPTION:
# This is an eclass-generated depend expression needed for moz_unpack to work
-MOZ_DEPEND='app-arch/unzip'
+MOZ_BDEPEND='app-arch/unzip'
# @FUNCTION: moz_split_browser
# @USAGE: <browser>