gentoo auto-resync : 05:05:2023 - 11:30:40

3 files changed, 30 insertions, 10 deletions

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index fddaff33163a..d55f580dba16 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -5,6 +5,6 @@ DIST Botan-2.19.3.tar.xz.asc 488 BLAKE2B cd86bf77306aad2956cced6ac4fb96081279af8
 DIST Botan-3.0.0.tar.xz 8752380 BLAKE2B 06ac29dc0cbaef43a38cc30185f431e1b1f4083469fdea19ee5d77ada6633022746b8ae2419bd00872f9b3892af9c61a455bc88f77bef84f451938dffd27bde3 SHA512 d67ac0f9d67f6869b7a35d4a7c5e96ffcc619f7e44ead36b4cd0906f3d925d12181566aace03ac719ef54d819ae1158febc0b25839beed5f92eade06d510b594
 DIST Botan-3.0.0.tar.xz.asc 488 BLAKE2B 6a34817ec4700983151f97d2e278870736860ac72f3936fcc63e241d89ba758bdf7765d3c877d88019055562a6067c278ecbac263e8d87cc310790089e47f662 SHA512 46ff64bb4d215a48b0549d90ae2461ae39ae5ecf588a7e130876759ec30561c5a2db77ee9cdc7a3dab990927b51ea732f5b56592bdc150062ca25690378ab817
 EBUILD botan-2.19.2.ebuild 4430 BLAKE2B f3ecd4970642c364814e8ecbc7e831c8009b90d06b44dfc3da8abf270d7bd55f07715f86bf155a0e7f31baab03b849ccfbade89e346d8ccd2cb88edaeb7530a2 SHA512 42227dea382c9db6d3623506ab50ee4b3bf4139e419917c0f7e2fc5467b29a86723b1159e8025b982f7d82f057733cc8ac1193834e8a4609a5dfde80563f8205
-EBUILD botan-2.19.3.ebuild 4505 BLAKE2B d8be90d066261e658ab1b2aeaaa34854d256a313f3298e4e914f3c050a24b9e1acd1959c115f98ced3a46ddab0bc525c40d3ac8ccaec7be456316e36c23dd10e SHA512 47752ec698abf983870b9dceed2fc8f946b99b1f2153a019c3e25d0bdfa4b277f387a04882cda2e4f035a099adf259be8847636f6a7fd4f520e03d656710153c
-EBUILD botan-3.0.0.ebuild 4509 BLAKE2B 40f55f427ba9b7af09a4cf08a0faf578908b39ff0a439699044e13a8495a3698c590fe37d30af96f338cabfd36e42946cd627f5457b9a68db6511a31541b43d8 SHA512 198993389e076674d2d7570fddf2f37428d9fe90fd688dd19ad073c53bd3fedeaa38ba46c4a690a4e73e701ee629bf6d8a212f15f9cc9239ef01b8330844d76f
+EBUILD botan-2.19.3-r2.ebuild 4801 BLAKE2B 62773458d226a78bb28c0611073c6a1b628e3a6910915a40bf07c2f7dc5f8252f8da3ccf682d618f915a6095e808c7ef9d4f46a1ad0d30dc1bf3fde98ced59e0 SHA512 c5dba4870489f004a2d955d351aa4f31d82f483b39a01dd137f765686b3f1a18f69139b72097761839a6485443ce4b4fbdcfb875f40537ce2248fe73b5e681d2
+EBUILD botan-3.0.0-r2.ebuild 4806 BLAKE2B 8349aa70b1c7d65941ccadb7f106547c2c7f82f38e38945420e9124fba8304e35e84ed7cd93965ea050903a4e7a6c683ca9dbf0fe6b339d8c9fdc2c9b56ae5fb SHA512 de8b359299947bdd3d5f9866141d4bbf2f0d6c4bb1f436863e51632aceb462904330110053e24c962e89275dd750c172700775ceb079c32e38dea1454db506f3
 MISC metadata.xml 587 BLAKE2B 8d46466fee633fda0f81549a6e512e4ef5963eda31d7c882cee2fe2bfae8b0379509f046d0bdfdb1fe9481eea0585f1754753ed6b509c4f922b8fbf9ae089f39 SHA512 258e04098b9db5821a66e38d02ffb195b57378621fd2a549c8892744cf257be857ebf75c8e4a2f041cd267f07c2f1c3a5fca8df61db0538d8282507cf03a029d
diff --git a/dev-libs/botan/botan-2.19.3.ebuild b/dev-libs/botan/botan-2.19.3-r2.ebuild
index 1ad66cddebfd..3059e4d2c09e 100644
--- a/dev-libs/botan/botan-2.19.3.ebuild
+++ b/dev-libs/botan/botan-2.19.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc
 inherit edo python-r1 toolchain-funcs verify-sig
 
@@ -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 '
@@ -116,7 +119,7 @@ src_configure() {
 		$(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1')
 		$(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2')
 
-		# HPPA's GCC doesn't support SSP (presumably due to stack direction)
+		# HPPA's GCC doesn't support SSP
 		$(usev hppa '--without-stack-protector')
 
 		$(use_with boost)
@@ -133,6 +136,8 @@ src_configure() {
 		--disable-modules=$(IFS=","; echo "${disable_modules[*]}")
 		--distribution-info="Gentoo ${PVR}"
 		--libdir="$(get_libdir)"
+		# Avoid collisions between slots for tools (bug #905700)
+		--program-suffix=$(ver_cut 1)
 
 		# Don't install Python bindings automatically
 		# (do it manually later in the right place)
@@ -168,12 +173,17 @@ src_configure() {
 }
 
 src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+	LD_LIBRARY_PATH="${S}" ./botan-test$(ver_cut 1) || die "Validation tests failed"
 }
 
 src_install() {
 	default
 
+	if [[ -d "${ED}"/usr/share/doc/${P} ]] ; then
+		# --docdir in configure controls the parent directory unfortunately
+		mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die
+	fi
+
 	# Manually install the Python bindings (bug #723096)
 	if use python ; then
 		python_foreach_impl python_domodule src/python/botan$(ver_cut 1).py
diff --git a/dev-libs/botan/botan-3.0.0.ebuild b/dev-libs/botan/botan-3.0.0-r2.ebuild
index e31d7d9348d4..59ea36471611 100644
--- a/dev-libs/botan/botan-3.0.0.ebuild
+++ b/dev-libs/botan/botan-3.0.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc
 inherit edo python-r1 toolchain-funcs verify-sig
 
@@ -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 '
@@ -116,7 +119,7 @@ src_configure() {
 		$(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1')
 		$(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2')
 
-		# HPPA's GCC doesn't support SSP (presumably due to stack direction)
+		# HPPA's GCC doesn't support SSP
 		$(usev hppa '--without-stack-protector')
 
 		$(use_with boost)
@@ -133,6 +136,8 @@ src_configure() {
 		--disable-modules=$(IFS=","; echo "${disable_modules[*]}")
 		--distribution-info="Gentoo ${PVR}"
 		--libdir="$(get_libdir)"
+		# Avoid collisions between slots for tools (bug #905700)
+		--program-suffix=$(ver_cut 1)
 
 		# Don't install Python bindings automatically
 		# (do it manually later in the right place)
@@ -168,12 +173,17 @@ src_configure() {
 }
 
 src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+	LD_LIBRARY_PATH="${S}" ./botan-test$(ver_cut 1) || die "Validation tests failed"
 }
 
 src_install() {
 	default
 
+	if [[ -d "${ED}"/usr/share/doc/${P} ]] ; then
+		# --docdir in configure controls the parent directory unfortunately
+		mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die
+	fi
+
 	# Manually install the Python bindings (bug #723096)
 	if use python ; then
 		python_foreach_impl python_domodule src/python/botan$(ver_cut 1).py