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 AA7C3138334 for ; Sun, 14 Oct 2018 13:35:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76A5CE0876; Sun, 14 Oct 2018 13:35:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 37A22E0876 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 B0FF6335CE7 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 31FFB43E 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.7da9c7778847f578f904a01b195776785d8b5260.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/Manifest sci-libs/nemesis/files/nemesis-5.22b-multilib.patch sci-libs/nemesis/nemesis-5.24.ebuild X-VCS-Directories: sci-libs/nemesis/files/ sci-libs/nemesis/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7da9c7778847f578f904a01b195776785d8b5260 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: 4c1f0e93-e467-4250-a454-e78c2ff4b9b3 X-Archives-Hash: e791b85a0bb21f1a7ed0170c20df0e22 commit: 7da9c7778847f578f904a01b195776785d8b5260 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 14 12:46:14 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=7da9c777 sci-libs/nemesis: Drop old Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sci-libs/nemesis/Manifest | 1 - .../nemesis/files/nemesis-5.22b-multilib.patch | 57 ---------------------- sci-libs/nemesis/nemesis-5.24.ebuild | 47 ------------------ 3 files changed, 105 deletions(-) diff --git a/sci-libs/nemesis/Manifest b/sci-libs/nemesis/Manifest index d47e626e04a..994c13bd1ae 100644 --- a/sci-libs/nemesis/Manifest +++ b/sci-libs/nemesis/Manifest @@ -1,2 +1 @@ -DIST exodus-5.24.tar.bz2 4252980 BLAKE2B 44c0233077a3dbcba11e79643e2b81c5529e21b0c447e8621f5247817df95f91ee992091135d8ead694f5817e4575eb88825a0e90703b332c79164c91cfb828b SHA512 d31cf17d2112b625259a70a7f73609323b94a3eed77be3b09961e67518d1b8caf82617a18f8c651fa6549988aa9a02455aea04402463b4fb7e66dd4e15b7e87e DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516 diff --git a/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch b/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch deleted file mode 100644 index b99add01ea5..00000000000 --- a/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch +++ /dev/null @@ -1,57 +0,0 @@ - nemesis/CMakeLists.txt | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt -index 64aff5d..bed5ede 100644 ---- a/nemesis/CMakeLists.txt -+++ b/nemesis/CMakeLists.txt -@@ -19,7 +19,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h - find_library( NETCDF_LIBRARY netcdf - $ENV{ACCESS}/lib/shared - $ENV{ACCESS}/lib -- $ENV{NETCDF_DIR}/lib -+ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR} - $ENV{NETCDF_DIR}/libsrc/.libs - ) - -@@ -29,16 +29,17 @@ find_program (NETCDF_NCDUMP ncdump - $ENV{NETCDF_DIR}/ncdump - ) - --find_library( EXODUS_LIBRARY exodus -+find_library( EXODUS_LIBRARY exoIIv2c - $ENV{ACCESS}/lib/shared - $ENV{ACCESS}/lib -+ $ENV{EXODUS_DIR}/${CMAKE_INSTALL_LIBDIR} - ) - - # Hack for HDF5 - find_library( HDF5_LIBRARY hdf5 - $ENV{ACCESS}/lib/shared - $ENV{ACCESS}/lib -- $ENV{NETCDF_DIR}/lib -+ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR} - $ENV{NETCDF_DIR}/libsrc/.libs - /usr/local/hdf5/lib - ) -@@ -46,7 +47,7 @@ find_library( HDF5_LIBRARY hdf5 - find_library( HDF5HL_LIBRARY hdf5_hl - $ENV{ACCESS}/lib/shared - $ENV{ACCESS}/lib -- $ENV{NETCDF_DIR}/lib -+ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR} - $ENV{NETCDF_DIR}/libsrc/.libs - /usr/local/hdf5/lib - ) -@@ -79,8 +80,8 @@ ADD_EXECUTABLE(ne_test ne_ctest_wrap.c) - TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY}) - - INSTALL(TARGETS nemesis -- RUNTIME DESTINATION lib COMPONENT Runtime -- LIBRARY DESTINATION lib COMPONENT Runtime -- ARCHIVE DESTINATION lib COMPONENT Development) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) - INSTALL(FILES ${HEADERS} DESTINATION include COMPONENT Development) - diff --git a/sci-libs/nemesis/nemesis-5.24.ebuild b/sci-libs/nemesis/nemesis-5.24.ebuild deleted file mode 100644 index 7a5a5b95805..00000000000 --- a/sci-libs/nemesis/nemesis-5.24.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils multilib - -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.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs test" - -DEPEND=" - sci-libs/exodusii - sci-libs/netcdf" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MY_P}/${PN} - -PATCHES=( "${FILESDIR}"/${PN}-5.22b-multilib.patch ) - -src_prepare() { - find ../exodus -delete || die - cmake-utils_src_prepare - sed -i 's/exoIIv2c/NAMES exodus &/' CMakeLists.txt || die -} - -src_configure() { - mycmakeargs="${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)" - cmake-utils_src_configure -} - -src_test() { - "${BUILD_DIR}"/ne_test || die -}