gentoo resync : 03.11.2019

3 files changed, 64 insertions, 4 deletions

diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 87721eb92a25..78d78e7206c5 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -5,5 +5,6 @@ AUX vm-8.2.0_beta-optional-args.patch 556 BLAKE2B 9c07937f43b99484b5973aa63b386e
 AUX vm-8.2.0_beta-texinfo-5.patch 8594 BLAKE2B 542c755aa7aee4f39c8977ec0a33eab53954bdecfc9e9b65a5fa069c3f3fa89311a00356a8dfdebc2159bfd5a047dbb3500b78e0f1f21398e41fe1ac55516aba SHA512 dbc8f9456735f4d1757a7094bf2cde86148444bf4c46136eb5170b94e9124bee48c08d8f7d82e3b3c03ebd3443f0ec3dc988178e335189904c3d2b4edb6d2cd3
 AUX vm-8.2.0_beta-texinfo-encoding.patch 197 BLAKE2B eeea93146d8dafab49b961c4a2b3ff981dc4269fab1fe6eb9124575341439a9fcdf8819eeea395ec623c07a2c31018770222265f1835361333d543239b63278f SHA512 ba227fa27e6b19f23b487e254703a4665dedf3cd4f6887db71cf76dad4ac66c52608a1e978c2eeef851e6f2241aeddd5249fd8824d5194105ed172c68b9fb6a4
 DIST vm-8.2.0b.tgz 839789 BLAKE2B fc032e0a6259d2397d80cc80fbb7cf5845e43a228124f867402738a9123c78c798822d8d9c8edbdb823bfe3bce946d53afb6cd24e02d28925a51d458cf21eedf SHA512 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d
-EBUILD vm-8.2.0_beta-r1.ebuild 1598 BLAKE2B 34e16e27d7f1fcd6d147defb86199d05f9d6902f93bf729b65be8a0790ae7d1cdeebeb8c8fdab049c5aa8048bcdb807c217b5981fe8fbb9a30d1b72ce90a9b52 SHA512 f762281984af7feb73742e0006ea2a858175b0bb0bd399a72766df550194985f56ebfa9defbba0fdf546ea5a820d1bd28663734b6090d27a577537faf99ba52e
+EBUILD vm-8.2.0_beta-r1.ebuild 1612 BLAKE2B c2b341748409ecf9042e7d25af8592a5ad2de97d75785f2797a5f6557c2f46f3c808c1c36d760c399d40cc07d8fdda471da73764a7d11e8c1f3ae57c5584e7cb SHA512 6e8eb2f2bfdf01fdc73caa0ed248b3b356f18297a868fbc5c367d1e6111568f0abfe623d857371f0982c1e28582b3273ba0ca393ccdaf2345fd61cb5ff5434df
+EBUILD vm-9999.ebuild 1314 BLAKE2B a3c1a93c06320825e007f49cce5d31d87b5cdd89329c70b99ae5f457a5324fe78e0f2d6fea319dc4d1bf1d287c4de5605b45b23e04328b82521b5ffed2cecf14 SHA512 c266cd618df313d6e11e365a1253744dd29d35f62d428b039db8ae3057219fa42351bbd9caffd767808345945571ab736622791baafebff7c604c7f8729d6515
 MISC metadata.xml 785 BLAKE2B 1d8be69c7be90cb03815bad0324c55e4ed4be6443246922054dc6ebf4b66090bb9f7f30916cb5df07a664d151a77de6591a45d923847547898ebc32ac9505038 SHA512 62df38ecfe4b3de679d856cbca5b58d73c73a885f86998f00aa75e67efc2def4ce973bc1e2f40fa22f6f79cc9f4fc4185a916e6ba176a89d685b1092ea9eddfe
diff --git a/app-emacs/vm/vm-8.2.0_beta-r1.ebuild b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
index df64a109d955..519d10d2b622 100644
--- a/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
+++ b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
@@ -16,10 +16,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 x86"
 IUSE="bbdb ssl"
 
-DEPEND="bbdb? ( app-emacs/bbdb )"
-RDEPEND="${DEPEND}
+BDEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="${BDEPEND}
 	ssl? ( net-misc/stunnel )"
-BDEPEND="sys-apps/texinfo"
+BDEPEND="${BDEPEND}
+	sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/vm/vm-9999.ebuild b/app-emacs/vm/vm-9999.ebuild
new file mode 100644
index 000000000000..7834ef8f589d
--- /dev/null
+++ b/app-emacs/vm/vm-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp bzr autotools
+
+DESCRIPTION="The VM mail reader for Emacs"
+HOMEPAGE="http://www.nongnu.org/viewmail/"
+EBZR_REPO_URI="lp:vm"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="bbdb ssl"
+
+BDEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="${BDEPEND}
+	ssl? ( net-misc/stunnel )"
+BDEPEND="${BDEPEND}
+	sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	eapply "${FILESDIR}"/vm-8.2.0_beta-texinfo-encoding.patch
+	if ! use bbdb; then
+		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
+		eapply "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
+	fi
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-emacs="emacs" \
+		--with-lispdir="${SITELISP}/${PN}" \
+		--with-etcdir="${SITEETC}/${PN}" \
+		--with-docdir="/usr/share/doc/${PF}" \
+		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	# delete duplicate documentation
+	find "${D}/${SITEETC}/${PN}" -type d -name pixmaps -prune \
+		-o -type f -exec rm '{}' '+' || die
+
+	dodoc example.vm
+	# NEWS is accessed from lisp and must not be compressed
+	docompress -x /usr/share/doc/${PF}/NEWS
+}