[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

[Ulrich Müller]

commit:     c33bb9c4a9d3da1c88383d689edd7fe39bdda491
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 09:59:34 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 16:09:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c33bb9c4

app-editors/emacs: Sync live ebuilds.

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-editors/emacs/emacs-27.1.9999.ebuild | 12 ++++++++----
 app-editors/emacs/emacs-28.0.9999.ebuild | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app-editors/emacs/emacs-27.1.9999.ebuild 
b/app-editors/emacs/emacs-27.1.9999.ebuild
index 0adb5bb850d..4a221fae2c8 100644
--- a/app-editors/emacs/emacs-27.1.9999.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999.ebuild
@@ -12,15 +12,19 @@ if [[ ${PV##*.} = 9999 ]]; then
        EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
        S="${EGIT_CHECKOUT_DIR}"
 else
-       SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
-               mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
        # FULL_VERSION keeps the full version number, which is needed in
        # order to determine some path information correctly for copy/move
        # operations later on
        FULL_VERSION="${PV%%_*}"
+       SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
        S="${WORKDIR}/emacs-${FULL_VERSION}"
-       [[ ${PV} == *_pre* ]] && S="${WORKDIR}/emacs"
+       if [[ ${PV} == *_pre* ]]; then
+               SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz";
+               S="${WORKDIR}/emacs"
+       elif [[ ${PV//[0-9]} != "." ]]; then
+               
SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+       fi
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"

diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild 
b/app-editors/emacs/emacs-28.0.9999.ebuild
index fbe5d94d188..e4482f0ae60 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -12,15 +12,19 @@ if [[ ${PV##*.} = 9999 ]]; then
        EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
        S="${EGIT_CHECKOUT_DIR}"
 else
-       SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
-               mirror://gnu-alpha/emacs/pretest/${P}.tar.xz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
        # FULL_VERSION keeps the full version number, which is needed in
        # order to determine some path information correctly for copy/move
        # operations later on
        FULL_VERSION="${PV%%_*}"
+       SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
        S="${WORKDIR}/emacs-${FULL_VERSION}"
-       [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
+       if [[ ${PV} == *_pre* ]]; then
+               SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz";
+               S="${WORKDIR}/emacs"
+       elif [[ ${PV//[0-9]} != "." ]]; then
+               
SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+       fi
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"