upstream patch

Package-Manager: portage-2.1.2-r9

5 files changed, 137 insertions, 5 deletions

diff --git a/dev-libs/mpfr/ChangeLog b/dev-libs/mpfr/ChangeLog
index 4db0ef632916..40a4a27a9601 100644
--- a/dev-libs/mpfr/ChangeLog
+++ b/dev-libs/mpfr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/mpfr
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.44 2007/02/05 13:56:36 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.45 2007/02/17 11:36:01 dragonheart Exp $
+
+*mpfr-2.2.1_p1 (17 Feb 2007)
+
+  17 Feb 2007; Daniel Black <dragonheart@gentoo.org> +files/2.2.1/patch01,
+  +mpfr-2.2.1_p1.ebuild:
+  upstream patch
 
   05 Feb 2007; Simon Stelling <blubb@gentoo.org> mpfr-2.2.0_p16.ebuild:
   stable on amd64; bug 159250
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 62d8c81e5376..7326b4af5b0b 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.2.0/debian-disable-buggy-umul_ppmm.patch 753 RMD160 e0ae8ad88deaa925ea5415d6e77eb5cd5d894109 SHA1 e329ddb795f6969028a2c46e69e2e8a82c69b560 SHA256 8d1ee311fee1f09f7311ce72428845e7233021c5578c42bed7a24bb01fc1f4da
 MD5 be0b2edcf2ceb8c3af3ee4e72512dc5e files/2.2.0/debian-disable-buggy-umul_ppmm.patch 753
 RMD160 e0ae8ad88deaa925ea5415d6e77eb5cd5d894109 files/2.2.0/debian-disable-buggy-umul_ppmm.patch 753
@@ -62,6 +65,10 @@ AUX 2.2.0/patch16 1573 RMD160 ac7f444e6b1e7e2bd95ff396cd3d60437526cfdd SHA1 88a6
 MD5 c263ca095dd799eda3fea95a1075f185 files/2.2.0/patch16 1573
 RMD160 ac7f444e6b1e7e2bd95ff396cd3d60437526cfdd files/2.2.0/patch16 1573
 SHA256 6d17bdb0b8031cff601e36b9c0503e905da2a90a113d42a7033e074f7d836d13 files/2.2.0/patch16 1573
+AUX 2.2.1/patch01 1826 RMD160 8e5d21a2b43062a31d13bca242f334d42b552bee SHA1 47c3ec783f32081ea1406bc0aac06bf61fd804aa SHA256 0b19e4b6484e505aa9e518b8942df3dee686d17d17cdbc2c41f7d444f9afd8f8
+MD5 fd276c3936d6fa5adf9fae1cd57c74c4 files/2.2.1/patch01 1826
+RMD160 8e5d21a2b43062a31d13bca242f334d42b552bee files/2.2.1/patch01 1826
+SHA256 0b19e4b6484e505aa9e518b8942df3dee686d17d17cdbc2c41f7d444f9afd8f8 files/2.2.1/patch01 1826
 DIST mpfr-2.2.0.tar.bz2 728490 RMD160 5243eb0387392123d9d30ca009b30147a51370a6 SHA1 3894bf68982e6218fd94ee743f05c0554a35536a SHA256 cea002a11707b5f8fb2147686145563e5f313fc62558e8400444bdcf89971e6a
 DIST mpfr-2.2.0_p5 27251 RMD160 7e60b2be4691235de88646534b64cd12cdc1a45d SHA1 b2600dead06a074fc4485d1a2f3e4940a1c54134 SHA256 1e253c48800667d295e5ec3407b8e27a86e385706ecb49a7dc51503839752309
 DIST mpfr-2.2.1.tar.bz2 787634 RMD160 cb4c24dc356412e3bae30242f426a2a02d146d04 SHA1 d0abd0943fcfc937a816bf67baaff3f0273a19e7 SHA256 92e2fea0eefd3d50b8e762334326657bfc5be9a6bda58cfa724b2a5cba9f65e4
@@ -77,10 +84,14 @@ EBUILD mpfr-2.2.1.ebuild 1404 RMD160 7a862c2916055cef3c762dd2ed2d17e2584651c6 SH
 MD5 cb9a0accd536b46ff5b3ffa4098fa516 mpfr-2.2.1.ebuild 1404
 RMD160 7a862c2916055cef3c762dd2ed2d17e2584651c6 mpfr-2.2.1.ebuild 1404
 SHA256 5012dfedf00552de7da022c78e2b2b0f91df75667555251126583bf4809c1bdd mpfr-2.2.1.ebuild 1404
-MISC ChangeLog 5714 RMD160 1d139393e05a43aa1c6110174b3a17e427fd3db2 SHA1 1cdce762cd5d75f8e1a45bf06241ede429d4f16a SHA256 dac939ce05e2e37e3744f821d8db570ab9463f61e92ed454b68dbccf7d1f1e7f
-MD5 9e69ea18cf9ed61cde9b8dd01b175b5e ChangeLog 5714
-RMD160 1d139393e05a43aa1c6110174b3a17e427fd3db2 ChangeLog 5714
-SHA256 dac939ce05e2e37e3744f821d8db570ab9463f61e92ed454b68dbccf7d1f1e7f ChangeLog 5714
+EBUILD mpfr-2.2.1_p1.ebuild 1425 RMD160 8dd8637bd7619c67ea15df13d45e1ec66288d0a0 SHA1 bc9519356c2fc1e9b8462ab472c855e5af4f0c38 SHA256 d1d396760cc0332c0f1a109ebf09d30be4564db22187c350577582140a7901d3
+MD5 b3a03005931420dbb0f7a4255922f0f3 mpfr-2.2.1_p1.ebuild 1425
+RMD160 8dd8637bd7619c67ea15df13d45e1ec66288d0a0 mpfr-2.2.1_p1.ebuild 1425
+SHA256 d1d396760cc0332c0f1a109ebf09d30be4564db22187c350577582140a7901d3 mpfr-2.2.1_p1.ebuild 1425
+MISC ChangeLog 5868 RMD160 685a26c0fa8b7096008f4515f2d1ae0d9e7f7d61 SHA1 825e26e6ce5b661d69b10dbec81d968bb43ccb47 SHA256 618dfdc5d14457ccd6864ad3e4455272f0d6dd9b9dfbf3282825edab8ff556f6
+MD5 b77df2405a056e01f5eb7367a212e1ff ChangeLog 5868
+RMD160 685a26c0fa8b7096008f4515f2d1ae0d9e7f7d61 ChangeLog 5868
+SHA256 618dfdc5d14457ccd6864ad3e4455272f0d6dd9b9dfbf3282825edab8ff556f6 ChangeLog 5868
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -94,3 +105,13 @@ SHA256 fd671c3ccece1d416e9b46718913d3ed839e8d0129ad8577df0551e91e6f6ece files/di
 MD5 2e4c88b3a3810fc13043d40304378bbd files/digest-mpfr-2.2.1 235
 RMD160 dcfe570bc7a569fdce138a0a1e8e4d4776463f3a files/digest-mpfr-2.2.1 235
 SHA256 138a6c0286b4a439b3c422770c9b41093baa2d0822a06074ce71f8aef4c3a927 files/digest-mpfr-2.2.1 235
+MD5 2e4c88b3a3810fc13043d40304378bbd files/digest-mpfr-2.2.1_p1 235
+RMD160 dcfe570bc7a569fdce138a0a1e8e4d4776463f3a files/digest-mpfr-2.2.1_p1 235
+SHA256 138a6c0286b4a439b3c422770c9b41093baa2d0822a06074ce71f8aef4c3a927 files/digest-mpfr-2.2.1_p1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF1ujCmdTrptrqvGERAiFyAKCPQz5Fu4xIrySX7h3lc01JHYohIQCfeoOj
+1JgrHUGsCLyAF8t8kCU31T8=
+=WJcr
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/mpfr/files/2.2.1/patch01 b/dev-libs/mpfr/files/2.2.1/patch01
new file mode 100644
index 000000000000..9ddd6a446ffc
--- /dev/null
+++ b/dev-libs/mpfr/files/2.2.1/patch01
@@ -0,0 +1,49 @@
+diff -Naurd mpfr-2.2.1/VERSION mpfr-2.2.1-p1/VERSION
+--- mpfr-2.2.1/VERSION	2006-11-29 09:49:47.000000000 +0000
++++ mpfr-2.2.1-p1/VERSION	2007-02-02 00:01:41.000000000 +0000
+@@ -1 +1 @@
+-2.2.1
++2.2.1-p1
+diff -Naurd mpfr-2.2.1/mpfr.h mpfr-2.2.1-p1/mpfr.h
+--- mpfr-2.2.1/mpfr.h	2006-11-29 09:49:47.000000000 +0000
++++ mpfr-2.2.1-p1/mpfr.h	2007-02-02 00:01:41.000000000 +0000
+@@ -26,7 +26,7 @@
+ #define MPFR_VERSION_MAJOR 2
+ #define MPFR_VERSION_MINOR 2
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "2.2.1"
++#define MPFR_VERSION_STRING "2.2.1-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+@@ -680,6 +680,8 @@
+  ( mpfr_init(x), mpfr_set_ui((x), (i), (rnd)) )
+ #define mpfr_init_set_d(x, d, rnd) \
+  ( mpfr_init(x), mpfr_set_d((x), (d), (rnd)) )
++#define mpfr_init_set_ld(x, d, rnd) \
++ ( mpfr_init(x), mpfr_set_ld((x), (d), (rnd)) )
+ #define mpfr_init_set_z(x, i, rnd) \
+  ( mpfr_init(x), mpfr_set_z((x), (i), (rnd)) )
+ #define mpfr_init_set_q(x, i, rnd) \
+diff -Naurd mpfr-2.2.1/tests/tversion.c mpfr-2.2.1-p1/tests/tversion.c
+--- mpfr-2.2.1/tests/tversion.c	2006-11-29 09:49:47.000000000 +0000
++++ mpfr-2.2.1-p1/tests/tversion.c	2007-02-02 00:01:41.000000000 +0000
+@@ -45,7 +45,7 @@
+   version = mpfr_get_version ();
+ 
+   /* This test is disabled when a suffix (e.g. -dev) has been defined. */
+-#if 1
++#if 0
+   sprintf (buffer, "%d.%d.%d", MPFR_VERSION_MAJOR, MPFR_VERSION_MINOR,
+            MPFR_VERSION_PATCHLEVEL);
+   if (strcmp (buffer, version) != 0)
+diff -Naurd mpfr-2.2.1/version.c mpfr-2.2.1-p1/version.c
+--- mpfr-2.2.1/version.c	2006-11-29 09:49:47.000000000 +0000
++++ mpfr-2.2.1-p1/version.c	2007-02-02 00:01:41.000000000 +0000
+@@ -24,5 +24,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "2.2.1";
++  return "2.2.1-p1";
+ }
diff --git a/dev-libs/mpfr/files/digest-mpfr-2.2.1_p1 b/dev-libs/mpfr/files/digest-mpfr-2.2.1_p1
new file mode 100644
index 000000000000..d2fa709152b3
--- /dev/null
+++ b/dev-libs/mpfr/files/digest-mpfr-2.2.1_p1
@@ -0,0 +1,3 @@
+MD5 40bf06f8081461d8db7d6f4ad5b9f6bd mpfr-2.2.1.tar.bz2 787634
+RMD160 cb4c24dc356412e3bae30242f426a2a02d146d04 mpfr-2.2.1.tar.bz2 787634
+SHA256 92e2fea0eefd3d50b8e762334326657bfc5be9a6bda58cfa724b2a5cba9f65e4 mpfr-2.2.1.tar.bz2 787634
diff --git a/dev-libs/mpfr/mpfr-2.2.1_p1.ebuild b/dev-libs/mpfr/mpfr-2.2.1_p1.ebuild
new file mode 100644
index 000000000000..e35d2588efe9
--- /dev/null
+++ b/dev-libs/mpfr/mpfr-2.2.1_p1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-2.2.1_p1.ebuild,v 1.1 2007/02/17 11:36:01 dragonheart 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-libs/gmp-4.1.4-r2"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack "${MY_P}.tar.bz2"
+	cd "${S}"
+	[[ ${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
+}
+
+src_compile() {
+	econf \
+		--enable-shared \
+		--enable-static \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+	dohtml *.html
+}