Fix LICENSE, bug 452914.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 27 insertions, 15 deletions

diff --git a/sci-visualization/xgraph/ChangeLog b/sci-visualization/xgraph/ChangeLog
index b88ca47cf28b..60faa6c50126 100644
--- a/sci-visualization/xgraph/ChangeLog
+++ b/sci-visualization/xgraph/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/xgraph
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/ChangeLog,v 1.16 2012/08/07 04:46:51 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/ChangeLog,v 1.17 2014/02/12 20:11:29 ulm Exp $
+
+  12 Feb 2014; Ulrich Müller <ulm@gentoo.org> xgraph-12.1-r2.ebuild,
+  xgraph-12.1-r3.ebuild:
+  Fix LICENSE, bug 452914. Unfortunately, some of xgraph's code seems to be
+  non-free.
 
 *xgraph-12.1-r3 (07 Aug 2012)
 
diff --git a/sci-visualization/xgraph/Manifest b/sci-visualization/xgraph/Manifest
index 066ed44a5dd2..4fa4b8599568 100644
--- a/sci-visualization/xgraph/Manifest
+++ b/sci-visualization/xgraph/Manifest
@@ -6,14 +6,21 @@ AUX xgraph-makefile-gentoo.patch 514 SHA256 9860b8650414d6dcd82b49f465abb0501741
 DIST xgraph-12.1.tar.gz 145278 SHA256 0aa17d3fa3abfa8b6679fc26812a988332a2a0f1f48973d17429089015672b08 SHA512 67c1faea0f423717cf97c4613e7c288ad17e952f7f0c7cc555d3d3cffaaef890b3b8d77f9421ab5842f8c65dea3393820e296b38d7a3eae2a0b80eb0b8fc948c WHIRLPOOL 16f5abba42e42196bed2994b2d83fb5a5266c4d0fdfa0b8bdd52f175f9046c09167544e93f45945cb1cf045319e725f9154c0ffdb9d8ac06eb4e8839a5c7cc3c
 DIST xgraph_12.1-10.diff.gz 48172 SHA256 5f0ee8dededaafb054b3d87431acc9b1b6486b8375775aac889d993e35f4e8d5 SHA512 060973645e5371a8f768650f31ad4560060ce171a9ee12308c5776a5e550784bb30cd3a55017c7a3856f27701376bb3f30af2c0b96d4902c89e68fd6c0114f78 WHIRLPOOL 0ea2a260005126d7c6f1fb9d3d335ec2cf6d7467b71441763d9a911055adc46d2805c1e9d32327c1762c2ad8fb6a290b5f579460ea0aa064ecba5e98f0337f83
 DIST xgraph_12.1-16.debian.tar.gz 23154 SHA256 a10daac6dca06938c4d96b8b82c8070b2763f6e0761030e0dfd2bb3fb338212a SHA512 6942d85d453a63191b11f6f52bee592c765023068d022e62b94b6fc6b0ed46ce57c9cc00bfcb53cd5f943997cef23724513c1433cdfbf11c7debac5760de1d26 WHIRLPOOL c6584cc98b0cf9e5cee85a4f1287dbb836aa7a0165d6c0c1d4066e0aefb4ce700d31e57d54cf8c051a5e1eb5e6c6410d1979b140628ea5ad90dbe1b2bc8fb336
-EBUILD xgraph-12.1-r2.ebuild 1292 SHA256 4f88f0557d751765c080d0b71f0f86b3d9a2502d74732931225d808ba7b6d9ba SHA512 14ec4ae2d511b1c59f50fe6be062d195962cfffca3dc930c192aac42c46911c299252d68c133a006c4e3ca1d05c427ad932b5a6a1a0dd025bca808679baab056 WHIRLPOOL e8ed31b2e13017a1bbf1894358159cff48bb835e35f3a662156cb419d167ddf2ab5c883656efd014aa5adb26fcdfbef5c730cf1f6b9cb49e13724b52741ea1fe
-EBUILD xgraph-12.1-r3.ebuild 1072 SHA256 9c6fff50d5570227d816fcf1892305a2454e888e75fc02b3a018f22b91721adc SHA512 2d27da9de0490892a54d73042c245fad40ac42aed6f544b8468394b1ed6c78d8c4d598e233550e2d554e3e1356f9eec9c3e1ebd6130a23174640551d1e332731 WHIRLPOOL 3ff1eac04bd92e93c89b8049482e6e84035e17a0369a444e0273d2bd18ab501406764cad1cd49f4a8c67d2e9a8ca610a653cb3e8f936f6e913bd8de371d18557
-MISC ChangeLog 2817 SHA256 3e68d26f2b95a867371cf0a03ef7dd05a2b715076b7f49e1fd66ca2a23a59a23 SHA512 0641fa01fa3936308f69739cb7fcf85dd877aa8348275081725443c87b0c53c45c279bd2615f8bbcf653fd82b55f719caad39d5780cb66f4cd4ec7e7da6e8d77 WHIRLPOOL 4ec557b32cf4f96ad8a7a3de1defb39f58e4620f5aabf73ba1d49c5dca6c9e07fcc15224028474142027782a25710544e4ed43d3cb8b0d09aac453b2e8ebc519
+EBUILD xgraph-12.1-r2.ebuild 1292 SHA256 b384dead2df0a4cc7702667d3816e15d3f50f43b24f379842eed4faa8f6e2d26 SHA512 d7c43a6d52c9b5b51939cd868b15c38ac242bb8ea3c5be6d908d28457e6227693bddcae661a5ef6dbb9c94be6f51d4b2d4f89e615f22623ee6af3e23847ce58e WHIRLPOOL 6041ba09d8c1d827314bd7593bd1f929a71602ec54a0a92dffb93ee1c4b7ea4bd411f660aff13cad7f455f3447fe9444310b41baee137f41efd666a70aade2aa
+EBUILD xgraph-12.1-r3.ebuild 1068 SHA256 2f6b0e725af2e1e4a298d47e5d31023500efa9138e424f2001fe89e5e8d4cb65 SHA512 a35a3eda3c8ebe32cedc41ab8f28f989ab884790406b558a9a5df6bde52b889e981e57b1fc4b19fd0cf9a6c7b22931012e03e04d4a2086ac2447e09f91aea13e WHIRLPOOL 0f24177a2daa978d4a80ec62c499811190186ef24475ed0e8eae1d97c8cba5a3b20c015de669a139a6a97256677b1a0fdd3b449ea445e32ab6460de8b251ac1f
+MISC ChangeLog 2996 SHA256 a9939c1b1edb726643cf44c0a750698a74b65bec664ddffe1bfb8ce118af13c0 SHA512 cc35c2ab847216b7fe073ec09882429fd1b17839a50b4f842a993e3145d19a9099ccb5a87a6136e44869a6ea0c21057a092b85768da1f3b6579327a8f19f1636 WHIRLPOOL 242928c2958d617982b8f18c0d6010097ccf2eb9ac85954de216cca7905c87ca503200f9c7b4ea23ecad3e34d49b55fc0192599abbedc9dcd92219c5c66a85a3
 MISC metadata.xml 672 SHA256 80ef43932386e837edb5e5fbc41a0fe5293f7f4ca100802d92d3f2836f693e93 SHA512 8ed1849e8ec06f851dbfa7e33034032112f684ab1fcc3463cb7c1d9bf7ce9d03a7d52508534af64857e624b0e6377ed4af4ba7b8a9711fb9cea6cb7d5858bc5f WHIRLPOOL e69fce7d81ad42dad656dae2e80a64ec3f2bb01c8204fb8c129f6d9787aa82ffc7ee9f809a80bada28cef378ff64f11491efb3f50cb099979f9a7dfb4976572a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlAgncQACgkQ1ycZbhPLE2Dv2ACfR82bcZoVlTNyj0NEUEGsj5yT
-eggAnjZJAajbHrrW9KC9c1cPqbL3DUL4
-=Ufh2
+iQGcBAEBCAAGBQJS+9a6AAoJEJQzkH1pP7W4SvML/jDHyy+g/IHBF1vKmdXqrKer
+l8tiIlcFTjRXWuP7SGh2WPBr5+0u6XKTvG9LsbUuP6YykRZb6qIOemyg4zT0GA9Z
+v6RC3QkN5Ed3iCX3/Me5lftrodaF3xehRI3auB5d77iCIoqH4+miTZscDxJ76MoI
+Ax9OProSXgCixajjydx3/h5rFvWVR5T9KzzXcEqvS3EkM6SHHAvGtJrH1hUKv7Wy
+6xD5Ic99HmLmoXSL8AqO4U5V6W7zllw9mdMpeXYqH/tcVWHf5rJ/fgaH/1Rr3xFw
+KWMqDFqe+NxxClHGm/+2KgwuueZPtbmdbKCYIf18451KPeRIo9Ruugmc+p7C1NA9
+0e5iD/2ZAHUc44S7v3FPO4V/smeUAlaR5RgJjq1YHPufWrOnSEABTKKn4I1jfG2K
+j0v4mJ5q1/mMnW4FMgBphUERfkvVcrCwsNXfJqJPTyla7yLbE0K70s2LqIhvzqN0
+qNKvtP9hPNV1Vlh/Zm6cu1BDqWAolQ1kAeTJw5svxg==
+=fwFJ
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/xgraph/xgraph-12.1-r2.ebuild b/sci-visualization/xgraph/xgraph-12.1-r2.ebuild
index 35e828fe09e5..2437d49fdcb6 100644
--- a/sci-visualization/xgraph/xgraph-12.1-r2.ebuild
+++ b/sci-visualization/xgraph/xgraph-12.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/xgraph-12.1-r2.ebuild,v 1.7 2010/06/28 21:34:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/xgraph-12.1-r2.ebuild,v 1.8 2014/02/12 20:11:29 ulm Exp $
 
 EAPI=3
 inherit eutils autotools
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.isi.edu/nsnam/xgraph/"
 SRC_URI="http://www.isi.edu/nsnam/dist/${P}.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.diff.gz"
 
-LICENSE="as-is"
+LICENSE="xgraph"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples"
diff --git a/sci-visualization/xgraph/xgraph-12.1-r3.ebuild b/sci-visualization/xgraph/xgraph-12.1-r3.ebuild
index 4b6b16b625e1..1595a459b640 100644
--- a/sci-visualization/xgraph/xgraph-12.1-r3.ebuild
+++ b/sci-visualization/xgraph/xgraph-12.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/xgraph-12.1-r3.ebuild,v 1.1 2012/08/07 04:46:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/xgraph-12.1-r3.ebuild,v 1.2 2014/02/12 20:11:29 ulm Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.isi.edu/nsnam/xgraph/"
 SRC_URI="http://www.isi.edu/nsnam/dist/${P}.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.gz"
 
-LICENSE="as-is"
+LICENSE="xgraph"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples"