gentoo resync : 15.02.2018

7 files changed, 3 insertions, 357 deletions

diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index f721cedb039e..ed9f9f9d14ab 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,14 +1,6 @@
 AUX 70mu-gentoo.el 76 BLAKE2B 478ebba49409f7b1fd601e4c6019cb9da7cc8c6f9b4f7318155225fa84ebd82cb73ba79637c0aa2dda9d9779e525b0577bc940a0d613a3fa64031e35f3178a46 SHA512 61cc2bf611a0d1f2aa53b4624c52e1aa9672a81b4b8d7386aad1bf70b0b0db6ee19e011acc5a1a28b220d99eb3683140a2ff02dc3e01ea68f512ee05ec7bc23e
-DIST mu-0.9.15.tar.gz 2203193 BLAKE2B f639af3d851ba72605840ef969ff046ba59eba656d57be54f53b5d02fcb948989419972307dfbc60e66314ef3abfe9be379e094d72ffc4a836a0454846f6afc5 SHA512 36a0dcaa9b355c7a75f1d8c7730241ade979ec050e18f8609b840d6dff6befc96cf3fb649b8970649542724b2c20482099aaf9827b17a5e9618eb13cdda9c4b5
-DIST mu-0.9.16.tar.gz 2212969 BLAKE2B b56fe468ad1e077f7f66bdd0afb6e81f7ba500aaf55a867ea4b44f78f9b7f8d723905075515692da38918c3b7b89d3679e473774fe03efbea1210b3b75b954fd SHA512 8cf9b83aea287ee79b5160ed19e7dc6ef27f0784143b5eac9cf55d07b7718bc777624d752e0b407258b5078e998544d18dbb258a7eb03cafe55596f07a60d1f4
 DIST mu-0.9.18.tar.gz 2250319 BLAKE2B 7eb83a797eccff706ac6b264a7d56feae80e40f370e190e0a94f2524dd73a8bfdb35599909f90d0a2b87fc513bbcf2b00fa307a3e4d0b6718ebdc7f7fcdc6df0 SHA512 47104d18547de0871782abc4e1c6dbf1f9b2489410e5716043861bf8d973d33d2138de7d7ac568b300ca86ae9f1a0fda0fa9555ad9a5938771336ef958183546
-DIST mu-0.9.9.6.tar.gz 2172349 BLAKE2B 371db6a38e7a099e5d4f16b097c450be608390ebcd2edf02f316f308c06b102999be24c1ab3f29975a9a153ee2443e4833f404e5613123b7ed4e3d27bead9f67 SHA512 0213033aa7599a5120c38a4b9ec018357ebd63a3c4828e0f9d7af41529dc1b001db8d506408b0341e0efe9835fbd21dbf23c836920c98ae2caabcb0cdc7dac2b
 DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31f19606c260ba3dfef857a36a333f5ede4ca30be88d7b7eae28e996e15a8deebd96971b341f0f72bfbbb SHA512 49b0b86f22e9a6ace1fc3fd6e7a8a523aa9edf092b953d59f59a1ef7311c8c546a261a1a186e3285cea788be20c816c70ac08d1514f700ff97258a2012ad394d
-DIST mu4e-manual-0.9.9.5.pdf 396250 BLAKE2B 83bcc3a5b70dc6480189a803748b530b7a3ba11187f418e45e81dc7e67501086ebccf82859600d123137901feede75270dbc1df9c59ce4020c4f75c2999e0a95 SHA512 ef9d36a1d9c7a397d89ce5a01072408165dc37b1cc7bb90658f35421cd0dfe28c8fa932cc602f5150c7947aa09c94a470924c98fcae3d9caa7d92fb1d47f7e7e
-EBUILD mu-0.9.15-r1.ebuild 2103 BLAKE2B 1e80b8a668e13b755dfc96e486ec4c50f78648ceb7c08d418cb69ca50d39d5265aaf5dc548efc65273b326ff13ab4df51ef96ab1f0f3bdca35663b1538b4d550 SHA512 31182b79ab81a3fb15a3abbd2a89465e071882e1aa7b3955270f46dbecf18c8f202bd8d37ac3ed46f5f4adc1218fbe715b587022879fc27b93c75a5c091cb9e9
-EBUILD mu-0.9.16.ebuild 2104 BLAKE2B c52e1a7b808c690448f0bc7b26246651ef96bb38a34c45896e3c0950723bef27581873ae2e8e5175e46725cec2944f6b2fbd654bee19c96ae21f99a5f02df1b0 SHA512 27d37bee83c7b8dd956e873da34fcf154ee54b8686a826ead1e28f4e1e135e665588e30e49bb13a0f4de6b1acb62012fd5c248c6503403214fc2df1b003c0208
-EBUILD mu-0.9.18-r1.ebuild 2126 BLAKE2B 85d3c9fd9d1ce59672e2ecace48ab272ced738100624edfda84111a055027c90b816eebe077fa6faf1c63b63b6ca5d6f58534f406f8559dad122d07aaee9326c SHA512 07f527eea48a74f0b260ee861c07deb51655eceea4acc2570a4be3da8ca259f89666624e78ab60bb846b69082a33c59e54813dd54d6e556e596336010536f525
-EBUILD mu-0.9.18-r2.ebuild 1968 BLAKE2B 3c3df8bf236e10a9485426b0c91d0f09c7d097352b3c81551d42618178f9169777346b03fa60e0445dbf929548b38a49661886d6929c579640b1d6ccd2830ffa SHA512 eb2cd179c7f59bebdb22afbd6c7436b440e45752c46bb19d09a52a345d7e4be02f6175049e66e095654777d3346243105e4a8214736886ffc0c1c93c77993940
-EBUILD mu-0.9.9.6.ebuild 2088 BLAKE2B aa98be00d833b5c8c0db5cedde29f87655bf9439875dc70b79f28039e485b50f31e52f87092eb2b436e93ff49656d361f78bcf627c9da66e34a1600e29f81473 SHA512 9ea907c47bb88e13f2437a5e76841d7aa619729f27027227643f562c06f396e3c3be82fca1f2f57314d1c435a8ed1d73b39653cc79dcc402629c60955848a33e
+EBUILD mu-0.9.18-r2.ebuild 1967 BLAKE2B 2fc80cbf26459398f0f12824cb310eafe4b0af676dfaf1d680bbff480ff7bcbd363ef6db1b022d87b6fa6333be33c47e47baa2a04db9d00653062724075243d2 SHA512 d2d2aaf0e23a3edb2871353eea2beee972aad3a06d1ad30dedb94d0c283850a2ebbf537dd3245e447968ee202105fa0ff1f8b965964765d3e0312cf9f7f1a824
 EBUILD mu-1.0.ebuild 1970 BLAKE2B 1f0d0ec3b5cc6c79a0a83c4c5d0488e81e92304e15134dd4902aa78f63ca77a120a7d10930261eb061f425bdff3d985d0d9fee63f7952abf10a65768fbdbb39c SHA512 1c9522b996bc308452352ecd6343280e95ddc3ce2684918c18f032537d92f1327f9a1271a1abc30ace3469985c628c0eb1c567e61fd634d87e30fb3f0c1f36a8
-MISC metadata.xml 893 BLAKE2B 56022e2c549b0c8f2d11f4eb2ecbf92cf44f522c291e8cbe3b97969cec946180e2c70bc691891920ec3c82ef98a72938a837dc2e18f0c1897999b42ee0946070 SHA512 13013b9e11642092e1f3d2a9af64ed08fd52c9125be0ff3deeea5dfd2e54dfc2beaad9e96dac3da817e594e14f5cff9723e4b166dcdd667c427a6cf3d8aa6df5
+MISC metadata.xml 821 BLAKE2B fe40637ca5578df13dba58f8a526585025aadadbbbdb8192de5105cab2125dc86b1ec3eff4ee01dc1a301e3d02d7e9850ca3058f751ec911fcdba9dabe154ea2 SHA512 f0517130dac1c678752562d03178fe74588b34de0f9fa1a6b449a0d1d2de3c98fa80f4cd130b08ba7a4f01732a189888d8c2410ff364bed5203b6d10d5aa969a
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index 7b72a85abe33..e8ae737901c9 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -14,7 +14,6 @@
 		are looking for, assuming that you store your e-mails in Maildirs.  It also includes an emacs based mail client mu4e.
 	</longdescription>
 	<use>
-		<flag name="gui">Build and install the experimental gui 'mug'.</flag>
 		<flag name="emacs">Install the mu4e mail client.</flag>
 	</use>
 	<upstream>
diff --git a/net-mail/mu/mu-0.9.15-r1.ebuild b/net-mail/mu/mu-0.9.15-r1.ebuild
deleted file mode 100644
index e6830778b4ca..000000000000
--- a/net-mail/mu/mu-0.9.15-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils base elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs gui"
-
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
-DEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/xapian
-	dev-libs/glib:2
-	gui? (
-	  x11-libs/gtk+:3
-	  net-libs/webkit-gtk:3 )
-	emacs? ( >=virtual/emacs-23 )
-	!net-mail/mailutils"
-RDEPEND="${DEPEND}"
-
-SITEFILE="70mu-gentoo.el"
-
-src_prepare(){
-	eautoreconf
-}
-
-src_configure() {
-	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	# Note: --disable-silent-rules is included in EAPI-5
-	econf --disable-guile \
-		$(use_enable gui webkit) \
-		$(use_enable gui gtk) \
-		$(use_enable emacs mu4e)
-}
-
-src_install () {
-	dobin mu/mu
-	if use gui; then
-		dobin toys/mug/mug
-	fi
-	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
-	if use emacs; then
-		elisp-install ${PN} mu4e/*.el mu4e/*.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	# TODO: Add guile man page when guile-2 is available.
-	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
-		  man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
-		  man/mu-mkdir.1 man/mu-remove.1 man/mu-server.1 man/mu-verify.1 \
-		  man/mu-view.1 man/mu.1
-	if use gui; then
-		dobin man/mug.1
-	fi
-}
-
-src_test () {
-	# Note: Fails with parallel make
-	emake -j1 check
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	elog "If you upgrade from an older major version,"
-	elog "then you need to rebuild your mail index."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-0.9.16.ebuild b/net-mail/mu/mu-0.9.16.ebuild
deleted file mode 100644
index d6af3e33c345..000000000000
--- a/net-mail/mu/mu-0.9.16.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils base elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-SRC_URI="https://github.com/djcb/mu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs gui"
-
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
-DEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/xapian
-	dev-libs/glib:2
-	gui? (
-	  x11-libs/gtk+:3
-	  net-libs/webkit-gtk:3 )
-	emacs? ( >=virtual/emacs-23 )
-	!net-mail/mailutils"
-RDEPEND="${DEPEND}"
-
-SITEFILE="70mu-gentoo.el"
-
-src_prepare(){
-	eautoreconf
-}
-
-src_configure() {
-	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	# Note: --disable-silent-rules is included in EAPI-5
-	econf --disable-guile \
-		$(use_enable gui webkit) \
-		$(use_enable gui gtk) \
-		$(use_enable emacs mu4e)
-}
-
-src_install () {
-	dobin mu/mu
-	if use gui; then
-		dobin toys/mug/mug
-	fi
-	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
-	if use emacs; then
-		elisp-install ${PN} mu4e/*.el mu4e/*.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	# TODO: Add guile man page when guile-2 is available.
-	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
-		  man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
-		  man/mu-mkdir.1 man/mu-remove.1 man/mu-server.1 man/mu-verify.1 \
-		  man/mu-view.1 man/mu.1
-	if use gui; then
-		dobin man/mug.1
-	fi
-}
-
-src_test () {
-	# Note: Fails with parallel make
-	emake -j1 check
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	elog "If you upgrade from an older major version,"
-	elog "then you need to rebuild your mail index."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-0.9.18-r1.ebuild b/net-mail/mu/mu-0.9.18-r1.ebuild
deleted file mode 100644
index 0d23cc5c5d9a..000000000000
--- a/net-mail/mu/mu-0.9.18-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs gui"
-
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
-DEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/xapian
-	dev-libs/glib:2
-	gui? (
-	  x11-libs/gtk+:3
-	  net-libs/webkit-gtk:3 )
-	emacs? ( >=virtual/emacs-23 )
-	!net-mail/mailutils"
-RDEPEND="${DEPEND}"
-
-SITEFILE="70mu-gentoo.el"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	# Note: --disable-silent-rules is included in EAPI-5
-	econf --disable-guile \
-		$(use_enable gui webkit) \
-		$(use_enable gui gtk) \
-		$(use_enable emacs mu4e)
-}
-
-src_install () {
-	dobin mu/mu
-	if use gui; then
-		dobin toys/mug/mug
-	fi
-	dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog
-	if use emacs; then
-		elisp-install ${PN} mu4e/*.el mu4e/*.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		doinfo mu4e/mu4e.info
-	fi
-	# TODO: Add guile man page when guile-2 is available.
-	doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \
-		  man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \
-		  man/mu-mkdir.1 man/mu-remove.1 man/mu-server.1 man/mu-verify.1 \
-		  man/mu-view.1 man/mu.1
-	if use gui; then
-		dobin man/mug.1
-	fi
-}
-
-src_test () {
-	# Note: Fails with parallel make
-	emake -j1 check
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/"
-	fi
-
-	elog "If you upgrade from an older major version,"
-	elog "then you need to rebuild your mail index."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-0.9.18-r2.ebuild b/net-mail/mu/mu-0.9.18-r2.ebuild
index 288e651c506e..17815abc9802 100644
--- a/net-mail/mu/mu-0.9.18-r2.ebuild
+++ b/net-mail/mu/mu-0.9.18-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="emacs"
 
 # net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
diff --git a/net-mail/mu/mu-0.9.9.6.ebuild b/net-mail/mu/mu-0.9.9.6.ebuild
deleted file mode 100644
index 39345c09b4ea..000000000000
--- a/net-mail/mu/mu-0.9.9.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils base elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-SRC_URI="https://github.com/djcb/mu/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		doc? ( https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mu0/mu4e-manual-0.9.9.5.pdf )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc emacs gui"
-
-# net-mail/mailutils also installes /usr/bin/mu.  Block it until somebody
-# really wants both installed at the same time.
-DEPEND="
-	dev-libs/gmime:2.6
-	dev-libs/xapian
-	dev-libs/glib:2
-	gui? (
-	  x11-libs/gtk+:3
-	  net-libs/webkit-gtk:3 )
-	emacs? ( >=virtual/emacs-23 )
-	!net-mail/mailutils"
-RDEPEND="${DEPEND}"
-
-SITEFILE="70mu-gentoo.el"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc ; then
-		cp "${DISTDIR}"/mu4e-manual-0.9.9.5.pdf "${S}" || die
-	fi
-}
-
-src_prepare(){
-	eautoreconf
-}
-
-src_configure() {
-	# Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable
-	# Note: --disable-silent-rules is included in EAPI-5
-	econf --disable-guile \
-		$(use_enable gui webkit) \
-		$(use_enable gui gtk) \
-		$(use_enable emacs mu4e)
-}
-
-src_install () {
-	base_src_install
-	# Installing the guis is not supported by upstream
-	if use gui; then
-		dobin toys/mug/mug
-	fi
-	dodoc AUTHORS HACKING NEWS TODO README ChangeLog
-	if use doc; then
-		dodoc mu4e-manual-0.9.9.5.pdf
-	fi
-	if use emacs; then
-		elisp-install ${PN} mu4e/*.el mu4e/*.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-src_test () {
-	emake check
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "http://www.djcbsoftware.nl/code/mu/mu4e/Getting-started.html"
-	fi
-
-	elog "If you upgrade from an older major version,"
-	elog "then you need to rebuild your mail index."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}