restrict ntl dep

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

6 files changed, 24 insertions, 28 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 5c02c8475b30..9d83c4879d0f 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/Macaulay2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.33 2015/03/24 17:22:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.34 2015/03/26 10:17:49 tomka Exp $
+
+  26 Mar 2015; Thomas Kahle <tomka@gentoo.org> Macaulay2-1.4-r1.ebuild,
+  Macaulay2-1.4.ebuild, Macaulay2-1.6.ebuild, Macaulay2-1.7_pre.ebuild:
+  restrict ntl dep
 
   24 Mar 2015; Agostino Sarubbo <ago@gentoo.org> Macaulay2-1.7_pre.ebuild:
   Stable for amd64, wrt bug #542572
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.4-r1.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.4-r1.ebuild
index be08d35dc28f..a65b2ee14e37 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-1.4-r1.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.4-r1.ebuild,v 1.4 2011/12/14 08:44:52 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.4-r1.ebuild,v 1.5 2015/03/26 10:17:49 tomka Exp $
 
 EAPI="2"
 
@@ -28,6 +28,7 @@ RESTRICT="test"
 
 DEPEND="sys-libs/gdbm
 	>=dev-libs/ntl-5.5.2
+	<dev-libs/ntl-7
 	>=sci-mathematics/pari-2.3.4[gmp]
 	>=sys-libs/readline-6.1
 	dev-libs/libxml2:2
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.4.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.4.ebuild
index fb45b130cbbc..09b71af9cf8f 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-1.4.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.4.ebuild,v 1.5 2011/05/14 14:34:21 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.4.ebuild,v 1.6 2015/03/26 10:17:49 tomka Exp $
 
 EAPI="2"
 
@@ -26,6 +26,7 @@ KEYWORDS="amd64 x86"
 
 DEPEND="sys-libs/gdbm
 	>=dev-libs/ntl-5.5.2
+	<dev-libs/ntl-7
 	>=sci-mathematics/pari-2.3.4[gmp]
 	>=sys-libs/readline-6.1
 	dev-libs/libxml2:2
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild
index 74aa81e35f90..041881e6d17e 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild,v 1.4 2014/05/03 15:44:12 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.6.ebuild,v 1.5 2015/03/26 10:17:49 tomka Exp $
 
 EAPI=5
 
@@ -38,7 +38,7 @@ DEPEND="
 
 RDEPEND="
 	sys-libs/gdbm
-	dev-libs/ntl
+	<dev-libs/ntl-7
 	sci-mathematics/pari[gmp]
 	>=sys-libs/readline-6.1
 	dev-libs/libxml2:2
diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild
index 2267b6224fbf..8f1a859842ab 100644
--- a/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild
+++ b/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.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/Macaulay2/Macaulay2-1.7_pre.ebuild,v 1.2 2015/03/24 17:22:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild,v 1.3 2015/03/26 10:17:49 tomka Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ DEPEND="${PYTHON_DEPS}
 
 RDEPEND="${PYTHON_DEPS}
 	sys-libs/gdbm
-	dev-libs/ntl
+	<dev-libs/ntl-7
 	sci-mathematics/pari[gmp]
 	>=sys-libs/readline-6.1
 	dev-libs/libxml2:2
diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
index e6073330e591..a9425f55ee2b 100644
--- a/sci-mathematics/Macaulay2/Manifest
+++ b/sci-mathematics/Macaulay2/Manifest
@@ -23,26 +23,16 @@ DIST gtest-1.6.0.tar.gz 956966 SHA256 d2346ad6f3b56763b3e18ffde7e69fd2fac11a434f
 DIST gtest-1.7.0.tar.gz 1001582 SHA256 c0f860eee47c86e0aeb462fd0bdfd70e3975297e0b8b178e0e03a95e1f6c9bc4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3 WHIRLPOOL 36edbdf8be7c3793a89918a3c43d74e75a6281a37c394f7d2f20506130a76aab04a3beddba01bf7f0e9b6901c7e834ca014c31c913c0ea846d3f6be9c93599d2
 DIST libfac-3-1-1.tar.gz 90104 SHA256 4c463af2d22375aa62be4fb1f9a32cada6723ca5e3ddbd8a4f5cab72b675e33a SHA512 d920bd40c9fb3938d2c08ff0d750bd26df0c7627af388f2ee0592947e4bc78c9841b9bae95775af53642daeee7b8d42761af4bf564e7f899f2ac03ba7ac83a67 WHIRLPOOL 03b550ee8f9ddb57cbd1e690a9e9a660ab083da74b58936c8a3275ba106023d64d59b8bad0ced8b08db2a8e912b01737d2a9814824b154bb95216f556aa77701
 DIST libfac-3-1-6.tar.gz 83557 SHA256 b511559d1c49ca799d46dad6b8e89b9f0183f1c2f53046b1727f9c1d3ff54104 SHA512 fa23180d4139cd87009ff1194a749d7e2997e50c55db9787c2bdabdd6dc6989cda565a54d5138b92315fa51706c58e412b0c21665a04baeeaf756947daf9f38b WHIRLPOOL ff569ced414c779c50ce0aa8b09a06e31930f6be40dd204e2cb7b53e4589f86cff434afae220adfa19290bd188a7c27b711d2f0d3b41cf0b8e9b8a9c69268469
-EBUILD Macaulay2-1.4-r1.ebuild 4320 SHA256 1cd029f99254ac4596afe1711bc45a1e8d0e7d8f027b7564d23e92aa066ace84 SHA512 54bcafcd1d9719d888fbd20301235905b409f1a0aaee9a526e18a5ba9eff96f0380a3c737b54f440ed561eb84b24176b0e7c6c7c9b2b8722961e96b831250921 WHIRLPOOL 6d4ab258db25ceb8c2d82253069a9dfc0638d9dd68d3f2087059e5420918232e63a3487e5e49286968d6a93b79fcc6c989649319e727be1d1e08f6e4564ddb43
-EBUILD Macaulay2-1.4.ebuild 3892 SHA256 d5d9631515263d355e548827512e44fd526ffd41b5db981ac9acae35fbfca39c SHA512 1d95b5c593655a40851a371ce5f8dc3eb9d4dfc0656d66068c557d56d7394e5022d1b690c424a5a73649a7399b1f2e2837e3803ea262fffd4c97e087b9bc9e1c WHIRLPOOL a7a342f10f7c4efc8025e50db2b3542a7dea802abaa6695faefe345cd0733654a510a12da66648da688bda9cd55cd3bef6d65b757f7681861fa565a7ba61155b
-EBUILD Macaulay2-1.6.ebuild 5083 SHA256 26b232700c4a4b44381bdc3e3ce09e7bcd2d504cd42656c2859572090ea40980 SHA512 d8ac6f360d8290f25246f927dd28882c1f134b5ca4eaea0be4a116039a3a5eb23db984522e899db4bffa69d08db2f80e889c54443bbce17e4f6565e7cdf835c7 WHIRLPOOL df63c19e9b648097753ffa227489a51cf3eed3eff4eb6a42f6989565c224117d5bd8c1bf68f20b11594072a8fbe188432a5fe582ff87a5860ec4fdeba37012be
-EBUILD Macaulay2-1.7_pre.ebuild 4044 SHA256 8a79660cc85d57d52373bcf720486200625b12fe14ba55a97ce13febcd20d363 SHA512 3bf95bca8c9f412bc6d83a8cc18c40343162dae2d4e70abf80845afa724f2fc321da8ed19b2c2c793b43ba360869cd5a522903d20ed42f069307086619993a46 WHIRLPOOL c3dc31c6652a91e7b95d5d6741eaf90f89d4c4bd860177ce55727f95068380302a9dc7e3467a8b684d049ae9f384dce850f853bd4cc92e4a5ca15ad1692330fd
-MISC ChangeLog 2395 SHA256 cc3aa6c4ee5ba250eeb520bdc369ace4e8c992c5cb266f7197fc4d7b88ef84b9 SHA512 7b9742708d7a3e70fa257a21ed8af54b4cb3971a061bfb0359fda6c16a738b0853a1ae3e79b476660d6407a0f8b8082d1b181e28b8532a2c48d12376e658dd65 WHIRLPOOL 1fd1258607be5829d0f5a6e1630b6a52d1ca66ed3e68262429ac51ddfecf6afbd01cd761fdf15bd60058a9696e5eb75015e156551f03b31a8d2fba1e130cddac
+EBUILD Macaulay2-1.4-r1.ebuild 4332 SHA256 ee166f0023d2a41f68d01103c32b57adb13a99df6d8fd2ec0eb470ce0082a04f SHA512 4e73586bda7d56a38206cb960e84f7697717155539dfdb150a16ded5cc3925ad8f48763d68c4e85927a20674faf7ef4dc62045b4b04d952f0d4602b13ceb1cf4 WHIRLPOOL c0a377bffc089b3a6176f6cdc323cf692721387e3e883fc224b3ec279482b919ac794c1ef81be516dbf0feb0e1261573b93c3e544a2b9dca1cd4fffaeb1265d4
+EBUILD Macaulay2-1.4.ebuild 3909 SHA256 4f4e171e14eef6895a5f33d9586d07994ed4eb8812b6bf3d6b9729f9c8a77467 SHA512 76f34282eb73aaea3a81baed5ce6a410579b665c4fe26cb8037b60778f3adc1024bb3e85523e5af2bc94c6c44559f03793fb9c63a2f70135db771d5a6a17056c WHIRLPOOL 4ef152c4342a67fdf3aa27a42f1f513213042aa0f2b6e555955af8289a19efb73fd042b39e1bf66c2137563da1ef78379a53512970c5b52edb250acd44ef6f95
+EBUILD Macaulay2-1.6.ebuild 5086 SHA256 33abba1628ae0280da2ebd09a10e6503ec538ec19cd5b77308a24e97e9692b69 SHA512 a0efd0301a46fc953f704f9c108b409ca8a0ead956e6f9216ca6f6ed89f508dd02fcda7a6fba3a807d249fe9ea190f2f2671a615936672da5725b4b4bbb66682 WHIRLPOOL 4ed06acc7ed8e8d798a237fcc6c90c4773b382063ef96c3e749d3869e0b8f3821d390065663fabb0f725afdd8f79ba98addebf17ae84c980f4b5cdcb048edc32
+EBUILD Macaulay2-1.7_pre.ebuild 4049 SHA256 66393363c6e1d52763e0c78a0a694867a59d275c71f69aaa6e46f6a0ce322d6e SHA512 de0b211499a5b634f9c518204efccc0d2836913e173e8b4c6602e948b43ff1f6f6a0dd383486849e0f6068f74fa6507dde08e43a5ef474c0d91559de73d16b10 WHIRLPOOL 58cccd5e07bb444bfc26098d3d1982a76329a9b432369a3db6feb301351eade9845106d849ae1bec1bb54c87435e7f4820cb07d3e8be1bb2b9c5c4c133d05e6e
+MISC ChangeLog 2561 SHA256 38a38b7ca1701ce513d400eb71b608842ca0c2cd003ded5dbc2f49ad4919a08e SHA512 b161e03b711fef66923cd63ac49a5037d33863168f44ba0aa0dd69765a6df5155e10782dc4e93176d9cb8b07c780bb09d17f68d833b42d41531eda8c456088d9 WHIRLPOOL 74e9d5092bb593c82843be3390ce83f65fe16db44b56be7902649a16b2d897e62a1456a40879b8dab98e1fec42539c58959e79f2d39291bc94a4c662d698f26d
 MISC metadata.xml 501 SHA256 0f1bd9e307bc0b7f1e5f116c5993f8c36cd796a11bf7f5deca930d43d1d3574b SHA512 19b638437b7591c262ac41401f4154742325aa8afa7a3b087c85b3dee2e4ce98166cc67136bc31d1df25b5bb90eaf6482e05de1ee25023f3f03ad017789b0ccd WHIRLPOOL edfa93878dbaf97c227c18f43805ca48c83978d94d8f4ddf000cd8a2b34bd13dd2454c9086497e00b8cce1cec1d38763b3f8e0a55f0b39f4fc3172d4a858d4ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVEZ1IAAoJELp701BxlEWfn8YP/1K4Qgi0G/OVj4ZDXUI5FqzA
-kTbLEKTIrt2AII4MQ6ivf0SWo/ZFCSdSHxLgFe1oT7N9M/O3Eo6ls18YJSUNsr5b
-JDuaaiQXTIHidzl67Nf1R46dcKeSjKv+jW69izWneMfGKCdJTDVv6YBClkI335se
-QtpaX4KLYzeug69BnGNU7GaB+6xGcSCNlMD1FimGPdy3+VynarlcIe0ZXnRzPmjw
-H17AIxt5FgiFiVZbCIiQcdcH2affVKAp7n4j0gRhwOC2F42s1dwmhfX/pk4KDVDv
-3aDrMvsSmTtAOGbGxtyhmLhUOqASLn87WAGTaY0hmVf/a+V+Y7VGR3iMinjT6P/n
-MDclDrxyAVpT+uvUWkDr8WINi8T4jaD4QDMon+JSa1aJZhldw2aX+wJmrSAMItHs
-ZqfHsjlzFNASHZnN/BiK624Kq0zQIHuZtwkemzMG1Q+URtr2iE5tw05fbJoJK6JB
-ZL/UQTnx8Y02tlV/ZXbjIjspDs/cJU448K0OvQ1puspu+n/igRbaWhAhhKnfju92
-ZThP999iNV1MJF6VyaHaXKaURodHe+4PuMPY4A3TyGdXTq5NZlkAgHlP0TW+H2My
-1rs5YkAH1diGGbg8jquI21jusm9Bu7D7T2mTZ1whzVPDXN4eFJrzUup0fAs6Cafo
-cN7xfNoSper9Xf3/rgmA
-=/7pp
+iF4EAREIAAYFAlUT3UcACgkQid6yGVZcMrx19AEAmsT89/UZUuoyt85I36de5C/F
+8KscLTNfBsUgvzjMkxMA/R5X79lV7QWLxpAMspBPjoTeifcXJKtxL9vG5SxicICE
+=FDXl
 -----END PGP SIGNATURE-----