Fix Bug #362731 & Bug #425706

Migrating to EAPI 4

Package-Manager: portage-2.1.11.31/cvs/Linux i686
Manifest-Sign-Key: 0x0145142D

6 files changed, 56 insertions, 56 deletions

diff --git a/dev-games/wfmath/ChangeLog b/dev-games/wfmath/ChangeLog
index 4eb40135a03d..6320cbbb4eed 100644
--- a/dev-games/wfmath/ChangeLog
+++ b/dev-games/wfmath/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/wfmath
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/wfmath/ChangeLog,v 1.20 2012/07/10 16:50:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/wfmath/ChangeLog,v 1.21 2012/10/31 09:25:13 tupone Exp $
+
+  31 Oct 2012; Tupone Alfredo <tupone@gentoo.org> -wfmath-0.3.10.ebuild,
+  wfmath-0.3.11.ebuild, +files/wfmath-0.3.11-gcc47.patch, wfmath-1.0.0.ebuild:
+  Remove old affected by Bug #362731 from Diego
+  Migrating to EAPI 4 the 1.0.0 version
+  Fix build with gcc-4.7 Bug #425706 by Diego
 
 *wfmath-1.0.0 (10 Jul 2012)
 
diff --git a/dev-games/wfmath/Manifest b/dev-games/wfmath/Manifest
index b90b3f5ffed5..3d528ed1f27e 100644
--- a/dev-games/wfmath/Manifest
+++ b/dev-games/wfmath/Manifest
@@ -1,8 +1,17 @@
-DIST wfmath-0.3.10.tar.bz2 331936 SHA256 74013586e9bf7b0d1a28e8ba1107113e804de1a18fa4bd8c357de564aaa565c9 SHA512 90335479df5a03b8cca781e8d98c0f7175da11d4507b261a476e2e3557d4eb535cb87d133448c367bcc3122f4ccee95da0158d81fae65bb48e4ea92f8dcb5b6d WHIRLPOOL 1de78bfa084de262b5e9c935c97eb277a6142189774d0c10bd325eb2e76a9789975d690f1fd2ef445a69d45df4f44e838835928df1be6ba248482e0fca20b6bf
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX wfmath-0.3.11-gcc47.patch 462 SHA256 7b9e119b6b082972d4a81468e32ba0429b69a26f930cd02745e0b99d89865ee1 SHA512 c3437c318506b46478b3ae27fe998c786b75d78283bfcb02b1fdc24a00a3905099dd6b673450116796ead337d3f96e30e9cff0722ca9ff05dabf69c9e7762efa WHIRLPOOL f6d9d506846219e05f4edcf17993485d916d5f552087f279360c29d5829f12d4d87e96ac2d5782694755b39532af383d7263f52139b68cc5116ffe28f67a181c
 DIST wfmath-0.3.11.tar.bz2 369831 SHA256 da4d4f55b2d56cf8412db406933b0331a051a17b3053ac91003323cbe51eecea SHA512 3be9ed9332baa1d7f54e01ba61596238443848804820b74b1e83a1a40c501b2a0d3b799dcdf1b998435329684995c29a2346b9a38284226b68603f47a2916c32 WHIRLPOOL 1ebe21236d5fefc88d1df1561c77af635b01c60ed286b944dca24773fa1f54088f6894513dd7a2cff52463daa70f3d6b76ad670013bac44b571f64676de91ad1
 DIST wfmath-1.0.0.tar.bz2 390060 SHA256 6283fde403b87547b41394af0a1993f5086d7cb9d2ed8db4bcca5fae625fd99b SHA512 aa3fb300cd00c53ede226d860301fc51852429af61fac460b26345e77cc23a3c6af4c63f9241639e30e6c7993ecbe8f568fcc2185cd0a75983ddcd4acccf1222 WHIRLPOOL 707389e29d9378f9d266e8abb23b6b11a10457347e25ed6af60be706807c1152607fd5886a3edb54f9cdc94a5065e4c1187f6e57b8c9683fae956c1e71e7764e
-EBUILD wfmath-0.3.10.ebuild 993 SHA256 114d0cd377b60826866810447b68f85ce2943955da18c9f649fc4a62d5bf45c9 SHA512 09a616b8c4e4ab3f77828f88bd427ac7f85d62b87e568686861c76daa5025ed94aace05e9e407e517041a800c7b7a3eabbf01abc70e07e75af03c28ac94f1fdc WHIRLPOOL b6d52a2eb9ef19f67546d2f8214ea4a40d202a3789e7140290b31dd97dab70287c0a8df30f909eda0c309950dbbecc8e5f5232291e29d7d7f677bae607b3c1f1
-EBUILD wfmath-0.3.11.ebuild 994 SHA256 873c89c36e98469a6e3d7f1ad0b2f6af4109a2a271fa41bb1e7b15a2b2ad1f85 SHA512 b9447e52ea5bf833038ae9015e8900a9b807d6a43ae27310ac061508df3fac0958163ea7e5b5409c15097bdd6c9b504617dd35e3e7601727ad66086c1a94c198 WHIRLPOOL ea4e6074fb233fbf0a8646faada286fe6526b103873c9642cf437f74d240698c7877a38cdd83e2e7e9fbfc2f95f7d09202db4fb71bf4741851dadf82e411862a
-EBUILD wfmath-1.0.0.ebuild 1013 SHA256 0500755de381faec379d3c0e01adc68d0400f33710cc45270749cfa755f2dc19 SHA512 122999d94cbe824587bdd3ce8bc088652d6ba484a9493ddfcaff30c0b6484fa22818aeaa4953f6b2dbe044b6923138587fe8b9e7f5de037660174120d346d6c0 WHIRLPOOL c5eaeb1372f0981e261643b2ae090e03944979fbddd07de2af3c7e3965c912f567bc6b707ce7aefb57f8ebe5394848c03e5b9bfd068996c6030ce7dc970318b3
-MISC ChangeLog 2672 SHA256 0ed4c10cea19b1bed6d7bd42bcac2fb4f10791ff5d27f9345c2965026750ba7e SHA512 4c4c48ff267310a04c7d6ebdd44e9718de627f36f7d365f594b429ad18ae9561d935d7f36afc2884087d7c6a95bfdb29e76f57df6c1348352bdd9b8c37781f26 WHIRLPOOL 998b79b537140a18b484dc4f82e2b8358e18377048379b536d04f31ace77d5dbe7d7f382942b1cdc8d2f3eb7f7ad3b6ecef25c63f2038ac154785b05fd17eb0a
+EBUILD wfmath-0.3.11.ebuild 1065 SHA256 cb40e7e4c52bc371b6327ed18639c2e619d032b9d5512511d2e9d391b09a1283 SHA512 5dcde1ea6dda464787a372f8951d8865986b314da2627c36599ca5608fbb0925d188e4393e5e8ce903bb2fcf6f4584b627a7a7da2e1687ee59bf73bea482491c WHIRLPOOL 2c9107a60948ef49efd460e57909a1670ba8edaff99f100d7969584c7699f53da99ab02b36c2388adac11a86893ba7a5a583d3099f4808b6b4f9bdc6c55820c9
+EBUILD wfmath-1.0.0.ebuild 835 SHA256 ba04676ee0183dd9cd21547c99224061522f97af1e1b63892929641c5d9931cb SHA512 09bb6fb215758a0685e217b03bc453993e52a1b851f02517e8248fa2ca2d4a1cc4760cecabbbcb61f004f25d803c2f339675868692c20e0c7dcb83fdea7f3a1e WHIRLPOOL 78ef2a4127b35bd80bce323644f7a8ef0dd4a9d0a154b96ec3ca2a24b60e5ba8604ec9e1094e5c60ef25833f9a1cb6a3303e2593127de6ba5df148cc0717e6c2
+MISC ChangeLog 2956 SHA256 6fa3fe142ac35202093cf3b1346ab4354742e9a5aa8312ab38b595d254162213 SHA512 e3e0372794128aed884f52bc47861f1c2fa1b96cefee1ba5d385e9ca7b577d6fddd3c89ba3e6a281bbf36d485b78798d2bf87706cc93152e894b90f5821838f8 WHIRLPOOL bd5f9590d92850316a9ad8c5cf3dc5fa7ce2b482007f028f8f31a973ec40fda3d4e199d122755766a930fdc676a74d58d120c7bad899661ad57d7ff0c2f8f660
 MISC metadata.xml 658 SHA256 9d39c987c2c288a78ead2f054bdd5071287a58a10b2b566e7dc59c4844dc1966 SHA512 f2fb73cedcb50e207b3ef44aaf92dee89c2f2b750ca78ceeddcf78a770eee679fc37979f2569d2099eaa1b6ed463442a1e37c991ba5e18052afceb3e7e6804a4 WHIRLPOOL 90f19a10410a825532951f4deeb821dd95ef32b7e4c8c55c04579163ce4534dae851da76303be03e3e40ef8976b084a2346005e28f1efa8f1b31cd43bc24c58b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCQ7oAACgkQIY77eQFFFC36YQCg6yw46bRmcjVhm3B4DWXlnlYL
+1PIAn1RIwmuZIGvR//79ulYkCMVZIwcG
+=U1ow
+-----END PGP SIGNATURE-----
diff --git a/dev-games/wfmath/files/wfmath-0.3.11-gcc47.patch b/dev-games/wfmath/files/wfmath-0.3.11-gcc47.patch
new file mode 100644
index 000000000000..c475ccb1ddad
--- /dev/null
+++ b/dev-games/wfmath/files/wfmath-0.3.11-gcc47.patch
@@ -0,0 +1,21 @@
+--- wfmath/vector.h.old	2012-10-31 08:39:38.033547273 +0100
++++ wfmath/vector.h	2012-10-31 08:40:12.200097132 +0100
+@@ -34,6 +34,7 @@
+ #include <wfmath/zero.h>
+ 
+ #include <iosfwd>
++#include <cmath>
+ 
+ namespace WFMath {
+ 
+--- wfmath/point.h.old	2012-10-31 08:41:00.226654036 +0100
++++ wfmath/point.h	2012-10-31 08:41:52.353918234 +0100
+@@ -32,6 +32,8 @@
+ #include <memory>
+ #include <iosfwd>
+ 
++#include <cmath>
++
+ namespace WFMath {
+ 
+ template<const int dim>
diff --git a/dev-games/wfmath/wfmath-0.3.10.ebuild b/dev-games/wfmath/wfmath-0.3.10.ebuild
deleted file mode 100644
index 052040812c9a..000000000000
--- a/dev-games/wfmath/wfmath-0.3.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/wfmath/wfmath-0.3.10.ebuild,v 1.5 2011/01/16 04:11:53 mr_bones_ Exp $
-
-EAPI=2
-DESCRIPTION="Worldforge math library"
-HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/wfmath"
-SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		emake -C doc docs || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	if use doc; then
-		dohtml doc/html/*
-	fi
-	if ! use static-libs ; then
-		find "${D}" -type f -name '*.la' -exec rm {} + \
-			|| die "la removal failed"
-	fi
-}
diff --git a/dev-games/wfmath/wfmath-0.3.11.ebuild b/dev-games/wfmath/wfmath-0.3.11.ebuild
index 7372cbac97c2..ba2d63899648 100644
--- a/dev-games/wfmath/wfmath-0.3.11.ebuild
+++ b/dev-games/wfmath/wfmath-0.3.11.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/wfmath/wfmath-0.3.11.ebuild,v 1.3 2011/11/11 09:18:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/wfmath/wfmath-0.3.11.ebuild,v 1.4 2012/10/31 09:25:13 tupone Exp $
 
 EAPI=2
+
+inherit eutils
+
 DESCRIPTION="Worldforge math library"
 HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/wfmath"
 SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
@@ -15,6 +18,10 @@ IUSE="doc static-libs"
 RDEPEND=""
 DEPEND="doc? ( app-doc/doxygen )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+}
+
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
diff --git a/dev-games/wfmath/wfmath-1.0.0.ebuild b/dev-games/wfmath/wfmath-1.0.0.ebuild
index 4e35e98fde1d..9acbbc4c664e 100644
--- a/dev-games/wfmath/wfmath-1.0.0.ebuild
+++ b/dev-games/wfmath/wfmath-1.0.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/wfmath/wfmath-1.0.0.ebuild,v 1.1 2012/07/10 16:50:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/wfmath/wfmath-1.0.0.ebuild,v 1.2 2012/10/31 09:25:13 tupone Exp $
 
-EAPI=2
+EAPI=4
 DESCRIPTION="Worldforge math library"
 HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/wfmath"
 SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
@@ -18,20 +18,18 @@ DEPEND="doc? ( app-doc/doxygen )
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static)
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 	if use doc; then
-		emake -C doc docs || die "emake doc failed"
+		emake -C doc docs
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
 	if use doc; then
 		dohtml doc/html/*
 	fi