fix dcraw license

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

5 files changed, 37 insertions, 12 deletions

diff --git a/media-gfx/dcraw/ChangeLog b/media-gfx/dcraw/ChangeLog
index c617af517384..9bc04e6e7e79 100644
--- a/media-gfx/dcraw/ChangeLog
+++ b/media-gfx/dcraw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/dcraw
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.74 2011/04/02 14:43:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/ChangeLog,v 1.75 2011/04/25 22:09:10 hanno Exp $
+
+  25 Apr 2011; Hanno Boeck <hanno@gentoo.org> dcraw-8.98-r1.ebuild,
+  dcraw-9.04.ebuild, dcraw-9.05.ebuild:
+  Change license to GPL-2, parts of the package are under more liberal
+  licensing terms, but it definitely allows everything to be relicensed as GPL.
 
   02 Apr 2011; Raúl Porcel <armin76@gentoo.org> dcraw-9.05.ebuild:
   arm/ia64/sparc/x86 stable wrt #358679
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 1a1915489812..e4dcc1a8fb43 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX conversion-examples.txt 545 RMD160 f03310a2adee83df1b883f64c122d2d72c493d6f SHA1 159c57f2feba36029c97baa182670ffb0c05c0ce SHA256 b6a5a658c550ffbd26bbc1b6e7723bced7461af234062af7d77e53441429d218
 AUX dcwrap 437 RMD160 c72cc183f18df5878c84a988d0746089baae0f10 SHA1 fe7f75f15f7e0dd2cdde5f96d2a0185213974066 SHA256 fd113fe5c1005116f8e03db59fb1f505667883f237abe0c799cd5a45d6ceb0bd
 AUX update-dcparse-and-rawphoto-tarballs.sh 523 RMD160 0e98f9dbe916f16185299b38f8a58c33eca0ba30 SHA1 45942b643d78d5036edec6d4f09a22a5533fa9e5 SHA256 d5a12f5ff9248649af03f224d768cc55499c4f717024fe723893cd9189918a15
@@ -7,8 +10,25 @@ DIST dcraw-9.05.tar.gz 161390 RMD160 5301db44b1d5905d8cf1dd3bb4d76877b626ee17 SH
 DIST parse-1.69.tar.bz2 7931 RMD160 29200a907a60f05c3de6dcc870eb99b022bb4deb SHA1 ed693e040ff62e434381d4334ff04160540024bd SHA256 a0560aca1d5c58b6e21ab187af299fbb90ca3d56db34f33705d8d69b3de17aed
 DIST parse-1.71.tar.bz2 8129 RMD160 bc7732b2b52cdda69b9a39d7e30cc02aff371a6b SHA1 96e74cb9e366ae17897852e231e1c764fd36d96f SHA256 58d91d4ce8533b84e6933d9cfa505b7a1b3c228e34b7e3aeae438948a42a454a
 DIST rawphoto-1.32.tar.bz2 3841 RMD160 11c6c0fd621170ec5657c8803300ade7c3c21f99 SHA1 6952d39556c3b83e1c790c6ccd34f8233cf2dd53 SHA256 3348a83a44fa941924a4e743f88d993b71d28ba995f80e6765d6c19b6eeaea4c
-EBUILD dcraw-8.98-r1.ebuild 3321 RMD160 d397a96f707095e99eb03ead7eec4dc81ee2371b SHA1 4e7dbf99c00f34d66030ee760861aa7f725b1632 SHA256 386f19556cab623043c9100b99d545e445ba0ca20119fcc09bf503cbd80e2c7b
-EBUILD dcraw-9.04.ebuild 3319 RMD160 7863180cff56831e732820d07d5a12560ae40b3a SHA1 8fc99b164b90ce94a55b58cfe77aa69fd1d53463 SHA256 6547ef850964eb81812a5dc886a1b9fb9caeff503184e0a30011afb71a9b7b66
-EBUILD dcraw-9.05.ebuild 3321 RMD160 59e4dbe13b85c363ced9ad8eb01062af0777e7e3 SHA1 22848b94262b60b22606b6472eb60de9b50bd935 SHA256 757e830b63c9560b74f945225c6080494853f75e2345ae9030f2927ff6d92374
-MISC ChangeLog 8924 RMD160 19acbdd6307f86713a4875f875c16280db892a82 SHA1 0ff0a3fb1213dd6f8ae94baab91b559f9de80096 SHA256 e39ac4f1541216ebbf3743c15d4cfa09a59d264f7c981035e4287205b9c81f80
+EBUILD dcraw-8.98-r1.ebuild 3314 RMD160 e197477ca9331c8d6435c965d265532734a330c0 SHA1 ff9bc3e515be207d90bc705cbba2e3a25b12c4bc SHA256 8949dfeda2edce45c0f0994e38aacb4f6982695f0cac2e75272f57b6d0f6c4b5
+EBUILD dcraw-9.04.ebuild 3312 RMD160 9fac6ead8e0aa36002d509eef325d48f10cea453 SHA1 1e4bf31262869eff487c1a02e9881fef31b5ee02 SHA256 c941f8dcdb36bfa7ebf6e56a43bfc80123f604e35de3d52e219cb747dc4cc612
+EBUILD dcraw-9.05.ebuild 3310 RMD160 1eb5a3cf9e023c7f0df9bc9d32ba44a10b279fef SHA1 21c5721161593a2c12d510cbbf5f0f828ad551b3 SHA256 881b9c3258c916e966dd2557dd33dcea4b67f87531f1204c4796f09f3fd0eb96
+MISC ChangeLog 9182 RMD160 33a2cc1e9bba782f0412430c92b56cfec3af25ed SHA1 63a160a664ffcaf2d6ab2a5704e544f6dc7a8349 SHA256 5b69fd1ac5d52f4536a817d651c94819d697a4e01e3d55c84ac884875bdf3286
 MISC metadata.xml 813 RMD160 d279f21ee59ab9ffcbf673791c0f2eb1518faffe SHA1 928512e9bcbc80147a1c7cf7d16be98545edf61e SHA256 f51aa74b7cff8440095882fb475ed8e18c83222af0aa02b6048ebcc572e8a702
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNtfELAAoJEKWIAHK7tR5CxTwP/3Y0hHhJyYc0Pyj/ygnjrkaR
+Os4w/JhR8Lj2YAmwrACHJiGbfqm0NrBaMxohcohTvqnTzbRTkCPuMgGbxcZhPfU9
+jxcJ6qp7a+OJ2iauZOt4jag5D7ujq4rGAJ/WAzYL+p29qRerE3GyY/xEWK06M8Ku
+bjIybmeSjN7jDtYjiRdXFWkPJ/2PkEyxrx7VqIbMA/aqupw6caUhnHJ6PxoQFGJ9
+pLuZ3EIJkun9VioHBGLZ8P27RWY4aS3Qy6T3xLNDujui8yixavcUlcXSTi578UCl
+DP/OfAKPzYMgOdRML5zeCMFbsjSvyOAR1dXsYi/gAfiBqbTueAlkNcJetOuidOkN
+OzDDVGqlWoNuciH/0KnVPNl7n0d/jl7v4hUg8NoGq3Hz0eiCvCeBKQdb4u5uZwts
+hFigCS2SN3EoB5QI2POI0WkPE2VvhBADKnF1OkdkV/Shgb9/1FLr4JnII9/VuwR1
++YnLF/3OiT1rfJ3f8e3SDi+0uVSqqzvJ6aCGyhZg8AXG6ksuuP07EI4hb3J9AshV
+vVqSAPw+8oiBk6cZG+ZRru2cYAWsdTDgfJFeNWZYQg4L5QjSvfNvmfmDFDkBv5EC
+oWWK7H5tTEVZo0YB6Ib4ylcWMr5wfY8Wbdx4NZSr20ScEMRopj2kGX0R0PZSEtOx
+HqKmZcOsbSiBovxi5+zb
+=94Bt
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/dcraw/dcraw-8.98-r1.ebuild b/media-gfx/dcraw/dcraw-8.98-r1.ebuild
index 32e3011a64c2..4cec779e02ec 100644
--- a/media-gfx/dcraw/dcraw-8.98-r1.ebuild
+++ b/media-gfx/dcraw/dcraw-8.98-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-8.98-r1.ebuild,v 1.7 2010/12/20 18:06:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-8.98-r1.ebuild,v 1.8 2011/04/25 22:09:10 hanno Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 	mirror://gentoo/parse-1.69.tar.bz2
 	gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )"
 
-LICENSE="freedist GPL-2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="nls gimp jpeg lcms"
diff --git a/media-gfx/dcraw/dcraw-9.04.ebuild b/media-gfx/dcraw/dcraw-9.04.ebuild
index 707b1737778e..06dc0a71eda0 100644
--- a/media-gfx/dcraw/dcraw-9.04.ebuild
+++ b/media-gfx/dcraw/dcraw-9.04.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/media-gfx/dcraw/dcraw-9.04.ebuild,v 1.8 2011/01/25 17:10:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-9.04.ebuild,v 1.9 2011/04/25 22:09:10 hanno Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 	mirror://gentoo/parse-1.71.tar.bz2
 	gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )"
 
-LICENSE="freedist GPL-2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls gimp jpeg lcms"
diff --git a/media-gfx/dcraw/dcraw-9.05.ebuild b/media-gfx/dcraw/dcraw-9.05.ebuild
index 37b6f6e58eb9..6433b0c8f747 100644
--- a/media-gfx/dcraw/dcraw-9.05.ebuild
+++ b/media-gfx/dcraw/dcraw-9.05.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/media-gfx/dcraw/dcraw-9.05.ebuild,v 1.7 2011/04/02 14:43:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dcraw/dcraw-9.05.ebuild,v 1.8 2011/04/25 22:09:10 hanno Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.cybercom.net/~dcoffin/dcraw/archive/${P}.tar.gz
 	mirror://gentoo/parse-1.71.tar.bz2
 	gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )"
 
-LICENSE="freedist GPL-2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls gimp jpeg lcms"