commit: 28fed3d4a1643bb201d8523e5355ca42fd66b0a5 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 17 17:43:07 2019 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Wed Dec 18 10:06:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28fed3d4
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 <AT> gentoo.org> app-editors/emacs/emacs-23.4-r18.ebuild | 12 ++++++------ app-editors/emacs/emacs-24.5-r7.ebuild | 12 ++++++------ app-editors/emacs/emacs-25.3-r6.ebuild | 12 ++++++------ app-editors/emacs/emacs-26.2.ebuild | 12 ++++++------ app-editors/emacs/emacs-26.3-r1.ebuild | 12 ++++++------ 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild index 9a48a465e91..98c12e08da1 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 diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild index dcd5917087b..afb4238b747 100644 --- a/app-editors/emacs/emacs-24.5-r7.ebuild +++ b/app-editors/emacs/emacs-24.5-r7.ebuild @@ -90,8 +90,8 @@ DEPEND="${RDEPEND} BDEPEND="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 @@ -272,7 +272,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 @@ -294,9 +294,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 @@ -311,7 +311,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 diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild index 726d3e818c2..8f79717eeb5 100644 --- a/app-editors/emacs/emacs-25.3-r6.ebuild +++ b/app-editors/emacs/emacs-25.3-r6.ebuild @@ -96,8 +96,8 @@ BDEPEND="virtual/pkgconfig RDEPEND="${RDEPEND} !<app-editors/emacs-vcs-${PV}" -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 @@ -283,7 +283,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 @@ -305,9 +305,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 @@ -322,7 +322,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 diff --git a/app-editors/emacs/emacs-26.2.ebuild b/app-editors/emacs/emacs-26.2.ebuild index 960bddd2312..488c95652d9 100644 --- a/app-editors/emacs/emacs-26.2.ebuild +++ b/app-editors/emacs/emacs-26.2.ebuild @@ -104,8 +104,8 @@ BDEPEND="virtual/pkgconfig RDEPEND="${RDEPEND} !<app-editors/emacs-vcs-${PV}" -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 @@ -300,7 +300,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 @@ -322,9 +322,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 @@ -339,7 +339,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 diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild index a9f8c3660f2..7ec3305f06f 100644 --- a/app-editors/emacs/emacs-26.3-r1.ebuild +++ b/app-editors/emacs/emacs-26.3-r1.ebuild @@ -104,8 +104,8 @@ BDEPEND="virtual/pkgconfig RDEPEND="${RDEPEND} !<app-editors/emacs-vcs-${PV}" -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 @@ -309,7 +309,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 @@ -331,9 +331,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 @@ -348,7 +348,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