From d162ba1860a88062f4cd61f8b52fc303ba0b2991 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 7 Aug 2021 00:16:33 +0100 Subject: gentoo resync : 07.08.2021 --- sci-libs/cdd+/Manifest | 13 ++-- sci-libs/cdd+/cdd+-077a.ebuild | 24 ++++---- sci-libs/cdd+/files/cdd+-077a-gcc-5.patch | 4 +- .../files/cdd+-077a-gcc11-dynamic-exceptions.patch | 71 ++++++++++++++++++++++ sci-libs/cdd+/files/cdd+-077a-gentoo.patch | 4 +- sci-libs/cdd+/files/cdd+-077a-headers.patch | 36 +++-------- sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch | 8 +-- sci-libs/cdd+/metadata.xml | 21 ++++--- 8 files changed, 117 insertions(+), 64 deletions(-) create mode 100644 sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch (limited to 'sci-libs/cdd+') diff --git a/sci-libs/cdd+/Manifest b/sci-libs/cdd+/Manifest index ff600fbc237b..5667afeec722 100644 --- a/sci-libs/cdd+/Manifest +++ b/sci-libs/cdd+/Manifest @@ -1,7 +1,8 @@ -AUX cdd+-077a-gcc-5.patch 369 BLAKE2B c213d0c13c779c02846f0c3e005265ba696a82619f3690242743eda6fa8203ac2c5df4e7d5f0e9c0972f37a6de955a9b55f6aa76fda3c4fc8b80f875afda70a5 SHA512 36804d2cf1f8ac137b2ef5b1991e5e73a2ab40f8391a813f07b3d1ba6d5556bf852f07f25567a3696f9c1fa5927ef23f3364125af50136d0954723fee8d80059 -AUX cdd+-077a-gentoo.patch 1141 BLAKE2B 6b4a63e53e7a892df25eff22a198aecbed3e9b9987466e9662959f9cdcd9abf37e9a3a3e25f2c7e61cbf1c49e778b1a3ab4141f6ee2be89ccc2bae99246f1d85 SHA512 7b05ac66c6b4205c5434dc63ca46f2fbd88c115fa3bdae92ad8014fe5c70daf256b24ec1d7a0f7697e78868f78afd3ea6d5e23ed294433c2507fd8b1be510e61 -AUX cdd+-077a-headers.patch 1993 BLAKE2B e9659821dd75f7202be84ed7384a4123e96ab50f5e45ec59724c39aea7c820417022abf2b15e2b1a60931be4a31c5e92857df83758e9dbbe54d11e328a0b75ba SHA512 8b141789efea76eba1256c0f9c882dc7920169c39b80040f8c7a0238cede399b69094cf3352b26c3996d0d9ced650c654cb12d07996d0c6466a7efa1069e609f -AUX cdd+-077a-qa-const-char.patch 1469 BLAKE2B fe9afa62b86a0d43eea6b5652599f064905c3815d2a732eb4536988751c06c5e3fc795839c2d2cbc6eb61fc8beb2aa1faf7c1bfa51118fddd2b225970762641e SHA512 fb9165442197cdbe5c1994d1759eed4c7948ce2fd89dc15b10012684be5749e9cdff548d0809f7dbf6f07141d608b71f990c10d4fbe089c73abeda8519158ab5 +AUX cdd+-077a-gcc-5.patch 353 BLAKE2B 3c37c431e1dbfbcaefed3b8df952e731ee45d63fca4c6bb83f60177fbdc9a18f4299145a7ac2af3821929e54d338786a12aabd8a1fbe1f4d26467a78e67f6d34 SHA512 04f955b92344d7e2f0a9686b014ab11e776e347388fed169641953c594e5556374d9b169c493cb19421adf96ef479a121e4f46b2632e4e43656abe420a8741e7 +AUX cdd+-077a-gcc11-dynamic-exceptions.patch 1955 BLAKE2B d84de845adc66fe4e66b345764a6652fbdc89c76c5326fac4e867976c40c50557d5dae13dad096868f80fa815149f70ed6540e456db68af379f8037821093106 SHA512 053e55dccc31a4e2284d8c929401530c8a1d04516ffef834b4ee4bf9c71e99341e353b47e954b3f44407a24997d7ec7ea4aa018ac34668e1c115d714db0ca181 +AUX cdd+-077a-gentoo.patch 1068 BLAKE2B adb0a66750309896dd58309e39b42cf982d3864c03f919f83905c09d74d118e171aa647a71d38a65f6a67acceaa81444d9fd65d55690d5da406ee72eb95e5a64 SHA512 7213b26439a8a555eba25563d7396fbfc444426480675721503fabebe96418f05b0277479c7450dfbc75fd1e51f4d5841611d7fd3a76179119c084cd35db634f +AUX cdd+-077a-headers.patch 1066 BLAKE2B 4d63d96fddb9e265d28e66371dd3a8656cbfb0b4d13338912f88220e29bc90488d4b50afca581d192559c36c134bc0755ab1e02fb6b900eed0734aad5eac395d SHA512 462f6a11a2cc27df264d93432088fb5abb998c759e08b6bf12121336ae77a9a33702f7169971926bf9feed8fc3bf6f5b526c7ffcfa9f1e12b72a238d9aac8d4c +AUX cdd+-077a-qa-const-char.patch 1437 BLAKE2B 5d6a347f6c8c2ee7c03612849454aa4134bb4ae41272bc6cbf1420ebebadb6dd68c5ba19973e5252d0b9badd9d90275dca78fa8cc56631395688f93e85d27754 SHA512 5ab7d38beceb21527e2c3daf889a5bcb93eb537b2a5b39f6a1d9781ddb36e3366600ce97717558c7dbf548b075c7280c474388809d37c9ab7391069e7b3839a7 DIST cdd+-077a.tar.gz 186771 BLAKE2B 1bc1ae864c83da4f2c2d421c783f484933ee9625bf16d299a65ae738cb218e670453b661e9914776d6fc0766503a44f345c4cdfaea834120c79e677bb5686b46 SHA512 cb151274adec502420e5e931d2f248d62b26d5797f7d55f6db9c947f8e9d715a864c88ad08ad2cd74ada237789de5ca3c49dc04dc55e63d4101f07cc1685ab12 -EBUILD cdd+-077a.ebuild 852 BLAKE2B 067bb02142b588a6cd5855c330a5b3207784903490389dbe03a3ea913d9e94abe6fab2478436c32c90a661dc00907c94e82c20d10c0e4fae143b87916c748fa3 SHA512 bdb20e049558dfde9b40c9b810a52603436bbb5b75030d378beb0fdb66c27c2a2e54aeab7d4ae8c2b3aade5eef527387fb51ce9c5e880311e39942030e2386c3 -MISC metadata.xml 661 BLAKE2B 281640e5f49b4c8512384dc9f2a48996d96a6e91f7a85bde3510ae7808698fbc09be72d8997e37f8b27065fd9f5696384aec2880b5224d060727aba9f21e727f SHA512 cefc0b38a9d11cd66ef0646a3bad907d3fc4d78aa6cf24e594efd40b8114293c94255c3fea1bb54f66f5e1beeb6a732fe1809ffb62d4528ef3f63b6f7e4a73e8 +EBUILD cdd+-077a.ebuild 854 BLAKE2B f7189d0b866de1eac79af31782f71a86bb6c76bdfff026e3e9e5adcb2440627dab925e2bd2536a31acd6e07490959b8c5055e403a32bcd0f2845416753d9ce5c SHA512 4d22b9838d6c4809f32e864bb4119849eec35572bf109857e12df5e2d6f2a4ad5fd04f5d6eb71ec2864037ce27963dd214e5e3aeea36cb6bb155057c405095c8 +MISC metadata.xml 723 BLAKE2B 68b9f97d2373aafafaf1b63d834d649dd5aaf8fd0adbbe1642ed3e819769b1b569c7d658d52905b04e880ed03f40bdfb5f921bac212e1a56e756e47296ed87e3 SHA512 a6c58e4cba4852ff383be3a15d8e9bcf8621827679e02a9ce18509d816a9e286e895e8d4d5e7be68468cab815481db653fa023be89cf72a77123173f77ab5c3a diff --git a/sci-libs/cdd+/cdd+-077a.ebuild b/sci-libs/cdd+/cdd+-077a.ebuild index b0f5d66efdd8..12930c685aba 100644 --- a/sci-libs/cdd+/cdd+-077a.ebuild +++ b/sci-libs/cdd+/cdd+-077a.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit epatch multilib toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Another implementation of the double description method" HOMEPAGE="http://www.ifor.math.ethz.ch/~fukuda/cdd_home/" @@ -12,27 +12,25 @@ SRC_URI="ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm x86" -IUSE="" DEPEND="dev-libs/gmp:0=" RDEPEND="${DEPEND}" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-headers.patch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-gcc-5.patch \ - "${FILESDIR}"/${P}-qa-const-char.patch -} +PATCHES=( + "${FILESDIR}"/${P}-headers.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-gcc-5.patch + "${FILESDIR}"/${P}-qa-const-char.patch + "${FILESDIR}"/${P}-gcc11-dynamic-exceptions.patch +) src_compile() { emake \ CC="$(tc-getCC)" \ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - GMPLIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - GMPINCLUDE="${EPREFIX}/usr/include" \ + GMPLIBDIR="${ESYSROOT}/usr/$(get_libdir)" \ + GMPINCLUDE="${ESYSROOT}/usr/include" \ all - } src_install() { diff --git a/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch b/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch index cd2d32a8a31b..94018d6da2a6 100644 --- a/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch +++ b/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch @@ -1,8 +1,8 @@ Fix check for GCC version beyond major version 4. Gentoo bug #569222 ---- cdd+-077a/gmp_init.cc -+++ cdd+-077a/gmp_init.cc +--- a/gmp_init.cc ++++ b/gmp_init.cc @@ -31,7 +31,7 @@ # define pm_gmp_reallocate std::__alloc::reallocate #endif // gcc 3.3 diff --git a/sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch b/sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch new file mode 100644 index 000000000000..1ac5a0cef32b --- /dev/null +++ b/sci-libs/cdd+/files/cdd+-077a-gcc11-dynamic-exceptions.patch @@ -0,0 +1,71 @@ +https://bugs.gentoo.org/787941 + +From 46d95aeac2d3951d79291def284bb610e7cb033f Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Thu, 5 Aug 2021 02:00:33 +0100 +Subject: [PATCH] Drop deprecated C++17 dynamic exceptions + +--- + Integer.h | 6 +++--- + Rational.cc | 2 +- + Rational.h | 2 +- + cddio.o | Bin 0 -> 154584 bytes + 4 files changed, 5 insertions(+), 5 deletions(-) + create mode 100644 cddio.o + +diff --git a/Integer.h b/Integer.h +index 8b7f04e..d4a1bdd 100644 +--- a/Integer.h ++++ b/Integer.h +@@ -179,7 +179,7 @@ public: + } + + /// Recognizes automatically number base 10, 8, or 16. +- Integer& set(const char *s) throw(gmp_error) ++ Integer& set(const char *s) + { + if (mpz_set_str(rep, s, 0) < 0) + throw gmp_error("Integer: syntax error in string"); +@@ -195,14 +195,14 @@ public: + + operator double() const { return mpz_get_d(rep); } + +- operator long() const throw(gmp_error) ++ operator long() const + { + if (!mpz_fits_slong_p(rep)) + throw gmp_error("Integer: value too big"); + return mpz_get_si(rep); + } + +- operator int() const throw(gmp_error) ++ operator int() const + { + if (!mpz_fits_sint_p(rep)) + throw gmp_error("Integer: value too big"); +diff --git a/Rational.cc b/Rational.cc +index f1b86a4..c679671 100644 +--- a/Rational.cc ++++ b/Rational.cc +@@ -19,7 +19,7 @@ + #include "Rational.h" + #include + +-Rational& Rational::set(const char* s) throw (gmp_error) ++Rational& Rational::set(const char* s) + { + const char* digit=s; + while (*digit && *digit!='/') ++digit; +diff --git a/Rational.h b/Rational.h +index acaba13..eb30578 100644 +--- a/Rational.h ++++ b/Rational.h +@@ -421,7 +421,7 @@ public: + Numerator and denominator are expected delimited by `/'. + Omitted denominator assumed equal to 1. + */ +- Rational& set(const char *s) throw(gmp_error); ++ Rational& set(const char *s); + + Rational& operator= (const Rational& b) + { diff --git a/sci-libs/cdd+/files/cdd+-077a-gentoo.patch b/sci-libs/cdd+/files/cdd+-077a-gentoo.patch index efe6d7035e99..b61b8ab42a0b 100644 --- a/sci-libs/cdd+/files/cdd+-077a-gentoo.patch +++ b/sci-libs/cdd+/files/cdd+-077a-gentoo.patch @@ -1,5 +1,5 @@ ---- makefile.orig 2010-01-19 20:22:59.000000000 +0100 -+++ makefile 2010-01-19 20:52:01.000000000 +0100 +--- a/makefile ++++ b/makefile @@ -6,21 +6,21 @@ #CC = /bin/cc diff --git a/sci-libs/cdd+/files/cdd+-077a-headers.patch b/sci-libs/cdd+/files/cdd+-077a-headers.patch index c6ceb93bfaad..4df6f05871c9 100644 --- a/sci-libs/cdd+/files/cdd+-077a-headers.patch +++ b/sci-libs/cdd+/files/cdd+-077a-headers.patch @@ -1,10 +1,5 @@ -Index: Integer.h -=================================================================== -RCS file: /home/imocvs/cdd+/Integer.h,v -retrieving revision 1.1.1.1 -diff -u -p -r1.1.1.1 Integer.h ---- Integer.h 2008/12/15 01:19:52 1.1.1.1 -+++ Integer.h 2008/12/15 01:24:04 +--- a/Integer.h ++++ b/Integer.h @@ -23,6 +23,7 @@ #include #include @@ -13,13 +8,8 @@ diff -u -p -r1.1.1.1 Integer.h class Integer; class Rational; -Index: Rational.cc -=================================================================== -RCS file: /home/imocvs/cdd+/Rational.cc,v -retrieving revision 1.1.1.1 -diff -u -p -r1.1.1.1 Rational.cc ---- Rational.cc 2008/12/15 01:19:52 1.1.1.1 -+++ Rational.cc 2008/12/15 01:25:14 +--- a/Rational.cc ++++ b/Rational.cc @@ -17,6 +17,7 @@ #include @@ -28,13 +18,8 @@ diff -u -p -r1.1.1.1 Rational.cc Rational& Rational::set(const char* s) throw (gmp_error) { -Index: Rational.h -=================================================================== -RCS file: /home/imocvs/cdd+/Rational.h,v -retrieving revision 1.1.1.1 -diff -u -p -r1.1.1.1 Rational.h ---- Rational.h 2008/12/15 01:19:52 1.1.1.1 -+++ Rational.h 2008/12/15 01:27:08 +--- a/Rational.h ++++ b/Rational.h @@ -17,6 +17,7 @@ #define _POLYMAKE_GMP_RATIONAL_H "$Project: polymake $$Id$ @@ -52,13 +37,8 @@ diff -u -p -r1.1.1.1 Rational.h *den_buf++ = '/'; denominator(a).putstr(os.flags(), den_buf); } -Index: gmp_init.cc -=================================================================== -RCS file: /home/imocvs/cdd+/gmp_init.cc,v -retrieving revision 1.1.1.1 -diff -u -p -r1.1.1.1 gmp_init.cc ---- gmp_init.cc 2008/12/15 01:19:52 1.1.1.1 -+++ gmp_init.cc 2008/12/15 01:23:45 +--- a/gmp_init.cc ++++ b/gmp_init.cc @@ -16,6 +16,7 @@ #ident "$Project: polymake $$Id$ diff --git a/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch b/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch index a2304725990f..883b6bf809ba 100644 --- a/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch +++ b/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch @@ -4,8 +4,8 @@ cddio.C: In function ‘void SetWriteFileName(char*, char, char*)’: cddio.C:103:20: warning: deprecated conversion from string constant to ‘char*’ [-Wwrite-strings] extension=".ine"; break; /* output file for ine data */ ---- cdd+-077a/cdd.h -+++ cdd+-077a/cdd.h +--- a/cdd.h ++++ b/cdd.h @@ -185,8 +185,8 @@ extern int output_digits; /* Float digits for output. Does not affect the computation. */ @@ -17,8 +17,8 @@ cddio.C:103:20: warning: deprecated conversion from string constant to ‘char* myTYPE FABS(myTYPE); void SetNumberType(string); ---- cdd+-077a/cddio.C -+++ cdd+-077a/cddio.C +--- a/cddio.C ++++ b/cddio.C @@ -90,10 +90,10 @@ } } diff --git a/sci-libs/cdd+/metadata.xml b/sci-libs/cdd+/metadata.xml index 1745610437d5..e793c504506a 100644 --- a/sci-libs/cdd+/metadata.xml +++ b/sci-libs/cdd+/metadata.xml @@ -1,13 +1,16 @@ - - sci-mathematics@gentoo.org - Gentoo Mathematics Project - - - The program cdd+ is a C++ implementation of the Double Description Method of Motzkin et al. for generating all - vertices (i.e. extreme points) and extreme rays of a general convex polyhedron in R^d given by a system of linear - inequalities: P = { x : A x <= b } where A is an m x d real matrix and b is a real m dimensional vector. - + + sci-mathematics@gentoo.org + Gentoo Mathematics Project + + + The program cdd+ is a C++ implementation of the Double Description Method of Motzkin et al. for generating all + vertices (i.e. extreme points) and extreme rays of a general convex polyhedron in R^d given by a system of linear + inequalities: P = { x : A x <= b } where A is an m x d real matrix and b is a real m dimensional vector. + + + cddlib/cddplus + -- cgit v1.2.3