gentoo resync : 03.11.2019

3 files changed, 16 insertions, 13 deletions

diff --git a/app-emacs/desktop+/Manifest b/app-emacs/desktop+/Manifest
index 13624d900105..89bede5f2791 100644
--- a/app-emacs/desktop+/Manifest
+++ b/app-emacs/desktop+/Manifest
@@ -1,4 +1,4 @@
-AUX 50desktop+-gentoo.el 72 BLAKE2B 76ac2f6e8e087bf06704946b008f2b9366a3e4eefd0d71d3d5b8d37295ff0dc5dc364c826b3ddf37c3d7cd1ecf47318534f9405683dfe13ad542e055df5361b0 SHA512 a97bf9092cd7e397f2b76d3e0459f9639180a84e481aae7c5b64c08713704173760df8aba7fc05d4aaa4cba7f4ae3b5d578c7db93f9cfcd120b688de4ca53cb4
+AUX 50desktop+-gentoo.el 458 BLAKE2B dc9343836e0850a4789fab5cb13d7725b8e1242e7330ce96a10839a48901fc7a7bd1197abcb43098290b96f72faedaccba6eddd6f1a3581c9f5da38a93681dd7 SHA512 2f058d7ebd9364b76beaa7e8ed56aba1ac45864b95206d6ef477c9e3cb841d28b28a0c2079be89bf026abb2220d92a0a04848431a6048443f911c501dbdb232d
 DIST desktop+-0.2.tar.gz 19596 BLAKE2B 601591977f981ebf66b9b01d397b08e3e0a72c73515760cf8b3333a0d25a9b8747a2f207ffeb13ed1c0292888049b4263ed6ecc875dd70273661a826be28a89b SHA512 3fe0647e506832e37378862d59f5d748f8db20d4ad776d7486ba3393f67047a69f0e5704042eec2e2327ead89b6b2e55196f5773efbe975f5913a6ec6f01269c
-EBUILD desktop+-0.2.ebuild 591 BLAKE2B 89b4f16e30aca0d226d2ad7fcc0df87ad2bffcaa7d4b27ac9d99ec7a86f3d7f7cbcf9aec25b83389d309a24e3c487e4a21fc7b508b5621f433de1bf09bb0221a SHA512 4047e82313c254fe9ffc2f06c804cc5f0d6ea3bf60461b80e5cbeefdb2a88c3aaff22e96efda374b20f0e63634391b96199792258dddc550d6a47a3051d44962
+EBUILD desktop+-0.2-r2.ebuild 530 BLAKE2B 14149bbf24d80816365ec88ff8f0ca5fd9fd9cd57cce33693872c64e23724d520d7aa3d31fe09e9470def11d9de55798bbd8f4d2e461dfd7f621b7109d317a69 SHA512 b7171f83213021da4239a76b87c82ebe0f80d506c46ed1886448094173cd50769130c801c3c2a03412e6faff9421b449059e37b6fedf2a2bc59e3a15ee0d7f24
 MISC metadata.xml 382 BLAKE2B e58ddca456331873929c0d7c527913d08879053ab26681b86071c3d0f7c9e8aa54765bbc482a2ef0b4ed8641626d375180ecfe98b309b1f6ad7ab6841040749a SHA512 0fcba01ddc8ebf9c735b2c095fe3563beb920e1e28022a20f224337c9e122b1e847fa10da179a7412e79b9208a643b7ca2d947434087942f58cd2317f66aebf5
diff --git a/app-emacs/desktop+/desktop+-0.2.ebuild b/app-emacs/desktop+/desktop+-0.2-r2.ebuild
index adf858b1a86d..b4016a3364f9 100644
--- a/app-emacs/desktop+/desktop+-0.2.ebuild
+++ b/app-emacs/desktop+/desktop+-0.2-r2.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..49a731f077e1 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)