From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1053975-garchives=archives.gentoo.org@lists.gentoo.org>
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 6BD58138334
for <garchives@archives.gentoo.org>; Wed, 24 Oct 2018 14:44:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 20FCEE09B5;
Wed, 24 Oct 2018 14:44:55 +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 BF6F7E09B5
for <gentoo-commits@lists.gentoo.org>; Wed, 24 Oct 2018 14:44:54 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 BF8C1335C5A
for <gentoo-commits@lists.gentoo.org>; Wed, 24 Oct 2018 14:44:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B3A0D449
for <gentoo-commits@lists.gentoo.org>; Wed, 24 Oct 2018 14:44:50 +0000 (UTC)
From: "Sergey Popov" <pinkbyte@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" <pinkbyte@gentoo.org>
Message-ID: <1540392266.3b793890131530295d7cc52c4cec4367fae832aa.pinkbyte@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: pinkbyte
X-VCS-Committer-Name: Sergey Popov
X-VCS-Revision: 3b793890131530295d7cc52c4cec4367fae832aa
X-VCS-Branch: master
Date: Wed, 24 Oct 2018 14:44:50 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: c4655e48-879f-45f1-99d1-a7ebad7ce3c2
X-Archives-Hash: 93d2a697fe67add8055ba9b292f4e053
commit: 3b793890131530295d7cc52c4cec4367fae832aa
Author: Georg Rudoy <0xd34df00d <AT> gmail <DOT> com>
AuthorDate: Wed Oct 24 03:39:45 2018 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 14:44:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b793890
net-libs/qxmpp: upstream build system change in 9999
Signed-off-by: Georg Rudoy <0xd34df00d <AT> gmail.com>
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/10210
net-libs/qxmpp/qxmpp-9999.ebuild | 52 ++++++++++++++++------------------------
1 file changed, 20 insertions(+), 32 deletions(-)
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild
index 6bc4e3d8310..a6fb6f67b14 100644
--- a/net-libs/qxmpp/qxmpp-9999.ebuild
+++ b/net-libs/qxmpp/qxmpp-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
EGIT_REPO_URI="https://github.com/qxmpp-project/qxmpp"
-inherit git-r3 qmake-utils
+inherit git-r3 cmake-utils
DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
@@ -25,50 +25,38 @@ RDEPEND="
vpx? ( media-libs/libvpx:= )
"
DEPEND="${RDEPEND}
+ dev-util/cmake
test? ( dev-qt/qttest:5 )
+ doc? ( app-doc/doxygen )
"
src_prepare() {
- default
+ # requires network connection, bug #623708
+ sed -e "/qxmppiceconnection/d" \
+ -i tests/CMakeLists.txt || die "failed to drop single test"
- if ! use doc; then
- sed -e '/SUBDIRS/s/doc//' \
- -e '/INSTALLS/d' \
- -i qxmpp.pro || die "failed to remove docs"
- fi
- if ! use test; then
- sed -e '/SUBDIRS/s/tests//' \
- -i qxmpp.pro || die "failed to remove tests"
- else
- # requires network connection, bug #623708
- sed -e "/qxmppiceconnection/d" \
- -i tests/tests.pro || die "failed to drop single test"
- fi
- # There is no point in building examples. Also, they require dev-qt/qtgui
- sed -e '/SUBDIRS/s/examples//' \
- -i qxmpp.pro || die "sed for removing examples failed"
+ cmake-utils_src_prepare
}
src_configure() {
- eqmake5 "${S}"/qxmpp.pro \
- PREFIX="${EPREFIX}/usr" \
- LIBDIR="$(get_libdir)" \
- QXMPP_USE_OPUS=$(usex opus 1 '') \
- QXMPP_USE_SPEEX=$(usex speex 1 '') \
- QXMPP_USE_THEORA=$(usex theora 1 '') \
- QXMPP_USE_VPX=$(usex vpx 1 '')
+ local mycmakeargs=(
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ -DBUILD_EXAMPLES=OFF
+ -DBUILD_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() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
+ 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
}
-
-src_test() {
- MAKEOPTS="-j1" # random tests fail otherwise
- default_src_test
-}