Version bump, mostly taken from sage-on-gentoo

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 172 insertions, 3 deletions

diff --git a/dev-libs/ntl/ChangeLog b/dev-libs/ntl/ChangeLog
index 61f12e4fbfdd..d71700058438 100644
--- a/dev-libs/ntl/ChangeLog
+++ b/dev-libs/ntl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/ntl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ChangeLog,v 1.22 2011/02/24 04:56:07 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ChangeLog,v 1.23 2014/03/10 18:29:06 bicatali Exp $
+
+*ntl-6.0.0 (10 Mar 2014)
+
+  10 Mar 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/ntl-6.0.0-sage-tools.patch, +files/ntl-6.0.0-singular.patch,
+  +ntl-6.0.0.ebuild:
+  Version bump, mostly taken from sage-on-gentoo
 
   24 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> -ntl-5.3.ebuild,
   -ntl-5.3.2.ebuild, -ntl-5.4-r1.ebuild, -files/ntl-5.4-endless_testrun.patch,
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 99fd47ccc316..66d08f2cbfee 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,7 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ntl-5.5.2-sage-tools.patch 1411 SHA256 ca3ab5d6fc295d8825c32e307086b686ccc56f58d3aa69bb810d1a50c4f05a27 SHA512 cf1d19629061e4495f24b0726d7480aa7bb23e9c00d80e66f034f82831d19adfee9dce94412494a12c033144d016074126ec8b23064766b0c6dd478a6a74e00d WHIRLPOOL bc65acf6878376c71c35c15cf95a55ab1f3e3a58f5ec94274eb6ec126c890c850f43e282ddf7263d9f9a457808d787d065c540f6da1471274fc9eb7bfe066da0
 AUX ntl-5.5.2-shared.patch 4343 SHA256 38b298b4f4b6fa7083bc7a86dfb2dcc19e5fcbb2cad90a216b28110e8f0642a9 SHA512 e3f6c49a62c753e97f1606f90be13edfe997dcb1aec9df11ceb9efbfc14b7ec43d916f3f90ae687634b8672d16c9dad225ba7911ec8de761637d249d57611541 WHIRLPOOL 0baa24f6a177b69bc18f04eaa06f5511ccd6dbc4c3c5b154aed07b08fb53a310e9fdb7ed21f071d7db1d7b6abe4db800651908bf3d9d2efad36cdcc0361a5254
 AUX ntl-5.5.2-singular.patch 324 SHA256 2b9c1b1504ede6d9332fcb6e63bba93f81d528f0d035ebdbd8f32b2085c1f110 SHA512 8b62628b352ca8b15e894461c70a14b4d8ac87781d7bffaa2953d2ae3acca4a9a223d51da40ac76e553d0ea9a2ee1ea1a7c8c221a5e009771774e0ce7a50da95 WHIRLPOOL 2429ad058a8d97b3c2002d2369ff1b877135903f8c462ab4ccb6b95fb5d40e68dd2a927355152e132fec709d9d378c98f3ff0c0399faba673f16e93754f9a295
+AUX ntl-6.0.0-sage-tools.patch 1557 SHA256 dd999071c247c20b1030ec4f07e0f9fbd1ab3c978d06f4abb8c6abdf1578e7ac SHA512 5b028ef0b00d7ef0f82a260232bc130b300e175d31681b8f994e9037bc82d2d49491d8b495725388137cf3a2f73d17cdd6266592b3894189e11484159c70ce73 WHIRLPOOL c36cf93d45e481dcf95542d41aed81dc40be2973fdef4df9384dfaacb20450dc89306105f5a4ad1843ae3c825076f4a44049571dc6380d4ecf73af7d6e785568
+AUX ntl-6.0.0-singular.patch 330 SHA256 a09dec321bbbc5f88288b6d09a8c641b23cb658bb8ae467ab92a2c8ee0a62d6b SHA512 ea8fa036a3032231435de13578f01ce038d89ca35d1ff6250a72b6129cdcae1da329b3d273c98e34ed40dc09ac2cc172a5f1614184d44325a35ddc10b59e5fe5 WHIRLPOOL f87ef9128c9044842549568ab47f06f5687bee766768130d3b986a441eda127dd6facd4c113081e9bf6ac5462740374d703e835f1921fd179d2558de3af7fd02
 DIST ntl-5.5.2.tar.gz 707247 SHA256 ef7fe7c8b60ec6e05b2a279caad0081263f7fb68b7360120846644cde726ff56 SHA512 44892e00051ca743b1184c9ae30e62c8e2605edaa394358979ff990a535993a6f282d882871ca9ebb3c632971f806c41d9b8024c8fb2cc6fa0d22bc26c66db06 WHIRLPOOL 4587463c4b52be721a7feb164fab73341af97c6f451c0bb2fbf675503c8a5262a5d7615d628e97f082dde23ce49db0f0b314c625dae0526bb1abdfc88732896f
+DIST ntl-6.0.0.tar.gz 714741 SHA256 9342fa7d83a0ee6748ebae683368250eff06b19d7df5dfb85bcba8a896c0a29b SHA512 fa1f1745e75c7588ca5af437648ab0844281f5c6e6a22a3bcaf0409792f3d4c70f0b8050823d90d19673ebcecae18ce6d39e6c9b1fec9f2d79f87b788b58d261 WHIRLPOOL ba8d7355639d54c6b95b66f648330876a892223c2232ddd5dd7097c53b783f01a26c5da01e72c6ad4527c3829b3c9e7123b58e63ecb8d22b4940f71a9b8a422d
 EBUILD ntl-5.5.2.ebuild 2140 SHA256 013bf8253651a5c6c50fc3b1fedbff948e973c70b71e3012d382751eac54a693 SHA512 6f0180db3097c30450c745f397a4c4961d7d8ba4ffca38565bf3c11d0b9b7c50a3842227fee7bc78a608b0a9c4442532bc03b0c12863167d0e2b99235d46231d WHIRLPOOL f5855d5bda710ddfa86449fc2ea5d9c7022d76b5867787a8ee0c2b903bb5248200f6079888d565c3a5478f45628173d575c57e9aa47c3f38f0b93641c9fac315
-MISC ChangeLog 3583 SHA256 9a5f8b608d394d56dbab70d1e93d2c79e664303c0f5ad234113b2015afb3b0d3 SHA512 3abac560e35468611d19ceee54911aa34a8aa308ac4d9bedea3894bed13d45a59f009b31327c92dd90b22cf0d31d1227077299643fca0d0de195b3141b93f5e0 WHIRLPOOL b86e0f80aa98656ea2268ea0bbcf1f5e76cdc7a291caaefa98544a5ba17aacdf873e9951de582864ed253238d9d6ea4b16a48b3c1f8a89792d05aadd797a952f
+EBUILD ntl-6.0.0.ebuild 1905 SHA256 75c7224175b354e6ce7714bb51aa28def47d7187e99aead4bb11f63ac289c8ac SHA512 5da85d3390b538069e9aef78449170fb21f55cf8f9b11f4bafa38a488a8c8d02db7965ad59ed1d08c31a11ee07a7812bc394f9ba1b55a10f0527c0e38f7b6f68 WHIRLPOOL e3deb6534f1ff1c8bbe65497c3cc2823bf54b6c0d427a794d875e6d8720272bd2502131cbd57b3b45a55df04e956f941987f12513aaf988600f8e29c526df194
+MISC ChangeLog 3805 SHA256 50690ceaf07ce31919d6a73f17d9dd3fe4344bf5350f26098da44325fc31aa92 SHA512 d9ba809054ff165168ea3d10afc8735d63ef1d25fb269b2f7834907bde5926f3f029a5d83bebaad3cf4a4699f5b3f7e3d5d97314a6d64068fea07b5d1fc5f1ec WHIRLPOOL 3063974749d42abebbc27a503843aadec01f93bf4a07fa5c550aef14da720772dd34bf9f8ea4198d58494e02495c4a2d3b03d8277e59cd122ba555f19b9c2505
 MISC metadata.xml 466 SHA256 9b0633c6003b9cb406f4407b15cf094ddedd24d6c502024a6e30f996617f1808 SHA512 1c16b66249a73ed824dac46382ba18575e49cc2be8c86f978a2689d00bcd3510b5a3cd8b47f822d505aea9b3325728b06e7ee3292b25c834528846382dbd4905 WHIRLPOOL 4fad2f00acb9abd766641efad477443ee86c9d043403470ce11bd3177a951db30183aa6460cbb8159ef3250760a9ab96e2b9d7e6b0ae5fc6c90e53d9b0f3f2fb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlMeBHYACgkQ1ycZbhPLE2CriwCgi4x6ObWOGf1A2JBtHp1nfbSC
+G6oAnipEJ9vv18hJ95YZnAP4gKqAhqDo
+=/osg
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch b/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch
new file mode 100644
index 000000000000..e79731fc2fce
--- /dev/null
+++ b/dev-libs/ntl/files/ntl-6.0.0-sage-tools.patch
@@ -0,0 +1,61 @@
+--- src.orig/src/tools.c	2012-08-06 11:54:53.652334400 +0200
++++ src/src/tools.c	2012-08-06 11:59:18.183993600 +0200
+@@ -18,8 +18,35 @@
+ void (*ErrorCallback)() = 0;
+ 
+ 
++/*
++   The following code differs from vanilla NTL.
++
++   We add a SetErrorCallbackFunction(). This sets a global callback function _function_,
++   which gets called with parameter _context_ and an error message string whenever Error()
++   gets called.
++
++   Note that if the custom error handler *returns*, then NTL will dump the error message
++   back to stderr and abort() as it habitually does.
++
++   -- David Harvey (2008-04-12)
++*/
++
++void (*ErrorCallbackFunction)(const char*, void*) = NULL;
++void *ErrorCallbackContext = NULL;
++
++
++void SetErrorCallbackFunction(void (*function)(const char*, void*), void *context)
++{
++   ErrorCallbackFunction = function;
++   ErrorCallbackContext = context;
++}
++
++
+ void Error(const char *s)
+ {
++   if (ErrorCallbackFunction != NULL)
++      ErrorCallbackFunction(s, ErrorCallbackContext);
++
+    cerr << s << "\n";
+    _ntl_abort();
+ }
+--- src.orig/include/NTL/tools.h	2012-08-06 11:54:52.830333000 +0200
++++ src/include/NTL/tools.h	2012-08-06 11:59:18.143993600 +0200
+@@ -10,6 +10,7 @@
+ 
+ #include <cstdlib>
+ #include <cmath>
++#include <cstdio>
+ #include <iostream>
+ 
+ #else
+@@ -252,6 +253,12 @@
+ char IntValToChar(long a);
+ 
+ 
++/*
++  This function is not present in vanilla NTL.
++  See tools.c for documentation.
++ */
++void SetErrorCallbackFunction(void (*func)(const char *s, void *context), void *context);
++
+ 
+ void Error(const char *s);
+ 
diff --git a/dev-libs/ntl/files/ntl-6.0.0-singular.patch b/dev-libs/ntl/files/ntl-6.0.0-singular.patch
new file mode 100644
index 000000000000..c172386f3102
--- /dev/null
+++ b/dev-libs/ntl/files/ntl-6.0.0-singular.patch
@@ -0,0 +1,12 @@
+--- src.orig/include/NTL/new.h	2012-08-06 17:12:25.658913083 +0200
++++ src/include/NTL/new.h	2012-08-06 17:11:15.002915713 +0200
+@@ -12,7 +12,8 @@
+ 
+ #include <new>
+ 
+-#define NTL_NEW_OP new (std::nothrow)
++// commenting std::nothrow makes this ntl work properly with Singular
++#define NTL_NEW_OP new //(std::nothrow) 
+ 
+ 
+ #else
diff --git a/dev-libs/ntl/ntl-6.0.0.ebuild b/dev-libs/ntl/ntl-6.0.0.ebuild
new file mode 100644
index 000000000000..8a12dc1f7b0b
--- /dev/null
+++ b/dev-libs/ntl/ntl-6.0.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ntl/ntl-6.0.0.ebuild,v 1.1 2014/03/10 18:29:06 bicatali Exp $
+
+EAPI=5
+inherit toolchain-funcs eutils multilib flag-o-matic
+
+DESCRIPTION="High-performance and portable Number Theory C++ library"
+HOMEPAGE="http://shoup.net/ntl/"
+SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/gf2x:0="
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	# fix parallel make
+	sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
+	cd ..
+	# enable compatibility with singular
+	# implement a call back framework (submitted upstream)
+	# sanitize the makefile and allow the building of shared library
+	epatch \
+		"${FILESDIR}"/${PN}-6.0.0-singular.patch \
+		"${FILESDIR}"/${PN}-6.0.0-sage-tools.patch \
+		"${FILESDIR}"/${PN}-5.5.2-shared.patch
+	replace-flags -O[3-9] -O2
+}
+
+src_configure() {
+	perl DoConfig \
+		PREFIX="${EPREFIX}"/usr \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+		NTL_STD_CXX=on NTL_GMP_LIP=on NTL_GF2X_LIB=on \
+		|| die "DoConfig failed"
+}
+
+src_compile() {
+	# split the targets to allow parallel make to run properly
+	emake setup1 setup2
+	emake setup3
+	sh Wizard on || die "Tuning wizard failed"
+	if use static-libs || use test; then
+		emake ntl.a
+	fi
+	local trg=so
+	[[ ${CHOST} == *-darwin* ]] && trg=dylib
+	emake shared${trg}
+}
+
+src_install() {
+	dolib.so lib*$(get_libname)
+	use static-libs && newlib.a ntl.a libntl.a
+
+	cd ..
+	insinto /usr/include
+	doins -r include/NTL
+
+	dodoc README
+	if use doc ; then
+		dodoc doc/*.txt
+		dohtml doc/*
+	fi
+}