diff options
author | François Bissey <f.r.bissey@massey.ac.nz> | 2010-02-19 19:48:08 +1300 |
---|---|---|
committer | François Bissey <f.r.bissey@massey.ac.nz> | 2010-02-19 19:48:08 +1300 |
commit | 9781c67401c341d218f7ba2536d4c2618c14f08c (patch) | |
tree | 291d6cf4f9fc3fb8912e3c5969cdcfd9efa12e81 /dev-libs | |
parent | [sci-chemistry/gromacs] patch appliyed upstream (diff) | |
download | sci-9781c67401c341d218f7ba2536d4c2618c14f08c.tar.gz sci-9781c67401c341d218f7ba2536d4c2618c14f08c.tar.bz2 sci-9781c67401c341d218f7ba2536d4c2618c14f08c.zip |
move mpir in sci-libs and adjust Macaulay2-1.3.* dependencies accordingly.
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/mpir/ChangeLog | 44 | ||||
-rw-r--r-- | dev-libs/mpir/Manifest | 9 | ||||
-rw-r--r-- | dev-libs/mpir/files/mpir-1.2.2-yasm.patch | 54 | ||||
-rw-r--r-- | dev-libs/mpir/files/mpir-1.3.0-ABI-multilib.patch | 145 | ||||
-rw-r--r-- | dev-libs/mpir/files/mpir-1.3.0-yasm.patch | 51 | ||||
-rw-r--r-- | dev-libs/mpir/metadata.xml | 15 | ||||
-rw-r--r-- | dev-libs/mpir/mpir-1.2.2.ebuild | 38 | ||||
-rw-r--r-- | dev-libs/mpir/mpir-1.3.1.ebuild | 54 |
8 files changed, 0 insertions, 410 deletions
diff --git a/dev-libs/mpir/ChangeLog b/dev-libs/mpir/ChangeLog deleted file mode 100644 index 5784015a8..000000000 --- a/dev-libs/mpir/ChangeLog +++ /dev/null @@ -1,44 +0,0 @@ -# ChangeLog for dev-libs/mpir -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*mpir-1.3.1 (06 Feb 2010) - - 06 Feb 2010; François Bissey <f.r.bissey@massey.ac.nz> - -mpir-1.3.0.ebuild, +mpir-1.3.1.ebuild: - revbump to 1.3.1, removing 1.3.0 - - 30 Jan 2010; François Bissey <f.r.bissey@massey.ac.nz> - -mpir-1.3.0_rc3.ebuild, +mpir-1.3.0.ebuild, - +files/mpir-1.3.0-ABI-multilib.patch, +files/mpir-1.3.0-yasm.patch, - -files/mpir-1.3.0_rc3-yasm.patch: - fix copyright line in 1.2.2 - -*mpir-1.3.0 (30 Jan 2010) - - 30 Jan 2010; François Bissey <f.r.bissey@massey.ac.nz> - -mpir-1.3.0_rc3.ebuild, +mpir-1.3.0.ebuild, - +files/mpir-1.3.0-ABI-multilib.patch, +files/mpir-1.3.0-yasm.patch, - -files/mpir-1.3.0_rc3-yasm.patch: - Bumped to version 1.3.0 remove old rc. Add a proper ABI patch. - - 17 Dec 2009; Thomas Kahle <tom@gentoo.org> -mpir-1.2.1.ebuild, - mpir-1.2.2.ebuild, +files/mpir-1.2.2-yasm.patch: - yasm-patch for v 1.2.2, v 1.2.1 removed - - 22 Nov 2009; François Bissey <f.r.bissey@massey.ac.nz> - mpir-1.3.0_rc3.ebuild, +files/mpir-1.3.0_rc3-yasm.patch, metadata.xml: - update mpir-1.3.0_rc3 to include patch to use portage version of yasm. - Allow building of "fat" binaries. - - 21 Nov 2009; Thomas Kahle <tom111@gmx.de> +mpir-1.2.2.ebuild - - Added version 1.2.2 - Fixed 1.2.1 for amd64 - - 16 Nov 2009; Thomas Kahle <tom111@gmx.de> +mpir-1.2.1.ebuild - +mpir-1.3.0_rc3.ebuild +metadata.xml +ChangeLog - - Intial import (Bug #293383) - - diff --git a/dev-libs/mpir/Manifest b/dev-libs/mpir/Manifest deleted file mode 100644 index 538443d55..000000000 --- a/dev-libs/mpir/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX mpir-1.2.2-yasm.patch 2049 RMD160 33138854e9429ee5fd57fc547a50bfec02aa51bc SHA1 03a513b9a832734324bc6116cf06c4ebca17f2c3 SHA256 483aff2973c89ce78fe46ef965bbbe8e06d7ba8d75bf64c651a1e379ebebe581 -AUX mpir-1.3.0-ABI-multilib.patch 3903 RMD160 3f961212097a7957f2cc831929c545cfc3e80e2b SHA1 cda3a90665716132f5078eedb0fdfca2eff3d4b2 SHA256 3db2dc41f385d6c8ce9da8406a42072c8462e6e15eba0b6ff93664ef31c00957 -AUX mpir-1.3.0-yasm.patch 1741 RMD160 a10820ce5a350f746cab4981ccf40ca9f40e1cca SHA1 5aa4003a7ff6d3f1f4d36734acd90c41cb8b39f0 SHA256 32d1ed07d65b033c70d78cb85ae3cb551ba2f7871d50ad9f3e991abec9bcc5c1 -DIST mpir-1.2.2.tar.gz 4276405 RMD160 11bfa2c4de8c1131498722638f8f2e4242651918 SHA1 bd012e207f2c750dfc23af6ac25b96bdd7009354 SHA256 6e070f6a2cc104596f197ac551cac0a35f64e3de5522891db544a1417b7f908a -DIST mpir-1.3.1.tar.gz 4359993 RMD160 d80d0e88fcea5508aea34f198a50f5beb20abe0e SHA1 8494bea32a0e1eed1bfc679f118490243bc5a0c6 SHA256 866c4a66904e1a600fe4ee09a485afcc30f1d950c5797b965288babc81009b66 -EBUILD mpir-1.2.2.ebuild 830 RMD160 2c22f6a0328a998c031565f6de6a38a655804317 SHA1 a8a56a6004fdae7868504de6398698b8431451fa SHA256 edd2a1ffeeb6dc8eb69a15931a13cdb59b9347abba78bf55c3d395c650dcc150 -EBUILD mpir-1.3.1.ebuild 1540 RMD160 705a2431edbccc1c414b134af271559914308d67 SHA1 52a16dbfed850771558e45a04a7b0aaad646c5cf SHA256 10f4b42968d7ee657af3aa67760657207e55b43b53bc8a134799b6486a0be6d9 -MISC ChangeLog 1478 RMD160 bc34aa553fcc1e75a7d0976894b1ece9adba3e9c SHA1 f0c8450c527939f26e146329e92c1667fb980788 SHA256 102707b135bcfd9e2acd75db2da758076680cdb1f630abb2de6c793d500db07a -MISC metadata.xml 516 RMD160 dcd6e4599dfc146ef42a021dcfbaf65444d5b272 SHA1 a922010b05f992381656820c3c93697da3b30b70 SHA256 d4a7736b383f142b29166bca022254c5e4e599a3304886ca73491dd7b5954d76 diff --git a/dev-libs/mpir/files/mpir-1.2.2-yasm.patch b/dev-libs/mpir/files/mpir-1.2.2-yasm.patch deleted file mode 100644 index b13739b3a..000000000 --- a/dev-libs/mpir/files/mpir-1.2.2-yasm.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -U 3 -H -d -r -N -- mpir-1.2.2.orig/Makefile.am mpir-1.2.2/Makefile.am ---- mpir-1.2.2.orig/Makefile.am 2009-12-17 21:04:02.000000000 +0100 -+++ mpir-1.2.2/Makefile.am 2009-12-17 21:05:27.000000000 +0100 -@@ -97,10 +97,6 @@ - - SUBDIRS = tests - --if BUILD_YASM --SUBDIRS += yasm --endif -- - SUBDIRS += mpn mpz mpq mpf printf scanf cxx mpbsd demos tune doc bench - - EXTRA_DIST = configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf -diff -U 3 -H -d -r -N -- mpir-1.2.2.orig/configure.in mpir-1.2.2/configure.in ---- mpir-1.2.2.orig/configure.in 2009-12-17 21:04:02.000000000 +0100 -+++ mpir-1.2.2/configure.in 2009-12-17 21:05:00.000000000 +0100 -@@ -1586,8 +1586,6 @@ - ;; - esac - --AM_CONDITIONAL(BUILD_YASM, test "$want_yasm" = "yes") -- - CFLAGS_or_unset=${CFLAGS-'(unset)'} - CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'} - -@@ -1985,7 +1983,7 @@ - GMP_CHECK_LIBM_FOR_BUILD - - --MPIR_AS="/yasm/yasm" -+MPIR_AS="yasm" - - # How to assemble, used with CFLAGS etc, see mpn/Makeasm.am. - # Using the compiler is a lot easier than figuring out how to invoke the -@@ -3346,9 +3344,6 @@ - # FIXME: Upcoming version of autoconf/automake don't like broken lines. - # Right now automake isn't accepting the new AC_CONFIG_FILES scheme. - --# allways configure all subdirectorys , even if there are not going to be built , --AC_CONFIG_SUBDIRS([yasm]) -- - if test $enable_fat = yes; then - YASM_MAC_INC=yasm_mac.inc.fat - else -diff -U 3 -H -d -r -N -- mpir-1.2.2.orig/mpn/Makeasm.am mpir-1.2.2/mpn/Makeasm.am ---- mpir-1.2.2.orig/mpn/Makeasm.am 2009-12-17 21:04:01.000000000 +0100 -+++ mpir-1.2.2/mpn/Makeasm.am 2009-12-17 21:06:39.000000000 +0100 -@@ -111,4 +111,4 @@ - # .as assembler, assembled with Yasm - - .as.lo: -- $(LIBTOOL) --mode=compile --tag=CC $(top_srcdir)/strip_fPIC.sh $(top_builddir)$(MPIR_AS) -I $(top_builddir) $(OBJECT_FORMAT) $(GSYM_FLAG) -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+ $(LIBTOOL) --mode=compile --tag=CC $(top_srcdir)/strip_fPIC.sh $(MPIR_AS) -I $(top_builddir) $(OBJECT_FORMAT) $(GSYM_FLAG) -o $@ `test -f '$<' || echo '$(srcdir)/'`$< diff --git a/dev-libs/mpir/files/mpir-1.3.0-ABI-multilib.patch b/dev-libs/mpir/files/mpir-1.3.0-ABI-multilib.patch deleted file mode 100644 index fba6fea2e..000000000 --- a/dev-libs/mpir/files/mpir-1.3.0-ABI-multilib.patch +++ /dev/null @@ -1,145 +0,0 @@ ---- configure.in.orig 2009-11-28 10:48:59.196977657 +0000 -+++ configure.in 2009-11-28 10:54:50.717976971 +0000 -@@ -361,7 +361,7 @@ - # hugely bloat the output. - - --AC_ARG_VAR(ABI, [desired ABI (for processors supporting more than one ABI)]) -+AC_ARG_VAR(MPIRABI, [desired ABI (for processors supporting more than one ABI)]) - - # abilist needs to be non-empty, "standard" is just a generic name here - abilist="standard" -@@ -1590,7 +1590,7 @@ - - cat >&AC_FD_CC <<EOF - User: --ABI=$ABI -+MPIRABI=$MPIRABI - CC=$CC - CFLAGS=$CFLAGS_or_unset - CPPFLAGS=$CPPFLAGS_or_unset -@@ -1611,22 +1611,22 @@ - # If the user specifies an ABI then it must be in $abilist, after that - # $abilist is restricted to just that choice. - # --if test -n "$ABI"; then -+if test -n "$MPIRABI"; then - found=no - for abi in $abilist; do -- if test $abi = "$ABI"; then found=yes; break; fi -+ if test $abi = "$MPIRABI"; then found=yes; break; fi - done - if test $found = no; then -- AC_MSG_ERROR([ABI=$ABI is not among the following valid choices: $abilist]) -+ AC_MSG_ERROR([MPIRABI=$MPIRABI is not among the following valid choices: $abilist]) - fi -- abilist="$ABI" -+ abilist="$MPIRABI" - fi - - found_compiler=no - - for abi in $abilist; do - -- echo "checking ABI=$abi" -+ echo "checking MPIRABI=$abi" - - # Suppose abilist="64 32", then for abi=64, will have abi1="_64" and - # abi2="_64". For abi=32, will have abi1="_32" and abi2="". This is how -@@ -1879,7 +1879,7 @@ - done - fi - -- ABI="$abi" -+ MPIRABI="$abi" - CC="$cc" - CFLAGS="$cflags" - CPPFLAGS="$cppflags" -@@ -1895,8 +1895,8 @@ - AC_SUBST(GMP_CFLAGS) - - # Could easily have this in config.h too, if desired. -- ABI_nodots=`echo $ABI | sed 's/\./_/'` -- GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')", POST) -+ ABI_nodots=`echo $MPIRABI | sed 's/\./_/'` -+ GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_ABI_$MPIRABI_nodots')", POST) - - - # GMP_LDFLAGS substitution, selected according to ABI. -@@ -2094,7 +2094,7 @@ - # - case $host in - X86_PATTERN | X86_64_PATTERN) -- if test "$ABI" = 32; then -+ if test "$MPIRABI" = 32; then - case "$path $fat_path" in - *mmx*) GMP_ASM_X86_MMX( , [GMP_STRIP_PATH(*mmx*)]) ;; - esac -@@ -2108,7 +2108,7 @@ - - cat >&AC_FD_CC <<EOF - Decided: --ABI=$ABI -+MPIRABI=$MPIRABI - CC=$CC - CFLAGS=$CFLAGS - CPPFLAGS=$CPPFLAGS -@@ -2117,7 +2117,7 @@ - CXXFLAGS=$CXXFLAGS - path=$path - EOF --echo "using ABI=\"$ABI\"" -+echo "using MPIRABI=\"$MPIRABI\"" - echo " CC=\"$CC\"" - echo " CFLAGS=\"$CFLAGS\"" - echo " CPPFLAGS=\"$CPPFLAGS\"" -@@ -2593,7 +2593,7 @@ - - - if test -n "$fat_path"; then -- if test "$ABI" = 64; then -+ if test "$MPIRABI" = 64; then - fat_path="$fat_path_64" - fi - -@@ -3099,19 +3099,19 @@ - GMP_INCLUDE_MPN(powerpc32/powerpc-defs.m4) - case $host in - *-*-aix*) -- case $ABI in -+ case $MPIRABI in - 64 | aix64) GMP_INCLUDE_MPN(powerpc64/aix.m4) ;; - *) GMP_INCLUDE_MPN(powerpc32/aix.m4) ;; - esac - ;; - *-*-linux* | *-*-*bsd*) -- case $ABI in -+ case $MPIRABI in - mode64) GMP_INCLUDE_MPN(powerpc64/elf.m4) ;; - mode32 | 32) GMP_INCLUDE_MPN(powerpc32/elf.m4) ;; - esac - ;; - *-*-darwin*) -- case $ABI in -+ case $MPIRABI in - mode64) GMP_INCLUDE_MPN(powerpc64/darwin.m4) ;; - mode32 | 32) GMP_INCLUDE_MPN(powerpc32/darwin.m4) ;; - esac -@@ -3126,7 +3126,7 @@ - GMP_INCLUDE_MPN(powerpc32/aix.m4) - ;; - sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*) -- case $ABI in -+ case $MPIRABI in - 64) - GMP_ASM_SPARC_REGISTER - ;; -@@ -3134,7 +3134,7 @@ - ;; - X86_PATTERN | X86_64_PATTERN) - GMP_ASM_ALIGN_FILL_0x90 -- case $ABI in -+ case $MPIRABI in - 32) - GMP_INCLUDE_MPN(x86/x86-defs.m4) - AC_DEFINE(HAVE_HOST_CPU_FAMILY_x86) diff --git a/dev-libs/mpir/files/mpir-1.3.0-yasm.patch b/dev-libs/mpir/files/mpir-1.3.0-yasm.patch deleted file mode 100644 index 572931353..000000000 --- a/dev-libs/mpir/files/mpir-1.3.0-yasm.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- configure.in.orig 2009-11-22 11:15:42.000000000 +1300 -+++ configure.in 2009-11-22 11:59:16.000000000 +1300 -@@ -1583,8 +1583,6 @@ - ;; - esac - --AM_CONDITIONAL(BUILD_YASM, test "$want_yasm" = "yes") -- - CFLAGS_or_unset=${CFLAGS-'(unset)'} - CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'} - -@@ -1982,7 +1980,7 @@ - GMP_CHECK_LIBM_FOR_BUILD - - --MPIR_AS="/yasm/yasm" -+MPIR_AS="yasm" - - # How to assemble, used with CFLAGS etc, see mpn/Makeasm.am. - # Using the compiler is a lot easier than figuring out how to invoke the -@@ -3354,9 +3352,6 @@ - # FIXME: Upcoming version of autoconf/automake don't like broken lines. - # Right now automake isn't accepting the new AC_CONFIG_FILES scheme. - --# allways configure all subdirectorys , even if there are not going to be built , --AC_CONFIG_SUBDIRS([yasm]) -- - if test $enable_fat = yes; then - YASM_MAC_INC=yasm_mac.inc.fat - else ---- Makefile.am.orig 2009-11-22 11:16:02.000000000 +1300 -+++ Makefile.am 2009-11-22 12:00:01.000000000 +1300 -@@ -91,10 +91,6 @@ - - SUBDIRS = tests - --if BUILD_YASM --SUBDIRS += yasm --endif -- - SUBDIRS += mpn mpz mpq mpf printf scanf cxx demos tune doc bench - - EXTRA_DIST = configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf ---- mpn/Makeasm.am.orig 2009-11-22 11:16:41.000000000 +1300 -+++ mpn/Makeasm.am 2009-11-22 12:01:28.000000000 +1300 -@@ -111,4 +111,4 @@ - # .as assembler, assembled with Yasm - - .as.lo: -- $(LIBTOOL) --mode=compile --tag=CC $(top_srcdir)/strip_fPIC.sh $(top_builddir)$(MPIR_AS) -I $(top_builddir) $(OBJECT_FORMAT) $(GSYM_FLAG) -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+ $(LIBTOOL) --mode=compile --tag=CC $(top_srcdir)/strip_fPIC.sh $(MPIR_AS) -I $(top_builddir) $(OBJECT_FORMAT) $(GSYM_FLAG) -o $@ `test -f '$<' || echo '$(srcdir)/'`$< diff --git a/dev-libs/mpir/metadata.xml b/dev-libs/mpir/metadata.xml deleted file mode 100644 index 0d8c85412..000000000 --- a/dev-libs/mpir/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>sci</herd> -<maintainer> - <email>tom111@gmx.de</email> - <name>Thomas Kahle</name> -</maintainer> - <longdescription lang="en"> - mpir is an open source multiprecision integer library derived from version 4.2.1 of gmp -</longdescription> - <use> - <flag name='cpudetection'>Enables runtime cpudetection (useful for bindist, compatability on other CPUs)</flag> - </use> -</pkgmetadata> diff --git a/dev-libs/mpir/mpir-1.2.2.ebuild b/dev-libs/mpir/mpir-1.2.2.ebuild deleted file mode 100644 index 9e1024480..000000000 --- a/dev-libs/mpir/mpir-1.2.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -inherit eutils versionator autotools - -DESCRIPTION="MPIR is a library for arbitrary precision integer arithmetic derived from version 4.2.1 of gmp" -HOMEPAGE="http://www.mpir.org/" -SRC_URI="http://www.mpir.org/${PN}-$(replace_version_separator 3 -).tar.gz" -RESTRICT="mirror" -S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="nocxx" - -DEPEND="dev-lang/yasm" -RDEPEND="" - -src_prepare(){ - epatch "${FILESDIR}/${P}-yasm.patch" - eautoreconf -} - -src_configure() { - unset ABI - - econf $(use_enable !nocxx cxx) \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc ChangeLog README NEWS -} diff --git a/dev-libs/mpir/mpir-1.3.1.ebuild b/dev-libs/mpir/mpir-1.3.1.ebuild deleted file mode 100644 index a08def78a..000000000 --- a/dev-libs/mpir/mpir-1.3.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -inherit eutils autotools - -DESCRIPTION="MPIR is a library for arbitrary precision integer arithmetic derived from version 4.2.1 of gmp" -HOMEPAGE="http://www.mpir.org/" -SRC_URI="http://www.mpir.org/${P}.tar.gz" -RESTRICT="mirror" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="+cxx cpudetection" - -# Beware: cpudetection aka fat binaries only works on x86/amd64 -# When we enable more cpus we will have to carefully filter. - -DEPEND="dev-lang/yasm" -RDEPEND="" - -src_prepare(){ - epatch "${FILESDIR}/${PN}-1.3.0-yasm.patch" - epatch "${FILESDIR}/${PN}-1.3.0-ABI-multilib.patch" - # FIXME: In the same way there was QA regarding executable stacks - # with GMP we have some here as well. We cannot apply the - # GMP solution as yasm is used, at least on x64/amd64. - # Furthermore we are able to patch config.ac. - eautoreconf -} - -src_configure() { -# beware that cpudetection aka fat binaries is x86/amd64 only. -# It will need to be filtered when extended to other archs - econf \ - $(use_enable cxx) \ - $(use_enable cpudetection fat) \ - || "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc ChangeLog README NEWS -} - -pkg_postinst() { - elog "The mpir ebuild is still under development." - elog "Help us improve the ebuild in:" - elog "http://bugs.gentoo.org/show_bug.cgi?id=293383" - elog "This ebuild is known to have an executable atack problem" -} |