gentoo resync : 22.10.2018

5 files changed, 15 insertions, 124 deletions

diff --git a/sci-libs/nemesis/Manifest b/sci-libs/nemesis/Manifest
index 0609bc6ff5d4..8cf7c806ed8c 100644
--- a/sci-libs/nemesis/Manifest
+++ b/sci-libs/nemesis/Manifest
@@ -1,7 +1,4 @@
-AUX nemesis-5.22b-multilib.patch 1885 BLAKE2B 1c678e89e5b5f0ba7d13b5bc258c343d727a93ae32ff1eb64a3de352ad0d9d189433537ab22c8547167adfda95257ecd144016d505a087b9dcab440ce666687c SHA512 d068f9d2f35b306fe9c57b41a065c8c6aea85bfa1f0b4d42c538a17c3563840c014cc0b0f93da79a5bfd98d5c8e6007d6f99d03e92aa534278b90871e7da663d
-AUX nemesis-6.09-multilib.patch 1649 BLAKE2B 620cc881f48b925e4b50fb8306d190ba64ee5bd76d752bb4208a733ece871486964260771096c1894db8a77b28461035ff95e09793bd5a5d5a1ebb5f2ff6d151 SHA512 db01d3afe33bc2f30868e5ceceb4fbe5a0eb10c08b39a72f2d3cb0d363eb837c79bd62e4590a0013602419ecfcb6dcc33eaf656e670d2b25600409e8b07890e7
-DIST exodus-5.24.tar.bz2 4252980 BLAKE2B 44c0233077a3dbcba11e79643e2b81c5529e21b0c447e8621f5247817df95f91ee992091135d8ead694f5817e4575eb88825a0e90703b332c79164c91cfb828b SHA512 d31cf17d2112b625259a70a7f73609323b94a3eed77be3b09961e67518d1b8caf82617a18f8c651fa6549988aa9a02455aea04402463b4fb7e66dd4e15b7e87e
+AUX nemesis-6.09-multilib.patch 1617 BLAKE2B 706800577f7ff5865e54502bbe2fb18d64a6c247880c30a1101ede1d27edb5fc3b6e7ffdd6d04c1e84e3b6c29b65042fb0839906ca81fee6971fbd2ea566738e SHA512 4b9b21b67a85c3f4a69a97de1676cd0c8fbc1285737412d0996822d8e1a0e19700e1c5e4990a0dc7cc92db5315415fc8af1d1f3a8a9dfe4fb11cf5cf13e59f27
 DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
-EBUILD nemesis-5.24.ebuild 1073 BLAKE2B 520b7c8b97e70060d574e0a1f0e1aa1cf6293887b7c5dc034aaee496a6c01e58b5920ccb8b27a3da22477f6496620505d3305594efd5594f5d5d81a52569e897 SHA512 181b306208310225bd22dc328f7dc40c49279ff70a8b504063df2031a5e6ce4eae91b68d54699d6d39a8ba4f72738668dad71b17c0977eaa85dd741039e6bab6
-EBUILD nemesis-6.09.ebuild 994 BLAKE2B f04ec75808a19745daf6965352aa97f19d1b956818c74b8202d1c42ac1394bde3f6a3dced77fa181a37207a93a188c0b01327c887c86333093acf8835bee8c43 SHA512 e9e6e4c3d6c56816144f2d3ef8104a452fa042ec97484b619b0b4c9dee614896a41b89e6625c6c5dbbd57f041ff90ed9e53e3b863417620c7ff5ac0805153ac7
+EBUILD nemesis-6.09.ebuild 899 BLAKE2B 7419ff1d1fe6b888363f0220b014880553aee7fd6f55893c457cd9aaf26e0cf1982209ccb919c39734e1ba6cf3a32ace853c5772f32f0fb1859503556573594f SHA512 537f625ed53c0f361af88f4ddec033b06f25321a2717c4bbc3235f1c38949bf1f9a6ad0aa55eabae652ebe2ef7a9b3e07cbbdd3ade17705305ef01092da479dd
 MISC metadata.xml 1055 BLAKE2B 3ba3589e0f67d44da504eff1e008e0b6ac9b43b9e8eceac9089de61c8333b41b2c04db33bcfc6e3d52e1d083778bd49fdb2702154cebb0fca38e055a44f3b2ed SHA512 bf7702146727a7449c7a0988d64f0036809e3688801a2cca42a8f7a442e4f1f204c0101e50c3ffc98e4a04ee13cc01105c12bad3a480a0179574ae4d1ff6ac14
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 b99add01ea56..000000000000
--- 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/files/nemesis-6.09-multilib.patch b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
index d0f05f23a2d2..09b5c9a60377 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-5.24.ebuild b/sci-libs/nemesis/nemesis-5.24.ebuild
deleted file mode 100644
index 7a5a5b95805c..000000000000
--- 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
-}
diff --git a/sci-libs/nemesis/nemesis-6.09.ebuild b/sci-libs/nemesis/nemesis-6.09.ebuild
index 4bd332e3b01c..3e18bd12f610 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
 }