sci-mathematics/gismo: version bump (#743)

Package-manager: portage-2.3.3 repoman-2.3.1

5 files changed, 11 insertions, 102 deletions

diff --git a/sci-mathematics/gismo/Manifest b/sci-mathematics/gismo/Manifest
index a0cf16aae..aea878b91 100644
--- a/sci-mathematics/gismo/Manifest
+++ b/sci-mathematics/gismo/Manifest
@@ -1 +1 @@
-DIST gismo-0.8.1.tar.gz 3328760 SHA256 03d25bda9d0d311fdc142c6e113ff9018e7f87737e6c70c2df441c28adeb2013 SHA512 3dac7ddb08d7f651027cb4539ec7c48b82e43948b9567f4a716c37b539693d482ef7fd4467fb60085059d5c76633b69056f08db8e7ba05373383168460850227 WHIRLPOOL 3f6c5b9c2c1baceb94802f99c9ff4afaa78f9f403ca1c469feea31bc1de3a5eb22f558f38fd3423169280690c2811b0729d2e7162a755e492529752dc990dcfd
+DIST gismo-2017.02.16.tar.gz 4370643 SHA256 0ef03916d62b2273fd5ca2e2dfbe22a9771b31f4e9a83a5ba75d0a746719f167 SHA512 c9d9e3541e1195eca84f75217f1bfb2444db4fdca936fa32513cdabbc89a482be8b940345dd3fff2bea0b0a0806b7aff0c0c4484505a2d0451aa7ab6e923291d WHIRLPOOL ab1b376f50456c0be391034f3027a7ea8bc39453d32a2b2113cd19dcbb5247c390a5ae87cd99f8e936082af92947d67c18e3eb2d1aacaf369fa684323e73e234
diff --git a/sci-mathematics/gismo/files/doc-install.patch b/sci-mathematics/gismo/files/doc-install.patch
deleted file mode 100644
index 6f730bd3e..000000000
--- a/sci-mathematics/gismo/files/doc-install.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- cmake/gsInstall.cmake	2015-08-08 12:39:45.000000000 +0200
-+++ cmake/gsInstall.cmake	2015-10-15 19:08:34.735776106 +0200
-@@ -1,6 +1,15 @@
--## #################################################################
-+######################################################################
-+## gsIntall.cmake ---
-+## This file is part of the G+Smo library.
-+## 
-+## Author: Angelos Mantzaflaris 
-+## Author: Harald Weiner
-+## Copyright (C) 2012-2015 - RICAM-Linz.
-+######################################################################
-+
-+######################################################################
- ## Installation
--## #################################################################
-+######################################################################
- 
- message ("  CMAKE_INSTALL_PREFIX    ${CMAKE_INSTALL_PREFIX}")
- 
-@@ -128,3 +137,25 @@
-    message ("Configure with -DGISMO_BUILD_LIB=ON to compile the library")
- endif(GISMO_BUILD_LIB)
- 
-+# Install docs (if available)
-+set(DOC_SRC_DIR "${PROJECT_BINARY_DIR}/doc/html/")
-+#message("DOC_SRC_DIR='${DOC_SRC_DIR}'")
-+
-+set(TMP_VERSION "${gismo_VERSION}")
-+string(REGEX REPLACE "[a-zA-Z]+" "" TMP_VERSION ${TMP_VERSION})
-+#message("TMP_VERSION='${TMP_VERSION}'")
-+set(DOC_INSTALL_DIR share/doc/gismo-${TMP_VERSION} CACHE PATH 
-+                       "Installation directory for documentation")
-+#message("DOC_INSTALL_DIR='${DOC_INSTALL_DIR}'")
-+
-+install(DIRECTORY "${DOC_SRC_DIR}"
-+               DESTINATION "${DOC_INSTALL_DIR}/"
-+               USE_SOURCE_PERMISSIONS
-+               OPTIONAL 
-+               FILES_MATCHING
-+                       PATTERN "*.css"
-+                       PATTERN "*.html"
-+                       PATTERN "*.js"
-+                       PATTERN "*.jpg"
-+                       PATTERN "*.png"
-+)
diff --git a/sci-mathematics/gismo/files/examples-CMakeLists.patch b/sci-mathematics/gismo/files/examples-CMakeLists.patch
deleted file mode 100644
index 980f4825c..000000000
--- a/sci-mathematics/gismo/files/examples-CMakeLists.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- examples/CMakeLists.txt	2015-08-08 12:39:45.000000000 +0200
-+++ examples/CMakeLists.txt	2015-10-14 16:19:16.387637011 +0200
-@@ -1,7 +1,8 @@
- ### CMakeLists.txt ---
- ## 
- ## Author: Angelos Mantzaflaris 
--## Copyright (C) 2012 - RICAM-Linz.
-+## Author: Harald Weiner
-+## Copyright (C) 2012-2015 - RICAM-Linz.
- ######################################################################
- 
- cmake_minimum_required(VERSION 2.8.8)
-@@ -11,7 +12,12 @@
- cmake_policy(SET CMP0048 OLD)
- endif()
- 
--project(gismo-examples)
-+project(examples)
-+
-+# Add a grouping target that builds all tests this is equivalent to
-+# running "make" inside the tests build folder
-+add_custom_target(${PROJECT_NAME})
-+set_property(TARGET ${PROJECT_NAME} PROPERTY LABELS "${PROJECT_NAME};gismo")
- 
- #find_package(gismo REQUIRED)
- #include_directories( ${GISMO_INCLUDE_DIRS})
-@@ -24,6 +30,19 @@
- 
- foreach(file ${FILES})
-     add_gismo_executable(${file})
-+    get_filename_component(tarname ${file} NAME_WE) # name without extension
-+    set_property(TEST ${tarname} PROPERTY LABELS "${PROJECT_NAME};gismo")
-+    add_dependencies(${PROJECT_NAME} ${tarname})
-+    # install the example executables to <CMAKE_INSTALL_PREFIX>/bin/
-+	# message("install_bin_dir='${INSTALL_BIN_DIR}'")
-+	# message("targets add='${tarname}'")
-+    install(TARGETS ${tarname} 
-+		DESTINATION "${INSTALL_BIN_DIR}/"
-+		PERMISSIONS
-+			OWNER_READ OWNER_WRITE OWNER_EXECUTE
-+			GROUP_READ GROUP_WRITE GROUP_EXECUTE
-+			WORLD_READ WORLD_EXECUTE
-+	)
- endforeach(file ${FILES})
- 
- list(LENGTH FILES len)
diff --git a/sci-mathematics/gismo/gismo-0.8.1.ebuild b/sci-mathematics/gismo/gismo-2017.02.16.ebuild
index 86eea9414..e3a8f1869 100644
--- a/sci-mathematics/gismo/gismo-0.8.1.ebuild
+++ b/sci-mathematics/gismo/gismo-2017.02.16.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils eutils
 
 DESCRIPTION='C++ library for geometric design and numerical simulation'
 HOMEPAGE="https://gs.jku.at/gismo"
-SRC_URI="https://github.com/filiatra/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://timeraider4u.github.io/distfiles/files/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
@@ -19,14 +19,11 @@ IUSE="doc examples"
 DEPEND="
 	doc? ( >=app-doc/doxygen-1.8 )"
 
-src_prepare() {
-	epatch "${FILESDIR}/examples-CMakeLists.patch"
-	epatch "${FILESDIR}/doc-install.patch"
-}
-
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use examples GISMO_BUILD_EXAMPLES)
+		-DGISMO_BUILD_EXAMPLES=$(usex examples)
+		# set to same directory as the one used by einstalldocs
+		-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
 	)
 	cmake-utils_src_configure
 }
diff --git a/sci-mathematics/gismo/metadata.xml b/sci-mathematics/gismo/metadata.xml
index d9e70962e..ce39098f1 100644
--- a/sci-mathematics/gismo/metadata.xml
+++ b/sci-mathematics/gismo/metadata.xml
@@ -5,4 +5,8 @@
 		<email>harald.weiner@jku.at</email>
 		<name>Harald Weiner</name>
 	</maintainer>
+	<use>
+		<flag name="doc">Build doxygen-documentation</flag>
+		<flag name="examples">Build examples</flag>
+	</use>
 </pkgmetadata>