From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1434918-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 268EC158003
	for <garchives@archives.gentoo.org>; Fri,  9 Sep 2022 07:59:49 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2B46AE0938;
	Fri,  9 Sep 2022 07:59:45 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 07C23E0938
	for <gentoo-commits@lists.gentoo.org>; Fri,  9 Sep 2022 07:59:45 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 23B3C340F45
	for <gentoo-commits@lists.gentoo.org>; Fri,  9 Sep 2022 07:59:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A2E255E5
	for <gentoo-commits@lists.gentoo.org>; Fri,  9 Sep 2022 07:59:40 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1662710360.27de68f739ed2bae841d1e1d8b86d87e865d0ad1.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/axtls/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-libs/axtls/axtls-2.1.5-r101.ebuild net-libs/axtls/axtls-2.1.5-r102.ebuild
X-VCS-Directories: net-libs/axtls/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: 27de68f739ed2bae841d1e1d8b86d87e865d0ad1
X-VCS-Branch: master
Date: Fri,  9 Sep 2022 07:59:40 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 756fc707-37d2-46b5-800e-2bb46d717a0e
X-Archives-Hash: 751558b0d7c543c89c801a9d75e52964

commit:     27de68f739ed2bae841d1e1d8b86d87e865d0ad1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  9 07:59:20 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Sep  9 07:59:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27de68f7

net-libs/axtls: drop multilib, static-libs

No multilib or static-libs reverse dependencies.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...s-2.1.5-r101.ebuild => axtls-2.1.5-r102.ebuild} | 30 +++++++++-------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/net-libs/axtls/axtls-2.1.5-r101.ebuild b/net-libs/axtls/axtls-2.1.5-r102.ebuild
similarity index 87%
rename from net-libs/axtls/axtls-2.1.5-r101.ebuild
rename to net-libs/axtls/axtls-2.1.5-r102.ebuild
index 5f09e2c9f169..046f79d41d75 100644
--- a/net-libs/axtls/axtls-2.1.5-r101.ebuild
+++ b/net-libs/axtls/axtls-2.1.5-r102.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit lua-single multilib-minimal savedconfig toolchain-funcs
+inherit lua-single savedconfig toolchain-funcs
 
 ################################################################################
 # axtls CONFIG MINI-HOWTO
@@ -44,7 +44,7 @@ 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"
+IUSE="httpd cgi-lua cgi-php static doc"
 
 # TODO: add ipv6, and c#, java, lua, perl bindings
 # Currently these all have some issue
@@ -72,14 +72,12 @@ src_prepare() {
 
 	eapply "${FILESDIR}/explicit-libdir-r1.patch"
 
-	#We want CONFIG_DEBUG to avoid stripping
-	#but not for debugging info
+	# 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() {
@@ -122,12 +120,12 @@ use_flag_config() {
 	emake -j1 oldconfig < <(yes n) > /dev/null
 }
 
-multilib_src_configure() {
-	#Per-ABI substitutions.
+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
+	# Use CC as the host compiler for mconf
 	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
 		config/Rules.mak || die
 
@@ -145,25 +143,21 @@ multilib_src_configure() {
 	fi
 }
 
-multilib_src_install() {
-	if multilib_is_native_abi && use savedconfig; then
+src_install() {
+	if 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
+	rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
 
 	# The build system needs to install before it builds docs
-	if multilib_is_native_abi && use doc; then
+	if 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