From af8eefcbdfae2802779052b89bb2e02ee0776008 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Thu, 17 Oct 2019 14:50:23 +0200
Subject: [PATCH] app-emacs/desktop+: Inline autoloads.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 ...esktop+-0.2.ebuild => desktop+-0.2-r1.ebuild} | 16 ++++++----------
 app-emacs/desktop+/files/50desktop+-gentoo.el    |  9 ++++++++-
 2 files changed, 14 insertions(+), 11 deletions(-)
 rename app-emacs/desktop+/{desktop+-0.2.ebuild => desktop+-0.2-r1.ebuild} (68%)

diff --git a/app-emacs/desktop+/desktop+-0.2.ebuild b/app-emacs/desktop+/desktop+-0.2-r1.ebuild
similarity index 68%
rename from app-emacs/desktop+/desktop+-0.2.ebuild
rename to app-emacs/desktop+/desktop+-0.2-r1.ebuild
index adf858b1a86d..b4016a3364f9 100644
--- a/app-emacs/desktop+/desktop+-0.2.ebuild
+++ b/app-emacs/desktop+/desktop+-0.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit elisp
 
@@ -11,17 +11,13 @@ SRC_URI="https://github.com/ffevotte/desktop-plus/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 
-RDEPEND="app-emacs/dash app-emacs/f"
-DEPEND="${RDEPEND}"
+RDEPEND="app-emacs/dash
+	app-emacs/f"
+BDEPEND="${RDEPEND}"
 
 S="${WORKDIR}/desktop-plus-${PV}"
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/desktop+/files/50desktop+-gentoo.el b/app-emacs/desktop+/files/50desktop+-gentoo.el
index ca3b3828a3ed..6ccccf547c06 100644
--- a/app-emacs/desktop+/files/50desktop+-gentoo.el
+++ b/app-emacs/desktop+/files/50desktop+-gentoo.el
@@ -1,2 +1,9 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "desktop+-autoloads" nil t)
+(autoload 'desktop+-create "desktop+"
+  "Create a new session, identified by a name." t)
+(autoload 'desktop+-load "desktop+"
+  "Load a session previously created using `desktop+-create'." t)
+(autoload 'desktop+-create-auto "desktop+"
+  "Create a new session, identified by the current working directory." t)
+(autoload 'desktop+-load-auto "desktop+"
+  "Load a session previously created using `desktop+-create-auto'. t)
-- 
2.26.2