fixed LICENSE string format, according to repoman and numerous examples from other ebuilds. (the docs/manpages don't seem to mention this anywhere, though.)

8 files changed, 40 insertions, 45 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index e6da59899da9..9e7305a02f01 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.173 2004/10/10 20:32:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.174 2004/10/25 17:29:58 danarmak Exp $
+
+  25 Oct 2004; Dan Armak <danarmak@gentoo.org> qt-2.3.2-r1.ebuild,
+  qt-3.2.3-r1.ebuild, qt-3.3.1-r2.ebuild, qt-3.3.2.ebuild,
+  qt-3.3.3-r1.ebuild, qt-3.3.3.ebuild:
+  Fixed LICENSE string format: '|| ( foo bar )' rather than 'foo | bar'.
 
   10 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> qt-3.3.3-r1.ebuild:
   Readded multilib fixes.
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 5115e8aa7828..2501a790b34b 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,39 +1,29 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 098e24b4e6f15a527c4aa6c47bffec7c ChangeLog 29145
+MD5 e33147091e31dcc39606b59566b03a99 qt-3.3.3-r1.ebuild 6310
+MD5 a5c51d879fff01b6f6b8128088bbe3c4 qt-3.3.2.ebuild 6893
+MD5 f769105ec9340901a442a9e9880f504d qt-2.3.2-r1.ebuild 2287
+MD5 5d82c6565d0f7cd22378670d038b92fb qt-3.3.1-r2.ebuild 5743
+MD5 899308105181d43ccb6e64a2978eb818 ChangeLog 29382
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 c167f38f82d95bc8e7414bf15cbd693b qt-2.3.2-r1.ebuild 2282
-MD5 393f3401d3e83e7fae8f93abc30c2434 qt-3.3.3.ebuild 6568
-MD5 c25f0c9aae669e1ee480a04128ec7356 qt-3.3.2.ebuild 6886
-MD5 c31b58bb9bef0cf4b24823c9c7ce4d56 qt-3.3.1-r2.ebuild 5733
-MD5 3dc117d667771d6bd5a766379d5487b4 qt-3.2.3-r1.ebuild 5119
-MD5 78cd2e569982e115bf0e802b405a49ba qt-3.3.3-r1.ebuild 6303
-MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
+MD5 02dec99f5f3f938a53845183873c5111 qt-3.3.3.ebuild 6575
+MD5 12029b56d726aef8a419006508cdf7da qt-3.2.3-r1.ebuild 5125
+MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
+MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
+MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
 MD5 698d5ff434cbace76297754f49699b7e files/digest-qt-3.3.2 165
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
-MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
+MD5 494ea57bec4dcfe3a4ca65e413d81791 files/digest-qt-3.3.3 165
 MD5 9bd231bda8dcf1508a797c80002bfaa3 files/qt-3.3.1-qclipboard-fix.patch 2878
-MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688
+MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
+MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.1-r2 72
+MD5 96842a84a7834f8bca5dfc0d272137f1 files/digest-qt-3.3.3-r1 165
 MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.2-mips-relax-branches.patch 688
-MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761
-MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
-MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
+MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
+MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
+MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
+MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688
 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
-MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
-MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
-MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
-MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3-r1 72
-MD5 96842a84a7834f8bca5dfc0d272137f1 files/digest-qt-3.3.3-r1 165
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 dd5958e335d63c95fc1e5051aa5224ca files/qt-3.3.2-immodule-20040819.patch 1761
 MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
-MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBdSLEHTu7gpaalycRApzzAJ4q81dzrWgKbF24NFEEBCSzyBk1rgCgzG3q
-4wvtGT1+X/IsaMT+/YMli0E=
-=1bUC
------END PGP SIGNATURE-----
+MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
diff --git a/x11-libs/qt/qt-2.3.2-r1.ebuild b/x11-libs/qt/qt-2.3.2-r1.ebuild
index 58572635aed2..be618a66daa9 100644
--- a/x11-libs/qt/qt-2.3.2-r1.ebuild
+++ b/x11-libs/qt/qt-2.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/qt-2.3.2-r1.ebuild,v 1.29 2004/06/24 22:07:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.2-r1.ebuild,v 1.30 2004/10/25 17:29:58 danarmak Exp $
 
 DESCRIPTION="QT ${PV}, an X11 widget set and general library used by KDE et al"
 HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${PV}.tar.gz"
 
-LICENSE="QPL-1.0 | GPL-2"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="2"
 KEYWORDS="x86 ppc sparc hppa alpha amd64 ia64"
 IUSE="gif opengl nas debug"
diff --git a/x11-libs/qt/qt-3.2.3-r1.ebuild b/x11-libs/qt/qt-3.2.3-r1.ebuild
index 8ffeee221126..39be77937aab 100644
--- a/x11-libs/qt/qt-3.2.3-r1.ebuild
+++ b/x11-libs/qt/qt-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.3-r1.ebuild,v 1.9 2004/06/24 22:07:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.3-r1.ebuild,v 1.10 2004/10/25 17:29:58 danarmak Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2"
 
-LICENSE="QPL-1.0 | GPL-2"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="3"
 KEYWORDS="x86 hppa amd64 sparc ia64 alpha ppc"
 IUSE="cups nas postgres opengl mysql odbc gif doc xinerama cjk debug"
diff --git a/x11-libs/qt/qt-3.3.1-r2.ebuild b/x11-libs/qt/qt-3.3.1-r2.ebuild
index bca7ba92c901..526834928f20 100644
--- a/x11-libs/qt/qt-3.3.1-r2.ebuild
+++ b/x11-libs/qt/qt-3.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.1-r2.ebuild,v 1.10 2004/08/06 00:34:08 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.1-r2.ebuild,v 1.11 2004/10/25 17:29:58 danarmak Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.trolltech.com/"
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2"
 
-LICENSE="QPL-1.0 | GPL-2"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="3"
 KEYWORDS="~x86 ~alpha ~ppc ~amd64 sparc ~hppa mips"
 IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib"
diff --git a/x11-libs/qt/qt-3.3.2.ebuild b/x11-libs/qt/qt-3.3.2.ebuild
index f0f23fb1bb8b..2e2aacee5d9a 100644
--- a/x11-libs/qt/qt-3.3.2.ebuild
+++ b/x11-libs/qt/qt-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.2.ebuild,v 1.18 2004/09/10 16:30:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.2.ebuild,v 1.19 2004/10/25 17:29:58 danarmak Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
 	immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )
 	immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )"
 
-LICENSE="QPL-1.0 | GPL-2"
+LICENSE="|| (QPL-1.0 GPL-2 )"
 SLOT="3"
 KEYWORDS="x86 alpha ppc amd64 sparc hppa ~mips ppc64"
 IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
diff --git a/x11-libs/qt/qt-3.3.3-r1.ebuild b/x11-libs/qt/qt-3.3.3-r1.ebuild
index 2c9ca4e21652..06d605e0cd9b 100644
--- a/x11-libs/qt/qt-3.3.3-r1.ebuild
+++ b/x11-libs/qt/qt-3.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r1.ebuild,v 1.4 2004/10/19 14:20:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r1.ebuild,v 1.5 2004/10/25 17:29:58 danarmak Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
 	immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )
 	immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )"
 
-LICENSE="QPL-1.0 | GPL-2"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
diff --git a/x11-libs/qt/qt-3.3.3.ebuild b/x11-libs/qt/qt-3.3.3.ebuild
index 443b7b6f12fd..5d19f463a44e 100644
--- a/x11-libs/qt/qt-3.3.3.ebuild
+++ b/x11-libs/qt/qt-3.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3.ebuild,v 1.15 2004/10/19 14:20:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3.ebuild,v 1.16 2004/10/25 17:29:58 danarmak Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
 	immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )
 	immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )"
 
-LICENSE="QPL-1.0 | GPL-2"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="3"
 KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"