| 1 |
commit: ee9f45ac28c6ca69c972704b4d8eb850e81d15b3 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 3 13:53:36 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 3 14:00:58 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee9f45ac |
| 7 |
|
| 8 |
net-libs/qxmpp: Disable failing test |
| 9 |
|
| 10 |
Also cleanup src_prepare. Maintainer timeout. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/623708 |
| 13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 14 |
|
| 15 |
net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild | 22 +++++++++++++--------- |
| 16 |
net-libs/qxmpp/qxmpp-9999.ebuild | 22 +++++++++++++--------- |
| 17 |
2 files changed, 26 insertions(+), 18 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild |
| 20 |
index c8b090dafc1..a8bd6e94ae7 100644 |
| 21 |
--- a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild |
| 22 |
+++ b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild |
| 23 |
@@ -27,21 +27,25 @@ DEPEND="${RDEPEND} |
| 24 |
test? ( dev-qt/qttest:5 ) |
| 25 |
" |
| 26 |
|
| 27 |
-src_prepare(){ |
| 28 |
+src_prepare() { |
| 29 |
+ default |
| 30 |
+ |
| 31 |
if ! use doc; then |
| 32 |
- sed -i \ |
| 33 |
- -e '/SUBDIRS/s/doc//' \ |
| 34 |
+ sed -e '/SUBDIRS/s/doc//' \ |
| 35 |
-e '/INSTALLS/d' \ |
| 36 |
- qxmpp.pro || die "sed for removing docs failed" |
| 37 |
+ -i qxmpp.pro || die "failed to remove docs" |
| 38 |
fi |
| 39 |
if ! use test; then |
| 40 |
- sed -i -e '/SUBDIRS/s/tests//' \ |
| 41 |
- qxmpp.pro || die "sed for removing tests failed" |
| 42 |
+ sed -e '/SUBDIRS/s/tests//' \ |
| 43 |
+ -i qxmpp.pro || die "failed to remove tests" |
| 44 |
+ else |
| 45 |
+ # requires network connection, bug #623708 |
| 46 |
+ sed -e "/qxmppiceconnection/d" \ |
| 47 |
+ -i tests/tests.pro || die "failed to drop single test" |
| 48 |
fi |
| 49 |
# There is no point in building examples. Also, they require dev-qt/qtgui |
| 50 |
- sed -i -e '/SUBDIRS/s/examples//' \ |
| 51 |
- qxmpp.pro || die "sed for removing examples failed" |
| 52 |
- default_src_prepare |
| 53 |
+ sed -e '/SUBDIRS/s/examples//' \ |
| 54 |
+ -i qxmpp.pro || die "sed for removing examples failed" |
| 55 |
} |
| 56 |
|
| 57 |
src_configure() { |
| 58 |
|
| 59 |
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild |
| 60 |
index d9226e906b6..fc67feb3c99 100644 |
| 61 |
--- a/net-libs/qxmpp/qxmpp-9999.ebuild |
| 62 |
+++ b/net-libs/qxmpp/qxmpp-9999.ebuild |
| 63 |
@@ -28,21 +28,25 @@ DEPEND="${RDEPEND} |
| 64 |
test? ( dev-qt/qttest:5 ) |
| 65 |
" |
| 66 |
|
| 67 |
-src_prepare(){ |
| 68 |
+src_prepare() { |
| 69 |
+ default |
| 70 |
+ |
| 71 |
if ! use doc; then |
| 72 |
- sed -i \ |
| 73 |
- -e '/SUBDIRS/s/doc//' \ |
| 74 |
+ sed -e '/SUBDIRS/s/doc//' \ |
| 75 |
-e '/INSTALLS/d' \ |
| 76 |
- qxmpp.pro || die "sed for removing docs failed" |
| 77 |
+ -i qxmpp.pro || die "failed to remove docs" |
| 78 |
fi |
| 79 |
if ! use test; then |
| 80 |
- sed -i -e '/SUBDIRS/s/tests//' \ |
| 81 |
- qxmpp.pro || die "sed for removing tests failed" |
| 82 |
+ sed -e '/SUBDIRS/s/tests//' \ |
| 83 |
+ -i qxmpp.pro || die "failed to remove tests" |
| 84 |
+ else |
| 85 |
+ # requires network connection, bug #623708 |
| 86 |
+ sed -e "/qxmppiceconnection/d" \ |
| 87 |
+ -i tests/tests.pro || die "failed to drop single test" |
| 88 |
fi |
| 89 |
# There is no point in building examples. Also, they require dev-qt/qtgui |
| 90 |
- sed -i -e '/SUBDIRS/s/examples//' \ |
| 91 |
- qxmpp.pro || die "sed for removing examples failed" |
| 92 |
- default_src_prepare |
| 93 |
+ sed -e '/SUBDIRS/s/examples//' \ |
| 94 |
+ -i qxmpp.pro || die "sed for removing examples failed" |
| 95 |
} |
| 96 |
|
| 97 |
src_configure() { |
Archives