gentoo resync : 08.09.2019

4 files changed, 17 insertions, 62 deletions

diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
index f719febf72c1..b158e11a4309 100644
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -1,8 +1,6 @@
 AUX 70emacs-w3m-gentoo.el 96 BLAKE2B 90d452df120d37b1d19be08ed6e7b56edb588c95de6d124bdb8d25daa5c65fd8a19500e29e94a0936aa8efa2b51bae258e1431c6d1459d0d700e8d1dae0cbaca SHA512 7fd090a575e5b8f2df50bd751f301f5f4409dfd78eb45bb911c54a3cbfe76941a146630ea0e4089138c400caf45bb040f72e3ac335457061776e01e0aa3f5577
-DIST emacs-w3m-1.4.528_pre20140213.tar.xz 751532 BLAKE2B 14527b80ed3938f2685a98cf37633a9ba046b070d94dffd7c8082d65c09dfca4a63114aff55d0bfe85853d8623db55dd63db3e7d10142871287312281fa4ef59 SHA512 f4ccb41f2011354c091c9b07b2ab596f030a6b2e8ef2ef674db75c93e5bfe7347b8b3602283e169e7fd591c44b222482d1a399880c60176fc55a5e77ed728483
-DIST emacs-w3m-1.4.570_pre20170203.tar.xz 765108 BLAKE2B 75568e543719a25863ee943293f1a6ca4fff8b5af19a39d910efe5a8bfa7f311ef3620c34a6fcfe23e231e33d61c9ba5a03cf39b23155982079a0cf28471a341 SHA512 d1940679055d7ad74b7c417dc9e56061524f5afdf758075139e279c2df325af10eae334a6b83d40d39857237396da04744f19c293ffb8adb2e579c32ed118b52
 DIST emacs-w3m-1.4.625_pre20180518.tar.xz 788404 BLAKE2B f621071c8657cab848789d359d492e5bee0fe401af48871fa54298571d87192de7186b1ea92fd3d64e6f1713fd12e5750b49b7e54c94e8d3b455d614ef0d0683 SHA512 f60317024f6dca23699510c21f185c162a5b3f0be551c681ce69b3b46e6fc7860e875fa6fc46a0bfafd8e5e6aaa9f1b29af0e0731685fbca2ce2b636eca7ad93
-EBUILD emacs-w3m-1.4.528_pre20140213.ebuild 1120 BLAKE2B e136c6089f6e29092c17f09ff36199e081eb6cc28c7ef276ce6781aaf02e503271988664192628db8a7c8532c9f9c6bb09b67f488cae444166f097c2025d63b3 SHA512 270d48daafef67a4da1fe7d7a3f362c27732a59396bc4b845ba6d1be7f0e8865954b478042404efcdebf2ef0a2cfa390f3a13fe9906255f9bb2b2ea0954b2b8f
-EBUILD emacs-w3m-1.4.570_pre20170203.ebuild 1215 BLAKE2B 98cc7be2a22dab4a69444df06d37ece302e3b8211e80060c27a9ba0c425af7af5b53f9ce224bb3d3cd13be8995ec4f16ccf3717b50efac71199bbc8e55f7e8bf SHA512 9ec23005c602a2879d7ca26c7f44d67efa9663ee8d9d7c346aefd2b374166608bb6cef7d1d23d43c2ee295fc5420681ff63f74a6b8d0b007a83d9cc2c26cb3de
+DIST emacs-w3m-1.4.632_pre20181112.tar.xz 792664 BLAKE2B f60249a064cf9b63a46e0d9ae0d845d3877dd9ddfc1f7770609c68c9d9b60c67b9e461c399b83c5b01fbe94609914937fbf8177475274faa262d8fab0b4e6a19 SHA512 01ecb8a282484d164f5d630adac39784aec9f2e37975865f132be4b8b82d4be1e5667d903775c4adf0470109053b1b229f09472410a0ac7d1588e64c86c7b8f9
 EBUILD emacs-w3m-1.4.625_pre20180518.ebuild 1215 BLAKE2B 98cc7be2a22dab4a69444df06d37ece302e3b8211e80060c27a9ba0c425af7af5b53f9ce224bb3d3cd13be8995ec4f16ccf3717b50efac71199bbc8e55f7e8bf SHA512 9ec23005c602a2879d7ca26c7f44d67efa9663ee8d9d7c346aefd2b374166608bb6cef7d1d23d43c2ee295fc5420681ff63f74a6b8d0b007a83d9cc2c26cb3de
-MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
+EBUILD emacs-w3m-1.4.632_pre20181112.ebuild 1307 BLAKE2B 1f3fd16f58e2621e39dec449b35e7587730a3f23cdc7e59d676c4a94b961d07f7c064946098dc85dd7bf5451a7721e8ee70fac93452f8d08490f521be5afb4f6 SHA512 a18bee4ffe4dc6bb7afa26f27cb146aa484f32cc47ab473d0ca6469dedef3d5a3d7b191a4e847b924eeb33ab2c95a68b423a20e0ebbb209fe52249a0416e965f
+MISC metadata.xml 360 BLAKE2B 35118ae1bf39fcfa2171f3637f0bac4b96f9727800a5ecd6057fc94185bfde69b496f2eed3ecbfb177b2a797ca23868f455889bfe86e978775ee09ce89534dcd SHA512 bce2ca2010fac3a4afadee07e58978abeba393e2e21642059c2d9baabd51ae9301915f41a9cc028a43d47f0dca878fdfd365585662b1dd1db0278e8473e9cd5c
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.528_pre20140213.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.528_pre20140213.ebuild
deleted file mode 100644
index 7f9097a4aa50..000000000000
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.528_pre20140213.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp autotools
-
-DESCRIPTION="emacs-w3m is an interface program of w3m on Emacs"
-HOMEPAGE="http://emacs-w3m.namazu.org/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="l10n_ja"
-
-DEPEND="virtual/w3m"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-SITEFILE="70${PN}-gentoo.el"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	default
-}
-
-src_compile() {
-	emake all-en $(use l10n_ja && echo all-ja)
-}
-
-src_install() {
-	emake lispdir="${ED}${SITELISP}/${PN}" \
-		infodir="${ED}/usr/share/info" \
-		ICONDIR="${ED}${SITEETC}/${PN}" \
-		install-en $(use l10n_ja && echo install-ja) install-icons
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	dodoc ChangeLog* NEWS README
-	use l10n_ja && dodoc BUGS.ja NEWS.ja README.ja
-
-	DOC_CONTENTS="If you want to use the shimbun library, please emerge
-		app-emacs/apel and app-emacs/flim."
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.570_pre20170203.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.632_pre20181112.ebuild
index cfd2bfcc7f22..e2f6b0b1b9a8 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.570_pre20170203.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.632_pre20181112.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 autotools readme.gentoo-r1
 
@@ -12,10 +12,10 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="l10n_ja"
+IUSE="gzip-el l10n_ja"
 
-DEPEND="virtual/w3m"
-RDEPEND="${DEPEND}"
+RDEPEND="virtual/w3m"
+BDEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}"
 SITEFILE="70${PN}-gentoo.el"
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	default
+	econf --without-compress-install
 }
 
 src_compile() {
@@ -37,11 +37,13 @@ src_compile() {
 
 src_install() {
 	emake lispdir="${ED}${SITELISP}/${PN}" \
-		infodir="${ED}/usr/share/info" \
+		COMPRESS_INSTALL=$(usex gzip-el) \
+		install-lisp
+	emake infodir="${ED}/usr/share/info" \
 		ICONDIR="${ED}${SITEETC}/${PN}" \
-		install-en $(use l10n_ja && echo install-ja) install-icons
+		install-info-en $(use l10n_ja && echo install-info-ja) install-icons
 
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc ChangeLog* NEWS README
 	use l10n_ja && dodoc BUGS.ja NEWS.ja README.ja
 
diff --git a/app-emacs/emacs-w3m/metadata.xml b/app-emacs/emacs-w3m/metadata.xml
index c918cdef9591..e85e29b23db6 100644
--- a/app-emacs/emacs-w3m/metadata.xml
+++ b/app-emacs/emacs-w3m/metadata.xml
@@ -6,4 +6,7 @@
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <stabilize-allarches/>
+<use>
+  <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
+</use>
 </pkgmetadata>