Use separate LICENSE entries for "BSD" (OggVorbis) and "BSD-2" (Android Support) instead of bundling them all in "fmod" file.

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

4 files changed, 20 insertions, 15 deletions

diff --git a/media-libs/fmod/ChangeLog b/media-libs/fmod/ChangeLog
index 06fe3ae5d001..a083c7dc7885 100644
--- a/media-libs/fmod/ChangeLog
+++ b/media-libs/fmod/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/fmod
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fmod/ChangeLog,v 1.39 2011/11/20 04:32:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fmod/ChangeLog,v 1.40 2011/11/20 04:49:36 ssuominen Exp $
+
+  20 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> fmod-4.38.00.ebuild,
+  fmod-4.38.02.ebuild:
+  Use separate LICENSE entries for "BSD" (OggVorbis) and "BSD-2" (Android
+  Support) instead of bundling them all in "fmod" file.
 
 *fmod-4.38.02 (20 Nov 2011)
 
diff --git a/media-libs/fmod/Manifest b/media-libs/fmod/Manifest
index 8a1e5c6b75a1..d0de908380f7 100644
--- a/media-libs/fmod/Manifest
+++ b/media-libs/fmod/Manifest
@@ -7,18 +7,18 @@ DIST fmodapi43800linux64.tar.gz 22276575 RMD160 cf69d95ce8780f373e28760741927922
 DIST fmodapi43802linux.tar.gz 21992247 RMD160 b657fcc3aa14e12bf72cdde031c316227fcb74b3 SHA1 3027f951c94188cebdabf85d3f96326d1e60780f SHA256 9ef7eb3e277a53a69ea31206223fd27f01e236869568f83bfac97dbd9982a4fd
 DIST fmodapi43802linux64.tar.gz 22282269 RMD160 607871ef29019ca1f9077231b8ae87afd8431010 SHA1 9115f4a10301ed7a3a7d014a91309d478e19542c SHA256 55e52603d2d53cd43467e086ea292928d66c741956c98266fd312a7936f1ba42
 EBUILD fmod-3.75.ebuild 965 RMD160 97eb86817f8b7e51a1fec371e209a61c400ed690 SHA1 817918047d7ff2bcbd3d1c2b603e6cc92df4cce8 SHA256 8b519707d2e567f5a972418b9ef79539876a72b677e2976c444b2463974f84d8
-EBUILD fmod-4.38.00.ebuild 1708 RMD160 418ddee4ddbbf8879d1ee44f35fc029b4cfeafa5 SHA1 e0b2287b0d9757dcfcc73edd25adeae1c87ad927 SHA256 3c61b95ab1c467cbf06e97b892ba05af8d2c6dfe45414619dfe72474dca8b937
-EBUILD fmod-4.38.02.ebuild 1709 RMD160 ac7c45c755fa1c602dc2e91474586551a9624801 SHA1 ab11b9aaa37a6a7c86eeb178b06593ab8c21358d SHA256 7aae4f9704954b9ef55619a6c053a2afe8d6dcabf55ad139e3b0abaa542b2ffc
-MISC ChangeLog 5524 RMD160 4c48cb97424c925bcd0cd3452e34ded69e499074 SHA1 ad67411c1096d6c580f9fc88f4165ff358117659 SHA256 a47f164a0d9c198c9d3b8465e4e9282bc3b178bed02f2b29661fd48cc3963514
+EBUILD fmod-4.38.00.ebuild 1717 RMD160 84a252e20db5a59c97c6f499a06588351014e8ce SHA1 da89275d2cd8c56d08da8e28a974d755de159c2a SHA256 e837f1d56f822a7af3085dbf03068b9e3fccb90c4cbebde15aef287b66ccb796
+EBUILD fmod-4.38.02.ebuild 1719 RMD160 33e6950e16c95b80f2a0f2edffe5f3f924cd2cb2 SHA1 2a63780487cf99e396d721f88a9c6662694fc0c9 SHA256 b7054c9bccc31a6a4e15debba844275489610cefb04d8c780d7f482de56f41fc
+MISC ChangeLog 5753 RMD160 a1eeb4218e222cfa7f0d061a1ecfa2fd02fae78d SHA1 c614e27a7f09476095c0a8986d733bb7544e6514 SHA256 f584455cb94fe7973bb6250d41a9f3241cab2404f64f8343d01b21357881444a
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOyIKVAAoJEEdUh39IaPFN+60H/06yZ8Kza1W2OvqyGYZATeSg
-HSJ65NtsWs9IYI3DDLc5URbu99FB/VyYEohdKDk6dCT/Y9bQa5xRr8xHyTvIxp2M
-/eYrLIBst0xE0H8XsC7BsVhNt76Ac+SYCDSdtLAOty451mo5woGgBYsixGdl3Xs4
-DHn8jH0CBsMxf7Zg2LlYi4UR5aLQ9WMF7Fv+qwGt4myUK7cFvAXHlvJZCTgl3o2U
-9b53+aYOz05uc+JGEDeSQV3O9WUtMHd/WPR8bj62YryuMEIxUiCk84cFidrAONHz
-JNbM0pRzs6KIqewFKoj7KX6nIvHyfJmG8nhiozRCC37iKIXFTBaukwmFh7poiKY=
-=mqJa
+iQEcBAEBAgAGBQJOyIZ6AAoJEEdUh39IaPFNKvUH/1FqWHV8hkDmgnrGTIkn7wJ6
+jBjHqDGhCLd+zl37ZXqDJa1BmKQqjd4/P77dvYSLkrVry791VkceoClIW08ejA2x
+Y094VTMBoTOfGJCAjW+b6JQOcfRX0Bv3eXxVXbQrOGSREKTJh6b622g9XUDtO2OO
+COoESLf3EONTHJUgjQuDXd4xO+R/R7Uh/bxdXAucIeP0ookTuFPkOgUeo2sUVGln
+q0ZT6aqkY8v1oYHsmrk29c3DTU41DQ7RsfnBt/HxN8H7pZ93BfkYu7u4/cCaS2xj
+XJNbOdr345fe6iVakGZb5Ucr8BROlsUumBu2iTUJO3RViSxFMk+O8byQ8d6S09c=
+=3Rvo
 -----END PGP SIGNATURE-----
diff --git a/media-libs/fmod/fmod-4.38.00.ebuild b/media-libs/fmod/fmod-4.38.00.ebuild
index 9e4597bcac99..0ee8f8464e79 100644
--- a/media-libs/fmod/fmod-4.38.00.ebuild
+++ b/media-libs/fmod/fmod-4.38.00.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/media-libs/fmod/fmod-4.38.00.ebuild,v 1.3 2011/11/02 14:58:38 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fmod/fmod-4.38.00.ebuild,v 1.4 2011/11/20 04:49:36 ssuominen Exp $
 
 inherit versionator
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.fmod.org"
 SRC_URI="x86? ( http://www.fmod.org/index.php/release/version/${MY_P}.tar.gz )
 	amd64? ( http://www.fmod.org/index.php/release/version/${MY_P}64.tar.gz )"
 
-LICENSE="fmod"
+LICENSE="BSD BSD-2 fmod"
 SLOT="1"
 KEYWORDS="amd64 x86"
 IUSE="examples"
diff --git a/media-libs/fmod/fmod-4.38.02.ebuild b/media-libs/fmod/fmod-4.38.02.ebuild
index d064c5c1c840..9b46178b660a 100644
--- a/media-libs/fmod/fmod-4.38.02.ebuild
+++ b/media-libs/fmod/fmod-4.38.02.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/media-libs/fmod/fmod-4.38.02.ebuild,v 1.1 2011/11/20 04:32:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fmod/fmod-4.38.02.ebuild,v 1.2 2011/11/20 04:49:36 ssuominen Exp $
 
 inherit versionator
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.fmod.org"
 SRC_URI="x86? ( http://www.fmod.org/index.php/release/version/${MY_P}.tar.gz )
 	amd64? ( http://www.fmod.org/index.php/release/version/${MY_P}64.tar.gz )"
 
-LICENSE="fmod"
+LICENSE="BSD BSD-2 fmod"
 SLOT="1"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"