gentoo resync : 28.04.2019

3 files changed, 68 insertions, 29 deletions

diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index 27838d05b714..4e94a4a71c62 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -1,5 +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
 EBUILD cvm-0.76.ebuild 1451 BLAKE2B a869b351583def10291ee6f19ac8602fab654dcac0dfa9e09cc7003afe795a97a7d64243a1d331eb78a27781c6e57532f39298704b57a0a719bf8714760f2761 SHA512 e0cdea110fa6acff28b95bb9eede58dd63dc4dfd9c6c22aa9ae2c2ede0b8d926d5f4adf458be62054358aad5f9329ea9b64441ca0dada3b60d825ae4fd956eb2
-EBUILD cvm-0.96-r1.ebuild 2952 BLAKE2B 12224e99a5bf7ae32b85fd2ac30bb961e882130e909f10f0854ae4b973fc3a9357a008b200ff68aad5cc5c3b00e2896325fc2438c1038941a4ad3de32986db78 SHA512 9fa0300955f8bacc4f68ca8fe4b9a047fea132d7f5842c4b3892bed5706e21f968617e25be24b0a1ac9acf38c37d35115427797006a6f912d4338609a6f63ccf
+EBUILD cvm-0.96-r1.ebuild 3208 BLAKE2B 0ad53487cbaa52ca349b1e12abfced27584808a5d0c8e02ee56fc90bd091b79e413d435dd4a719237a5a2e945a6f1edae663fa14f007aee7badd65b3ed90cbb1 SHA512 b761512901a1a10b4d9c1f1952a3e63ef09a1257dacba6afec9588389c4967fc49b056a314a05c1b1fb7c644e0bd4f32b8cfd4767c62f09f4f46b5ccd7571705
 MISC metadata.xml 296 BLAKE2B bdd092a7e715a03179775af2fcaf170ac7ad4d640812b29d347484bbb986e09b429365201112a409b97b8d40615e561958da79e1acfdbb783ec3e6db30d41109 SHA512 75d265987a3c3e83685a00d760965bc8e4e796429017c05642de2fcda4e37891dd06386df57dfe2d0e2b294916316389a1d72dc09e9feebdf5db3abe2626e34b
diff --git a/net-libs/cvm/cvm-0.96-r1.ebuild b/net-libs/cvm/cvm-0.96-r1.ebuild
index c31bc931cc8e..4f150585b773 100644
--- a/net-libs/cvm/cvm-0.96-r1.ebuild
+++ b/net-libs/cvm/cvm-0.96-r1.ebuild
@@ -7,23 +7,31 @@ inherit toolchain-funcs
 
 DESCRIPTION="Credential Validation Modules by Bruce Guenter"
 HOMEPAGE="http://untroubled.org/cvm/"
-SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
+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 )"
 
-RDEPEND="dev-db/cdb"
+RDEPEND="
+	dev-db/cdb:=
+	>=dev-libs/bglibs-1.041:="
 DEPEND="${RDEPEND}
-		>=dev-libs/bglibs-1.041
-		mysql? ( dev-db/mysql-connector-c:0= )
-		postgres? ( dev-db/postgresql[server] )
-		vpopmail? ( net-mail/vpopmail )
-		test? ( app-editors/vim dev-db/cdb )"
-# some of the testcases use ex/vi/xxd and cdbmake
-
-MAKEOPTS="${MAKEOPTS} -j1" #310843
+	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
@@ -48,45 +56,54 @@ src_prepare() {
 }
 
 src_configure() {
-	echo "/usr/include/bglibs" > conf-bgincs
-	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs
-	echo "/usr/include" > conf-include
-	echo "/usr/$(get_libdir)" > conf-lib
-	echo "/usr/bin" > conf-bin
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld
+	echo "/usr/include/bglibs" > conf-bgincs || die
+	echo "/usr/$(get_libdir)/bglibs" > conf-bglibs || die
+	echo "/usr/include" > conf-include || die
+	echo "/usr/$(get_libdir)" > conf-lib || die
+	echo "/usr/bin" > conf-bin || die
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld || die
 }
 
 src_compile() {
-	emake
+	emake -j1
 
 	if use mysql; then
 		einfo "Building MySQL support"
-		emake mysql
+		emake -j1 mysql
 	fi
 
 	if use postgres; then
 		einfo "Building Postgresql support"
-		emake pgsql
+		emake -j1 pgsql
 	fi
 
 	if use vpopmail; then
 		einfo "Building vpopmail support"
-		emake cvm-vchkpw
+		emake -j1 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.*
-	for i in a so ; do
+
+	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
+		; do
 			dobin .libs/cvm-${i}
 	done
 	use mysql && dobin .libs/cvm-mysql{,-local,-udp}
@@ -104,7 +121,3 @@ src_install() {
 	docinto html
 	dodoc *.html
 }
-
-src_test() {
-	sh tests.sh || die "Testing Failed"
-}
diff --git a/net-libs/cvm/files/cvm-0.96-fix-test-padding.patch b/net-libs/cvm/files/cvm-0.96-fix-test-padding.patch
new file mode 100644
index 000000000000..0db28d59553c
--- /dev/null
+++ b/net-libs/cvm/files/cvm-0.96-fix-test-padding.patch
@@ -0,0 +1,25 @@
+The Debian packaging of cvm is maintained using dgit.  For the sake
+of an efficient workflow, Debian modifications to the upstream
+source are squashed into a single diff, rather than a series of
+quilt patches.  To obtain a patch queue for package version
+0.97-0.1:
+
+    # apt-get install dgit
+    % dgit clone cvm
+    % cd foo
+    % git log --oneline 0.97-0.1..debian/0.97 -- . ':!debian'
+--- a/tests.sh
++++ b/tests.sh
+@@ -674,9 +674,9 @@ system directory: @TMPDIR@/home
+ domain:           test.tld
+ mailbox path:     @TMPDIR@/home/virt
+ 
+-0000000: 020a 0108 0100 2430 2470 6173 7300 2e2f  ......\$0\$pass../
+-0000010: 7669 7274 0000 002d 002d 002d 002d 0031  virt...-.-.-.-.1
+-0000020: 3031 3637 3331 3335 3800 2d00            016731358.-.
++00000000: 020a 0108 0100 2430 2470 6173 7300 2e2f  ......\$0\$pass../
++00000010: 7669 7274 0000 002d 002d 002d 002d 0031  virt...-.-.-.-.1
++00000020: 3031 3637 3331 3335 3800 2d00            016731358.-.
+ END_OF_TEST_RESULTS
+ 
+