gentoo resync : 08.09.2019

22 files changed, 113 insertions, 252 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 3d49fd1dd4e8..ecaa4ffa09d4 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/actionscript-mode/Manifest b/app-emacs/actionscript-mode/Manifest
index 9a7b8b7262d8..5f7671a5a511 100644
--- a/app-emacs/actionscript-mode/Manifest
+++ b/app-emacs/actionscript-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50actionscript-mode-gentoo.el 270 BLAKE2B e3ad9140ed1c92d78fdd3aa60855bacce78f798c8cecfcab158c04340da231bc5a0338fa3d8bd111d1770527a9b00bbeb123e50f4e71d7e9e673f70aaeb41462 SHA512 0e991f231e57ff72f992670f6469f36409fc89243afc5d6955b9035fa835cd4af2b107d59031a692c07c3d66b3e6e82941659619e344fef5a5b3b4c423437a3e
-DIST actionscript-mode-7.2.2_p20140605.tar.gz 8276 BLAKE2B 8fbe8147b1626f4e454753ae92baf14020424c0806aee4a9e050b789770e7bd1f19f45b0d493fd94af0d05ce541916c0dec1bad2327b285de77e8d27a7a1e675 SHA512 05a3a0a0bc185bdbc96bf292a220912e8649acd20eb3f55dbfde04cd956da3e4f71daa10957bb2ba6e150589f626ec1059908e3b294a643b4034a6c08e507fb8
 DIST actionscript-mode-7.2.2_p20180527.tar.gz 8446 BLAKE2B 4ce386be79ee4059e99cfef523036733a7c16a4bf24950dc77bd66ab03f9e07476507589fbc1a337f1f54cd4bf75234d2307ea630d642ee3306f2390e16fa0e1 SHA512 251877acec4ea79c03a67b3de441633080b421b5e84ef04d072e02916eb3e1c7b89beb18a897fe8165a0b39247da5a01c8d2b6980887dbf15ab3c5d38c39f279
-EBUILD actionscript-mode-7.2.2_p20140605.ebuild 648 BLAKE2B d4cc2e0ecdbde972bc6dd47103be11ba74acbe2d52e93509818b37832b8fa4bc34c88df4882e85dfa2986d56724e6474f100d47b0a4ae33ab6b322171e3f768a SHA512 4375a370c110599c159aec9eab45e7d0ead0272b52a800e320d13a05592749ea241790cf57e33069208dc7a39f92f1d4484559c0a236ad13229771a78c0586bc
 EBUILD actionscript-mode-7.2.2_p20180527.ebuild 525 BLAKE2B 1fd1602e443c88d44e084192f5778ed74c51ca8830db5f92da2255e9b062a6f622634ee006cf82e7ba53892d0115252e006b6e9160c08d25182190605a3dcc79 SHA512 d9672cc6f6471714e237279bfe117ddb23faeb212267c190bfc0468262a06a3a91a5f9dd95d04c06a3724ca2d68ee4c89b655632044f43194aee33a021cc8d64
 MISC metadata.xml 373 BLAKE2B 459d26d032a23887848eca1b521e609ba0799b2b85ee625b4ab6918562c55e0513fd4946caac21b0736d2f65648d30630c7b12f5b74f7b8f191f6d429f1b34f7 SHA512 3459389fdaaec6cf0126421ed50e0e3b06262771233808b5e3f1563ae2216e32f294396336fcf55b9807f1e2418cd17291e10ffad9d23436a19662b7e23d634e
diff --git a/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20140605.ebuild b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20140605.ebuild
deleted file mode 100644
index a9168a442eb4..000000000000
--- a/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20140605.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-GITHUB_USER="austinhaas"
-GITHUB_PROJECT="${PN}"
-GITHUB_TAG="6822d0bfd5d7ff2c0b246ca90ef9480d3c528b97"
-
-DESCRIPTION="A major mode for GNU Emacs for editing Actionscript 3 files"
-HOMEPAGE="https://github.com/austinhaas/actionscript-mode"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${GITHUB_TAG} -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS="README.txt"
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	mv "${GITHUB_USER}-${GITHUB_PROJECT}"-* ${P} || die
-}
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 84acac06b8bd..7d944d08e79c 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,4 +1,3 @@
 DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
-EBUILD emacs-common-gentoo-1.6-r1.ebuild 2878 BLAKE2B aafb8c7842b9075d08dd037ed2e3fd59699bf0110d380f10a2c8adf4dba2aea3008b5670b3bd9ee8f33dca4ca1f88a4e081df292e4eb9c0578b9a51cb9b0c84b SHA512 d9b0cb62a397af1ee382aff2c9344891f9632b9eafd54f56c7f34c29b4712b0ae4006420798e6022e4ffa9658aa2874c1f43a824a3eba5ddc0e1f056af730fce
-EBUILD emacs-common-gentoo-1.6-r3.ebuild 2849 BLAKE2B 0f526443ee423c4e77c5b07da987c84da4303a449a3e955b680fb9faeb61b3c8dd158ccb1cf9c32d97d5e430f70a5141288a73d11a0e103e2c0733b9b8c1a9b9 SHA512 641b456b2f238d69dc6542b400488201c10d08a2b6fdd2e28408c93a325bff325bca1099c74b79ece849640e3f6681010b66c986cc74e0649526b50a882eb150
+EBUILD emacs-common-gentoo-1.6-r3.ebuild 2845 BLAKE2B 429f477d7b6e57196ebaf4536541ccfcf98760bfdb0912d1f4965d794eb84347a53faa27a150ebf0e30cdbeea9cfd43dddcb03d1b7fb09007fd2081dc2694119 SHA512 4ad139f88c6cda86333f4bd8719aee19a2e3047cf9f47fe643b9baa680316ed23b64d9d96a92d46c84784bfd50c0e7d6afd85f63c524fc7eeed3d4904711151c
 MISC metadata.xml 360 BLAKE2B e7e420afb7a8377bffcf2a23f3954bbf4cc80fcd19a8514733e2e0164f4235271e21dc860bf77cb9cfcd1a4026ef3dafe97a10dc397e2d8e6f001f02bf6e9bc7 SHA512 d57f8f097617229f774b06437aaa83595aab2a6d9321d51b97dac8bd56fa94db396c7bdca538570f0912390e25ae8643c5adc374908757f67f1422fa1f872605
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
deleted file mode 100644
index 84eab96b484e..000000000000
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1 user
-
-DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="games X"
-
-PDEPEND="virtual/emacs"
-
-pkg_setup() {
-	use games && enewgroup gamestat 36
-}
-
-src_install() {
-	insinto "${SITELISP}"
-	doins subdirs.el
-	newins site-gentoo.el{,.orig}
-
-	keepdir /etc/emacs
-	insinto /etc/emacs
-	doins site-start.el
-
-	if use games; then
-		keepdir /var/games/emacs
-		fowners 0:gamestat /var/games/emacs
-		fperms g+w /var/games/emacs
-	fi
-
-	if use X; then
-		local i
-		domenu emacs.desktop emacsclient.desktop || die
-
-		pushd icons || die
-		newicon sink.png emacs-sink.png
-		newicon emacs25_48.png emacs.png
-		for i in 16 24 32 48 128; do
-			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
-			newicon -s ${i} emacs23_${i}.png emacs23.png
-			newicon -s ${i} emacs25_${i}.png emacs.png
-		done
-		doicon -s scalable emacs23.svg
-		newicon -s scalable emacs25.svg emacs.svg
-		popd
-
-		gnome2_icon_savelist
-	fi
-
-	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
-		added to ${SITELISP}/site-gentoo.el. In order for this site
-		initialisation to be loaded for all users automatically, a default
-		site startup file /etc/emacs/site-start.el is installed. You are
-		responsible for maintenance of this file.
-		\n\nAlternatively, individual users can add the following command:
-		\n\n(require 'site-gentoo)
-		\n\nto their ~/.emacs initialisation files, or, for greater
-		flexibility, users may load single package-specific initialisation
-		files from the ${SITELISP}/site-gentoo.d/ directory."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# make sure that site-gentoo.el exists since site-start.el requires it
-	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
-		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
-	fi
-	if [[ -d ${EROOT}${SITELISP} ]]; then
-		elisp-site-regen
-		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
-	fi
-
-	if use games; then
-		local f
-		for f in /var/games/emacs/{snake,tetris}-scores; do
-			if [[ -e ${EROOT}${f} ]]; then
-				cp "${EROOT}${f}" "${ED}${f}" || die
-			fi
-			touch "${ED}${f}" || die
-			chgrp gamestat "${ED}${f}" || die
-			chmod g+w "${ED}${f}" || die
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use X; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	if use X; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
index b6a09310a9f4..ac15465304fc 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="games X"
 
 RDEPEND="games? ( acct-group/gamestat )"
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>
diff --git a/app-emacs/mediawiki/Manifest b/app-emacs/mediawiki/Manifest
index edaa24b1e5d3..ed26c60a2cde 100644
--- a/app-emacs/mediawiki/Manifest
+++ b/app-emacs/mediawiki/Manifest
@@ -1,4 +1,8 @@
+AUX 50mediawiki-gentoo-2.2.9.el 410 BLAKE2B 805a4fb5639dd443d2a2da196ec95d1c22644ffcba68687d82dd0822c79070f19ce83c2a2979cfa64559d868d847967f8bb6c19e5909c182cc53f9ab47c26ded SHA512 8915b44c0f01f6cdc0c9c2badb84b59ef4ad10e8ec30f3fdf7331ce37386ae3152f7e851cdc6dd4540eecdfdd672232eeae295a208994e177a3485e535dc00db
 AUX 50mediawiki-gentoo.el 395 BLAKE2B be76f989906bd8c6eae72257ebddeeaf1dc9eb6ae45488e7afcaa73a1a173800a83510bbd683a172afd2597b7173f8e4ceb7cfab910c0ece77c76833bd85a055 SHA512 579680b31ffb86b68e1ccc8c7f4969860437a34bd2cc308cb9400ea861d313c2b2d538412eadbdff9d56ddfdab8f7312dc8cb97137a6c8c2707ebce4437c7b79
+AUX mediawiki-2.2.9-user-agent.patch 1138 BLAKE2B 283c88605aecb7fcfaf9883f4c3926036281a528fee133db1e4a43769ed7e98d0f996b6ec9313a6d62df720bca10586af18b7a9c2bc7a3bfeae301d90050d441 SHA512 0f30bd86e4fac425b98822f1e18bd98b71fa69bafa34d235a8aa380f2588f26958bcace8c09490a9fdf8dd28d289263cb98b3d7f2e67fdafa5e8822d2c76cead
 DIST mediawiki-2.2.4.1.el.xz 19108 BLAKE2B e8603a622c80943153f96f6f9997053fd0913ef23e0a672576726fbac3d2a5de850afbcdb3748a05769b9c880bc641aa8aa5e48bf6dca800b1fbadd6c8b8a2ce SHA512 4526c04c560679196900310c90d6321ab10a447ff4f904b0bc40bfc56296c3a773cc8fe7d4001cdfc108e9e11ce3ca4dd6677e51b220eb3b453a1b975118f52c
+DIST mediawiki-2.2.9.tar.gz 36595 BLAKE2B a044008115e545d043045e943762072981b5bcc7776e5f38480a2170168929989b990d90b225f3416a8ce9052d3a310bb77ac6ac1d273f112180ff2bddeb850c SHA512 7586558b953c3e2a41b792db55ba9b3520b07377a555c2dd38829c0be24f3388313dfaa049520c632d6fd3a471cb777ba662f723c56cd59c307b68faf9d8adb0
 EBUILD mediawiki-2.2.4.1.ebuild 357 BLAKE2B 5bbf3c1758797c4258d1eb842a9a37e4b3c9444db03de4f0c3476d9928de28b221716ad21564b775aba21a735488616e059a45c6a6639374fd1e550308f4a834 SHA512 726db4d0cad4bd04b56028bd37dc3ce5db8ffe89048292aa81691ea89cd8d24b4a4e4baf997f25489e490a902b7a2b66a1abbcfba47127f89886eee569da02c0
-MISC metadata.xml 360 BLAKE2B a8bea1d7a9c2b71040527e427b6924d7df89d8e68a5d11cd6cfb63b545355049ea059d5245d0289d3a90ce096cf8908bba0d854e04e7adf4d13deb6fbbcc85e1 SHA512 3e148d922f9e2828274c0f721663520a5526dbf36e5f3e61b3423a833c3bd5cdbb9d4b0410a35fe8d8c3427d9a0c1af2f3f4a304e5504b1a6ce411735b08413a
+EBUILD mediawiki-2.2.9-r1.ebuild 497 BLAKE2B edb3202fc0e08c1b0b100adc92bfe5d73bff0944aad242621608c0c97a241a5844227bb2562e9b97d4d1e6ce8b499884420d93e4091e5af203829a70d53c0a57 SHA512 e4c0626db03acc3af971e64865fa6d78bfc6a53e253c3816b947dff1e03ad231985cd631f41b14c12f99b68fd23d53d56559d461f51c3b78cf409e1c19b19838
+MISC metadata.xml 365 BLAKE2B 3c775b4bae44a5de7e5604d331bb1a01d926b2adea8ee9e83f37a5d5eebaa415dcdd5182aece1c41f0f69a15f931673bb48bdb90d83b431213f2cec8fa29306e SHA512 7d449d74ac37095df97f257e323c5362e0e2fa15fb573de53988d73b4941ffe0a876c59548b2f1cb244554904097d71a7bc293914fa8e7c66f4f844d7ab7ad87
diff --git a/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el b/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el
new file mode 100644
index 000000000000..cc9c5b714fb3
--- /dev/null
+++ b/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el
@@ -0,0 +1,11 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mediawiki-open "mediawiki"
+  "Open a wiki page specified by NAME from the mediawiki engine" t)
+(autoload 'mediawiki-site "mediawiki"
+  "Set up mediawiki.el for a site." t)
+(eval-after-load "mediawiki"
+  '(add-to-list
+    'mediawiki-site-alist
+    '("Gentoo" "https://wiki.gentoo.org/" "" "" nil "Main Page")
+    nil
+    (lambda (a b) (equal (car a) (car b)))))
diff --git a/app-emacs/mediawiki/files/mediawiki-2.2.9-user-agent.patch b/app-emacs/mediawiki/files/mediawiki-2.2.9-user-agent.patch
new file mode 100644
index 000000000000..2d64e410b9e0
--- /dev/null
+++ b/app-emacs/mediawiki/files/mediawiki-2.2.9-user-agent.patch
@@ -0,0 +1,25 @@
+Fix "(wrong-type-argument stringp default)" in url-compat-retrieve.
+https://github.com/hexmode/mediawiki-el/issues/27
+
+--- mediawiki-el-2.2.9-orig/mediawiki.el
++++ mediawiki-el-2.2.9/mediawiki.el
+@@ -414,10 +414,15 @@
+ POST-PROCESS is the function to call for post-processing.
+ BUFFER is the buffer to store the result in.  CALLBACK will be
+ called in BUFFER with CBARGS, if given."
+-  (let ((url-user-agent (concat (string-trim (if (functionp url-user-agent)
+-                                                 (funcall url-user-agent)
+-                                               url-user-agent))
+-                                " mediawiki.el " mediawiki-version "\r\n")))
++  (let ((url-user-agent
++	 (if (eq url-user-agent 'default)
++	     'default
++	   (concat (string-trim (if (functionp url-user-agent)
++				    (funcall url-user-agent)
++				  url-user-agent))
++		   " mediawiki.el " mediawiki-version "\r\n")))
++	(url-package-name "mediawiki.el")
++	(url-package-version mediawiki-version))
+     (cond ((boundp 'url-be-asynchronous) ; Sniff w3 lib capability
+            (if callback
+                (setq url-be-asynchronous t)
diff --git a/app-emacs/mediawiki/mediawiki-2.2.9-r1.ebuild b/app-emacs/mediawiki/mediawiki-2.2.9-r1.ebuild
new file mode 100644
index 000000000000..62d903056419
--- /dev/null
+++ b/app-emacs/mediawiki/mediawiki-2.2.9-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+MY_PN="${PN}-el"
+DESCRIPTION="MediaWiki client for Emacs"
+HOMEPAGE="https://github.com/hexmode/mediawiki-el"
+SRC_URI="https://github.com/hexmode/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+ELISP_PATCHES="${P}-user-agent.patch"
+SITEFILE="50${PN}-gentoo-${PV}.el"
+DOCS="README.mediawiki"
diff --git a/app-emacs/mediawiki/metadata.xml b/app-emacs/mediawiki/metadata.xml
index ea38af629394..29a48e65d922 100644
--- a/app-emacs/mediawiki/metadata.xml
+++ b/app-emacs/mediawiki/metadata.xml
@@ -7,6 +7,6 @@
 </maintainer>
 <stabilize-allarches/>
 <upstream>
-  <remote-id type="launchpad">mediawiki-el</remote-id>
+  <remote-id type="github">hexmode/mediawiki-el</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/app-emacs/popwin/Manifest b/app-emacs/popwin/Manifest
index 44b70cf9a88b..bafe031b670b 100644
--- a/app-emacs/popwin/Manifest
+++ b/app-emacs/popwin/Manifest
@@ -1,6 +1,4 @@
 AUX 50popwin-gentoo.el 336 BLAKE2B 5f76341b524d373ed3aa8d15e99123f5be33a45eed4e865f647e8c40353bceefb8775dabadce9f0cbb630742893de1354dd09062ccc2cc4c4c68484ee380a02d SHA512 a9b72edf953d67a16aad44186d3f0f3deead224ce57342d73ba43abe15c0c2b170311380926d1195d98884b6e64fbeca23b74c3dd9a67b13015ec0b491861905
-DIST popwin-0.6.2.tar.gz 16821 BLAKE2B 6fcf2e711c28db3465fd4e267195f8526eff26aedeb04f07d66f5adac83f2447beef1ee988f692b9062a0e0eabbbe0760d3df6f1f7679fb4ab76317237aa8fdf SHA512 3c086361d6b79d7c68583cdbfb76cfd95b6ed56883382e42a863137d93e2a64fa8dce7b7873a4c46ce04a742942dd5f16367c691be608438079555578709b108
 DIST popwin-1.0.0.tar.gz 69319 BLAKE2B 2dea34f002a97ac58848abaecfb9b591ceeb58539f581918101604a485b6d45b9dd078dc89b3020bbe38e99646127a784582c51ffaa3a76de5b6ccaa365b22d6 SHA512 5b3ba489e747ec80d80e516024ca8bdafdb17a56df3f89c20053765d551173f448fbc10db348c6ec0e6efc5557eec672da3477980fb41f1fbbbf220f757f98e6
-EBUILD popwin-0.6.2.ebuild 471 BLAKE2B d76ac412dbdefe4a1449bd95b0552d5605e5fa5f27e4f4c4d2400b8f4bccaf3954d994e729927fb1537949aa4fdc52ba0af14ae234520b9bb88ca8000c2225b7 SHA512 a4dbeca3a4bd29b666fc533e01315fe02dae86ffad5653559ca3c4443189faf2b987d3b7960d04afa0a01425cc28f3a4f663d02b4bd56fd237bda367dcfedd23
 EBUILD popwin-1.0.0.ebuild 487 BLAKE2B a2b2ba9b5a428e3b58aabd2f83df7626212345fea65b4770e45633124226b8fb8fce5f5c3a2e1a0d6e9b44df513484f38d26fe453f5c5a446a4bddd40f42469d SHA512 310efe067b267ba1d0f843489f65429437773d906342d6ec94eac68b02742a5e57f972cb3c1863b46208a643359d001bddef02e8b36b0fdd6eb3504f361e0d72
 MISC metadata.xml 434 BLAKE2B 7a3d9e391906d94c7325bb2b3037ac72a17592c7000ea7952d1a24307972ac5e76197ab65757111c67b9e08714b5e8af3e96afa6b01ec6ebaba522bb07edcdcb SHA512 aecd01bc0b93d462be5de0f33709bde26740f9d5c86b926201a215c6eeedf79f8216d9906260f61b65f81f5850b958d1ac94a767775ddacee6df4547ec01efe9
diff --git a/app-emacs/popwin/popwin-0.6.2.ebuild b/app-emacs/popwin/popwin-0.6.2.ebuild
deleted file mode 100644
index f353fe5a47a0..000000000000
--- a/app-emacs/popwin/popwin-0.6.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp eutils
-
-DESCRIPTION="Popup window manager for Emacs"
-HOMEPAGE="https://github.com/m2ym/popwin-el/"
-SRC_URI="https://github.com/m2ym/${PN}-el/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md NEWS.md"
-
-src_unpack() {
-	unpack ${A}
-	mv m2ym-popwin-el-* ${P} || die
-}
diff --git a/app-emacs/uptimes/Manifest b/app-emacs/uptimes/Manifest
index 542663ed77f2..21c6e87713a4 100644
--- a/app-emacs/uptimes/Manifest
+++ b/app-emacs/uptimes/Manifest
@@ -1,4 +1,6 @@
 AUX 50uptimes-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST uptimes-2.3.tar.bz2 3637 BLAKE2B 75517032993f8192c4985d6bb5793b90c828565495a4471845e3efb6fa939268c7b94751baa6b85f5462cfb2a944ea4f4904a75b950a071c0840bb21313bb751 SHA512 31a8e4da410c1c02e96b3aa910fb3afe99c924af0f8299465e1c1b4b22e925aeb427b1ad349df459f93d2efd8bbf66804186f26486957d9e8196eda1b50eb5ba
+DIST uptimes-3.7.tar.gz 3913 BLAKE2B 3148b17a8e61201027702891e0303870cddaace650770621bf7847cb86ba917c74aa5938f55fe2e6275180f9e66755f418dee47bc80b6fd7439276ff525ea9d8 SHA512 6e31cdacabc93a8f9d206d95eb4d16ad4a6b4a69f1032e93710693eebe8064446b19e4938eb342c8a66fac7e52e22da36b26bd3417216ab302c9c8e50dba27c3
 EBUILD uptimes-2.3-r2.ebuild 529 BLAKE2B 386946ca894ae58d415d36b198310e529f666fd78f93d5dfaf59ec171bd4c826c7858bbf0b1aa9481e15adf21535c79a46a3055122ead909aea69793a39c6094 SHA512 bf8e66286c792e86a7758c7b668ecd1d08ba6ec4725f2bba883cb037788af70414ccaa057fb3c0a5bda9e89a548f40f9b23e450e38c10130603e59567e5adbed
-MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
+EBUILD uptimes-3.7.ebuild 622 BLAKE2B 8fe4586a0a1aeb61022bff900f3b6506b6bc971ac1a4d17997f85775542be73f511f4cada0d5ddfd69e29ad43a3a0f03eeb00f84edfc24f4d5f60ae700276658 SHA512 00af7458a0a7d6b94a571145001cabf497edc6f58b7e93f8df4e0d1efa2f58c705a6659d83d200a004649567fa9d98c9ef509412d382e9e1583be8a8640e2ea3
+MISC metadata.xml 594 BLAKE2B e19412bb4bf3f290341ed58cfd0db991c57e91cff25862a8ff3ea942e8f68587a7f40c58a755867fdc0ea3688d6399cf87aa02b6edae41d5a5bde1c5a60c589b SHA512 94546e797fbcd61c03c4b8775e2204f3fac23fc50a9581722d46e92863f022a032c06ecb573e6785656a0950daa4b085f17104068f058917b32af4e2a5d8184e
diff --git a/app-emacs/uptimes/metadata.xml b/app-emacs/uptimes/metadata.xml
index c918cdef9591..bb9b255aed7d 100644
--- a/app-emacs/uptimes/metadata.xml
+++ b/app-emacs/uptimes/metadata.xml
@@ -5,5 +5,13 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<longdescription>
+  uptimes.el provides a simple system for tracking and displaying the
+  uptimes of your Emacs sessions. Simply loading uptimes.el from your
+  ~/.emacs file will start the tracking of any session.
+</longdescription>
 <stabilize-allarches/>
+<upstream>
+  <remote-id type="github">davep/uptimes.el</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/uptimes/uptimes-3.7.ebuild b/app-emacs/uptimes/uptimes-3.7.ebuild
new file mode 100644
index 000000000000..224e4265609f
--- /dev/null
+++ b/app-emacs/uptimes/uptimes-3.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+MY_PN="${PN}.el"
+DESCRIPTION="Track and display emacs session uptimes"
+HOMEPAGE="http://www.davep.org/emacs/"
+SRC_URI="https://github.com/davep/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="Uptimes is not enabled as a site default. Add the following
+	line to your ~/.emacs file to enable tracking of session uptimes:
+	\n(require 'uptimes)"
diff --git a/app-emacs/vhdl-mode/Manifest b/app-emacs/vhdl-mode/Manifest
index 4520e95f4e04..8dff75ee68dd 100644
--- a/app-emacs/vhdl-mode/Manifest
+++ b/app-emacs/vhdl-mode/Manifest
@@ -1,9 +1,7 @@
 AUX 50vhdl-mode-gentoo.el 146 BLAKE2B 4a747d323606390205a52c3cebfd1e54b153e9e18ec3fa5ed557493df1579b783cd29fdef2a031f6b8f8c573fa3eb82e312c8e7449a5e91ffd00ebe9b4c874c1 SHA512 22f1d437f487fc2c0e739000687424271027c2defa87eec696c79ff5df958c6087475c7ff84c2af39e2eb756401ec1d4b1f013a27af1639c416843899333ee21
 AUX vhdl-mode-info-dir-gentoo.patch 522 BLAKE2B 35204f9ec727ec5ec44ecc03a99cedd5a5a3bc62e59dac577ed40dd0099cf08788b149e16d4fc0c2953dbe70bad8810eaed8496165e3b65ae1d8c23298a2aa5d SHA512 7ca2b0ea5c07255bf99e6a9105c120df924178a596e97d6a1bfcedfda4bcdf4f093f1383d1ea2a1383207c19971a110696ef9b49b17542e79d92c4501316039d
-DIST vhdl-mode-3.34.2.tar.gz 313856 BLAKE2B e4c685b0e9d616bc242e02d6ad17dec56feba580c11763d522f336c96b0ff09a740bf37ce5473437175e111d6b64b9b8e5612d70f9d2823a5e17b484ef54b0ec SHA512 38b3275fd4d92966bc806e16362bfea3d3ed8789330ba891fa0c149633d938abb1c8ea32085dd0b06a17fdd98a645121a5fe60a8c4c5fd3261d1f45d14ee4a6f
 DIST vhdl-mode-3.35.1.tar.gz 316090 BLAKE2B 5517c7881fc52df631d3efeb82e88d0b5db7038575eb378e241d062c4746d810ab308005b24570725ab244d1d3229b69896f8821944b15664561a38d828f4ae3 SHA512 963d4c8c938c9c9279a7ab862da6fc91257ab270e8eefb185d73b9c9217c4cc7b7330f2b33300bb7b604ed348543621d8371685e7e4a8f29d596e76ce8795f1c
 DIST vhdl-mode-3.38.1.tar.gz 318400 BLAKE2B 2ddad9f4e8fdb0fafd2e27075f5722fcf7959a2b50ad61c5860af52706d9579065e0880d7b9bd1b884c21cfc902760dff006404490c8cbb1474831aa4c6d841d SHA512 2cc12994e17658d65cffa348c59ac3208cc0f498731941b8f64da68e258ca57d6aa500d72103b005996cf3496e119cf59b52bbc1c4b740401685030b42f272a8
-EBUILD vhdl-mode-3.34.2.ebuild 533 BLAKE2B 668ea558451caae10a8daaffeed2f9d65d65946389202ce1508f773bbe6d73b4208eb98fef52e4c73fe9435c812745edd3b04aa371a5f8af4033e12addc48d5b SHA512 a2a7302687194f14cd855f441e3f2f31c015462a8c1547197711ae5b060fe185bc13ae05e02e8f0ad85ce1454b09f1260e6becc1a2e36cb8b1bd0716a12fbb3e
 EBUILD vhdl-mode-3.35.1.ebuild 530 BLAKE2B 2301997d33cf7a51789b8c66a15439cdb7a63c102cffb8cd48dc381d8f920863fed59a0b50e603516a8e9476d402e8ae09cc172779fe36d6f26e9462b1d47648 SHA512 1c1c7584288f7a3e9a666d4563347441da782deeddb49eed51a305beb21cb1aa6c062a0355ae8454130006532134b8bd0379928ec17fe2d7e035fb0f4da0f515
 EBUILD vhdl-mode-3.38.1.ebuild 533 BLAKE2B 88d38d63abb7ae205d808b248b5fa9656f41f1edf147f0fd797928616aa9901acf44e0365351e941689b11de76dc4d391a0490d738f5d108e877e0ee9239060d SHA512 47b31b47cd00c415f8ddc14814f1339a826e234999b0f36ea6ce170b9a8822c210320e07fa0e03acdbb69a3a0506b5089ad38e7bc40b96af2124edf93c836b6c
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.34.2.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.34.2.ebuild
deleted file mode 100644
index 781cee81001b..000000000000
--- a/app-emacs/vhdl-mode/vhdl-mode-3.34.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="VHDL-mode for Emacs"
-HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
-SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-ELISP_PATCHES="${PN}-info-dir-gentoo.patch"
-ELISP_REMOVE="site-start.*"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="ChangeLog README"
-
-src_install() {
-	elisp_src_install
-	doinfo vhdl-mode.info
-}