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 26DDE58973 for ; Thu, 21 Jan 2016 06:58:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0061021C006; Thu, 21 Jan 2016 06:58:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 94D8221C006 for ; Thu, 21 Jan 2016 06:58:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 796EB33FDBF for ; Thu, 21 Jan 2016 06:58:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD2F2A91 for ; Thu, 21 Jan 2016 06:58:51 +0000 (UTC) From: "Slawek Lis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slawek Lis" Message-ID: <1453359749.53efe0f5116074b19f63a1a4fabe405a95e56b7d.slis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/assimp/assimp-3.2-r1.ebuild media-libs/assimp/assimp-3.2-r2.ebuild X-VCS-Directories: media-libs/assimp/ X-VCS-Committer: slis X-VCS-Committer-Name: Slawek Lis X-VCS-Revision: 53efe0f5116074b19f63a1a4fabe405a95e56b7d X-VCS-Branch: master Date: Thu, 21 Jan 2016 06:58:51 +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: 65576030-37d1-4889-b41a-794f278aa033 X-Archives-Hash: 67c46209ec6cd664279b76154b8f492e commit: 53efe0f5116074b19f63a1a4fabe405a95e56b7d Author: Slawomir Lis gentoo org> AuthorDate: Thu Jan 21 07:01:49 2016 +0000 Commit: Slawek Lis gentoo org> CommitDate: Thu Jan 21 07:02:29 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53efe0f5 Fixed tests (#571896) Package-Manager: portage-2.2.26 .../{assimp-3.2-r1.ebuild => assimp-3.2-r2.ebuild} | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/media-libs/assimp/assimp-3.2-r1.ebuild b/media-libs/assimp/assimp-3.2-r2.ebuild similarity index 72% rename from media-libs/assimp/assimp-3.2-r1.ebuild rename to media-libs/assimp/assimp-3.2-r2.ebuild index 74d7856..22f1038 100644 --- a/media-libs/assimp/assimp-3.2-r1.ebuild +++ b/media-libs/assimp/assimp-3.2-r2.ebuild @@ -12,25 +12,36 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" KEYWORDS="~amd64 ~arm ~x86" -IUSE="+boost samples static tools" +IUSE="+boost samples static test tools" SLOT="0" -DEPEND=" +RDEPEND=" boost? ( dev-libs/boost ) samples? ( x11-libs/libX11 virtual/opengl media-libs/freeglut ) sys-libs/zlib " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest ) +" + +src_prepare() { + epatch "${FILESDIR}/test-cmakelists.patch" +} src_configure() { mycmakeargs=( $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ $(cmake-utils_use_build tools ASSIMP_TOOLS) \ $(cmake-utils_use_build static STATIC_LIB) \ - $(cmake-utils_use_enable !boost BOOST_WORKAROUND) + $(cmake-utils_use_enable !boost BOOST_WORKAROUND) \ + $(cmake-utils_use_build test TESTS) -DCMAKE_DEBUG_POSTFIX="" -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/" ) cmake-utils_src_configure } + +src_test() { + "${BUILD_DIR}/test/unit" || die +}