gentoo resync : 15.12.2019

5 files changed, 56 insertions, 34 deletions

diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index d7419d4074dd..eaabe6f36d58 100644
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index 0d398d21accb..b183ee535331 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,5 +1,5 @@
-DIST ebuild-mode-1.46.tar.xz 34928 BLAKE2B ee2686f3862fc7aa5f820311a6e45d62b153426134422c56a2a6222795163f454291da5510e86c52edee1b22b7bec641ceb132147b29243ee647774a8e91342b SHA512 e7a81c9a3692db1c6db41e138b382e3027094529d4ad3244ecde5a245340f911f8a63ce8ce8bbd7910116c704bcf8fcce90142b8863ecc1b543760ef1411833e
 DIST ebuild-mode-1.47.tar.xz 34812 BLAKE2B abbc3be110239f9e1765d4f1293856a7fc616d497ac5256a28b7d78fc57c8d725abccbf7b9e5908cb85f9a684dc1be26ab88152d836c2ec3a481802091729717 SHA512 13ee756ef914a314f6705df78735a3926a50d156f4abeff917bed68298aec81f072d53a60f7b985d9bb2caddcdbf65fd26f6c9189e6c5c1822674d9142b7db17
-EBUILD ebuild-mode-1.46.ebuild 697 BLAKE2B d8336118054f744caa1f8673c2d7a81b40ac2164f7a5bcf8ecfc93a13b3d9eb9f84db1ab9de6a9290714866e3257b76c23805029a91a297a1a19b622308ba614 SHA512 ff4d5d6c10887d69b602e4827c4d170469ef2f545ed663269ea29b7913ccd4e134b7e2cbd58b77282c357e308f03a527c03de0ad800bc9636c35aeefe87866d3
-EBUILD ebuild-mode-1.47.ebuild 697 BLAKE2B 926600d5707cccd5d47d486475d60ccd26622e8208aa14dc4b61b3f9504c700eec3da5c868948a38e9a035f32144a988d0835c8a3100e2d522424071527dff60 SHA512 ad3864638cdce34cd4e0993a1a6a448377bc541683db035f4ffbdeb799a5ef21007ecd3018673c7af8cc542bd5aa76e1f65f96b544c800d3faa09b2fcc4a4c60
+DIST ebuild-mode-1.48.tar.xz 34764 BLAKE2B cd54e8a1b65232538924aafd10f6dcadd457634313ccf08c97b841d0255f02496a0e3308a4d9cdcd5cbbc41f9f5c373e14641fa31202cfa369fd10f8562cf5da SHA512 d37d7951030877454416dca761c9775eadaa514f29bba8745f61c0f3a5ecb42675c230301286d5a8cce76d8ef7082f5db76151f69b35f6a999118c5e60a5f9c0
+EBUILD ebuild-mode-1.47.ebuild 1000 BLAKE2B 4ab2d003b3bb30b4e6317812b91e0c6731e42051616d2ec4c7693845c8d8882281f6cbaecb132bb331977e0b10f7d518929c0702185313785ef1c09d6b064508 SHA512 7fcccdb1d9375a23e983d97cee0c3ada87c2b2647aa568bce93d373848976754c9d33b68f9e36fea2c463a9d450d691fa03ce0c5ff6b770f4f7ec8267c5d13f8
+EBUILD ebuild-mode-1.48.ebuild 1003 BLAKE2B 17e3b6dfbfeed21163f2be29784897ef4516bed6dfbcd63779ad276a680a4ce6ade481c6811434cb5775d390c07bb15b8b7d7ea915c0b73a0982f412350c5de9 SHA512 806103c34dc0a3f541f0dbf86bc8d3867ee63c4962467cbdb7e8805cb160a8058fda55c9b58c25a0e9cbda45cc5a0f1f8367d33f7cde84fc31d9a256de15ceec
 MISC metadata.xml 417 BLAKE2B d442b7726c175c95922475904d9dbb6260ecf53140bf041121fed80c3183142bdf7bcc88f7f87eeeab0dd91a81eacf507e2c4ea8cc8f86dbf6b60c52fcec868d SHA512 459969f9a78209b1058fb5fed220192bddd532c9dabc8e5d340c040bef0e454f08fe3896b33bcddaa011fd4639351f6f6a33ba6669895e99e001810324c101ad
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.46.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.46.ebuild
deleted file mode 100644
index c880a91f8ae1..000000000000
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.46.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xemacs-elisp
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-
-RDEPEND=">=app-editors/xemacs-21.4.20-r5
-	app-xemacs/sh-script"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
-		-f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
-	xemacs-elisp-make-autoload-file \
-		ebuild-mode.el gentoo-newsitem-mode.el || die
-}
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
index e65982b198ea..9ed99b9368d9 100644
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit xemacs-elisp
-
 DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
 SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
@@ -15,11 +13,24 @@ KEYWORDS="amd64 hppa x86"
 
 RDEPEND=">=app-editors/xemacs-21.4.20-r5
 	app-xemacs/sh-script"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
 
 src_compile() {
-	${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
-		-f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
-	xemacs-elisp-make-autoload-file \
+	local XEMACS="${EPREFIX}/usr/bin/xemacs"
+
+	"${XEMACS}" -batch -q --no-site-file \
+		-eval "(add-to-list 'load-path \".\")" \
+		-f batch-byte-compile \
+		ebuild-mode.el gentoo-newsitem-mode.el || die
+
+	"${XEMACS}" -batch -q --no-site-file \
+		-eval "(setq autoload-package-name \"${PN}\")" \
+		-eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
+		-l autoload -f batch-update-autoloads \
 		ebuild-mode.el gentoo-newsitem-mode.el || die
 }
+
+src_install() {
+	insinto /usr/share/xemacs/site-packages/lisp/${PN}
+	doins *.el *.elc
+}
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild
new file mode 100644
index 000000000000..d329637b970d
--- /dev/null
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+RDEPEND=">=app-editors/xemacs-21.4.20-r5
+	app-xemacs/sh-script"
+BDEPEND="${RDEPEND}"
+
+src_compile() {
+	local XEMACS="${EPREFIX}/usr/bin/xemacs"
+
+	"${XEMACS}" -batch -q --no-site-file \
+		-eval "(add-to-list 'load-path \".\")" \
+		-f batch-byte-compile \
+		ebuild-mode.el gentoo-newsitem-mode.el || die
+
+	"${XEMACS}" -batch -q --no-site-file \
+		-eval "(setq autoload-package-name \"${PN}\")" \
+		-eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
+		-l autoload -f batch-update-autoloads \
+		ebuild-mode.el gentoo-newsitem-mode.el || die
+}
+
+src_install() {
+	insinto /usr/share/xemacs/site-packages/lisp/${PN}
+	doins *.el *.elc
+}