commit: 15640f96beb337ec193dfc6d369b6a867eea7010 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Sun May 19 23:23:58 2024 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Sun May 19 23:32:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15640f96
app-emacs/magit: drop libgit IUSE and remove libegit support Bug: https://github.com/emacsorphanage/libegit2/issues/127 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> ...230912.ebuild => magit-3.3.0.50_p20230912-r1.ebuild} | 15 ++------------- app-emacs/magit/magit-9999.ebuild | 17 +++-------------- app-emacs/magit/metadata.xml | 3 --- 3 files changed, 5 insertions(+), 30 deletions(-) diff --git a/app-emacs/magit/magit-3.3.0.50_p20230912.ebuild b/app-emacs/magit/magit-3.3.0.50_p20230912-r1.ebuild similarity index 76% rename from app-emacs/magit/magit-3.3.0.50_p20230912.ebuild rename to app-emacs/magit/magit-3.3.0.50_p20230912-r1.ebuild index 2894d75d1d6f..5990133510ee 100644 --- a/app-emacs/magit/magit-3.3.0.50_p20230912.ebuild +++ b/app-emacs/magit/magit-3.3.0.50_p20230912-r1.ebuild @@ -26,7 +26,6 @@ fi LICENSE="GPL-3+" SLOT="0" -IUSE="libgit" DOCS=( ../README.md ../docs/AUTHORS.md ../docs/RelNotes ) ELISP_TEXINFO="../docs/*.texi" @@ -36,7 +35,6 @@ RDEPEND=" >=app-emacs/dash-2.19.1 >=app-emacs/transient-0.3.6 >=app-emacs/with-editor-3.0.5 - libgit? ( app-emacs/libegit2 ) " BDEPEND=" ${RDEPEND} @@ -48,16 +46,7 @@ RDEPEND+=" src_prepare() { default - use libgit || rm magit-libgit.el || die - echo "(setq magit-version \"${PV}\")" > magit-version.el || die -} -pkg_postinst() { - elisp_pkg_postinst - - if ! use libgit; then - einfo "The dependency on app-emacs/libegit2 is optional" - einfo "since magit version 3.3.0. Enable the \"libgit\" flag" - einfo "if you need the libgit backend." - fi + rm magit-libgit.el || die + 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 b4313fb02089..a9701898bfb4 100644 --- a/app-emacs/magit/magit-9999.ebuild +++ b/app-emacs/magit/magit-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,6 @@ S="${WORKDIR}/${P}/lisp" LICENSE="GPL-3+" SLOT="0" -IUSE="libgit" DOCS=( ../README.md ../docs/AUTHORS.md ../docs/RelNotes ) ELISP_TEXINFO="../docs/*.texi" @@ -33,7 +32,6 @@ RDEPEND=" >=app-emacs/dash-2.19.1 >=app-emacs/transient-0.3.6 >=app-emacs/with-editor-3.0.5 - libgit? ( app-emacs/libegit2 ) " BDEPEND=" ${RDEPEND} @@ -45,16 +43,7 @@ RDEPEND+=" src_prepare() { default - use libgit || rm magit-libgit.el || die - echo "(setq magit-version \"${PV}\")" > magit-version.el || die -} -pkg_postinst() { - elisp_pkg_postinst - - if ! use libgit; then - einfo "The dependency on app-emacs/libegit2 is optional" - einfo "since magit version 3.3.0. Enable the \"libgit\" flag" - einfo "if you need the libgit backend." - fi + rm magit-libgit.el || die + echo "(setq magit-version \"${PV}\")" > magit-version.el || die } diff --git a/app-emacs/magit/metadata.xml b/app-emacs/magit/metadata.xml index 6b01d379f24b..f81070d61ccb 100644 --- a/app-emacs/magit/metadata.xml +++ b/app-emacs/magit/metadata.xml @@ -16,9 +16,6 @@ Git operations. </longdescription> <stabilize-allarches/> -<use> - <flag name="libgit">Use libgit (<pkg>app-emacs/libegit2</pkg>)</flag> -</use> <upstream> <remote-id type="github">magit/magit</remote-id> </upstream>
