gentoo resync : 30.06.2019

4 files changed, 22 insertions, 15 deletions

diff --git a/app-emacs/mu-cite/Manifest b/app-emacs/mu-cite/Manifest
index 2091513cefb4..e74401628278 100644
--- a/app-emacs/mu-cite/Manifest
+++ b/app-emacs/mu-cite/Manifest
@@ -1,6 +1,6 @@
 AUX 50mu-cite-gentoo.el 142 BLAKE2B f6631cf5bb32bf66af28c56cf21e0dd51ffc545a47ac82edb0db125b78bbf6a183553b6d0afedcde766df0ae349085253f3edb91718b949341a899f01e6f1733 SHA512 737b4c0c5ae0790e7cc8dbf0d253aadf7cd2680c54940967d93f95dbf6fe80fdbf5290560ef4eacfa16c1a26ab9567726228af7b3b649f859c01b021c10563ef
-DIST mu-cite-200709030413.tar.gz 19439 BLAKE2B 279627608af2759ee5fe566c315f8c2be168e0e4a01bc179ae7289f6c990f4a569d59288b02097a3230271ec4c1ba6aefa3db9e46271eb476eb50e912bacc9d0 SHA512 aee355abf8d77ca9ce6d5d2f00e5e8d9a1123b82bb15169bbbdf22c9447c37f1d200ffe1cd05abb61f1011c0d9731d3300d0e5bbf6f10ca6155c00a610a46703
 DIST mu-cite-201202272330.tar.gz 19212 BLAKE2B d52378258b3804e2867d6f8f6f471a73eebb3ff955df70a2ddc5dfd91d6ada2ea2349d44e86c81e1c314b88787b08b39f40238b22760a74b77f8393361aecdcc SHA512 78013bed020c46baeecf56bcd155eb6058d11b1d61a0af55b075454601e3cd1a992bdad887e125ffd569782a38e4509d60efdc431ded501c35da096133b475b8
-EBUILD mu-cite-8.1_p200709030413.ebuild 530 BLAKE2B f308931d0d93012c7201a48ab4ba0871e503aaa78cb122d5423dfdfc53bc8782bf7d98c5bd1b61a55b5fb87b0ed82a9754687cdd77352718f5a8e746d1526a6d SHA512 9139ceff997366d98f6bfec34025d3978faeb629232eeab133369e90cb413802a91465b8e6b98f0b6e998ba27456fda60535178127c30a6d38747e672e987068
-EBUILD mu-cite-8.1_p201202272330.ebuild 530 BLAKE2B f308931d0d93012c7201a48ab4ba0871e503aaa78cb122d5423dfdfc53bc8782bf7d98c5bd1b61a55b5fb87b0ed82a9754687cdd77352718f5a8e746d1526a6d SHA512 9139ceff997366d98f6bfec34025d3978faeb629232eeab133369e90cb413802a91465b8e6b98f0b6e998ba27456fda60535178127c30a6d38747e672e987068
-MISC metadata.xml 375 BLAKE2B 022df13d1d586579ed08af80b893ce2a1a9d1275720ec5d447efca002dd05a5544eaa6c1f01a5d6df2c0e7cf594eacf6a0c1fb840989674f8af537e1468ec6ee SHA512 24ea62246bc2d2c433dd071cf9906fe2f0c9dd834ba4d5bfadbbefcb9d47a063cd07da9c6756043c296c2ae56da39f18714416dab862d5f36fbd2f6100dc663b
+DIST mu-cite-201808232348.tar.gz 20443 BLAKE2B 814ebbd3ab45af4af65fee54884a1960a0cecccd07e1e0e084e860fcab4884ca0d97f4042f14f530b8ead4ee4347d13dbde9ecc96f5e82121bad44e0b93855ac SHA512 5a30124041ea5a807f5d8ea8a1ef18afcc7020d3f2d2bee4dd163fa1098d37d27b43db81c1b538bf1d1b06720840fb5c3f95d999fddd624437dd251fa061f699
+EBUILD mu-cite-8.1_p201202272330.ebuild 543 BLAKE2B 76d89b5bc1b895fa73a8979e23b2b76280f6a39821a0c2b06175643111eec9abbf2430f0f7042e06cf2c75405c64ac7009ea8748a3351a053bdc130d76716067 SHA512 097432f31951a446abf5fe1f60d5925189737fcfbeb11464b6524836986620675ac97552a565810d4a7a572d17b6ae41cf5fb14f2b08174cf2f8914ffa277a72
+EBUILD mu-cite-8.1_p201808232348.ebuild 616 BLAKE2B 79e1b6002f78a7cff3efe8eae072563b91fb37c625e378280a9a513913db86bda87e8e50fdc93a00115a166b218f1da5a52da657a7d37667b0ba1392788d68cc SHA512 a04ea2f2776bbd7bd3bbbe05df93baec2f19bbe4476eea309f65991dffd945be6996f82cb8eea513000a977ec7ee5481cb27f6d9beaeb9e5afbc8f16dd350ed2
+MISC metadata.xml 461 BLAKE2B e3af9dfa48edf30c53472e5fa450b7d9d22668845dca046060a5bc3ad14dc6e8d5d3c03b4b4102d65b6cd8d302f783d6e7a62c7d2a359beb7cd6a07ea6d19720 SHA512 0128a20ae81bc9256b1aba5f432a55b2004dec6bdebfac5c2e169c6d23962886fe3da889abdcac1e5dfd84020cf3d95e36c25710fe1323f2692c1e924ad5b241
diff --git a/app-emacs/mu-cite/metadata.xml b/app-emacs/mu-cite/metadata.xml
index c59c7fc25206..eea0cf345971 100644
--- a/app-emacs/mu-cite/metadata.xml
+++ b/app-emacs/mu-cite/metadata.xml
@@ -10,4 +10,7 @@
   <name>Cjk</name>
 </maintainer>
 <stabilize-allarches/>
+<use>
+  <flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild b/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
index 63f2fdaec660..0bf16aaea004 100644
--- a/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
+++ b/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="app-emacs/apel
-	virtual/emacs-flim"
+	app-emacs/flim"
+DEPEND="${RDEPEND}"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="ChangeLog NEWS README.en"
diff --git a/app-emacs/mu-cite/mu-cite-8.1_p200709030413.ebuild b/app-emacs/mu-cite/mu-cite-8.1_p201808232348.ebuild
index 63f2fdaec660..b27d88c3a9c4 100644
--- a/app-emacs/mu-cite/mu-cite-8.1_p200709030413.ebuild
+++ b/app-emacs/mu-cite/mu-cite-8.1_p201808232348.ebuild
@@ -1,27 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit elisp
 
 MY_P="${PN}-${PV#*_p}"
 DESCRIPTION="Message citation utilities for emacsen"
-HOMEPAGE="http://www.jpl.org/elips/mu/"
-SRC_URI="http://www.jpl.org/elips/mu/snapshots/${MY_P}.tar.gz"
+HOMEPAGE="https://www.jpl.org/elips/mu/"
+SRC_URI="https://www.jpl.org/elips/mu/snapshots/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="bbdb"
 
 RDEPEND="app-emacs/apel
-	virtual/emacs-flim"
+	app-emacs/flim
+	bbdb? ( app-emacs/bbdb )"
+DEPEND="${RDEPEND}"
 
+S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
 DOCS="ChangeLog NEWS README.en"
 
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	emake EMACS=emacs
+src_prepare() {
+	elisp_src_prepare
+	use bbdb || rm mu-bbdb.el || die
 }