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 89AF5138350 for ; Tue, 10 Mar 2020 20:45:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADEF3E0917; Tue, 10 Mar 2020 20:45:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 89D8AE0917 for ; Tue, 10 Mar 2020 20:45:06 +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 98DEB34F28C for ; Tue, 10 Mar 2020 20:45:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 673A0176 for ; Tue, 10 Mar 2020 20:45:02 +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: <1583873087.28bdaa99c48bce0ceb44d1052add81fa576b2dae.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/qxmpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/qxmpp/qxmpp-9999.ebuild X-VCS-Directories: net-libs/qxmpp/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 28bdaa99c48bce0ceb44d1052add81fa576b2dae X-VCS-Branch: master Date: Tue, 10 Mar 2020 20:45:02 +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: 0ebd7787-740d-4cc1-b07d-e0879d2e635f X-Archives-Hash: 20dadb441ff04861c4beb0b24f83c8d4 commit: 28bdaa99c48bce0ceb44d1052add81fa576b2dae Author: 0xd34df00d <0xd34df00d gmail com> AuthorDate: Tue Mar 10 19:29:16 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 10 20:44:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28bdaa99 net-libs/qxmpp: update the 9999 ebuild * EAPI 7 * `cmake` eclass instead of `cmake-utils` * minor fixes to mirror the ones for the versioned ebuilds Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Georg Rudoy <0xd34df00d gmail.com> Signed-off-by: Andreas Sturmlechner gentoo.org> net-libs/qxmpp/qxmpp-9999.ebuild | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild index b1973ffc3cc..453364d6055 100644 --- a/net-libs/qxmpp/qxmpp-9999.ebuild +++ b/net-libs/qxmpp/qxmpp-9999.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -EGIT_REPO_URI="https://github.com/qxmpp-project/qxmpp" - -inherit git-r3 cmake-utils +inherit git-r3 cmake DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework" HOMEPAGE="https://github.com/qxmpp-project/qxmpp/" +EGIT_REPO_URI="https://github.com/qxmpp-project/qxmpp" LICENSE="LGPL-2.1" SLOT="0" @@ -26,17 +25,22 @@ RDEPEND=" vpx? ( media-libs/libvpx:= ) " DEPEND="${RDEPEND} - dev-util/cmake test? ( dev-qt/qttest:5 ) +" +BDEPEND=" doc? ( app-doc/doxygen ) " src_prepare() { # requires network connection, bug #623708 - sed -e "/qxmppiceconnection/d" \ - -i tests/CMakeLists.txt || die "failed to drop single test" - - cmake-utils_src_prepare + sed \ + -e "/qxmppiceconnection/d" \ + -e "/qxmppserver/d" \ + -e "/qxmpptransfermanager/d" \ + -i tests/CMakeLists.txt \ + || die "failed to drop certain network tests" + + cmake_src_prepare } src_configure() { @@ -44,20 +48,12 @@ src_configure() { -DBUILD_DOCUMENTATION=$(usex doc) -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=$(usex test) + -DBUILD_INTERNAL_TESTS=$(usex test) -DWITH_OPUS=$(usex opus) -DWITH_SPEEX=$(usex speex) -DWITH_THEORA=$(usex theora) -DWITH_VPX=$(usex vpx) ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - if use doc; then - # Use proper path for documentation - mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed" - fi + cmake_src_configure }