Adding metadata

5 files changed, 137 insertions, 125 deletions

diff --git a/dev-cpp/doctest/doctest-2.4.12.ebuild b/dev-cpp/doctest/doctest-2.4.12.ebuild
index 13f2f8b53f0f..46a69e7a5850 100644
--- a/dev-cpp/doctest/doctest-2.4.12.ebuild
+++ b/dev-cpp/doctest/doctest-2.4.12.ebuild
@@ -19,15 +19,15 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.4.11-backport-pr770.patch"
 )
 
+# skip false positive detection in examples, bug #957418
+CMAKE_QA_COMPAT_SKIP=1
+
 src_prepare() {
 	sed -i '/-Werror/d' scripts/cmake/common.cmake || die
 	cmake_src_prepare
 }
 
 src_configure() {
-	# skip false positive detection in examples, bug #957418
-	local CMAKE_QA_COMPAT_SKIP=1
-
 	local mycmakeargs=(
 		-DDOCTEST_WITH_TESTS=$(usex test)
 	)
diff --git a/dev-cpp/wt/metadata.xml b/dev-cpp/wt/metadata.xml
index e0e2b5642369..5abee058ce18 100644
--- a/dev-cpp/wt/metadata.xml
+++ b/dev-cpp/wt/metadata.xml
@@ -7,7 +7,9 @@
  </maintainer>
  
  <use>
-  <flag name="pango">Enable <pkg>x11-libs/pango</pkg>, wich is used for improved font support (WPdfImage and WRasterImage)</flag>
+  <flag name="graphicsmagick">Enable <pkg>media-gfx/graphicsmagick</pkg>, which is used for creating raster images (WRasterImage)</flag>
+  <flag name="pango">Enable <pkg>x11-libs/pango</pkg>, which is used for improved font support (WPdfImage and WRasterImage)</flag>
+  <flag name="wttest">Build Wt::Test for automated (integration/unit) tests</flag>
  </use>
  <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-cpp/wt/wt-4.11.4-r2.ebuild b/dev-cpp/wt/wt-4.11.4-r2.ebuild
deleted file mode 100644
index 8d286d1accad..000000000000
--- a/dev-cpp/wt/wt-4.11.4-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Wt, C++ Web Toolkit"
-HOMEPAGE="https://www.webtoolkit.eu/wt https://github.com/emweb/wt"
-SRC_URI="https://github.com/emweb/wt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="doc mysql opengl +pango pdf postgres ssl"
-
-DEPEND="
-	<=dev-libs/boost-1.86.0:=
-	media-libs/libharu
-	media-gfx/graphicsmagick[jpeg,png]
-	sys-libs/zlib
-	mysql? ( virtual/mysql )
-	opengl? ( virtual/opengl )
-	pango? ( x11-libs/pango )
-	postgres? ( dev-db/postgresql )
-	ssl? ( dev-libs/openssl )
-"
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen[dot]
-		dev-qt/qttools:6[qdoc]
-	)
-"
-
-PATCHES=( "${FILESDIR}/wt-no-rundir.patch")
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DBUILD_EXAMPLES=OFF
-		-DINSTALL_DOCUMENTATION=$(usex doc)
-		-DDOCUMENTATION_DESTINATION="share/doc/${PF}"
-		-DENABLE_SSL=$(usex ssl)
-		-DENABLE_HARU=$(usex pdf)
-		-DENABLE_PANGO=$(usex pango)
-		-DENABLE_SQLITE=ON
-		-DENABLE_POSTGRES=$(usex postgres)
-		-DENABLE_MYSQL=$(usex mysql)
-		-DENABLE_FIREBIRD=OFF
-		# QT is only required for examples
-		-DENABLE_QT4=OFF
-		-DENABLE_QT5=OFF
-		-DENABLE_QT6=OFF
-		-DENABLE_SAML=ON
-		-DENABLE_OPENGL=$(usex opengl)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/wt/wt-4.11.4-r3.ebuild b/dev-cpp/wt/wt-4.11.4-r3.ebuild
new file mode 100644
index 000000000000..d33c8f3d91aa
--- /dev/null
+++ b/dev-cpp/wt/wt-4.11.4-r3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Wt, C++ Web Toolkit"
+HOMEPAGE="https://www.webtoolkit.eu/wt https://github.com/emweb/wt"
+SRC_URI="https://github.com/emweb/wt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc +graphicsmagick mysql opengl +pango pdf postgres +sqlite ssl wttest"
+REQUIRED_USE="
+	pango? ( || ( graphicsmagick pdf ) )
+	opengl? ( graphicsmagick )
+"
+# TODO: auto-test with wttest
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib
+	graphicsmagick? ( media-gfx/graphicsmagick:=[jpeg,png] )
+	mysql? (
+		virtual/mysql
+		|| (
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
+	opengl? (
+		media-libs/glew:=
+		media-libs/libglvnd[X]
+	)
+	pango? (
+		dev-libs/glib:2
+		media-libs/fontconfig
+		x11-libs/pango
+	)
+	pdf? ( media-libs/libharu:= )
+	postgres? ( dev-db/postgresql )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		app-text/doxygen
+		dev-qt/qttools:6[assistant]
+		dev-ruby/asciidoctor
+		media-gfx/graphviz[cairo]
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/wt-no-rundir.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled sqlite
+	rm -r src/Wt/Dbo/backend/amalgamation || die
+
+	if use doc; then
+		doxygen -u Doxyfile 2>/dev/null || die
+		doxygen -u examples/Doxyfile 2>/dev/null || die
+		sed -e "/^QHG_LOCATION/s|qhelpgenerator|/usr/$(get_libdir)/qt6/libexec/&|" \
+			-i Doxyfile || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_TESTS=OFF
+		-DDOCUMENTATION_DESTINATION="share/doc/${PF}"
+		-DINSTALL_DOCUMENTATION=$(usex doc)
+		# will be deprecated
+		-DCONNECTOR_FCGI=OFF
+		-DCONNECTOR_HTTP=ON
+		-DENABLE_SSL=$(usex ssl)
+		-DENABLE_HARU=$(usex pdf)
+		-DENABLE_PANGO=$(usex pango)
+		-DENABLE_SQLITE=$(usex sqlite)
+		-DENABLE_POSTGRES=$(usex postgres)
+		-DENABLE_MYSQL=$(usex mysql)
+		-DENABLE_FIREBIRD=OFF
+		-DENABLE_LIBWTTEST=$(usex wttest)
+		# QT is only required for examples
+		-DENABLE_QT4=OFF
+		-DENABLE_QT5=OFF
+		-DENABLE_QT6=OFF
+		# requires shibboleth and opensaml, not in tree
+		-DENABLE_SAML=OFF
+		-DENABLE_OPENGL=$(usex opengl)
+		-DWT_WRASTERIMAGE_IMPLEMENTATION=$(usex graphicsmagick GraphicsMagick none)
+	)
+
+	if use mysql || use postgres || use sqlite; then
+		mycmakeargs+=( -DENABLE_LIBWTDBO=ON )
+		if use sqlite; then
+			mycmakeargs+=( -DUSE_SYSTEM_SQLITE3=ON )
+			# DboTest.C: In member function ‘void Sqlite3_Test_Suite::dbo_precision_test2::test_method()’
+			if use wttest; then
+			append-flags -fno-strict-aliasing
+			filter-lto
+			fi
+		fi
+	else
+		mycmakeargs+=( -DENABLE_LIBWTDBO=OFF )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		find "${ED}" \( \
+			-iname '*.map' -o \
+			-iname '*.md5' \
+			\) -delete || die
+
+		docompress -x /usr/share/doc/${PF}/{examples,reference,tutorial}
+	fi
+}
diff --git a/dev-cpp/wt/wt-4.11.4.ebuild b/dev-cpp/wt/wt-4.11.4.ebuild
deleted file mode 100644
index 5447c6aec969..000000000000
--- a/dev-cpp/wt/wt-4.11.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Wt, C++ Web Toolkit"
-HOMEPAGE="https://www.webtoolkit.eu/wt https://github.com/emweb/wt"
-SRC_URI="https://github.com/emweb/wt/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="doc mysql opengl +pango pdf postgres ssl"
-
-DEPEND="
-	mysql? ( virtual/mysql )
-	opengl? ( virtual/opengl )
-	pango? ( x11-libs/pango )
-	postgres? ( dev-db/postgresql )
-	ssl? ( dev-libs/openssl )
-	<=dev-libs/boost-1.86.0:=
-	media-libs/libharu
-	media-gfx/graphicsmagick[jpeg,png]
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	doc? (
-		app-text/doxygen[dot]
-		dev-qt/qttools[qdoc]
-	)
-"
-
-PATCHES=( "${FILESDIR}/wt-no-rundir.patch")
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DBUILD_EXAMPLES=OFF
-		-DINSTALL_DOCUMENTATION=$(usex doc)
-		-DDOCUMENTATION_DESTINATION="share/doc/${PF}"
-		-DENABLE_SSL=$(usex ssl)
-		-DENABLE_HARU=$(usex pdf)
-		-DENABLE_PANGO=$(usex pango)
-		-DENABLE_SQLITE=ON
-		-DENABLE_POSTGRES=$(usex postgres)
-		-DENABLE_MYSQL=$(usex mysql)
-		-DENABLE_FIREBIRD=OFF
-		-DENABLE_QT4=OFF
-		-DENABLE_QT5=OFF
-		-DENABLE_QT6=ON
-		-DENABLE_SAML=ON
-		-DENABLE_OPENGL=$(usex opengl)
-	)
-
-	cmake_src_configure
-}