This change was wrong. Qt is still dual licensed GPL/QPL, so revert this back

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 35f4dcbc3fe0eadb2324e20e5259c07be8da62c5..725442e0826a4997f09c6fe6a61f83eedd794aaa 100644 (file)
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # 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.403 2006/12/19 14:28:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.404 2006/12/19 19:11:20 caleb Exp $
+
+  19 Dec 2006; Caleb Tennis <caleb@gentoo.org> qt-4.1.4-r2.ebuild,
+  qt-4.2.1.ebuild, qt-4.2.2.ebuild:
+  This change was wrong.  Qt is still dual licensed GPL/QPL, so revert this back
 
   19 Dec 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.2.ebuild:
   Make sure we catch sed the proper stuff

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 2e431d248e3da2172f242ace18d3d1e140a0ee1a..ddb9d012cab867053b023dc3f859cc974a08b703 100644 (file)
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -129,22 +129,22 @@ EBUILD qt-3.3.6-r5.ebuild 11214 RMD160 390b12c960146b4a1477f1fad93974f5e63766f9
 MD5 2e2951d65b40903731b57f228e529ec3 qt-3.3.6-r5.ebuild 11214
 RMD160 390b12c960146b4a1477f1fad93974f5e63766f9 qt-3.3.6-r5.ebuild 11214
 SHA256 2cf1cf08c51a1ff2583340fb6e24fe80b7a89696bac788f7ddc898b1705667af qt-3.3.6-r5.ebuild 11214
-EBUILD qt-4.1.4-r2.ebuild 6841 RMD160 43b7e69204b28ad0944d777331a7874514d8037a SHA1 63d028649f3d6f39149ab1b7030bfe542540210f SHA256 130b35011c5132f4ee13d7879438584a10f344b216ab1d6f4c96d4fac20ba74c
-MD5 40d8f00d8565bd9352f794c30d49b72c qt-4.1.4-r2.ebuild 6841
-RMD160 43b7e69204b28ad0944d777331a7874514d8037a qt-4.1.4-r2.ebuild 6841
-SHA256 130b35011c5132f4ee13d7879438584a10f344b216ab1d6f4c96d4fac20ba74c qt-4.1.4-r2.ebuild 6841
-EBUILD qt-4.2.1.ebuild 7901 RMD160 0ca5067fa7e5abc88cf91aa4c662d3dd0b13d056 SHA1 1248c4a2520e54ed268fb006c67142c8e69be61e SHA256 91be57c3a8c1e6376472c5a2aa48bac1845fba83691c0737bd2bdb2294713dab
-MD5 0d748095dcbdd4785ae4e10838d3f8bd qt-4.2.1.ebuild 7901
-RMD160 0ca5067fa7e5abc88cf91aa4c662d3dd0b13d056 qt-4.2.1.ebuild 7901
-SHA256 91be57c3a8c1e6376472c5a2aa48bac1845fba83691c0737bd2bdb2294713dab qt-4.2.1.ebuild 7901
-EBUILD qt-4.2.2.ebuild 7781 RMD160 a9dcc775ab5e17fea6713a553bf2611c796ea683 SHA1 4291059bae518dccb536de044689df659701a41d SHA256 7b81a0c75b8ae5cd80a7a404ddb68e3fdb7d9691733cf816f4f62d33fc1a290f
-MD5 05bc2f2f4e9356e7f4b9fb08dc70f77f qt-4.2.2.ebuild 7781
-RMD160 a9dcc775ab5e17fea6713a553bf2611c796ea683 qt-4.2.2.ebuild 7781
-SHA256 7b81a0c75b8ae5cd80a7a404ddb68e3fdb7d9691733cf816f4f62d33fc1a290f qt-4.2.2.ebuild 7781
-MISC ChangeLog 23154 RMD160 f02e6552cdbb50d97272b87101463826cac09eec SHA1 a8f056714da16d9d2233a16fb2ae4b310d4b4be6 SHA256 48a0af80063078771666ff82d720ba76fed587b265912034827ffb6762602e7b
-MD5 34b1dece6872618e87aabb54599a5c1e ChangeLog 23154
-RMD160 f02e6552cdbb50d97272b87101463826cac09eec ChangeLog 23154
-SHA256 48a0af80063078771666ff82d720ba76fed587b265912034827ffb6762602e7b ChangeLog 23154
+EBUILD qt-4.1.4-r2.ebuild 6855 RMD160 7872b1f71731ac3ccb1f940b49acfc8106cef3ff SHA1 dffa6d4bae33a49c7c75e6d75736b70f0228fb25 SHA256 6046a7e215477727fda16c698b9d9a817e4fd3a456915d00b121e167f19a63ff
+MD5 8f9beb1a3080a83dac2e8941aba8a06d qt-4.1.4-r2.ebuild 6855
+RMD160 7872b1f71731ac3ccb1f940b49acfc8106cef3ff qt-4.1.4-r2.ebuild 6855
+SHA256 6046a7e215477727fda16c698b9d9a817e4fd3a456915d00b121e167f19a63ff qt-4.1.4-r2.ebuild 6855
+EBUILD qt-4.2.1.ebuild 7917 RMD160 36a70bc03f912ef7134872a58b56f4829dd57497 SHA1 7257744ddd8bad6c2777e76c2775877e56c7f852 SHA256 716669c5f4d7f6d712228cec6b1a759d8a53a8c447cadcb84dfa8492517debcc
+MD5 053f6b83133fd3b5eff9ec988f334376 qt-4.2.1.ebuild 7917
+RMD160 36a70bc03f912ef7134872a58b56f4829dd57497 qt-4.2.1.ebuild 7917
+SHA256 716669c5f4d7f6d712228cec6b1a759d8a53a8c447cadcb84dfa8492517debcc qt-4.2.1.ebuild 7917
+EBUILD qt-4.2.2.ebuild 7796 RMD160 61820f18951c2e482947b0d99c8f642c8dd5b2d6 SHA1 7d76708e496f5596bb2ba4b098d6e40546c78e8f SHA256 706fd8b070e670afde0c03c49e5635ffa76bcb32a990b444a3a60c9803e4974c
+MD5 00e224a222e99db103d3a8378d22442b qt-4.2.2.ebuild 7796
+RMD160 61820f18951c2e482947b0d99c8f642c8dd5b2d6 qt-4.2.2.ebuild 7796
+SHA256 706fd8b070e670afde0c03c49e5635ffa76bcb32a990b444a3a60c9803e4974c qt-4.2.2.ebuild 7796
+MISC ChangeLog 23339 RMD160 6b92733fe68b4497fe1cc7b459c8649c2914b1e1 SHA1 960154598155295a8edf39356d8e80ab31ac89ff SHA256 9dbc19876b21e430ed22e5894c163adb4be342003aa5309a1bdb83d2b6668a8c
+MD5 94b0ef74bcf1d917d449e80ec3bb1fd6 ChangeLog 23339
+RMD160 6b92733fe68b4497fe1cc7b459c8649c2914b1e1 ChangeLog 23339
+SHA256 9dbc19876b21e430ed22e5894c163adb4be342003aa5309a1bdb83d2b6668a8c ChangeLog 23339
 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 8e1b2bf6955c706ee9a44d80ddc8283c39f81800..30de2366aa4fae90aa4e6dbc20be40ceebc087c8 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.13 2006/11/29 19:47:32 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.4-r2.ebuild,v 1.14 2006/12/19 19:11:20 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="GPL-2"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="4"
 KEYWORDS="alpha 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.ebuild b/x11-libs/qt/qt-4.2.1.ebuild
index bb4395a41e16c34a41c148ad9dcd82b059cf2fdd..d4f0e3783e6572ae13a58057cfc05f765d2a3f8f 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.15 2006/11/23 20:09:56 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.1.ebuild,v 1.16 2006/12/19 19:11:20 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="GPL-2"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="4"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 

diff --git a/x11-libs/qt/qt-4.2.2.ebuild b/x11-libs/qt/qt-4.2.2.ebuild
index 2628b6739050f5526fd7e2790d0269469e869259..d5139c201db55ff694304c6c2742c99d86627d96 100644 (file)
--- a/x11-libs/qt/qt-4.2.2.ebuild
+++ b/x11-libs/qt/qt-4.2.2.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.2.ebuild,v 1.8 2006/12/19 14:28:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.9 2006/12/19 19:11:20 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="GPL-2"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="4"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"