From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1515597-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 52A9E15ACFC
for <garchives@archives.gentoo.org>; Fri, 5 May 2023 05:03:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9010CE0920;
Fri, 5 May 2023 05:03:46 +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 781D7E0920
for <gentoo-commits@lists.gentoo.org>; Fri, 5 May 2023 05:03:46 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id AF89D34127D
for <gentoo-commits@lists.gentoo.org>; Fri, 5 May 2023 05:03:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 26955A5F
for <gentoo-commits@lists.gentoo.org>; Fri, 5 May 2023 05:03:44 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1683263007.c9f856a92ddea76d2bf335ced9cdb39d838915d4.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/botan/botan-2.19.3-r1.ebuild dev-libs/botan/botan-2.19.3.ebuild dev-libs/botan/botan-3.0.0-r1.ebuild dev-libs/botan/botan-3.0.0.ebuild
X-VCS-Directories: dev-libs/botan/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: c9f856a92ddea76d2bf335ced9cdb39d838915d4
X-VCS-Branch: master
Date: Fri, 5 May 2023 05:03:44 +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: 76d0a0aa-4c32-44c2-967e-711247e8e0c5
X-Archives-Hash: 00852c673ae0b2113c91048948d077a2
commit: c9f856a92ddea76d2bf335ced9cdb39d838915d4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 5 05:03:18 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 5 05:03:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f856a9
dev-libs/botan: fix file collision w/ USE=tools
Closes: https://bugs.gentoo.org/905700
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/botan/{botan-2.19.3.ebuild => botan-2.19.3-r1.ebuild} | 10 +++++++++-
dev-libs/botan/{botan-3.0.0.ebuild => botan-3.0.0-r1.ebuild} | 10 +++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/dev-libs/botan/botan-2.19.3.ebuild b/dev-libs/botan/botan-2.19.3-r1.ebuild
similarity index 95%
rename from dev-libs/botan/botan-2.19.3.ebuild
rename to dev-libs/botan/botan-2.19.3-r1.ebuild
index 1ad66cddebfd..782d8dcc8ce1 100644
--- a/dev-libs/botan/botan-2.19.3.ebuild
+++ b/dev-libs/botan/botan-2.19.3-r1.ebuild
@@ -40,7 +40,10 @@ DEPEND="
sqlite? ( dev-db/sqlite:3= )
zlib? ( >=sys-libs/zlib-1.2.3:= )
"
-RDEPEND="${DEPEND}"
+RDEPEND="
+ ${DEPEND}
+ !<dev-libs/botan-3.0.0-r1:3[tools]
+"
BDEPEND="
${PYTHON_DEPS}
$(python_gen_any_dep '
@@ -178,4 +181,9 @@ src_install() {
if use python ; then
python_foreach_impl python_domodule src/python/botan$(ver_cut 1).py
fi
+
+ # Avoid collisions between slots for tools (bug #905700)
+ if use tools ; then
+ mv "${ED}"/usr/bin/botan "${ED}"/usr/bin/botan$(ver_cut 1) || die
+ fi
}
diff --git a/dev-libs/botan/botan-3.0.0.ebuild b/dev-libs/botan/botan-3.0.0-r1.ebuild
similarity index 95%
rename from dev-libs/botan/botan-3.0.0.ebuild
rename to dev-libs/botan/botan-3.0.0-r1.ebuild
index e31d7d9348d4..d5f062279dde 100644
--- a/dev-libs/botan/botan-3.0.0.ebuild
+++ b/dev-libs/botan/botan-3.0.0-r1.ebuild
@@ -40,7 +40,10 @@ DEPEND="
sqlite? ( dev-db/sqlite:3= )
zlib? ( >=sys-libs/zlib-1.2.3:= )
"
-RDEPEND="${DEPEND}"
+RDEPEND="
+ ${DEPEND}
+ !<dev-libs/botan-2.19.3-r1:2[tools]
+"
BDEPEND="
${PYTHON_DEPS}
$(python_gen_any_dep '
@@ -178,4 +181,9 @@ src_install() {
if use python ; then
python_foreach_impl python_domodule src/python/botan$(ver_cut 1).py
fi
+
+ # Avoid collisions between slots for tools (bug #905700)
+ if use tools ; then
+ mv "${ED}"/usr/bin/botan "${ED}"/usr/bin/botan$(ver_cut 1) || die
+ fi
}