Fix LICENSE. Patch by Arfrever

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

4 files changed, 34 insertions, 12 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 12d17500f949..6acc5666dfe2 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.110 2011/11/25 05:47:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.111 2011/12/03 18:06:01 hwoarang Exp $
+
+  03 Dec 2011; Markos Chandras <hwoarang@gentoo.org> matplotlib-1.0.1-r1.ebuild,
+  matplotlib-1.1.0.ebuild:
+  Fix LICENSE. Patch by Arfrever
 
 *matplotlib-1.1.0 (25 Nov 2011)
 
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index a48b95edead1..759d695368da 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX matplotlib-1.0.1-libpng15.patch 2393 RMD160 ab0fdb3ebfa3d112496f0246d084dc996ecfc019 SHA1 4aa6374bef7193163a9ed641fd513607566a8060 SHA256 fd6721b37b6de66b5d11804137a7040ad9bc4edcadfd1397b9afbe570e7c58c7
 AUX matplotlib-1.0.1-linux3.patch 985 RMD160 679247326b0bc98d61462a42658d4ae9620daeb5 SHA1 e53f58b4f4ebbe618e4ef28e25eb89e7a6db1286 SHA256 2487d4b599a0b52ebccdc79a30365aa4ad56a2cb5fd8d5d3f8cfb167780bb380
@@ -7,14 +7,24 @@ AUX matplotlib-1.0.1-sphinx.patch 3441 RMD160 b1a7ad1184dc0e16d65ba0d409f508309d
 DIST matplotlib-1.0.1.tar.gz 13285166 RMD160 e3e326f7f31ef995253da483444cb593b8e6753b SHA1 c7a832f28a66817626e7a8af21e14ea0e15f4008 SHA256 83bc6377373b3f34b18eac1883c27f3f381f5c9b9c422b4d85c91e217a947af6
 DIST matplotlib-1.1.0.tar.gz 35842643 RMD160 9313fc6407271c46f3ac5af4c53df5ea57982711 SHA1 435b4f04a7e099b79f66451d69ad0b5ce66030ae SHA256 be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7
 DIST matplotlib-sampledata.tar.bz2 1013421 RMD160 43a06cf7847cfe1ad744bd6444786b16843bb1f3 SHA1 b5335b05b6d3c05dcb052c81385f1304e465d2ee SHA256 0a9d45f1e5f31bee1e6efeb453775153d0553b721971830d6c1657a8d9640a3e
-EBUILD matplotlib-1.0.1-r1.ebuild 6149 RMD160 435580b39994fb27bcf73009ce6b682bc63a76ff SHA1 ff6c88d48259e3a0e8037a82f8d06d6020c009f5 SHA256 7fadc682836d1292f862a5be4df1b40931b49782f4c91163b684fed9f06b45c5
-EBUILD matplotlib-1.1.0.ebuild 6007 RMD160 0a0e4b331f1e3161511a0ef7bd90096313b0bb17 SHA1 636933331f19d221e15ff69c78b185891a37e47e SHA256 2723e5db83683efa04dfdd06c6558c8cf456dc4824fd42dab41cbc16668ea0d9
-MISC ChangeLog 20937 RMD160 eac9b22890f042ee15919b5f728cdc3f83e410ad SHA1 d0e49d1f7d65e78d6ad4983f6285c7c83e3aa0fc SHA256 4792a0a85b186f9626e78728f1e6bc9fb26c9498e61e97f4984688492c7f9ccd
+EBUILD matplotlib-1.0.1-r1.ebuild 6296 RMD160 0dbbc97e4ac8a13cb31190ef099c66d0dcc3e554 SHA1 ee2a5d6064eca99860a4df0b6b251f1a0c8e52b3 SHA256 358e64a2ea492e2e9ab1341604755f8eda572da78a1e717fd75d3031f5aa81ed
+EBUILD matplotlib-1.1.0.ebuild 6154 RMD160 cd744e3679ecdb430b62d951bddee5fd8795c76f SHA1 4af6301929dedcb98227b9432ac50b39ad2737e8 SHA256 c5443d5bab2305f101872df34b2c7a85352daa5d0896f54f290a7b98b1e5a1a0
+MISC ChangeLog 21079 RMD160 054ef42ef2417023a92ac360c45943979f6e62a7 SHA1 9ab36df4cce43ff4a5417a55084d10a759c7074f SHA256 07145cee12597e671a77db592ff42c08481034ef5aac22920371f8d71c88535d
 MISC metadata.xml 640 RMD160 5a3412572c06b5f54b7570a6d42e503b5711b8b9 SHA1 dbdefc26499cd67470a363f54fcb928f2f510fcf SHA256 6643fb3ec5019f58c1a7af76a25d791f1109c37929b3332ddbe1a2911f5de3b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7PLAgACgkQ1ycZbhPLE2Bi4ACfRAcTtU2Tr8WKf/ujI9HWbQ0J
-uh0An01WOnFoGHuij4nmW0TaofoMt2ht
-=SRRS
+iQIcBAEBCgAGBQJO2mUMAAoJEPqDWhW0r/LC+BUP/RhkQyi4I03YpHsF7he09Nrj
+RAPeBJQQTk5LxaWLJ4v+pVyM9SviGBN16/y38Hv10vn96BenBiWk2HJ0MBIOcg4Q
+j4KkbF11X19c5yWptSHhQkMeutqdttctglbsm542fY663POEKhWNC/omqmCCwycW
+jMew0+YV1zpF1iXcgyDI1E8QitQwgtrYFrfCZZciPKsW2xl3LPLwQnXCBAuEVVmH
+0kjbB3wQbScDym/mfrk81v0lpT9u+cPVO93LADdoTyZj2Ft4qqX3aY6tSgtslM+c
+rTLSfciZSYqEypENguS9aboDDaMtGgjM6/he6xKIgqWe+HUzp1jqtaDHCmqkA67X
+fXa8D4kODPNFa4JVChMZ55Src2h+h3CXqO8JmVjc9q5EKOcEa3iNNwKRWTrR6dZa
+s6Nqhf+4I6tbZh/IywVFMAWntokS2WPrcQsTeFmEcAeoGXW6YfGn+12L8796XxZh
+f6RU6V36XdcLniwlS4JyXb714buYbJ52PLvYDtn+JOqzsVbjBJvCFPFV01jIhGu6
+204tONU9NI4SFnhGJMSIY1BeiGIeiHEsRqqHr54a9WhDTJXwFVmkjm8h105a2O4a
+iyb1wue55d9Q5k1gGPTh4Yy5h5jQ4DwfT5Gs0OIUh4kS5zBG/fnrZx3EHfCP8wpa
+s5l/rKCOEe6fshvNjBv1
+=q98V
 -----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/matplotlib-1.0.1-r1.ebuild b/dev-python/matplotlib/matplotlib-1.0.1-r1.ebuild
index 617677c43498..dc026d4b07cf 100644
--- a/dev-python/matplotlib/matplotlib-1.0.1-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.0.1-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-python/matplotlib/matplotlib-1.0.1-r1.ebuild,v 1.8 2011/10/06 20:09:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.0.1-r1.ebuild,v 1.9 2011/12/03 18:06:01 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -21,7 +21,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 IUSE="cairo doc excel examples fltk gtk latex qt4 traits tk wxwidgets"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-LICENSE="PYTHON BSD"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 
 CDEPEND="dev-python/numpy
 	dev-python/python-dateutil
diff --git a/dev-python/matplotlib/matplotlib-1.1.0.ebuild b/dev-python/matplotlib/matplotlib-1.1.0.ebuild
index da16c3d881e2..c0bb501064d6 100644
--- a/dev-python/matplotlib/matplotlib-1.1.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.1.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-python/matplotlib/matplotlib-1.1.0.ebuild,v 1.1 2011/11/25 05:47:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.1.0.ebuild,v 1.2 2011/12/03 18:06:01 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -21,7 +21,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 IUSE="cairo doc excel examples fltk gtk latex qt4 traits tk wxwidgets"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-LICENSE="PYTHON BSD"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 
 CDEPEND="dev-python/numpy
 	dev-python/python-dateutil