gentoo resync : 16.09.2020

3 files changed, 2 insertions, 79 deletions

diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest
index 5e66506560be..c6138ef6b426 100644
--- a/mail-filter/gld/Manifest
+++ b/mail-filter/gld/Manifest
@@ -1,6 +1,5 @@
 AUX gld.rc 443 BLAKE2B da060c3e9c29b4a12a1e8d74c29b82f9d29943864cdbdd4e4fd6ee502acd6b3cf052a2c578a12120ce515ac640346cfb19135f83082dd2ff748adb95bfb9c519 SHA512 08c2d5db9e607bf583f0f7d4cfb0a8bbef68d19ae068f4e899cc620b199e2cea742e84d98ea79d14d09fc1f4635834140b8ae4c9f71f90d63c6b2fc3debd5ee6
 AUX tables.sql 1141 BLAKE2B 0154c7dfe7a1761c15c2548990d5fb3889218287e7f5a4ddb943d871245d2aafe4d4cac014855dcfb3dd9fbaf9e950b0d2be9d6135eb4527e99b4521d5197dcd SHA512 4501ffb273f7064f1bbb56dd6d3f433532924da52c9007d089c57a27aff9cfda2f4b0a59844d0c8e5ff8ce9218f66316914a5af2c801eacba489d003806bb56a
 DIST gld-1.7.tgz 40241 BLAKE2B 3ec3f28d933da4cf7cbb5d66188f162be6d4d6882c5c1d6a143ca6ce1222e92abb7f0e67dba6cb49e9af5b9b2eec9ec962c82edea97aa305efe23acda2825c8b SHA512 68bbfd03295c2895608f8404ca1a0942c53003af66d70fda0e2515717ab8e6836f2b609942633b6d70a15b49338a887b5b1082ed1d9bc7c2c0aa3a7735abb13e
-EBUILD gld-1.7-r2.ebuild 1875 BLAKE2B 1f2f2dccb676953a92aa4933fdd8a4ee580500c5118327d1c2ea950cbe6a92879a133d7a742d96409253e73df5a0a5409270ad9c9fba1e8a54269d3c982e618f SHA512 16e11bd850678ef303a81fab386870bc54d9a6341f66ac55e8a84b3d0d86cf9f0fccb3aec9cd39c0eff906eac976e554c055e91c197af8f91eadb35414b931ab
-EBUILD gld-1.7-r4.ebuild 2051 BLAKE2B 9edab9b96caaa40877df42f5169abd072113bdcc03a7b5b1d0fe707fa552f024eb9c259f46dc6f30979f0bcf98885088b259bb235512a006feebf237b3d289db SHA512 ebd7d1de7212ee06688941ec068c57cf6f1764cc7361e035e0de1c7e70a001fcd9f161424eb47a0b32dff4a0a34164cba35980c796a5759dfbf23889694a81a9
+EBUILD gld-1.7-r4.ebuild 2049 BLAKE2B 8373f96ee3953781ad8df8c750bb7b38a1cef373a92fc468a7189537174e04be56126cb3ff6a847a2d571b080147fe90166b752997ff30766e41ba905742f729 SHA512 5f99a5bf91bd034e11b4b2c3b4dcb685441fa21dc0d835dac7d58724562c34dbcd9a7aced48d24c4b4f86499846934c7b3136f6283a2dc5cdf512023e923bc35
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-filter/gld/gld-1.7-r2.ebuild b/mail-filter/gld/gld-1.7-r2.ebuild
deleted file mode 100644
index 55c7f21f081d..000000000000
--- a/mail-filter/gld/gld-1.7-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix"
-HOMEPAGE="http://www.gasmi.net/gld.html"
-SRC_URI="http://www.gasmi.net/down/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="postgres"
-# Not adding a mysql USE flag. The package defaults to it, so we will too.
-DEPEND="sys-libs/zlib
-	>=dev-libs/openssl-0.9.6
-	postgres? ( dev-db/postgresql[server] )
-	!postgres? ( virtual/mysql )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i gld.conf \
-		-e 's:^LOOPBACKONLY=.*:LOOPBACKONLY=1:' \
-		-e 's:^#USER=.*:USER=nobody:' \
-		-e 's:^#GROUP=.*:GROUP=nobody:' \
-		|| die "sed gld.conf failed"
-
-	sed -i Makefile.in \
-		-e '/ -c /{s|-O2|$(CFLAGS)|g}' \
-		-e '/ -o /{s|-O2|$(CFLAGS) $(LDFLAGS)|g}' \
-		-e '/strip/d' \
-		|| die "sed Makefile.in failed"
-
-	sed -i tables.{my,pg}sql \
-		-e '/ip char/s/16/39/' \
-		|| die "sed sql tables failed"
-}
-
-src_configure() {
-	tc-export CC
-	# It's kind of weird. $(use_with postgres pgsql) won't work if you don't
-	# use it...
-	if use postgres ; then
-		myconf="${myconf} --with-pgsql"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	dobin gld
-
-	insinto /etc
-	newins gld.conf gld.conf.example
-
-	dodoc HISTORY README*
-
-	insinto /usr/share/${PN}/sql
-	doins *.pgsql *-whitelist.sql "${FILESDIR}"/tables.sql
-
-	newinitd "${FILESDIR}"/gld.rc gld
-}
-
-pkg_preinst() {
-	elog "Please read the README file in /usr/share/doc/${PF} for"
-	elog "details on how to setup gld."
-	elog
-	elog "The sql files have been installed to /usr/share/${PN}/sql."
-	if [[ $REPLACING_VERSIONS == "1.7-r1" ]]; then
-		elog "You might want to use the ALTER_TABLE command to change the"
-		elog "ip field width to 39 chars to accomodate ipv6 addresses."
-		elog "Please see your sql server documentation."
-	fi
-}
diff --git a/mail-filter/gld/gld-1.7-r4.ebuild b/mail-filter/gld/gld-1.7-r4.ebuild
index 0bcd3923f278..fb79d9897fc6 100644
--- a/mail-filter/gld/gld-1.7-r4.ebuild
+++ b/mail-filter/gld/gld-1.7-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.gasmi.net/down/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="libressl postgres"
 # Not adding a mysql USE flag. The package defaults to it, so we will too.
 DEPEND="sys-libs/zlib