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 9AE07138334 for ; Sun, 14 Oct 2018 13:35:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E1CDE0878; Sun, 14 Oct 2018 13:35:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 4C232E0878 for ; Sun, 14 Oct 2018 13:35:26 +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 BD1C4335CE9 for ; Sun, 14 Oct 2018 13:35:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F36243D for ; Sun, 14 Oct 2018 13:35:22 +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: <1539524106.5c772bb3f055335b6c91bf20d5ab85c75dde6f8d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/nemesis/files/, sci-libs/nemesis/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/nemesis/files/nemesis-6.09-multilib.patch sci-libs/nemesis/nemesis-6.09.ebuild X-VCS-Directories: sci-libs/nemesis/files/ sci-libs/nemesis/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5c772bb3f055335b6c91bf20d5ab85c75dde6f8d X-VCS-Branch: master Date: Sun, 14 Oct 2018 13:35:22 +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: e77d177e-7299-4365-bfb3-09d1a2a3804c X-Archives-Hash: b0a5e9f97b11f5d285a79402bcb418d6 commit: 5c772bb3f055335b6c91bf20d5ab85c75dde6f8d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 14 12:45:32 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 14 13:35:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c772bb3 sci-libs/nemesis: EAPI-6 bump, drop unused cmake args Fix dead HOMEPAGE, SRC_URI. Bug: https://bugs.gentoo.org/644588 Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sci-libs/nemesis/files/nemesis-6.09-multilib.patch | 6 +++--- sci-libs/nemesis/nemesis-6.09.ebuild | 22 ++++++++++------------ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch index d0f05f23a2d..09b5c9a6037 100644 --- a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch +++ b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch @@ -1,10 +1,10 @@ nemesis/CMakeLists.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt +diff --git a/CMakeLists.txt b/CMakeLists.txt index 64aff5d..bed5ede 100644 ---- a/nemesis/CMakeLists.txt -+++ b/nemesis/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -19,7 +19,7 @@ find_library( NETCDF_LIBRARY netcdf $ENV{ACCESS}/lib/shared diff --git a/sci-libs/nemesis/nemesis-6.09.ebuild b/sci-libs/nemesis/nemesis-6.09.ebuild index 4bd332e3b01..3e18bd12f61 100644 --- a/sci-libs/nemesis/nemesis-6.09.ebuild +++ b/sci-libs/nemesis/nemesis-6.09.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit cmake-utils multilib +inherit cmake-utils MY_PN="exodus" MY_P="${MY_PN}-${PV}" DESCRIPTION="Enhancement to the EXODUSII finite element database model" -HOMEPAGE="https://sourceforge.net/projects/exodusii/" -SRC_URI="mirror://sourceforge/project/${MY_PN}ii/${MY_P}.tar.gz" +HOMEPAGE="https://github.com/certik/exodus" +SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs test" +IUSE="static-libs" DEPEND=" sci-libs/exodusii @@ -32,13 +32,11 @@ src_prepare() { } src_configure() { - mycmakeargs=( - -DLIB_INSTALL_DIR=$(get_libdir) - -DNETCDF_DIR="${EPREFIX}/usr/" - -DEXODUS_DIR="${EPREFIX}/usr/" - $(cmake-utils_use !static-libs BUILD_SHARED_LIBS) - $(cmake-utils_use test BUILD_TESTING) + local mycmakeargs=( + -DBUILD_SHARED_LIBS=$(usex !static-libs) ) + export NETCDF_DIR="${EPREFIX}/usr/" + export EXODUS_DIR="${EPREFIX}/usr/" cmake-utils_src_configure }