Fix LICENSE, see flashpix.h file, bug 450210.

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

4 files changed, 33 insertions, 19 deletions

diff --git a/media-libs/libfpx/ChangeLog b/media-libs/libfpx/ChangeLog
index 09336870981c..e42eb250aa56 100644
--- a/media-libs/libfpx/ChangeLog
+++ b/media-libs/libfpx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libfpx
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/ChangeLog,v 1.31 2012/05/09 17:34:33 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/ChangeLog,v 1.32 2013/01/19 11:22:05 ulm Exp $
+
+  19 Jan 2013; Ulrich Müller <ulm@gentoo.org> libfpx-1.2.0.9.ebuild,
+  libfpx-1.3.0-r1.ebuild:
+  Fix LICENSE, see flashpix.h file, bug 450210.
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> libfpx-1.3.0-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index ed9e1da19830..9ffc28edad5f 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1,17 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX libfpx-1.2.0.13-export-symbols.patch 343 RMD160 fb3f5b57910c5099880c1e43462ddd3a73eca608 SHA1 e11ff79557890bacfcdf654634bc242ef726a38b SHA256 e06b7ffd990e3e35132fd239ce856157a0d135bd43cc398e3c1f7fd5fb9373f2
-DIST libfpx-1.2.0.9.tar.bz2 2240442 RMD160 f0fc74cdf8e1ba950bc24e9c93aa65095a6d9a2f SHA1 8f37c8a468f5bdc3aaa27f3e95a378c9282c7f58 SHA256 a7e475f14b1110c79d49e777a7d70341f6e2335ef8a28825295a6a279eca701e
-DIST libfpx-1.3.0-1.tar.bz2 2285921 RMD160 0a1a55f571f6d28730a4957ca607091638418e39 SHA1 ee96623144c6ad51dba24dae20a27fb646590bc8 SHA256 0cc240e9458d099c0a50db9c771b3e5b109164472c08f40f31e1190716af48b6
-EBUILD libfpx-1.2.0.9.ebuild 739 RMD160 54cb6798f5ed70f078288b74e004b684bd0b5ce7 SHA1 497fe6c4d0e9b26ae42749158b5a42e3f55a9b80 SHA256 5d17837e671ab568520fda30c598eb3a7b25990a0b727273a0eae0c700ecace1
-EBUILD libfpx-1.3.0-r1.ebuild 1149 RMD160 cbcc2602221aa45e21c3a239e8f1036a1290f1ad SHA1 e518ff5d086244e8a6debd5e1ebc5cdd954e420d SHA256 cceefa3eb9bbb81370af0f51287d41d4d53705560f304c20cba5847a66d35769
-MISC ChangeLog 4017 RMD160 c4a64bbb0e4ee31f70afc6fa2de861230e45c702 SHA1 26d49be91873a1208ba6852e574973150e7c9386 SHA256 48c1bf543c7de288f3f095c29c15ce779a489b340051bf6c0ac499924bdffd66
-MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
+AUX libfpx-1.2.0.13-export-symbols.patch 343 SHA256 e06b7ffd990e3e35132fd239ce856157a0d135bd43cc398e3c1f7fd5fb9373f2 SHA512 e6bd83c8177b960491c6683676463c77cf9b6c7103d3b729614f3dd13648f1ce6350e98b7f049fcfa4ede8374618889c468c39cb4216faaf5406906cc022ac6f WHIRLPOOL 0ad92ee0a92f58095ee4c7234fe2caf82996a3fce75c69282647439015a2fc5632b940db290bd7d734297344c9165ba391a985c52f8befce9ef88a3a2a135584
+DIST libfpx-1.2.0.9.tar.bz2 2240442 SHA256 a7e475f14b1110c79d49e777a7d70341f6e2335ef8a28825295a6a279eca701e
+DIST libfpx-1.3.0-1.tar.bz2 2285921 SHA256 0cc240e9458d099c0a50db9c771b3e5b109164472c08f40f31e1190716af48b6
+EBUILD libfpx-1.2.0.9.ebuild 739 SHA256 3ab8ec98802fb6b6f4ebad4244d09687020e065c2246b8e9bc23debb6e888283 SHA512 c9c800a23b75c470d7eada62e7237285c71a577c1de06cc45ce46053dd87b1a8dbb3085799a85c01e995ef71adaa796fcb63366e92ac57835a5e48128a4f094f WHIRLPOOL b9ae7e10fc100415f81caa3f54ea05236b0b611d6bf87f2baf8cf09c6aa4069e01fd098082b4ea75568f34eb18807d4cba18022ab6b127b4291abe8765851445
+EBUILD libfpx-1.3.0-r1.ebuild 1147 SHA256 b4ed60397bf63d8fe8c36a10170218a32e42c0dafaa84971c785f2a3d0d18efd SHA512 10a788d6ffa030406aac6b343f81e1a689e191e786714bdc8bb668e5e24a677e3cc3ea3fb9d3eaccac10586d456cbd9e5a6b36057a8f08ceb3b938be99398c4c WHIRLPOOL 0dd3d997434a277568ee6c681d1c4a323d9d5bc79c737e38494fb7dd4033077f7ca768afe804e0a9dc6f7fefcf6978bd06316401c3c0d9344d36bc4910660a5e
+MISC ChangeLog 4157 SHA256 08b7db3f8f799076333bc349a51f2f951d731c1ca8496019ef19fb05a5802a47 SHA512 5bc1b8e912897fdc3b59f89c56c032dfa9693ad91cba923a86be003d382f0b350c170e626cd1ccc53f36cbdf38b081eac13de6368493286b4e1464a623a85956 WHIRLPOOL 276504ffff2f72207e416e5f1ba509a75b92b284afb829d10f5b7199d1dfa72cf434dfb9d1ea30d30ed230966a7e8281483fd73474c3c6eee12f18ed17d6fb6d
+MISC metadata.xml 163 SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564 SHA512 ff4552bc5fce771795ba67e190fc9eb90ac70aaff219130e7ff9a36cde348cd4a771d8b61e158ce9390771d29e2e0ffe17618746ff1843b2af7322e0f21cdf2c WHIRLPOOL b0db778b8dab215f2790081db3d51586e43bbc790ab06f704ef4ddd6e83e90e53685d3483feff33ed1763945fca36e934e7813bff822713869d0d7f208678fb1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+qqq8ACgkQvFcC4BYPU0rnaQCfezDRZBUl1TDKeIBbBxu789Kf
-57AAoIzimJ9RwC1H8vI0M1JCOECAb69p
-=E2p9
+iQIcBAEBCAAGBQJQ+oKQAAoJEDxpGckxwJCBUoYQAJP0gNUtpTj1ExC53PGVRHtZ
+f9w5Z6pXodo2GWCg+ArEBqz5EJddgpxEokAt6rWnD2ngmDtYP/XxDLAiGiSjIUth
+oj5/ZVCnMy4gUgENs+3pA95MNJmt4TcQfPPvo15i2heHDH/xax95a7RtO0DYyZwy
+/zOdeluU5uOorxRng4fOb4YP3jEz2KfEQPxoDI9SGDwrOwmnxZRlHa2hyWwp3xAR
+Pr1j3RTkJSk6Vcjchsy2sO6j7eu8mnTXvCEo15Me/NCiyqKVU6BV9joEn6enMZn7
+acfZ/9NG+vvc7dE6wVLpKUrecYioqroclUI8D6N6Wngc6rCS0MB0hy9+vZ2lklE2
+kt1CGkpVbRir225JaqtMMls5apudfkpwhr2wmDkjuyecWmtQs6jPomrWdtGRZgCw
+QJDN2rttlu9Jx3ElDP7HNSZQLQ4euV/5jdLaaSoGvK9kBEZdcbqCEltMsqZJ+Yho
+oh5ddgjoaTtIQXgANZNTVghl9gBzZQQGONzJUvppHowNB7HZ39ZSRwc5qL/wdllB
+fCU9rsLKm4htWR7V3FF9lSCXiEZtKv4w1thD4w9a3Jrp0M8zNO1i2kvsnBXiJI74
+usBEBFU4651rZiN4IoeQqwNQZxuSblzb1hkB6Sd+99CqHxZLdHKOR4LtIn8aYohr
+v2t4m871wVAhFQJhLYqS
+=ISzI
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libfpx/libfpx-1.2.0.9.ebuild b/media-libs/libfpx/libfpx-1.2.0.9.ebuild
index 6c574c7b632f..74f014e01ce0 100644
--- a/media-libs/libfpx/libfpx-1.2.0.9.ebuild
+++ b/media-libs/libfpx/libfpx-1.2.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/libfpx-1.2.0.9.ebuild,v 1.22 2012/04/23 17:35:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/libfpx-1.2.0.9.ebuild,v 1.23 2013/01/19 11:22:05 ulm Exp $
 
 ### uncomment the right variables depending on if we have a patchlevel or not
 #MY_P=${PN}-${PV%.*}-${PV#*.*.*.}
@@ -12,7 +12,7 @@ DESCRIPTION="A library for manipulating FlashPIX images"
 HOMEPAGE="http://www.i3a.org/"
 SRC_URI="mirror://imagemagick/delegates/${MY_P}.tar.bz2"
 
-LICENSE="as-is"
+LICENSE="Flashpix"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
diff --git a/media-libs/libfpx/libfpx-1.3.0-r1.ebuild b/media-libs/libfpx/libfpx-1.3.0-r1.ebuild
index f7adb9726646..a2f87b0bd28e 100644
--- a/media-libs/libfpx/libfpx-1.3.0-r1.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/libfpx-1.3.0-r1.ebuild,v 1.10 2012/05/09 17:34:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/libfpx-1.3.0-r1.ebuild,v 1.11 2013/01/19 11:22:05 ulm Exp $
 
 EAPI=2
 inherit eutils flag-o-matic libtool
@@ -9,7 +9,7 @@ DESCRIPTION="A library for manipulating FlashPIX images"
 HOMEPAGE="http://www.i3a.org/"
 SRC_URI="mirror://imagemagick/delegates/${P}-1.tar.bz2"
 
-LICENSE="as-is"
+LICENSE="Flashpix"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""