Updating licenses.

5 files changed, 30 insertions, 9 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index d3adb0e0f55b..4a0c7e705f32 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.302 2004/03/17 08:59:57 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.303 2004/03/19 10:51:22 spyderous Exp $
+
+  19 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r4.ebuild,
+  xfree-4.3.0-r5.ebuild, xfree-4.3.0-r6.ebuild, xfree-4.3.99.902-r2.ebuild:
+  Updating licenses.
 
   17 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild:
   Changing build-time FONTDIR in attempt to fix #44854.
diff --git a/x11-base/xfree/xfree-4.2.1-r4.ebuild b/x11-base/xfree/xfree-4.2.1-r4.ebuild
index b20b7c3859a4..e869a0347741 100644
--- a/x11-base/xfree/xfree-4.2.1-r4.ebuild
+++ b/x11-base/xfree/xfree-4.2.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r4.ebuild,v 1.2 2004/02/17 22:51:27 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r4.ebuild,v 1.3 2004/03/19 10:51:22 spyderous Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -95,7 +95,11 @@ SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz
 	${X_DRIVERS}
 	truetype? ( ${MS_FONT_URLS} )"
 
-LICENSE="X11 MSttfEULA"
+# http://www.xfree86.org/4.3.0/LICENSE.html
+LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
+	bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor
+	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
+	MIT SGI-B BSD FTL | GPL-2 MSttfEULA"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
 
diff --git a/x11-base/xfree/xfree-4.3.0-r5.ebuild b/x11-base/xfree/xfree-4.3.0-r5.ebuild
index 4a35c2f634d6..8ded42a633be 100644
--- a/x11-base/xfree/xfree-4.3.0-r5.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.4 2004/03/01 04:52:45 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.5 2004/03/19 10:51:22 spyderous Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -112,7 +112,11 @@ SRC_URI="${SRC_URI}
 	mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2
 	truetype? ( !bindist? ( ${MS_FONT_URLS} ) )"
 
-LICENSE="X11 MSttfEULA"
+# http://www.xfree86.org/4.3.0/LICENSE.html
+LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
+	bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor
+	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
+	MIT SGI-B BSD FTL | GPL-2 MSttfEULA"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha mips hppa amd64 ia64"
 
diff --git a/x11-base/xfree/xfree-4.3.0-r6.ebuild b/x11-base/xfree/xfree-4.3.0-r6.ebuild
index 692ebb077112..62721bb4ad5a 100644
--- a/x11-base/xfree/xfree-4.3.0-r6.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.8 2004/03/17 08:59:57 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.9 2004/03/19 10:51:22 spyderous Exp $
 
 # TODO
 # 14 Mar. 2004 <spyderous@gentoo.org>
@@ -88,7 +88,11 @@ SRC_URI="${SRC_URI}
 	mirror://gentoo/XFree86-locale.dir.bz2
 	mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2"
 
-LICENSE="X11"
+# http://www.xfree86.org/4.3.0/LICENSE.html
+LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
+	bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor
+	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
+	MIT SGI-B BSD FTL | GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
diff --git a/x11-base/xfree/xfree-4.3.99.902-r2.ebuild b/x11-base/xfree/xfree-4.3.99.902-r2.ebuild
index a5fdb9da4056..8c250fd30587 100644
--- a/x11-base/xfree/xfree-4.3.99.902-r2.ebuild
+++ b/x11-base/xfree/xfree-4.3.99.902-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.902-r2.ebuild,v 1.5 2004/03/10 17:28:34 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.902-r2.ebuild,v 1.6 2004/03/19 10:51:22 spyderous Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -94,7 +94,12 @@ SRC_URI="${SRC_PATH0}/${MY_SV}.tar.bz2
 	${X_DRIVERS}
 	${X_PATCHES}"
 
-LICENSE="X11 MSttfEULA"
+# http://www.xfree86.org/4.4.0/LICENSE.html with exception of xfree86-1.1
+# and BitstreamVera
+LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
+	bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor
+	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
+	MIT SGI-B BSD FTL | GPL-2 MSttfEULA x-oz"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips"