fix bug #513348, bump to EAPI 5, add ~amd64, thanks to Georg Rudoy

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB2EFA1D4

4 files changed, 42 insertions, 18 deletions

diff --git a/sci-libs/beagle/ChangeLog b/sci-libs/beagle/ChangeLog
index 964baedf03f7..b1d1edc6ca42 100644
--- a/sci-libs/beagle/ChangeLog
+++ b/sci-libs/beagle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/beagle
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/ChangeLog,v 1.13 2012/04/26 15:40:11 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/ChangeLog,v 1.14 2014/06/15 21:23:54 jauhien Exp $
+
+  15 Jun 2014; Jauhien Piatlicki <jauhien@gentoo.org>
+  +files/beagle-3.0.3-gcc47.patch, beagle-3.0.3.ebuild:
+  fix bug #513348, bump to EAPI 5, add ~amd64, thanks to Georg Rudoy
 
   26 Apr 2012; Justin Lecher <jlec@gentoo.org> beagle-3.0.3.ebuild,
   metadata.xml:
@@ -61,4 +65,3 @@
 
   13 May 2004; Thomas Veith <xtv@gentoo.org> beagle-2.1.3.ebuild :
   Initial import.  
-
diff --git a/sci-libs/beagle/Manifest b/sci-libs/beagle/Manifest
index 2d1ba60a3194..04ca97081d15 100644
--- a/sci-libs/beagle/Manifest
+++ b/sci-libs/beagle/Manifest
@@ -1,15 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX beagle-3.0.3-gcc43.patch 3096 RMD160 a94d48124a018ab76318831d9a1c2f71ff7ab643 SHA1 1c32f8e04083a19a40e315021cb12fee157866c0 SHA256 2c54696275ac9653fa30eddc1bc1640fffd5f68a7153fab896634b0b553f9487
-DIST beagle-3.0.3.tar.gz 5002994 RMD160 cda67b28e17f1bf65cd91bd26c5ac48c41f852be SHA1 f621a85c82eeef95f03ad41fe8387264cc836589 SHA256 2e481dc180bc1f665ade82f0568db4d67f4b8b3f32bc155f1358fd48630e2935
-EBUILD beagle-3.0.3.ebuild 1197 RMD160 6d3d267641af6c8b4ba4a6bc26540a05ae709a8a SHA1 e243d06de11564ab20efda8708db51acd9368192 SHA256 bbb46897c230e0551cfb9ee614bd9deb899b053b150aa320561496d068d8f521
-MISC ChangeLog 2178 RMD160 19d6120d5e7cc5541d3c5b8b80d892b8a04924c9 SHA1 7ded8f7c27d7273f4a2decc53b7589c24432ef6a SHA256 e5006d84563fa54bc2c20ba3e74edfdc6cf65e52d3dc26b8af6aacd983363812
-MISC metadata.xml 452 RMD160 a95e05aed42adc12014861d10f75e3ffa1bbb53f SHA1 2fd90389832bb3c9184fa6c538f207426526d26b SHA256 0fd9e1aa9e39939276bf72dab0b8b8529aa002174c948c1d66f8ec93510d395c
+AUX beagle-3.0.3-gcc43.patch 3096 SHA256 2c54696275ac9653fa30eddc1bc1640fffd5f68a7153fab896634b0b553f9487 SHA512 3611b41ea82030b192cf36cfa9636a72e874e69b60f69dcbe0745b21c98e8d89e09f52f902b6d4e174a5a64e05b14352227610b4780f917d29122ef03270e702 WHIRLPOOL c056115ca74ccb33297f55890c5ba1b19064b046a549eb570fc45d76ca3ca449f4c122541f09948df554b5c44aecb3a9589c6204f9451709624045ca35f3efab
+AUX beagle-3.0.3-gcc47.patch 443 SHA256 a3bee8539fe7430c3842115990e6499f5d21e8b41c5eeadabe0375f507bf593d SHA512 9fcc65a3cb2502005aa6a7e4f950cbca8a5383a0495cc3358f749fc4f6f20a57252fdb37e72fefd79d265137b414966ee6deff46387b4c99a89874b850675743 WHIRLPOOL 551c626725a60c8b4df34fddd9b0d42675e5334c592d836c007ce06f5ad6fbd0223509dc94b1001518517bd87720fb697030e3946d4779262737ea387571c0c9
+DIST beagle-3.0.3.tar.gz 5002994 SHA256 2e481dc180bc1f665ade82f0568db4d67f4b8b3f32bc155f1358fd48630e2935 SHA512 2f8f027f3f24d0fd287e27a80fe5b24e18550144add06fb8157dd03f734f5ce212f62889720c81fd33246fa7086e9b913802ec0c5155df5bd801c36888b346cb WHIRLPOOL 7902d2bf149afb9c2dc1f89fbb6754250950d6df90e63b445939b9c7fdc21b59835ac840d3babb7b56056c24e1f159da9aef27105ff9e05e0298f283e6697bbb
+EBUILD beagle-3.0.3.ebuild 1245 SHA256 0ed81f490b9deecba8272eff85bd5a04226dbd7758b91dce1e56bfbc62ee28d6 SHA512 8a57525d9f865c78852222754b256a45ed79414b797f10d174f1fc1e8940950e5a595806d1da640c5241e21cb347d8d3186c7b163e10a83283b3600aeb7c6805 WHIRLPOOL e1a4f3d8c9f5ee65b7e565899cb8a20adbba7e491575ee4ed4135a56aa07a3aebd08c534669827ae21a8cf9814f0456c6618fddfeffae2b275e586c961033c9a
+MISC ChangeLog 2360 SHA256 b8a6c4098d8fe9c969c06b169ca9d06745dc53cec854433e2b447129ff5a2e72 SHA512 68d153c45046d06e165ad5e0f45d2b8f433137e959657ffe174fabf0ad849810f2549477fed1db8537a025a3f7c34c0e9f9feec3d2f18b304530374be4fb875a WHIRLPOOL 047af6a7b35f888784252e03ff297d95b22a639059e62c72ec2540cc08a2b2826c463dff2b14f7ddafb461fd966e1cf9e22a1d798ae5f570be57dfa04f8f54c0
+MISC metadata.xml 452 SHA256 0fd9e1aa9e39939276bf72dab0b8b8529aa002174c948c1d66f8ec93510d395c SHA512 aaef8157fd8734d58fc9b5c232e74ea0b25df2e48cf7c06c4cf734bf74dc0939c98a1711609cd993ed94ce8d194978b6b3e3894c29d2ca9cc2f3152865e0a8ba WHIRLPOOL 554388675c7a5d15df2012f67209ffbf3a53ab8d578dcf2b271396498d3c9e986235ee36a3c85460e087c486cd5beb53d3a3e65db7f13e741a97c8abf6afea81
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREKAAYFAk+ZbGAACgkQgAnW8HDreRbpVACggGkLdazKkT1d+ZKMKngBNbEi
-oucAn0+XT6icFlT5/MrcwGx4Cg/aLnyR
-=ljZN
+iQIcBAEBCAAGBQJTng7yAAoJELvuk32y76HUVzsP/0WN0vIpjovCpmCwwN4o6zo7
+SQuz5zUnd983uUWXY4y8iQSES/8IrEQj+5sBUCsesdoWyyYf3Du0tqEr0k+XUkph
+diVUTMArxc6f9LO6pv4QOtB3GcLKQK2DDV3t2RB1LaP0xkhWgNOR6/nP+OnxBhIN
+bEeJpUFd78jTmMvOSAnZctg7MxpsL8t5FG0ZFegynR2jugy48OHCF0/1VAC2kDtq
+Mm3v5tyi33bhapcstJe1caNuz6luVb21PV6rexEZa9FIKw2pEFqSMkXl0pBMw8Pi
+fAwYwK/8XeLij7C7UvQcKlImzqNzs3OywObDG6sy/xK28lOW/NZ2Pv5U+WeEFnke
+5DdoCiLKwfiaTAcbkDhR/uPR3JB4C8Owc6GFsQAyrXY7+TixFwDmudJOx1C2mYpg
+dsXred8aZPzVIsgCL0vZDDqdkkA6hsJLRGDCiXtLYHjUEFIbpGNzqXbweO5cJ2HG
++ldY/Vi7BtJeowXb3+F2tJ8OIQL+KowTadV00vD/FZ10NTaU9IqbnwNVsZDhcomO
+5au9f9U8mVWRSUjAXTCYIgoQsFJdd8bwY1LCj4xTFVgouMqRpMAvGPAiTXa12zTr
+pL7lDrfQNgNMKjTWgPyfNbMRrtugx83ZgvCDNlEM9UMMHXxmHgt2s1F9f13JLxYA
+KY6NGU8iOjlDDwyWq33p
+=BaG0
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/beagle/beagle-3.0.3.ebuild b/sci-libs/beagle/beagle-3.0.3.ebuild
index 3ef6944b9b9d..d0d79d302557 100644
--- a/sci-libs/beagle/beagle-3.0.3.ebuild
+++ b/sci-libs/beagle/beagle-3.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/beagle-3.0.3.ebuild,v 1.4 2012/04/26 15:40:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/beagle-3.0.3.ebuild,v 1.5 2014/06/15 21:23:54 jauhien Exp $
 
-EAPI=4
+EAPI=5
 
 inherit autotools-utils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://beagle.gel.ulaval.ca/"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="
@@ -22,7 +22,7 @@ RDEPEND="
 DEPEND="${DEPEND}
 	doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.0.3-gcc43.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.0.3-gcc43.patch "${FILESDIR}"/${PN}-3.0.3-gcc47.patch )
 
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
diff --git a/sci-libs/beagle/files/beagle-3.0.3-gcc47.patch b/sci-libs/beagle/files/beagle-3.0.3-gcc47.patch
new file mode 100644
index 000000000000..cb3546c68a5c
--- /dev/null
+++ b/sci-libs/beagle/files/beagle-3.0.3-gcc47.patch
@@ -0,0 +1,10 @@
+--- beagle/include/beagle/RouletteT.hpp
++++ beagle/include/beagle/RouletteT.hpp
+@@ -87,7 +87,7 @@
+     Beagle_StackTraceBeginM();
+     Beagle_AssertM(inWeight>=0.0);
+     if(VectorType::empty()==false) inWeight += VectorType::back().first;
+-    push_back(std::make_pair(inWeight,inValue));
++    this->push_back(std::make_pair(inWeight,inValue));
+     Beagle_StackTraceEndM("void RouletteT<T>::insert(const T& inValue, double inWeight)");
+   }