diff options
| author |   Thomas Kahle <tom111@gmx.de> | 2009-08-26 22:32:48 +0200 |
|---|---|---|
| committer | Thomas Kahle <tom111@gmx.de> | 2009-08-26 22:33:44 +0200 |
| commit | 572f088d142bb1369d2f1dacd4037ff3f5e819ae (patch) | |
| tree | 5edf377baa9538e1110a411987b854156b19731d /sci-mathematics/Macaulay2 | |
| parent | Manifest (diff) | |
| download | sci-572f088d142bb1369d2f1dacd4037ff3f5e819ae.tar.gz sci-572f088d142bb1369d2f1dacd4037ff3f5e819ae.tar.bz2 sci-572f088d142bb1369d2f1dacd4037ff3f5e819ae.zip | |
Bug #282174 was fixed. Removed workarounds from ebuild.
Diffstat (limited to 'sci-mathematics/Macaulay2')
| -rw-r--r-- | sci-mathematics/Macaulay2/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-mathematics/Macaulay2/Macaulay2-1.2-r3.ebuild | 11 | ||||
| -rw-r--r-- | sci-mathematics/Macaulay2/Manifest | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog index db98603ec..6bd9fc790 100644 --- a/sci-mathematics/Macaulay2/ChangeLog +++ b/sci-mathematics/Macaulay2/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Aug 2009; Thomas Kahle <tom111@gmx.de> + + Changed -r3 ebuild since #282174 was fixed and workarounds are not + needed anymore + 19 Aug 2009; Thomas Kahle <tom111@gmx.de> +Macaulay2-1.2-r3.ebuild Rewritten ebuild for QA diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.2-r3.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.2-r3.ebuild index 0c30ac977..dba76f391 100644 --- a/sci-mathematics/Macaulay2/Macaulay2-1.2-r3.ebuild +++ b/sci-mathematics/Macaulay2/Macaulay2-1.2-r3.ebuild @@ -28,7 +28,8 @@ KEYWORDS="~x86 ~amd64" # sys-process/time is needed to run the checks DEPEND="sys-libs/gdbm dev-libs/gmp - >=dev-libs/ntl-5.4.1[gmp] + || ( >=dev-libs/ntl-5.4.1[gmp,-gf2x] + >=dev-libs/ntl-5.4.2 ) >=dev-libs/boehm-gc-7.0 >=sci-mathematics/pari-2.3.4[gmp] virtual/blas @@ -60,11 +61,7 @@ src_prepare () { cd "${S}/Macaulay2/packages/Macaulay2Doc" sed "/^ *SourceCode => applicationDirectory.*$/d" -i doc13.m2 - # This might help if ntl is built with gf2x support - # Currently we run into --as-needed problems then. cd "${S}" - sed 's/"-lntl"/"-lntl" "-lgf2x -lntl"/' -i "${S}/configure.ac" - eautoreconf } @@ -72,13 +69,11 @@ src_configure (){ # Recommended in bug #268064 Possibly unecessary since # its a local problem of original reporter. - if ! use emacs; then tags="ctags" fi - # --as-needed should be possible: - append-ldflags "-L${WORKDIR}/$(get_libdir) -Wl,--no-as-needed" + append-ldflags "-L${WORKDIR}/$(get_libdir)" CPPFLAGS="-I/usr/include/gc -I${WORKDIR}/include" \ ./configure --prefix="${D}/usr" --disable-encap \ || die "failed to configure Macaulay" diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest index 7bd983854..b94d63219 100644 --- a/sci-mathematics/Macaulay2/Manifest +++ b/sci-mathematics/Macaulay2/Manifest @@ -5,6 +5,6 @@ DIST factory-3-1-0.tar.gz 565374 RMD160 059ed1697f282d309e89d1cc2e0ce8bd94a8b4b3 DIST frobby_vmike3.tar.gz 235794 RMD160 d9bf705895f4ccb8a1db9fd3909d4ae53fb05b08 SHA1 e478c0d0ac66f4d315ab246a1b2e0cb563991367 SHA256 98c58c0bb99f81344d1a647840f32e062923f2a45bf4cbafbf03ad1160e0a673 DIST libfac-3-1-0.tar.gz 91544 RMD160 2500d402328ad532756c677015c1d01f8594e394 SHA1 d005ddd58a180b8a91fe5728b96bde515c5d9cc5 SHA256 fc3dda08f7ec039635f8d7f1629546f4ac7620a69cf9332ca39e29dd822aee7d EBUILD Macaulay2-1.2-r2.ebuild 3140 RMD160 4228497ba8c22038b496744c494c6ab0c808d90b SHA1 33ef56c4cbfe449e119d5b7fb1a2801421c5f30a SHA256 bfb59f0a752f4dd90ed87ade901010dc26d2fa6b5c70872638f898399072bb5c -EBUILD Macaulay2-1.2-r3.ebuild 3162 RMD160 ae79cc28703ad478d35f9a51b73fc0b845eb9ed2 SHA1 7331a7098c331fd1d8cecc27745ec112c00d30dc SHA256 fbd46bf3ae1c222e0cdf7b421f0116c84aaba49cf776fa722eca84b21ece3e5c -MISC ChangeLog 679 RMD160 0f1fd2adf96dd03a784a5ed047e0e753c324f6db SHA1 bf45ce8e662b2ec7126710180aac5076638dd97c SHA256 7f289dbf1457658b89650a115ecaa458d953d2c45946bd0c098419fcf3e4b652 +EBUILD Macaulay2-1.2-r3.ebuild 2974 RMD160 cabf35edad035f139fd3a19ef66162d1791fac78 SHA1 89bf3bf6ec3c756855ee38f7f746aa6bd9dc2a7a SHA256 d9ac5a514993b57af7204319330734d164303bfa0db33bd11cb2fd07e7642bdc +MISC ChangeLog 810 RMD160 2eaf46ae8cee98cb1a72f761a190575cb61d9088 SHA1 5ed628fd0f7cc09c7758caaa6384f0635abe0a45 SHA256 8cf6eef7ed58fc5c4f350f1ab79def9ac5c6bcf84f95167624c543238861b17c MISC metadata.xml 361 RMD160 273db3a009b85938f85e60ea0d34d6fc625f9477 SHA1 7f6e903d81af55b08c7dbb9feb4f7ad39852a23e SHA256 71a0f19b08b1e752e754bbc5faf15880601d00c5b9df2bc5ca5a3b8e93e83b7f |