From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- sci-libs/votca-tools/Manifest | 5 ++- sci-libs/votca-tools/files/197.patch | 27 +++++++++++++++ sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild | 46 +++++++++++++++++++++++++ sci-libs/votca-tools/votca-tools-9999.ebuild | 21 +++-------- 4 files changed, 81 insertions(+), 18 deletions(-) create mode 100644 sci-libs/votca-tools/files/197.patch create mode 100644 sci-libs/votca-tools/votca-tools-1.6_rc1.ebuild (limited to 'sci-libs/votca-tools') diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest index ccf4f0e32092..3a031cb310f9 100644 --- a/sci-libs/votca-tools/Manifest +++ b/sci-libs/votca-tools/Manifest @@ -1,10 +1,13 @@ +AUX 197.patch 1238 BLAKE2B c268890151942f8f5a285897d37626431b79963f7e0271d220be3de6903fd6557aebb706ad58f7e340acd0e331d49a957743f23a3b201f3d3c53a8e7a52da969 SHA512 6a65808d3b7e0e9ac928249949d2f807e420e871d35da58344baf822eab74395a91fa8d90efe5d4b649b1851c7eb0281e89037cb869e0bc6bc2ab6a2164bb604 DIST votca-tools-1.4.1.tar.gz 103152 BLAKE2B 73dc726ea899ceb65d0406f3795f1df79a6184d65e50e95be3768678a2d006b75e487dbe3df5d44be4b5ba3899aeeb01ed63b51755bd46b546b017ccc0406d38 SHA512 19165be7c9903cb664051a6556f9fd689b02af71156f040960008e8d74e4a32adfe283c67eb7b53c8bdc6ae6f72516ad0b674d9f2b3354ca50f082b1651dafef 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 EBUILD votca-tools-1.4.1.ebuild 1211 BLAKE2B d49fc0a98bfaf61cee9b1c38f058687591b81319788b578e91db513f76d452fec9e2116e503b22539f84bc0e567434d144b6ad22d3c62bd819b0fa817a7ccdea SHA512 920a37e44b7ad3d1e655843b22646d87f376bb93cbb99f7241ff538183b1d4df7aeb6ede66f04fee423bd112c651185d837423024fd1cdfde7350018b83ebde7 EBUILD votca-tools-1.4.ebuild 1182 BLAKE2B 2077617efbf04198cf2a0f53bbf07f87897a8420ec6ad9e1774c821e7e3789421a253b79e9f09e85abfdf1523ebba02400233199cee5d7966a03b97db4477155 SHA512 48eb152df0bc0ad1481179977c0a8b6947180d9978961024a57674414326eb370182c02f5fda3a902a03a14fe3f0e60f666787eb16729412426ee83f1a074613 EBUILD votca-tools-1.5.1.ebuild 1124 BLAKE2B d8bbb47af7f2b160f83719246b8c1c1e435970790aa1ec3922085959354347c61a845013a32da9edcbcad19c66e7dd25fd0fa8c2b908f795827c324452413183 SHA512 9219e23530a0f55cc4159f250e251c49ce61a8514b05d0d4eca7f224b340e0bcc313e82b57fb647141f683607be545044495da2eea956ea197cae029f52a5662 EBUILD votca-tools-1.5.ebuild 1122 BLAKE2B e6ca1c6354b17eae1f1574de117b2fe421965e05376ac2d13cff50814e5b2987fbac645be133037cf31b08513e09f96fba94cb02a82bab06c60a667b9147d75c SHA512 2482328a8306a0126c7ab17250be2ab91e823a1ae248e3d4bf15b27bf1f313b3277a132ba4e52362c92f1d4096a00f7b5e657afaa6de464866b551c5976c4be5 -EBUILD votca-tools-9999.ebuild 1118 BLAKE2B d0a35124322cd249fb57a49151889005a9e3da80d6a0c9196bedccbb34228857865820613aa5a706fed9a5a1657e08efceaa61022703836f97b5ca957675093b SHA512 95780c5025941d1c124fd8ae277360d3654217b7135993669fc50d7873a6b72d7d3f4d9518a99e96688be1efdfdf9b736a820f68120ff8b113d018185866b157 +EBUILD votca-tools-1.6_rc1.ebuild 854 BLAKE2B ee6c6234021d9a903a611fe75c64c612ea8c3c35c048c0663dfbff91d289410966d9aef8ca2533895b33d734d7333e7bb3dba9ae88db3b387dbee199bef2c2e5 SHA512 137867d077e0c84d49a76553f00e2182350643822c6961103aba45810b236e2333f3a9092b5572cb1588d658e0c1111aa2ffdc83e6b679d84af2d7c885fbb0da +EBUILD votca-tools-9999.ebuild 817 BLAKE2B 07c6d4667bf74c45a962fea7ad7af4d3e40910d7fb4c38713e30193c9d58d2553c693b28db361f7c0b7d16df2d05636fedc648a18934b77bd6f7faeefebb6b5c SHA512 4be6e932cb3a573465c907956d79f6f85c3f2d38bd867ce8488afdafdc4e005c3d953f5e8cfdc4a422ff16e39a8d844ed5e84e53e1155a800ab3844ffbd8a32c MISC metadata.xml 455 BLAKE2B 8f698a0352731cfaa42f58ad669e7a509fbc95082c9accedef69d91628528e29b55a03256f035446f1d1da9a8ac569f17136a2e05e87bb4300cbd4f4af9639ea SHA512 db6cffcdbb0d1b791e8d96338ea9226161d14130d4e6760fdc3997751fbae20e2452529a6403c5ddd0b0a30274f51465fea7edae60fc9655291bd0497f316c8d diff --git a/sci-libs/votca-tools/files/197.patch b/sci-libs/votca-tools/files/197.patch new file mode 100644 index 000000000000..a0e4245c7635 --- /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 +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 index 000000000000..888d78eb3405 --- /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 a0839fa8779c..6088d1e095d9 100644 --- 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 -} -- cgit v1.2.3