Fix ntl8 compatibility

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

4 files changed, 52 insertions, 8 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index a194ec944fc2..aaba7b6b44a0 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/singular
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.63 2015/03/26 10:16:33 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.64 2015/03/26 12:44:41 tomka Exp $
+
+  26 Mar 2015; Thomas Kahle <tomka@gentoo.org>
+  +files/singular-4.0.2-ntl8-compat.patch, singular-4.0.2.ebuild:
+  Fix ntl8 compatibility
 
   26 Mar 2015; Thomas Kahle <tomka@gentoo.org> singular-4.0.2.ebuild:
   Restrict ntl dep
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index e9db6d7e4f06..8b7be2809e8a 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -13,18 +13,19 @@ AUX singular-3.1.3.3.make_parallel.2.patch 1498 SHA256 4d16186fc3e218d86a99f45d4
 AUX singular-3.1.6-factory_template_instantiation.patch 900 SHA256 03c64c0f4946a4de9b57f4ae644bb364283763b56075e712c617972de4636c37 SHA512 0a0d7a271fddf543de6d8d987322e4062997a6283ccbb90f55c8d70ed39a2e58a0d68e881c0d260ad9f4ceaf60352bcd78a48b6f707a7719369c0b4cbe47542f WHIRLPOOL 8b0a5903c6d13cb94e68791fa1ab7e6846909059ebf4d9d5eda5a04693fc09eed93c1c95ad03af018068c044846b9da6d98cc11da03a8277d29ce4860671946c
 AUX singular-3.1.6-ntl6compat.patch 1401 SHA256 4fbc4bd0817e585345a7dd3fa8df8c19e8ed241fb78d911c2e7161b1e12e9c1c SHA512 5d6c4ec73b81cebcd8d24dc75efedb2f3da656fc5103701f25f7bba40355e995f116acddb7bb711b8832a89ec55a1b7fbbc7dd9215822f786e7a6012905b66be WHIRLPOOL c0ee7ee9486eda07f00df2ab4604b88813d19dd47662d25e16eb9c83ede3f85589f7c1d6d675791d0198c53ceff9a2fe47c4fdcc185e08d172fa4798bcd6bf76
 AUX singular-4.0.0-fix-omalloc-ar-detection.patch 484 SHA256 510bcac07d297b39579e99caf101cd9132a607453ff2566f8e7024a2cb23ccf6 SHA512 4f74b1d436c17efa3872a6b24e56c691220813a3cc2debeb19caa5dd6bf0e3c39af32e43e3d7afb5af40f985ec56377128185b9138dfcf77a04618ba444ea619 WHIRLPOOL 9485b6c7adce21c208da12acc62babeadeba20bd9fee15c3f10833246f2ed225887cdf8d9e8d35b29ca5753acf7e8dca8a7a802d67a99d6ce066dc027ebbb512
+AUX singular-4.0.2-ntl8-compat.patch 1149 SHA256 fa84f01f4c11b930850327da69ad7a16d7ecb941a4e9fe774b1dcfa77700c442 SHA512 178f0130cd6a606d6c93f5cc42dfe92782a16cc6b3d0e2695ce16d2115f70e502f702e8e72fd5d3b61b1bb5b3f4038a4fbf6277418b3f0bf89cae7939d5ed606 WHIRLPOOL 0d7bf9024410db80379b9d6694bea1c279b9d2ad4c89440206f9c701205241140a31c37a0fa6157be55247d2c6ceca1740a12ef6b723154c682842b9d9c7ce3b
 DIST Singular-3-1-6-share.tar.gz 10620177 SHA256 c74a97b7eb8ed53417682637fe11c2480aeb1a6cbf4a8db27a1b16a162e83c4d SHA512 54bff29c5d64609583ec8b1c43005a1ff453c8f2cedfe9a26ac840888e9d306e3104e14aea5a3cc923fac916215c4285ecfe5ae7e1242aee0308b5e4c6e2d48d WHIRLPOOL a1edc8fa9cad189af413870b0e63316e135e8456075f13b3d8036afafd6c25f4bcc854432cdcb8c2ec690c63b43f616367aa9f1027c096e95f22aa0508943f67
 DIST Singular-3-1-6.tar.gz 25535111 SHA256 7956a17a0b5d428fea25bc0bc6c19c753748fb98bb2926c49b9fbcbec94172ff SHA512 103a10dd474d93cceb678bcef1a4aae5ec693cb9e68c9d63a7536929b738a0127501ee145a79cc3b9ddfa4bd1ca0f05e640eeb3b0fbdb60de4f56aa5beacc213 WHIRLPOOL 71ef6d505f7c8b2eeacd46666640d7b3c79f75d6c2c858b135553b1fb3a9dd7d88df74924009468c32aa4aa748b88ccb7762010ab4d36eec420a07fd36e8dd22
 DIST singular-4.0.2-share.tar.gz 8789162 SHA256 fe81cb100f3b73b159eb4a8122a29bc0f7705ef6f62ad55b68b5582c1ec0642d SHA512 068827df04a5d1b4407dbaab1296d0120071dc109b749037b02263d51906852a5c2c1ef321733953a181c2d3d0fe799c197ef0af3b9341810ecf31a5324e0a25 WHIRLPOOL 615487e95e32d9f07552e92ebcd46e3071d110dd31e7d980b01340d22a5205ba2d771532fad1bf44863a38820428157284a171e0b901861fda6e51482d546adc
 DIST singular-4.0.2.tar.gz 8635172 SHA256 c105a2c8ace0b3c9189b782ed63660ce235407d0160907c2cafc2128d36d8cb7 SHA512 4543a45839ce8adc45e3b2edd84a6e398b7ba157da1eda050dbce2a8b20333eb0c63433e3e7eaf59d76bf6bcb65c1b1611bfc08c25fd493c88e2f06624898e3d WHIRLPOOL fe30bc87c6b403b2e30bd1c016aeeb015c2a64a63d87b81536dc53a2555ac068f3e0c6d8763775d8be5e5e1a935aadab1c86b603cbb698234a19cc9cfffac282
 EBUILD singular-3.1.6.ebuild 4770 SHA256 76405ee23daaff5d73b42e96c18e93a56277c6d3ecb1f32b7fa6df9b22a76d8d SHA512 0308de0e31ec6f8e5801a3375f43f52970d0e173ae48484ddfa074021535d82962ba494a4bc200b4e41c0e3a59702499003b2330ce03806081bf1bdac9b7ec12 WHIRLPOOL 752fa5fdff5f4e719af2ca8edc4ebc90ce8744ede046f7f5b8a7d0f9d142dbc7b8dbbb1d77abc39867337adbe44250af40b286cb59598c24334533fbbd4517a5
-EBUILD singular-4.0.2.ebuild 4045 SHA256 abc577346f1d98929979e9159b907ca8b89ddb61e866b12faf07411119ce5b89 SHA512 e46234573080ae2956874b12c6e9454a4133a6a1990dfc29308eeb804dd7e86ab9fdf70ddcd10d6b5b0e4233bc66c971397fa6e64e9ef7720b7431366c13b75e WHIRLPOOL 633d17701e418864b0a55e5e9c42d7c086c8166d4ebcf962b66ceb43940330ae0ad433e4587a89cc901c79e24c0fcd7b6cefa8a080e3fba3ddb630d3fdf49a51
-MISC ChangeLog 13652 SHA256 945e1a07e809745f10592a3f932bb0d9846c6b23f3bc0c56be8e457118b77827 SHA512 91777943c6af1fbfb62bd79a6172418ac84ee5a3e668e71ab8b396a2ba2a3ce438826ff82eef894341f1b644eea617dcbfdbe5154a73a4b9763bd6e6a7332fda WHIRLPOOL 17cfbd1603481097b19ecc1695d0ba71a176a6e9c5405b3ab9e6eac1f69993c7dc8bb372c27321b6350d0045200e56eced8571419618f9658a2ffcb9fe95dd6f
+EBUILD singular-4.0.2.ebuild 4081 SHA256 45741a6d64f1d8d73e593584ce9262681d0e0a6b403ce5cfd4d968d3f4144350 SHA512 d25c3e17922f641fde54bfd9ead27b87efaf7d369479a8310a3bd531e0cffac0711c366071b3bf4b6781bcbd77df3270ff85041450323f8c78c798cb6c7b876b WHIRLPOOL f0dfa9827c494717be4a7298cf7c74fb2f552a311658ccc80886ed297e1ae8ec44bcc5a71c3ba857b47a37dc0771bc9be3c2e391624af509ec9d8b0c3728e8ca
+MISC ChangeLog 13791 SHA256 adb73d456d950cb68bdf7bf0739c341e4a2082ba1f041091e6db3c6b57fdab26 SHA512 75e779b4eff5ad8963581211d30c8677bf4f53b88570a835dff047f3ff208cd2ae62ce99c03521541c6dba5c1b58ed757e15db5376505be02595e8b9353de0ce WHIRLPOOL 364d531a377fd7568dbdb1c0511f60d79e2e6e1dbac0f1bebbaed3abff1ad08186b64213039c18d51134916f0ada4a72132ea9e93898337198a28ba772c8a47f
 MISC metadata.xml 381 SHA256 784d034201d00e1cf426a61486184b5178702a00dbaa4be3740a462c45cc1312 SHA512 5896b2b956ca1405616871bdb55981b94a22cb4b4f6483096429ec8b010d522d32d9e4eb0a87bc040aab6d3ff8007f1b0f3172d7994f74a408dd9628e89dc08d WHIRLPOOL d5b8312b3aed717bcf191dccad086994456e413a0444d11c216e96a416b4cf1d3c4903ba187cdee3e61a9dddaa1858958766e0782b28ab8ff6c6d5fa86b7eaac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUT3PsACgkQid6yGVZcMry4/AD+OXO5iQNYm4lEeeb0zIfX6cvx
-BJXwwXPPnmtKNvsUt3gA/RcdbvDAjoH0WhAf2d8KrB69CSeDBNJ08W/60SqgCB5q
-=XOPn
+iF4EAREIAAYFAlUT/7IACgkQid6yGVZcMry1QQD5Aaou8VF3gNTpA9mRhz6RTUIN
+uQwvDWG6Jkk386Dxe54BAJ0f2S009bCyc52yyT0KbKaWVKVsM+Q2ajl1WO/qmVZ3
+=dYpm
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch b/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch
new file mode 100644
index 000000000000..d3e6b77a28e9
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch
@@ -0,0 +1,38 @@
+diff --git a/factory/NTLconvert.cc b/factory/NTLconvert.cc
+index 41ce9b2..e32093d 100644
+--- a/factory/NTLconvert.cc
++++ b/factory/NTLconvert.cc
+@@ -30,6 +30,7 @@
+ #include <NTL/GF2EXFactoring.h>
+ #include <NTL/tools.h>
+ #include <NTL/mat_ZZ.h>
++#include <NTL/version.h>
+ #include "int_int.h"
+ #include <limits.h>
+ #include "NTLconvert.h"
+@@ -500,8 +501,14 @@ convertZZ2CF (const ZZ & a)
+     return CanonicalForm(coeff_long);
+   }
+   else
+-  {
+-    long sizeofrep= ((long *) a.rep) [1];
++  { 
++    const long * rep =
++#if NTL_MAJOR_VERSION <= 6
++      static_cast<long *>( a.rep );
++#else
++      static_cast<long *>( a.rep.rep ); // what about NTL7?
++#endif
++    long sizeofrep= rep[1];
+     bool lessZero= false;
+     if (sizeofrep < 0)
+     {
+@@ -519,7 +526,7 @@ convertZZ2CF (const ZZ & a)
+       cf_stringtemp_l= sizeofrep*sizeof(mp_limb_t)*2;
+       cf_stringtemp= (unsigned char*) Alloc (cf_stringtemp_l);
+     }
+-    int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) (((long *) (a.rep)) + 2), sizeofrep);
++    int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) ((rep) + 2), sizeofrep);
+ 
+     char* cf_stringtemp2;
+     if (lessZero)
diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
index 1b52f4ba1e8f..c9f58d3c7388 100644
--- a/sci-mathematics/singular/singular-4.0.2.ebuild
+++ b/sci-mathematics/singular/singular-4.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-4.0.2.ebuild,v 1.3 2015/03/26 10:16:33 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-4.0.2.ebuild,v 1.4 2015/03/26 12:44:41 tomka Exp $
 
 EAPI=5
 
@@ -26,7 +26,6 @@ IUSE="boost doc emacs examples python +readline"
 
 RDEPEND="dev-libs/gmp
 	>=dev-libs/ntl-5.5.1
-	<dev-libs/ntl-7
 	emacs? ( >=virtual/emacs-22 )
 	sci-mathematics/flint
 	sci-mathematics/4ti2
@@ -59,6 +58,8 @@ src_prepare () {
 	# omalloc's old configure will fail if ar is not exactly 'ar'.
 	epatch "${FILESDIR}"/${PN}-4.0.0-fix-omalloc-ar-detection.patch
 
+	epatch "${FILESDIR}"/${PN}-4.0.2-ntl8-compat.patch
+
 	cd "${S}"/omalloc || die "failed to cd into omalloc directory"
 	eautoreconf
 }