summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2019-12-17 18:43:07 +0100
committerUlrich Müller <ulm@gentoo.org>2019-12-18 11:06:13 +0100
commit28fed3d4a1643bb201d8523e5355ca42fd66b0a5 (patch)
tree3c42971e39d7883f451e8c9dfea7ed833300a1b5 /app-editors/emacs/emacs-23.4-r18.ebuild
parentmedia-libs/zita-convolver: removed old (2.0.0-r1, 3.1.0) (diff)
downloadgentoo-28fed3d4a1643bb201d8523e5355ca42fd66b0a5.tar.gz
gentoo-28fed3d4a1643bb201d8523e5355ca42fd66b0a5.tar.bz2
gentoo-28fed3d4a1643bb201d8523e5355ca42fd66b0a5.zip
app-editors/emacs: Use EMACS_SUFFIX instead of SLOT.
Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'app-editors/emacs/emacs-23.4-r18.ebuild')
-rw-r--r--app-editors/emacs/emacs-23.4-r18.ebuild12
1 files changed, 6 insertions, 6 deletions
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild
index 9a48a465e91e..98c12e08da18 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild
@@ -82,8 +82,8 @@ BDEPEND="alsa? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )"
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
@@ -277,7 +277,7 @@ src_install () {
sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
X
- ;;; ${PN}-${SLOT} site-lisp configuration
+ ;;; ${EMACS_SUFFIX} site-lisp configuration
X
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
Y (setq find-function-C-source-directory
@@ -299,9 +299,9 @@ src_install () {
if use aqua; then
dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
mv nextstep/Emacs.app \
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+ "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi
DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
@@ -317,7 +317,7 @@ src_install () {
machine would satisfy basic Emacs requirements under X11.
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
for how to enable anti-aliased fonts."
- use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+ use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
it into /Applications by yourself."
readme.gentoo_create_doc