gentoo resync : 10.02.2020

4 files changed, 4 insertions, 61 deletions

diff --git a/net-mail/mairix/Manifest b/net-mail/mairix/Manifest
index f8247228cf73..ea077c59d3af 100644
--- a/net-mail/mairix/Manifest
+++ b/net-mail/mairix/Manifest
@@ -1,6 +1,3 @@
-DIST mairix-0.23-gnus-marks-propagation.patch.gz 3401 BLAKE2B 258e1dec608c896d7ffdff4ebffe959703ef371bcd9c3dddad44793cf43377dec78e289517c3bc5cef3f51d56eb0996c1f873c7ed092ca4d0084b50b35d10a9f SHA512 89572c1dc1913b974461a3cd75787d9360cabfaf08dc987ccf2ae5519dcf8d12935e22ca5ff3e2e58038f04b818884bab305a11393ca99bb6dad86018d863d1c
-DIST mairix-0.23.tar.gz 193726 BLAKE2B e1de3f7d8b81a23a87845fe4cc285ee46232a14eea77e9f8191dc26fbaddd435d1a1e194158b13542ef201851cc03e32eece2e7b16fcd6be71595f60f82e10d1 SHA512 3ea372304e91eed6127d8e71cf0970c9380e4dec96fd9ad38a6deb1af455ae6eb604dfbb2ec372cbb940beb8459c39d8620af12a996d7f6a37e893fbb588e61b
 DIST mairix-0.24.tar.gz 206903 BLAKE2B b18832dbd5d570d428c454ade693ab0746b6e601d94a9b6d5dd4ca81356cbaecaec5c88623fe5bd612e94112dc4b6f16929fc210ce3c5c8e1e5d2a0c62309d79 SHA512 3e0af50c2c5857c5e1661e1be131c9c184377947b2ed884d1d9faa6d8bd88c17a7b7a29e105e65c990d2ede5d9fff679e57e83c4b8eedf2870493395e3ec8cf3
-EBUILD mairix-0.23.ebuild 1127 BLAKE2B 5849c85e56f2d6fcb7c36db6e6a57a9320df46d469b942a3138c56b307bc0259a4f3d934a0274b250d583fcdde360a602bdfd00416b3c00dda7248637e1c460b SHA512 c5dcaf358b4d6813173545ee12d582b377df0a341d28b820b7b2f708924e0bdd64db2c7c8f5a1e7cd6a88a1ae3a7526d399d00e0ed39d3555cee570658bdb0b7
-EBUILD mairix-0.24.ebuild 940 BLAKE2B 663da72cc3f39b05b88786d42dbf21e6cff8d3bc7dd0c8312acc6e663d68335aef4012d79e7189d4956ea6a6cf88b7a9fa31e34e227183d60b4b39e67a6cf8dc SHA512 04706eb4755fea2b4814396d28d227f2388519887714dc9008b14573650e50fd2be6a6f55bbba56b651a5d0990738edca255e808f56c4e6fdb336b64360ce08f
-MISC metadata.xml 435 BLAKE2B 10c870e9494171a3842301820c03bb8502556d0c2a36e0e5062960db644273eb20edd82b1a9f28df3d06fd1b7205e9403e80275f00652d233f0b6d9a6b381f89 SHA512 8ee659642be4150429b6f925f930b647bef299eb1dfb2fb808eb0e2e06ba693416397f27681d1291d21a215b016a1c1887cdf802f00b7efc8bb0b526a24aaa81
+EBUILD mairix-0.24.ebuild 934 BLAKE2B 941e93ca2a862721ed2dbe89403007a041fa20cf6a98f2f0c848d65a8d84939ed9c9aac6561800c228c59034e35b280e667602d27b97a3af662b636c84cc9078 SHA512 3e763c38297b91838bf93a5afc57475b70a444e7f53418f5e81942866c2b9efe53b4794ed3cf36cf06c10dd2b7d59b522ff5cdf8e3a9a7523793d67678f0e2f9
+MISC metadata.xml 243 BLAKE2B d9d3e2a9c2df5ef86d73ee0d991b7cd768837c3cd73c5e3fc164583b5eba416994bcee999c2bd40e03d3b09504f291df80c5ae93deb545bc8aec3997c49465a8 SHA512 85c72e2ecb2b1328ebccb72908bacfacbb8b062937f13d0d5fe3c2131a91ff2be5cd999417a13f584277a21bae70cd7ff3d5d17c4a3a5f02e0b563a5d8947a54
diff --git a/net-mail/mairix/mairix-0.23.ebuild b/net-mail/mairix/mairix-0.23.ebuild
deleted file mode 100644
index a39bc552fb9b..000000000000
--- a/net-mail/mairix/mairix-0.23.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Indexes and searches Maildir/MH folders"
-HOMEPAGE="http://www.rpcurnow.force9.co.uk/mairix/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	gnus? ( mirror://gentoo/${P}-gnus-marks-propagation.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-macos"
-
-IUSE="zlib bzip2 gnus"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	bzip2? ( app-arch/bzip2 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-# Fail on various locales
-RESTRICT="test"
-
-src_prepare() {
-	# econf would fail with unknown options.
-	# Now it only prints "Unrecognized option".
-	sed -i -e "/^[[:space:]]*bad_options=yes/d" "${S}"/configure || die "sed failed"
-
-	# Add support for gnus marks propagation (bug #274578)
-	use gnus && epatch "${WORKDIR}"/${P}-gnus-marks-propagation.patch
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable zlib gzip-mbox) \
-		$(use_enable bzip2 bzip-mbox)
-}
-
-src_install() {
-	dobin mairix
-	doman mairix.1 mairixrc.5
-	dodoc NEWS README dotmairixrc.eg
-}
diff --git a/net-mail/mairix/mairix-0.24.ebuild b/net-mail/mairix/mairix-0.24.ebuild
index 2fb5df966c5f..163f013cbd22 100644
--- a/net-mail/mairix/mairix-0.24.ebuild
+++ b/net-mail/mairix/mairix-0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-macos"
 
 IUSE="zlib bzip2"
 
diff --git a/net-mail/mairix/metadata.xml b/net-mail/mairix/metadata.xml
index 1c5738b1e1f3..59ab1f3d05b1 100644
--- a/net-mail/mairix/metadata.xml
+++ b/net-mail/mairix/metadata.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="gnus">Add support for the marks propagation feature
-			in GNUS (provided by <pkg>app-editors/emacs</pkg>
-			or <pkg>app-xemacs/gnus</pkg> for XEmacs users)</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">mairix</remote-id>
 	</upstream>