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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E58B61581D3 for ; Sun, 19 May 2024 23:32:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91648E29E7; Sun, 19 May 2024 23:32:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FC32E29E7 for ; Sun, 19 May 2024 23:32:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75506335C7E for ; Sun, 19 May 2024 23:32:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A542186B for ; Sun, 19 May 2024 23:32:52 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1716161549.15640f96beb337ec193dfc6d369b6a867eea7010.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/magit/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emacs/magit/magit-3.3.0.50_p20230912-r1.ebuild app-emacs/magit/magit-3.3.0.50_p20230912.ebuild app-emacs/magit/magit-9999.ebuild app-emacs/magit/metadata.xml X-VCS-Directories: app-emacs/magit/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 15640f96beb337ec193dfc6d369b6a867eea7010 X-VCS-Branch: master Date: Sun, 19 May 2024 23:32:52 +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: f8af75b9-774f-4987-b454-e2c5fe35302d X-Archives-Hash: 056abc648745fe4167935a17a54f33b9 commit: 15640f96beb337ec193dfc6d369b6a867eea7010 Author: Maciej Barć gentoo org> AuthorDate: Sun May 19 23:23:58 2024 +0000 Commit: Maciej Barć gentoo 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ć 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. - - Use libgit (app-emacs/libegit2) - magit/magit