elisp.eclass: Depend on app-editors/emacs directly.

This replaces the indirect dependency on virtual/emacs.

Update pkg_setup() to call elisp-check-emacs-version instead of the
now deprecated elisp-need-emacs.

Signed-off-by: Ulrich Müller <ulm@gentoo.org>

diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index df160ea01e22a673c92e212074481d8fe3946d24..a411f602cf7cdb65e35d38394f05e3ef1f12e2c7 100644 (file)
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -30,8 +30,8 @@
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # If you need anything different from Emacs 23, use the NEED_EMACS
-# variable before inheriting elisp.eclass.  Set it to the major version
-# your package uses and the dependency will be adjusted.
+# variable before inheriting elisp.eclass.  Set it to the version your
+# package uses and the dependency will be adjusted.
 
 # @ECLASS-VARIABLE: ELISP_PATCHES
 # @DEFAULT_UNSET
@@ -70,24 +70,20 @@ esac
 EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
        pkg_{setup,postinst,postrm}
 
-RDEPEND=">=virtual/emacs-${NEED_EMACS:-23}"
+RDEPEND=">=app-editors/emacs-${NEED_EMACS}:*"
 case ${EAPI} in
-       4|5|6) DEPEND="${RDEPEND}" ;;
+       4) RDEPEND="${RDEPEND%:*}"; DEPEND="${RDEPEND}" ;;
+       5|6) DEPEND="${RDEPEND}" ;;
        *) BDEPEND="${RDEPEND}" ;;
 esac
 
 # @FUNCTION: elisp_pkg_setup
 # @DESCRIPTION:
-# Test if the eselected Emacs version is sufficient to fulfil the major
+# Test if the eselected Emacs version is sufficient to fulfil the
 # version requirement of the NEED_EMACS variable.
 
 elisp_pkg_setup() {
-       elisp-need-emacs "${NEED_EMACS:-23}"
-       case $? in
-               0) ;;
-               1) die "Emacs version too low" ;;
-               *) die "Could not determine Emacs version" ;;
-       esac
+       elisp-check-emacs-version
 }
 
 # @FUNCTION: elisp_src_unpack