gentoo resync : 08.10.2021

4 files changed, 5 insertions, 77 deletions

diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 1b92097b6070..a8f87b94df76 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,12 +1,8 @@
 AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6
-DIST magit-2.13.1.tar.gz 520271 BLAKE2B fdffa561dccaafc2be56bf285e286859145e00f5037c99b5ab1ee50c9895eee56dbe8a5470e3a148e0150367bf92ed1c7cee4a35662f5c0bed0e4e7a2d49638c SHA512 f9f796fd6840788cebff62b316a0a1d708736e7a6962cd34d8ea86e94fb5a55c9e25f9aace17bceec199b2b931a0d5e586c4ab7d189c64ec6e5a9e42d041b269
 DIST magit-2.90.1.tar.gz 544968 BLAKE2B d3a38cf8c4d8c15529463028c4f6718d65bff044f91f58f2027c62d584202835d17229ec1db93d2990b5bb59403eabf7f12e7e91e2de519149ad40c274da5f25 SHA512 57a81fc72276907009fd3d05abbaed930d089d3e4621d539abb6ce2b24fd594950533f47d60682e25f0bd1c9f1ab3a16ba6b2698d79c6980f250ffd335be7789
-DIST magit-3.0.0.tar.gz 610528 BLAKE2B b667a6f12020f37303fa5d5c8bc71cb8f66bd25acbed704f3b3ba666b95b656da8c1b979d592e58171dd7bbaa4896b8fa144f52ec65e28976a88f42917df9323 SHA512 f1bb0d96906d327bb929cc45e2496a214513b1da4fd68e78a3db188f19dd69bd253c83e6b7881713989ee2a70d2f2cfdc9414263e0ee09be34cd72eb7fcb198d
-DIST magit-3.1.0.tar.gz 613295 BLAKE2B b2ab1e56d1dcab7476fcfd22563452c0b6977a90f9d614911f13fb9eb591b75197d3ba7f74a1acab9eee464d4ab8d3c63e2019e7b974b3895d4a9851e37887e7 SHA512 b4e884aea1d6b0cbf7861016b7fbc8214911ea84afd349320c929368a245da31105555e644d4e2e9f5aa6787202c9c30c24e62f64f5671cc036273c22ab65bfc
 DIST magit-3.2.0.tar.gz 618602 BLAKE2B c96226669bc5160460d24a1b9b36784d6764234e2e2690f059c362176e9a56fc742b961a0d4103049b33d958e44c092f4bbb75de3b3437ac178dae89e34028e0 SHA512 3b4bd5a13592814c0c638a26ba09c6e01a15db6af3555db41bc0adc53e8c08eaa2e7c58d8a105101fb46a8a04be0e09a0f2c86d365391430b42adee83df382f6
-EBUILD magit-2.13.1.ebuild 835 BLAKE2B 786b7e8ac034d16b1baef4620c1eca7b436dc3c13b75d97e246970d80a96575c5111d12edd3c34e792126706b1cc87ac295e8292361a917948f9988949730869 SHA512 78e0c514ebe0eeaaeb69c66980794886e8584e52dc1a695ff8a333eb91be08ca8ee6b8cfae902633aa7572d123b609a82d4e3ed96ff59e27c4f4f410a3004df8
+DIST magit-3.3.0.tar.gz 629283 BLAKE2B b07a071682ac543ba4a94b9bb8d78cedca1dcc4a7140ad2972d65e014666a2fea078611a7fd98356747d02431e5aa2456801e7e9a12e2b08027666b437863535 SHA512 22fa7c41cb18746b33f64ef936f88dbf229f998e2d2a5d066771711450753c98430335040d0a9812832f3fa39f96f6e88133d5274964332bc899fa7ef19422eb
 EBUILD magit-2.90.1.ebuild 828 BLAKE2B f2ddb437ef786073f6a9f7f5561cbc9452bfa274c3b1e31a49ae9f5984f5ca63d54468e51023e1990da073bc162808b38f12c9b1ee9a51509ea5d2fbf3de525c SHA512 a85ae33cef7625b40c7d8dd1794075adb4dbe0eae2b99a08395ab91bdd0ff590cec877298d5e20c1868322e6eba2dc1ee08ec9306b60be8c65a13cd15de0091d
-EBUILD magit-3.0.0.ebuild 823 BLAKE2B eead5e1ea1d1ba7e2969cf81358cc9089c1e7b7d5df257d93133033430e7ea5342cef6cd4aa3b74b1cf8615205f6e438ed1dc52704330bb8d0e5cf7a41fab80c SHA512 fcc54d58483dc52229468ea2e90150be80d3efce32e4cab7fdf8d12956c9a8a51143da6b99151f402934d777eaf6d0134bbf8f5381a696cd10fd489ebab8666e
-EBUILD magit-3.1.0.ebuild 823 BLAKE2B d7b1760ed5f5d5c95204933f5346eff2a40824b7fe6a44a689dd37afcc9b57ab53a9550ec89819074fd3d7c56ea399fee97b34a846690c2ba2c5acef3145bcbb SHA512 c319209ba031fd875f8838ee848d275682032de23f912aa763bfb7f6dbc2d6c76a04a5906bb173763cf3036357d2d88bfbf5c96ab787c7ab5d8f6ef674ecc6e1
 EBUILD magit-3.2.0.ebuild 823 BLAKE2B 0bd97294709e7cc31744117cf8cc92c00a1f7b3aac89a2085c1652510da6269ce9738302079f5828a909434fae9382387bf2d5ab1099cfe5dbab03e4d78cf680 SHA512 bfa883e5a9567aae7be3999536735fdc97707925095520a2307ddd01151052b70bd68d7991abfd3c50926793cdf673c277d0a7cf6b492775d3014606cb317e64
+EBUILD magit-3.3.0.ebuild 823 BLAKE2B 7106b5b0ecf09334a6c9c906b973fc79b7224e8e9d63028831b4d94ec0d50c86acdf5099d8b8924df6d083a8f92cfea8927a97c84d8aee6852868ac9e94bf656 SHA512 b50e63e2bc0c63588e61295524062bda2f0ae9b9a204d74370856dd0656c44ea4d26b2c9f89cfde034c668dafd16b32c37d181d884032942f37df06f23f5ab3d
 MISC metadata.xml 812 BLAKE2B a00fcce22437d2853e3c6ab16e57e284444eed91cc2ec90e443ac14ab61c60dd476b21504fd41fae27eb0180cebb236f86b35cee557a41ca34c854939c8a0ab8 SHA512 a0aa797e586bdb7657c9f4af4eaa8611a012146abbae4f47f47b124a7ebb9c2a8e65f9e862464bef0cc6f5671da40a2bd6e6cb78e0fb9d6ec02c362bcbd27399
diff --git a/app-emacs/magit/magit-2.13.1.ebuild b/app-emacs/magit/magit-2.13.1.ebuild
deleted file mode 100644
index e01da9137a1e..000000000000
--- a/app-emacs/magit/magit-2.13.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="https://magit.vc/"
-SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 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/${PV}.txt"
-
-DEPEND="
-	>=app-emacs/dash-2.14.1
-	>=app-emacs/ghub-2.0.1
-	>=app-emacs/magit-popup-2.12.3
-	>=app-emacs/with-editor-2.7.3
-"
-RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
-DEPEND="${DEPEND} sys-apps/texinfo"
-
-src_prepare() {
-	default
-	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
-}
diff --git a/app-emacs/magit/magit-3.0.0.ebuild b/app-emacs/magit/magit-3.0.0.ebuild
deleted file mode 100644
index 1315dee8fe75..000000000000
--- a/app-emacs/magit/magit-3.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-NEED_EMACS=25
-
-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 ~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.18.1
-	app-emacs/libegit2
-	>=app-emacs/transient-0.3.3
-	>=app-emacs/with-editor-3.0.4
-"
-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-3.1.0.ebuild b/app-emacs/magit/magit-3.3.0.ebuild
index 9eaf6e8ef348..5b015439899f 100644
--- a/app-emacs/magit/magit-3.1.0.ebuild
+++ b/app-emacs/magit/magit-3.3.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 NEED_EMACS=25
 
 inherit elisp
@@ -20,10 +20,10 @@ ELISP_TEXINFO="../Documentation/*.texi"
 DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/*"
 
 DEPEND="
-	>=app-emacs/dash-2.18.1
+	>=app-emacs/dash-2.19.1
 	app-emacs/libegit2
 	>=app-emacs/transient-0.3.6
-	>=app-emacs/with-editor-3.0.4
+	>=app-emacs/with-editor-3.0.5
 "
 RDEPEND="${DEPEND} >=dev-vcs/git-2.0.0"
 DEPEND="${DEPEND} sys-apps/texinfo"