From 05ee8049e2326946a2cd1720f98384c864f0a804 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Jan 2024 10:49:19 +0000 Subject: gentoo auto-resync : 22:01:2024 - 10:49:19 --- net-irc/kvirc/Manifest | 3 +- net-irc/kvirc/files/kvirc-5.2.0-qtver.patch | 25 +++++ net-irc/kvirc/kvirc-5.2.0-r1.ebuild | 161 ++++++++++++++++++++++++++++ net-irc/kvirc/kvirc-5.2.0.ebuild | 157 --------------------------- 4 files changed, 188 insertions(+), 158 deletions(-) create mode 100644 net-irc/kvirc/files/kvirc-5.2.0-qtver.patch create mode 100644 net-irc/kvirc/kvirc-5.2.0-r1.ebuild delete mode 100644 net-irc/kvirc/kvirc-5.2.0.ebuild (limited to 'net-irc/kvirc') diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest index 2fc06e47716e..b770f9baf188 100644 --- a/net-irc/kvirc/Manifest +++ b/net-irc/kvirc/Manifest @@ -1,7 +1,8 @@ +AUX kvirc-5.2.0-qtver.patch 911 BLAKE2B 23f3af68c8b87643d28cc7e377f6964190c354980d4a3e592c7b0149cf99d99bf3a28b55748d64d0c11533a1b0ee717d2f868b8ade84b39e7b8d0bb9cb9d9dcd SHA512 d5926370fb329ba101f1bd2672076349156f16aa0fc502421777f35c68b293694816219023a12890f91e9ca4827e8aeca6c8cfe2b9ed055eaeab6c9647207a72 AUX kvirc-5.2_pre20210630233331-fixqprocess.patch 869 BLAKE2B ccdec97ac8cd412c776146a56971f61bff66737a5a5590bb1508f05e64850211b9d0748999d347aaab8ade499d22ae6f9bfd8c4b9bced35de0dc0b2d7669734f SHA512 deb5252936bcb593fe1a11631fe4c03f26c28afaf1e88206a076d2f7754160620178362d0f00023a56f4eafa19d60c4d281cee88c20253ac6629033284719363 DIST kvirc-5.2.0.tar.gz 6365703 BLAKE2B fda63b6579b9d8d75eae5c2b039f474f4a810c79c74d98da0adebc4bec51c19286a9fb4a219dafefdf4132709394e946dd5aa30d1335ce1af4cbffd60764578d SHA512 01a183ae283b774dc096ec4bf81509ad79acf10fb3c82e06f66b7360736d32c1514856849ef562e2fc2b4ef3019e0842d17de8a762c7858dbac34f85de125079 DIST kvirc-5.2_pre20220629000000.tar.gz 6173590 BLAKE2B b4bfdc307df81a485acb72b33908f82bad0793139543abed03a1b84cae36cba4e11a6b8098cffc9669cb0a7c9072fd6a608589ce03a228b25dfd00b8d7d94b82 SHA512 4369f3703555c8717febfd32c06f6fd8576424cb3a92f9d9e24a5af93acf69ca8707d89a27804457327fd6c30601566d7874c0fc08e12018a3f5440ea988a69e -EBUILD kvirc-5.2.0.ebuild 3767 BLAKE2B 39f9728e01de43f7c67b3268cd33f17b36db8f66b2bfa02edb6dc820b4bbf601d682852ea6435b90977ce1cb1cb9199e2b452ee91dafc208a3607931927a825f SHA512 3869c2363ac8425f1b6c7462dbfb74f73f4d22be97cbb4efa48c1e2ac4e22dac8e0bd67107447fc2cf0e5c7a2b94345d393299ef4ee2837535f3cf9aeda55257 +EBUILD kvirc-5.2.0-r1.ebuild 3819 BLAKE2B dc16562e46df72225c3e9f4a621b9bdba4cbe622322386fb369a6d0c389b06b7f6fcf065a8490d7f47e5cd4f900f0b06326f171a85333625f8d161be02d57fbe SHA512 060e2f2852e4d3b2174739fa31175dadb73d9ac4e197e6f990a41869ce77ebed66f528da638210cf7fac5352f29ef19f9b1b1f845312d235dae2b1baa8c91390 EBUILD kvirc-5.2_pre20220629000000.ebuild 4387 BLAKE2B fa9b947311a24f05ea67e5361b6ddb9cfc75563653630fb6b042e3179c4e1d00aea2ecd7cdf385ffaf4dc45136a48594f890f3bc110d3cd231d4e165b30a39d1 SHA512 6f843c06033883080a374120b2f93317b5d2096b58031aa095deb8772f741b533ccfa60a9d90ce6ba23b4828ac3e55349ce4fc2484b3925cba4078615f5e2db7 EBUILD kvirc-9999.ebuild 3767 BLAKE2B 39f9728e01de43f7c67b3268cd33f17b36db8f66b2bfa02edb6dc820b4bbf601d682852ea6435b90977ce1cb1cb9199e2b452ee91dafc208a3607931927a825f SHA512 3869c2363ac8425f1b6c7462dbfb74f73f4d22be97cbb4efa48c1e2ac4e22dac8e0bd67107447fc2cf0e5c7a2b94345d393299ef4ee2837535f3cf9aeda55257 MISC metadata.xml 632 BLAKE2B 00e76e3f4dae2d7422da074a35e0bf2ed0d919be1a7c86e42779c809f9a31e87e6627d6eac03f8913ab40e094a8e5d284daa42d1140717083c73783342b0bea5 SHA512 a38097a282426fad3339a155ea4e8be00bcae177fb8dc4820c3cd1b1c5ceab5820c47cc7a33573c8b0d391e7ad726f57ee8450dc1b0f33f9dcff8354a9d7e1fe diff --git a/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch b/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch new file mode 100644 index 000000000000..9f3700ec9d9b --- /dev/null +++ b/net-irc/kvirc/files/kvirc-5.2.0-qtver.patch @@ -0,0 +1,25 @@ +From a301aa4998c4f0040d093cd2950b7b2f4ec4dcdc Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov +Date: Sun, 21 Jan 2024 21:07:37 +0000 +Subject: [PATCH] Fix ability to select Qt5 vs Qt6 + +https://bugs.gentoo.org/922636 +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aabc0988b..9368e81c9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -389,7 +389,9 @@ endif() + ############################################################################ + + # first check if Qt6 or Qt5 has to be used +-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) ++if(NOT DEFINED QT_VERSION_MAJOR) ++ find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) ++endif() + # second, detect available modules for the specific Qt version + find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets) + if(Qt${QT_VERSION_MAJOR}Widgets_FOUND) diff --git a/net-irc/kvirc/kvirc-5.2.0-r1.ebuild b/net-irc/kvirc/kvirc-5.2.0-r1.ebuild new file mode 100644 index 000000000000..9e0cd048be85 --- /dev/null +++ b/net-irc/kvirc/kvirc-5.2.0-r1.ebuild @@ -0,0 +1,161 @@ +# Copyright 2009-2024 Gentoo Authors +# 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..12} ) + +inherit cmake flag-o-matic python-single-r1 xdg + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/kvirc/KVIrc" +else + 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" +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-text/doxygen ) + kde? ( kde-frameworks/extra-cmake-modules:0 ) + 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:2 ) + ssl? ( dev-libs/openssl:0= ) + theora? ( + media-libs/libogg + media-libs/libtheora + media-libs/libvorbis + )" +RDEPEND="${DEPEND} + gsm? ( media-sound/gsm )" + +DOCS=() + +PATCHES=( + "${FILESDIR}/kvirc-5.2.0-qtver.patch" +) + +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)" + 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 +} + +src_configure() { + append-flags -fno-strict-aliasing + + local libdir="$(get_libdir)" + local mycmakeargs=( + -DLIB_SUFFIX=${libdir#lib} + -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) + -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) + -DQT_VERSION_MAJOR=5 + + # 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 + if [[ "${PV}" == "9999" ]]; then + mycmakeargs+=( + -DMANUAL_REVISION=${KVIRC_GIT_REVISION} + -DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/} + ) + 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 +} diff --git a/net-irc/kvirc/kvirc-5.2.0.ebuild b/net-irc/kvirc/kvirc-5.2.0.ebuild deleted file mode 100644 index aff1e010cbc6..000000000000 --- a/net-irc/kvirc/kvirc-5.2.0.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 2009-2024 Gentoo Authors -# 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..12} ) - -inherit cmake flag-o-matic python-single-r1 xdg - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kvirc/KVIrc" -else - 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" -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-text/doxygen ) - kde? ( kde-frameworks/extra-cmake-modules:0 ) - 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:2 ) - ssl? ( dev-libs/openssl:0= ) - theora? ( - media-libs/libogg - media-libs/libtheora - media-libs/libvorbis - )" -RDEPEND="${DEPEND} - gsm? ( media-sound/gsm )" - -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)" - 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 -} - -src_configure() { - append-flags -fno-strict-aliasing - - local libdir="$(get_libdir)" - local mycmakeargs=( - -DLIB_SUFFIX=${libdir#lib} - -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) - -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) - -DQT_VERSION_MAJOR=5 - - # 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 - if [[ "${PV}" == "9999" ]]; then - mycmakeargs+=( - -DMANUAL_REVISION=${KVIRC_GIT_REVISION} - -DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/} - ) - 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 -} -- cgit v1.2.3