more upstream patches

(Portage version: 2.1.1_pre3-r5)

5 files changed, 280 insertions, 1 deletions

diff --git a/dev-libs/mpfr/ChangeLog b/dev-libs/mpfr/ChangeLog
index ecb1f292ea74..e3cc2ea0c785 100644
--- a/dev-libs/mpfr/ChangeLog
+++ b/dev-libs/mpfr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/mpfr
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.25 2006/07/18 14:08:38 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.26 2006/07/28 14:58:17 dragonheart Exp $
+
+*mpfr-2.2.0_p14 (28 Jul 2006)
+
+  28 Jul 2006; Daniel Black <dragonheart@gentoo.org> +files/2.2.0/patch13,
+  +files/2.2.0/patch14, +mpfr-2.2.0_p14.ebuild:
+  more upstream patches
 
 *mpfr-2.2.0_p12 (19 Jul 2006)
 
diff --git a/dev-libs/mpfr/files/2.2.0/patch13 b/dev-libs/mpfr/files/2.2.0/patch13
new file mode 100644
index 000000000000..303691be1229
--- /dev/null
+++ b/dev-libs/mpfr/files/2.2.0/patch13
@@ -0,0 +1,74 @@
+diff -Naurd mpfr-2.2.0-p12/configure mpfr-2.2.0-p13/configure
+--- mpfr-2.2.0-p12/configure	2006-05-26 22:08:17.000000000 +0000
++++ mpfr-2.2.0-p13/configure	2006-07-21 13:56:45.000000000 +0000
+@@ -2053,7 +2053,7 @@
+ # Check whether --with-gmp_lib or --without-gmp_lib was given.
+ if test "${with_gmp_lib+set}" = set; then
+   withval="$with_gmp_lib"
+-  LDFLAGS="-L$withval $LDFLAGS"
++  LDFLAGS="$LDFLAGS -L$withval"
+ fi;
+ 
+ # Check whether --with-gmp_build or --without-gmp_build was given.
+@@ -2061,7 +2061,7 @@
+   withval="$with_gmp_build"
+ 
+     CPPFLAGS="$CPPFLAGS -I$withval -I$withval/tune"
+-    LDFLAGS="-L$withval -L$withval/.libs -L$withval/tune/ $LDFLAGS"
++    LDFLAGS="$LDFLAGS -L$withval -L$withval/.libs -L$withval/tune/"
+     if test -r $withval/Makefile ; then
+      GMP_CFLAGS=`grep -w "CFLAGS =" $withval/Makefile | sed 's/CFLAGS = //'`
+      GMP_CC=`grep -w "CC =" $withval/Makefile | sed 's/CC = //'`
+@@ -2074,7 +2074,7 @@
+   withval="$with_gmp"
+ 
+    CPPFLAGS="$CPPFLAGS -I$withval/include"
+-   LDFLAGS="-L$withval/lib $LDFLAGS"
++   LDFLAGS="$LDFLAGS -L$withval/lib"
+ fi;
+ 
+ 
+@@ -4108,7 +4108,7 @@
+ case $OS_TYPE in
+   HP-UX*)
+ 	if test -n "$GCC"; then
+-	  LDFLAGS="-Xlinker +allowunsats $LDFLAGS"
++	  LDFLAGS="$LDFLAGS -Xlinker +allowunsats"
+ 	fi
+ 	;;
+   IRIX64)
+diff -Naurd mpfr-2.2.0-p12/configure.in mpfr-2.2.0-p13/configure.in
+--- mpfr-2.2.0-p12/configure.in	2005-09-17 10:27:28.000000000 +0000
++++ mpfr-2.2.0-p13/configure.in	2005-09-17 10:27:28.000000000 +0000
+@@ -40,11 +40,11 @@
+    CPPFLAGS="$CPPFLAGS -I$withval")
+ AC_ARG_WITH(gmp_lib, 
+    [  --with-gmp-lib=DIR      GMP lib directory ], 
+-   LDFLAGS="-L$withval $LDFLAGS")
++   LDFLAGS="$LDFLAGS -L$withval")
+ AC_ARG_WITH(gmp_build, 
+    [  --with-gmp-build=DIR    GMP build directory], [
+     CPPFLAGS="$CPPFLAGS -I$withval -I$withval/tune"
+-    LDFLAGS="-L$withval -L$withval/.libs -L$withval/tune/ $LDFLAGS"
++    LDFLAGS="$LDFLAGS -L$withval -L$withval/.libs -L$withval/tune/"
+     if test -r $withval/Makefile ; then
+      GMP_CFLAGS=`grep -w "CFLAGS =" $withval/Makefile | sed 's/CFLAGS = //'`
+      GMP_CC=`grep -w "CC =" $withval/Makefile | sed 's/CC = //'`
+@@ -53,7 +53,7 @@
+ AC_ARG_WITH(gmp, 
+    [  --with-gmp=DIR          GMP install directory ], [
+    CPPFLAGS="$CPPFLAGS -I$withval/include"
+-   LDFLAGS="-L$withval/lib $LDFLAGS" ])
++   LDFLAGS="$LDFLAGS -L$withval/lib" ])
+ 
+ AC_ARG_WITH(irix64, 
+    [  --with-irix64=on/off    Irix 32/64 bits support ], 
+@@ -165,7 +165,7 @@
+ case $OS_TYPE in
+   HP-UX*)
+ 	if test -n "$GCC"; then
+-	  LDFLAGS="-Xlinker +allowunsats $LDFLAGS"
++	  LDFLAGS="$LDFLAGS -Xlinker +allowunsats"
+ 	fi
+ 	;;
+   IRIX64)
diff --git a/dev-libs/mpfr/files/2.2.0/patch14 b/dev-libs/mpfr/files/2.2.0/patch14
new file mode 100644
index 000000000000..45507c1560c9
--- /dev/null
+++ b/dev-libs/mpfr/files/2.2.0/patch14
@@ -0,0 +1,134 @@
+diff -Naurd mpfr-2.2.0-p13/acinclude.m4 mpfr-2.2.0-p14/acinclude.m4
+--- mpfr-2.2.0-p13/acinclude.m4	2005-09-02 14:32:14.000000000 +0000
++++ mpfr-2.2.0-p14/acinclude.m4	2005-09-02 14:32:14.000000000 +0000
+@@ -551,3 +551,21 @@
+     ;;
+ esac
+ ])
++
++
++dnl  MPFR_LD_SEARCH_PATHS_FIRST
++dnl  --------------------------
++
++AC_DEFUN([MPFR_LD_SEARCH_PATHS_FIRST],
++[case "$LD $LDFLAGS" in
++  *-Wl,-search_paths_first*) ;;
++  *) AC_MSG_CHECKING([if the compiler understands -Wl,-search_paths_first])
++     saved_LDFLAGS="$LDFLAGS"
++     LDFLAGS="-Wl,-search_paths_first $LDFLAGS"
++     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
++       [AC_MSG_RESULT(yes)],
++       [AC_MSG_RESULT(no)]
++        LDFLAGS="$saved_LDFLAGS")
++     ;;
++ esac
++])
+diff -Naurd mpfr-2.2.0-p13/configure mpfr-2.2.0-p14/configure
+--- mpfr-2.2.0-p13/configure	2006-07-21 13:56:45.000000000 +0000
++++ mpfr-2.2.0-p14/configure	2006-07-25 21:33:01.000000000 +0000
+@@ -4120,6 +4120,81 @@
+ 	;;
+ esac
+ 
++case $host in
++  *-apple-darwin*)
++    case "$LD $LDFLAGS" in
++  *-Wl,-search_paths_first*) ;;
++  *) { echo "$as_me:$LINENO: checking if the compiler understands -Wl,-search_paths_first" >&5
++echo $ECHO_N "checking if the compiler understands -Wl,-search_paths_first... $ECHO_C" >&6; }
++     saved_LDFLAGS="$LDFLAGS"
++     LDFLAGS="-Wl,-search_paths_first $LDFLAGS"
++     cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++        LDFLAGS="$saved_LDFLAGS"
++fi
++
++rm -f core conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++     ;;
++ esac
++ ;;
++esac
++
+ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+diff -Naurd mpfr-2.2.0-p13/configure.in mpfr-2.2.0-p14/configure.in
+--- mpfr-2.2.0-p13/configure.in	2005-09-17 10:27:28.000000000 +0000
++++ mpfr-2.2.0-p14/configure.in	2005-09-17 10:27:28.000000000 +0000
+@@ -177,6 +177,20 @@
+ 	;;
+ esac
+ 
++dnl $OS_TYPE is not defined on darwin, so we use $host
++case $host in
++  *-apple-darwin*)
++dnl This allows to take the first GMP library in the library paths,
++dnl whether it is dynamic or static. This behavior is more sensible,
++dnl in particular because it is the only way to link with a version
++dnl only available in static form when another version is available
++dnl in dynamic, and also for consistency, because the compiler will
++dnl take the first gmp.h found in the include paths (so, we need to
++dnl take a library that corresponds to this header file). This is a
++dnl common problem with darwin.
++    MPFR_LD_SEARCH_PATHS_FIRST ;;
++esac
++
+ AC_C_CONST
+ AC_C_VOLATILE
+ MPFR_CONFIGS
diff --git a/dev-libs/mpfr/files/digest-mpfr-2.2.0_p14 b/dev-libs/mpfr/files/digest-mpfr-2.2.0_p14
new file mode 100644
index 000000000000..4d1063c367b4
--- /dev/null
+++ b/dev-libs/mpfr/files/digest-mpfr-2.2.0_p14
@@ -0,0 +1,6 @@
+MD5 1a81f721ee78cb027f6c41a243d3a33d mpfr-2.2.0.tar.bz2 728490
+RMD160 5243eb0387392123d9d30ca009b30147a51370a6 mpfr-2.2.0.tar.bz2 728490
+SHA256 cea002a11707b5f8fb2147686145563e5f313fc62558e8400444bdcf89971e6a mpfr-2.2.0.tar.bz2 728490
+MD5 5c4db32dfaef7d032e2f359cacebf7ce mpfr-2.2.0_p5 27251
+RMD160 7e60b2be4691235de88646534b64cd12cdc1a45d mpfr-2.2.0_p5 27251
+SHA256 1e253c48800667d295e5ec3407b8e27a86e385706ecb49a7dc51503839752309 mpfr-2.2.0_p5 27251
diff --git a/dev-libs/mpfr/mpfr-2.2.0_p14.ebuild b/dev-libs/mpfr/mpfr-2.2.0_p14.ebuild
new file mode 100644
index 000000000000..1797a52547f8
--- /dev/null
+++ b/dev-libs/mpfr/mpfr-2.2.0_p14.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-2.2.0_p14.ebuild,v 1.1 2006/07/28 14:58:17 dragonheart Exp $
+
+inherit eutils flag-o-matic autotools
+
+MY_PV=${PV/_p*}
+MY_P=${PN}-${MY_PV}
+PLEVEL=${PV/*p}
+DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
+HOMEPAGE="http://www.mpfr.org/"
+SRC_URI="http://www.mpfr.org/mpfr-current/${MY_P}.tar.bz2
+	mirror://gentoo/mpfr-2.2.0_p5"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/gmp-4.1.4-r2"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack "${MY_P}.tar.bz2"
+	cd "${S}"
+	for ((i=1; i<=PLEVEL; ++i)) ; do
+		patch=patch$(printf '%02d' ${i})
+		if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
+			epatch "${FILESDIR}"/${MY_PV}/${patch}
+		elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
+			epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
+		else
+			ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
+			die "patch ${i} missing - please report to bugs.gentoo.org"
+		fi
+	done
+
+	# Disable buggy code on s390/hppa #126082
+	epatch "${FILESDIR}"/${MY_PV}/debian-disable-buggy-umul_ppmm.patch
+	eautoreconf
+}
+
+src_compile() {
+	# tests fail on amd64 with -ffast-math, maybe other arches too
+	use amd64 && filter-flags -ffast-math
+
+	econf \
+		--enable-shared \
+		--enable-static \
+		|| die
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+	dohtml *.html
+}