summaryrefslogtreecommitdiff
path: root/net-irc/kvirc
diff options
context:
space:
mode:
Diffstat (limited to 'net-irc/kvirc')
-rw-r--r--net-irc/kvirc/Manifest9
-rw-r--r--net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch53
-rw-r--r--net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild174
-rw-r--r--net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild (renamed from net-irc/kvirc/kvirc-5.2_pre20191202122540.ebuild)38
-rw-r--r--net-irc/kvirc/kvirc-9999.ebuild7
5 files changed, 31 insertions, 250 deletions
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 61b10f369cb2..4bc285a9a479 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,7 +1,4 @@
-AUX kvirc-5.2_pre20190628041642-python-3.patch 2036 BLAKE2B 71de965fcd6d3ff6ec74c52662d894b60ff15d7b9dd895f18a6c31d4404291c227ae0f15362b0eebd86c377adce5ebd1a6a65975c40d2a391c928748dcb144d1 SHA512 3dcdf021f9c78df31031f25a86dea332996d489e482ba3da867856f262fd001c7858da51f5cb9dc0a3c208674a60105e484c3426d73816c61f0fbdca0a88b3cb
-DIST kvirc-5.2_pre20190628041642.tar.gz 5967194 BLAKE2B b1a2e2775056e2db058f82656ac90e43828d497019e9c6ae0431a1092423425558c6eb91a3a8301616cc4cdc7ef1acbab3729702484d703e00dc8e09f7cf243f SHA512 5f532739d9837f357a36fa1df67db0fbf8d8eddb990e686224e53c5678d26ba18c6c7c60422cef4e08ee587156638b278f534b1be1d49251fdeea19858227a5f
-DIST kvirc-5.2_pre20191202122540.tar.gz 5967654 BLAKE2B 059e57f0b8a789388f351c536dc3b57a7fc119cc78206a6a42266a1296e1edc6410ab9f564959d77aabb98ca55c9d4ec63505b4c1d46ad27a7f0f2ee748eae55 SHA512 2e3b7683070446a80642ef07abbc69912e47af59966cbc95698f5b8b1a1726b85ae78890dcc85d3f546f32b3c5f2a6c64ec4049467c6b336798ad91542d48c42
-EBUILD kvirc-5.2_pre20190628041642.ebuild 4318 BLAKE2B dc65b96a97b9e8c8fed70e6b740d51d2e2e3d186ecb584b0d310994ea4f5b471414bbb765ed16ecf74479d3c3d6ad4c5c0cb00748c0a4dc5d49f3f66eda0723c SHA512 4cb5fd86446d65335a1f1882b6576c348da53e191fa61095f8aa96bd2ca9227bacbb7314a8905a807a14263f47cd282e19877864fa52c5d7f90d9560f177f6ae
-EBUILD kvirc-5.2_pre20191202122540.ebuild 4325 BLAKE2B 7af23814810c6863700412b5307c4e6df818fd09ef859365ba1d8eae2172d896c408f4bcdbbfdca0e03c46c9445ea8154fe81877a17280a2ec042da6beaa5ce1 SHA512 b3dcb64f67dd31d4bdb80070c0de988c29855298e866c1d4c4e20752380b86440ff1d6e7fc451d2806cf75c9e0f31805d97152972046afb5c610b23f0c4667b0
-EBUILD kvirc-9999.ebuild 4403 BLAKE2B 1568a27b1fbef54ebae71cb8d4829e8bb5d49cc7275f4ae5abe4621fdd3e4fe8ca7665a8cf25dcda854449a2515fc8ab4cfa9b120370542256d3ab0c89da9f3f SHA512 632e450166c175f25c905790d643488b62f65da5298473877099b40b82e11f651bd944b0d0c2f45d637e26bb7b62f4ba8d15d43574084704ea7e23284f80323a
+DIST kvirc-5.2_pre20200605155236.tar.gz 6170072 BLAKE2B 2652bcae16263615ccbf494d8265a1ecf997525dbfa70d4ace0c3f6ae58231ce575dfe444a60e2751bb7741445bf44297fafb260c05bad6d637f8dc89eb254b4 SHA512 84499fe13337f114587ff267d5e85e39ef61d99e88c84cfc9f0341a5db2e17b50d644bf8483de420c3629f073d6e3eeb81e25de357a723f54e39f154cb4b7da1
+EBUILD kvirc-5.2_pre20200605155236.ebuild 4528 BLAKE2B 874a2c26cc792f36ccb6eb35d5dd8fd9fbd93e67540242ca4b378179327bfe6a3e3a7a6db077589148ddbb0911746b3a3a503899211abedfff7c5198d5357a02 SHA512 51ffa855b9e97f4824f216c2ce3ecc119a189a146b9bda5e9aa364f72227b91a1c0ce13f742eba42ec4ee59800527719b09059495d9b26e96e3a127dae09b721
+EBUILD kvirc-9999.ebuild 4467 BLAKE2B 981e92e8fe2d3395d7c1f147859408de5de19bb7ed1457594cd4aab1eea32c02dd72808fb06762de8798f03fbce8f1b982af84c97bc50ee81ed24a56f47594e7 SHA512 6f30e5285cba65fd3ce42f4f931b78e0f4367274b7960079ca43ede98e4ac990c2d97069ff4108ed6f6946f2c08f53245fec078a3513ae7bb1c1a152a86c8f9b
MISC metadata.xml 643 BLAKE2B 820a98f07a4cfb58e857d5c7b863ed7adc174497a7ea05e66245a2c40c328ee0bdb644b98ba1d923834ccf05f23f8128abfe462d433fe2136078225b152a633f SHA512 3dd50caac7ff50679cabad216d4ec28b60351febc419f5d32f60b785043eba6f2f379c06e5af28af26355845ebcfe8439bca9d141bc3b9d0401fb0ee0a0c704c
diff --git a/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch b/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch
deleted file mode 100644
index 14e9e6f795c7..000000000000
--- a/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/kvirc/KVIrc/pull/2269
-
---- /CMakeLists.txt
-+++ /CMakeLists.txt
-@@ -67,9 +67,6 @@
- set(CMAKE_KVIRC_BUILD_COMPILER ${CMAKE_CXX_COMPILER})
- set(CMAKE_KVIRC_BUILD_COMPILER_FLAGS ${CMAKE_CXX_FLAGS})
-
--# Prefer Python 2.7 over 3.x (which is currently incompatible) - GitHub issue #2020
--set(Python_ADDITIONAL_VERSIONS "2.7")
--
- # Suffix for GNU/Linux
- set(LIB_SUFFIX
- CACHE STRING "Define suffix of directory name (32/64)"
-@@ -751,10 +748,10 @@
- # Check for Python support
- option(WANT_PYTHON "Compile Python support" ON)
- if(WANT_PYTHON)
-- find_package(PythonLibs 2.7)
-+ find_package(PythonLibs)
- if(PYTHONLIBS_FOUND)
- set(COMPILE_PYTHON_SUPPORT 1)
-- set(CMAKE_STATUS_PYTHON_SUPPORT "Yes")
-+ set(CMAKE_STATUS_PYTHON_SUPPORT "Yes, Python ${PYTHONLIBS_VERSION_STRING}")
- list(APPEND LIBS ${PYTHON_LIBRARIES})
- include_directories(${PYTHON_INCLUDE_DIRS})
- else()
---- /src/modules/pythoncore/kvircmodule.cpp
-+++ /src/modules/pythoncore/kvircmodule.cpp
-@@ -413,7 +413,7 @@
- else
- {
- // Create a CObject containing the API pointer array's address
-- PyObject * pC_API_Object = PyCObject_FromVoidPtr(PyKVIrc_API, nullptr);
-+ PyObject * pC_API_Object = PyCapsule_New((void *)PyKVIrc_API, "kvirc._C_API", nullptr);
- if(pC_API_Object)
- PyModule_AddObject(pModule, "_C_API", pC_API_Object);
- }
---- /src/modules/pythoncore/pythonheaderwrapper.h
-+++ /src/modules/pythoncore/pythonheaderwrapper.h
-@@ -1,6 +1,12 @@
- #ifndef _PYTHONHEADERWRAPPER_H_
- #define _PYTHONHEADERWRAPPER_H_
-
-+// As of Python 3, something inside <Python.h> defines a struct with a member
-+// called "slots" which conflicts with the builtin Qt keyword. But since we
-+// include stuff from KVIrc itself back into the python module, we can't just
-+// use QT_NO_KEYWORDS.
-+#undef slots
-+
- // See http://stackoverflow.com/questions/16200997/why-doesnt-include-python-h-work and http://stackoverflow.com/questions/19716859/puzzling-dependency-of-boost-python-1-54-debug-build-to-python27-lib-on-window
-
- #if defined(_DEBUG) && defined(_MSC_VER)
diff --git a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild b/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
deleted file mode 100644
index 43699ea71e58..000000000000
--- a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{3_6,3_7})
-
-inherit cmake-utils 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="2fe1a3bcac42349967e27b3f7098c25f34efca1d"
- 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 x86"
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
-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
- )
- webkit? ( dev-qt/qtwebkit:5 )"
-RDEPEND="${DEPEND}
- gsm? ( media-sound/gsm )"
-
-if [[ "${PV}" != "9999" ]]; then
- S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
-fi
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch"
-)
-
-DOCS=()
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- cmake-utils_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=$(usex webkit ON OFF)
- -DWANT_SPELLCHECKER=$(usex spell ON OFF)
-
- # COMPILE_SVG_SUPPORT not used in source code.
- -DWANT_QTSVG=OFF
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use doc; then
- cmake-utils_src_compile devdocs
- fi
-}
-
-src_install() {
- cmake-utils_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_pre20191202122540.ebuild b/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild
index 5a3b79274188..50ee9d0c832f 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20191202122540.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2009-2019 Gentoo Authors
+# Copyright 2009-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
CMAKE_MAKEFILE_GENERATOR="emake"
PYTHON_COMPAT=(python{3_6,3_7,3_8})
-inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
+inherit cmake flag-o-matic python-single-r1 xdg-utils
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
@@ -14,7 +14,7 @@ if [[ "${PV}" == "9999" ]]; then
KVIRC_GIT_REVISION=""
KVIRC_GIT_SOURCES_DATE=""
else
- KVIRC_GIT_REVISION="0df9f22f2f4d013b91d5a8905cbd47c32e8fb9e5"
+ KVIRC_GIT_REVISION="e66a5106ef55a92e2532c38aa255ac376ba6afe1"
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
@@ -29,11 +29,12 @@ fi
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="audiofile +dbus dcc_video debug doc gsm kde libressl +nls oss +perl +phonon profile +python spell +ssl theora webkit"
REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
BDEPEND="dev-lang/perl:0
+ >=dev-util/cmake-3.16
virtual/pkgconfig
doc? ( app-doc/doxygen )
kde? ( kde-frameworks/extra-cmake-modules:5 )
@@ -65,7 +66,10 @@ DEPEND="dev-qt/qtcore:5
phonon? ( media-libs/phonon[qt5(+)] )
python? ( ${PYTHON_DEPS} )
spell? ( app-text/enchant:0= )
- ssl? ( dev-libs/openssl:0= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
theora? (
media-libs/libogg
media-libs/libtheora
@@ -79,10 +83,6 @@ if [[ "${PV}" != "9999" ]]; then
S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
fi
-PATCHES=(
- "${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch"
-)
-
DOCS=()
pkg_setup() {
@@ -92,7 +92,7 @@ pkg_setup() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
if [[ "${PV}" == "9999" ]]; then
KVIRC_GIT_REVISION="$(git show -s --format=%H)"
@@ -140,20 +140,28 @@ src_configure() {
# COMPILE_SVG_SUPPORT not used in source code.
-DWANT_QTSVG=OFF
)
+ if use python; then
+ local PYTHON_INCLUDEDIR PYTHON_LIBPATH
+ python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
+ mycmakeargs+=(
+ -DPython3_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
+ -DPython3_LIBRARY="${PYTHON_LIBPATH}"
+ )
+ fi
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
- cmake-utils_src_compile
+ cmake_src_compile
if use doc; then
- cmake-utils_src_compile devdocs
+ cmake_src_compile devdocs
fi
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
if use doc; then
(
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 8be4b3e7e2e9..c7a673bfd4ad 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -30,7 +30,7 @@ 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 webkit"
+IUSE="audiofile +dbus dcc_video debug doc gsm kde libressl +nls oss +perl +phonon profile +python spell +ssl theora webkit"
REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
BDEPEND="dev-lang/perl:0
@@ -66,7 +66,10 @@ DEPEND="dev-qt/qtcore:5
phonon? ( media-libs/phonon[qt5(+)] )
python? ( ${PYTHON_DEPS} )
spell? ( app-text/enchant:0= )
- ssl? ( dev-libs/openssl:0= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
theora? (
media-libs/libogg
media-libs/libtheora
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 16:44:09 +0000