sci-libs/votca-tools: version bump

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Christoph Junghans <junghans@gentoo.org>

diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index e412d312c79aecf606eb854518efb0bbf898c722..5900ee36f7d845860d94b3dfa60e120e7f797063 100644 (file)
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -2,3 +2,4 @@ DIST votca-tools-1.4.1.tar.gz 103152 BLAKE2B 73dc726ea899ceb65d0406f3795f1df79a6
 DIST votca-tools-1.4.tar.gz 103102 BLAKE2B a398d20b628148ec753ee1e59353e272dbda93848be11ecccaf2153385ebcac62c7b819c4ef0b9b1a7cfc7dfd85136d042726cc996af79a4dad64375f5aa9f6c SHA512 7c4bf2e2ba8cf795f03879138787db3875f48db56b88394c98b18cef0ae90e636d8aafff42eb62a408df06a91583e37e59b33440e83de9f4338295e9ccfc9be5
 DIST votca-tools-1.5.1.tar.gz 129629 BLAKE2B ab68b38241d2c065939cf0b2e08603eaaccf613454bb64056c3d3d03472501e2079408ce856fbcc7243d51d035acec0b52c9767e2d687234296c7858f1a46fa4 SHA512 c8fe4baee0f4586dbe1a9f5b7c33b7d6b16ef0ebc35b50febfdcb049b09cd150dec3a5e9b98b43430db66f866dd01c1776f6777f01d227246c9d7b7ca879ea72
 DIST votca-tools-1.5.tar.gz 129464 BLAKE2B 2ab72758cc7c9bed5a49c924f7f0a93dc562a43cefbcc84f393656fd6c6b165152114eab48131db4d42008472d01103b5abba6ae0cf12779fe1ffacbcd65dc11 SHA512 fdee932c861742961937bdb88a1ace8caa4041c38ce80ece3b27e8a4b624248c21bf9be63b157565d1114047d3895c8b959f95b4fa49225c0cd1b2e708ef54f0
+DIST votca-tools-1.6_rc1.tar.gz 128577 BLAKE2B d9270739c00f945ff4af24e45a529e73ff0da596956791991f03b5586134d16b5fec077b3859dcd685de96a334f419f5f82ede7df60614482c9fddc61a01ca8d SHA512 42b0eae148bb93293ac16e193d2595aaa850dcee0dcaab1f6cf0ca8e36a95a1719a03243d421fbfb1034c81baf2ef294768a86530f0d69b59862df95846241ed

diff --git a/sci-libs/votca-tools/files/197.patch b/sci-libs/votca-tools/files/197.patch
new file mode 100644 (file)
index 0000000..a0e4245
--- /dev/null
+++ b/sci-libs/votca-tools/files/197.patch
@@ -0,0 +1,27 @@
+From 32c497808d3ff52a25cd0367c602f57577d56352 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@votca.org>
+Date: Thu, 5 Dec 2019 07:16:02 -0700
+Subject: [PATCH] VOTCA_TOOLSConfig.cmake.in: only add VOTCA::votca_compare
+ once
+
+---
+ src/libtools/VOTCA_TOOLSConfig.cmake.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/libtools/VOTCA_TOOLSConfig.cmake.in b/src/libtools/VOTCA_TOOLSConfig.cmake.in
+index c69c0426..b129913f 100644
+--- a/src/libtools/VOTCA_TOOLSConfig.cmake.in
++++ b/src/libtools/VOTCA_TOOLSConfig.cmake.in
+@@ -2,8 +2,10 @@ include(CMakeFindDependencyMacro)
+ find_dependency(Eigen3 NO_MODULE)
+ find_dependency(Boost 1.53.0 REQUIRED COMPONENTS program_options)
+ include("${CMAKE_CURRENT_LIST_DIR}/VOTCA_TOOLS_Targets.cmake")
+-add_executable(VOTCA::votca_compare IMPORTED)
+-set_property(TARGET VOTCA::votca_compare PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_BINDIR@/votca_compare")
++if(NOT TARGET VOTCA::votca_compare)
++  add_executable(VOTCA::votca_compare IMPORTED)
++  set_property(TARGET VOTCA::votca_compare PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_BINDIR@/votca_compare")
++endif()
+ if(@MKL_FOUND@)
+   if(NOT TARGET MKL::MKL)
+     add_library(MKL::MKL UNKNOWN IMPORTED)

diff --git a/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild b/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
new file mode 100644 (file)
index 0000000..888d78e
--- /dev/null
+++ b/sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils eutils multilib
+
+if [ "${PV}" != "9999" ]; then
+       SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+       S="${WORKDIR}/${P#votca-}"
+else
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/${PN/-//}.git"
+       KEYWORDS=""
+fi
+
+DESCRIPTION="Votca tools library"
+HOMEPAGE="http://www.votca.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+       dev-libs/boost:=
+       dev-libs/expat
+       >=dev-cpp/eigen-3.3
+       sci-libs/fftw:3.0"
+
+DEPEND="${RDEPEND}
+       >=app-text/txt2tags-2.5
+       virtual/pkgconfig"
+
+DOCS=( NOTICE )
+
+PATCHES=( "${FILESDIR}/197.patch" )
+
+src_configure() {
+       mycmakeargs=(
+               -DWITH_RC_FILES=OFF
+       )
+       cmake-utils_src_configure
+}

diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild
index a0839fa8779c6bb2dba93aa4c331116d49e6505c..6088d1e095d973e07dfd61ffb2fe730586b667fd 100644 (file)
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
@@ -22,17 +22,15 @@ HOMEPAGE="http://www.votca.org"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc +fftw sqlite"
+IUSE=""
 
 RDEPEND="
        dev-libs/boost:=
        dev-libs/expat
        >=dev-cpp/eigen-3.3
-       fftw? ( sci-libs/fftw:3.0 )
-       sqlite? ( dev-db/sqlite:3 )"
+       sci-libs/fftw:3.0"
 
 DEPEND="${RDEPEND}
-       doc? ( >=app-doc/doxygen-1.7.6.1[dot] )
        >=app-text/txt2tags-2.5
        virtual/pkgconfig"
 
@@ -40,18 +38,7 @@ DOCS=( NOTICE )
 
 src_configure() {
        mycmakeargs=(
-               -DWITH_FFTW=$(usex fftw)
-               -DWITH_SQLITE3=$(usex sqlite)
                -DWITH_RC_FILES=OFF
        )
        cmake-utils_src_configure
 }
-
-src_install() {
-       cmake-utils_src_install
-       if use doc; then
-               cd "${CMAKE_BUILD_DIR}"
-               cmake-utils_src_make html
-               dodoc -r share/doc/html
-       fi
-}