From dfc7c3cb3c123af93fe762c4b7dc3ddae6dd2059 Mon Sep 17 00:00:00 2001
From: John Turner <jturner.usa+gentoo@gmail.com>
Date: Sun, 17 Oct 2021 15:07:17 -0400
Subject: [PATCH] app-emacs/eglot: prepared eglot for PR to include into gentoo

---
 app-emacs/eglot/Manifest                |  2 +-
 app-emacs/eglot/eglot-1.6.ebuild        | 20 ++++++++++++++++----
 app-emacs/eglot/files/50eglot-gentoo.el |  4 +---
 app-emacs/eglot/metadata.xml            | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 app-emacs/eglot/metadata.xml

diff --git a/app-emacs/eglot/Manifest b/app-emacs/eglot/Manifest
index 48bcd5c..1c18d5f 100644
--- a/app-emacs/eglot/Manifest
+++ b/app-emacs/eglot/Manifest
@@ -1 +1 @@
-DIST eglot-1.6.tar.gz 288078 SHA512 51227c8e2b0a1dd9a63ededbea592f01616ff728c34c330400c078212fef3f3e747e6dd30ba312523cbe60c7ea663a7af9d83300210cf331ea6162d2db5c7e41
+DIST eglot-1.6.tar.gz 288078 BLAKE2B a2214d216d0eeaca32d974c6686696dfcf141b3384741bc8cce0d02abb508eb5713933bc227d12a07f4b87fc34601431845b1b8e519538ae04ecc74b24db4004 SHA512 51227c8e2b0a1dd9a63ededbea592f01616ff728c34c330400c078212fef3f3e747e6dd30ba312523cbe60c7ea663a7af9d83300210cf331ea6162d2db5c7e41
diff --git a/app-emacs/eglot/eglot-1.6.ebuild b/app-emacs/eglot/eglot-1.6.ebuild
index c9ebccb..913bb95 100644
--- a/app-emacs/eglot/eglot-1.6.ebuild
+++ b/app-emacs/eglot/eglot-1.6.ebuild
@@ -1,16 +1,28 @@
-EAPI=7
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.1"
 
 inherit elisp
 
-DESCRIPTION="Minimal Emacs LSP client"
+DESCRIPTION="A minimal Emacs LSP client"
 HOMEPAGE="https://github.com/joaotavora/eglot"
 SRC_URI="https://github.com/joaotavora/eglot/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="test mirror"
+# test requires internet connection to install several language servers, one of which
+# is not packaged
+RESTRICT="test"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_REMOVE="eglot-tests.el"
-DOCS="README.md NEWS.md"
+DOCS=( README.md NEWS.md )
+
+src_install() {
+	elisp-make-autoload-file "${S}"/${PN}-autoload.el "${S}"/
+	elisp_src_install
+}
diff --git a/app-emacs/eglot/files/50eglot-gentoo.el b/app-emacs/eglot/files/50eglot-gentoo.el
index 9bf4916..b8a7e2b 100644
--- a/app-emacs/eglot/files/50eglot-gentoo.el
+++ b/app-emacs/eglot/files/50eglot-gentoo.el
@@ -1,4 +1,2 @@
-;;; eglot site-lisp configuration
 (add-to-list 'load-path "@SITELISP@")
-(autoload 'eglot "eglot" nil t)
-(autoload 'eglot-ensure "eglot" nil t)
+(load "@SITELISP@/eglot-autoload.el")
diff --git a/app-emacs/eglot/metadata.xml b/app-emacs/eglot/metadata.xml
new file mode 100644
index 0000000..4d327b8
--- /dev/null
+++ b/app-emacs/eglot/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>jturner.usa+gentoo@gmail.com</email>
+    <name>John Turner</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">joaotavora/eglot</remote-id>
+    <doc>https://github.com/joaotavora/eglot/blob/master/README.md</doc>
+  </upstream>
+</pkgmetadata>
-- 
2.39.5