Specify LICENSE more precisely, bug 446688.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

5 files changed, 29 insertions, 25 deletions

diff --git a/x11-libs/xvba-video/ChangeLog b/x11-libs/xvba-video/ChangeLog
index 455c947dacc9..2546c5dec5f2 100644
--- a/x11-libs/xvba-video/ChangeLog
+++ b/x11-libs/xvba-video/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xvba-video
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.10 2012/11/23 14:02:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.11 2012/12/26 11:33:31 ulm Exp $
+
+  26 Dec 2012; Ulrich Müller <ulm@gentoo.org> xvba-video-0.8.0.ebuild,
+  xvba-video-0.8.0-r1.ebuild, xvba-video-9999.ebuild:
+  Specify LICENSE more precisely, bug 446688.
 
   23 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> xvba-video-0.8.0-r1.ebuild,
   xvba-video-9999.ebuild:
diff --git a/x11-libs/xvba-video/Manifest b/x11-libs/xvba-video/Manifest
index e8551ad24e71..278b87c70781 100644
--- a/x11-libs/xvba-video/Manifest
+++ b/x11-libs/xvba-video/Manifest
@@ -4,25 +4,25 @@ Hash: SHA256
 DIST xvba-driver-0.8.0.tar.bz2 80424 SHA256 bd56e64c619732956fe3e900520a704de90c1849f0b0e0ab6b8db5ff695d38a2 SHA512 1e968f6123c5563f5dfc1f01cd2b7ed9b3f6afa9cf93b50b2079b1408670f6048f8d6b6d47c1ebbad1defc3600788ddf85a93bee772d90e05a8769ff19e2425b WHIRLPOOL df19706f84c17c6141e9a3cacec230012767b8fb06117477b95ed4b511b52321e9092455d927ff4147b1a951aea234d35575758fd69ba577ade131fb27d79da1
 DIST xvba-video-0.8.0.i686.tar.gz 58245 SHA256 947b186722a2ac22888c7e0d3f6df20335bb2f40fe1383c35b9b17e93287a5ea
 DIST xvba-video-0.8.0.x86_64.tar.gz 64524 SHA256 ffc64d1614d2868495b2181cfda85ada905b2812b84c0d245c864edbbd9339af
-EBUILD xvba-video-0.8.0-r1.ebuild 1232 SHA256 6f394215d78d059d84f31b21521576526b9a40e1299f3be370fea9d6f551bf16 SHA512 b6a9a183a58dcbd9b754ec76322cafd4c2303f8b425dc6082644fe23fa39bf67df19d9096fa89dcf270e2f3651ee251ec24e4a58ea558f792c06eb4669265b8c WHIRLPOOL 49f410e1c491b383ba91c47fac8ffffad085d98e038624958ad47d99269ec212cb483ef59f333248b3b55f1eed11fc2d8e2a7ac77f170e8f6dd571e6a63dafc5
-EBUILD xvba-video-0.8.0.ebuild 1087 SHA256 1403542b60ad0f86be6a90037e8318733fdb87e97f3e560bc97c72bfe9ce1df7 SHA512 b78ece3afdfb93cbf9d55fd30caf8b40fbc6400306dbae4ac6a4bc7a6cd89bd00d564b53e727b3ba593cf2c64f75502482632ee200ce42c9d98acd10de335553 WHIRLPOOL 036334cf24bf986b20fd4ec22d32a3763363b6f0a5c9a2783db4821154c2a123b3728f8cda648001db929bb622b54b1f05eaadaadbd01ebcf8bed3e0af986ea5
-EBUILD xvba-video-9999.ebuild 1112 SHA256 04d20780932b95ca570c348eeeaf9e3b64c557e1a76d3046a00c2d7ab97f8e97 SHA512 3b93fe9863c4b87881ac52b0e3b6e56d04e0aacc4117c83b2b1a56c0bdc4a699a4fb0fa984f2a213d97eddd642c672cdcb572534651ae760208b0ccf947ca5e4 WHIRLPOOL dde49823e79a4a5c8cac3f5503270b7f8201770975ab6bf701f61ef751b5ba4fabb1189a94bdac89a530c6a5b89d5f487b55f1e678312db3cb37f54e8ab4bf5a
-MISC ChangeLog 1721 SHA256 cff08889bb08240c199936c2181bf5b718141978c1f87998452325fc2e143269 SHA512 db1b3d7b869a1b5dfdddace83c43cf161d3c4c603061c7914ddb588dcd2e23b016e23df8fb8b0a939329439ce8772d99c838f6ef05a257ce765fb47cc478104b WHIRLPOOL d9f0ca4ee2fa6d95fcf32a399440ab5a645b10b900b4b175cd0bc706f490ecb1d23770b7a0bbc0be71209fb8a5d557ce0685a2923ed61e76a043d96e7f587e1a
+EBUILD xvba-video-0.8.0-r1.ebuild 1231 SHA256 160b8cc8914c33742afd0a9f7aa1c97161840345913f1fb44fbe88b65c29fcf7 SHA512 6e4a24eafc4786349d80ac77b38e12f229b8c42302afca172ccdee2bb7c5070b01837fa9903dac7eb6d58a9e2fe57e1c6a6728afd1e3aba75f0d6fc58f1dd6b7 WHIRLPOOL 64abeaaeb4c6c993b0a025582b805065839a92e7352b4b433c5c3e9567062aca09eed9eb60277f25c59e877c4147aea18016ce81b1bc007850be729fa0827811
+EBUILD xvba-video-0.8.0.ebuild 1089 SHA256 894068748e62865451aefb4f9de3e0a7bee433f1a02a721c30b196691b959cae SHA512 212dcca10ab30bb96ac1be45e29e87e9ca1e1684bc1f7ea292b74cb7933e945d2cd19c12f7a1d96f730277b98e754cdea1cc45efc92062c31d349222411cdf6d WHIRLPOOL 7526ec5e89668e76e9cd6247f291d8dca453d3663842ceb1b2be623eac91770c2d05aee1fb76d497f7c3ddf6a45d8e64f9bb306b8398384bbaaeeca107d28880
+EBUILD xvba-video-9999.ebuild 1111 SHA256 f85f277c8bb3263b21e423e038aac7a2b578eb1c6ff90828ed0aefca72685903 SHA512 7940b9cea6431864d28d40ce61d7ffe8211718e0b4ad29da0dcaf562decc626f95e686a77d20bc0f26ee71f4a2335b0ce5384e1b447d077341bd451c379265c5 WHIRLPOOL 18421783bb3724c7d2e140b36f47906c62861fe631bb870f72017c6147471df2ba8d965aede9757f13731a9d9003a6046add763b28fbd3d8c0b0e12402b56c0d
+MISC ChangeLog 1888 SHA256 d991e6ff93246e543df26cd493aabcc7272324c167b51dbd1a863c794287ce88 SHA512 038a52b6811fa8b1aa9c3de388b5629659aae8e1b0aae1ec39177bd56deedcd202ea04cb9229654320daf93abcd7783ea887bfbefa5e0f8e913eb818d6ba2042 WHIRLPOOL 31813f47d4e65c84313e193aed9555206593e539b33fdf4cc2949ab5427f6c7a6e025709331d26407f819910586881e4b5ee5705e7647a50f528acd48864d677
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQr4IIAAoJEOSiRoyO7jvoHAYQAJGGN358K0WsKiKLYCsNj78Z
-S8uFdNRJyJ2oTfXwRObmlb67cjfAatfq+g1K+uk4vGmeFVmZaHBs0wmT3J5BgMhE
-jD+ketwHIdCoNBRGWnHKGk0JEPdJoK4YBYUfYe9NWSoNDWN7/nRyXg8v0bCeChGQ
-MNQXfdGxdt1dovQgLHJL3km9dgoDCWeeTD1H/gaq8A1+kGshlteSaToHg3VF3ZK9
-EMwMg9OlqtZFQKsQqb2A8AIshOeEAyEyKJMIAUOXd6mUDBMmMM9F9AvrP52G9djR
-ANJxzNtbeakdjbGnpWIaD+6fG82vh+CUy+rLXKfbp81PyEzJoOnVGwY7D7z1rXC4
-p10KtL2/6udQzKL52EnLj568DkuT0es32amucSP7zGjgTwFJxlWMJ6u5SvNJF+iE
-FZab3qmO64hQrDgeS6JBU2SIFlIPnSb8AoRc30fz3dfMw2AZS8lKlgmYKpZp7EUP
-MnrG9jIaldemefHK3WjL1ScT5MjB6uBVce7kj8nkBrYVe5MggUFV6Be/g3KzjzbH
-4bvkYM7xtmJiXecXn7VYSrrWolhA9v7nA8nWp3v8Si9Oh7uciyyJ+8gHrXygzYKZ
-Y3fmAblWaTUMid2Mhsff+myxBEXOoq7cS89v/UGeHw1ARB8oUrmLHIBVUmbWVtsk
-469UdrKZ/hgHxxB8z2L3
-=dQzY
+iQIcBAEBCAAGBQJQ2uETAAoJEDxpGckxwJCBKTkP/iakBp1XpsjSIZ9xG/U9dkuE
+8HaFiN2Pi9qjslehFEtwtfb3l/UWslL+DuCyHf76vSFzkVPptV87S6GUIuH+xC/h
+XTsMrbAXUES+wW5GMy8Jv9JoP00zYRpB6KHNULUO3wyJSZ4IjegXrIokUZId4OUs
+LQg9qnP1jN5KCerw1+y5Z/oE3/w0Xo2PNnbZl2F+EDPew1vzijmAqz2R1LeQHz0I
+PfoWfEfksqZHzzcNyi9+LM9Kujqisi6GWkn6Ebj5AAWCOt0K6NeXmIr7OFN2c4Aa
+Kemo+KGtxdayHyhD3y9m9N4Q5ip2x5im+eQ3p8JiXWl6hzMcO1x9VNlU7OPCOraR
+YCExHkKEzXRSW2dWlBiHLigsqImRPzPPPMz8aPWsHts6MkDH4n+tDCrZtNKv3syV
+/ngdXJGff8E4mVC4J9lXdjZmvn04vv6xZ58y+ljYX5mWmakqPb8cjji+wntKVNjx
+TEjZrq4zDwp0gQR4Ux8EnWqFvWtMIpC/FqPIbck+PazxOKshreN5Nq62nY5Oja0i
+zxGIMx2gksHDwvBgrfK9l7qESvwNISECHwf8SdTI6NU6CQlLKJm5Abfr5XOMpa6H
+pSSVYgUGC7pFv6AT9ssDaAP8vUH/YCW02DoeaBtoKT4fSNcLYk5I+tmDvcwVDAzi
+WH1tMGlA86CkozMhPL6x
+=yFY5
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild b/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild
index f6ad303ba87f..4ba0c80e3af5 100644
--- a/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild
+++ b/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild,v 1.2 2012/11/23 14:02:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0-r1.ebuild,v 1.3 2012/12/26 11:33:31 ulm Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/xvba-driver-${PV}.tar.bz2"
 # No source release yet, the src_uri is theoretical at best right now
 #[[ ${PV} = 9999 ]] || SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ MIT"
 SLOT="0"
 # newline is needed for broken ekeyword
 [[ ${PV} = 9999 ]] || \
diff --git a/x11-libs/xvba-video/xvba-video-0.8.0.ebuild b/x11-libs/xvba-video/xvba-video-0.8.0.ebuild
index 189b3ec2e5da..30bae6a5b6ac 100644
--- a/x11-libs/xvba-video/xvba-video-0.8.0.ebuild
+++ b/x11-libs/xvba-video/xvba-video-0.8.0.ebuild
@@ -1,6 +1,6 @@
-# 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/x11-libs/xvba-video/xvba-video-0.8.0.ebuild,v 1.3 2011/12/27 21:11:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0.ebuild,v 1.4 2012/12/26 11:33:31 ulm Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="
 	x86? ( http://www.splitted-desktop.com/~gbeauchesne/${PN}/${x86name}.tar.gz )
 "
 
-LICENSE="as-is"
+LICENSE="GPL-2+ MIT"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE=""
diff --git a/x11-libs/xvba-video/xvba-video-9999.ebuild b/x11-libs/xvba-video/xvba-video-9999.ebuild
index 199d0965d7f1..5ca0b7bb68a7 100644
--- a/x11-libs/xvba-video/xvba-video-9999.ebuild
+++ b/x11-libs/xvba-video/xvba-video-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-9999.ebuild,v 1.2 2012/11/23 14:02:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-9999.ebuild,v 1.3 2012/12/26 11:33:31 ulm Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
 # No source release yet, the src_uri is theoretical at best right now
 [[ ${PV} = 9999 ]] || SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ MIT"
 SLOT="0"
 # newline is needed for broken ekeyword
 [[ ${PV} = 9999 ]] || \