Fix LICENSE, bug 360501 comment #12.

Package-Manager: portage-2.1.10.40/cvs/Linux x86_64

diff --git a/dev-lang/yasm/ChangeLog b/dev-lang/yasm/ChangeLog
index 273c08193dce37014a117578756bc5f250cab3b3..bf3abb4522461b627d5fc0939116c2c3ce7631a4 100644 (file)
--- a/dev-lang/yasm/ChangeLog
+++ b/dev-lang/yasm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/yasm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.48 2011/11/20 00:04:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.49 2011/12/15 07:42:44 ulm Exp $
+
+  15 Dec 2011; Ulrich Mueller <ulm@gentoo.org> yasm-1.1.0-r1.ebuild,
+  yasm-1.2.0.ebuild:
+  Fix LICENSE, bug 360501 comment #12.
 
   20 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> yasm-1.1.0-r1.ebuild,
   yasm-1.2.0.ebuild:

diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
index ccbc56a76a6847f723a0493f988fffe7c7006836..64dee597f8841e6fcdb628570299342a7310ebb2 100644 (file)
--- a/dev-lang/yasm/Manifest
+++ b/dev-lang/yasm/Manifest
@@ -5,18 +5,14 @@ AUX yasm-1.1.0-cython-0.14.patch 719 RMD160 dc69a23a248cb5ce08ed68480f20a63c8d12
 AUX yasm-1.1.0-skip_cython_check.patch 701 RMD160 2b24da3738ef79a3741de078f7e5302d1bb6383b SHA1 23e85c86e8de7e5d833369d56611b74d50a1d30c SHA256 a0fb5760e0d090a159afac6eaf2961be10e11644fc7c7dbef809fcd95363f9f2
 DIST yasm-1.1.0.tar.gz 1409438 RMD160 93e9ee40319ca02a3a8fff7f85af216d37fb1d06 SHA1 8b252d2a50f6d0d8fe13997183596c3cd7589db9 SHA256 e5d56b582f3d0c30ed5c4fc221063e4175602307ea645520889458133671c232
 DIST yasm-1.2.0.tar.gz 1436502 RMD160 6d2baf27a45d6dbe250f972f18fb6627f50394d9 SHA1 773d28f27f83c44ac35079add0d3167ca6c1def8 SHA256 768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31
-EBUILD yasm-1.1.0-r1.ebuild 1211 RMD160 0aa3f68e335a069a0f3b4d59dd109f12bacdd979 SHA1 83b05214f533be38d908b5652d4ddf09cd8c60b2 SHA256 2c40c67efb566222575afdcac7487c962d4b7a11068358e0ad483cd68f9ea180
-EBUILD yasm-1.2.0.ebuild 963 RMD160 f66ffa4e62bbe0b271ae2479c83530552770d76c SHA1 89cfea98e196d0337ba38f4c149d9220c89ef5a9 SHA256 dbecf465943f86cf03be03a2c46a730f0c05fafa7acd8364c802ef54af8c7197
-MISC ChangeLog 6083 RMD160 8c63f99d14e09cad75e04845600d6cf6e0a47ba4 SHA1 2cfb01a5cbfb25245225769ac05c1d6424c33b9d SHA256 ba3a7000999be522c33a389aecf85829c8a4ea64ace783866c8b91dac1ec31e9
+EBUILD yasm-1.1.0-r1.ebuild 1212 RMD160 dc99dc3bbc91ef142183b1dfd5711ce314d8886d SHA1 1560e6a569f8fe2aa0273f14904d0d9f8065ca43 SHA256 46df857a8b2c6a212852dbb8ae2884280ad34fdf2805635f2b5216365d4e8bdd
+EBUILD yasm-1.2.0.ebuild 964 RMD160 4121168fc75bd89b5e4ad06085da18fb0732e359 SHA1 46615bed9c2bda4e0dfaf4a44881773464798dda SHA256 2049b5438aa8af8313ba59c148befd06ccf926688ba80b526da90266a7f21fba
+MISC ChangeLog 6207 RMD160 06623143460b7809d450bbb52d603c79a439f290 SHA1 8ae8a5c0014d63cef464840ebaad6a4814238142 SHA256 7542f9cadecfcc4a432a5edbf02b829a06770dfc3730269ae8850990a3a8493d
 MISC metadata.xml 159 RMD160 d52f9d709e07e1eca289e2940d4292c64fda6029 SHA1 021f81ae2e25595444e199cc4be3c122d37da802 SHA256 38c5ab0a3cf60ec0611d1112056b9ff16183715db2c60a2ac84590da0ce7fb76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOyEOcAAoJEEdUh39IaPFNBG8IAIvV9oJjKDdakdmYV6vzMt5T
-fSEhVi5sviuS46F6+fO2cszcGrvP0fJr2/GdL3BChzMaCIBZM/u1Dgje7OuYWx26
-KG1QByqnAx7Gw3ToUw22/0GGjiaIWhJMKkP1U49NT3AoUWcYCUDiaV3SkE3G2v+9
-ypoxkaEqpL/2I5AzvGmV/5hx9hPSqiQfzPsqQ1j4tZi0GgvKjOHkrJH+Ze1FAOtd
-kPHX7IbfhZ5SbRAZrPhNbfH90vAT4PCWUagoq3rfOb2eHPDUXkmyKFdwfRGCLh7U
-1yI8CFanfGacb0aPq3VDPsDOm5y8FHb+Q2Gb82O/QZKmKKTr3ngI5Kp7VZ51i88=
-=dWg9
+iEYEARECAAYFAk7pp1AACgkQOeoy/oIi7uyAwgCg1+NHv6R2mr1hqD7nbupGSEYl
+6zUAoKHysHZxruiPXuXYHK/AZ/ZkD4iT
+=O/LB
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/yasm/yasm-1.1.0-r1.ebuild b/dev-lang/yasm/yasm-1.1.0-r1.ebuild
index 31bcb5ccfa25ba2a53422c87872dd32d58b0f15a..102aabcd9a513b84e6d53edfb41b82291b98eb67 100644 (file)
--- a/dev-lang/yasm/yasm-1.1.0-r1.ebuild
+++ b/dev-lang/yasm/yasm-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.1.0-r1.ebuild,v 1.4 2011/11/20 00:04:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.1.0-r1.ebuild,v 1.5 2011/12/15 07:42:44 ulm Exp $
 
 EAPI=2
 PYTHON_DEPEND="python? 2:2.6"
@@ -11,7 +11,7 @@ DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
 HOMEPAGE="http://www.tortall.net/projects/yasm/"
 SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
 
-LICENSE="Artistic BSD BSD-2 GPL-2 LGPL-2"
+LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
 SLOT="0"
 KEYWORDS="-* amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="nls python"

diff --git a/dev-lang/yasm/yasm-1.2.0.ebuild b/dev-lang/yasm/yasm-1.2.0.ebuild
index 88992b505fd7c4a9c6c5a7bba2a96ed7f4290656..db702d0842eb2014d8d1c0b7b17ceec9edefb1a2 100644 (file)
--- a/dev-lang/yasm/yasm-1.2.0.ebuild
+++ b/dev-lang/yasm/yasm-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.2.0.ebuild,v 1.2 2011/11/20 00:04:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.2.0.ebuild,v 1.3 2011/12/15 07:42:44 ulm Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.7"
@@ -10,7 +10,7 @@ DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
 HOMEPAGE="http://www.tortall.net/projects/yasm/"
 SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
 
-LICENSE="Artistic BSD BSD-2 GPL-2 LGPL-2"
+LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="nls python"