gentoo resync : 18.05.2019

3 files changed, 129 insertions, 7 deletions

diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index 4e94a4a71c62..9d81bc99f23c 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -1,6 +1,8 @@
 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
-MISC metadata.xml 296 BLAKE2B bdd092a7e715a03179775af2fcaf170ac7ad4d640812b29d347484bbb986e09b429365201112a409b97b8d40615e561958da79e1acfdbb783ec3e6db30d41109 SHA512 75d265987a3c3e83685a00d760965bc8e4e796429017c05642de2fcda4e37891dd06386df57dfe2d0e2b294916316389a1d72dc09e9feebdf5db3abe2626e34b
+EBUILD cvm-0.97.ebuild 3238 BLAKE2B 8d1cc8aaa761dc1cf2200c72ec9ff2f70a92ec6238ca9a0e16bf462db5a061bbb71fcdf5b013e1d44d09404cd6b3599b49a454fd76867a0ff03e1eca5b7ade6d SHA512 7b406bec5ed97fee10d4124f40d7fb62e8c993cf0d156046654c855bbdaf516433cae161e08f204483a1f24b2e70cd69ef4515db627214991b524bef407c6c52
+MISC metadata.xml 237 BLAKE2B 0c8ef45b6f0e15404fc767ceb7b133a844621199b4b5a5f8906c6e9ffb186572a46fd6871021bb4fe3e3b1f76ba75f38bddcaaf8eddeef43568074a54dea0c9e SHA512 34de058bcfc91edc8aa792fa3a20d0bb0318166634113402f22da57d97a4d54f8710c922c38fdd810aeb3bdcb9591494d5b20f63441ff77d242ab83f764126f3
diff --git a/net-libs/cvm/cvm-0.97.ebuild b/net-libs/cvm/cvm-0.97.ebuild
new file mode 100644
index 000000000000..9f7bfe2f7380
--- /dev/null
+++ b/net-libs/cvm/cvm-0.97.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Credential Validation Modules by Bruce Guenter"
+HOMEPAGE="http://untroubled.org/cvm/"
+SRC_URI="http://untroubled.org/cvm/archive/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="mysql postgres test vpopmail"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/cdb:=
+	>=dev-libs/bglibs-2.04:0="
+DEPEND="${RDEPEND}
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql[server] )
+	vpopmail? ( net-mail/vpopmail )
+	test? (
+		app-editors/vim
+		dev-db/sqlite
+	)"
+# some of the testcases use
+# - ex/vi/xxd
+# - cdbmake
+# - sqlite
+
+PATCHES=( "${FILESDIR}"/${PN}-0.96-fix-test-padding.patch )
+
+src_prepare() {
+	default
+	# 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' \
+		tests.sh || die "sed failed"
+	# Fix the vpopmail build
+	sed -i.orig \
+		-e '/.\/ltload cvm-vchkpw/s,-lmysqlclient,,g' \
+		-e '/.\/ltload cvm-vchkpw/s,-L/usr/local/vpopmail/lib,,g' \
+		-e '/.\/ltload cvm-vchkpw/s,-L/var/vpopmail/lib,,g' \
+		-e '/.\/ltload cvm-vchkpw/s,-L/usr/local/lib/mysql,,g' \
+		-e '/.\/ltload cvm-vchkpw/s,\.la,.la `cat /var/vpopmail/etc/lib_deps`,g' \
+		Makefile \
+		|| die "Failed to fix vpopmail linking parts of Makefile"
+	sed -i.orig \
+		-e '/.\/compile cvm-vchkpw/s,$, `cat /var/vpopmail/etc/inc_deps`,g' \
+		Makefile \
+		|| die "Failed to fix vpopmail compiling parts of Makefile"
+	sed -i '/\-rpath/s|conf\-lib|conf\-rpath|' Makefile || die
+}
+
+src_configure() {
+	echo "${ED}/usr/include" > conf-include || die
+	echo "${ED}/usr/$(get_libdir)" > conf-lib || die
+	echo "${ED}/usr/bin" > conf-bin || die
+	echo "${EPREFIX}/usr/$(get_libdir)" > conf-rpath || die
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)/bglibs -lcrypt" > conf-ld || die
+}
+
+src_compile() {
+	default
+
+	if use mysql; then
+		einfo "Building MySQL support"
+		emake mysql
+	fi
+
+	if use postgres; then
+		einfo "Building Postgresql support"
+		emake pgsql
+	fi
+
+	if use vpopmail; then
+		einfo "Building vpopmail support"
+		emake cvm-vchkpw
+	fi
+}
+
+src_test() {
+	# bug 624384
+	# the test suite tests stuff that isn't potentially enabled
+	emake -j1 sqlite
+	sh tests.sh || die "Testing Failed"
+}
+
+src_install() {
+	# Upstreams installer is incredibly broken
+	dolib.a .libs/*.a
+	dolib.so .libs/*.so*
+
+	local i
+	for i in a so; do
+		dosym libcvm-v2client.${i} /usr/$(get_libdir)/libcvm-client.${i}
+	done
+
+	for i in {bench,test}client chain checkpassword pwfile qmail unix \
+			vmailmgr{,-local,-udp} v1{benchclient,checkpassword,testclient} \
+		; do
+			dobin .libs/cvm-${i}
+	done
+	use mysql && dobin .libs/cvm-mysql{,-local,-udp}
+	use postgres && dobin .libs/cvm-pgsql{,-local,-udp}
+	use vpopmail && dobin .libs/cvm-vchkpw
+
+	insinto /usr/include/cvm
+	doins {credentials,errors,facts,module,protocol,sasl,v1client,v2client}.h
+	dosym v1client.h /usr/include/cvm/client.h
+	dosym cvm/sasl.h /usr/include/cvm-sasl.h
+
+	dodoc ANNOUNCEMENT NEWS{,.sql,.vmailmgr}
+	dodoc README{,.vchkpw,.vmailmgr}
+	dodoc TODO VERSION ChangeLog*
+	docinto html
+	dodoc *.html
+}
diff --git a/net-libs/cvm/metadata.xml b/net-libs/cvm/metadata.xml
index db5dda48e725..e24b11abcabd 100644
--- a/net-libs/cvm/metadata.xml
+++ b/net-libs/cvm/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="vpopmail">Enable vpopmail support</flag>
-  </use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="vpopmail">Enable vpopmail support</flag>
+	</use>
 </pkgmetadata>