From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AA7E7138222 for ; Tue, 3 May 2016 03:42:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCFF1E0872; Tue, 3 May 2016 03:42:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A42BDE086E for ; Tue, 3 May 2016 03:42:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A628340A98 for ; Tue, 3 May 2016 03:42:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A725733F for ; Tue, 3 May 2016 03:41:58 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1462246904.a7a6d00357859094ff31fcbaf4eba09de9360022.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/classified-ads/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/classified-ads/classified-ads-0.10.ebuild X-VCS-Directories: net-p2p/classified-ads/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: a7a6d00357859094ff31fcbaf4eba09de9360022 X-VCS-Branch: master Date: Tue, 3 May 2016 03:41:58 +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: 1d095576-0bf7-448a-a190-0cd55448bc2d X-Archives-Hash: 734d1951e85bd22cc12408b12dad9a05 commit: a7a6d00357859094ff31fcbaf4eba09de9360022 Author: Antti Jarvinen katiska org> AuthorDate: Tue Apr 26 20:59:19 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Tue May 3 03:41:44 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7a6d003 net-p2p/classified-ads: Classified ads v0.10 version bump. - changed way how test suite is run and fixed 2 unit tests. Package-Manager: portage-2.2.26 Closes: https://github.com/gentoo/gentoo/pull/1327 Signed-off-by: Ian Delaney gentoo.org> net-p2p/classified-ads/classified-ads-0.10.ebuild | 35 +++++++++++++++-------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/net-p2p/classified-ads/classified-ads-0.10.ebuild b/net-p2p/classified-ads/classified-ads-0.10.ebuild index 9ff04f5..a792705 100644 --- a/net-p2p/classified-ads/classified-ads-0.10.ebuild +++ b/net-p2p/classified-ads/classified-ads-0.10.ebuild @@ -5,11 +5,12 @@ EAPI=5 PLOCALES="en fi sv da uk" PLOCALE_BACKUP="en" -inherit qt4-r2 qmake-utils +inherit qt4-r2 qmake-utils virtualx vcs-snapshot +COMMIT_ID="cd0652c52f86f6284b793f26e5362bc8fb8a7118" DESCRIPTION="Program for displaying classified advertisement items" HOMEPAGE="http://katiska.org/classified-ads/" -SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz -> classified-ads-${PV}.tar.gz \ +SRC_URI="https://github.com/operatornormal/classified-ads/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz \ https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true \ -> classified-ads-graphics-${PV}.tar.gz" @@ -37,13 +38,14 @@ DEPEND="${RDEPEND} dev-qt/qttest:4 sys-devel/gdb:0 doc? ( app-doc/doxygen[dot] ) - test? ( dev-libs/libgcrypt:0 ) + test? ( dev-libs/libgcrypt:0 + ${VIRTUALX_DEPEND} ) " src_prepare() { # preprocessed graphics are unpacked into wrong directory # so lets move them into correct location: - mv ../ui/* ui/ || die + mv ../classified-ads-graphics-${PV}/* ui/ || die # then just run qmake qt4-r2_src_prepare } @@ -57,8 +59,19 @@ src_compile() { } src_test() { - cd test || die "test suite missing" - "$(qt4_get_bindir)"/qmake || die "test suite configure failed" + virtx test_suite +} + +src_install() { + emake install INSTALL_ROOT="${D}" DESTDIR="${D}" + use doc && dodoc -r doc/doxygen.generated/html/ +} + +# virtualx requires a command that returns number, and does not just die: +test_suite() { + cd test || return -1 + echo qmake + "$(qt4_get_bindir)"/qmake || return -2 emake # test suite will create files under $HOME, set $HOME to point to # safe location, ideas stolen from @@ -70,11 +83,9 @@ src_test() { result=$? export HOME=$BACKUP_HOME if [ $result != "0" ]; then - die "test suite failed with error code " `echo $result` + echo "test suite failed with error code " `echo $result` + return $result + else + return 0 fi } - -src_install() { - emake install INSTALL_ROOT="${D}" DESTDIR="${D}" - use doc && dodoc -r doc/doxygen.generated/html/ -}