From 6b89cba67f554b60d139fd07623aef5cc724ec91 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 20 Jul 2023 19:08:44 +0100 Subject: gentoo auto-resync : 20:07:2023 - 19:08:44 --- app-emacs/magit/Manifest | 3 +- .../magit/files/magit-3.3.0-libgit-unavail.patch | 15 ++++++ app-emacs/magit/magit-3.3.0-r3.ebuild | 59 -------------------- app-emacs/magit/magit-3.3.0-r4.ebuild | 62 ++++++++++++++++++++++ 4 files changed, 79 insertions(+), 60 deletions(-) create mode 100644 app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch delete mode 100644 app-emacs/magit/magit-3.3.0-r3.ebuild create mode 100644 app-emacs/magit/magit-3.3.0-r4.ebuild (limited to 'app-emacs/magit') diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest index b856c3ea9cf2..aa30b31e4bdc 100644 --- a/app-emacs/magit/Manifest +++ b/app-emacs/magit/Manifest @@ -1,10 +1,11 @@ AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6 AUX magit-3.3.0-inhibit-libgit.patch 629 BLAKE2B 281721586bc1e37ab9655366ba09d4bdc2b509c7a9c86cbf6bbd79aec4583ade3f43ea26449dc14be87d084154c2c77403cbd088c6249f0a882e514d255e1c68 SHA512 cefd33afc1d2f939ecb6b7724dfb2e907e4d6be2453eab2c42ce9a11c99c5cc43c0df4ed999c8cc0b176fa06f45d27091d548fb20bd27e5f03745f8a9b0663d3 +AUX magit-3.3.0-libgit-unavail.patch 388 BLAKE2B 5059db82ca0838e156f761f85699e02e3c3cd8b74fb816461106f1f79f6f2c31c4ad75be496c8701f9a62f8e4ffc75b3bf66f6f38954ff7a53a40e96daf9aa4f SHA512 7c246a20e506063481145b8f216bd4bdf059ab4fccaf49bd99f3cbf6999e9a3df6eb504ca83ca286d23a2616b16e6f8ead77477a52e40e8988ff53e245b89357 DIST magit-3.2.0.tar.gz 618602 BLAKE2B c96226669bc5160460d24a1b9b36784d6764234e2e2690f059c362176e9a56fc742b961a0d4103049b33d958e44c092f4bbb75de3b3437ac178dae89e34028e0 SHA512 3b4bd5a13592814c0c638a26ba09c6e01a15db6af3555db41bc0adc53e8c08eaa2e7c58d8a105101fb46a8a04be0e09a0f2c86d365391430b42adee83df382f6 DIST magit-3.3.0.tar.gz 629283 BLAKE2B b07a071682ac543ba4a94b9bb8d78cedca1dcc4a7140ad2972d65e014666a2fea078611a7fd98356747d02431e5aa2456801e7e9a12e2b08027666b437863535 SHA512 22fa7c41cb18746b33f64ef936f88dbf229f998e2d2a5d066771711450753c98430335040d0a9812832f3fa39f96f6e88133d5274964332bc899fa7ef19422eb EBUILD magit-3.2.0.ebuild 807 BLAKE2B 418802ee37923255aa288b501f4888c36f4018a2dd4bd52672f767811a714a63a7c95987984f9d481b1422af00a1bb4a8575032bc2683537af626f3134aa3351 SHA512 59be2f1efbc33801bfe959158147db52193be79c5641235ed0fcdca6ce887dd08b24e3472191b516047a184d0a72065fac2f1ea2b4f0e80fe6258bff7a56194d EBUILD magit-3.3.0-r2.ebuild 1370 BLAKE2B 61f27f958f6789a6b711c501a327356803fd9b0c2e3f3253b843710e917fb44ece5220f7b3173bb7e38b444599ba59fc2e71d5d58e0a1c883292cf0d67278def SHA512 eaac1d916e5149865678b90294ff27e6b4613b2c4b58438204c97174f9712c625498865f9a9ee733363d6e42a9b49b80be8f3af640e1ac4fabc0ff13c7e20916 -EBUILD magit-3.3.0-r3.ebuild 1327 BLAKE2B b9493efeb3b0321ea0896892e6c3746f10b824d1d261c70b1d666c865bd1d9301bbe7e2503e8f1baa388adb510b609e7084787ca4ab7d51456c775d4479412dd SHA512 53d2dffed5547cff3e39709bf009db281cb4c2b814a76feaa4b201b14d69525f5fd4f1096f0d886940866084273eeacf2c9c799e4b00bdb890898d7d3ba2c776 +EBUILD magit-3.3.0-r4.ebuild 1369 BLAKE2B cf05cd5c5c6936661d26ac33e8e04bbaa813587013fc5181ceeb81deb2e539a557e31536bc6d6124612c979294fc3972b6df2c7dc349119eef7aa00df0d4cdb5 SHA512 c9bec5f21f5b9716cc90d8f8fa4d22042e4dc297d3eba8ca870f21a7f3415dc176ffd458aca32c14e97fcec280d03cfb211eb8ba528d65ede5a1de260f140c9b EBUILD magit-3.3.0.ebuild 826 BLAKE2B ca539102915e7ed93337ef91930ade8bccf28b6584618015e039602fe4d3cd1877689005ef08abcdecb981a116b334a41000683c0258440a1b18ab9905612748 SHA512 722ecf9f5041b7f117171ee33fbd3d95270a47a53b34bcb7b58a2c222ef9d3178343c7274fa1d8832ac61ed3400ea07a21dcc4950385b29bed3e94b409c8c04d EBUILD magit-9999.ebuild 1197 BLAKE2B 3e31eb726e742f2d73ef632f9d1f4c433edb295624c04506a777b8e458ac0db5523ab3b629dafbe7315426779488b6e9e546a18eaf64cd4d37e9e5b27d400b51 SHA512 3222319fa7dabdd6dc94eb020ea8002006c64e466214fa533aa0d804993f11d53702da79c45df0104d5e1c0a8b1e62182b9b90ee3f1b29954d4f426e00f8154e MISC metadata.xml 897 BLAKE2B ffc0c9c8260fd035b5d2d73b87ca250aa1272ed22ee8b6ce470e103a01a47bff44becb1ccfbcbc3bcfa50c19c94461100fb2032f0d2f212a6fa007ffd08a2421 SHA512 1236dba8fc89a33863db76c1ed16a2541508a21cd3901b369c9f5ff79af4a37dee2c9448b489900faa7f0627b3718adb17d91bafe02fdf7c261b1401108a9a7b diff --git a/app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch b/app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch new file mode 100644 index 000000000000..6373e720dffc --- /dev/null +++ b/app-emacs/magit/files/magit-3.3.0-libgit-unavail.patch @@ -0,0 +1,15 @@ +Suppress warning message about missing magit-libgit +https://bugs.gentoo.org/910593 + +--- lisp/magit-core.el ++++ lisp/magit-core.el +@@ -41,7 +41,8 @@ + (require 'magit-transient) + (require 'magit-autorevert) + +-(when (magit--libgit-available-p) ++(when (and (not magit-inhibit-libgit) ++ (magit--libgit-available-p)) + (condition-case err + (require 'magit-libgit) + (error diff --git a/app-emacs/magit/magit-3.3.0-r3.ebuild b/app-emacs/magit/magit-3.3.0-r3.ebuild deleted file mode 100644 index eaee9f6713a7..000000000000 --- a/app-emacs/magit/magit-3.3.0-r3.ebuild +++ /dev/null @@ -1,59 +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/ - https://github.com/magit/magit/" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/magit/magit.git" -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" -fi -S="${WORKDIR}/${P}/lisp" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="libgit" - -PATCHES=( "${FILESDIR}"/${P}-inhibit-libgit.patch ) -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 - libgit? ( app-emacs/libegit2 ) -" -BDEPEND=" - ${RDEPEND} - sys-apps/texinfo -" -RDEPEND+=" - >=dev-vcs/git-2.0.0 -" - -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 -} diff --git a/app-emacs/magit/magit-3.3.0-r4.ebuild b/app-emacs/magit/magit-3.3.0-r4.ebuild new file mode 100644 index 000000000000..46f40464fe43 --- /dev/null +++ b/app-emacs/magit/magit-3.3.0-r4.ebuild @@ -0,0 +1,62 @@ +# 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/ + https://github.com/magit/magit/" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/magit/magit.git" +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" +fi +S="${WORKDIR}/${P}/lisp" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="libgit" + +PATCHES=( + "${FILESDIR}"/${P}-inhibit-libgit.patch + "${FILESDIR}"/${P}-libgit-unavail.patch +) +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 + libgit? ( app-emacs/libegit2 ) +" +BDEPEND=" + ${RDEPEND} + sys-apps/texinfo +" +RDEPEND+=" + >=dev-vcs/git-2.0.0 +" + +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 +} -- cgit v1.2.3