From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-947168-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 CBE85139694 for <garchives@archives.gentoo.org>; Sun, 30 Apr 2017 22:07:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 030D921C0B0; Sun, 30 Apr 2017 22:07: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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C303921C0B0 for <gentoo-commits@lists.gentoo.org>; Sun, 30 Apr 2017 22:07:25 +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 63B97340806 for <gentoo-commits@lists.gentoo.org>; Sun, 30 Apr 2017 22:07:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C746D7442 for <gentoo-commits@lists.gentoo.org>; Sun, 30 Apr 2017 22:07:22 +0000 (UTC) From: "David Seifert" <soap@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, "David Seifert" <soap@gentoo.org> Message-ID: <1493590020.3182c1136a66adc2ef355be613cd7dd0e7c6623f.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/eigen/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/eigen/eigen-2.0.17.ebuild X-VCS-Directories: dev-cpp/eigen/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 3182c1136a66adc2ef355be613cd7dd0e7c6623f X-VCS-Branch: master Date: Sun, 30 Apr 2017 22:07:22 +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: ddb8de4a-3390-4f59-a0a4-a62d78feabaf X-Archives-Hash: 683266c1cb676cd6e9bae4b283b7b0f3 commit: 3182c1136a66adc2ef355be613cd7dd0e7c6623f Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Apr 30 21:48:19 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Apr 30 22:07:00 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3182c113 dev-cpp/eigen: Port SLOT=2 ebuild to EAPI 6 Package-Manager: Portage-2.3.5, Repoman-2.3.2 dev-cpp/eigen/eigen-2.0.17.ebuild | 58 ++++++++++++++------------------------- 1 file changed, 21 insertions(+), 37 deletions(-) diff --git a/dev-cpp/eigen/eigen-2.0.17.ebuild b/dev-cpp/eigen/eigen-2.0.17.ebuild index f2543f9e389..842c54187eb 100644 --- a/dev-cpp/eigen/eigen-2.0.17.ebuild +++ b/dev-cpp/eigen/eigen-2.0.17.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 inherit cmake-utils @@ -10,24 +10,20 @@ HOMEPAGE="http://eigen.tuxfamily.org/" SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2" LICENSE="GPL-3" -KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux" SLOT="2" -IUSE="debug doc examples" +KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +IUSE="debug doc examples test" +# bugs 426236, 455460, 467288 +RESTRICT="test" -COMMON_DEPEND=" +RDEPEND=" examples? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 - )" -DEPEND="${COMMON_DEPEND} - doc? ( app-doc/doxygen )" -RDEPEND="${COMMON_DEPEND} + ) !dev-cpp/eigen:0" - -MAKEOPTS+=" -j1" - -# bugs 426236, 455460, 467288 -RESTRICT="test" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" src_unpack() { unpack ${A} @@ -35,44 +31,32 @@ src_unpack() { } src_configure() { - # benchmarks (BTL) brings up damn load of external deps including fortran - # compiler + # benchmarks (BTL) brings up a damn load of external deps including fortran # library hangs up complete compilation proccess, test later - mycmakeargs=( + local mycmakeargs=( -DEIGEN_BUILD_LIB=OFF -DEIGEN_BUILD_BTL=OFF -DEIGEN_BUILD_PKGCONFIG=ON - $(cmake-utils_use examples EIGEN_BUILD_DEMOS) + -DEIGEN_BUILD_DEMOS=$(usex examples) + -DEIGEN_BUILD_TESTS=$(usex test) ) cmake-utils_src_configure } src_compile() { - cmake-utils_src_compile + cmake-utils_src_compile -j1 + if use doc; then - cd "${CMAKE_BUILD_DIR}" - emake doc + cmake-utils_src_compile -j1 doc + HTML_DOCS=( "${BUILD_DIR}"/html/. ) fi } src_install() { - cmake-utils_src_install - if use doc; then - cd "${CMAKE_BUILD_DIR}"/doc - dohtml -r html/* - fi + cmake-utils_src_install -j1 + if use examples; then - cd "${CMAKE_BUILD_DIR}"/demos + cd "${BUILD_DIR}"/demos || die dobin mandelbrot/mandelbrot opengl/quaternion_demo fi } - -src_test() { - mycmakeargs=( - -DEIGEN_BUILD_TESTS=ON - -DEIGEN_TEST_NO_FORTRAN=ON - ) - cmake-utils_src_configure - cmake-utils_src_compile - cmake-utils_src_test -}