gentoo resync : 13.10.2019

3 files changed, 2 insertions, 83 deletions

diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index 9acadadc0d0a..3a4fceca802e 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -1,6 +1,3 @@
-DIST ezmlm-0.53.tar.gz 62693 BLAKE2B f417522da8d2b3ae7d0465e7226cd95dc85b55a397b61a6ce20df15544639377667a8912f7a26daf83e54fd3f26881c4e771409c98a640b7b94c7b6e3fef7461 SHA512 0dc1c64168428c531dbf78ca99582de4d4193d10bb38e87d3ee8f33f78083dc696bfd0681e3f2f690d7aa78b55b1b91c4ea6900c109406063445104826ff6d94
-DIST ezmlm-idx-6.0.0.tar.gz 659996 BLAKE2B bf5f7ac0a40d1167d42ef26c4b28f95899f5a72d4c969c975368f61902f5ce9b5721143c251cdcb70c58149e6d7eb28c834b26426d9611b4249a285b523c38d8 SHA512 547186a2e32f3861ef51a9012442e7d8b553d90f2af949bb51845c29178ee2a44760471852c7c23fbd241c14753f22357463c5d5f10b70eceb05603cc6d83d4a
 DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192266112da0516e936278610288dc11d44d1959cd135a90eacb4befa43d62f53b3bedb94e994afc13aed986834bce SHA512 c0fc35aef4a72aefa4cdaee4c1933cc00aab82ee81ad7577793952fbf57106c06e4a5844a2bbf3919ad2985d2062ba1edf8831e6aa66d7e762210e7e147210ef
-EBUILD ezmlm-idx-6.0.0.ebuild 1740 BLAKE2B 268ec06ad95ed38cdb4fe02d4c36a1a10f877603a6c629c67e205ab4664cf9dfeec45d1dd9998ebe382dce754105476db2dc951ebc7420951163c2c1d9090b16 SHA512 42ffd641cd6d754f898c6d66b4026b0ec5f6492ba52b4f6799b0ef60ff0b1050e86db44886cc487c263da1a7c1d575ec0cb33842d3c47ce9cb0db00cc8713bb3
-EBUILD ezmlm-idx-7.0.0-r3.ebuild 1429 BLAKE2B 9e5641fbaee2a744019f1fbf0882b51f27193e926facf733bb6d769b054cf91270ad1ff88304f4cad09158a1e8338664296987be248358ef39320cfd260caa43 SHA512 235a676ea6da184741f0c6d7241ac91b6489b60744673a02acef534bce02796aae3c021e3f98692f6e5f88345ff023ddcc856c80c301787d38e8338cce17f93a
+EBUILD ezmlm-idx-7.0.0-r3.ebuild 1424 BLAKE2B 00a21949859705e02af4eb3e66438b26b6ed06e59c1c6d6d8608238ed71eee7d45081a388274b8022d3cdd1f7f50c9b237be8cfea34a9d5065beaae7b48316e8 SHA512 b59d8990b956e52e3afcfcbd4d73d105c56f3bb781ee956ae54bc13fa1c30a683db93ab9182d96ffc87ebaedcf5dde5a7be68a4a5dd44cf9f2d8ba8c9ed131f6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild
deleted file mode 100644
index d3490191fb35..000000000000
--- a/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-EZMLM_P=ezmlm-0.53
-
-inherit eutils fixheadtails
-
-DESCRIPTION="Simple yet powerful mailing list manager for qmail"
-HOMEPAGE="http://www.ezmlm.org"
-SRC_URI="http://cr.yp.to/software/${EZMLM_P}.tar.gz
-	http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
-IUSE="mysql postgres"
-
-DEPEND="
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-"
-RDEPEND="${DEPEND}
-	virtual/qmail"
-
-S="${WORKDIR}"/${EZMLM_P}
-
-pkg_setup() {
-	if use mysql && use postgres; then
-		die "cannot build mysql and pgsql support at the same time"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}"/${P}/* "${S}" || die
-	cd "${S}"
-
-	epatch "${S}"/idx.patch
-
-	ht_fix_file Makefile
-
-	echo /usr/bin > conf-bin
-	echo /usr/lib/ezmlm > conf-lib
-	echo /etc/ezmlm > conf-etc
-	echo /usr/share/man > conf-man
-	echo /var/qmail > conf-qmail
-
-	echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc
-	echo $(tc-getCC) ${CFLAGS} > conf-ld
-
-	# fix DESTDIR and skip cat man-pages
-	sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
-		-e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
-		-e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
-		-i Makefile
-
-	# ezmlm-mktab-{my|pg}sql may or may not be made
-	sed -i -e "s/\(^.*mktab\)/?\1/" BIN
-}
-
-src_compile() {
-	emake it man || die "make failed"
-
-	if use mysql; then
-		emake mysql || die "make mysql failed"
-	elif use postgres; then
-		emake pgsql || die "make pgsql failed"
-	fi
-}
-
-src_install () {
-	dodir /usr/bin /usr/lib/ezmlm /etc/ezmlm /usr/share/man
-	dobin ezmlm-cgi
-
-	make DESTDIR="${D}" setup || die "make setup failed"
-}
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
index a8b8d7a76fe3..1f0025826f86 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86"
 IUSE="mysql postgres"
 
 DEPEND="mysql? ( dev-db/mysql-connector-c:0= )