diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-01-19 17:59:37 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-19 17:59:37 +0000 |
commit | 150a86a9cb006b4800d6517d58532b8a556fec1e (patch) | |
tree | 0cea769c7bef669c4dfe19e7805593f6f34033fb /sci-libs | |
parent | 1cb0dd91756f77b25d6cc22318dc85187ed084cb (diff) |
gentoo auto-resync : 19:01:2023 - 17:59:37
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/Manifest.gz | bin | 44229 -> 44072 bytes | |||
-rw-r--r-- | sci-libs/libcmatrix/Manifest | 11 | ||||
-rw-r--r-- | sci-libs/libcmatrix/files/libcmatrix-3.11.0-fix-c++14.patch | 40 | ||||
-rw-r--r-- | sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch | 16 | ||||
-rw-r--r-- | sci-libs/libcmatrix/files/libcmatrix-3.11.0-shared.patch | 80 | ||||
-rw-r--r-- | sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.4.patch | 12 | ||||
-rw-r--r-- | sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.6.patch | 16 | ||||
-rw-r--r-- | sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.7.patch | 227 | ||||
-rw-r--r-- | sci-libs/libcmatrix/files/libcmatrix-3.2.1-minuit2.patch | 14 | ||||
-rw-r--r-- | sci-libs/libcmatrix/files/libcmatrix-3.9.0-atlas.patch | 24 | ||||
-rw-r--r-- | sci-libs/libcmatrix/libcmatrix-3.11.0-r1.ebuild | 59 | ||||
-rw-r--r-- | sci-libs/libcmatrix/metadata.xml | 8 |
12 files changed, 0 insertions, 507 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 4d9341b3e7e8..8703d33a300a 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/libcmatrix/Manifest b/sci-libs/libcmatrix/Manifest deleted file mode 100644 index dd53b59bf27a..000000000000 --- a/sci-libs/libcmatrix/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX libcmatrix-3.11.0-fix-c++14.patch 1488 BLAKE2B 551a57283af223c0985d8741c5d37903c3f3c6a83a722df0deb36040c18369fb3182a0513381f3187ad9af3d513bd49ef362c9231b623fe753ccc0d03e3452ed SHA512 df859444d88b54ad5b8ed19b375d2e77203979e9f979f8cccbc7d4c10d6b76e1852041e2172e3731dd0adb9dca0db49d14a455cd7b6d20766695bd8448839d4c -AUX libcmatrix-3.11.0-gcc5.2.patch 635 BLAKE2B 972d4e3f0c70c2fe366ec099166a983c71ea69bc9d019d6a16b4d028e702e97519cd53c838467a304e1f8d2f0b7973f166eec9bd7a0083e5d35fc307f7fa8b20 SHA512 2a07ac76fb7e7e5b6be97ed2d779d2cc1f56c38a2896b586338ace23515e5ea7428264c61faa4457efcd9b8ecdc8d9239beec09b01a8fe989a68b996bf594452 -AUX libcmatrix-3.11.0-shared.patch 2711 BLAKE2B bf478f154fc34f1fc49a755f67b3a8433ff2716357cf41b6eef3d733960ca22392e031e073cd371114f8ab48f2f0414ed2962c98db6233dab3f17f57c79dda7f SHA512 64af0020890477ff0f0ebaa2f708bad76f6dfb8416984a1cfbb5efef3f8c8179541245026dcc2ae454dcc563c2887a0b01b4b38f3f91b63b3bb3ebcac5cc53fc -AUX libcmatrix-3.2.1-gcc4.4.patch 286 BLAKE2B 02b1f432b0a2d6a4195c64ccff8717c1a5cc9675e1bec36ce15abfe055ea8ccd4f794fc97de3b0f73ffbfbce461fc33ed8d6cde8bb11a17a565303c5c6fd6750 SHA512 e1cc2c4d02fb6e2d802df9eb866f70cd90a55ff15f184b3f8b95c954a30a28e6bb251756ead429398417365a6a1e8a59a8e65ec6732fcc0f8cd9b54f103fe329 -AUX libcmatrix-3.2.1-gcc4.6.patch 616 BLAKE2B 595dfe180b345a129999f5d0180873aa560a127b63dda8bdaffaf52794172bae43b6013bb402a90cddc99b1d2efb6e322f6f770542274e5517ffd677c690fdaa SHA512 967ed45060c42f21f5191568f346630f0f25106d5469573f3c50a164d3efbd83a578f6ff3ef3f719c6dfa2c48d1867a6d89640567730be119fb5b252c4c3855d -AUX libcmatrix-3.2.1-gcc4.7.patch 7685 BLAKE2B 34bdb6bef22d532d0b6fd95a7d3dd6ec7444b7b00fa876fbb33a5dd2f8458bf1ca14d71c6e9c2c2a21f4d6e05409b0bf024738cb0e4ce18040ee2c01ea7ea646 SHA512 41060e3d67c4885b56cf6f6a8530a613f82a02b715d0c676cb5c2569ec723e273037ee40b294c640e710c911c5d181995e6c0c89b90492977558ea7a87131f91 -AUX libcmatrix-3.2.1-minuit2.patch 516 BLAKE2B 6da5f3412fa92de91f354d72fdbe76d11724595cad57a25a1a2768e155e57033542274c0a1d192ed9bc1f560ed69a79ece58fa314e7cfd62b3771d251648d1ec SHA512 3675033dc2c1ca0224ead0c61159a4b27fffc1f9dee5612de7dc8e8b6e98a1211ab6c61aa219f30039540a5a9e1274900e3eb7a12ce264711587f45b98087a13 -AUX libcmatrix-3.9.0-atlas.patch 983 BLAKE2B 1aaaf25720f64db89434466b29009bca07d401a46f8ed73fa239c98725f6d8d8d20c6b7421cffee689281d24ddfc39d083951b3f89a4f01e95f35c3a4e09a84c SHA512 7294e79c880c7b76ec020ba573db1b1f411f65157845447019e4562534298ce07a34d450b0e232a5ba707ce1860a1407bbff7ba61007ad7e66653715570c7543 -DIST libcmatrix-3.11.0.tar.gz 1064634 BLAKE2B 5eb5ffe7ceb80f430fcfb8ca42ab029863a2571ef01adfdc59644fa9951cb1c5205eb74faefdef1fa335af3a16396bb154b6258f0d4dd2c52b5a40eac6cda9b0 SHA512 b0f5d9382e0a7c6f8695488481c51e5cdc38d89c9371203870c31a91bf957956a85301cf3aa035b9214d581077581dc1f599f092dd2f077ee14e6b4fd06128c2 -EBUILD libcmatrix-3.11.0-r1.ebuild 1202 BLAKE2B 82e714c9ca8cbff3542f3664c55d9302f74cc6ee54d3879d8eaeb95cf0984cc5f6bf2b8a94d7a278fdf322c6d5577fbede8c759a87b42d847041575953a39d19 SHA512 d7917284024d24602cba945186c5129adeb17a4ade03a083780081f1ad66d934ebdc58437d5242ecc6364c14ce1142e2f70029070ea03da01a5670ee5c1beaab -MISC metadata.xml 260 BLAKE2B 14d3d7872b9a3cb341301daf85c6b037c567163317516100d5af08e7ae02970252f210e90118d5df9e0cf6e0b3560add3a7894d379609b864e60dfdda3036423 SHA512 973385fccdcb0ccc36e00a09dc85204cf15081b8b61bc20e02d7d1311cb05af4927f01aac36ec93275158f5b990874ca03ab7d381cf6ee6f5e30bc4926d2f045 diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.11.0-fix-c++14.patch b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-fix-c++14.patch deleted file mode 100644 index 74e49285dd04..000000000000 --- a/sci-libs/libcmatrix/files/libcmatrix-3.11.0-fix-c++14.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix building with C++14, which errors out due -Wnarrowing conversions. -See also: https://bugs.gentoo.org/show_bug.cgi?id=594680 - ---- a/include/lcm_ssecomplex.h -+++ b/include/lcm_ssecomplex.h -@@ -151,7 +151,7 @@ - { - static const union { - int i[4]; ssecomplex_t v; -- } signbithigh = {{0,0,0,0x80000000}}; -+ } signbithigh = {{0,0,0,(int)0x80000000}}; - ssecomplex_t b_im = _mm_shuffle_pd(b,b,3); // Imag. part of b in both - const ssecomplex_t b_re = _mm_shuffle_pd(b,b,0); // Real part of b in both - const ssecomplex_t tmp=_mm_mul_pd(a,b_re); -@@ -166,7 +166,7 @@ - ssecomplex_t b_re = _mm_set1_pd(b); - static const union { - int i[4]; ssecomplex_t v; -- } signbithigh = {{0,0,0,0x80000000}}; -+ } signbithigh = {{0,0,0,(int)0x80000000}}; - b_re = _mm_xor_pd(b_re, signbithigh.v); // Change sign of high - return complex(_mm_mul_pd(a.z_, b_re)); - } -@@ -184,14 +184,14 @@ - inline complex operator- (const complex& a) { - static const union { // (signbit,signbit) - int i[4]; ssecomplex_t v; -- } signbits = {{0,0x80000000,0,0x80000000}}; -+ } signbits = {{0,(int)0x80000000,0,(int)0x80000000}}; - return complex(_mm_xor_pd(a, signbits.v)); // Change sign of both elements - } - - inline complex conj(const complex& a) { - static const union { // (signbit,signbit) - int i[4]; ssecomplex_t v; -- } signbithigh = {{0,0,0,0x80000000}}; -+ } signbithigh = {{0,0,0,(int)0x80000000}}; - return complex(_mm_xor_pd(a.z_, signbithigh.v)); // Change sign of imag. part - } - diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch deleted file mode 100644 index d5d40246a2f8..000000000000 --- a/sci-libs/libcmatrix/files/libcmatrix-3.11.0-gcc5.2.patch +++ /dev/null @@ -1,16 +0,0 @@ - include/MultiMatrix.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/MultiMatrix.h b/include/MultiMatrix.h -index 2d54db5..e95ce4c 100755 ---- a/include/MultiMatrix.h -+++ b/include/MultiMatrix.h -@@ -1225,7 +1225,7 @@ template<class T,size_t N> struct new_trait_<T,N,N> { typedef MultiMatrix<T,N> v - #endif - //LCM_SUPPRESS_VIEWS - -- template<size_t N, template<size_t> class CheckClass =LCM_CheckBoundsDefault> -+ template<size_t N, template<size_t> class CheckClass> - class Indexer<N,CheckClass>::permuted_iterator : public ::std::iterator< ::std::bidirectional_iterator_tag,size_t> - { - private: diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.11.0-shared.patch b/sci-libs/libcmatrix/files/libcmatrix-3.11.0-shared.patch deleted file mode 100644 index 6c5c3167619e..000000000000 --- a/sci-libs/libcmatrix/files/libcmatrix-3.11.0-shared.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 1361371..1448e76 100755 ---- a/Makefile.in -+++ b/Makefile.in -@@ -13,8 +13,8 @@ AR=@AR@ - - # You shouldn't need to alter anything below here - --COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c --ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG -+COMPILE=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -c -+#ALLOPTFLAGS=$(OPTFLAGS) -DNDEBUG - - LOCALOBJS= local/CrystalSystem.o local/CrystalGeneric.o local/MoleculeStructure.o - COREOBJS= coredefs/complex.o coredefs/common.o coredefs/diagonal.o coredefs/diagonalise.o coredefs/power.o coredefs/invert.o coredefs/transforms.o coredefs/blocking.o coredefs/mixed.o coredefs/realtransforms.o coredefs/Chebyshev.o -@@ -36,7 +36,7 @@ ALLTHROBJS=$(UNSAFEOBJS:.o=_r.o) $(ALLSAFEOBJS) - - ROOT=.. - --first: lib/libcmatrix.a -+first: lib/libcmatrix.so.3.11.0 - - #%.o: %.f - # @F77@ @FFLAGS@ -c -o $@ $< -@@ -68,25 +68,25 @@ tempclean: - # -cd optim; @CLEAN@ - # -cd local; @CLEAN@ - --lib/libcmatrix.a: $(ALLNORMOBJS) -- $(AR) $@ $(ALLNORMOBJS) -- chmod a+rx $@ -- $(RANLIB) $@ -- --lib/libcmatrix_p.a: $(ALLPROFOBJS) -- $(AR) $@ $(ALLPROFOBJS) -- chmod a+rx $@ -- $(RANLIB) $@ -- --lib/libcmatrix-g.a: $(ALLGOBJS) -- $(AR) $@ $(ALLGOBJS) -- chmod a+rx $@ -- $(RANLIB) $@ -- --lib/libcmatrix_r.a: $(ALLTHROBJS) -- $(AR) @MTFLAGS@ $@ $(ALLTHROBJS) -- chmod a+rx $@ -- $(RANLIB) $@ -+lib/libcmatrix.so.3.11.0: $(ALLNORMOBJS) -+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLNORMOBJS) -lrt @ATLAS_LIBS@ -+ ln -sf libcmatrix.so.3.11.0 lib/libcmatrix.so.3 -+ ln -sf libcmatrix.so.3.11.0 lib/libcmatrix.so -+ -+lib/libcmatrix_p.so.3.11.0: $(ALLPROFOBJS) -+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLPROFOBJS) -lrt @ATLAS_LIBS@ -+ ln -sf libcmatrix_p.so.3.11.0 lib/libcmatrix_p.so.3 -+ ln -sf libcmatrix_p.so.3.11.0 lib/libcmatrix_p.so -+ -+lib/libcmatrix-g.so.3.11.0: $(ALLGOBJS) -+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLGOBJS) -lrt @ATLAS_LIBS@ -+ ln -sf libcmatrix-g.so.3.11.0 lib/libcmatrix-g.so.3 -+ ln -sf libcmatrix-g.so.3.11.0 lib/libcmatrix-g.so -+ -+lib/libcmatrix.so_r.3.11.0: $(ALLTHROBJS) -+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLTHROBJS) -lrt @ATLAS_LIBS@ -+ ln -sf libcmatrix_r.so.3.11.0 lib/libcmatrix_r.so.3 -+ ln -sf libcmatrix_r.so.3.11.0 lib/libcmatrix_r.so - - @CONFIGLEAF@.tar.gz: - cd $(ROOT) ; tar --exclude lib/* --exclude *.o --exclude=*~ --exclude=Makefile --exclude=include/config.h --exclude=config.status -cvf @CONFIGLEAF@.tar @CONFIGLEAF@ -diff --git a/configure.ac b/configure.ac -index c0ae0e1..50dcd5a 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,6 @@ - AC_INIT(configure.ac) - AC_CONFIG_HEADER(include/config.h) -+LT_INIT - - DEFAR="ar ru" - MAKEEXTRA= diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.4.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.4.patch deleted file mode 100644 index 24c1a89b48d0..000000000000 --- a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/DynamicList.h b/include/DynamicList.h -index f8c1346..05a7b10 100755 ---- a/include/DynamicList.h -+++ b/include/DynamicList.h -@@ -4,6 +4,7 @@ - #include "BaseList.h" - #include "lcm_basethreads.h" - #include "Warnings.h" -+#include <cstdio> - - namespace libcmatrix { - diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.6.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.6.patch deleted file mode 100644 index b3d8c8d19996..000000000000 --- a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.6.patch +++ /dev/null @@ -1,16 +0,0 @@ - NMR/MetaPropagation.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/NMR/MetaPropagation.cc b/NMR/MetaPropagation.cc -index b7ed98b..ce8c16f 100755 ---- a/NMR/MetaPropagation.cc -+++ b/NMR/MetaPropagation.cc -@@ -2136,7 +2136,7 @@ SpinOpGenerator::add_A0(T& dest,F func, double coup, size_t j, size_t sk, Type2T - { ref_.clear(0); } - const space_T& operator()() const { return ref_; } - ~fudge_isotropic_() { ref_.ensure_rank(0); } -- mutable space_T& ref_; -+ space_T& ref_; - }; - template<> struct fudge_isotropic_<double> { - fudge_isotropic_(double v) : v_(v) {}; diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.7.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.7.patch deleted file mode 100644 index 633c9d50cf94..000000000000 --- a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-gcc4.7.patch +++ /dev/null @@ -1,227 +0,0 @@ - include/MultiMatrix.h | 14 +++++++------- - include/UnionHolder.h | 40 ++++++++++++++++++++-------------------- - include/basedefs.h | 22 ++++++++++++---------- - utils/Fork_controller.cc | 3 +++ - utils/ttyio.cc | 2 ++ - 5 files changed, 44 insertions(+), 37 deletions(-) - -diff --git a/include/MultiMatrix.h b/include/MultiMatrix.h -index b6fec33..2d54db5 100755 ---- a/include/MultiMatrix.h -+++ b/include/MultiMatrix.h -@@ -254,19 +254,19 @@ namespace libcmatrix { - } - - size_t operator()(size_t r) const -- { check_bounds_open(dim,r); -+ { this->check_bounds_open(dim,r); - return r*mults[0]; } - - size_t operator()(size_t r,size_t s) const -- { check_bounds_open(dim,r,s); -+ { this->check_bounds_open(dim,r,s); - return r*mults[0]+s*mults[1]; } - - size_t operator()(size_t r,size_t s,size_t t) const -- { check_bounds_open(dim,r,s,t); -+ { this->check_bounds_open(dim,r,s,t); - return r*mults[0]+s*mults[1]+t*mults[2]; } - - size_t operator()(size_t r,size_t s,size_t t,size_t u) const -- { check_bounds_open(dim,r,s,t,u); -+ { this->check_bounds_open(dim,r,s,t,u); - return r*mults[0]+s*mults[1]+t*mults[2]+u*mults[3]; } - - size_t index(size_t r) const -@@ -293,14 +293,14 @@ namespace libcmatrix { - - void reverse(size_t& r, size_t& s, size_t ind) const { - LCM_STATIC_CHECK(N==2, Indexer_non2D_object); -- check(ind<size(),"Indexer::reverse"); -+ this->check(ind<size(),"Indexer::reverse"); - r=ind / mults[0]; - s=ind-r*mults[0]; - } - - void reverse(size_t& r, size_t& s, size_t& t, size_t ind) const { - LCM_STATIC_CHECK(N==3, Indexer_non3D_object); -- check(ind<size(),"Indexer::reverse"); -+ this->check(ind<size(),"Indexer::reverse"); - r=ind / mults[0]; - ind-=r*mults[0]; - s=ind / mults[1]; -@@ -309,7 +309,7 @@ namespace libcmatrix { - - void reverse(size_t& r, size_t& s, size_t& t, size_t& u, size_t ind) const { - LCM_STATIC_CHECK(N==4, Indexer_non4D_object); -- check(ind<size(),"Indexer::reverse"); -+ this->check(ind<size(),"Indexer::reverse"); - r=ind / mults[0]; - ind-=r*mults[0]; - s=ind / mults[1]; -diff --git a/include/UnionHolder.h b/include/UnionHolder.h -index f447501..3157330 100755 ---- a/include/UnionHolder.h -+++ b/include/UnionHolder.h -@@ -359,21 +359,21 @@ namespace libcmatrix { - //! overrides ::clear method from ::CommonHolder - void clear() { - switch (type_) { -- case 1: clear_(first_); break; -- case 2: clear_(second_); break; -- case 3: clear_(third_); break; -- case 4: clear_(fourth_); break; -- case 5: clear_(fifth_); break; -- case 6: clear_(sixth_); break; -- case 7: clear_(seventh_); break; -- case 8: clear_(eighth_); break; -- case 9: clear_(nineth_); break; -+ case 1: this->clear_(first_); break; -+ case 2: this->clear_(second_); break; -+ case 3: this->clear_(third_); break; -+ case 4: this->clear_(fourth_); break; -+ case 5: this->clear_(fifth_); break; -+ case 6: this->clear_(sixth_); break; -+ case 7: this->clear_(seventh_); break; -+ case 8: this->clear_(eighth_); break; -+ case 9: this->clear_(nineth_); break; - } - type_=0; - } - - template<class T> UnionHolder& operator= (const T& v) { -- get(Type2Type<T>())=v; -+ this->get(Type2Type<T>())=v; - type(Type2Type<T>()); //only change type if assignment was successful - return *this; - } -@@ -399,12 +399,12 @@ namespace libcmatrix { - - template<class T> T& set(Type2Type<T> in) { - type(in); -- return get(in); -+ return this->get(in); - } - - template<int M> typename reverse<M>::type& set(Int2Type<M> in) { - type(in); -- return get(Type2Type<typename reverse<M>::type>()); -+ return this->get(Type2Type<typename reverse<M>::type>()); - } - - template<class T> T& operator()(Type2Type<T> in) { -@@ -429,12 +429,12 @@ namespace libcmatrix { - - template<int M> typename reverse<M>::type& operator()(Int2Type<M> in) { - verify(in); -- return get(Type2Type<typename reverse<M>::type>()); -+ return this->get(Type2Type<typename reverse<M>::type>()); - } - - template<int M> const typename reverse<M>::type& operator()(Int2Type<M> in) const { - verify(in); -- return get(Type2Type<typename reverse<M>::type>()); -+ return this->get(Type2Type<typename reverse<M>::type>()); - } - }; - -@@ -482,12 +482,12 @@ namespace libcmatrix { - bool iscomplex() const { return (this->type()==COMPLEX); } - bool isreal() const { return (this->type()==REAL); } - -- C& set_complex() { return set(Int2Type<COMPLEX>()); } -- R& set_real() { return set(Int2Type<REAL>()); } -- const C& get_complex() const { return get(Type2Type<C>()); } -- const R& get_real() const { return get(Type2Type<R>()); } -- C& get_complex() { return get(Type2Type<C>()); } -- R& get_real() { return get(Type2Type<R>()); } -+ C& set_complex() { return this->set(Int2Type<COMPLEX>()); } -+ R& set_real() { return this->set(Int2Type<REAL>()); } -+ const C& get_complex() const { return this->get(Type2Type<C>()); } -+ const R& get_real() const { return this->get(Type2Type<R>()); } -+ C& get_complex() { return this->get(Type2Type<C>()); } -+ R& get_real() { return this->get(Type2Type<R>()); } - }; - - } //namespace libcmatrix -diff --git a/include/basedefs.h b/include/basedefs.h -index 420b341..80d47e3 100755 ---- a/include/basedefs.h -+++ b/include/basedefs.h -@@ -13,6 +13,8 @@ - #include <functional> - #include <iterator> - #include <algorithm> -+#include <math.h> -+//#include "BlockedMatrix.h" - //#include <complex> - - // #ifdef LCM_DEBUG_ALLOCATOR -@@ -1703,6 +1705,16 @@ template<size_t N> struct Multiply_<N,N,0> { - } - }; - -+template<size_t,size_t,size_t> struct Mla_ { -+ template<class T1,class T2,class T3> static void func(T1&, const T2&, const T3&) { -+ LCM_STATIC_ERROR( mla_incompatible_dimensionalities ); -+ } -+}; -+ -+template<class T1,class T2,class T3> inline void mla(T1& d,const T2& a,const T3& b) { -+ Mla_<LCM_DIM(T1),LCM_DIM(T2),LCM_DIM(T3)>::func(d,a,b); -+} -+ - template<> struct Multiply_<2,2,2> { - template<class T1,class T2,class T3> static void func(T1& dest,const T2& a,const T3& b) - { -@@ -1875,12 +1887,6 @@ template<> struct Multiply_<0,0,0> { - Multiply_<LCM_DIM(T1),LCM_DIM(T2),LCM_DIM(T3)>::func(d,a,b); - } - --template<size_t,size_t,size_t> struct Mla_ { -- template<class T1,class T2,class T3> static void func(T1&, const T2&, const T3&) { -- LCM_STATIC_ERROR( mla_incompatible_dimensionalities ); -- } --}; -- - template<size_t N> struct Mla_<N,0,N> { - template<class T1,class T2,class T3> LCM_INLINE static void func(T1& d, const T2& a, const T3& b) { - if (d.empty()) -@@ -1940,10 +1946,6 @@ template<> struct Mla_<0,0,0> { - } - }; - --template<class T1,class T2,class T3> inline void mla(T1& d,const T2& a,const T3& b) { -- Mla_<LCM_DIM(T1),LCM_DIM(T2),LCM_DIM(T3)>::func(d,a,b); --} -- - template<class T,size_t N> struct Print_ { - static void print(const T& a,std::ostream& ostr) { - ostr << '['; -diff --git a/utils/Fork_controller.cc b/utils/Fork_controller.cc -index 5f6b913..08ec942 100755 ---- a/utils/Fork_controller.cc -+++ b/utils/Fork_controller.cc -@@ -3,6 +3,9 @@ - #include <sys/wait.h> - #include <time.h> - #include <cstdio> -+#include <sys/types.h> -+#include <unistd.h> -+ - - namespace libcmatrix { - -diff --git a/utils/ttyio.cc b/utils/ttyio.cc -index 17e4eb3..bbeac81 100755 ---- a/utils/ttyio.cc -+++ b/utils/ttyio.cc -@@ -17,6 +17,8 @@ - #include "args_iter.h" - #endif - -+#include <unistd.h> -+ - namespace libcmatrix { - - namespace { diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-minuit2.patch b/sci-libs/libcmatrix/files/libcmatrix-3.2.1-minuit2.patch deleted file mode 100644 index e7a6cec644bf..000000000000 --- a/sci-libs/libcmatrix/files/libcmatrix-3.2.1-minuit2.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/configure-libraries.ac -+++ b/configure-libraries.ac -@@ -14,8 +14,8 @@ - fi - if test x$FOUNDMINUIT = xyes; then - AC_CHECK_LIB(lcg_Minuit,main,, -- AC_CHECK_LIB(Minuit,main,,FOUNDMINUIT=no -- AC_MSG_WARN([Minuit library (liblcg_Minuit or libMinuit) not found -+ AC_CHECK_LIB(Minuit2,main,,FOUNDMINUIT=no -+ AC_MSG_WARN([Minuit library (liblcg_Minuit or libMinuit2) not found - Is LDFLAGS is defined to include relevant directory?]))) - if test x$FOUNDMINUIT = xyes; then - AC_DEFINE(HAVE_LIBMINUIT) - diff --git a/sci-libs/libcmatrix/files/libcmatrix-3.9.0-atlas.patch b/sci-libs/libcmatrix/files/libcmatrix-3.9.0-atlas.patch deleted file mode 100644 index 329e794645eb..000000000000 --- a/sci-libs/libcmatrix/files/libcmatrix-3.9.0-atlas.patch +++ /dev/null @@ -1,24 +0,0 @@ - configure-libraries.ac | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/configure-libraries.ac b/configure-libraries.ac -index 6e9579d..a919398 100755 ---- a/configure-libraries.ac -+++ b/configure-libraries.ac -@@ -33,6 +33,7 @@ AC_ARG_WITH(atlas, - AS_HELP_STRING([--with-atlas],[use the ATLAS BLAS library (default-use if found)]),,with_atlas=check) - if test x$with_atlas != xno; then - FOUNDATLAS=yes -+ PKG_CHECK_MODULES([ATLAS], [cblas]) - AC_CHECK_HEADERS(cblas.h,,FOUNDATLAS=no - AC_MSG_WARN([ATLAS header files (cblas.h) not found - Is CPPFLAGS is defined to include relevant directory?])) -@@ -40,7 +41,7 @@ Is CPPFLAGS is defined to include relevant directory?])) - AC_MSG_WARN([ATLAS library (libatlas.a) not found - Is LDFLAGS is defined to include relevant directory?])) - if test x$FOUNDATLAS = xyes; then -- LIBS="-lcblas $LIBS" -+ LIBS="$ATLAS_LIBS $LIBS" - CXXFLAGS="$CXXFLAGS -DLCM_USE_EXTERNAL" - else - if test x$with_atlas = xyes; then diff --git a/sci-libs/libcmatrix/libcmatrix-3.11.0-r1.ebuild b/sci-libs/libcmatrix/libcmatrix-3.11.0-r1.ebuild deleted file mode 100644 index 87813567028c..000000000000 --- a/sci-libs/libcmatrix/libcmatrix-3.11.0-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -MY_P="${PN}${PV}_lite" - -DESCRIPTION="lite version of pNMRsim" -HOMEPAGE="http://www.dur.ac.uk/paul.hodgkinson/pNMRsim/" -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="cpu_flags_x86_sse threads" - -RDEPEND="sci-libs/minuit" -DEPEND="${RDEPEND}" - -RESTRICT="mirror" - -S="${WORKDIR}/${PN}R3" - -DOCS=( CHANGES docs/cmatrix.pdf ) -PATCHES=( - "${FILESDIR}/${PN}-3.11.0-shared.patch" - "${FILESDIR}/${PN}-3.2.1-minuit2.patch" - "${FILESDIR}/${PN}-3.2.1-gcc4.4.patch" - "${FILESDIR}/${PN}-3.2.1-gcc4.6.patch" - "${FILESDIR}/${PN}-3.2.1-gcc4.7.patch" - "${FILESDIR}/${PN}-3.9.0-atlas.patch" - "${FILESDIR}/${PN}-3.11.0-gcc5.2.patch" - "${FILESDIR}/${PN}-3.11.0-fix-c++14.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --with-minuit \ - --without-atlas \ - --with-sysroot="${ESYSROOT}" \ - $(use_with cpu_flags_x86_sse sse) \ - $(use_with threads) -} - -src_install() { - dolib.so lib/*.so* - - insinto /usr/include/${PN}R3 - doins -r include/. - - einstalldocs -} diff --git a/sci-libs/libcmatrix/metadata.xml b/sci-libs/libcmatrix/metadata.xml deleted file mode 100644 index 7d3acaf5d252..000000000000 --- a/sci-libs/libcmatrix/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> -</pkgmetadata> |