From 4e3c54b317888c8f1e3b45338581c0edd9245157 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 22 Mar 2023 19:49:24 +0100
Subject: [PATCH] unittest++, fix recipe, disable static (#8058)

---
 .../patches/unittest++-1.6.1.patchset         | 23 ------
 dev-libs/unittest++/unittest++-1.6.1.recipe   | 71 -------------------
 dev-libs/unittest++/unittest++-2.0.0.recipe   |  5 +-
 3 files changed, 3 insertions(+), 96 deletions(-)
 delete mode 100644 dev-libs/unittest++/patches/unittest++-1.6.1.patchset
 delete mode 100644 dev-libs/unittest++/unittest++-1.6.1.recipe

diff --git a/dev-libs/unittest++/patches/unittest++-1.6.1.patchset b/dev-libs/unittest++/patches/unittest++-1.6.1.patchset
deleted file mode 100644
index 99456d150..000000000
--- a/dev-libs/unittest++/patches/unittest++-1.6.1.patchset
+++ /dev/null
@@ -1,23 +0,0 @@
-From e9bd231d1a65425721a94b945973fc8dd26a42a3 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Thu, 2 Jun 2016 19:49:48 +0200
-Subject: Haiku patch
-
-
-diff --git a/UnitTest++/Config.h b/UnitTest++/Config.h
-index ff62b4e..4bd31fe 100644
---- a/UnitTest++/Config.h
-+++ b/UnitTest++/Config.h
-@@ -21,7 +21,8 @@
- #endif
- 
- #if defined(unix) || defined(__unix__) || defined(__unix) || defined(linux) || \
--   defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-+   defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) \
-+   || defined (__HAIKU__)
-    #define UNITTEST_POSIX
- #endif
- 
--- 
-2.2.2
-
diff --git a/dev-libs/unittest++/unittest++-1.6.1.recipe b/dev-libs/unittest++/unittest++-1.6.1.recipe
deleted file mode 100644
index d2b4a0973..000000000
--- a/dev-libs/unittest++/unittest++-1.6.1.recipe
+++ /dev/null
@@ -1,71 +0,0 @@
-SUMMARY="A lightweight unit testing framework for C++"
-DESCRIPTION="UnitTest++ was designed to do test-driven development on a wide \
-variety of platforms. Simplicity, portability, speed, and small footprint \
-are all very important aspects of UnitTest++. UnitTest++ is mostly standard \
-C++ and makes minimal use of advanced library and language features, which \
-means it should be easily portable to just about any platform."
-HOMEPAGE="http://unittest-cpp.github.io"
-COPYRIGHT="2006 Noel Llopis and Charles Nicholson"
-LICENSE="MIT"
-REVISION="2"
-SOURCE_URI="https://github.com/unittest-cpp/unittest-cpp/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="1cc9071be01db190f26868fefb6a7af49ee56a339fc3b08d1a1e9eeca5376c45"
-SOURCE_FILENAME="unittest-cpp-$portVersion.tar.gz"
-SOURCE_DIR="unittest-cpp-$portVersion"
-PATCHES="unittest++-$portVersion.patchset"
-
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86 x86_gcc2"
-
-PROVIDES="
-	unittest++$secondaryArchSuffix = $portVersion
-	lib:libunittest++$secondaryArchSuffix = $portVersion compat >= 1
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	unittest++${secondaryArchSuffix}_devel = $portVersion
-	devel:libunittest++$secondaryArchSuffix = $portVersion compat >= 1
-	"
-REQUIRES_devel="
-	unittest++$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	cmake -DCMAKE_INSTALL_PREFIX=$prefix .
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	mkdir -p $includeDir
-	mv $prefix/include/UnitTest++ $includeDir/
-	rmdir $prefix/include
-
-	if [ -n "$secondaryArchSuffix" ]; then
-		mkdir -p $libDir
-		mv $prefix/lib/lib* $prefix/lib/cmake $libDir/
-	fi
-
-	prepareInstalledDevelLibs libUnitTest++
-	packageEntries devel $relativeDevelopDir
-}
-
-TEST()
-{
-	./TestUnitTest++
-}
diff --git a/dev-libs/unittest++/unittest++-2.0.0.recipe b/dev-libs/unittest++/unittest++-2.0.0.recipe
index c4626a5ee..f7f3e508f 100644
--- a/dev-libs/unittest++/unittest++-2.0.0.recipe
+++ b/dev-libs/unittest++/unittest++-2.0.0.recipe
@@ -7,7 +7,7 @@ means it should be easily portable to just about any platform."
 HOMEPAGE="https://unittest-cpp.github.io/"
 COPYRIGHT="2006 Noel Llopis and Charles Nicholson"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/unittest-cpp/unittest-cpp/releases/download/v$portVersion/unittest-cpp-$portVersion.tar.gz"
 CHECKSUM_SHA256="1d1b118518dc200e6b87bbf3ae7bfd00a0cfc6be708255f98e5e3d627a7c9f98"
 SOURCE_DIR="unittest-cpp-$portVersion"
@@ -38,6 +38,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:git
 	cmd:make
@@ -49,7 +50,7 @@ defineDebugInfoPackage unittest++$secondaryArchSuffix \
 
 BUILD()
 {
-	runConfigure ./configure
+	runConfigure ./configure --disable-static
 	make $jobArgs
 }