botan, bump versions (#10303)

dev-libs/botan/botan-2.19.4.recipe

@@ -6,11 +6,12 @@ hardware support, password hashing, and post quantum crypto schemes. \
 Botan also has a C89 API specifically designed to be easy to call from other \
 languages."
 HOMEPAGE="https://botan.randombit.net/"
-COPYRIGHT="1999-2022 The Botan Authors"
+COPYRIGHT="1999-2024 The Botan Authors"
 LICENSE="BSD (2-clause)"
 REVISION="1"
-SOURCE_URI="https://github.com/randombit/botan/archive/refs/tags/$portVersion.tar.gz"
-CHECKSUM_SHA256="8f568bf74c2e476d92ac8a1cfc2ba8407ec038fe9458bd0a11e7da827a9b8199"
+SOURCE_URI="https://botan.randombit.net/releases/Botan-$portVersion.tar.xz"
+CHECKSUM_SHA256="5a3a88ef6433e97bcab0efa1ed60c6197e4ada9d9d30bc1c47437bf89b97f276"
+SOURCE_DIR="Botan-$portVersion"
 PATCHES="botan-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -23,7 +24,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-libVersion="19.19.3"
+libVersion="19.19.4"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
@@ -67,7 +68,7 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	runConfigure --omit-buildspec --omit-dirs binDir ./configure.py \
-		--prefix="$prefix" --bindir="$commandBinDir" \
+		--bindir="$commandBinDir" \
 		--enable-shared-library \
 		--disable-static \
 		--with-bzip2 --with-lzma --with-zlib \
@@ -83,7 +84,8 @@ INSTALL()
 	fixPkgconfig
 
 	packageEntries devel \
-		"$developDir"
+		"$developDir" \
+		"$documentationDir"
 
 	# remove the cmd in favor for package botan3
 	rm -rf $commandBinDir

dev-libs/botan/botan3-3.3.0.recipe

@@ -6,13 +6,13 @@ hardware support, password hashing, and post quantum crypto schemes. \
 Botan also has a C89 API specifically designed to be easy to call from other \
 languages."
 HOMEPAGE="https://botan.randombit.net/"
-COPYRIGHT="1999-2023 The Botan Authors"
+COPYRIGHT="1999-2024 The Botan Authors"
 LICENSE="BSD (2-clause)"
 REVISION="1"
-SOURCE_URI="https://github.com/randombit/botan/archive/refs/tags/$portVersion.tar.gz"
-CHECKSUM_SHA256="2d0af0c3a7140572f3f7f1a22865f9c5eadc102a7fa58f03314709b0bee26c11"
-SOURCE_DIR="botan-$portVersion"
-PATCHES="botan3-$portVersion.patchset"
+SOURCE_URI="https://botan.randombit.net/releases/Botan-$portVersion.tar.xz"
+CHECKSUM_SHA256="368f11f426f1205aedb9e9e32368a16535dc11bd60351066e6f6664ec36b85b9"
+SOURCE_DIR="Botan-$portVersion"
+PATCHES="botan-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -24,7 +24,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-libVersion="0.1.1"
+libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
@@ -58,6 +58,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -86,7 +87,9 @@ INSTALL()
 	fixPkgconfig
 
 	packageEntries devel \
-		"$developDir"
+		"$developDir" \
+		"$documentationDir" \
+		"$libDir/cmake"
 
 	# install botan3.py to the wright place
 	local installDir="$prefix/lib/python3.10/vendor-packages"

dev-libs/botan/patches/botan-2.19.4.patchset

@@ -1,11 +1,11 @@
-From cc19bf72f5eb7adabcb8e5e6b1d8d525e404dde6 Mon Sep 17 00:00:00 2001
+From 99a50ce7dff79f12931350ef379026b31cf14650 Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Sun, 13 Nov 2022 08:42:34 +0100
 Subject: botan, add configure.py patch for cmd:python3
 
 
 diff --git a/configure.py b/configure.py
-index 72e02c3..7208e3f 100755
+index 7ff2ef2..f6cbccb 100755
 --- a/configure.py
 +++ b/configure.py
 @@ -1,4 +1,4 @@
@@ -15,10 +15,10 @@ index 72e02c3..7208e3f 100755
  """
  Configuration program for botan
 -- 
-2.39.2
+2.43.2
 
 
-From e1fe04bbebab5dfac011d520f021980e3587106a Mon Sep 17 00:00:00 2001
+From b5365e3b2600e1f501410474a74850d0c29c0d4f Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Wed, 3 May 2023 00:16:42 -0600
 Subject: Don't mkdir prefix during install
@@ -38,5 +38,5 @@ index 32a7a7e..50ab4d7 100755
  
      build_include_dir = os.path.join(options.build_dir, 'include', 'botan')
 -- 
-2.39.2
+2.43.2
 

dev-libs/botan/patches/botan-3.3.0.patchset

@@ -1,14 +1,14 @@
-From 033c3a42ffb70a45eb4cf340a0704e78fd60ef86 Mon Sep 17 00:00:00 2001
+From 25926b1b6c449a2c157fcab6fd76a76b2f9433dd Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Wed, 3 May 2023 00:16:42 -0600s
 Subject: Don't mkdir prefix during install
 
 
 diff --git a/src/scripts/install.py b/src/scripts/install.py
-index 2d059bf..0666ce1 100755
+index b052bec..38310b7 100755
 --- a/src/scripts/install.py
 +++ b/src/scripts/install.py
-@@ -151,7 +151,7 @@ def main(args):
+@@ -150,7 +150,7 @@ def main(args):
  
      prefix = cfg['prefix']
  
@@ -18,5 +18,5 @@ index 2d059bf..0666ce1 100755
  
      for header in cfg['public_headers']:
 -- 
-2.37.3
+2.43.2