gentoo resync : 21.09.2018

3 files changed, 0 insertions, 200 deletions

diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest
index d25ec9324dde..98d7d8af2056 100644
--- a/sci-libs/cgnslib/Manifest
+++ b/sci-libs/cgnslib/Manifest
@@ -1,6 +1,3 @@
-AUX cgnslib-3.2.1-cmake.patch 4758 BLAKE2B 7c209924597b2b1301cb887f2d63dac3408d81d607c3cde5bd47e1a3b21894f5a80c74fa9c19c3aa3e13a1648f2effadf5411c90bb2a2006b7bb7f0d224279d1 SHA512 c55279d0c5d26bb8c0ed41e637d7cd417e84f6896fa76c81d5c47d2fd7491e2889e739606e52763bca184f1775da6ee4d0be55d8fab7f6d2e2a73b87fa593f0f
 DIST cgnslib-3.3.0.tar.gz 3314889 BLAKE2B 3b8af11e04c211ca60f512c7995e9b23e0dd79180f3443f238562216073740de6b845c5bb78d6fb017bbf41e5249c1f58c27130047fd50afb4b20bbc778a046b SHA512 eb5c79d3830f8ee1fa30a67fbf32133c13a276c4b18a553826e4670bd4aa7262d7751bccb74c5e208cd47703f9076bde2e2e0db70408c88fde3ac11b638e6ff3
-DIST cgnslib_3.2.1.tar.gz 865223 BLAKE2B a4e8f65af1d750f2c2b06191cffdb7598036ce8ee3e1e52790ef68f90f4dfe06cf152bbcfbedcb682059473e942d64108e7b78160fd89166f361ac754cb3baaf SHA512 318fda24e7f5f20407c6026ad4b10a84a0ea02a04d3dab3e0e2277d21cbc1b43f04eb65c4b912a7964e1219cf83afdabb357d25b40e76add9bed8bd2564a674e
-EBUILD cgnslib-3.2.1.ebuild 1103 BLAKE2B efe88916045b6b9b0d12618ea4223e3b3ef755d56fd5021d878072933c84b9c1fd8861d8192a0cb07b85889820b13840f0175e962822bbdad2ce5450c91bdb3d SHA512 73bc128be53abcd968bf315f0663e02ceee4aad74730611fab15981c2d62a231e0e1dcb195b82f98ffb53e39528a2634d8b8022ed1110cbd5a61ca31dec4dacd
 EBUILD cgnslib-3.3.0.ebuild 1976 BLAKE2B d5bc20620ad851ee7dd2f491f1b17b2970ee7c41d3dcd640cb72704129767d3ee3a68613e0f5e7eb8ab4436ccd40ee8e6e1c9961ffe4188fd8206b20cf393d65 SHA512 6662f4a324febcec8164ac2ee037254c38a1822c2131467bc54c18c0d196194b8e2b08cc9183c4dc783d59a56cd3832b24ab6310c0f72406a0a2edb47c3f6a1d
 MISC metadata.xml 1202 BLAKE2B 812a82c8a2d93299ddd4c3e93913055971a18db1e3cdf581b9f34f6ba04dda4eda647b5762ee4509e1e48c6f3e823921ad3d08503a879feb26890c8eff3b1589 SHA512 320b2e7940f9c3ef6a47cbca31cdee70d97b38291da3f4552fd159d83594b88ab347cc71e22d50d7bf08e44a63d6b4b90bbf5e96c5a0d9780d2407d1ecf02a05
diff --git a/sci-libs/cgnslib/cgnslib-3.2.1.ebuild b/sci-libs/cgnslib/cgnslib-3.2.1.ebuild
deleted file mode 100644
index d7b52134e77c..000000000000
--- a/sci-libs/cgnslib/cgnslib-3.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED="fortran"
-
-inherit cmake-utils fortran-2 versionator
-
-MY_P="${PN}_$(replace_version_separator 3 '-')"
-MY_S="${PN}_$(get_version_component_range 1-2)"
-
-DESCRIPTION="The CFD General Notation System (CGNS) is a standard for CFD data"
-HOMEPAGE="http://www.cgns.org/"
-SRC_URI="mirror://sourceforge/project/cgns/${MY_S}/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fortran hdf5 legacy mpi szip zlib"
-
-DEPEND="
-	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
-	szip? ( virtual/szip )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}_${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCGNS_ENABLE_64BIT=ON
-		$(usex x86 -DCGNS_ENABLE_LFS=ON)
-		$(cmake-utils_use fortran CGNS_ENABLE_FORTRAN)
-		$(cmake-utils_use hdf5 CGNS_ENABLE_HDF5)
-		$(cmake-utils_use legacy CGNS_ENABLE_LEGACY)
-		$(cmake-utils_use mpi HDF5_NEED_MPI)
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch b/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch
deleted file mode 100644
index bf8ea5f2bfeb..000000000000
--- a/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch
+++ /dev/null
@@ -1,149 +0,0 @@
- CMakeLists.txt     | 20 +--------------
- src/CMakeLists.txt | 72 +++++++++++++++++++++++++++---------------------------
- 2 files changed, 37 insertions(+), 55 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d9c1b3c..d4c2bf7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,7 +81,7 @@ if (CGNS_ENABLE_LFS)
-     if (HAVE_OPEN64)
-       add_definitions(-DHAVE_LSEEK64)
-     endif (HAVE_OPEN64)
--    if (HAVE_OPEN64)
-+    if (HAVE_LSEEK64)
-       add_definitions(-DHAVE_LSEEK64)
-     endif (HAVE_LSEEK64)
-   endif (WIN32)
-@@ -254,24 +254,6 @@ else (CGNS_ENABLE_HDF5 AND HDF5_NEED_MPI)
-   mark_as_advanced(FORCE CGNS_ENABLE_PARALLEL)
- endif (CGNS_ENABLE_HDF5 AND HDF5_NEED_MPI)
- 
--####################
--# RPATH Management #
--####################
--
--# use, i.e. don't skip the full RPATH for the build tree
--set(CMAKE_SKIP_BUILD_RPATH  FALSE)
--
--# when building, don't use the install RPATH already
--# (but later on when installing)
--set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
--
--# the RPATH to be used when installing
--set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
--
--# add the automatically determined parts of the RPATH
--# which point to directories outside the build tree to the install RPATH
--set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--
- ########
- # CGNS #
- ########
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3c12c6d..694da42 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -69,7 +69,7 @@ set(SYSCFLAGS "")
- set(CFGFLAGS "")
- set(LIBS "")
- 
--file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/lib LIBDIR)
-+file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} LIBDIR)
- file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/include INCLUDEDIR)
- file(TO_NATIVE_PATH ${CMAKE_C_COMPILER} CC)
- if (WIN32)
-@@ -102,42 +102,42 @@ set(ZLIBLIB "")
- set(MPIINC "")
- set(MPILIBS "")
- 
--macro(native_paths INPUT_PATH_VARIABLE RESULT_VARIABLE)

--  set(${RESULT_VARIABLE} "")

--  foreach(PATH ${${INPUT_PATH_VARIABLE}})

--    file(TO_NATIVE_PATH ${PATH} NATIVE_PATH)

--    list(APPEND ${RESULT_VARIABLE} ${NATIVE_PATH})

--  endforeach(PATH ${${INPUT_PATH_VARIABLE}})

--endmacro(native_paths)

-+macro(native_paths INPUT_PATH_VARIABLE RESULT_VARIABLE)
-+  set(${RESULT_VARIABLE} "")
-+  foreach(PATH ${${INPUT_PATH_VARIABLE}})
-+    file(TO_NATIVE_PATH ${PATH} NATIVE_PATH)
-+    list(APPEND ${RESULT_VARIABLE} ${NATIVE_PATH})
-+  endforeach(PATH ${${INPUT_PATH_VARIABLE}})
-+endmacro(native_paths)
- 
- if (CGNS_ENABLE_HDF5)
-   set(BUILDHDF5 1)
--  if (HDF5_INCLUDE_PATH)

--    native_paths(HDF5_INCLUDE_PATH HDF5INC)

--  endif (HDF5_INCLUDE_PATH)

--  if (HDF5_LIBRARY)

--    native_paths(HDF5_LIBRARY HDF5LIB)

--  endif (HDF5_LIBRARY)

--  if (HDF5_NEED_SZIP)

--    set(H5NEEDSZIP 1)

--    if (SZIP_LIBRARY)

--      native_paths(SZIP_LIBRARY SZIPLIB)

--    endif (SZIP_LIBRARY)

--  endif (HDF5_NEED_SZIP)

--  if (HDF5_NEED_ZLIB)

--    set(H5NEEDZLIB 1)

--    if (ZLIB_LIBRARY)

--      native_paths(${ZLIB_LIBRARY} ZLIBLIB)

--    endif (ZLIB_LIBRARY)

--  endif (HDF5_NEED_ZLIB)

--  if (HDF5_NEED_MPI)

--    set(H5NEEDMPI 1)

--    if (MPI_INC)

--      native_paths(MPI_INC MPIINC)

--    endif (MPI_INC)

--    if (MPI_LIBS)

--      native_paths(MPI_LIBS MPILIBS)

--    endif (MPI_LIBS)

-+  if (HDF5_INCLUDE_PATH)
-+    native_paths(HDF5_INCLUDE_PATH HDF5INC)
-+  endif (HDF5_INCLUDE_PATH)
-+  if (HDF5_LIBRARY)
-+    native_paths(HDF5_LIBRARY HDF5LIB)
-+  endif (HDF5_LIBRARY)
-+  if (HDF5_NEED_SZIP)
-+    set(H5NEEDSZIP 1)
-+    if (SZIP_LIBRARY)
-+      native_paths(SZIP_LIBRARY SZIPLIB)
-+    endif (SZIP_LIBRARY)
-+  endif (HDF5_NEED_SZIP)
-+  if (HDF5_NEED_ZLIB)
-+    set(H5NEEDZLIB 1)
-+    if (ZLIB_LIBRARY)
-+      native_paths(${ZLIB_LIBRARY} ZLIBLIB)
-+    endif (ZLIB_LIBRARY)
-+  endif (HDF5_NEED_ZLIB)
-+  if (HDF5_NEED_MPI)
-+    set(H5NEEDMPI 1)
-+    if (MPI_INC)
-+      native_paths(MPI_INC MPIINC)
-+    endif (MPI_INC)
-+    if (MPI_LIBS)
-+      native_paths(MPI_LIBS MPILIBS)
-+    endif (MPI_LIBS)
-     if (CGNS_ENABLE_PARALLEL)
-       set(BUILDPARALLEL 1)
-     endif (CGNS_ENABLE_PARALLEL)
-@@ -251,7 +251,7 @@ if(CGNS_BUILD_SHARED)
- endif(CGNS_BUILD_SHARED)
- 
- # Set the install path of the static library
--install(TARGETS cgns_static ARCHIVE DESTINATION lib)
-+install(TARGETS cgns_static ARCHIVE DESTINATION lib${LIB_SUFFIX})
- # Set the install path of the shared library
- if(CGNS_BUILD_SHARED)
-   # for windows, need to install both cgnsdll.dll and cgnsdll.lib
-@@ -259,7 +259,7 @@ if(CGNS_BUILD_SHARED)
-     install(TARGETS cgns_shared ARCHIVE DESTINATION lib)
-     install(TARGETS cgns_shared RUNTIME DESTINATION lib)
-   else (WIN32 OR CYGWIN)
--    install(TARGETS cgns_shared LIBRARY DESTINATION lib)
-+    install(TARGETS cgns_shared LIBRARY DESTINATION lib${LIB_SUFFIX})
-   endif (WIN32 OR CYGWIN)
- endif(CGNS_BUILD_SHARED)
-