11 files changed, 141 insertions, 4 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 9076809774e5..2068678137d9 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
index afff2f3c9311..5e46af0afbd6 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -1,4 +1,6 @@
-AUX 50company-mode-gentoo.el 79 BLAKE2B c9b00690d98498b53fa329adf5279ee341c03c73cfd12b70e1474189cc9c9de07bca276ef9fad35f346825c4daab0212e8965069a2a0706cec690350df24fbf7 SHA512 8c3c1d4a50bfd4729f8a06f33bf9d754b5865814cf15eee1f3c84c6726734f8ff26c21547f1453f7417a0b9d008fe7804104ee6e30f13c54625d2b4b6faa7e99
+AUX 50company-mode-gentoo.el 221 BLAKE2B 353a829a13e544c5da76d7a39a0af76310bc94384e2a21729bbb3912edb09423f03cbc078436c491da5741c9120d6c2047170eb3d96907305a0def4fd00c3166 SHA512 5456259e279908c8c2042c1c1b06bdf6d4a3ecfadb6c4ec04e3b13ecace4e126519635985bac45d77eb6b25bc575a8663caed2e41997b3002884269cc44b0dbf
 DIST company-mode-0.9.10.tar.gz 85982 BLAKE2B 393e8ff31f4a88d1c156418bd0c827572ec078b833e78bd1007779961e9fb852737f12a5c1aeba154ebba53d81058bdc2871f7d88880aaa7dd8cb9692461c8fb SHA512 b6571c55bcf68a5e83e7c92c8b53e0ac6b4e84bce1246331a7da4495f4ee5c3ab38035310fd2eb7a87748db1c034996d99c7ead8aa831d552800642b31cf9fe0
-EBUILD company-mode-0.9.10.ebuild 510 BLAKE2B a4b4162357dc232a2614d4e942e07555b6281b8965e667ae39c721d2698b6ead847771a16b1faecee72dae707f7cf2d4fc571f10897f188f01672168e23d4461 SHA512 18aedf133e54a1a0fe9662aed54077e59546cf9bde74d8dd36846b37bf62ab9df217d9dad20d90cf3226098f9c25efbf16f477f82f46294dd902a5f7241e13c1
+DIST company-mode-0.9.13.tar.gz 88074 BLAKE2B 8704d45d0dec15d7fbe39edcdaa3e348263eef4e78a9c55160b4c83df892b73241659dec685e31d7eab5fceaf34a956a7d81d0ec7d3ce134ffda0415a44a7c8c SHA512 d253504e38515335b9a7186c5664e2700ae171e215e8eef1fca28c267d610882dd29c03701efb9d71eac9ec855807aa956411de08a3bd42508f0b0aba38d4dd9
+EBUILD company-mode-0.9.10.ebuild 509 BLAKE2B 989fda1916d89b73575df28f7faaf3e9fc6c01e9b599bfa6c40f4624f8baab949dea1bca2bc2a4968307fc444eb972b079449bd4e560fb29cc92877ed6e35476 SHA512 4f7ad07ac7dc54c5b58ab2bbcefddcecd36199ebbe80602ef1ec3f01f061bef874c244db115fe00d2b90bb2947966ce8d715f80f5ef17c63d12c657660ef5535
+EBUILD company-mode-0.9.13.ebuild 509 BLAKE2B 989fda1916d89b73575df28f7faaf3e9fc6c01e9b599bfa6c40f4624f8baab949dea1bca2bc2a4968307fc444eb972b079449bd4e560fb29cc92877ed6e35476 SHA512 4f7ad07ac7dc54c5b58ab2bbcefddcecd36199ebbe80602ef1ec3f01f061bef874c244db115fe00d2b90bb2947966ce8d715f80f5ef17c63d12c657660ef5535
 MISC metadata.xml 370 BLAKE2B 1628845f0ee6e98db3af16a9c547f9b3273e19bf5d0a401c33eeeda05e245f4ffe723333b73f42e7112152e4c4045787dca44b22e41b6316dccbb5033190f84e SHA512 6eb79238a729a9b373738f398badfa7a41895f60536c577add191668523bedeafd8a34f774c14a188db175843e489a68fac6857bd7fef44e6596dcb5ffbdaf9f
diff --git a/app-emacs/company-mode/company-mode-0.9.10.ebuild b/app-emacs/company-mode/company-mode-0.9.10.ebuild
index a0b76f2616a8..2e6e2a23a92b 100644
--- a/app-emacs/company-mode/company-mode-0.9.10.ebuild
+++ b/app-emacs/company-mode/company-mode-0.9.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit elisp
 
 DESCRIPTION="In-buffer completion front-end"
-HOMEPAGE="https://company-mode.github.com/"
+HOMEPAGE="https://company-mode.github.io/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/company-mode/company-mode-0.9.13.ebuild b/app-emacs/company-mode/company-mode-0.9.13.ebuild
new file mode 100644
index 000000000000..2e6e2a23a92b
--- /dev/null
+++ b/app-emacs/company-mode/company-mode-0.9.13.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="In-buffer completion front-end"
+HOMEPAGE="https://company-mode.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+# Note: company-mode supports many backends, and we refrain
+# from including them in RDEPEND.
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md NEWS.md"
diff --git a/app-emacs/company-mode/files/50company-mode-gentoo.el b/app-emacs/company-mode/files/50company-mode-gentoo.el
index cd85457fe91e..2cffc8ab76f7 100644
--- a/app-emacs/company-mode/files/50company-mode-gentoo.el
+++ b/app-emacs/company-mode/files/50company-mode-gentoo.el
@@ -1,2 +1,5 @@
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'company-mode "company" nil t)
+(autoload 'global-company-mode "company" nil t)
+(autoload 'company-manual-begin "company" nil t)
+(autoload 'company-complete "company" nil t)
diff --git a/app-emacs/libegit2/Manifest b/app-emacs/libegit2/Manifest
new file mode 100644
index 000000000000..11ecb52c303b
--- /dev/null
+++ b/app-emacs/libegit2/Manifest
@@ -0,0 +1,4 @@
+AUX 50libegit2-gentoo.el 199 BLAKE2B f9f7b6d2c6d8a70d37e698dd71a40b0ccb4224c1276393adfe2eb546313cc3bea29136820f98d3579f6cdeafd0559e1739150be503233de44dddefd3f97b66b6 SHA512 067030b050715f80251b28a179c0b4779efd311c4d5c1e0bb2bdd10f95442cd8f243c45c81f004ad8362740aa0139667324ef9c829abec7291ddfe801ea4c67a
+DIST libegit2-0.0.20200515.tar.gz 132122 BLAKE2B 2e8e06fb833e5ea2ee0f4e1fa760d30e91235a9b9c4a465de6d8a12d6c8431bdc85204546ba36c36f206e2788d9f1cda00d578c1c40057ccfb3f2117e8302013 SHA512 f604591ba272ea1cef8c428f644c0cfcc4ba2438a55c2b7a0dd1cdcb15836c755c0c6bdc6c42bd6da05935bba7fdac30efe65f26307599b07e591f4efdd1e897
+EBUILD libegit2-0.0.20200515.ebuild 1054 BLAKE2B d8e402885e7462fefb237d6740f822b4ad229611a01939c2fd3611aa40ff57652a8dff254d504b45bdc0ceafbc8032e154cf39b31e8b999a41657aa89ed9c666 SHA512 7bb6ecc9c06e3517259efd08500764902a3f874dfccead423207dd9f27ef47f6e86fad5f874f29e55f6d4230d84e307c6268c37c50be60f4a67694e074fc0520
+MISC metadata.xml 481 BLAKE2B d06b7cfec5217134e02da97f1ddce3c04b515ac9739ba5ae2044a00bad58350b1da130d07db461fca4c0fed83273ddcbe310cec4b5247b95ee980122926ee62f SHA512 777c402b7b95a7b37e920553080bfb848529f0fa74cf15cc3d3e0664405dd9c7c711f248f3e3421d2019e89b4b50aa5cd42994796462a3faec09c3adbeb6f4fb
diff --git a/app-emacs/libegit2/files/50libegit2-gentoo.el b/app-emacs/libegit2/files/50libegit2-gentoo.el
new file mode 100644
index 000000000000..4117c7926cd8
--- /dev/null
+++ b/app-emacs/libegit2/files/50libegit2-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'load-path "@EMACSMODULES@")
+(defvar libgit--build-dir "@EMACSMODULES@")
+(autoload 'libgit-load "libegit2" "Load the `libegit2` dynamic module." t)
diff --git a/app-emacs/libegit2/libegit2-0.0.20200515.ebuild b/app-emacs/libegit2/libegit2-0.0.20200515.ebuild
new file mode 100644
index 000000000000..866475b7aba7
--- /dev/null
+++ b/app-emacs/libegit2/libegit2-0.0.20200515.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=26
+COMMIT="0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a"
+
+BUILD_DIR=.
+
+inherit cmake elisp
+
+DESCRIPTION="Emacs bindings for libgit2"
+HOMEPAGE="https://github.com/magit/libegit2"
+SRC_URI="https://github.com/magit/libegit2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-libs/libgit2-1.0.0"
+RDEPEND="${DEPEND}
+	>=app-editors/emacs-26:*[dynamic-loading]"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+# The tests seem to be written specifically for the libegit2 git
+# repository.
+RESTRICT="test"
+
+src_prepare() {
+	# Don't build against the bundled submodule
+	sed -i -e '/subdirectory.*libgit2/ s/^/#/' CMakeLists.txt || die
+
+	rm -f test.el || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	elisp_src_compile
+}
+
+src_install() {
+	elisp_src_install
+	elisp-modules-install ${PN} libegit2.so
+}
diff --git a/app-emacs/libegit2/metadata.xml b/app-emacs/libegit2/metadata.xml
new file mode 100644
index 000000000000..717abc0dea75
--- /dev/null
+++ b/app-emacs/libegit2/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+  This is an experimental module for libgit2 bindings to Emacs, intended to boost the performance of magit.
+</longdescription>
+<upstream>
+  <remote-id type="github">magit/libegit2</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 60d409614f87..77ad7188dd99 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,6 +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
 EBUILD magit-2.13.1.ebuild 835 BLAKE2B 786b7e8ac034d16b1baef4620c1eca7b436dc3c13b75d97e246970d80a96575c5111d12edd3c34e792126706b1cc87ac295e8292361a917948f9988949730869 SHA512 78e0c514ebe0eeaaeb69c66980794886e8584e52dc1a695ff8a333eb91be08ca8ee6b8cfae902633aa7572d123b609a82d4e3ed96ff59e27c4f4f410a3004df8
 EBUILD magit-2.90.1.ebuild 828 BLAKE2B f2ddb437ef786073f6a9f7f5561cbc9452bfa274c3b1e31a49ae9f5984f5ca63d54468e51023e1990da073bc162808b38f12c9b1ee9a51509ea5d2fbf3de525c SHA512 a85ae33cef7625b40c7d8dd1794075adb4dbe0eae2b99a08395ab91bdd0ff590cec877298d5e20c1868322e6eba2dc1ee08ec9306b60be8c65a13cd15de0091d
+EBUILD magit-3.0.0.ebuild 823 BLAKE2B eead5e1ea1d1ba7e2969cf81358cc9089c1e7b7d5df257d93133033430e7ea5342cef6cd4aa3b74b1cf8615205f6e438ed1dc52704330bb8d0e5cf7a41fab80c SHA512 fcc54d58483dc52229468ea2e90150be80d3efce32e4cab7fdf8d12956c9a8a51143da6b99151f402934d777eaf6d0134bbf8f5381a696cd10fd489ebab8666e
 MISC metadata.xml 811 BLAKE2B aa2a5aaf1024e2a75c24cad4d01622884ffde259c3a2d9869df9629741d4a19da87c5933efd2aa58a9fc0256150e8bf5e68bef99595993154cf06027f2de4b83 SHA512 ec3ade59fbba30a15b3b728f293884c9f5cf532a8ca92c984c7978b73061cbd5a7b4b1fc68af15d28990d13f50cad688d7cc8229e9e38988bdbdbcf2fbe2a900
diff --git a/app-emacs/magit/magit-3.0.0.ebuild b/app-emacs/magit/magit-3.0.0.ebuild
new file mode 100644
index 000000000000..1315dee8fe75
--- /dev/null
+++ b/app-emacs/magit/magit-3.0.0.ebuild
@@ -0,0 +1,34 @@
+# 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
+}