diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-16 17:34:21 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-16 17:34:21 +0000 |
| commit | 02e2208f46f4e2c00fb9743cbc47350bdd233bfa (patch) | |
| tree | 132dd60828854db4f65f30f9230f43d9602507ff /sci-libs/chemkit | |
| parent | 8be70107efbb417f839292165ee39d07a062046f (diff) | |
gentoo resync : 16.01.2018
Diffstat (limited to 'sci-libs/chemkit')
| -rw-r--r-- | sci-libs/chemkit/Manifest | 4 | ||||
| -rw-r--r-- | sci-libs/chemkit/chemkit-0.1-r2.ebuild (renamed from sci-libs/chemkit/chemkit-0.1-r1.ebuild) | 43 | ||||
| -rw-r--r-- | sci-libs/chemkit/metadata.xml | 3 |
3 files changed, 28 insertions, 22 deletions
diff --git a/sci-libs/chemkit/Manifest b/sci-libs/chemkit/Manifest index ed6649477d5d..30329518411d 100644 --- a/sci-libs/chemkit/Manifest +++ b/sci-libs/chemkit/Manifest @@ -1,5 +1,5 @@ AUX chemkit-0.1-multilib.patch 4694 BLAKE2B f52836ec887b9673c8eabac6ca4fb008aa23def355419f02704605438de44457f2a017a56a7fdd3ce387df08e5b57a0352052d2b88ff0e051a6cf47a192ffd1e SHA512 dedde9e5db14f088e5a70ebfcd9f46b6fbb2d60b1800a61ece1f7afef24caac502f129573823807caec050ba1515ad402a3615953b903a239c5287a5b96aa8b8 AUX chemkit-0.1-unbundle.patch 6103 BLAKE2B 9ee0f121fec938a528abb837ab386fec62a8576b5c7d123538ce95604953f4f30d0b285b27a153ef98629f053954324f7c384329fe3ca6873f2d18700e914ff8 SHA512 9edd39008763b56eb7697562536c4c4d476880a414ae1a305d1af64cee04e4ccb82585cfd15d2f7608b5200e39863a9a97c2a152110b28e501fbd055737ce015 DIST chemkit-0.1.tar.gz 5842235 BLAKE2B 9cf28dc6d2c067403172c4f54a057bf38ea9aeaebc96b9be819f4861d1559c1db440dd33baf15f739b2b0e6dc6ba3e73010e0b5aa1b46309435e7bbffb889259 SHA512 0273f8735333000b04007ccd7adc58f0c4809a570fa5a72e4161652d72e8953bf89cad0893c20ecbb3484d6c13a8828c92f12366dddeedaf591815c35f6ef011 -EBUILD chemkit-0.1-r1.ebuild 1838 BLAKE2B 31d611c5f385ab013ba8e0886cf7acc28e9c0a28fb305530f064d4665def5623403ae5891726f158b2ca217e63348f1905a850746d9ae0002e09ff2a6563ad0c SHA512 d1726b0239454b00623c807337341ff4bf5ad5da889e492da0613e09e34422c566322d2ceb68ebffcea52fd499d42c7678c7640b044d7b7a7312c84b4e322cb0 -MISC metadata.xml 453 BLAKE2B 4f54716d22e75ff9aae66893f194f7e52b12c632594e017d90682ffecfe6c51e85ea58cab892c63028f712c412f70401a87ca02d245568d108d16d3963f27f62 SHA512 4a492fc1856ccc3eda100f356ef4699bbbc9e51719015ffab0d14d6bf1077cd07f7be3a7113e93f9a1fb2acdc347dffe2fb68e6076c00e80f265cd35ec80019a +EBUILD chemkit-0.1-r2.ebuild 2000 BLAKE2B d6290e3de5dc1118bf89065d820cbfc1d44514e7aaf679d48d61beac4ef82c4a81cac93d34e6532601ed9f82572653d0524f136a6083cbdf152b64e87df75772 SHA512 14236546b1e91a844c32c0085d262962503c4ab5388ea0de6a3124920ee2975d1e5930509969d1ac1678acdeda6a35849666dc6b7e26babfeac2ce86a38de87a +MISC metadata.xml 352 BLAKE2B fbab9c9aa637ace5d90660942c8a34550c45bdf692b98ef583a77e5ed8d666877c09076314f6ec4081f91d12803fd1d8f50b7a715991e8e0ed0541e8473563b3 SHA512 b197aa62c04a5f668822db2e277407e7e871505f7adf5cfceaab36b5bc808f0b7582f17f9a00c7d4013eb4728b7a6ef61a52325deb182d6cd4a344e5d1e98cb1 diff --git a/sci-libs/chemkit/chemkit-0.1-r1.ebuild b/sci-libs/chemkit/chemkit-0.1-r2.ebuild index b620a1e9f7fd..c1cb99bc9455 100644 --- a/sci-libs/chemkit/chemkit-0.1-r1.ebuild +++ b/sci-libs/chemkit/chemkit-0.1-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) @@ -14,18 +14,15 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz" SLOT="0" LICENSE="BSD PSF-2.2" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="applications examples python test" +IUSE="examples python qt4 test" REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( applications python )" + test? ( python qt4 )" RDEPEND=" - dev-libs/boost - dev-libs/rapidxml dev-cpp/eigen:3 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 + dev-libs/boost:= + dev-libs/rapidxml media-libs/glu sci-libs/inchi sci-libs/lemon @@ -35,6 +32,11 @@ RDEPEND=" x11-libs/libXext ) python? ( ${PYTHON_DEPS} ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtopengl:4 + ) " DEPEND="${RDEPEND}" @@ -43,28 +45,35 @@ S="${WORKDIR}"/${PN} PATCHES=( "${FILESDIR}"/${P}-multilib.patch "${FILESDIR}"/${P}-unbundle.patch - ) +) src_prepare() { # jsoncpp API change # xdrf != xdrfile rm -rvf src/3rdparty/{inchi,khronos,lemon,rapidxml} || die cmake-utils_src_prepare + + # bug 640206 + sed -e "/add_subdirectory(xtc/s/^/#DONT /" \ + -i src/plugins/CMakeLists.txt || die "Failed to disable xtc" } src_configure() { local mycmakeargs=( - -DCHEMKIT_BUILD_PLUGIN_BABEL=on + -DCHEMKIT_BUILD_EXAMPLES=$(usex examples) + -DCHEMKIT_BUILD_DEMOS=$(usex examples) + -DCHEMKIT_BUILD_BINDINGS_PYTHON=$(usex python) + -DCHEMKIT_BUILD_APPS=$(usex qt4) + -DCHEMKIT_BUILD_PLUGIN_BABEL=$(usex qt4) + -DCHEMKIT_BUILD_QT_DESIGNER_PLUGINS=$(usex qt4) + -DCHEMKIT_WITH_GRAPHICS=$(usex qt4) + -DCHEMKIT_WITH_GUI=$(usex qt4) + -DCHEMKIT_WITH_WEB=$(usex qt4) + -DCHEMKIT_BUILD_TESTS=$(usex test) -DUSE_SYSTEM_INCHI=ON -DUSE_SYSTEM_JSONCPP=OFF -DUSE_SYSTEM_RAPIDXML=ON -DUSE_SYSTEM_XDRF=OFF - $(cmake-utils_use applications CHEMKIT_BUILD_APPS) - $(cmake-utils_use applications CHEMKIT_BUILD_QT_DESIGNER_PLUGINS) - $(cmake-utils_use examples CHEMKIT_BUILD_EXAMPLES) - $(cmake-utils_use examples CHEMKIT_BUILD_DEMOS) - $(cmake-utils_use python CHEMKIT_BUILD_BINDINGS_PYTHON) - $(cmake-utils_use test CHEMKIT_BUILD_TESTS) ) cmake-utils_src_configure } diff --git a/sci-libs/chemkit/metadata.xml b/sci-libs/chemkit/metadata.xml index d2802f9728df..ec37d80cac64 100644 --- a/sci-libs/chemkit/metadata.xml +++ b/sci-libs/chemkit/metadata.xml @@ -5,9 +5,6 @@ <email>sci-chemistry@gentoo.org</email> <name>Gentoo Chemistry Project</name> </maintainer> - <use> - <flag name="applications">Build also applications not only the libraries</flag> - </use> <upstream> <remote-id type="sourceforge">chemkit</remote-id> </upstream> |