commit: dc03c98faaa80c670c878830b161aac92cdb162a Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Sat Jul 15 11:48:57 2023 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Sat Jul 15 14:39:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc03c98f
app-emacs/magit: drop libegit2 dependency Closes: https://bugs.gentoo.org/910381 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> .../{magit-9999.ebuild => magit-3.3.0-r1.ebuild} | 15 +++++++--- app-emacs/magit/magit-3.3.0.ebuild | 33 ---------------------- app-emacs/magit/magit-9999.ebuild | 9 +++++- 3 files changed, 19 insertions(+), 38 deletions(-) diff --git a/app-emacs/magit/magit-9999.ebuild b/app-emacs/magit/magit-3.3.0-r1.ebuild similarity index 62% copy from app-emacs/magit/magit-9999.ebuild copy to app-emacs/magit/magit-3.3.0-r1.ebuild index 031034b86493..f5457ac3eebe 100644 --- a/app-emacs/magit/magit-9999.ebuild +++ b/app-emacs/magit/magit-3.3.0-r1.ebuild @@ -15,22 +15,21 @@ if [[ ${PV} == *9999* ]] ; then else SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 ~arm ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" fi S="${S}/lisp" LICENSE="GPL-3+" SLOT="0" -DOCS=( ../README.md ../docs/AUTHORS.md ../docs/RelNotes ) -ELISP_TEXINFO="../docs/*.texi" +DOCS=( ../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes ) +ELISP_TEXINFO="../Documentation/*.texi" SITEFILE="50${PN}-gentoo.el" RDEPEND=" >=app-emacs/dash-2.19.1 >=app-emacs/transient-0.3.6 >=app-emacs/with-editor-3.0.5 - app-emacs/libegit2 " BDEPEND=" ${RDEPEND} @@ -45,3 +44,11 @@ src_prepare() { echo "(setq magit-version \"${PV}\")" > magit-version.el || die } + +pkg_postinst() { + elisp_pkg_postinst + + einfo "magit version 3.3.0 dropped necessity of the app-emacs/libegit2 package" + einfo "magit after 3.3.0 can now use the git executable directly," + einfo "if you need the libegit backend, then please add app-emacs/libegit2 to @world" +} diff --git a/app-emacs/magit/magit-3.3.0.ebuild b/app-emacs/magit/magit-3.3.0.ebuild deleted file mode 100644 index 87684a463d06..000000000000 --- a/app-emacs/magit/magit-3.3.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# 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 031034b86493..d9d3068acc4b 100644 --- a/app-emacs/magit/magit-9999.ebuild +++ b/app-emacs/magit/magit-9999.ebuild @@ -30,7 +30,6 @@ RDEPEND=" >=app-emacs/dash-2.19.1 >=app-emacs/transient-0.3.6 >=app-emacs/with-editor-3.0.5 - app-emacs/libegit2 " BDEPEND=" ${RDEPEND} @@ -45,3 +44,11 @@ src_prepare() { echo "(setq magit-version \"${PV}\")" > magit-version.el || die } + +pkg_postinst() { + elisp_pkg_postinst + + einfo "magit version 3.3.0 dropped necessity of the app-emacs/libegit2 package" + einfo "magit after 3.3.0 can now use the git executable directly," + einfo "if you need the libegit backend, then please add app-emacs/libegit2 to @world" +}
