summaryrefslogtreecommitdiff
path: root/net-libs/axtls
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/axtls')
-rw-r--r--net-libs/axtls/Manifest8
-rw-r--r--net-libs/axtls/axtls-1.5.3.ebuild176
-rw-r--r--net-libs/axtls/axtls-2.1.3.ebuild178
-rw-r--r--net-libs/axtls/axtls-2.1.4.ebuild178
-rw-r--r--net-libs/axtls/axtls-2.1.5.ebuild4
5 files changed, 3 insertions, 541 deletions
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 6963c9539c0e..882e560715ad 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -2,12 +2,6 @@ AUX axhttpd.confd 181 BLAKE2B 9b4bc5cd02058c206f62186d3b6c1678d540312780fae595a9
AUX axhttpd.initd 515 BLAKE2B cd09293cd4741269493860cf9e18feb23f1ee496eb2314567465ea7412b4f82e5d837c7dd08f96d9bce354cfdc31ff615e798598bed823734add8cfaeccb5805 SHA512 8d538a03b9102b28aeb539714b5b886b9d7e5ad0496641e40a9c72c85bb4dc96f51f56482c346a0b2386e4fe5b1e34500f78bfc605fa4f8a968d487bbe534015
AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43ebcd31ad388423a8c12257a41481a63466d3d4ca85ecd05c75dfa1c9552d17ade2834aaa SHA512 6589e3912ba9231db660b8afe71a6e233807108a8662860667dcae3b6cc4d77fa405503d6eb9d520669cd26fb67f418095b6174b88527c290818fc6400cb65b0
AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a
-DIST axTLS-1.5.3.tar.gz 1309853 BLAKE2B 8a7db4df4775dc73e35c3a9b2a7bbee783d96f36c122393b72b47a4ed4e66f41e4736dcb7ed8eee4d756760957feafc113a5a4c6df58847b94721b1fb8560196 SHA512 d37fb1341259b079ed234512a96656d67e005c50d9f8e0c856fb140c9da35267624e065134e0cc8310f70e5cf5d196c7dd34f01e2a7a5cc29e77e7ca46c25281
-DIST axTLS-2.1.3.tar.gz 1316776 BLAKE2B f60502d34a9d23ac772e1bbe05dc9350ab2385fb3c42480117120923647f122ef7a955289b656b8a70b3ac9817b1bcf947f541739b8d01ebe1eb4340f8d9cf38 SHA512 aa116b671bf0fa059cb77f9e5c0307c48ab476b7ce7017f1d4b2e6362d9d527e534908cb30ec3667eec8c49566f950de3ae4ec0adf5b603fb4efb571eaffc596
-DIST axTLS-2.1.4.tar.gz 1316768 BLAKE2B 3ff302c59313ee80d18a0d5390c591e6259625e62707cc0c7c677add1f7fddffa5b4dc46860ee18dd96fcc227b3cac1179ab290f8af50ac91fe2841fff977cd4 SHA512 ce301719a12f5b836e3c67a169119d2836382b7b97d39f4010b8b8a644a6751b9f948a6c91f8dc6c39d19f5723311af7aca8958f9052e72cb38a9907247af3e6
DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18
-EBUILD axtls-1.5.3.ebuild 4648 BLAKE2B 015fd92687701d440e34b919c3aa2fcc6c44f1ce8bdb74527a9e489a40ae307ee293f11013f05ef9a2dc99a90ebac6667c0a7e5a63a893c1d4f66f9e86420e3e SHA512 e37dd43f7f73cf284e01d89413de6989c43168abc961c6854d9994bc2e704f07c79cd2b2f151788fb48c671738e18cbc3c5931f36b59d85792909c19310691f5
-EBUILD axtls-2.1.3.ebuild 4670 BLAKE2B 04885486d07d580daed57d66feb02495ca08e9493f047fc5c162b60521cb94020642488406425fe83869a6d8bff6e68222835f44a447ebb0e367387fed4637da SHA512 691d01cfb57df53516cdc699eb3a87844064335e2c212fec1f36ebfc52779378a6a3501706a84980280216025ffa56ad362d6f393259df10fc8bfb30c18c1f44
-EBUILD axtls-2.1.4.ebuild 4677 BLAKE2B 25e88d8ee91fcebd1388ebb6e0ee36be17f973b962da0d5e0b448ccaff9bc34833561fbee78b3400ff57981f7425a46c88cb42019a038b07e065d060776194d4 SHA512 a5f5b59c5a6984c187cf3b8938bf1ad4a657dd776922c46f04c78c990dd74e3d23ee03777e74620ae06b0c29aa67c472dccf3d9fa93544723ed684dfa4332aa7
-EBUILD axtls-2.1.5.ebuild 4674 BLAKE2B 7557b02e15493c9ebe89d3cea24e6f5c75b56e45b3a10e3e723a3e835d20c04e225df68ff03f795439b78ca5e8abbd63d6963fd6e2707bf933887d0eef35d083 SHA512 0307a9e39243546b616f2709635ea11834805108edf0f8912d295bdc19d0700a3db08b6f2c4cdd86f6f4eefb6896664156667adfad3b09708bb24b4543bd7143
+EBUILD axtls-2.1.5.ebuild 4669 BLAKE2B 6f3c57e1af7475993d2231bbad8bae78db869fe4ab407dbb1bb341777e3a1cd5329ed8eef31836180d3d71851790de40a1061a8bad73ea8928eb7c5e2d10f799 SHA512 3ee92c1b81cb20f9a51569931102ce04ff24e7cc2400c53b90939b080c3b92c621f24d426967b171c86e5a83cc74acc32913a3a2e079195e790fe6f945684f51
MISC metadata.xml 632 BLAKE2B b83cd23e97a4fdd09ea7354c1245dd65e54c50b418538c2ef71ae9054626861b6516268fcd37485ba19d1981024c47d869cdce00b276473200a7352c29072b1a SHA512 bfd387d998bcf2a457ff01752b553307b0de430cb9372115b366ab80a10866ede54b8ee149c726aba6f12c8cc3c5ea089dc5b25083e95594d8912e181a8626b0
diff --git a/net-libs/axtls/axtls-1.5.3.ebuild b/net-libs/axtls/axtls-1.5.3.ebuild
deleted file mode 100644
index 1f02d467d121..000000000000
--- a/net-libs/axtls/axtls-1.5.3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib multilib-minimal savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-# FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-# cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-# make menuconfig
-#
-# Now configure axtls as you want. Finally save your config file:
-#
-# cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version. You can then run emerge again with
-# your configuration by doing
-#
-# USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-code"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
- httpd? (
- cgi-lua? ( dev-lang/lua )
- cgi-php? ( dev-lang/php[cgi] )
- )"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
- static? ( httpd )
- cgi-lua? ( httpd )
- cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
- use httpd && {
- ebegin "Creating axtls user and group"
- enewgroup ${AXTLS_GROUP}
- enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
- }
-}
-
-src_prepare() {
- tc-export AR CC
-
- epatch "${FILESDIR}/explicit-libdir-r1.patch"
-
- #We want CONFIG_DEBUG to avoid stripping
- #but not for debugging info
- sed -i -e 's: -g::' config/Rules.mak || die
- sed -i -e 's: -g::' config/makefile.conf || die
-
- multilib_copy_sources
-}
-
-use_flag_config() {
- cp "${FILESDIR}"/config config/.config || die
-
- #Respect CFLAGS/LDFLAGS
- sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
- config/.config || die
- sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
- config/.config || die
-
- #The logic is that the default config file enables everything and we disable
- #here with sed unless a USE flags says to keep it
- if use httpd; then
- if ! use static; then
- sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
- config/.config || die
- fi
- if ! use cgi-php && ! use cgi-lua; then
- sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
- config/.config || die
- fi
- if ! use cgi-php; then
- sed -i -e 's:,.php::' config/.config || die
- fi
- if ! use cgi-lua; then
- sed -i -e 's:\.lua,::' \
- -e 's:lua:php:' \
- -e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
- config/.config || die
- fi
- else
- sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
- config/.config || die
- fi
-
- emake -j1 oldconfig < <(yes n) > /dev/null
-}
-
-multilib_src_configure() {
- #Per-ABI substitutions.
- sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
- Makefile || die
-
- #Use CC as the host compiler for mconf
- sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
- config/Rules.mak || die
-
- if use savedconfig; then
- restore_config config/.config
- if [[ -f config/.config ]]; then
- ewarn "Using saved config, all other USE flags ignored"
- else
- ewarn "No saved config, seeding with the default"
- cp "${FILESDIR}"/config config/.config || die
- fi
- emake -j1 oldconfig < <(yes '') > /dev/null
- else
- use_flag_config
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi && use savedconfig; then
- save_config config/.config
- fi
-
- emake PREFIX="${ED}/usr" install
-
- if ! use static-libs; then
- rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
- fi
-
- # The build system needs to install before it builds docs
- if multilib_is_native_abi && use doc; then
- emake docs
- dodoc -r docsrc/html
- fi
-}
-
-multilib_src_install_all() {
- if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
- mv "${ED}"/usr/bin/{,ax}htpasswd || die
- fi
-
- if use httpd; then
- newinitd "${FILESDIR}"/axhttpd.initd axhttpd
- newconfd "${FILESDIR}"/axhttpd.confd axhttpd
- fi
-
- docompress -x /usr/share/doc/${PF}/README
- dodoc README
-}
diff --git a/net-libs/axtls/axtls-2.1.3.ebuild b/net-libs/axtls/axtls-2.1.3.ebuild
deleted file mode 100644
index b856997fc616..000000000000
--- a/net-libs/axtls/axtls-2.1.3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib multilib-minimal savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-# FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-# cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-# make menuconfig
-#
-# Now configure axtls as you want. Finally save your config file:
-#
-# cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version. You can then run emerge again with
-# your configuration by doing
-#
-# USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-code"
-
-LICENSE="BSD GPL-2"
-SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 ~sparc x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
- httpd? (
- cgi-lua? ( dev-lang/lua )
- cgi-php? ( dev-lang/php[cgi] )
- )"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
- static? ( httpd )
- cgi-lua? ( httpd )
- cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
- use httpd && {
- ebegin "Creating axtls user and group"
- enewgroup ${AXTLS_GROUP}
- enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
- }
-}
-
-src_prepare() {
- tc-export AR CC
-
- eapply "${FILESDIR}/explicit-libdir-r1.patch"
-
- #We want CONFIG_DEBUG to avoid stripping
- #but not for debugging info
- sed -i -e 's: -g::' config/Rules.mak || die
- sed -i -e 's: -g::' config/makefile.conf || die
-
- eapply_user
-
- multilib_copy_sources
-}
-
-use_flag_config() {
- cp "${FILESDIR}"/config config/.config || die
-
- #Respect CFLAGS/LDFLAGS
- sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
- config/.config || die
- sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
- config/.config || die
-
- #The logic is that the default config file enables everything and we disable
- #here with sed unless a USE flags says to keep it
- if use httpd; then
- if ! use static; then
- sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
- config/.config || die
- fi
- if ! use cgi-php && ! use cgi-lua; then
- sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
- config/.config || die
- fi
- if ! use cgi-php; then
- sed -i -e 's:,.php::' config/.config || die
- fi
- if ! use cgi-lua; then
- sed -i -e 's:\.lua,::' \
- -e 's:lua:php:' \
- -e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
- config/.config || die
- fi
- else
- sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
- config/.config || die
- fi
-
- emake -j1 oldconfig < <(yes n) > /dev/null
-}
-
-multilib_src_configure() {
- #Per-ABI substitutions.
- sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
- Makefile || die
-
- #Use CC as the host compiler for mconf
- sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
- config/Rules.mak || die
-
- if use savedconfig; then
- restore_config config/.config
- if [[ -f config/.config ]]; then
- ewarn "Using saved config, all other USE flags ignored"
- else
- ewarn "No saved config, seeding with the default"
- cp "${FILESDIR}"/config config/.config || die
- fi
- emake -j1 oldconfig < <(yes '') > /dev/null
- else
- use_flag_config
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi && use savedconfig; then
- save_config config/.config
- fi
-
- emake PREFIX="${ED}/usr" install
-
- if ! use static-libs; then
- rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
- fi
-
- # The build system needs to install before it builds docs
- if multilib_is_native_abi && use doc; then
- emake docs
- dodoc -r docsrc/html
- fi
-}
-
-multilib_src_install_all() {
- if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
- mv "${ED}"/usr/bin/{,ax}htpasswd || die
- fi
-
- if use httpd; then
- newinitd "${FILESDIR}"/axhttpd.initd axhttpd
- newconfd "${FILESDIR}"/axhttpd.confd axhttpd
- fi
-
- docompress -x /usr/share/doc/${PF}/README
- dodoc README
-}
diff --git a/net-libs/axtls/axtls-2.1.4.ebuild b/net-libs/axtls/axtls-2.1.4.ebuild
deleted file mode 100644
index dcd2852e8235..000000000000
--- a/net-libs/axtls/axtls-2.1.4.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib multilib-minimal savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-# FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-# cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-# make menuconfig
-#
-# Now configure axtls as you want. Finally save your config file:
-#
-# cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version. You can then run emerge again with
-# your configuration by doing
-#
-# USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-code"
-
-LICENSE="BSD GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
- httpd? (
- cgi-lua? ( dev-lang/lua )
- cgi-php? ( dev-lang/php[cgi] )
- )"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
- static? ( httpd )
- cgi-lua? ( httpd )
- cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
- use httpd && {
- ebegin "Creating axtls user and group"
- enewgroup ${AXTLS_GROUP}
- enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
- }
-}
-
-src_prepare() {
- tc-export AR CC
-
- eapply "${FILESDIR}/explicit-libdir-r1.patch"
-
- #We want CONFIG_DEBUG to avoid stripping
- #but not for debugging info
- sed -i -e 's: -g::' config/Rules.mak || die
- sed -i -e 's: -g::' config/makefile.conf || die
-
- eapply_user
-
- multilib_copy_sources
-}
-
-use_flag_config() {
- cp "${FILESDIR}"/config config/.config || die
-
- #Respect CFLAGS/LDFLAGS
- sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
- config/.config || die
- sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
- config/.config || die
-
- #The logic is that the default config file enables everything and we disable
- #here with sed unless a USE flags says to keep it
- if use httpd; then
- if ! use static; then
- sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
- config/.config || die
- fi
- if ! use cgi-php && ! use cgi-lua; then
- sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
- config/.config || die
- fi
- if ! use cgi-php; then
- sed -i -e 's:,.php::' config/.config || die
- fi
- if ! use cgi-lua; then
- sed -i -e 's:\.lua,::' \
- -e 's:lua:php:' \
- -e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
- config/.config || die
- fi
- else
- sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
- config/.config || die
- fi
-
- emake -j1 oldconfig < <(yes n) > /dev/null
-}
-
-multilib_src_configure() {
- #Per-ABI substitutions.
- sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
- Makefile || die
-
- #Use CC as the host compiler for mconf
- sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
- config/Rules.mak || die
-
- if use savedconfig; then
- restore_config config/.config
- if [[ -f config/.config ]]; then
- ewarn "Using saved config, all other USE flags ignored"
- else
- ewarn "No saved config, seeding with the default"
- cp "${FILESDIR}"/config config/.config || die
- fi
- emake -j1 oldconfig < <(yes '') > /dev/null
- else
- use_flag_config
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi && use savedconfig; then
- save_config config/.config
- fi
-
- emake PREFIX="${ED}/usr" install
-
- if ! use static-libs; then
- rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
- fi
-
- # The build system needs to install before it builds docs
- if multilib_is_native_abi && use doc; then
- emake docs
- dodoc -r docsrc/html
- fi
-}
-
-multilib_src_install_all() {
- if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
- mv "${ED}"/usr/bin/{,ax}htpasswd || die
- fi
-
- if use httpd; then
- newinitd "${FILESDIR}"/axhttpd.initd axhttpd
- newconfd "${FILESDIR}"/axhttpd.confd axhttpd
- fi
-
- docompress -x /usr/share/doc/${PF}/README
- dodoc README
-}
diff --git a/net-libs/axtls/axtls-2.1.5.ebuild b/net-libs/axtls/axtls-2.1.5.ebuild
index 674385dd40d6..a90dcc9ac7df 100644
--- a/net-libs/axtls/axtls-2.1.5.ebuild
+++ b/net-libs/axtls/axtls-2.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -40,7 +40,7 @@ S="${WORKDIR}/${PN}-code"
LICENSE="BSD GPL-2"
SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="httpd cgi-lua cgi-php static static-libs doc"