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 16BE3138331 for ; Sat, 3 Feb 2018 14:01:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43EE6E0B0F; Sat, 3 Feb 2018 14:01:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 16101E0B0F for ; Sat, 3 Feb 2018 14:01:25 +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 7178D335C54 for ; Sat, 3 Feb 2018 14:01:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 06E7C1D8 for ; Sat, 3 Feb 2018 14:01:23 +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: <1517666458.ee9f45ac28c6ca69c972704b4d8eb850e81d15b3.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-0.9.3-r1.ebuild 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: ee9f45ac28c6ca69c972704b4d8eb850e81d15b3 X-VCS-Branch: master Date: Sat, 3 Feb 2018 14:01:23 +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-Archives-Salt: d760f3f4-f8cc-4f53-bfe9-18ef6fa8004f X-Archives-Hash: 7f5c529581adaf4fb6bff27effd61ae3 commit: ee9f45ac28c6ca69c972704b4d8eb850e81d15b3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 3 13:53:36 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 3 14:00:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee9f45ac net-libs/qxmpp: Disable failing test Also cleanup src_prepare. Maintainer timeout. Closes: https://bugs.gentoo.org/623708 Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild | 22 +++++++++++++--------- net-libs/qxmpp/qxmpp-9999.ebuild | 22 +++++++++++++--------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild index c8b090dafc1..a8bd6e94ae7 100644 --- a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild +++ b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild @@ -27,21 +27,25 @@ DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 ) " -src_prepare(){ +src_prepare() { + default + if ! use doc; then - sed -i \ - -e '/SUBDIRS/s/doc//' \ + sed -e '/SUBDIRS/s/doc//' \ -e '/INSTALLS/d' \ - qxmpp.pro || die "sed for removing docs failed" + -i qxmpp.pro || die "failed to remove docs" fi if ! use test; then - sed -i -e '/SUBDIRS/s/tests//' \ - qxmpp.pro || die "sed for removing tests failed" + 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 -i -e '/SUBDIRS/s/examples//' \ - qxmpp.pro || die "sed for removing examples failed" - default_src_prepare + sed -e '/SUBDIRS/s/examples//' \ + -i qxmpp.pro || die "sed for removing examples failed" } src_configure() { diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild index d9226e906b6..fc67feb3c99 100644 --- a/net-libs/qxmpp/qxmpp-9999.ebuild +++ b/net-libs/qxmpp/qxmpp-9999.ebuild @@ -28,21 +28,25 @@ DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 ) " -src_prepare(){ +src_prepare() { + default + if ! use doc; then - sed -i \ - -e '/SUBDIRS/s/doc//' \ + sed -e '/SUBDIRS/s/doc//' \ -e '/INSTALLS/d' \ - qxmpp.pro || die "sed for removing docs failed" + -i qxmpp.pro || die "failed to remove docs" fi if ! use test; then - sed -i -e '/SUBDIRS/s/tests//' \ - qxmpp.pro || die "sed for removing tests failed" + 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 -i -e '/SUBDIRS/s/examples//' \ - qxmpp.pro || die "sed for removing examples failed" - default_src_prepare + sed -e '/SUBDIRS/s/examples//' \ + -i qxmpp.pro || die "sed for removing examples failed" } src_configure() {