1 |
commit: 48a35f2796f49c0515c98be58fe1ecfde43f18ac |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 7 15:36:35 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 7 17:00:08 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48a35f27 |
7 |
|
8 |
app-crypt/heimdal: Adjusted dependencies |
9 |
|
10 |
Slight ebuild improvements. |
11 |
|
12 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
14 |
|
15 |
app-crypt/heimdal/heimdal-7.5.0.ebuild | 67 +++++++++++++++++----------------- |
16 |
1 file changed, 33 insertions(+), 34 deletions(-) |
17 |
|
18 |
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild |
19 |
index e8a121962b7..17a6aa13e74 100644 |
20 |
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild |
21 |
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild |
22 |
@@ -1,11 +1,11 @@ |
23 |
-# Copyright 1999-2018 Gentoo Foundation |
24 |
+# Copyright 1999-2019 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=6 |
28 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
29 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) |
30 |
VIRTUALX_REQUIRED="manual" |
31 |
|
32 |
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic |
33 |
+inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic |
34 |
|
35 |
MY_P="${P}" |
36 |
DESCRIPTION="Kerberos 5 implementation from KTH" |
37 |
@@ -19,11 +19,11 @@ IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-lib |
38 |
|
39 |
CDEPEND=" |
40 |
ssl? ( |
41 |
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) |
42 |
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) |
43 |
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) |
44 |
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) |
45 |
) |
46 |
berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] ) |
47 |
- !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] ) |
48 |
+ !berkdb? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] ) |
49 |
caps? ( sys-libs/libcap-ng ) |
50 |
>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] |
51 |
>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}] |
52 |
@@ -66,8 +66,8 @@ MULTILIB_CHOST_TOOLS=( |
53 |
src_prepare() { |
54 |
eapply "${FILESDIR}/heimdal_disable-check-iprop.patch" |
55 |
eapply "${FILESDIR}/heimdal_tinfo.patch" |
56 |
- eautoreconf |
57 |
eapply_user |
58 |
+ eautoreconf |
59 |
} |
60 |
|
61 |
src_configure() { |
62 |
@@ -78,39 +78,38 @@ src_configure() { |
63 |
} |
64 |
|
65 |
multilib_src_configure() { |
66 |
- local myconf=() |
67 |
+ local myeconfargs=( |
68 |
+ --enable-kcm |
69 |
+ --disable-osfc2 |
70 |
+ --enable-shared |
71 |
+ --with-libintl="${EPREFIX}"/usr |
72 |
+ --with-readline="${EPREFIX}"/usr |
73 |
+ --with-sqlite3="${EPREFIX}"/usr |
74 |
+ --libexecdir="${EPREFIX}"/usr/sbin |
75 |
+ --enable-pthread-support |
76 |
+ $(use_enable afs afs-support) |
77 |
+ $(use_enable otp) |
78 |
+ $(use_enable pkinit kx509) |
79 |
+ $(use_enable pkinit pk-init) |
80 |
+ $(use_enable static-libs static) |
81 |
+ $(multilib_native_use_with caps capng) |
82 |
+ $(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr) |
83 |
+ $(use_with ipv6) |
84 |
+ $(use_with ssl openssl "${EPREFIX}"/usr) |
85 |
+ $(multilib_native_use_with X x) |
86 |
+ ) |
87 |
if use berkdb; then |
88 |
- myconf+=( |
89 |
+ myeconfargs+=( |
90 |
--with-berkeley-db |
91 |
--with-berkeley-db-include="$(db_includedir)" |
92 |
) |
93 |
else |
94 |
- myconf+=( |
95 |
+ myeconfargs+=( |
96 |
--without-berkeley-db |
97 |
) |
98 |
fi |
99 |
|
100 |
- ECONF_SOURCE=${S} \ |
101 |
- econf \ |
102 |
- --enable-kcm \ |
103 |
- --disable-osfc2 \ |
104 |
- --enable-shared \ |
105 |
- --with-libintl=/usr \ |
106 |
- --with-readline=/usr \ |
107 |
- --with-sqlite3=/usr \ |
108 |
- --libexecdir=/usr/sbin \ |
109 |
- --enable-pthread-support \ |
110 |
- $(use_enable afs afs-support) \ |
111 |
- $(use_enable otp) \ |
112 |
- $(use_enable pkinit kx509) \ |
113 |
- $(use_enable pkinit pk-init) \ |
114 |
- $(use_enable static-libs static) \ |
115 |
- $(multilib_native_use_with caps capng) \ |
116 |
- $(multilib_native_use_with hdb-ldap openldap /usr) \ |
117 |
- $(use_with ipv6) \ |
118 |
- $(use_with ssl openssl /usr) \ |
119 |
- $(multilib_native_use_with X x) \ |
120 |
- "${myconf[@]}" |
121 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
122 |
} |
123 |
|
124 |
multilib_src_compile() { |
125 |
@@ -145,8 +144,8 @@ multilib_src_install_all() { |
126 |
dodoc ChangeLog* README NEWS TODO |
127 |
|
128 |
# client rename |
129 |
- mv "${D}"/usr/share/man/man1/{,k}su.1 |
130 |
- mv "${D}"/usr/bin/{,k}su |
131 |
+ mv "${ED%/}"/usr/share/man/man1/{,k}su.1 |
132 |
+ mv "${ED%/}"/usr/bin/{,k}su |
133 |
|
134 |
newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc |
135 |
newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind |
136 |
@@ -166,7 +165,7 @@ multilib_src_install_all() { |
137 |
doins "${S}/lib/hdb/hdb.schema" |
138 |
fi |
139 |
|
140 |
- prune_libtool_files |
141 |
+ find "${ED}" -name "*.la" -delete || die |
142 |
|
143 |
# default database dir |
144 |
keepdir /var/heimdal |