diff options
Diffstat (limited to 'net-libs/cvm')
| -rw-r--r-- | net-libs/cvm/Manifest | 2 | ||||
| -rw-r--r-- | net-libs/cvm/cvm-0.96-r1.ebuild (renamed from net-libs/cvm/cvm-0.96.ebuild) | 39 |
2 files changed, 23 insertions, 18 deletions
diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest index 1a3c5831d2c0..27838d05b714 100644 --- a/net-libs/cvm/Manifest +++ b/net-libs/cvm/Manifest @@ -1,5 +1,5 @@ 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.ebuild 2986 BLAKE2B 49803d2d8b654ed62b5f06c792c0c2a0804641a5cfd4638743ebb52ee6cd610111951a1dcfe5840319ea39bb74d7d7cd451060a40dd2c5885d345593b3123baa SHA512 f01eb0a15617e1394c0f9de3094f9f625206a10c52d123116090252fa4ee2075147246c93e04455a784c9eb71147a0c8655eda4a5b784cc3bcd647dcfbeb496d +EBUILD cvm-0.96-r1.ebuild 2952 BLAKE2B 12224e99a5bf7ae32b85fd2ac30bb961e882130e909f10f0854ae4b973fc3a9357a008b200ff68aad5cc5c3b00e2896325fc2438c1038941a4ad3de32986db78 SHA512 9fa0300955f8bacc4f68ca8fe4b9a047fea132d7f5842c4b3892bed5706e21f968617e25be24b0a1ac9acf38c37d35115427797006a6f912d4338609a6f63ccf MISC metadata.xml 296 BLAKE2B bdd092a7e715a03179775af2fcaf170ac7ad4d640812b29d347484bbb986e09b429365201112a409b97b8d40615e561958da79e1acfdbb783ec3e6db30d41109 SHA512 75d265987a3c3e83685a00d760965bc8e4e796429017c05642de2fcda4e37891dd06386df57dfe2d0e2b294916316389a1d72dc09e9feebdf5db3abe2626e34b diff --git a/net-libs/cvm/cvm-0.96.ebuild b/net-libs/cvm/cvm-0.96-r1.ebuild index 1317cf1ef901..c31bc931cc8e 100644 --- a/net-libs/cvm/cvm-0.96.ebuild +++ b/net-libs/cvm/cvm-0.96-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=7 -inherit toolchain-funcs eutils +inherit toolchain-funcs DESCRIPTION="Credential Validation Modules by Bruce Guenter" HOMEPAGE="http://untroubled.org/cvm/" @@ -17,16 +17,16 @@ IUSE="mysql postgres test vpopmail" RDEPEND="dev-db/cdb" DEPEND="${RDEPEND} >=dev-libs/bglibs-1.041 - mysql? ( virtual/mysql ) + mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) vpopmail? ( net-mail/vpopmail ) - test? ( app-editors/vim )" -# some of the testcases use ex/vi/xxd + test? ( app-editors/vim dev-db/cdb )" +# some of the testcases use ex/vi/xxd and cdbmake MAKEOPTS="${MAKEOPTS} -j1" #310843 -src_unpack() { - unpack ${A} +src_prepare() { + default # disable this test, as it breaks under Portage # and there is no easy fix sed -i.orig \ @@ -47,35 +47,39 @@ src_unpack() { || die "Failed to fix vpopmail compiling parts of Makefile" } -src_compile() { +src_configure() { echo "/usr/include/bglibs" > conf-bgincs - echo "/usr/lib/bglibs" > conf-bglibs + echo "/usr/$(get_libdir)/bglibs" > conf-bglibs echo "/usr/include" > conf-include - echo "/usr/lib" > conf-lib + echo "/usr/$(get_libdir)" > conf-lib echo "/usr/bin" > conf-bin echo "$(tc-getCC) ${CFLAGS}" > conf-cc echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld - emake || die +} + +src_compile() { + emake if use mysql; then einfo "Building MySQL support" - emake mysql || die "making mysql support failed" + emake mysql fi if use postgres; then einfo "Building Postgresql support" - emake pgsql || die "making postgres support failed" + emake pgsql fi if use vpopmail; then einfo "Building vpopmail support" - emake cvm-vchkpw || die "making vpopmail support failed" + emake cvm-vchkpw fi } src_install() { # Upstreams installer is incredibly broken - dolib .libs/*.a .libs/*.so.* + dolib.a .libs/*.a + dolib.so .libs/*.so.* for i in a so ; do dosym libcvm-v2client.${i} /usr/$(get_libdir)/libcvm-client.${i} done @@ -97,7 +101,8 @@ src_install() { dodoc ANNOUNCEMENT NEWS{,.sql,.vmailmgr} dodoc README{,.vchkpw,.vmailmgr} dodoc TODO VERSION ChangeLog* - dohtml *.html + docinto html + dodoc *.html } src_test() { |