Adding metadata

4 files changed, 136 insertions, 66 deletions

diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 970f61899036..d3d865096571 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1 +1 @@
-DIST fwbuilder-6.0.0_rc1.tar.gz 7281841 BLAKE2B 4adfb2c1ba22d781e98de2e02cc7cca6a1c214d3b63e156b76a351d1a7e399afaf0227ced4c9fa228c637c37247dd1cb6e88a0cc4231a3827ba2e5bd0b8a4c5e SHA512 11126c23d8b9f68e7cdcf0a6d3de1678f1b0c879959cef5484b30c2d41ab0377c70dce432d014331cfd376a5fd20e384db7342745a066e8159c2ae275d5bdec4
+DIST fwbuilder-6.0.0_rc1_p20230723-8013c00e.tar.gz 7292112 BLAKE2B 6dbacdbbd30e0af7c0a997e0b110e2a42285c0c76e8b60bb68344f7eb459b79bd0baf045edd53d5c8ae8299b4046d154c3be8270aa56ae2ac7a8102a7542723b SHA512 0f7093588ab11e5f47672d9b73acd22674eb3a4ece1f70f99c1b00aa16cf95a79740b68419fe3e700542bdafa5943a5a1dc7000f28885e8b870106c94a25af50
diff --git a/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1_p20230723-docdir-nocompress.patch b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1_p20230723-docdir-nocompress.patch
new file mode 100644
index 000000000000..1d3641ca15c2
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-6.0.0_rc1_p20230723-docdir-nocompress.patch
@@ -0,0 +1,66 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -86,7 +86,7 @@
+ else()
+   include(GNUInstallDirs)
+   set(FWB_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR}/fwbuilder-${PROJECT_VERSION})
+-  set(FWB_INSTALL_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/fwbuilder-${PROJECT_VERSION})
++  set(FWB_INSTALL_DOCDIR ${CMAKE_INSTALL_DOCDIR})
+   set(FWB_INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -3,42 +3,22 @@
+ install(FILES
+         AUTHORS
+         ChangeLog
+-        COPYING
++        # COPYING
+         Credits
+-        FWBuilder-Routing-LICENSE.txt
++        # FWBuilder-Routing-LICENSE.txt
+         PatchAcceptancePolicy.txt
+ 	${readme_files}
+ 	DESTINATION ${FWB_INSTALL_DOCDIR})
+ 
+ if(UNIX AND NOT APPLE)
+-    FIND_PROGRAM(GZIP_TOOL
+-    	NAMES gzip
+-    	PATHS /bin
+-    	      /usr/bin
+-    	      /usr/local/bin)
+-    
+-    IF(NOT GZIP_TOOL)
+-        MESSAGE(FATAL_ERROR "Could not find gzip for man page compression.")
+-    endif(NOT GZIP_TOOL)
+-    
+-    add_custom_target(generate_man ALL
+-        COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwbedit.1 > ${CMAKE_BINARY_DIR}/fwbedit.1.gz
+-        COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwbuilder.1 > ${CMAKE_BINARY_DIR}/fwbuilder.1.gz
+-        COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwb_iosacl.1 > ${CMAKE_BINARY_DIR}/fwb_iosacl.1.gz
+-        COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwb_ipf.1 > ${CMAKE_BINARY_DIR}/fwb_ipf.1.gz
+-        COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwb_ipfw.1 > ${CMAKE_BINARY_DIR}/fwb_ipfw.1.gz
+-        COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwb_ipt.1 > ${CMAKE_BINARY_DIR}/fwb_ipt.1.gz
+-        COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwb_pf.1 > ${CMAKE_BINARY_DIR}/fwb_pf.1.gz
+-        COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/fwb_pix.1 > ${CMAKE_BINARY_DIR}/fwb_pix.1.gz)
+-    
+-    install(FILES ${CMAKE_BINARY_DIR}/fwbedit.1.gz
+-            ${CMAKE_BINARY_DIR}/fwbuilder.1.gz
+-            ${CMAKE_BINARY_DIR}/fwb_iosacl.1.gz
+-            ${CMAKE_BINARY_DIR}/fwb_ipf.1.gz
+-            ${CMAKE_BINARY_DIR}/fwb_ipfw.1.gz
+-            ${CMAKE_BINARY_DIR}/fwb_ipt.1.gz
+-            ${CMAKE_BINARY_DIR}/fwb_pf.1.gz
+-            ${CMAKE_BINARY_DIR}/fwb_pix.1.gz
++    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fwbedit.1
++            ${CMAKE_CURRENT_SOURCE_DIR}/fwbuilder.1
++            ${CMAKE_CURRENT_SOURCE_DIR}/fwb_iosacl.1
++            ${CMAKE_CURRENT_SOURCE_DIR}/fwb_ipf.1
++            ${CMAKE_CURRENT_SOURCE_DIR}/fwb_ipfw.1
++            ${CMAKE_CURRENT_SOURCE_DIR}/fwb_ipt.1
++            ${CMAKE_CURRENT_SOURCE_DIR}/fwb_pf.1
++            ${CMAKE_CURRENT_SOURCE_DIR}/fwb_pix.1
+             DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ endif(UNIX AND NOT APPLE)
+ 
diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1-r1.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1-r1.ebuild
deleted file mode 100644
index ee60e603b974..000000000000
--- a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake virtualx
-
-DESCRIPTION="A firewall management GUI for iptables, PF, Cisco routers and more"
-HOMEPAGE="https://github.com/fwbuilder/fwbuilder"
-SRC_URI="https://github.com/fwbuilder/fwbuilder/archive/refs/tags/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test ) test"
-
-RDEPEND="
-	dev-libs/libxml2:=
-	dev-libs/libxslt
-	dev-libs/openssl
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	net-analyzer/net-snmp
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0_pre20200502-drop-Werror.patch
-	"${FILESDIR}"/${PN}-6.0.0_rc1-automagic-ccache.patch
-	"${FILESDIR}"/${P}-fix_version.patch
-)
-
-src_prepare() {
-	# Hangs
-	sed -i \
-		-e '/add_subdirectory(.*Dialog.*Test)/d' \
-		-e '/add_subdirectory(RuleSetViewTest)/d' \
-		-e '/add_subdirectory(ObjectManipulatorTest)/d' \
-		-e '/add_subdirectory(RuleSetViewContextMenuTest)/d' \
-		src/unit_tests/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cp "${BUILD_DIR}"/src/libfwbuilder/etc/fwbuilder.dtd "${S}"/src/res || die
-	TEST_VERBOSE=1 FWB_RES_DIR="${S}/src/res" virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	docompress -x /usr/share/man
-}
diff --git a/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1_p20230723.ebuild b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1_p20230723.ebuild
new file mode 100644
index 000000000000..97d877bb368f
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-6.0.0_rc1_p20230723.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT=8013c00e1f29350d96926768290e8c7f91cda424
+inherit cmake xdg
+
+DESCRIPTION="Firewall management GUI for iptables, PF, Cisco routers and more"
+HOMEPAGE="https://github.com/fwbuilder/fwbuilder"
+SRC_URI="https://github.com/fwbuilder/fwbuilder/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 x86"
+IUSE="test"
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	dev-libs/libxml2:=
+	dev-libs/libxslt
+	dev-libs/openssl:=
+	dev-qt/qtbase:6[gui,network,widgets]
+	net-analyzer/net-snmp
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# downstream patches
+	"${FILESDIR}"/${PN}-6.0.0_pre20200502-drop-Werror.patch
+	"${FILESDIR}"/${PN}-6.0.0_rc1-automagic-ccache.patch
+	"${FILESDIR}"/${PN}-6.0.0_rc1-fix_version.patch
+	"${FILESDIR}"/${P}-docdir-nocompress.patch # bug 957888
+)
+
+src_prepare() {
+	# Hangs
+	sed -i \
+		-e '/add_subdirectory(.*Dialog.*Test)/s/^/# removed by Gentoo: &/' \
+		-e '/add_subdirectory(RuleSetViewTest)/s/^/# removed by Gentoo: &/' \
+		-e '/add_subdirectory(ObjectManipulatorTest)/s/^/# removed by Gentoo: &/' \
+		-e '/add_subdirectory(RuleSetViewContextMenuTest)/s/^/# removed by Gentoo: &/' \
+		src/unit_tests/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUseQt6=ON
+		-DFWB_INSTALL_DOCDIR=
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cp "${BUILD_DIR}"/src/libfwbuilder/etc/fwbuilder.dtd "${S}"/src/res || die
+
+	local -x QT_QPA_PLATFORM=offscreen
+	TEST_VERBOSE=1 FWB_RES_DIR="${S}/src/res" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	docompress -x /usr/share/man
+}