[gentoo-commits] repo/gentoo:master commit in: net-irc/kvirc/

["Sam James" <sam@gentoo.org>]

commit:     09eb43291b369864d996bd385efa8378f12d926d
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sun Jan 14 16:43:07 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 13:30:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09eb4329

net-irc/kvirc: add 5.2.0

Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/34802
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-irc/kvirc/Manifest                             |  1 +
 .../{kvirc-9999.ebuild => kvirc-5.2.0.ebuild}      | 84 +++++++++-------------
 net-irc/kvirc/kvirc-9999.ebuild                    | 84 +++++++++-------------
 3 files changed, 67 insertions(+), 102 deletions(-)

diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index fced4974c249..52ec1fb1df4c 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1 +1,2 @@
+DIST kvirc-5.2.0.tar.gz 6365703 BLAKE2B fda63b6579b9d8d75eae5c2b039f474f4a810c79c74d98da0adebc4bec51c19286a9fb4a219dafefdf4132709394e946dd5aa30d1335ce1af4cbffd60764578d SHA512 01a183ae283b774dc096ec4bf81509ad79acf10fb3c82e06f66b7360736d32c1514856849ef562e2fc2b4ef3019e0842d17de8a762c7858dbac34f85de125079
 DIST kvirc-5.2_pre20220629000000.tar.gz 6173590 BLAKE2B b4bfdc307df81a485acb72b33908f82bad0793139543abed03a1b84cae36cba4e11a6b8098cffc9669cb0a7c9072fd6a608589ce03a228b25dfd00b8d7d94b82 SHA512 4369f3703555c8717febfd32c06f6fd8576424cb3a92f9d9e24a5af93acf69ca8707d89a27804457327fd6c30601566d7874c0fc08e12018a3f5440ea988a69e

diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-5.2.0.ebuild
similarity index 58%
copy from net-irc/kvirc/kvirc-9999.ebuild
copy to net-irc/kvirc/kvirc-5.2.0.ebuild
index f13cb8327de4..aff1e010cbc6 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-5.2.0.ebuild
@@ -2,34 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
+DESCRIPTION="Advanced IRC Client"
+HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc"
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake flag-o-matic python-single-r1 xdg-utils
+inherit cmake flag-o-matic python-single-r1 xdg
 
 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=""
-	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"
+	SRC_URI="https://github.com/kvirc/KVIrc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/KVIrc-${PV}"
 fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS=""
 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} )"
 
@@ -74,10 +64,6 @@ DEPEND="dev-qt/qtcore:5
 RDEPEND="${DEPEND}
 	gsm? ( media-sound/gsm )"
 
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
-fi
-
 DOCS=()
 
 pkg_setup() {
@@ -92,9 +78,10 @@ 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)"
+		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"
 	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() {
@@ -103,8 +90,6 @@ src_configure() {
 	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
 
@@ -114,23 +99,24 @@ src_configure() {
 		-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_AUDIOFILE=$(usex audiofile)
+		-DWANT_DCC_VIDEO=$(usex dcc-video)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_DOXYGEN=$(usex doc)
+		-DWANT_GETTEXT=$(usex nls)
+		-DWANT_GSM=$(usex gsm)
+		-DWANT_KDE=$(usex kde)
+		-DWANT_MEMORY_PROFILE=$(usex profile)
+		-DWANT_OGG_THEORA=$(usex theora)
+		-DWANT_OPENSSL=$(usex ssl)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PERL=$(usex perl)
+		-DWANT_PHONON=$(usex phonon)
+		-DWANT_PYTHON=$(usex python)
+		-DWANT_QTDBUS=$(usex dbus)
 		-DWANT_QTWEBKIT=OFF
-		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
+		-DWANT_SPELLCHECKER=$(usex spell)
+		-DQT_VERSION_MAJOR=5
 
 		# COMPILE_SVG_SUPPORT not used in source code.
 		-DWANT_QTSVG=OFF
@@ -141,6 +127,12 @@ src_configure() {
 			-DPython3_LIBRARY="$(python_get_library_path)"
 		)
 	fi
+	if [[ "${PV}" == "9999" ]]; then
+		mycmakeargs+=(
+			-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
+			-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
+		)
+	fi
 
 	cmake_src_configure
 }
@@ -163,13 +155,3 @@ src_install() {
 		)
 	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-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index f13cb8327de4..aff1e010cbc6 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -2,34 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
+DESCRIPTION="Advanced IRC Client"
+HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc"
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake flag-o-matic python-single-r1 xdg-utils
+inherit cmake flag-o-matic python-single-r1 xdg
 
 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=""
-	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"
+	SRC_URI="https://github.com/kvirc/KVIrc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/KVIrc-${PV}"
 fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS=""
 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} )"
 
@@ -74,10 +64,6 @@ DEPEND="dev-qt/qtcore:5
 RDEPEND="${DEPEND}
 	gsm? ( media-sound/gsm )"
 
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
-fi
-
 DOCS=()
 
 pkg_setup() {
@@ -92,9 +78,10 @@ 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)"
+		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"
 	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() {
@@ -103,8 +90,6 @@ src_configure() {
 	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
 
@@ -114,23 +99,24 @@ src_configure() {
 		-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_AUDIOFILE=$(usex audiofile)
+		-DWANT_DCC_VIDEO=$(usex dcc-video)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_DOXYGEN=$(usex doc)
+		-DWANT_GETTEXT=$(usex nls)
+		-DWANT_GSM=$(usex gsm)
+		-DWANT_KDE=$(usex kde)
+		-DWANT_MEMORY_PROFILE=$(usex profile)
+		-DWANT_OGG_THEORA=$(usex theora)
+		-DWANT_OPENSSL=$(usex ssl)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PERL=$(usex perl)
+		-DWANT_PHONON=$(usex phonon)
+		-DWANT_PYTHON=$(usex python)
+		-DWANT_QTDBUS=$(usex dbus)
 		-DWANT_QTWEBKIT=OFF
-		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
+		-DWANT_SPELLCHECKER=$(usex spell)
+		-DQT_VERSION_MAJOR=5
 
 		# COMPILE_SVG_SUPPORT not used in source code.
 		-DWANT_QTSVG=OFF
@@ -141,6 +127,12 @@ src_configure() {
 			-DPython3_LIBRARY="$(python_get_library_path)"
 		)
 	fi
+	if [[ "${PV}" == "9999" ]]; then
+		mycmakeargs+=(
+			-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
+			-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
+		)
+	fi
 
 	cmake_src_configure
 }
@@ -163,13 +155,3 @@ src_install() {
 		)
 	fi
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}