| 1 |
commit: 27de68f739ed2bae841d1e1d8b86d87e865d0ad1 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 9 07:59:20 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 9 07:59:20 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27de68f7 |
| 7 |
|
| 8 |
net-libs/axtls: drop multilib, static-libs |
| 9 |
|
| 10 |
No multilib or static-libs reverse dependencies. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 14 |
|
| 15 |
...s-2.1.5-r101.ebuild => axtls-2.1.5-r102.ebuild} | 30 +++++++++------------- |
| 16 |
1 file changed, 12 insertions(+), 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-libs/axtls/axtls-2.1.5-r101.ebuild b/net-libs/axtls/axtls-2.1.5-r102.ebuild |
| 19 |
similarity index 87% |
| 20 |
rename from net-libs/axtls/axtls-2.1.5-r101.ebuild |
| 21 |
rename to net-libs/axtls/axtls-2.1.5-r102.ebuild |
| 22 |
index 5f09e2c9f169..046f79d41d75 100644 |
| 23 |
--- a/net-libs/axtls/axtls-2.1.5-r101.ebuild |
| 24 |
+++ b/net-libs/axtls/axtls-2.1.5-r102.ebuild |
| 25 |
@@ -1,11 +1,11 @@ |
| 26 |
-# Copyright 1999-2021 Gentoo Authors |
| 27 |
+# Copyright 1999-2022 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
EAPI=7 |
| 31 |
|
| 32 |
LUA_COMPAT=( lua5-{1..4} luajit ) |
| 33 |
|
| 34 |
-inherit lua-single multilib-minimal savedconfig toolchain-funcs |
| 35 |
+inherit lua-single savedconfig toolchain-funcs |
| 36 |
|
| 37 |
################################################################################ |
| 38 |
# axtls CONFIG MINI-HOWTO |
| 39 |
@@ -44,7 +44,7 @@ LICENSE="BSD GPL-2" |
| 40 |
SLOT="0/1" |
| 41 |
KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86" |
| 42 |
|
| 43 |
-IUSE="httpd cgi-lua cgi-php static static-libs doc" |
| 44 |
+IUSE="httpd cgi-lua cgi-php static doc" |
| 45 |
|
| 46 |
# TODO: add ipv6, and c#, java, lua, perl bindings |
| 47 |
# Currently these all have some issue |
| 48 |
@@ -72,14 +72,12 @@ src_prepare() { |
| 49 |
|
| 50 |
eapply "${FILESDIR}/explicit-libdir-r1.patch" |
| 51 |
|
| 52 |
- #We want CONFIG_DEBUG to avoid stripping |
| 53 |
- #but not for debugging info |
| 54 |
+ # We want CONFIG_DEBUG to avoid stripping |
| 55 |
+ # but not for debugging info |
| 56 |
sed -i -e 's: -g::' config/Rules.mak || die |
| 57 |
sed -i -e 's: -g::' config/makefile.conf || die |
| 58 |
|
| 59 |
eapply_user |
| 60 |
- |
| 61 |
- multilib_copy_sources |
| 62 |
} |
| 63 |
|
| 64 |
use_flag_config() { |
| 65 |
@@ -122,12 +120,12 @@ use_flag_config() { |
| 66 |
emake -j1 oldconfig < <(yes n) > /dev/null |
| 67 |
} |
| 68 |
|
| 69 |
-multilib_src_configure() { |
| 70 |
- #Per-ABI substitutions. |
| 71 |
+src_configure() { |
| 72 |
+ # Per-ABI substitutions. |
| 73 |
sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \ |
| 74 |
Makefile || die |
| 75 |
|
| 76 |
- #Use CC as the host compiler for mconf |
| 77 |
+ # Use CC as the host compiler for mconf |
| 78 |
sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \ |
| 79 |
config/Rules.mak || die |
| 80 |
|
| 81 |
@@ -145,25 +143,21 @@ multilib_src_configure() { |
| 82 |
fi |
| 83 |
} |
| 84 |
|
| 85 |
-multilib_src_install() { |
| 86 |
- if multilib_is_native_abi && use savedconfig; then |
| 87 |
+src_install() { |
| 88 |
+ if use savedconfig; then |
| 89 |
save_config config/.config |
| 90 |
fi |
| 91 |
|
| 92 |
emake PREFIX="${ED}/usr" install |
| 93 |
|
| 94 |
- if ! use static-libs; then |
| 95 |
- rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die |
| 96 |
- fi |
| 97 |
+ rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die |
| 98 |
|
| 99 |
# The build system needs to install before it builds docs |
| 100 |
- if multilib_is_native_abi && use doc; then |
| 101 |
+ if use doc; then |
| 102 |
emake docs |
| 103 |
dodoc -r docsrc/html |
| 104 |
fi |
| 105 |
-} |
| 106 |
|
| 107 |
-multilib_src_install_all() { |
| 108 |
if [[ -f "${ED}"/usr/bin/htpasswd ]]; then |
| 109 |
mv "${ED}"/usr/bin/{,ax}htpasswd || die |
| 110 |
fi |
Archives