Add another fix from upstream and fix docs install #298316 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 144 insertions, 2 deletions

diff --git a/dev-libs/mpfr/ChangeLog b/dev-libs/mpfr/ChangeLog
index f2b06b19f5aa..c6d74b410879 100644
--- a/dev-libs/mpfr/ChangeLog
+++ b/dev-libs/mpfr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/mpfr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.110 2010/01/06 18:32:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.111 2010/01/11 09:16:23 vapier Exp $
+
+*mpfr-2.4.2_p2 (11 Jan 2010)
+
+  11 Jan 2010; Mike Frysinger <vapier@gentoo.org> +files/2.4.2/patch02,
+  +mpfr-2.4.2_p2.ebuild:
+  Add another fix from upstream and fix docs install #298316 by Diego E.
+  Pettenò.
 
   06 Jan 2010; Jeroen Roovers <jer@gentoo.org> mpfr-2.4.1_p5.ebuild:
   Stable for PPC (bug #297297).
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 0b1ceed85ce8..9a430be6b704 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,13 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.4.1/patch01 3512 RMD160 a68a65e3ba90fabb8d634d69b172a32162488661 SHA1 82eb4c34685b6d655d33e0dfcea003248a8967d9 SHA256 6abd8c5abac124041fc0508fbcfdb04f564d0f78118235d70edd81daa3b6169d
 AUX 2.4.1/patch02 1585 RMD160 d1ff268cae4d0659d805d7e22bc5c8e245c86587 SHA1 49ae9b7d23d5ba1013687a99d28ac2c1d674af55 SHA256 9fc939052f9e501c051586fb18f7801262748a46c17476881307ec6100e64edd
 AUX 2.4.1/patch03 1271 RMD160 97b3cc3b761addf812420433d658ba400e0f8d4b SHA1 282066b0104ec41931126acb57e6ef6140dcacbd SHA256 b4a9276f295361c4b6d3ef896548e9d39cb0304146f40c29ed97cc95359ec2b5
 AUX 2.4.1/patch04 1804 RMD160 209acd4081774b4e63d58700dc8355e66238ac8d SHA1 a32e20029351eb34cee941d22566044693a91b93 SHA256 c7152d214006fa1da9dc987ab07468c493c1cf3afc14c22f0a293f14e745c0ee
 AUX 2.4.1/patch05 1872 RMD160 1493e46033944dc15e23b55a495659d07d5077a5 SHA1 aec518a69b75d11699daf6b984a2c6887638b6eb SHA256 2ef1030e3d40636f29ec25feeac87d0813ca73ab944c87837da8d656fcbe9070
 AUX 2.4.2/patch01 7136 RMD160 e612c1f8013860bbe53354022700855fdbc804f2 SHA1 9c8a8325848b4331e5c032abee1c765ad2e56de2 SHA256 ff84b6a8626c79f869d5625d70900e1f99a37f623cb124fdd949dcbcf9f9757e
+AUX 2.4.2/patch02 2538 RMD160 9d68771b4e7b267d20140a6e7b6fb55ddf38ef80 SHA1 39d921bd8d9b9f6abbd7d0311bcceaab7e0b77a6 SHA256 b61b3ff4abaf93e031d446be201c659275d1b49d1a02ac0a2de45e5fafd47f0b
 DIST mpfr-2.4.1.tar.lzma 903875 RMD160 e848db799fc3b6a4681de3b38df8809c2369f266 SHA1 6145947361fac880b87976e21e28fab12ccf4881 SHA256 95e507b26bac3b64215bc3cf1463525781582d40358b09becdb24d058b31def8
 DIST mpfr-2.4.2.tar.bz2 1077886 RMD160 a3563baef20dab98825d90971e6a69a649f53fdf SHA1 7ca93006e38ae6e53a995af836173cf10ee7c18c SHA256 c7e75a08a8d49d2082e4caee1591a05d11b9d5627514e678f02d66a124bcf2ba
 EBUILD mpfr-2.4.1_p1.ebuild 1546 RMD160 aa20f7a6988afe1c58c3e00b86a7826d93530486 SHA1 45376ccdf7693685c5b36dc9326844095ddb6701 SHA256 7a89ebad2e5076550c47cfd3c9c902e2e8d761276fc8538534493e93a64a5d63
 EBUILD mpfr-2.4.1_p5.ebuild 1543 RMD160 bfc73cdd7c07692498e4806d859a79d666b1d63e SHA1 7355d22eb12efe133a61c6bb5b6a22e928fc6ebf SHA256 9735bec905ebe3dc7a910ddc05e610eea3e70cd0c470b1a6aada2e9bb31d316b
 EBUILD mpfr-2.4.2_p1.ebuild 1508 RMD160 3f3bec82ddb456e69fe31b442c0dd6ce4c870bc4 SHA1 2faa950b874e40f4b4be2ba8e4c763a1fcca1ea7 SHA256 c54c24446914d87fd392f1db588542731338c6285dc5fd6f6160b520ac77b18c
-MISC ChangeLog 13424 RMD160 1d790aeb20332308bf2c9544783f22b836d1b742 SHA1 5818a02c0607dca7b8834fff1378ad9496ff753e SHA256 a0d5bd3447106418bdc63ae10594a849ae639729f1fb717b21fbbe6d3d2478bd
+EBUILD mpfr-2.4.2_p2.ebuild 1612 RMD160 b4df913c7f4005ca9e1f146ff63240b1071339d6 SHA1 393f824e803264cb10d6b9ebd50c43037ee62cc5 SHA256 82b45cd25d05142ebac54c62b78034fd2ea7f201007abc4e5c65c27363571bf5
+MISC ChangeLog 13640 RMD160 3ac851564fb2276bb66358e20adcf3e6bb911d6f SHA1 3f444a4043c5af09ea94deef037b5373adc7db85 SHA256 6acd27c255b6696fda346daf4e2ace1413993f980c7f3fdc94831ba15246a9ec
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAktK7Q8ACgkQTwhj9JtAlp7s/gD/QD7kh++0w1hR7K5tRhD1ZYkd
+vlyms8Y8CY3k6imq3vAA/iZuHDPMjcMy+Xqio27o8XeD2mcA2HfPw3CQmbhsirXQ
+=d05D
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/mpfr/files/2.4.2/patch02 b/dev-libs/mpfr/files/2.4.2/patch02
new file mode 100644
index 000000000000..fa85d8ef3c57
--- /dev/null
+++ b/dev-libs/mpfr/files/2.4.2/patch02
@@ -0,0 +1,71 @@
+diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
+--- mpfr-2.4.2-a/PATCHES	2009-12-18 12:03:30.000000000 +0000
++++ mpfr-2.4.2-b/PATCHES	2009-12-18 12:05:19.000000000 +0000
+@@ -0,0 +1 @@
++longlong.h
+diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
+--- mpfr-2.4.2-a/VERSION	2009-12-07 13:37:12.000000000 +0000
++++ mpfr-2.4.2-b/VERSION	2009-12-18 12:05:09.000000000 +0000
+@@ -1 +1 @@
+-2.4.2-p1
++2.4.2-p2
+diff -Naurd mpfr-2.4.2-a/mpfr-longlong.h mpfr-2.4.2-b/mpfr-longlong.h
+--- mpfr-2.4.2-a/mpfr-longlong.h	2009-11-30 02:43:08.000000000 +0000
++++ mpfr-2.4.2-b/mpfr-longlong.h	2009-12-18 12:04:29.000000000 +0000
+@@ -1011,7 +1011,15 @@
+ #endif /* __m88000__ */
+ 
+ #if defined (__mips) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
++#define umul_ppmm(w1, w0, u, v) \
++  do {									\
++    UDItype _r;							\
++    _r = (UDItype) u * v;						\
++    (w1) = _r >> 32;							\
++    (w0) = (USItype) _r;						\
++  } while (0)
++#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
+ #else
+@@ -1024,7 +1032,16 @@
+ #endif /* __mips */
+ 
+ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
++#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
++typedef unsigned int UTItype __attribute__ ((mode (TI)));
++#define umul_ppmm(w1, w0, u, v) \
++  do {									\
++    UTItype _r;							\
++    _r = (UTItype) u * v;						\
++    (w1) = _r >> 64;							\
++    (w0) = (UDItype) _r;						\
++  } while (0)
++#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
+ #else
+diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
+--- mpfr-2.4.2-a/mpfr.h	2009-12-07 13:37:12.000000000 +0000
++++ mpfr-2.4.2-b/mpfr.h	2009-12-18 12:05:09.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 2
+ #define MPFR_VERSION_MINOR 4
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "2.4.2-p1"
++#define MPFR_VERSION_STRING "2.4.2-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
+--- mpfr-2.4.2-a/version.c	2009-12-07 13:37:12.000000000 +0000
++++ mpfr-2.4.2-b/version.c	2009-12-18 12:05:09.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "2.4.2-p1";
++  return "2.4.2-p2";
+ }
diff --git a/dev-libs/mpfr/mpfr-2.4.2_p2.ebuild b/dev-libs/mpfr/mpfr-2.4.2_p2.ebuild
new file mode 100644
index 000000000000..ea18f5f88411
--- /dev/null
+++ b/dev-libs/mpfr/mpfr-2.4.2_p2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-2.4.2_p2.ebuild,v 1.1 2010/01/11 09:16:23 vapier Exp $
+
+# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
+inherit eutils
+
+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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/gmp-4.1.4-r2"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	[[ -d ${FILESDIR}/${PV} ]] && epatch "${FILESDIR}"/${PV}/*.patch
+	[[ ${PLEVEL} == ${PV} ]] && return 0
+	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
+	sed -i '/if test/s:==:=:' configure #261016
+	find . -type f -print0 | xargs -0 touch -r configure
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	rm "${D}"/usr/share/doc/${PN}/*.html || die
+	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+	dohtml *.html
+	prepalldocs
+}