| 1 |
commit: 6b31835b0fbeef0d06c1eaad78bc4cbc99be91ff |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 15 13:56:21 2019 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 15 13:56:21 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b31835b |
| 7 |
|
| 8 |
net-libs/cvm: Fix dependencies and make it build |
| 9 |
|
| 10 |
Non-maintainer commit |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/665988 |
| 13 |
Closes: https://bugs.gentoo.org/677440 |
| 14 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
| 15 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 16 |
|
| 17 |
.../cvm/{cvm-0.96.ebuild => cvm-0.96-r1.ebuild} | 39 ++++++++++++---------- |
| 18 |
1 file changed, 22 insertions(+), 17 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-libs/cvm/cvm-0.96.ebuild b/net-libs/cvm/cvm-0.96-r1.ebuild |
| 21 |
similarity index 83% |
| 22 |
rename from net-libs/cvm/cvm-0.96.ebuild |
| 23 |
rename to net-libs/cvm/cvm-0.96-r1.ebuild |
| 24 |
index 1317cf1ef90..c31bc931cc8 100644 |
| 25 |
--- a/net-libs/cvm/cvm-0.96.ebuild |
| 26 |
+++ b/net-libs/cvm/cvm-0.96-r1.ebuild |
| 27 |
@@ -1,9 +1,9 @@ |
| 28 |
-# Copyright 1999-2014 Gentoo Foundation |
| 29 |
+# Copyright 1999-2019 Gentoo Authors |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
|
| 32 |
-EAPI=2 |
| 33 |
+EAPI=7 |
| 34 |
|
| 35 |
-inherit toolchain-funcs eutils |
| 36 |
+inherit toolchain-funcs |
| 37 |
|
| 38 |
DESCRIPTION="Credential Validation Modules by Bruce Guenter" |
| 39 |
HOMEPAGE="http://untroubled.org/cvm/" |
| 40 |
@@ -17,16 +17,16 @@ IUSE="mysql postgres test vpopmail" |
| 41 |
RDEPEND="dev-db/cdb" |
| 42 |
DEPEND="${RDEPEND} |
| 43 |
>=dev-libs/bglibs-1.041 |
| 44 |
- mysql? ( virtual/mysql ) |
| 45 |
+ mysql? ( dev-db/mysql-connector-c:0= ) |
| 46 |
postgres? ( dev-db/postgresql[server] ) |
| 47 |
vpopmail? ( net-mail/vpopmail ) |
| 48 |
- test? ( app-editors/vim )" |
| 49 |
-# some of the testcases use ex/vi/xxd |
| 50 |
+ test? ( app-editors/vim dev-db/cdb )" |
| 51 |
+# some of the testcases use ex/vi/xxd and cdbmake |
| 52 |
|
| 53 |
MAKEOPTS="${MAKEOPTS} -j1" #310843 |
| 54 |
|
| 55 |
-src_unpack() { |
| 56 |
- unpack ${A} |
| 57 |
+src_prepare() { |
| 58 |
+ default |
| 59 |
# disable this test, as it breaks under Portage |
| 60 |
# and there is no easy fix |
| 61 |
sed -i.orig \ |
| 62 |
@@ -47,35 +47,39 @@ src_unpack() { |
| 63 |
|| die "Failed to fix vpopmail compiling parts of Makefile" |
| 64 |
} |
| 65 |
|
| 66 |
-src_compile() { |
| 67 |
+src_configure() { |
| 68 |
echo "/usr/include/bglibs" > conf-bgincs |
| 69 |
- echo "/usr/lib/bglibs" > conf-bglibs |
| 70 |
+ echo "/usr/$(get_libdir)/bglibs" > conf-bglibs |
| 71 |
echo "/usr/include" > conf-include |
| 72 |
- echo "/usr/lib" > conf-lib |
| 73 |
+ echo "/usr/$(get_libdir)" > conf-lib |
| 74 |
echo "/usr/bin" > conf-bin |
| 75 |
echo "$(tc-getCC) ${CFLAGS}" > conf-cc |
| 76 |
echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld |
| 77 |
- emake || die |
| 78 |
+} |
| 79 |
+ |
| 80 |
+src_compile() { |
| 81 |
+ emake |
| 82 |
|
| 83 |
if use mysql; then |
| 84 |
einfo "Building MySQL support" |
| 85 |
- emake mysql || die "making mysql support failed" |
| 86 |
+ emake mysql |
| 87 |
fi |
| 88 |
|
| 89 |
if use postgres; then |
| 90 |
einfo "Building Postgresql support" |
| 91 |
- emake pgsql || die "making postgres support failed" |
| 92 |
+ emake pgsql |
| 93 |
fi |
| 94 |
|
| 95 |
if use vpopmail; then |
| 96 |
einfo "Building vpopmail support" |
| 97 |
- emake cvm-vchkpw || die "making vpopmail support failed" |
| 98 |
+ emake cvm-vchkpw |
| 99 |
fi |
| 100 |
} |
| 101 |
|
| 102 |
src_install() { |
| 103 |
# Upstreams installer is incredibly broken |
| 104 |
- dolib .libs/*.a .libs/*.so.* |
| 105 |
+ dolib.a .libs/*.a |
| 106 |
+ dolib.so .libs/*.so.* |
| 107 |
for i in a so ; do |
| 108 |
dosym libcvm-v2client.${i} /usr/$(get_libdir)/libcvm-client.${i} |
| 109 |
done |
| 110 |
@@ -97,7 +101,8 @@ src_install() { |
| 111 |
dodoc ANNOUNCEMENT NEWS{,.sql,.vmailmgr} |
| 112 |
dodoc README{,.vchkpw,.vmailmgr} |
| 113 |
dodoc TODO VERSION ChangeLog* |
| 114 |
- dohtml *.html |
| 115 |
+ docinto html |
| 116 |
+ dodoc *.html |
| 117 |
} |
| 118 |
|
| 119 |
src_test() { |
Archives