Qt4 is GPL-2 only, not QPL (as far as I can tell), so remove that from the license...

Package-Manager: portage-2.1.2_rc1-r1

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index b06cc67b86eaf40cb4db29a4b2fecfa08d249313..c87e344cdefe3dd9ccce5f59853532d733b1e185 100644 (file)
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.387 2006/11/09 15:01:06 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.388 2006/11/10 00:55:23 caleb Exp $
+
+  10 Nov 2006; Caleb Tennis <caleb@gentoo.org> qt-4.1.4-r2.ebuild,
+  qt-4.2.1.ebuild, qt-4.2.1-r1.ebuild:
+  Qt4 is GPL-2 only, not QPL (as far as I can tell), so remove that from the
+  license option
 
 *qt-4.2.1-r1 (09 Nov 2006)
 

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index eecb073d35c9d9a99f0c71164a6686ef3a733c5f..ab7051a5d1af603be732963fcd5cda46dad9294b 100644 (file)
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -128,22 +128,22 @@ EBUILD qt-3.3.6-r4.ebuild 11098 RMD160 9bb7af6c6c80f833b47f4476cc003e70a4163952
 MD5 c32539b375a577ad93d0408c22f8c97b qt-3.3.6-r4.ebuild 11098
 RMD160 9bb7af6c6c80f833b47f4476cc003e70a4163952 qt-3.3.6-r4.ebuild 11098
 SHA256 f9e34ec40e66ba80b58256ade916a680f4519df9463b5d859d7285cb54abe6ba qt-3.3.6-r4.ebuild 11098
-EBUILD qt-4.1.4-r2.ebuild 6847 RMD160 8525b11f90d6f4faa20d712fc7d977e84a9c7999 SHA1 f6d212d9bdf0324fac92ad7169cde3cfe7e2440c SHA256 8f442105c43eb4d7902497b762461d6712611d0be0df6336bb1837010366762e
-MD5 9aa16bc9eba1a97600f040fa47afc568 qt-4.1.4-r2.ebuild 6847
-RMD160 8525b11f90d6f4faa20d712fc7d977e84a9c7999 qt-4.1.4-r2.ebuild 6847
-SHA256 8f442105c43eb4d7902497b762461d6712611d0be0df6336bb1837010366762e qt-4.1.4-r2.ebuild 6847
-EBUILD qt-4.2.1-r1.ebuild 7126 RMD160 bbaaa7345464179abb3957ecb3b3a0e43601d70b SHA1 25e1cf22378ed25caffb830d738790058a0fccd2 SHA256 8d01eac2322c378814bcc12ea9d72c8291b551b06d51c2c80b807cf18ccae9a1
-MD5 0542a48a3e003da26aeddaa85a34ac42 qt-4.2.1-r1.ebuild 7126
-RMD160 bbaaa7345464179abb3957ecb3b3a0e43601d70b qt-4.2.1-r1.ebuild 7126
-SHA256 8d01eac2322c378814bcc12ea9d72c8291b551b06d51c2c80b807cf18ccae9a1 qt-4.2.1-r1.ebuild 7126
-EBUILD qt-4.2.1.ebuild 7916 RMD160 435660dcadde727a12b9c4a8fc7d524520243312 SHA1 ce954730a0880982755676d97a7927259f60bdb0 SHA256 34746505591ccd20b953ef30cbb16ace07550719f655960c039b45f52a234498
-MD5 9470099e942dc638eb925480cd583de3 qt-4.2.1.ebuild 7916
-RMD160 435660dcadde727a12b9c4a8fc7d524520243312 qt-4.2.1.ebuild 7916
-SHA256 34746505591ccd20b953ef30cbb16ace07550719f655960c039b45f52a234498 qt-4.2.1.ebuild 7916
-MISC ChangeLog 20704 RMD160 7523801b1664f7cf81f1f798ad2a8277b1dad3d8 SHA1 16d8c1d519cc1ef07dd14744c35617256275b269 SHA256 f657da29ee060b9891ee06c4e39b122dcbf1f22f65075e02dc1b9da4e834bae2
-MD5 f0bfaabe083db643d73428866bfda861 ChangeLog 20704
-RMD160 7523801b1664f7cf81f1f798ad2a8277b1dad3d8 ChangeLog 20704
-SHA256 f657da29ee060b9891ee06c4e39b122dcbf1f22f65075e02dc1b9da4e834bae2 ChangeLog 20704
+EBUILD qt-4.1.4-r2.ebuild 6833 RMD160 9a37db3d603c14aa91615e89e46233363bd74923 SHA1 f56c7b06c43988541d81ff2d6584718f5fe04e38 SHA256 84bc2e821d037692e3ba6fbf36661badbdeb197590b2216736dd0eeb41048d96
+MD5 3d918788f2490db72dab5ebd482a96bb qt-4.1.4-r2.ebuild 6833
+RMD160 9a37db3d603c14aa91615e89e46233363bd74923 qt-4.1.4-r2.ebuild 6833
+SHA256 84bc2e821d037692e3ba6fbf36661badbdeb197590b2216736dd0eeb41048d96 qt-4.1.4-r2.ebuild 6833
+EBUILD qt-4.2.1-r1.ebuild 7111 RMD160 af070f22775af54487d9a08c769e123278ce2298 SHA1 3d4765177a4d01a60cc66ee7b995d68a87c0c7cc SHA256 690612f42b02971019705b346730e050b3b252cfa3356b1849d38127144f38df
+MD5 e09bbba13f08c223a42ece28e133c87b qt-4.2.1-r1.ebuild 7111
+RMD160 af070f22775af54487d9a08c769e123278ce2298 qt-4.2.1-r1.ebuild 7111
+SHA256 690612f42b02971019705b346730e050b3b252cfa3356b1849d38127144f38df qt-4.2.1-r1.ebuild 7111
+EBUILD qt-4.2.1.ebuild 7901 RMD160 a5be9cd553d8636b58a583d67ed7dd5979640681 SHA1 d862c4fd265561c0eb6208477cd7593bad5d8f6e SHA256 fc3077e4a9e4621c3d59c481578638c4d053da0753f3f6cd34176d840bf3991d
+MD5 87172d9de611e6f0f4c84a1faff1b389 qt-4.2.1.ebuild 7901
+RMD160 a5be9cd553d8636b58a583d67ed7dd5979640681 qt-4.2.1.ebuild 7901
+SHA256 fc3077e4a9e4621c3d59c481578638c4d053da0753f3f6cd34176d840bf3991d qt-4.2.1.ebuild 7901
+MISC ChangeLog 20905 RMD160 b63f3c23378bc860ca3499231dd129a8656bd4be SHA1 4cbf6b8d2260c792b0c584776bfe4a5cf439e274 SHA256 43e6659b1d1946dcb860c60b71ec87121a88d1671cd27549d2f52d3c563432b4
+MD5 767f4062c47990debd9f30776ea21117 ChangeLog 20905
+RMD160 b63f3c23378bc860ca3499231dd129a8656bd4be ChangeLog 20905
+SHA256 43e6659b1d1946dcb860c60b71ec87121a88d1671cd27549d2f52d3c563432b4 ChangeLog 20905
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156

diff --git a/x11-libs/qt/qt-4.1.4-r2.ebuild b/x11-libs/qt/qt-4.1.4-r2.ebuild
index eeb4b04164720b552b3d5f38a79f0c6fa87192ba..5c54ce53504398785aab107f81082b8cc286673f 100644 (file)
--- a/x11-libs/qt/qt-4.1.4-r2.ebuild
+++ b/x11-libs/qt/qt-4.1.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.4-r2.ebuild,v 1.9 2006/10/30 18:18:37 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.4-r2.ebuild,v 1.10 2006/11/10 00:55:23 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
 S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
 
-LICENSE="|| ( QPL-1.0 GPL-2 )"
+LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="accessibility cups debug doc examples firebird gif jpeg mng mysql nas nis odbc opengl png postgres sqlite xinerama zlib"

diff --git a/x11-libs/qt/qt-4.2.1-r1.ebuild b/x11-libs/qt/qt-4.2.1-r1.ebuild
index 2e34d7559c9f683d27cc0b242c1c44343cebd2ff..9b75c94d1f9cd5b96aa467a64cd4e55b4f643ed2 100644 (file)
--- a/x11-libs/qt/qt-4.2.1-r1.ebuild
+++ b/x11-libs/qt/qt-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.1-r1.ebuild,v 1.1 2006/11/09 15:01:06 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.1-r1.ebuild,v 1.2 2006/11/10 00:55:23 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
 S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
 
-LICENSE="|| ( QPL-1.0 GPL-2 )"
+LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 

diff --git a/x11-libs/qt/qt-4.2.1.ebuild b/x11-libs/qt/qt-4.2.1.ebuild
index c357fbf34958f5fd6b77c8bc721f5f21e5da38c7..eb3c72b800b9b08d6bb5d7c366fff01399704d31 100644 (file)
--- a/x11-libs/qt/qt-4.2.1.ebuild
+++ b/x11-libs/qt/qt-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.1.ebuild,v 1.13 2006/11/07 20:08:37 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.1.ebuild,v 1.14 2006/11/10 00:55:23 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
 S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
 
-LICENSE="|| ( QPL-1.0 GPL-2 )"
+LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"