From de7755366ace3c99a5618882b6eb86b49b5109de Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 8 Sep 2022 16:36:17 +0200 Subject: net-im/qtox: Prepare for dev-qt/qtgui losing IUSE gif Signed-off-by: Andreas Sturmlechner --- net-im/qtox/qtox-1.17.6-r1.ebuild | 91 +++++++++++++++++++++++++++++++++++++++ net-im/qtox/qtox-1.17.6.ebuild | 91 --------------------------------------- net-im/qtox/qtox-9999.ebuild | 2 +- 3 files changed, 92 insertions(+), 92 deletions(-) create mode 100644 net-im/qtox/qtox-1.17.6-r1.ebuild delete mode 100644 net-im/qtox/qtox-1.17.6.ebuild (limited to 'net-im') diff --git a/net-im/qtox/qtox-1.17.6-r1.ebuild b/net-im/qtox/qtox-1.17.6-r1.ebuild new file mode 100644 index 000000000000..ef4155852191 --- /dev/null +++ b/net-im/qtox/qtox-1.17.6-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/qTox/qTox.git" +else + MY_P="qTox-${PV}" + SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="amd64 ~x86" + S="${WORKDIR}/qTox" +fi + +DESCRIPTION="Instant messaging client using the encrypted p2p Tox protocol" +HOMEPAGE="https://qtox.github.io/" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="notification +spellcheck test X" + +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +RDEPEND=" + dev-db/sqlcipher + dev-libs/libsodium:= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5[gif(+),jpeg,png,X(-)] + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-gfx/qrencode:= + media-libs/libexif + media-libs/openal + media-video/ffmpeg:=[webp,v4l] + >=net-libs/tox-0.2.13:=[av] + notification? ( x11-libs/snorenotify ) + spellcheck? ( kde-frameworks/sonnet:5 ) + X? ( + x11-libs/libX11 + x11-libs/libXScrnSaver + ) +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) + X? ( x11-base/xorg-proto ) +" + +DOCS=( CHANGELOG.md README.md doc/user_manual_en.md ) + +src_prepare() { + cmake_src_prepare + + # bug 628574 + if ! use test; then + sed -i CMakeLists.txt -e "/include(Testing)/d" || die + sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die + fi +} + +src_configure() { + local mycmakeargs=( + -DPLATFORM_EXTENSIONS=$(usex X) + -DUPDATE_CHECK=OFF + -DUSE_CCACHE=OFF + -DSPELL_CHECK=$(usex spellcheck) + -DSVGZ_ICON=ON + -DASAN=OFF + -DDESKTOP_NOTIFICATIONS=$(usex notification) + -DSTRICT_OPTIONS=OFF + ) + + [[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_DESCRIBE=${PV} ) + + cmake_src_configure +} + +src_test() { + # The excluded tests require network access. + cmake_src_test -E "test_(bsu|core)" +} diff --git a/net-im/qtox/qtox-1.17.6.ebuild b/net-im/qtox/qtox-1.17.6.ebuild deleted file mode 100644 index a2a84d3ec982..000000000000 --- a/net-im/qtox/qtox-1.17.6.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/qTox/qTox.git" -else - MY_P="qTox-${PV}" - SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="amd64 ~x86" - S="${WORKDIR}/qTox" -fi - -DESCRIPTION="Instant messaging client using the encrypted p2p Tox protocol" -HOMEPAGE="https://qtox.github.io/" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="notification +spellcheck test X" - -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - dev-db/sqlcipher - dev-libs/libsodium:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[gif,jpeg,png,X(-)] - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-gfx/qrencode:= - media-libs/libexif - media-libs/openal - media-video/ffmpeg:=[webp,v4l] - >=net-libs/tox-0.2.13:=[av] - notification? ( x11-libs/snorenotify ) - spellcheck? ( kde-frameworks/sonnet:5 ) - X? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) - X? ( x11-base/xorg-proto ) -" - -DOCS=( CHANGELOG.md README.md doc/user_manual_en.md ) - -src_prepare() { - cmake_src_prepare - - # bug 628574 - if ! use test; then - sed -i CMakeLists.txt -e "/include(Testing)/d" || die - sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/d" || die - fi -} - -src_configure() { - local mycmakeargs=( - -DPLATFORM_EXTENSIONS=$(usex X) - -DUPDATE_CHECK=OFF - -DUSE_CCACHE=OFF - -DSPELL_CHECK=$(usex spellcheck) - -DSVGZ_ICON=ON - -DASAN=OFF - -DDESKTOP_NOTIFICATIONS=$(usex notification) - -DSTRICT_OPTIONS=OFF - ) - - [[ ${PV} != 9999 ]] && mycmakeargs+=( -DGIT_DESCRIBE=${PV} ) - - cmake_src_configure -} - -src_test() { - # The excluded tests require network access. - cmake_src_test -E "test_(bsu|core)" -} diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild index f9ff34f329b6..fe8a64494ea3 100644 --- a/net-im/qtox/qtox-9999.ebuild +++ b/net-im/qtox/qtox-9999.ebuild @@ -33,7 +33,7 @@ RDEPEND=" dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 - dev-qt/qtgui:5[gif,jpeg,png,X(-)] + dev-qt/qtgui:5[gif(+),jpeg,png,X(-)] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 -- cgit v1.2.3-65-gdbad