gentoo resync : 14.12.2020

4 files changed, 3 insertions, 49 deletions

diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest
index 94f5ed3a2e60..b9f03df539aa 100644
--- a/net-mail/fdm/Manifest
+++ b/net-mail/fdm/Manifest
@@ -1,5 +1,3 @@
-DIST fdm-1.9.tar.gz 299916 BLAKE2B 0c9bb9514a4d36fb1168be73fe745aa136cea75e0ebde28ab181be7d4b7e093c0bec775222e8a333e14baa90871739fa095a89bf8d1f16a86dee03b6d01021aa SHA512 e7e5c8aae8be3e82ff6015d2d87fd9d0dad4fe24796b4f30d6874f761e2df6900c8940d39de28bb2db6ee3ea3faf494c57149037657d986a3b54db3a6a601ca7
 DIST fdm-2.0.tar.gz 313596 BLAKE2B 8b323f4a8953a46773a4e5a1214444dc97db4346f50990fcfb4c9d79ae40bbb73b61e3bf41bc95b76e44f6bed7b398cb210d58901823752e92ca7b83189cbc7e SHA512 14e923202d17083ceb3b91b3a442d7e512c37f3d29535f22d8c0c4e1d57c97acc5d5465d643ed0cf437b3945ef777a6e38da3117219c2d54dcec88ecab1e10d9
-EBUILD fdm-1.9.ebuild 920 BLAKE2B 70d8d1f0438dda55671ddba7b17b868d63f89c573d5a8ceb0cf00f8d04253358089b05d29ff7eb7d2e27b431f0c413b007657ef2c2c642d9da829909a761c63a SHA512 d6cb2804a8df302ddc87c3ab84a7f0154d6eee144ebba10ce72a7a427aeebc487132dee472f8496270bf5b13623b66e3dc4a9fd7059817f9549851b2033c15b4
-EBUILD fdm-2.0.ebuild 842 BLAKE2B 53fbab79656bed53fc503d9d23f32fcc6effd5ab536c1066b79441e5b51169ad2ea58fdcb2872d19d1e9ed525091516c2b5983154a090e9798b44422ded5d770 SHA512 e8cb0f3eac3cb420945ee6243704c783c381e8bdf220e7e2b9f164ca055507960e3472d5a2eaf855635106363e6c5a93791383175e1264b1ca339d8513f36e2a
-MISC metadata.xml 395 BLAKE2B d62bae2c039a663b01a2ddaa4a025766c05032c2484eb0638dcf2dff888464fd7e582449a0ae1f53da2e2eced93bda7772e68c89e192bec17b9332ebe3878666 SHA512 08b8b693f7b5750b721c81181cbebc031bcd50fbf2b45706e2e78597f35c567267fa4e924d97f1df9969603d2be74a7e269769d957c1ac121dae772021b00bfe
+EBUILD fdm-2.0.ebuild 841 BLAKE2B 90dae6ba8dcfa5a2f9552fd90ce1b94f0816f743a2290afe00381554e34f4dd1c53d1ea5927e9699a82c3fb73751cdf8a83bcad20e28f2675f9b84abfd554921 SHA512 3f94f2ac469eb96c0d14b2568adb5a121aeed43c93bc2ba620803e167a533376cc5d05465e3cab54227f5f39a2d1d40739febe061e0843cb9a2ea4a180c4aa1f
+MISC metadata.xml 295 BLAKE2B 258b3dde768bd93f75108c451644287a850dd28a867429953e65ce650dd9911982f6c47672d6fe75d67f572d28f6d6e3d15393f7e88f9beff7917dea30f53ca4 SHA512 702eb19cdd97836f450877ec4fb366447b32b5eb4c181930c0960b1d5c2638ba1a0c995cb599fa272fd31c80b5ecba93ba4b713d9e913103d5509ba2959f8eb6
diff --git a/net-mail/fdm/fdm-1.9.ebuild b/net-mail/fdm/fdm-1.9.ebuild
deleted file mode 100644
index 7aeec5891373..000000000000
--- a/net-mail/fdm/fdm-1.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs user
-
-DESCRIPTION="fetch, filter and deliver mail"
-HOMEPAGE="https://github.com/nicm/fdm"
-SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="courierauth examples libressl pcre"
-
-DEPEND="!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/tdb
-	courierauth? ( net-libs/courier-authlib )
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewuser _fdm
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		COURIER=$(use courierauth && echo 1) \
-		PCRE=$(use pcre && echo 1)
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man install
-	dodoc CHANGES README TODO MANUAL
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-	fi
-}
diff --git a/net-mail/fdm/fdm-2.0.ebuild b/net-mail/fdm/fdm-2.0.ebuild
index 90719cb03337..c74527c128e3 100644
--- a/net-mail/fdm/fdm-2.0.ebuild
+++ b/net-mail/fdm/fdm-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nicm/fdm/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples libressl pcre"
 
 DEPEND="!libressl? ( dev-libs/openssl:0= )
diff --git a/net-mail/fdm/metadata.xml b/net-mail/fdm/metadata.xml
index dae07138c6d0..61a735f7ec60 100644
--- a/net-mail/fdm/metadata.xml
+++ b/net-mail/fdm/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <use>
-    <flag name="courierauth">Add support for Courier authentication library</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">fdm</remote-id>
     <remote-id type="github">nicm/fdm</remote-id>