commit: 756af0d0f6368c1dadfb42dc7b9612a718f923f3 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 16 05:16:50 2023 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Jul 16 05:34:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=756af0d0
app-emacs/magit: Restore stable 3.3.0, drop -r1 to unstable Fix assignment of S. This partially reverts dc03c98faaa80c670c878830b161aac92cdb162a Bug: https://bugs.gentoo.org/910381 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> app-emacs/magit/magit-3.3.0-r1.ebuild | 4 ++-- app-emacs/magit/magit-3.3.0.ebuild | 33 +++++++++++++++++++++++++++++++++ app-emacs/magit/magit-9999.ebuild | 2 +- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/app-emacs/magit/magit-3.3.0-r1.ebuild b/app-emacs/magit/magit-3.3.0-r1.ebuild index cbec2d023718..e15f4b690cc8 100644 --- a/app-emacs/magit/magit-3.3.0-r1.ebuild +++ b/app-emacs/magit/magit-3.3.0-r1.ebuild @@ -15,9 +15,9 @@ if [[ ${PV} == *9999* ]] ; then else SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" fi -S="${S}/lisp" +S="${WORKDIR}/${P}/lisp" LICENSE="GPL-3+" SLOT="0" diff --git a/app-emacs/magit/magit-3.3.0.ebuild b/app-emacs/magit/magit-3.3.0.ebuild new file mode 100644 index 000000000000..87684a463d06 --- /dev/null +++ b/app-emacs/magit/magit-3.3.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit elisp + +DESCRIPTION="A Git porcelain inside Emacs" +HOMEPAGE="https://magit.vc/"; +SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 ~arm ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" + +S="${WORKDIR}/${P}/lisp" +SITEFILE="50${PN}-gentoo.el" +ELISP_TEXINFO="../Documentation/*.texi" +DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/*" + +DEPEND=" + >=app-emacs/dash-2.19.1 + app-emacs/libegit2 + >=app-emacs/transient-0.3.6 + >=app-emacs/with-editor-3.0.5 +" +RDEPEND="${DEPEND} >=dev-vcs/git-2.0.0" +DEPEND="${DEPEND} sys-apps/texinfo" + +src_prepare() { + default + echo "(setq magit-version \"${PV}\")" > magit-version.el || die +} diff --git a/app-emacs/magit/magit-9999.ebuild b/app-emacs/magit/magit-9999.ebuild index 57f82de1ff46..b3423758df8c 100644 --- a/app-emacs/magit/magit-9999.ebuild +++ b/app-emacs/magit/magit-9999.ebuild @@ -17,7 +17,7 @@ else -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi -S="${S}/lisp" +S="${WORKDIR}/${P}/lisp" LICENSE="GPL-3+" SLOT="0"
