From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C60F4138359 for ; Sat, 22 Aug 2020 14:31:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB327E07A7; Sat, 22 Aug 2020 14:31:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFD58E07A7 for ; Sat, 22 Aug 2020 14:31:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 272A7340C53 for ; Sat, 22 Aug 2020 14:31:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A1E052D2 for ; Sat, 22 Aug 2020 14:31:10 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1598106637.57c860968813f09e35e253f6587e4e38489bfc12.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/emacs-27.1.9999-r1.ebuild app-editors/emacs/emacs-27.1.ebuild app-editors/emacs/emacs-28.0.9999.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 57c860968813f09e35e253f6587e4e38489bfc12 X-VCS-Branch: master Date: Sat, 22 Aug 2020 14:31:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c047299c-e5a5-490b-823c-081ded50e089 X-Archives-Hash: 6fafe43b53a72b2c4f2bfb39eb00101c commit: 57c860968813f09e35e253f6587e4e38489bfc12 Author: Ulrich Müller gentoo org> AuthorDate: Sat Aug 22 14:29:49 2020 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Aug 22 14:30:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c86096 app-editors/emacs: Calculate SLOT from PV. Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/emacs-27.1.9999-r1.ebuild | 10 +++++++++- app-editors/emacs/emacs-27.1.ebuild | 10 +++++++++- app-editors/emacs/emacs-28.0.9999.ebuild | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild index c74b9b7bf95..78fc06dd7e0 100644 --- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild +++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild @@ -11,6 +11,7 @@ if [[ ${PV##*.} = 9999 ]]; then EGIT_BRANCH="emacs-27" EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" S="${EGIT_CHECKOUT_DIR}" + SLOT="${PV%%.*}-vcs" else # FULL_VERSION keeps the full version number, which is needed in # order to determine some path information correctly for copy/move @@ -18,12 +19,20 @@ else FULL_VERSION="${PV%%_*}" SRC_URI="mirror://gnu/emacs/${P}.tar.xz" S="${WORKDIR}/emacs-${FULL_VERSION}" + # PV can be in any of the following formats: + # 27.1 released version (slot 27) + # 27.1_rc1 upstream release candidate (27) + # 27.0.9999 live ebuild (slot 27-vcs) + # 27.0.90 upstream prerelease snapshot (27-vcs) + # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs) 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 + SLOT="${PV%%.*}" + [[ ${PV} == *.*.* ]] && SLOT+="-vcs" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" fi @@ -31,7 +40,6 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -SLOT="27-vcs" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" REQUIRED_USE="?? ( aqua X )" RESTRICT="test" diff --git a/app-editors/emacs/emacs-27.1.ebuild b/app-editors/emacs/emacs-27.1.ebuild index ffbda3f182b..9258d36369f 100644 --- a/app-editors/emacs/emacs-27.1.ebuild +++ b/app-editors/emacs/emacs-27.1.ebuild @@ -11,6 +11,7 @@ if [[ ${PV##*.} = 9999 ]]; then EGIT_BRANCH="emacs-27" EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" S="${EGIT_CHECKOUT_DIR}" + SLOT="${PV%%.*}-vcs" else # FULL_VERSION keeps the full version number, which is needed in # order to determine some path information correctly for copy/move @@ -18,12 +19,20 @@ else FULL_VERSION="${PV%%_*}" SRC_URI="mirror://gnu/emacs/${P}.tar.xz" S="${WORKDIR}/emacs-${FULL_VERSION}" + # PV can be in any of the following formats: + # 27.1 released version (slot 27) + # 27.1_rc1 upstream release candidate (27) + # 27.0.9999 live ebuild (slot 27-vcs) + # 27.0.90 upstream prerelease snapshot (27-vcs) + # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs) 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 + SLOT="${PV%%.*}" + [[ ${PV} == *.*.* ]] && SLOT+="-vcs" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" fi @@ -31,7 +40,6 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -SLOT="27" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" REQUIRED_USE="?? ( aqua X )" RESTRICT="test" diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index 93b9e483392..8137dcdd89b 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -11,6 +11,7 @@ if [[ ${PV##*.} = 9999 ]]; then EGIT_BRANCH="master" EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" S="${EGIT_CHECKOUT_DIR}" + SLOT="${PV%%.*}-vcs" else # FULL_VERSION keeps the full version number, which is needed in # order to determine some path information correctly for copy/move @@ -18,12 +19,20 @@ else FULL_VERSION="${PV%%_*}" SRC_URI="mirror://gnu/emacs/${P}.tar.xz" S="${WORKDIR}/emacs-${FULL_VERSION}" + # PV can be in any of the following formats: + # 27.1 released version (slot 27) + # 27.1_rc1 upstream release candidate (27) + # 27.0.9999 live ebuild (slot 27-vcs) + # 27.0.90 upstream prerelease snapshot (27-vcs) + # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs) 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 + SLOT="${PV%%.*}" + [[ ${PV} == *.*.* ]] && SLOT+="-vcs" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" fi @@ -31,7 +40,6 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -SLOT="28-vcs" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" REQUIRED_USE="?? ( aqua X )" RESTRICT="test"