Gentoo Archives: gentoo-dev

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH 2/3] elisp-common.eclass: Update documentation.
Date: Wed, 18 Dec 2019 11:09:16
Message-Id: fee8485011a11f45b10f0d0d2e237885accaaa77.1576663643.git.ulm@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/3] elisp{,-common}.eclass update for emacs-vcs consolidation by "Ulrich Müller"
1 After the package split between emacs and emacs-vcs is gone, packages
2 can depend on app-editors/emacs directly.
3
4 Signed-off-by: Ulrich Müller <ulm@g.o>
5 ---
6 eclass/elisp-common.eclass | 22 +++++++++-------------
7 1 file changed, 9 insertions(+), 13 deletions(-)
8
9 diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
10 index 6f79caee2f0..47e33ac28ae 100644
11 --- a/eclass/elisp-common.eclass
12 +++ b/eclass/elisp-common.eclass
13 @@ -24,26 +24,26 @@
14 # When relying on the emacs USE flag, you need to add
15 #
16 # @CODE
17 -# emacs? ( virtual/emacs )
18 +# emacs? ( app-editors/emacs:* )
19 # @CODE
20 #
21 # to your DEPEND/RDEPEND line and use the functions provided here to
22 # bring the files to the correct locations.
23 #
24 -# If your package requires a minimum Emacs version, e.g. Emacs 24, then
25 -# the dependency should be on >=virtual/emacs-24 instead. Because the
26 -# user can select the Emacs executable with eselect, you should also
27 -# make sure that the active Emacs version is sufficient. This can be
28 -# tested with function elisp-need-emacs(), which would typically be
29 -# called from pkg_setup(), as in the following example:
30 +# If your package requires a minimum Emacs version, e.g. Emacs 26.1,
31 +# then the dependency should be on >=app-editors/emacs-26.1:* instead.
32 +# Because the user can select the Emacs executable with eselect, you
33 +# should also make sure that the active Emacs version is sufficient.
34 +# This can be tested with function elisp-need-emacs(), which would
35 +# typically be called from pkg_setup(), as in the following example:
36 #
37 # @CODE
38 -# elisp-need-emacs 24 || die "Emacs version too low"
39 +# elisp-need-emacs 26.1 || die "Emacs version too low"
40 # @CODE
41 #
42 # Please note that such tests should be limited to packages that are
43 # known to fail with lower Emacs versions; the standard case is to
44 -# depend on virtual/emacs without version.
45 +# depend on app-editors/emacs without version.
46 #
47 # @ROFF .SS
48 # src_compile() usage:
49 @@ -152,10 +152,6 @@
50 #
51 # When having optional Emacs support, you should prepend "use emacs &&"
52 # to above calls of elisp-site-regen().
53 -# Don't use "has_version virtual/emacs"! When unmerging the state of
54 -# the emacs USE flag is taken from the package database and not from the
55 -# environment, so it is no problem when you unset USE=emacs between
56 -# merge and unmerge of a package.
57
58 case ${EAPI:-0} in
59 4|5|6) inherit eapi7-ver ;;
60 --
61 2.24.1

Attachments

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