gentoo resync : 13.10.2019

3 files changed, 2 insertions, 65 deletions

diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index 66fb13e18096..e070f9555e71 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -1,8 +1,6 @@
 AUX cvm-0.96-fix-test-padding.patch 971 BLAKE2B a0a6dbd617427347a4b93b436f326d2cda5bd123adb6410a29f4b5955f014d078935cbf7178a1857941fa09ace013a5800f615cc0a5067dbfca10b228ec0e758 SHA512 18fa658e70030709fb83b81311a13358b09cc872ea8bb9db91ab78ea56dea13459f0bdf8e02bf8c6045c8838d7ea1941f73d0c405fe3b38f2edcb29a9cc200fb
-DIST cvm-0.76.tar.gz 91957 BLAKE2B 4b1ff780fa0842f2dba7afafe98479b76b95c3dc71ea3fe0321c92039697fde1fa69a99ee78450cadae6b23941344c48f4d4c845f9c3fcc8a69a5f8f208fbee6 SHA512 f3634be766e1381a95c09514547679f458e92b5f4de468b5d3b4e5f7e8f1eb8d1aa7eb5e2b15a374cbf51cc5f6e6269e7f5e7d9daf8d2adfaed37d2e11f472fa
 DIST cvm-0.96.tar.gz 127999 BLAKE2B bf6a0f26538f4f10dafe9d021e6f3ef22ee57230f64cf50cba95be3cb5ddf54a0479d033936d26ee9526745ead61fc6af7bfd1fdc3da10a6915108b2d873772c SHA512 23adf39571bf414fa61084ac824a54b3cb37ef32a46c72ad50734743fb66bb923168eb866d72fba7f88397b37831e2ce7603c7d543996b28761ed1d5b053d73d
 DIST cvm-0.97.tar.gz 127759 BLAKE2B 857a30ae52e7edc5e8bc66dfbe7e2ada6ba7763260b073eabbca6ee289b68ceece92442dffc5aa1d358faec24f90993d88d3555dd9399837f25e9f689ab6d66b SHA512 b04ca9edb8c84e06628ed1a827d28bf7d787c3853bec1e064fc1eb7e3082ad81998e7c902e029c0f01c346a52a4419e3c9890e2a7a75ab38625e0078dc4e9891
-EBUILD cvm-0.76.ebuild 1451 BLAKE2B a869b351583def10291ee6f19ac8602fab654dcac0dfa9e09cc7003afe795a97a7d64243a1d331eb78a27781c6e57532f39298704b57a0a719bf8714760f2761 SHA512 e0cdea110fa6acff28b95bb9eede58dd63dc4dfd9c6c22aa9ae2c2ede0b8d926d5f4adf458be62054358aad5f9329ea9b64441ca0dada3b60d825ae4fd956eb2
 EBUILD cvm-0.96-r1.ebuild 3208 BLAKE2B 0ad53487cbaa52ca349b1e12abfced27584808a5d0c8e02ee56fc90bd091b79e413d435dd4a719237a5a2e945a6f1edae663fa14f007aee7badd65b3ed90cbb1 SHA512 b761512901a1a10b4d9c1f1952a3e63ef09a1257dacba6afec9588389c4967fc49b056a314a05c1b1fb7c644e0bd4f32b8cfd4767c62f09f4f46b5ccd7571705
-EBUILD cvm-0.97.ebuild 3240 BLAKE2B a28ef097595d8421dd6b24c2c118867bea6c2619f11313dc5c8eb06f1c42cc1db4acdcee60b97e6579ce9cfe5b5654d3e9720cf85f473aeb237fbbea4e34bcad SHA512 40750c3ded0d159de4188452c7a685917164f788bfec6f94cd0ba7a218a66825fdcd40d30836c66ccc3781114a0d3427306a5bc1664ed0b1230145c7c0d57a42
+EBUILD cvm-0.97.ebuild 3238 BLAKE2B 6ae08ef6bf661b013167cecb2a76a735ddc05c4eed6b1be8bc195101ae394550c578b766c67107abe718a2b28b5ec12e65adc274d98bb4540ef6fd657b654651 SHA512 f100e1089aa30cf5da7260544db21ba27a78d5a7eb3e6d07fca2fdab95a193fa81b0c7d176b52f969b5de7c089e5e3d1b9f57b6b3922cb8633c265a2ac53d057
 MISC metadata.xml 237 BLAKE2B 0c8ef45b6f0e15404fc767ceb7b133a844621199b4b5a5f8906c6e9ffb186572a46fd6871021bb4fe3e3b1f76ba75f38bddcaaf8eddeef43568074a54dea0c9e SHA512 34de058bcfc91edc8aa792fa3a20d0bb0318166634113402f22da57d97a4d54f8710c922c38fdd810aeb3bdcb9591494d5b20f63441ff77d242ab83f764126f3
diff --git a/net-libs/cvm/cvm-0.76.ebuild b/net-libs/cvm/cvm-0.76.ebuild
deleted file mode 100644
index 63d425f003e3..000000000000
--- a/net-libs/cvm/cvm-0.76.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Credential Validation Modules by Bruce Guenter"
-HOMEPAGE="http://untroubled.org/cvm/"
-SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc sparc x86"
-IUSE="mysql postgres test"
-
-RDEPEND="dev-db/cdb"
-DEPEND="${RDEPEND}
-		>=dev-libs/bglibs-1.041
-		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql[server] )
-		test? ( app-editors/vim )"
-# some of the testcases use ex/vi/xxd
-
-src_unpack() {
-	unpack ${A}
-	# disable this test, as it breaks under Portage
-	# and there is no easy fix
-	sed -i.orig -e '/qmail-lookup-nodomain/,/^END_OF_TEST_RESULTS/d' "${S}"/tests.sh || die "sed failed"
-}
-
-src_compile() {
-	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/lib/bglibs" > conf-bglibs
-	echo "${D}/usr/include" > conf-include
-	echo "${D}/usr/lib" > conf-lib
-	echo "${D}/usr/bin" > conf-bin
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld
-	emake || die
-
-	if use mysql; then
-		make mysql || die "making mysql support failed"
-	fi
-
-	if use postgres; then
-		make pgsql || die "making postgres support failed"
-	fi
-}
-
-src_install() {
-	einstall || die
-
-	dodoc ANNOUNCEMENT NEWS NEWS.sql NEWS.vmailmgr README README.vchkpw
-	dodoc README.vmailmgr TODO VERSION
-	dohtml *.html
-}
-
-src_test() {
-	sh tests.sh || die "Testing Failed"
-}
diff --git a/net-libs/cvm/cvm-0.97.ebuild b/net-libs/cvm/cvm-0.97.ebuild
index 85fee1303328..849b3cab3e20 100644
--- a/net-libs/cvm/cvm-0.97.ebuild
+++ b/net-libs/cvm/cvm-0.97.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/cvm/archive/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE="mysql postgres test vpopmail"
 RESTRICT="!test? ( test )"