From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E35D0138350 for ; Sun, 19 Jan 2020 23:53:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69872E09C2; Sun, 19 Jan 2020 23:53:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 993B2E09C8 for ; Sun, 19 Jan 2020 23:53:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5664A34E2AD for ; Sun, 19 Jan 2020 23:53:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F07D5E3 for ; Sun, 19 Jan 2020 23:53:29 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1579477889.b9e9604f46b5a0a3410a5572da8b8c5c7fcf0ce6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/qtox/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/qtox/qtox-1.16.3-r1.ebuild net-im/qtox/qtox-9999.ebuild X-VCS-Directories: net-im/qtox/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b9e9604f46b5a0a3410a5572da8b8c5c7fcf0ce6 X-VCS-Branch: master Date: Sun, 19 Jan 2020 23:53:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6f6df11d-aae7-4a15-a83f-8f1119460a79 X-Archives-Hash: 69308f6c76499adb89c7b9a9685a17ae commit: b9e9604f46b5a0a3410a5572da8b8c5c7fcf0ce6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 15 20:33:12 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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