dev-libs/gmp: sync

(Portage version: 2.2.20-prefix/hg/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)

3 files changed, 17 insertions, 20 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index 26d5e7454e..ae9fcb986b 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/gmp
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.210 2014/06/06 19:27:06 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.212 2015/06/04 03:46:52 vapier Exp $
+
+  04 Jun 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/6.0.0a/gmp-6.0.0a-arm-thumb.diff:
+  Add fix from upstream for building on arm in thumb mode.
+
+  09 Mar 2015; Anthony G. Basile <blueness@gentoo.org> gmp-6.0.0a.ebuild:
+  Fix license for gmp-6, bug #542642.
 
   06 Jun 2014; Mike Frysinger <vapier@gentoo.org> -gmp-4.3.2.ebuild,
   gmp-4.3.2-r1.ebuild:
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index d5c30f6ba8..6394f0fcf0 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -28,23 +28,13 @@ DIST gmp-man-5.1.3.pdf 1159009 SHA256 56b0e21329f46ef1d59c1f191afc82c59f8b72273a
 DIST gmp-man-6.0.0a.pdf 1187496 SHA256 b38ed1d760b20c01b734b65380ab667373fa48d8203f762a434cd3f326c67a38 SHA512 528972502d65d23b58c47a594a628e648f11cc027bd0894a39b8f892bb421ceabb7f35640a9eede21cea791f5f597ed4661a1f73444c56a6fb31fa6e362d96c2 WHIRLPOOL e6c4eb3a9adc82496a1872223ceb153e05c3aabd2323aeb38064739a5200eb8fc24fa3bb96f5fb1e632cc90a2576bd3966bae3c7a7a0c750ca56faeb30837eea
 EBUILD gmp-5.0.5.ebuild 2965 SHA256 11a164e3ef393aee652298d0ab8f197179a930c21020a4b77531bc830d634b55 SHA512 cc4d1bedf01d080ad605c1cb7a7079a6500a283233c8102ef1920da73573bf2f8c10f24fb40b6b9c45c46eaa954e82ad6e8e80e959443bc1019d0b22ef97789c WHIRLPOOL b058b65e86087aa4e3beaed1320073a36eacd21e31445862f69477c11b9eb875cceeaca638b4031295c4bd287bdb279df29b1e8c958a0f76282f5b0daf517a84
 EBUILD gmp-5.1.3-r1.ebuild 3396 SHA256 48d5636ca8299326c5c90bc04707afe0dcad7f5089ff6414889eb39c5ee5065e SHA512 18765a3d0503e8dbd9bbe080060c6a5a4c208e51cc57830b944665bedbbd33a9d392004e8b08fb3863ea7b42fee942dbea03fca33f3005a365637a80f77d43d6 WHIRLPOOL 69a778bb3ea09f837295172c952dc69e5047f8eb823afdb7c80bfbc84e17754ffbe62c60faa1565bb29fc766bfa1937c02aa8b75ac5b27922bb2208b31515ad6
-EBUILD gmp-6.0.0a.ebuild 3346 SHA256 07afbfa0b5d048ac39375ff5b91f475dd3b34243004f5628a9f3b2bae4f80df1 SHA512 b1d3a377f62b4a43429626b2dac253e66a7a72e9abb0b13563f612a3aee48a5c20af1c52750484e1e513dc9af7aa699ab93fb5e66730213aa7cf33f6f1fe9e45 WHIRLPOOL df6469430e5dcf482e865cb9e3b913b04928eea21689653f8c65df4c909ffb8f76a2acf85575597d9263e3d51148799f0e8766515d443a6221fc17313ea4f71c
-MISC ChangeLog 27882 SHA256 35481d61d2d69e86517fe8d6d4068864dcde10507dd94dc59668ec6a4d73c01d SHA512 6442a08ffc7b3ac36cd6ef8ed0987b16bf99b4a1de399a279d1cd892e20094d7d035eef2a3d9ca908f8c3b55b207aa9606bf538d6766727b5daf5bb9874d779b WHIRLPOOL 3bc8d5f905917d933fe6e10f3e6301ac620abf73c0593c0a252099b360503d602f39fc5bbb413611895ca9aff90e47f618cc67bc49d4c01bedf5d22edfffe6b9
+EBUILD gmp-6.0.0a.ebuild 3363 SHA256 24500c65e79b31650d2f22d848a6274200c9e87a4d65c098100554675a070efa SHA512 172539c21104f44e2f5a4c4525998c31b4c7762184c0111b11cf820c10d933b4ecfc38b4afe9da2d498a692cfa72f7457931eda1869726072aaa6931822ff915 WHIRLPOOL 71bdc6fcdaf6af2bf8fe434205793ef67de958f3864e084ed09995cefc0871aa835debf557c1cef878a8355ea233fe2a3bed24018f5e0f9a5664c111f5e53c87
+MISC ChangeLog 28148 SHA256 23a7db9746fc1caf9e0f91adb20f0a2d1d03f6b969fd58f28e71e245b131efdf SHA512 9fdf6d08009e6c0be42c95d7ea0dcdee9dbf43d3197112e250daf79780acd5d4335e0352c20e00d57cfbef4eec74fafcede8eb4052b18b5fc4850e6e73446ab8 WHIRLPOOL 9a10f41665ee042ab35be45350c65dd85106303e10c61264f33f7876ffc69da0e67d7d1f40aa5a05bcabd611200f704b3290f7c968d9e15e777d6fd233c1cd20
 MISC metadata.xml 315 SHA256 f6cfb0b2b72dab3e088b68df3d21db3f8463b30571e6de17d1431a57f1bc8d26 SHA512 109d0cbf90eff7264eb6502397024425664d8349229ba334797fcca61852e92ea2c3064579c4765793a69e2811a44ffa63b3091f2ffa5a433dc22ab308a2bcba WHIRLPOOL 3320121476ba2740ee9ee338374cccc853990f229e0cb3a23b5c0ed3e925485f5fd4b797b04ec4ae419eadfc5b9a057dcd9435fe507cca65560e09ad158c1ffb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUcg3iAAoJEMcu9QQQ+wFr0F8QAIDfXSg2b9AYxMovSZRtlYDQ
-isl4ca0Jvg1dIBgJDL0vNDaam++kaxULzD3MlEHVNQE+A10Fz9pQQNft5UTxz4YK
-p1leqtxs7gAFcM93Hd09KIqsZMDLa6xoHocNUH3p6Ll5r1GOBYukb1JYBzWQE8bx
-lnUcJwzqSXS4nVkYuazi2iQtRIMBn27/gacBmDoAMZHnfI7ESIeKYAXjK5Mtoxku
-l8PhmJdI8IuokPB5dx3l0cgO/vBLO9QK7375bNLYr8z2d087OCdbEqw65W3j2L4F
-vu45uJmnWOm0YrSxgmshNMoPfcVJzSTu9Ik/srAZyjtg9Pa9m3rAokAC9OLQEpzh
-g1A6DhIlzIkFZttOzl0u462NrvN6VSwRJLYu+71iTcnKI8tZJhn0NZJ02acxiLEY
-layxK+WjVDYap/XItfA/yPMkT5xLJGmSgYbwNakn0PwyKq6DfxtpFx+p30jojO28
-arS41MdPAILKrpr+TmgllMDyZ5rNZYQ3/Pre2vco7we63BlbU1DAI4Ynn38mbORT
-TZFSaIaKIW4QtlMrBluSybmtQ/7JWZUbMYAfa6qAvkaIE5bGuFeNmbz651uf2L+u
-ZzLN3aIElNxxs2zU1KwE7EAxlxWOV8a9qqpHwqqOwto0CVqIJgPQGQ+lENXU/O8u
-RErhcO1/MkIkXeOMG/Uy
-=pwXo
+iEYEAREIAAYFAlWqJ9AACgkQX3X2B8XHTomi0gCaAnGcSA1ijSDmZ6PxoHh5FvTc
+eYQAnRzXTgoMTg205OyNqX7mCqbcqh0c
+=y0d9
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gmp/gmp-6.0.0a.ebuild b/dev-libs/gmp/gmp-6.0.0a.ebuild
index 0b15ee4375..964e773cab 100644
--- a/dev-libs/gmp/gmp-6.0.0a.ebuild
+++ b/dev-libs/gmp/gmp-6.0.0a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-6.0.0a.ebuild,v 1.2 2014/05/08 20:01:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-6.0.0a.ebuild,v 1.3 2015/03/09 17:53:52 blueness Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
 	ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
 
-LICENSE="LGPL-3"
+LICENSE="|| ( LGPL-3+ GPL-2+ )"
 SLOT="0"
 
 KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"