commit: 5a599503c4e21e13a107e2d5935d074d84694d5c Author: Harald Weiner <timeraider4u <AT> users <DOT> noreply <DOT> github <DOT> com> AuthorDate: Tue Mar 14 09:40:10 2017 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Tue Mar 14 09:40:10 2017 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5a599503
sci-mathematics/axel: added new ebuild (#744) * sci-libs/dtk: added new ebuild Package-manager: portage-2.3.3 repoman-2.3.1 * sci-mathematics/axel: added new ebuild Package-manager: portage-2.3.3 repoman-2.3.1 * sci-mathematics/axel-vtkview: added new ebuild Package-manager: portage-2.3.3 repoman-2.3.1 * sci-libs/dtk,sci-mathematics/axel,sci-mathematics/axel-vtkview: added new ebuilds (updates for requested changes) * sci-libs/dtk,sci-mathematics/axel,sci-mathematics/axel-vtkview: added new ebuilds (updates for requested changes, added a required use-flag) Package-manager: portage-2.3.3 repoman-2.3.1 sci-libs/dtk/dtk-2017.02.16.ebuild | 39 +++++++++++++ sci-libs/dtk/metadata.xml | 12 ++++ .../axel-vtkview/axel-vtkview-2017.02.16.ebuild | 40 +++++++++++++ .../files/2017.02.16/CMakeLists.txt.patch | 21 +++++++ .../2017.02.16/axlVtkView-CMakeLists.txt.patch | 10 ++++ sci-mathematics/axel-vtkview/metadata.xml | 12 ++++ sci-mathematics/axel/axel-2017.02.16.ebuild | 61 ++++++++++++++++++++ .../files/2017.02.16/AxelConfig.cmake.in.patch | 13 +++++ .../axel/files/2017.02.16/CMakeLists.txt.patch | 49 ++++++++++++++++ .../files/2017.02.16/install-AxelConfig.cmake.in | 67 ++++++++++++++++++++++ .../2017.02.16/install-axel-config.h.in.patch | 12 ++++ .../axel/files/2017.02.16/main.cpp.patch | 23 ++++++++ sci-mathematics/axel/metadata.xml | 12 ++++ 13 files changed, 371 insertions(+) diff --git a/sci-libs/dtk/dtk-2017.02.16.ebuild b/sci-libs/dtk/dtk-2017.02.16.ebuild new file mode 100644 index 000000000..6ef40677c --- /dev/null +++ b/sci-libs/dtk/dtk-2017.02.16.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="Meta-platform for modular scientific platform development" +HOMEPAGE="https://github.com/d-tk/dtk"; +SRC_URI="https://timeraider4u.github.io/distfiles/files/${P}.tar.gz"; + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtnetwork:5 + dev-qt/qtgui:5 + dev-qt/qtdeclarative:5 + dev-qt/qttest:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5" +DEPEND="${RDEPEND} + dev-lang/swig:0" + +src_configure() { + local mycmakeargs=( + -DDTK_BUILD_SUPPORT_COMPOSER=ON + -DDTK_BUILD_SUPPORT_CORE=ON + -DDTK_BUILD_SUPPORT_CONTAINER=ON + -DDTK_BUILD_SUPPORT_DISTRIBUTED=ON + -DDTK_BUILD_SUPPORT_GUI=ON + -DDTK_BUILD_SUPPORT_MATH=ON + ) + cmake-utils_src_configure +} diff --git a/sci-libs/dtk/metadata.xml b/sci-libs/dtk/metadata.xml new file mode 100644 index 000000000..ec9fa9d47 --- /dev/null +++ b/sci-libs/dtk/metadata.xml @@ -0,0 +1,12 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer type="person"> + <email>harald.wei...@jku.at</email> + <name>Harald Weiner</name> + </maintainer> + <maintainer type="project"> + <email>s...@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> +</pkgmetadata> diff --git a/sci-mathematics/axel-vtkview/axel-vtkview-2017.02.16.ebuild b/sci-mathematics/axel-vtkview/axel-vtkview-2017.02.16.ebuild new file mode 100644 index 000000000..48d2eab66 --- /dev/null +++ b/sci-mathematics/axel-vtkview/axel-vtkview-2017.02.16.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="Vtk plug-in for sci-mathematics/axel" +HOMEPAGE="http://dtk.inria.fr/axel/"; +SRC_URI="https://timeraider4u.github.io/distfiles/files/${P}.tar.gz"; + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="~sci-libs/dtk-${PV} + ~sci-mathematics/axel-${PV} + >=sci-libs/vtk-6.0.0[qt5,rendering]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PV}/CMakeLists.txt.patch" + "${FILESDIR}/${PV}/axlVtkView-CMakeLists.txt.patch" +) + +src_configure() { + local mycmakeargs=( + -DAXL=ON + -DAXEL_USED=ON + -DDTK_USED=ON + -DBUILD_FOR_RELEASE=ON + -Daxel-sdk_VERSION_MAJOR=2 + -Daxel-sdk_VERSION_MINOR=4 + -Daxel-sdk_VERSION_PATCH=0 + -DVTK_QT_VERSION:STRING=5 + -DVTKVIEW_USED=ON + ) + cmake-utils_src_configure +} diff --git a/sci-mathematics/axel-vtkview/files/2017.02.16/CMakeLists.txt.patch b/sci-mathematics/axel-vtkview/files/2017.02.16/CMakeLists.txt.patch new file mode 100644 index 000000000..0ce95b0db --- /dev/null +++ b/sci-mathematics/axel-vtkview/files/2017.02.16/CMakeLists.txt.patch @@ -0,0 +1,21 @@ +--- a/CMakeLists.txt 2017-03-01 18:07:06.105852551 +0100 ++++ b/CMakeLists.txt 2017-03-01 18:08:32.199894675 +0100 +@@ -202,6 +202,7 @@ + find_package (Qt5Core REQUIRED) + find_package (Qt5Sql REQUIRED) + find_package (Qt5WebKitWidgets REQUIRED) ++find_package (Qt5Xml REQUIRED) + + set (QT_USE_QTXML 1) + set (QT_USE_QTOPENGL 1) +@@ -319,3 +320,10 @@ + # Build axl + ###################################################################### + add_subdirectory (axl) ++ ++install ( FILES "${CMAKE_BINARY_DIR}/plugins/libaxlVtkView.so" ++ DESTINATION lib/axel-plugins) ++ ++install ( DIRECTORY "${PROJECT_SOURCE_DIR}/axl/axlVtkView" ++ DESTINATION include/ ++ FILES_MATCHING PATTERN "*.h") diff --git a/sci-mathematics/axel-vtkview/files/2017.02.16/axlVtkView-CMakeLists.txt.patch b/sci-mathematics/axel-vtkview/files/2017.02.16/axlVtkView-CMakeLists.txt.patch new file mode 100644 index 000000000..33a789bd3 --- /dev/null +++ b/sci-mathematics/axel-vtkview/files/2017.02.16/axlVtkView-CMakeLists.txt.patch @@ -0,0 +1,10 @@ +--- a/axl/axlVtkView/CMakeLists.txt.orig 2016-04-08 15:02:22.921914810 +0200 ++++ b/axl/axlVtkView/CMakeLists.txt 2016-04-08 15:03:05.692913022 +0200 +@@ -167,6 +167,7 @@ + qt5_use_modules(${LIB_NAME} Gui) + qt5_use_modules(${LIB_NAME} OpenGL) + qt5_use_modules(${LIB_NAME} Widgets) ++qt5_use_modules(${LIB_NAME} Xml) + + ## ################################################################# + ## Target properties diff --git a/sci-mathematics/axel-vtkview/metadata.xml b/sci-mathematics/axel-vtkview/metadata.xml new file mode 100644 index 000000000..ec9fa9d47 --- /dev/null +++ b/sci-mathematics/axel-vtkview/metadata.xml @@ -0,0 +1,12 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer type="person"> + <email>harald.wei...@jku.at</email> + <name>Harald Weiner</name> + </maintainer> + <maintainer type="project"> + <email>s...@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> +</pkgmetadata> diff --git a/sci-mathematics/axel/axel-2017.02.16.ebuild b/sci-mathematics/axel/axel-2017.02.16.ebuild new file mode 100644 index 000000000..31499d2c3 --- /dev/null +++ b/sci-mathematics/axel/axel-2017.02.16.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils user + +DESCRIPTION="Algebraic geometric modeling platform" +HOMEPAGE="http://dtk.inria.fr/axel/"; +SRC_URI="https://timeraider4u.github.io/distfiles/files/${P}.tar.gz"; + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="~sci-libs/dtk-${PV}" +DEPEND="${RDEPEND}" + +pkg_setup() { + AXEL_DATA_DIR="/usr/share/axel/data" + AXEL_PLUGINS_DIR="/usr/lib/axel-plugins" + AXEL_GROUP="dtk-axel" + enewgroup "${AXEL_GROUP}" +} + +PATCHES=( + "${FILESDIR}/${PV}/CMakeLists.txt.patch" + "${FILESDIR}/${PV}/AxelConfig.cmake.in.patch" + "${FILESDIR}/${PV}/install-axel-config.h.in.patch" + "${FILESDIR}/${PV}/main.cpp.patch" +) + +src_prepare() { + cp "${FILESDIR}/${PV}/install-AxelConfig.cmake.in" \ + "${S}/cmake/install-AxelConfig.cmake.in" || \ + die "Could not copy '${FILESDIR}/${PV}/install-AxelConfig.cmake.in' to '${S}/cmake/'" + # patches are applied by cmake-utils + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DAXL=ON + -DDTK_USED=ON + -DBUILD_FOR_RELEASE=ON + -Daxel-sdk_VERSION_MAJOR=2 + -Daxel-sdk_VERSION_MINOR=4 + -Daxel-sdk_VERSION_PATCH=0 + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + keepdir "${AXEL_DATA_DIR}" + keepdir "${AXEL_PLUGINS_DIR}" + # allow users to develop plug-ins + fowners "root:${AXEL_GROUP}" "${AXEL_PLUGINS_DIR}" + fperms g+w "${AXEL_PLUGINS_DIR}" +} diff --git a/sci-mathematics/axel/files/2017.02.16/AxelConfig.cmake.in.patch b/sci-mathematics/axel/files/2017.02.16/AxelConfig.cmake.in.patch new file mode 100644 index 000000000..26156df50 --- /dev/null +++ b/sci-mathematics/axel/files/2017.02.16/AxelConfig.cmake.in.patch @@ -0,0 +1,13 @@ +--- a/cmake/AxelConfig.cmake.in.orig 2016-04-09 21:54:56.363950425 +0200 ++++ b/cmake/AxelConfig.cmake.in 2016-04-09 22:05:45.816923263 +0200 +@@ -1,7 +1,7 @@ + +-set (@PKG_NAME@_INCLUDE_DIR @PROJECT_SOURCE_DIR@/src @dtk_INCLUDE_DIRS@) +-set (@PKG_NAME@_LIBRARY_DIR @CMAKE_BINARY_DIR@/lib) +-set (@PKG_NAME@_PLUGIN_DIR @CMAKE_BINARY_DIR@/plugins) ++set (@PKG_NAME@_INCLUDE_DIR @PROJECT_SOURCE_DIR@/src @dtk_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include/axlCore @CMAKE_INSTALL_PREFIX@/include/axlGui) ++set (@PKG_NAME@_LIBRARY_DIR @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@) ++set (@PKG_NAME@_PLUGIN_DIR @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/axel-plugins) + + if (APPLE) + set (@PKG_NAME@_PLUGIN_DIR @CMAKE_BINARY_DIR@/bin/axel.app/Contents/PlugIns) diff --git a/sci-mathematics/axel/files/2017.02.16/CMakeLists.txt.patch b/sci-mathematics/axel/files/2017.02.16/CMakeLists.txt.patch new file mode 100644 index 000000000..967262670 --- /dev/null +++ b/sci-mathematics/axel/files/2017.02.16/CMakeLists.txt.patch @@ -0,0 +1,49 @@ +--- a/CMakeLists.txt 2017-03-01 16:45:56.000000000 +0100 ++++ b/CMakeLists.txt 2017-03-01 16:53:47.896067236 +0100 +@@ -32,7 +32,7 @@ + #set(AXEL_VERSION ${PROJECT_VERSION}) + + set(AXEL_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) +-set(AXEL_PLUGIN_DIR ${CMAKE_BINARY_DIR}/plugins) ++set(AXEL_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/axel-plugins) + if (APPLE) + set (AXEL_PLUGIN_DIR ${CMAKE_BINARY_DIR}/bin/axel.app/Contents/PlugIns) + endif (APPLE) +@@ -323,18 +323,31 @@ + #################################################################### + if(BUILD_FOR_RELEASE) + configure_file ( "${PROJECT_SOURCE_DIR}/cmake/install-AxelConfig.cmake.in" +- "${CMAKE_BINARY_DIR}/for_installer/lib/cmake/AxelConfig.cmake" ++ "${CMAKE_BINARY_DIR}/lib/cmake/AxelConfig.cmake" + @ONLY IMMEDIATE) + +-install ( FILES "${CMAKE_BINARY_DIR}/for_installer/lib/cmake/AxelConfig.cmake" +- DESTINATION lib/cmake) ++install ( FILES "${CMAKE_BINARY_DIR}/lib/cmake/AxelConfig.cmake" ++ DESTINATION lib/cmake/Axel) + + configure_file ( "${PROJECT_SOURCE_DIR}/cmake/install-axel-config.h.in" +- "${CMAKE_BINARY_DIR}/for_installer/include/axel-config.h" ++ "${CMAKE_BINARY_DIR}/include/axel-config.h" + @ONLY IMMEDIATE) + +-install ( FILES "${CMAKE_BINARY_DIR}/for_installer/include/axel-config.h" +- DESTINATION include) ++install ( FILES "${CMAKE_BINARY_DIR}/include/axel-config.h" ++ DESTINATION include/Axel) ++install ( FILES "${CMAKE_BINARY_DIR}/src/axlCore/axlCoreExport.h" ++ DESTINATION include/axlCore) ++install ( FILES "${CMAKE_BINARY_DIR}/src/axlGui/axlGuiExport.h" ++ DESTINATION include/axlGui) ++ ++install(DIRECTORY "${PROJECT_SOURCE_DIR}/src/axlCore" ++ DESTINATION include/ ++ FILES_MATCHING PATTERN "*.h" ++) ++install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/axlGui ++ DESTINATION include/ ++ FILES_MATCHING PATTERN "*.h" ++) + endif(BUILD_FOR_RELEASE) + ###################################################################### + # Update diff --git a/sci-mathematics/axel/files/2017.02.16/install-AxelConfig.cmake.in b/sci-mathematics/axel/files/2017.02.16/install-AxelConfig.cmake.in new file mode 100644 index 000000000..8de7aba44 --- /dev/null +++ b/sci-mathematics/axel/files/2017.02.16/install-AxelConfig.cmake.in @@ -0,0 +1,67 @@ +## Version: $Id$ +## +###################################################################### +## +### Commentary: +## +###################################################################### +## +### Change Log: +## +###################################################################### +## + + +## ################################################################### +## Defines: +## - Axel_INCLUDE_DIRS +## ################################################################### + +set(Axel_INCLUDE_DIRS + "@CMAKE_INSTALL_PREFIX@/include" + "@CMAKE_INSTALL_PREFIX@/include/Axel" + "@CMAKE_INSTALL_PREFIX@/include/axlCore" + "@CMAKE_INSTALL_PREFIX@/include/axlGui") + +set(CMAKE_MODULE_PATH + ${CMAKE_MODULE_PATH} "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/Axel/") + +set(AXEL_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@") + +set(AXEL_INSTALL_DOCS "@CMAKE_INSTALL_PREFIX@/doc") + +set(AXEL_PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/axel-plugins") + +#include("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/Axel/axelDepends.cmake") + +find_package(Qt5 REQUIRED COMPONENTS + Core + Concurrent + Network + Quick + Svg + Test + Widgets + Xml) + +find_package(dtk REQUIRED) + +## ################################################################### +## Options +## ################################################################### + +## ################################################################### +## Always full RPATH +## ################################################################### + +include(GNUInstallDirs) +SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + +# the RPATH to be used when installing, but only if it's not a system directory +LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" isSystemDir) +IF("${isSystemDir}" STREQUAL "-1") + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +ENDIF("${isSystemDir}" STREQUAL "-1") + +###################################################################### +### AxelConfig.cmake.in ends here diff --git a/sci-mathematics/axel/files/2017.02.16/install-axel-config.h.in.patch b/sci-mathematics/axel/files/2017.02.16/install-axel-config.h.in.patch new file mode 100644 index 000000000..3b0ce511e --- /dev/null +++ b/sci-mathematics/axel/files/2017.02.16/install-axel-config.h.in.patch @@ -0,0 +1,12 @@ +--- a/cmake/install-axel-config.h.in.orig 2016-04-09 02:52:24.299133099 +0200 ++++ b/cmake/install-axel-config.h.in 2016-04-09 02:54:46.051127171 +0200 +@@ -12,7 +12,7 @@ + #define AXEL_SOURCE_DIR "[INSTALLER_TARGET_DIR]" + + /* Directory of plugins */ +-#define AXEL_PLUGIN_DIR "[INSTALLER_TARGET_DIR]/@INSTALLER_PLUGIN_SUBDIR@" ++#define AXEL_PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/axel-plugins" + + /* Directory of data */ +-#define AXEL_DATA_DIR "[INSTALLER_TARGET_DIR]/data" ++#define AXEL_DATA_DIR "@CMAKE_INSTALL_PREFIX@/share/axel/data" diff --git a/sci-mathematics/axel/files/2017.02.16/main.cpp.patch b/sci-mathematics/axel/files/2017.02.16/main.cpp.patch new file mode 100644 index 000000000..d9a490d6f --- /dev/null +++ b/sci-mathematics/axel/files/2017.02.16/main.cpp.patch @@ -0,0 +1,23 @@ +--- axel-2017.02.16/app/axel/main.cpp 2017-03-01 17:35:15.329721658 +0100 ++++ axel-2017.02.16/app/axel/main.cpp 2017-03-01 17:41:45.095111231 +0100 +@@ -39,6 +39,7 @@ + #include <axlRpc/axlServer.h> + #endif + ++#include <axel-config.h> // For AXEL_PLUGIN_DIR, AXEL_DATA_DIR + + int main(int argc, char **argv) + { +@@ -84,7 +85,11 @@ + #elif defined(Q_OS_MAC) + QString pathPlugins = QString("%1/../PlugIns/").arg(qApp->applicationDirPath()); + #else +- QString pathPlugins = QString("%1/../plugins/").arg(qApp->applicationDirPath()); ++ #if defined(AXEL_PLUGIN_DIR) ++ QString pathPlugins = QString(AXEL_PLUGIN_DIR); ++ #else ++ QString pathPlugins = QString("%1/../plugins/").arg(qApp->applicationDirPath()); ++ #endif + #endif + dtkPluginManager::instance()->setPath(pathPlugins); + //Initialized all factories diff --git a/sci-mathematics/axel/metadata.xml b/sci-mathematics/axel/metadata.xml new file mode 100644 index 000000000..ec9fa9d47 --- /dev/null +++ b/sci-mathematics/axel/metadata.xml @@ -0,0 +1,12 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer type="person"> + <email>harald.wei...@jku.at</email> + <name>Harald Weiner</name> + </maintainer> + <maintainer type="project"> + <email>s...@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> +</pkgmetadata>
