commit: b9e9604f46b5a0a3410a5572da8b8c5c7fcf0ce6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 20:33:12 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 19 23:51:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e9604f
net-im/qtox: Prepare for dev-qt/qtgui[xcb -> X]
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qtox/{qtox-9999.ebuild => qtox-1.16.3-r1.ebuild} | 19 ++++++++++++++-----
net-im/qtox/qtox-9999.ebuild | 7 +++++--
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-1.16.3-r1.ebuild
similarity index 76%
copy from net-im/qtox/qtox-9999.ebuild
copy to net-im/qtox/qtox-1.16.3-r1.ebuild
index c2f80f279d6..d29e70e3f7b 100644
--- a/net-im/qtox/qtox-9999.ebuild
+++ b/net-im/qtox/qtox-1.16.3-r1.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake git-r3 xdg
+MY_P="qTox-${PV}"
+inherit cmake xdg
DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5"
HOMEPAGE="https://github.com/qTox/qTox";
-EGIT_REPO_URI="https://github.com/qTox/qTox.git";
+SRC_URI="https://github.com/qTox/qTox/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="notification test X"
RESTRICT="!test? ( test )"
+S="${WORKDIR}/${MY_P}"
+
BDEPEND="
dev-qt/linguist-tools:5
virtual/pkgconfig
@@ -25,7 +28,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
@@ -45,6 +51,8 @@ DEPEND="${RDEPEND}
test? ( dev-qt/qttest:5 )
"
+PATCHES=( "${FILESDIR}/${P}-qt-5.13.patch" ) # bug #699152
+
src_prepare() {
cmake_src_prepare
@@ -61,6 +69,7 @@ src_configure() {
-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 c2f80f279d6..8e6526263d3 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
