From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1434900-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 F1CE7158094
for <garchives@archives.gentoo.org>; Fri, 9 Sep 2022 07:59:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 489B5E0918;
Fri, 9 Sep 2022 07:59:43 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 34DA7E0918
for <gentoo-commits@lists.gentoo.org>; Fri, 9 Sep 2022 07:59:43 +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 770AF340CAC
for <gentoo-commits@lists.gentoo.org>; Fri, 9 Sep 2022 07:59:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5EE135CD
for <gentoo-commits@lists.gentoo.org>; Fri, 9 Sep 2022 07:59:39 +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: <1662710343.7b2cebf22f8a32fc2654e7be03bef0dafa30e59c.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/nanomsg/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/nanomsg/nanomsg-1.1.5-r1.ebuild dev-libs/nanomsg/nanomsg-1.1.5.ebuild
X-VCS-Directories: dev-libs/nanomsg/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: 7b2cebf22f8a32fc2654e7be03bef0dafa30e59c
X-VCS-Branch: master
Date: Fri, 9 Sep 2022 07:59:39 +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: 773ea44c-f435-4111-b5c2-6c50ec1eb5a3
X-Archives-Hash: 4683093740280c2a22a6d0e285331bd7
commit: 7b2cebf22f8a32fc2654e7be03bef0dafa30e59c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 9 07:59:03 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 07:59:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2cebf2
dev-libs/nanomsg: drop multilib
No multilib reverse-dependencies.
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...nanomsg-1.1.5.ebuild => nanomsg-1.1.5-r1.ebuild} | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild b/dev-libs/nanomsg/nanomsg-1.1.5-r1.ebuild
similarity index 68%
rename from dev-libs/nanomsg/nanomsg-1.1.5.ebuild
rename to dev-libs/nanomsg/nanomsg-1.1.5-r1.ebuild
index 43d543afa707..b10243ad377a 100644
--- a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
+++ b/dev-libs/nanomsg/nanomsg-1.1.5-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake-multilib
+inherit cmake
DESCRIPTION="High-performance messaging interface for distributed applications"
HOMEPAGE="https://nanomsg.org/"
@@ -14,9 +14,9 @@ SLOT="0/5.0.0"
KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~riscv x86"
IUSE="doc"
-DEPEND="doc? ( dev-ruby/asciidoctor )"
+BDEPEND="doc? ( dev-ruby/asciidoctor )"
-multilib_src_prepare() {
+src_prepare() {
# Old CPUs like HPPA fails test because of timeout
sed -i \
-e '/inproc_shutdown/s/5/80/' \
@@ -26,20 +26,11 @@ multilib_src_prepare() {
cmake_src_prepare
}
-multilib_src_configure() {
+src_configure() {
local mycmakeargs=(
-DNN_STATIC_LIB=OFF
+ -DNN_ENABLE_DOC=$(usex doc)
)
- if multilib_is_native_abi; then
- mycmakeargs+=(
- -DNN_ENABLE_DOC=$(usex doc ON OFF)
- )
- else
- mycmakeargs+=(
- -DNN_ENABLE_DOC=OFF
- -DNN_TOOLS=OFF
- -DNN_ENABLE_NANOCAT=OFF
- )
- fi
+
cmake_src_configure
}