gentoo resync : 15.12.2019

3 files changed, 2 insertions, 46 deletions

diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index bdcf5582dbf8..b89e7eaea379 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -1,6 +1,4 @@
 AUX poppassd.xinetd 245 BLAKE2B 28fe0bc0c1c87c4ff48cae52c703a4a6c3e776bf91b869040025951dbaf1f07345a95c9bc45d40f87c3ad9a83d6556421f805d65952f4f9d7588abed9bb5b25f SHA512 333d331433a0b43f414f83e51cad3502afb6f5b287967e55d0dedd90ac06955ccbcbe598a3dafe682c97a7ac4ecf501c0842ade940c0702fb797717e8844ffd4
-DIST poppassd-1.8.5.tar.gz 6054 BLAKE2B f97c908a3880aa9ddb76ce09f33046649dfa2d145c8d8d5b70f1a7b473ba2ba8901b62d8e0644187c5987e3c4c8257c8f2bee9504b98bf3d81035e0acda4522c SHA512 4d8d9c3b15b986bd34e5e459f654e8137019a2466b9fec001d9e61a3267b09f150c3faee8e6914d98742c7b3a7301271ba522ee6dff614cca97815a3ae241ae9
 DIST poppassd-ceti-1.8.7.tar.xz 71400 BLAKE2B ca26f7298a8f679c595a9cd66622f1e8ddeff80a7b1655df91a7a15668337112113806d0aef788a374c483cbc957e765b178428d839da2c853ebf87e16039548 SHA512 d50549a4f6bdd9eac7fa74a7787e47dbffff14da883d4e8e23e24802883761c1a392b8a7fbffe5fa726845f48b3b33e0dbc1743ad2d689a4d396c91d0a42f8f1
-EBUILD poppassd_ceti-1.8.5-r2.ebuild 908 BLAKE2B 2b20b468bb071291b0381f0928fb89c5b448e59d983cb453f0155387a3b232f806032f27e4e44ce174ec35f6e8e115de09127704b9d067be5be0bcc6a9fb86d7 SHA512 d46b73589cb8e0eb37d666504024b9ba85b14ec4121230d5564c7e8b5046b4010b57e0046ab451f784066d0aaad150517b657170998caaf56753f37b9a7010bd
-EBUILD poppassd_ceti-1.8.7.ebuild 1680 BLAKE2B b0ae22e7f2be91092223c055f6f2e775c6383ffffd6934aebd64f9fc187bf4deb79636d2d5ad031ea9ab1d9acc317a2f6bfff9cfcb21f2c5ae425639381159de SHA512 4cb0d8d1ce80429bdf900c3a8eabd4428420e040288fd88f4874336e2e95a8fd11807fb9950c2246b12420c9c9cff790cbf5764a62e34ba8727e3217655bef97
+EBUILD poppassd_ceti-1.8.7.ebuild 1678 BLAKE2B bb77369d9c5ed2ec923a00c5813a16d6c55f92e429d16011d20398ee95f6999137ad3e9f4b43f72d927ec85faf3dcb58cef203e9d4cc4f5f63bc1ba6b4ca788a SHA512 93fc50a9205e0a543e2d9d729b6450a3b736079a83061fd912e491c2d5dd1149658ec2d8d4349ccea6f183f40837b143a724649d8e2a861695126895dc96c521
 MISC metadata.xml 914 BLAKE2B b6b5348eee4b5a213c13a382ae0294a25497fda65f48e8e4cacd327631357101b1509484936dc0fe0935279245b7fcc4cf15e062b333a73e281a7f793d5e016e SHA512 d1e4a0a72c157bb94ac240987b0b568b9212981f7727383eb28995f2f80e2d5f9ac0eaabbf36fd076f4237ebd84ec8e804238f92f583a63e963f1c4a20e4acf7
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild
deleted file mode 100644
index 170e89cb3179..000000000000
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs pam portability
-
-MY_PN="poppassd"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Password change daemon with PAM support"
-HOMEPAGE="http://echelon.pl/pubs/poppassd.html"
-SRC_URI="http://echelon.pl/pubs/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="sys-libs/pam"
-
-RDEPEND="${DEPEND}
-	sys-apps/xinetd"
-
-src_compile() {
-	$(tc-getCC) -c ${CFLAGS} ${MY_PN}.c || die "Compile failed."
-	$(tc-getCC) ${LDFLAGS} -o poppassd ${MY_PN}.o -lpam $(dlopen_lib) || die "Linking failed."
-}
-
-src_install() {
-	dodoc README
-
-	pamd_mimic_system poppassd auth account password
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/poppassd.xinetd poppassd
-
-	insinto /usr/sbin
-	insopts -o root -g bin -m 500
-	doins poppassd || die "Install failed."
-}
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
index 2ec3e4e92f26..0e359ed3991f 100644
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/kravietz/${MY_PN}/releases/download/v${PV}/${MY_P}.t
 # added upstream after 1.8.7:
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="sys-libs/pam"
 RDEPEND="${DEPEND}"