diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-29 03:22:09 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-29 03:22:09 +0100 |
| commit | d4bd6695641f6d2ec7ff8681913d304e995902f5 (patch) | |
| tree | 6ec8d4c38152bb4f2bb4b93277236ebd9fbbd21d /sci-mathematics | |
| parent | 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b (diff) | |
gentoo resync : 29.05.2018
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/4ti2/4ti2-1.6.7.ebuild | 20 | ||||
| -rw-r--r-- | sci-mathematics/4ti2/Manifest | 2 | ||||
| -rw-r--r-- | sci-mathematics/Manifest.gz | bin | 14822 -> 14827 bytes | |||
| -rw-r--r-- | sci-mathematics/lpsolve/Manifest | 2 | ||||
| -rw-r--r-- | sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild | 12 |
5 files changed, 20 insertions, 16 deletions
diff --git a/sci-mathematics/4ti2/4ti2-1.6.7.ebuild b/sci-mathematics/4ti2/4ti2-1.6.7.ebuild index c06748c20172..073a1868de77 100644 --- a/sci-mathematics/4ti2/4ti2-1.6.7.ebuild +++ b/sci-mathematics/4ti2/4ti2-1.6.7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils +inherit autotools DESCRIPTION="Software package for algebraic, geometric and combinatorial problems" HOMEPAGE="http://www.4ti2.de/" @@ -14,10 +14,10 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="static-libs" -DEPEND=" - sci-mathematics/glpk:0[gmp] - dev-libs/gmp[cxx]" -RDEPEND="${DEPEND}" +RDEPEND=" + sci-mathematics/glpk:=[gmp] + dev-libs/gmp:0=[cxx]" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-1.3.2-gold.patch @@ -25,8 +25,7 @@ PATCHES=( src_prepare() { default - sed -e "s:^CXX.*$:CXX=$(tc-getCXX):g" \ - -i m4/glpk-check.m4 || die + sed -e "/^CXX/d" -i m4/glpk-check.m4 || die # The swig subdir is not used, so we can skip running autotools in it. #518000 AT_NO_RECURSIVE=1 eautoreconf } @@ -39,5 +38,8 @@ src_configure() { src_install() { default - use static-libs || prune_libtool_files --all + + if ! use static-libs; then + find "${D}" -name '*.la' -delete || die + fi } diff --git a/sci-mathematics/4ti2/Manifest b/sci-mathematics/4ti2/Manifest index df3f68c2f154..597270666a8c 100644 --- a/sci-mathematics/4ti2/Manifest +++ b/sci-mathematics/4ti2/Manifest @@ -6,5 +6,5 @@ DIST 4ti2-1.6.7.tar.gz 5649869 BLAKE2B ab0e7da1de88e5e99ead0b8fa7f7a72773b84ae90 EBUILD 4ti2-1.6.2.ebuild 789 BLAKE2B fc726381328965ea640e5ee6cd529939561071dfaac133727a679c73a9a8ddffe9e4a3fe36637a8f6cfb7b3075dd765d071348aff7b94f4f47bbb5f608b2be08 SHA512 58e22453125f1329e5df372b4ed2bf3672de5180acd3667e90b528211a427c18ce77e041e91ab13ff96157f329210ed40771779940b323e5ef330aba417aabe4 EBUILD 4ti2-1.6.5.ebuild 791 BLAKE2B 93d7add8a6a1faaba96a82a1f0e146fd73ef6b3e43bc4d79bcfa17f490111216b0ea8423a62305b7cc6c311d67394e61ff048ad515ca854b4caf01afbbe73f04 SHA512 4951d3a3e5ddaf1641e0466e5601350b69c46f6e184a20d23466140bdc958e5538663dce8bb1e2395316dd63499a93d0eaef224188f407c7cb45104cc073652d EBUILD 4ti2-1.6.6.ebuild 798 BLAKE2B 1f315e0bdf92facd059b4a29adec741fb40b24adf28dfe66e93633b5e29be90f50565b6d021ea817da18bb01780dadc114a1e2db66b0bc44f8faa4af191a638e SHA512 e531966d6b40f7da358890db343d62536cd1947c5473a4e310e1bc639701442a779e6b37697bbaa9c1d3a25f5a5c4621ca6e5129361e9314bedeeade2e5a885e -EBUILD 4ti2-1.6.7.ebuild 918 BLAKE2B e9017b6ad419a4f8769163d28d257294e7a4ac7e25212d0a4dcf5629c466435929eeda8dbf1411a19c249061adcef049d7e3c8858ffd47240cb05bfea0762fc6 SHA512 b492edd19531900aa43ba8f945d3bbb804e15156e1a096b1045358a1fbbd0537bfe2ebe568dc8ca2e12045303ff7b16d57c0349865ac503842fd62b602b274ff +EBUILD 4ti2-1.6.7.ebuild 919 BLAKE2B 8b6ea74353bcc05727bc856566e16b37e22f7816c90507f441662ae18777a893deb5d44e3999a5da54dfda1c38557d91c909f4baee3e4b044a0b89dc15380178 SHA512 8c79cd88808064e58b2a6440f919a43b89b68db9a3ff96357168ccae0c2f9e62d620cef1f1441c9edcf06394923a280ae2beca425bbd7c6c78b2893bed13946f MISC metadata.xml 446 BLAKE2B ce737e287f6b8f420aee86ca0ce72aa4952474a3ba717239dc8d10261038faddbc9b06f93a04bc8f8c48b36606254780865bbc5038564d4fb9252241e45a7a4b SHA512 2c7950b353c54597eebcff1f50e5045f792ef37cfe59f0142160bdf5ea47ff6be57bd698b051e6c56863b109fde983c1aeeca87827289abde96838af1aa3f7d1 diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz Binary files differindex 6bed791cda2a..51214f1b7b3b 100644 --- a/sci-mathematics/Manifest.gz +++ b/sci-mathematics/Manifest.gz diff --git a/sci-mathematics/lpsolve/Manifest b/sci-mathematics/lpsolve/Manifest index 26efe9d183f8..51390a091e47 100644 --- a/sci-mathematics/lpsolve/Manifest +++ b/sci-mathematics/lpsolve/Manifest @@ -1,3 +1,3 @@ DIST lpsolve-5.5.2.0.tar.xz 737000 BLAKE2B 912690a7e4ed5fd5d475f322f5c168554fb3d47281545f42d2383ccbe72b3cb0036f72878c94899889972e266e9cf6ad73e59ac1e822deae753ae5b31a00c9b8 SHA512 341bff74dccf805cfd3aa4ee844a51f3c46ce875e88b1bf079a6ff0074f7cbd27420ec9c6a66a2530098a85c967457214543895651f4c570b956324a51bb9fe6 -EBUILD lpsolve-5.5.2.0.ebuild 710 BLAKE2B 8fdb2dc5ac4b0bd9da1ab1783d1732b729ee35d7f7aecb67de0f40bc0cac8820474b43db05b2bf6acf0a8461ab5b06b36d3f9082e842cdeaa9286443bd56ea7d SHA512 5a53d63b09575e6e66daad37aa1ab7cfe6a87951ea62cebf13576e3b98ca3db1f2376c125df39526425763380e4e4a0097140005056e9ffe53baf85c4c1bfd6e +EBUILD lpsolve-5.5.2.0.ebuild 676 BLAKE2B edcbc7ea1202d57d5338d75f0ebc432e3a08ebddc2eecf3fd8a43ada0d76e04199126e5180b38ae8aefafbfa7f0b718ee8f88b84788064cb2ba361fe4b042649 SHA512 f12844e5198a8ce3a86b87e6c62bd67da4162119d1b876bbb046c360cadeeee59a033a20878e82d96e5216905806fad1ca649d4b1678797852cf8a05d0729b64 MISC metadata.xml 462 BLAKE2B cc1d11f0cf8ec77ba2700ac44f3b0a791734b7edf4afc7f1b991a1ad612e1684ec9389b7517ae2678ecf247537c5c3e7e0bec2de8561964ebfc50b9f53ed57a9 SHA512 817ef33327783389aa73830c2ff2b9b54a140dbcaa9ed61a6d0ad7c2058014fc311c5abeef20cac157fac94d71fe2e8de8f241b3d7a2a2df26817d96cc19dd86 diff --git a/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild b/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild index dd828ca40d5a..5de810343b29 100644 --- a/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild +++ b/sci-mathematics/lpsolve/lpsolve-5.5.2.0.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=4 +EAPI=6 DESCRIPTION="Mixed Integer Linear Programming (MILP) solver" HOMEPAGE="https://sourceforge.net/projects/lpsolve/" @@ -17,12 +17,14 @@ RDEPEND="${DEPEND}" src_configure() { econf \ - $(use_enable static-libs static) \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" + $(use_enable static-libs static) } src_install() { default + # required because it does not provide .pc file - use static-libs || find "${ED}" -name '*.la' -exec rm -f {} + + if ! use static-libs; then + find "${D}" -name '*.la' -delete || die + fi } |