From 032a3dbb5d4ea63ec6c2ceb39c067ea6424b5792 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 20 Jan 2020 19:28:42 +0000 Subject: gentoo resync : 20.01.2020 --- net-im/qtox/Manifest | 4 +-- net-im/qtox/qtox-1.16.3-r1.ebuild | 76 +++++++++++++++++++++++++++++++++++++++ net-im/qtox/qtox-1.16.3.ebuild | 73 ------------------------------------- net-im/qtox/qtox-9999.ebuild | 7 ++-- 4 files changed, 83 insertions(+), 77 deletions(-) create mode 100644 net-im/qtox/qtox-1.16.3-r1.ebuild delete mode 100644 net-im/qtox/qtox-1.16.3.ebuild (limited to 'net-im/qtox') diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest index 70cfeddb3efe..7e5335fa8d30 100644 --- a/net-im/qtox/Manifest +++ b/net-im/qtox/Manifest @@ -1,5 +1,5 @@ AUX qtox-1.16.3-qt-5.13.patch 672 BLAKE2B 49bde1355f9042dcb60dde2863435bf32110d87d4954191425a50e67ff3ae2ea4b226a16639137a31267d5a97568b45249d1fbb22d2c2d21c5d5db64059322e9 SHA512 eb716cbd6b33c9a07f197a11dce31d875d32a1dfeb499bf2445e77b508cfb3a658a3e9ad1e6724b942e730a67d3784fe250682e151c87d93b83aa4ae0320cda1 DIST qTox-1.16.3.tar.gz 4256757 BLAKE2B 70103e2d912da86dab63424586c642a73614b4a408a53634b146d1e401d5b328a2b8c81c472a94e0e8804d774f693c1250e7263b263e80abef5e111372f29232 SHA512 a857266ffcf32b1963e3a4428501299ce19f3c087087583115dc01e41934fc31d52ea54d781fa93ec7e21f6e3303b4e22383ecaaa7f1f1dbf32d740db73aca4c -EBUILD qtox-1.16.3.ebuild 1515 BLAKE2B 3b4cee9033283fd157334e1105006a489dd5376790da8c989ea3f72908ae37c5da561228f62e249fced224f9c3f425b368a3c43046b81939d03d071b3e2eeaf8 SHA512 068f52867d5ea7d0dc12cf69c08e3f589da3a551ad386c9f8482ec8245e7ba6719f6834e2e251b2b778f57430ab763ff8eb80f8518e1de6375a4ea5287a64026 -EBUILD qtox-9999.ebuild 1354 BLAKE2B da1cd9849a2effe1fa860607adeebc6f30b962a24ddae0840e19f58e66af9660f3296eb3e29b0cca4e169c991a3956f55a94c98c0bfa1263a9b990978c1590c0 SHA512 10c8e794d2ee446552f0a0c8a3e9171cdc4b214dba5b13f4e3f6396a99f252075b778b0f55e8860252c49addcd47314bff916a184db180d14d1bdad8a1c6d43b +EBUILD qtox-1.16.3-r1.ebuild 1564 BLAKE2B 03facbc9f537853e2d2d9c265835630ae74a83574c7e76acfeed51ba9d22ce16edfbfc4cb5c1b5ed9d70a14401e78b5e0104341c4bd46a5c2583151cc90d6227 SHA512 5f6d88631c0d46c0c2484512b5ec768e15d41f804e260e524b58b40a85f195f2d26970cb25afc5c95d41c00152d1816b059a90101402b008c7cad080b8faa5bf +EBUILD qtox-9999.ebuild 1403 BLAKE2B 9042194f22e893186a212b47be588ffcde8cd1925126a6fd81f4906e3ff576162f5fbe9400013d781e51295d04139a1f513f2243b3c679c3bdf5ff7bfa66efe6 SHA512 5f7efa140c41dc4a4e8431361744e54820e290b17ba38037c3635824dd0f59b36718e8ad070f95da3fe6a96fe037d54824b9f06f5a84254da845060ee7c339cd MISC metadata.xml 387 BLAKE2B 16f71b094c5fcef1b3c0b3b7bb6bc962c9d7b332604d0c0d30676992b8ed0586b47d9b51470e41b5cd6c305895072661f8d7939ab90b780c28af460a80f660a5 SHA512 d941cb804aaf0f9d03fa699b0080b03afba798c5146ba21597349e65dc79c9c6a02fc23aec2db19403a19d906db3be55c56e5b8f4337a6871eb19ce3cecfe5cb diff --git a/net-im/qtox/qtox-1.16.3-r1.ebuild b/net-im/qtox/qtox-1.16.3-r1.ebuild new file mode 100644 index 000000000000..d29e70e3f7b1 --- /dev/null +++ b/net-im/qtox/qtox-1.16.3-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="qTox-${PV}" +inherit cmake xdg + +DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5" +HOMEPAGE="https://github.com/qTox/qTox" +SRC_URI="https://github.com/qTox/qTox/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="notification test X" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MY_P}" + +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/qtgui:5[gif,jpeg,png,xcb(-)] + ) + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtsql: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-2.6.3:=[webp,v4l] + net-libs/tox:0/0.2[av] + notification? ( x11-libs/gtk+:2 ) + X? ( x11-libs/libX11 + x11-libs/libXScrnSaver ) +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) +" + +PATCHES=( "${FILESDIR}/${P}-qt-5.13.patch" ) # bug #699152 + +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=( + -DENABLE_STATUSNOTIFIER=$(usex notification) + -DENABLE_GTK_SYSTRAY=$(usex notification) + -DPLATFORM_EXTENSIONS=$(usex X) + -DUSE_FILTERAUDIO=OFF + -DGIT_DESCRIBE="${PV}" + ) + + cmake_src_configure +} diff --git a/net-im/qtox/qtox-1.16.3.ebuild b/net-im/qtox/qtox-1.16.3.ebuild deleted file mode 100644 index 57aabd1c8f03..000000000000 --- a/net-im/qtox/qtox-1.16.3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="qTox-${PV}" -inherit cmake xdg - -DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5" -HOMEPAGE="https://github.com/qTox/qTox" -SRC_URI="https://github.com/qTox/qTox/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="notification test X" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_P}" - -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,xcb] - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtsql: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-2.6.3:=[webp,v4l] - net-libs/tox:0/0.2[av] - notification? ( x11-libs/gtk+:2 ) - X? ( x11-libs/libX11 - x11-libs/libXScrnSaver ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -PATCHES=( "${FILESDIR}/${P}-qt-5.13.patch" ) # bug #699152 - -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=( - -DENABLE_STATUSNOTIFIER=$(usex notification) - -DENABLE_GTK_SYSTRAY=$(usex notification) - -DPLATFORM_EXTENSIONS=$(usex X) - -DUSE_FILTERAUDIO=OFF - -DGIT_DESCRIBE="${PV}" - ) - - cmake_src_configure -} diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild index c2f80f279d6f..8e6526263d3a 100644 --- a/net-im/qtox/qtox-9999.ebuild +++ b/net-im/qtox/qtox-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,7 +25,10 @@ RDEPEND=" dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 - dev-qt/qtgui:5[gif,jpeg,png,xcb] + || ( + dev-qt/qtgui:5[gif,jpeg,png,X(-)] + dev-qt/qtgui:5[gif,jpeg,png,xcb(-)] + ) dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 -- cgit v1.2.3