obey right license (bug #401191#c9)

Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686

4 files changed, 18 insertions, 15 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index b266b3b80991..fe7a2c269dd0 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.176 2012/01/29 18:11:43 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.177 2012/01/30 04:34:33 ottxor Exp $
+
+  30 Jan 2012; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.6_rc1.ebuild,
+  metadata.xml:
+  obey right license (bug #401191#c9)
 
   29 Jan 2012; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.6_rc1.ebuild,
   metadata.xml:
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 0baea67b466f..7403ee1f559b 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -8,17 +8,17 @@ DIST gnuplot-4.4.4.tar.gz 3328278 RMD160 7e1d039c05c46fa38b53a3c4afbd328509da901
 DIST gnuplot-4.6.rc1.tar.gz 5018714 RMD160 96d44d5e0f7c8ac5b317b0b1851a2d0a0df4bd07 SHA1 41a4a4b83c7005d9d2b997e534d858a111791fc1 SHA256 e906f7276e76f6c8f119c7c731000ff6694a2dbf11571d531a1f2706f0ffdbd2
 EBUILD gnuplot-4.4.3-r1.ebuild 6822 RMD160 16cf62476b3ee217ddcda45c82e26977ad87c119 SHA1 405efe0aa3edf3e210324fcf36f7a67ac0389490 SHA256 46f55e88250d46f1f309a583ac982a4ee00e5128401e894a527c2b4355260f58
 EBUILD gnuplot-4.4.4-r1.ebuild 6624 RMD160 2983b7a564e4686c12d59150bfc38e717277d952 SHA1 c3d777d407d3f6cf78e114af7a259bd5b88bbebc SHA256 0d2df80565a23602efd7d75def21b5cab385a189fed7e14a99b36e8f7287f6d4
-EBUILD gnuplot-4.6_rc1.ebuild 7057 RMD160 87d260b59315f0f21cb52fb23b9386c49a42a88d SHA1 df2bc97e9fb89b76f01b51fdddb4f18010c65deb SHA256 9ea2aa47b172c643ca884d10994d1ed00f240eb35ee39ac7c11fe8b5dc075319
-MISC ChangeLog 32199 RMD160 91726fb8c4cc8c2413821f3711c6bcf861f8bf2b SHA1 0ef3eef061ded2b101c6b512142cbe15f375bd28 SHA256 fc9ce4fff118ee75769819aee971028e498b74df41ee90c986a0604fd94d5bdd
-MISC metadata.xml 943 RMD160 930896e91467c45610193d4d93a252fa0da1a9dd SHA1 27c091836d8da317a2d78105a96698cfd60435ff SHA256 a3be9844f04aaa205d01cc8518463a20ffa35141aec8179fba653dfbffa17e68
+EBUILD gnuplot-4.6_rc1.ebuild 7082 RMD160 4c25406f3373743cb7b6e247729acf0e048f595e SHA1 8a78d33e5fba31a25ef72811e1bfa567168c3ab2 SHA256 8ba45d6e94d7dc48453b21ba8f32772fd958b6a7378afa8d67ad592e7aef4e53
+MISC ChangeLog 32332 RMD160 c6054595b8af3686a170decc1a3fe85ebc4043bd SHA1 ebe0cb755fd65587edcae7b3d3d5640eaf778a24 SHA256 02dedcf51f84b1da84dc3c4139aad47e092170e093e5b9458d7fa87bf24e0c6f
+MISC metadata.xml 900 RMD160 59b4fe1d76ba85af0bae40abc30234bfb5da38c4 SHA1 2d8c395924fccaf27f153dcd307eb33183b946ff SHA256 9eb5b90c72cc99f8e7734febd3784ff96652917e643c8f2526fe2d96ed6cf64e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPJYvlAAoJEOeBhlrCAAWG7SsH/0+Qn5FNS0amcWCyenfJjKEI
-MfOP8JDmH7wR+i+G/8JnJUJZip9CWfhrwbGJj3XcFa3UenhvfeuvvxYRQJ4GSJ9/
-3FdJxl5zzZHvHSZDMcF5Pnwuj8UT316wjWsBoXYQiB97VJ9QsLEcUTHjayX3F5iR
-BFXffuO6qi6zxjObRWWOemBvjDio5DvOivm/2bOi47qN+niwGJsHm/gNERsjGj5r
-R+Y5XkDHfWFtjz2fWREJJXLAhe6E37jAiENZxWbpRXTfEHrSHFAxSUke+rLhCxZA
-HcVt7XKVSHITcmjgKVFWMaum3ogJF1NJGCPbfG0hYICZ6MC/BOjkfY8bD1YxsIg=
-=jMTi
+iQEcBAEBAgAGBQJPJh3eAAoJEOeBhlrCAAWGq9UH/j5zPHKG1eU5UJGikp8xritY
+bc3hsXLekWVKayyG3U15FIdrO/G0aGN1xXYwIlOvazpPG4y4XXsF3gXD9DITfxAl
+3BPWKtzHmgh84QlTTf/sOzwbgyJcituNkmZuQrUbRNjkmQa/TF8IKYC302IWKAT5
+//M2Ok0fXI+8hspgGxeTS6tSVn/uRZ3xutbdCYv7VJ0A64Rn+mtk1H3UuK06apRz
+EsZD1ulWVIaiw3jy7+6bL7S715Oq6BMN99aQ55S99By70sxr5xd6QMKdo7m8ik0C
+UBWzCRJ+YeDViUdWzf5kUgRzdeU6TNR6dReYOowY69lcHLAsro00tRcXQIfnjDs=
+=pRyE
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild b/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild
index ea627983342c..dbb379832304 100644
--- a/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.6_rc1.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/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.4 2012/01/29 18:11:43 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6_rc1.ebuild,v 1.5 2012/01/30 04:34:33 ottxor Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ else
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
 fi
 
-LICENSE="gnuplot GPL-2"
+LICENSE="gnuplot GPL-2 bitmap? ( free-noncomm )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bitmap cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 8e0994e1b017..603442515bc9 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -20,7 +20,6 @@
   <flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
     Needed for GIF, JPEG, and PNG image output.</flag>
   <flag name="thin-splines">Enable thin plate splines</flag>
-  <flag name="bitmap">Enable dot-matrix printers and pbm terminal
-	  (copyright may restrict commercial use)</flag>
+  <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
 </use>
 </pkgmetadata>