Fix mathlib test wrt #377253 by Brennan Shacklett and Dave Beckett (upstream)

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

4 files changed, 50 insertions, 9 deletions

diff --git a/media-libs/raptor/ChangeLog b/media-libs/raptor/ChangeLog
index 0c8f239f3b79..b85ad4eacec4 100644
--- a/media-libs/raptor/ChangeLog
+++ b/media-libs/raptor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/raptor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.104 2011/08/13 17:22:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.105 2011/09/11 19:24:24 ssuominen Exp $
+
+  11 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> raptor-2.0.4.ebuild,
+  +files/raptor-2.0.4-fix_math_test.patch:
+  Fix mathlib test wrt #377253 by Brennan Shacklett and Dave Beckett (upstream)
 
   13 Aug 2011; Markus Meier <maekke@gentoo.org> raptor-1.4.21-r1.ebuild:
   arm stable, bug #376893
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 14aa58f0da29..b076e80be4dd 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX raptor-2.0.3-curl-headers.patch 358 RMD160 7c92c938cf15dd126782aeeff93bce9aed8a5bdf SHA1 2e87d3881395a8541a5aa2d0b62b879b33b5080b SHA256 5018c8568f4a69465bc91584af00c896c02df57510b2f31d73c8e3758f77cb82
+AUX raptor-2.0.4-fix_math_test.patch 807 RMD160 2f6e675fc27e69975c28a95ee444e1aa6f84d7e1 SHA1 9dad69c6c07485be315e4b5ce79748439a14d38c SHA256 0dcf1d3263cf5c3e0af45d7e736b8af3bd20b54d17c7491ef55069d7c7f05ce9
 DIST raptor-1.4.20.tar.gz 1717426 RMD160 f0b1ad050fb41208ebd699578b0327344a0bad9b SHA1 b50279944f7a3573c331183bd03f6140f670442d SHA256 4fa1f98361e935b3802122f5c9d874384bc861d2ad4658de016933e11938a89b
 DIST raptor-1.4.21.tar.gz 1651843 RMD160 f2ee591e3e9e008b496d6b7bf78f1293173bf7ed SHA1 f8a82c6e9a342d0cc9772a02562c5e29c2c9b737 SHA256 db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca
 DIST raptor2-2.0.4.tar.gz 1660320 RMD160 643ea2a36c4dd07a5b15a25df926d795c0243d4a SHA1 79e1289f480cb0fe75f49ec29d9f49189a8a58c2 SHA256 34f49d3afa35f5433d8779dede62e4a6567783ee05ab2d6aec1a36054c552a6e
 EBUILD raptor-1.4.20.ebuild 1514 RMD160 40a8c0cdd746cf9011023ffd4bda3529803ec1b3 SHA1 02c298fb442be4105f713462e491b03707fcb247 SHA256 32e538e831b2ba993bbf3ec996913666381078fd764752d0390477ca7fe47bb0
 EBUILD raptor-1.4.21-r1.ebuild 1775 RMD160 e44d3e31767f0a181c1e213b6cd046ded6f1e07a SHA1 d8c2e1b8c1ae3a597f423d981f20b5a6db0ffd65 SHA256 eacbc942bc26d6fce626fb2301e96219650646a5a929e823918206e37add21c9
-EBUILD raptor-2.0.4.ebuild 1648 RMD160 9caa1f9df50b738064a2c2fed01c33aeb5727eb7 SHA1 90473ac89556c54f5005a90aca6ed6fb73c494a0 SHA256 7b62c21a2c1a9469159b784adaff028aa201a6bfcd9ce3e0709950d308fa3cd8
-MISC ChangeLog 12176 RMD160 4c3a3c8f15e13762bfce0babf71be3193f96ac8f SHA1 c27d42a2964596520d1287cad45e8ebd71d14312 SHA256 44b25a73ea72a8da5d37789dee2962153cf4f15b8147b39ec332227c5eee720b
+EBUILD raptor-2.0.4.ebuild 1750 RMD160 ffedc55bc3aac7e06f7fbd081bc23f4895ef5538 SHA1 5f37fe93f181ded5715622355c0650e6e8893d97 SHA256 2ea113b2181dcdbceca5f151ba5d677889f8bdf81249df9a827867ce57aeba80
+MISC ChangeLog 12378 RMD160 1dcad3823d5da39a16d5ea10dd96ec6fe2d42b51 SHA1 5a154039f1d62d02de26fb0a2eced7b92cc64db4 SHA256 b11c7158b178992045a4fec9084f4161223c3c120e6b43ba63393dff04a776fa
 MISC metadata.xml 238 RMD160 a0d305ec6bd1653212d168b6e61cee0c00702d01 SHA1 508ad5cf65139bb32cf6caffb035ccbbe2f387ac SHA256 e9088dff670aeaaff724dfd30b8f35090c97131a5dbb310b06b943740510bf36
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5Gs28ACgkQkKaRLQcq0GJkJACfb8VOSgpuEi7FyVQpjXaGqGtT
-QjAAniJkue8hM7w4LjgdNuSvO/msuQNO
-=Zjgi
+iF4EAREIAAYFAk5tCxoACgkQXkR9YqOcLPEstQD+IT0YQR78iYqvZfPUlBa7GoU0
+etvQnPicPDYqqP559/0A/0MKKbdirjC6kvWZKfyqRFkeRQlb+GMkdKEkxEV6+wUJ
+=5uxp
 -----END PGP SIGNATURE-----
diff --git a/media-libs/raptor/files/raptor-2.0.4-fix_math_test.patch b/media-libs/raptor/files/raptor-2.0.4-fix_math_test.patch
new file mode 100644
index 000000000000..76e698a3564a
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.4-fix_math_test.patch
@@ -0,0 +1,34 @@
+This patch is unnecessary for raptor-2.0.5 and above, only to be used with 2.0.4
+
+http://bugs.gentoo.org/show_bug.cgi?id=377253#c12
+
+--- a/configure.ac	2011-09-10 22:31:37.791042002 -0700
++++ b/configure.ac	2011-09-10 22:51:12.789352501 -0700
+@@ -407,8 +407,12 @@
+ #ifdef HAVE_MATH_H
+ #include <math.h>
+ #endif
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
+ ]], [[
+-double d = trunc(1.0F) + round(1.0F);
++double t = atof("0.000");
++return (int)(trunc(t) * round(t));
+ ]])],
+    AC_MSG_RESULT(yes)
+    trunc_round_lib=libc,
+@@ -421,8 +425,12 @@
+ #ifdef HAVE_MATH_H
+ #include <math.h>
+ #endif
++#ifdef HAVE_STDLIB_H
++#include <stdlib.h>
++#endif
+ ]], [[
+-double d = trunc(1.0F) + round(1.0F);
++double t = atof("0.000");
++return (int)(trunc(t) * round(t));
+ ]])],
+      AC_MSG_RESULT(yes)
+      need_libm=1
diff --git a/media-libs/raptor/raptor-2.0.4.ebuild b/media-libs/raptor/raptor-2.0.4.ebuild
index 04117ea185b0..415f66b5f92f 100644
--- a/media-libs/raptor/raptor-2.0.4.ebuild
+++ b/media-libs/raptor/raptor-2.0.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.4.ebuild,v 1.1 2011/07/26 16:40:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.4.ebuild,v 1.2 2011/09/11 19:24:24 ssuominen Exp $
 
 EAPI=4
-inherit eutils libtool
+inherit autotools eutils libtool
 
 MY_P=${PN}2-${PV}
 
@@ -32,6 +32,8 @@ S=${WORKDIR}/${MY_P}
 DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix_math_test.patch
+	eautoreconf # only for -fix_math_test.patch
 	epunt_cxx
 	elibtoolize
 }