LICENSE fix

6 files changed, 23 insertions, 28 deletions

diff --git a/x11-libs/qt-embedded/ChangeLog b/x11-libs/qt-embedded/ChangeLog
index 24778cbb0d4e..e40619ef25b5 100644
--- a/x11-libs/qt-embedded/ChangeLog
+++ b/x11-libs/qt-embedded/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-embedded
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/ChangeLog,v 1.13 2004/09/21 04:46:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/ChangeLog,v 1.14 2004/11/06 07:44:32 mr_bones_ Exp $
+
+  05 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  qt-embedded-3.0.5.ebuild, qt-embedded-3.1.2.ebuild,
+  qt-embedded-3.3.2-r1.ebuild, qt-embedded-3.3.2.ebuild:
+  LICENSE fix
 
   21 Sep 2004; Doug Goldstein <cardoe@gentoo.org> qt-embedded-3.1.2.ebuild:
   stable on x86
diff --git a/x11-libs/qt-embedded/Manifest b/x11-libs/qt-embedded/Manifest
index 851b59c52687..3fcc57d91adb 100644
--- a/x11-libs/qt-embedded/Manifest
+++ b/x11-libs/qt-embedded/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5344618caffea42faeabb749866fb646 qt-embedded-3.3.2.ebuild 4614
-MD5 e944d78635ad46a9ccf47fc672c09f5e qt-embedded-3.3.2-r1.ebuild 4766
+MD5 499665dae4b2da8eb697e1b41b493712 ChangeLog 2176
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 f31a0d03ba38445ce8244afcd93db107 ChangeLog 1992
-MD5 30c1f52a24ae025a677f62f8cdc3c75e qt-embedded-3.0.5.ebuild 4312
-MD5 ebcd52a12825d38d18ed865ae34710f6 qt-embedded-3.1.2.ebuild 4385
+MD5 55bdea2caffae2cb269f25f45f29515e qt-embedded-3.0.5.ebuild 4318
+MD5 616c7c1a19cb6ebc52d1fde9fc82e13e qt-embedded-3.1.2.ebuild 4394
+MD5 93269b1aa9694496199c162b2b494803 qt-embedded-3.3.2.ebuild 4619
+MD5 c901b061b2a25ed0c40b90be4344b3f2 qt-embedded-3.3.2-r1.ebuild 4776
+MD5 b0719cf6e99f249585e84430fbbc2883 files/47qt-embedded3 118
 MD5 1fcffbb83d84af4b0d6d074ec508db20 files/digest-qt-embedded-3.0.5 77
-MD5 fc553746a0c77730e1785fc7fc0da47d files/digest-qt-embedded-3.3.2 77
-MD5 097bb712d277f17864951d77b56ca46b files/tools-Makefile 2053
-MD5 fc553746a0c77730e1785fc7fc0da47d files/digest-qt-embedded-3.3.2-r1 77
 MD5 81e8e195b18cba662da2c540ce2a1dbc files/digest-qt-embedded-3.1.2 77
+MD5 097bb712d277f17864951d77b56ca46b files/tools-Makefile 2053
 MD5 5f0cacec360762cefef2d5219aee443a files/50qt-embeddeddir3 25
-MD5 b0719cf6e99f249585e84430fbbc2883 files/47qt-embedded3 118
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD4DBQFBT7JHFhz/XBeRBtARAtc6AJiaMLnDpA4pgHevNKmD6Rj1IV+pAJ9vwOgM
-8/bXdKDCZucmtY45pfhKBA==
-=WOAm
------END PGP SIGNATURE-----
+MD5 fc553746a0c77730e1785fc7fc0da47d files/digest-qt-embedded-3.3.2 77
+MD5 fc553746a0c77730e1785fc7fc0da47d files/digest-qt-embedded-3.3.2-r1 77
diff --git a/x11-libs/qt-embedded/qt-embedded-3.0.5.ebuild b/x11-libs/qt-embedded/qt-embedded-3.0.5.ebuild
index ccd9455d950c..3ffbbce91396 100644
--- a/x11-libs/qt-embedded/qt-embedded-3.0.5.ebuild
+++ b/x11-libs/qt-embedded/qt-embedded-3.0.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.0.5.ebuild,v 1.13 2004/06/24 22:07:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.0.5.ebuild,v 1.14 2004/11/06 07:44:32 mr_bones_ Exp $
 
 DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2"
 
-LICENSE="QPL-1.0 | GPL-2"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="3"
 KEYWORDS="x86"
 IUSE="gif opengl mysql odbc postgres debug build"
diff --git a/x11-libs/qt-embedded/qt-embedded-3.1.2.ebuild b/x11-libs/qt-embedded/qt-embedded-3.1.2.ebuild
index 12705a7454be..02d152fd493c 100644
--- a/x11-libs/qt-embedded/qt-embedded-3.1.2.ebuild
+++ b/x11-libs/qt-embedded/qt-embedded-3.1.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.1.2.ebuild,v 1.9 2004/09/21 04:46:54 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.1.2.ebuild,v 1.10 2004/11/06 07:44:32 mr_bones_ Exp $
 
 DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2"
 
-LICENSE="QPL-1.0 | GPL-2"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="3"
 KEYWORDS="x86"
 IUSE="gif opengl mysql odbc postgres debug build"
diff --git a/x11-libs/qt-embedded/qt-embedded-3.3.2-r1.ebuild b/x11-libs/qt-embedded/qt-embedded-3.3.2-r1.ebuild
index 45f50e033530..952756388daa 100644
--- a/x11-libs/qt-embedded/qt-embedded-3.3.2-r1.ebuild
+++ b/x11-libs/qt-embedded/qt-embedded-3.3.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.2-r1.ebuild,v 1.5 2004/07/15 11:21:35 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.2-r1.ebuild,v 1.6 2004/11/06 07:44:32 mr_bones_ Exp $
 
 DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2"
 
-LICENSE="QPL-1.0 | GPL-2"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="3"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="gif opengl mysql odbc postgres debug build doc"
diff --git a/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild b/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild
index 35d7f283b761..7e2a3f0919f9 100644
--- a/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild
+++ b/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild,v 1.2 2004/07/02 09:48:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.2.ebuild,v 1.3 2004/11/06 07:44:32 mr_bones_ Exp $
 
 DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2"
 
-LICENSE="QPL-1.0 | GPL-2"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="3"
 KEYWORDS="~x86"
 IUSE="gif opengl mysql odbc postgres debug build doc"