Changed license to ="QPL-1.0 | GPL-2"

8 files changed, 33 insertions, 30 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index d410989bebe9..8fdafe46c4e5 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.70 2003/06/10 23:53:19 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.71 2003/06/13 20:51:27 caleb Exp $
+
+  13 Jun 2003; Caleb Tennis <caleb@gentoo.org> all qt ebuilds:
+  Changed LICENSE to ="QPL-1.0 | GPL-2".  Closes bug #18949.
 
   10 Jun 2003; Will Woods <wwoods@gentoo.org> qt-2.3.2-r1.ebuild:
   Added ~alpha to KEYWORDS
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 67c9ef88b73a..c1ba14b96bc3 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,23 +1,23 @@
-MD5 6c4a619bf908470dee618fdf2b541d37 ChangeLog 11822
-MD5 83b0501258e0ff01e8a490b930b208e5 qt-2.3.2-r1.ebuild 2316
-MD5 7574a34ccd181870ea18bf3145310e37 qt-3.0.5-r2.ebuild 3975
-MD5 7d57c6970431541c36f2b5204ef553c4 qt-3.2.0_beta1.ebuild 4489
-MD5 adbc3aba052acc4d8f783b4a281f05c1 qt-3.1.0-r3.ebuild 4844
-MD5 66b942151418494936c3b73e01e37d68 qt-3.1.1-r2.ebuild 4659
-MD5 ad453a0562546a97ee88fa3c6b0f289b qt-3.1.2-r3.ebuild 5019
+MD5 9d308fe0cd81a5f1f7b5b96e707b5a53 qt-3.1.2-r3.ebuild 5026
+MD5 c7307da5af6db796cd242a5b51e78a80 qt-2.3.2-r1.ebuild 2323
+MD5 c0200496fd1c371b27238e33e95fbe9e qt-3.0.5-r2.ebuild 3983
+MD5 774f04a75d56c8b4da7772786d16b843 qt-3.1.0-r3.ebuild 4846
+MD5 3666aed2bc53e3d5cedf5fc6e424ed50 qt-3.1.1-r2.ebuild 4666
+MD5 bcbb420373abe1002ca8698b886e77ea ChangeLog 11946
+MD5 c31bb1b07af43f08f17f8c9ad1470cce qt-3.2.0_beta1.ebuild 4497
 MD5 2d5b68b38185a30a28ffb2b652258cb8 files/45qt3 83
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
-MD5 c8a8d41028d22397dcc86041f1856a79 files/digest-qt-3.0.5-r2 71
+MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
 MD5 75f50432ffd304d181e2799f7cdba228 files/digest-qt-3.2.0_beta1 74
-MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
-MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
-MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
+MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
+MD5 c8a8d41028d22397dcc86041f1856a79 files/digest-qt-3.0.5-r2 71
 MD5 52e7df9b93f281c262716caac4cb7705 files/digest-qt-3.1.0-r3 72
 MD5 cfa73af7c2f2661be4ea9f3c9347db84 files/digest-qt-3.1.1-r2 72
-MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
-MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
-MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
+MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
+MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
+MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
+MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
diff --git a/x11-libs/qt/qt-2.3.2-r1.ebuild b/x11-libs/qt/qt-2.3.2-r1.ebuild
index a6077f27a9f1..432c1f62bbb7 100644
--- a/x11-libs/qt/qt-2.3.2-r1.ebuild
+++ b/x11-libs/qt/qt-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.2-r1.ebuild,v 1.20 2003/06/10 23:53:19 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.2-r1.ebuild,v 1.21 2003/06/13 20:51:28 caleb Exp $
 
 IUSE="gif opengl nas"
 
@@ -9,7 +9,7 @@ DESCRIPTION="QT ${PV}, an X11 widget set and general library used by KDE et al"
 SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${PV}.tar.gz"
 HOMEPAGE="http://www.trolltech.com/"
 SLOT="2"
-LICENSE="QPL-1.0"
+LICENSE="QPL-1.0 | GPL-2"
 KEYWORDS="x86 ppc sparc hppa ~alpha"
 
 RDEPEND="virtual/x11
diff --git a/x11-libs/qt/qt-3.0.5-r2.ebuild b/x11-libs/qt/qt-3.0.5-r2.ebuild
index 171bcada5824..eaf8958fefd8 100644
--- a/x11-libs/qt/qt-3.0.5-r2.ebuild
+++ b/x11-libs/qt/qt-3.0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.0.5-r2.ebuild,v 1.9 2003/02/13 17:01:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.0.5-r2.ebuild,v 1.10 2003/06/13 20:51:28 caleb Exp $
 
 IUSE="nas nls postgres opengl mysql odbc gif"
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/qt-x11-free-${PV}
 
 DESCRIPTION="QT version ${PV}"
 SLOT="3"
-LICENSE="QPL-1.0"
+LICENSE="QPL-1.0 | GPL-2"
 KEYWORDS="x86 ppc sparc "
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.gz"
diff --git a/x11-libs/qt/qt-3.1.0-r3.ebuild b/x11-libs/qt/qt-3.1.0-r3.ebuild
index 5b7a219f996a..56a4b20c9ccb 100644
--- a/x11-libs/qt/qt-3.1.0-r3.ebuild
+++ b/x11-libs/qt/qt-3.1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.0-r3.ebuild,v 1.8 2003/06/01 17:34:40 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.0-r3.ebuild,v 1.9 2003/06/13 20:51:28 caleb Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ S=${WORKDIR}/qt-x11-free-${PV}
 
 DESCRIPTION="QT version ${PV}"
 SLOT="3"
-LICENSE="QPL-1.0"
+LICENSE="QPL-1.0 | GPL-2"
 KEYWORDS="x86 ppc ~alpha sparc hppa"
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
diff --git a/x11-libs/qt/qt-3.1.1-r2.ebuild b/x11-libs/qt/qt-3.1.1-r2.ebuild
index 6539f197dac7..b60bda339ff1 100644
--- a/x11-libs/qt/qt-3.1.1-r2.ebuild
+++ b/x11-libs/qt/qt-3.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.1-r2.ebuild,v 1.4 2003/03/15 12:25:10 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.1-r2.ebuild,v 1.5 2003/06/13 20:51:28 caleb Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ S=${WORKDIR}/qt-x11-free-${PV}
 
 DESCRIPTION="QT version ${PV}"
 SLOT="3"
-LICENSE="QPL-1.0"
+LICENSE="QPL-1.0 | GPL-2"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa"
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
diff --git a/x11-libs/qt/qt-3.1.2-r3.ebuild b/x11-libs/qt/qt-3.1.2-r3.ebuild
index b462bfdbe9cd..dac2888e7b19 100644
--- a/x11-libs/qt/qt-3.1.2-r3.ebuild
+++ b/x11-libs/qt/qt-3.1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r3.ebuild,v 1.4 2003/06/10 23:53:19 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r3.ebuild,v 1.5 2003/06/13 20:51:28 caleb Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ S=${WORKDIR}/qt-x11-free-${PV}
 
 DESCRIPTION="QT version ${PV}"
 SLOT="3"
-LICENSE="QPL-1.0"
+LICENSE="QPL-1.0 | GPL-2"
 
 # WARNING: do not give this ebuild keywords that >=kdelibs-3.1.1, >=kdebase-3.1.1-r1 don't have
 KEYWORDS="x86 ~ppc sparc ~alpha"
diff --git a/x11-libs/qt/qt-3.2.0_beta1.ebuild b/x11-libs/qt/qt-3.2.0_beta1.ebuild
index c25cfa791ea0..f5f1c3b0c47a 100644
--- a/x11-libs/qt/qt-3.2.0_beta1.ebuild
+++ b/x11-libs/qt/qt-3.2.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.0_beta1.ebuild,v 1.1 2003/05/30 13:06:35 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.0_beta1.ebuild,v 1.2 2003/06/13 20:51:28 caleb Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="QT version ${PV}"
 SLOT="3"
-LICENSE="QPL-1.0"
+LICENSE="QPL-1.0 | GPL-2"
 
 KEYWORDS="~x86"