gentoo auto-resync : 28:05:2023 - 15:14:55

4 files changed, 35 insertions, 178 deletions

diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 83b2f91cf5a0..1b55fda5bad9 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,6 +1,5 @@
-DIST kvirc-5.2_pre20210630233331.tar.gz 6173417 BLAKE2B dcdb5fed3250de08d8e2896ba799e142ee04fff409006d7b7d06bdcf1cf2f6df9f7abeeb055e550d99f9cca6182d68b4f5b9ff224f78d91b1efb7f42118458e5 SHA512 625712cc69a2ab3a33b72b2e9935bec8f307ef1f8d5a9a0672d7eb8e7daa5ab3e6202a2b8932493c30374f0451821db161e47cb3af840c0324e27ca2e58272ef
+AUX kvirc-5.2_pre20210630233331-fixqprocess.patch 869 BLAKE2B ccdec97ac8cd412c776146a56971f61bff66737a5a5590bb1508f05e64850211b9d0748999d347aaab8ade499d22ae6f9bfd8c4b9bced35de0dc0b2d7669734f SHA512 deb5252936bcb593fe1a11631fe4c03f26c28afaf1e88206a076d2f7754160620178362d0f00023a56f4eafa19d60c4d281cee88c20253ac6629033284719363
 DIST kvirc-5.2_pre20220629000000.tar.gz 6173590 BLAKE2B b4bfdc307df81a485acb72b33908f82bad0793139543abed03a1b84cae36cba4e11a6b8098cffc9669cb0a7c9072fd6a608589ce03a228b25dfd00b8d7d94b82 SHA512 4369f3703555c8717febfd32c06f6fd8576424cb3a92f9d9e24a5af93acf69ca8707d89a27804457327fd6c30601566d7874c0fc08e12018a3f5440ea988a69e
-EBUILD kvirc-5.2_pre20210630233331-r1.ebuild 4307 BLAKE2B 77235e7cb115566de84c634ce66b8c51b689103103810c8db46c41d2175df909873ec215ef01899bca7488b97ceaa43a2d8622d8abb874c74483b00861e46fa5 SHA512 0ccf0b177bbf412d4a7b5f0c21de589e7e438b25cb4e603e7f0af88c69f8a87ea1922c35939edb5a04b1a252c2fcaf672a97d997bd26531402386a66ca9fd330
-EBUILD kvirc-5.2_pre20220629000000.ebuild 4312 BLAKE2B 9dd5fda71ad665387541f543d129ab60a6848e1fba09c5250510505ce343004154a82c791121be7397bc0b18026a475fb7121cecd21a3b5f50e106c73bc4cf26 SHA512 13987045abd1d5ba0b1d52f6ea30b6cf53e5cf7928d1f5a64567bf121db303921805054c490a02fac573bc6650c6ecab528d78085287f4733a80ec1dbc84499d
+EBUILD kvirc-5.2_pre20220629000000.ebuild 4386 BLAKE2B 69bfffd3900ee5102406f1d08a9806b761e42871c7983e432e4669f47eef911ac24b33f64025418701827a145de25b8996154dd141b8e9783207ba9b33b986cf SHA512 39ecb1db0b8b6c86e0d1f6139e62fb1b424271185738161f34d2ba48937dc3f1a9edfbb5e339b37f93e2f532b3f13ec6b55111a2e9931f64898b140822ad66ce
 EBUILD kvirc-9999.ebuild 4244 BLAKE2B ae5f61a321839057b5cb42065024650cec6a268ce0f0f77ba53fcc72a253437c5ba9b23a690f3f2dafd0ffd2807486b572fb3f9553bc77107144c2caaca4815c SHA512 2fe493f136b83daef2d600ca7029b85c92e774eba18c5353a5104462ebc4aad4036007ea078640e6d6edfaf0b25308ab9c84077235578eeba7adc026e967ae7d
 MISC metadata.xml 632 BLAKE2B 00e76e3f4dae2d7422da074a35e0bf2ed0d919be1a7c86e42779c809f9a31e87e6627d6eac03f8913ab40e094a8e5d284daa42d1140717083c73783342b0bea5 SHA512 a38097a282426fad3339a155ea4e8be00bcae177fb8dc4820c3cd1b1c5ceab5820c47cc7a33573c8b0d391e7ad726f57ee8450dc1b0f33f9dcff8354a9d7e1fe
diff --git a/net-irc/kvirc/files/kvirc-5.2_pre20210630233331-fixqprocess.patch b/net-irc/kvirc/files/kvirc-5.2_pre20210630233331-fixqprocess.patch
new file mode 100644
index 000000000000..2127dcc3f1ce
--- /dev/null
+++ b/net-irc/kvirc/files/kvirc-5.2_pre20210630233331-fixqprocess.patch
@@ -0,0 +1,29 @@
+commit b4405b0c3dbd00c31d20597360249966bfd627c9
+Author: Alexey Sokolov <sokolov@google.com>
+Date:   Sat May 27 12:46:34 2023 +0100
+
+    Fix includes, QProcess is used not only without KDE
+    
+    https://bugs.gentoo.org/906940
+
+diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
+index 2abab2c10..842d3fa3f 100644
+--- a/src/modules/system/libkvisystem.cpp
++++ b/src/modules/system/libkvisystem.cpp
+@@ -50,12 +50,13 @@
+ #endif
+ 
+ #ifdef COMPILE_KDE_SUPPORT
+-#include <KToolInvocation> // invokeTerminal() for system.runcmd
+-#else                      // tools we need to work around the absence of
++// invokeTerminal() for system.runcmd
++// tools we need to work around the absence of
++#include <KToolInvocation>
++#endif
+ // invokeTerminal()
+ #include <QProcess>
+ #include <QStringList>
+-#endif
+ 
+ PluginManager * g_pPluginManager;
+ 
diff --git a/net-irc/kvirc/kvirc-5.2_pre20210630233331-r1.ebuild b/net-irc/kvirc/kvirc-5.2_pre20210630233331-r1.ebuild
deleted file mode 100644
index cf1b5bccf2fc..000000000000
--- a/net-irc/kvirc/kvirc-5.2_pre20210630233331-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 2009-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_10 )
-
-inherit cmake flag-o-matic python-single-r1 xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
-	KVIRC_GIT_REVISION=""
-	KVIRC_GIT_SOURCES_DATE=""
-else
-	KVIRC_GIT_REVISION="d86b79f657bb7388d7ec1d3e0d91e7c4221c2394"
-	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
-	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
-fi
-
-DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
-IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="dev-lang/perl:0
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )"
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:0=
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc-video? ( dev-qt/qtmultimedia:5[widgets] )
-	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
-	)
-	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:0= )
-	ssl? ( dev-libs/openssl:0= )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)"
-RDEPEND="${DEPEND}
-	gsm? ( media-sound/gsm )"
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
-fi
-
-DOCS=()
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ "${PV}" == "9999" ]]; then
-		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
-	fi
-	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
-	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
-		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		-DWANT_ENV_FLAGS=ON
-		-DWANT_VERBOSE=ON
-
-		-DWANT_CRYPT=ON
-		-DWANT_DCC_VOICE=ON
-		-DWANT_IPC=ON
-		-DWANT_IPV6=ON
-		-DWANT_TRANSPARENCY=ON
-
-		-DWANT_AUDIOFILE=$(usex audiofile ON OFF)
-		-DWANT_DCC_VIDEO=$(usex dcc-video ON OFF)
-		-DWANT_DEBUG=$(usex debug ON OFF)
-		-DWANT_DOXYGEN=$(usex doc ON OFF)
-		-DWANT_GETTEXT=$(usex nls ON OFF)
-		-DWANT_GSM=$(usex gsm ON OFF)
-		-DWANT_KDE=$(usex kde ON OFF)
-		-DWANT_MEMORY_PROFILE=$(usex profile ON OFF)
-		-DWANT_OGG_THEORA=$(usex theora ON OFF)
-		-DWANT_OPENSSL=$(usex ssl ON OFF)
-		-DWANT_OSS=$(usex oss ON OFF)
-		-DWANT_PERL=$(usex perl ON OFF)
-		-DWANT_PHONON=$(usex phonon ON OFF)
-		-DWANT_PYTHON=$(usex python ON OFF)
-		-DWANT_QTDBUS=$(usex dbus ON OFF)
-		-DWANT_QTWEBKIT=OFF
-		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
-
-		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=OFF
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DPython3_INCLUDE_DIR="$(python_get_includedir)"
-			-DPython3_LIBRARY="$(python_get_library_path)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		cmake_src_compile devdocs
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		(
-			docinto html
-			dodoc -r "${BUILD_DIR}/doc/api/html/"*
-		)
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-irc/kvirc/kvirc-5.2_pre20220629000000.ebuild b/net-irc/kvirc/kvirc-5.2_pre20220629000000.ebuild
index a7cba86601de..dea8494803e0 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20220629000000.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20220629000000.ebuild
@@ -80,6 +80,10 @@ fi
 
 DOCS=()
 
+PATCHES=(
+	"${FILESDIR}/kvirc-5.2_pre20210630233331-fixqprocess.patch"
+)
+
 pkg_setup() {
 	if use python; then
 		python-single-r1_pkg_setup