QA: Get rid of deprecated qt_min_version(). Quoting issues.

Package-Manager: portage-2.1.4.4

5 files changed, 55 insertions, 45 deletions

diff --git a/dev-libs/qsa/ChangeLog b/dev-libs/qsa/ChangeLog
index 9df60e085729..947cdd49de61 100644
--- a/dev-libs/qsa/ChangeLog
+++ b/dev-libs/qsa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/qsa
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/ChangeLog,v 1.19 2007/03/14 21:40:21 troll Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/ChangeLog,v 1.20 2008/07/27 20:15:59 carlo Exp $
+
+  27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> qsa-1.0.1.ebuild,
+  qsa-1.1.1.ebuild, qsa-1.1.5.ebuild:
+  QA: Get rid of deprecated qt_min_version(). Quoting issues.
 
   14 Mar 2007; Przemysław Maciąg <troll@gentoo.org> qsa-1.0.1.ebuild,
   qsa-1.1.1.ebuild, +qsa-1.1.5.ebuild:
diff --git a/dev-libs/qsa/Manifest b/dev-libs/qsa/Manifest
index 2c8a8cddbb81..8f32589e232f 100644
--- a/dev-libs/qsa/Manifest
+++ b/dev-libs/qsa/Manifest
@@ -8,8 +8,8 @@ AUX qsa-1.1.1-without-examples.diff 219 RMD160 246516e6d0ffd7390b6d8b1dc9b518f65
 DIST qsa-x11-free-1.0.1.tar.gz 2060183 RMD160 2a14085823cea0798f30e7ccb6d779721c2ee214 SHA1 c55b0094d13a3ba1a98386357e97bfff08971411 SHA256 4f0c40e8327e181fb8ec0bf5cd8d4370930ea915fed413bea3ed73bb4c9d9986
 DIST qsa-x11-free-1.1.1.tar.gz 1715187 RMD160 3a41740e94d2930f52d6217c7ad5f62aed6ae762 SHA1 5819d33396c9e76c1d4f7f3aecab664a52e79c08 SHA256 f52d7aa624296d1ca7ba135d14e2774a4c7cf3cedd9ef8ea072e77c310da9e26
 DIST qsa-x11-free-1.1.5.tar.gz 1716783 RMD160 93d28abbcb22a296864a32b8b9904d12eb61140a SHA1 a5cd0a21819a42dc50ae1d81df46743d6e235a4e SHA256 da1f059b4d27f231b9cc78e5cc6d7cd0db572c19e7d4d392597f8f58c6806e9d
-EBUILD qsa-1.0.1.ebuild 905 RMD160 58dc6e3259e0270d5aa3cef94a94266deae93ab5 SHA1 ba582791e48657572a1cce339a90db742213c55d SHA256 d4e0b4d063b365ac0f27e782c15cb941fab2d6d4b1cdc97a2bad481207db822b
-EBUILD qsa-1.1.1.ebuild 3175 RMD160 cc26c1ea1efc42477242bae0e8642418a8e56f65 SHA1 ab5dfbd27cb3ae216ffb15ea48e2255d6507635e SHA256 d40c9da5645a4d049e5c6905674118cf211d10e71b339a351fe87763f3e083c6
-EBUILD qsa-1.1.5.ebuild 3156 RMD160 1765446fec211c138e2891606d423cc32aee643d SHA1 6f6cf79cdc2b111aecd468f69cdaf332863b8ca9 SHA256 a53b7dab7e7cbe81b062c57d94541080e5134121348d9d89346a9f42149230a5
-MISC ChangeLog 2363 RMD160 23e7915e7f244ea93896f64892c1207560f0affd SHA1 d550125138f83815086d9ee22177805c8c6847ab SHA256 f07db62b58047be341c35f3c94ea64dc831d46ad67a25c72a9a453db1a6f633b
+EBUILD qsa-1.0.1.ebuild 915 RMD160 5e3f9ac56dcf98a934583523397362484ac2f014 SHA1 c47a8948e79166d339ceb60cd7dca06fb8ea48ad SHA256 6c2221c26fd85188f05ca840f6269f8f5fe040d75508baf3012f73a54d59d7b2
+EBUILD qsa-1.1.1.ebuild 3195 RMD160 61aa6193f5e11fcafc333c43b2d47d89812e5292 SHA1 d0a92fcfe211685c4a3f7c87a0f050f96ac315f6 SHA256 e211568f63dcad7d2545832f37a18e71662fb72f096361ed6f265350d21001f9
+EBUILD qsa-1.1.5.ebuild 3174 RMD160 cc85d8c6583b814a5f4a5b2e60d8493aa672c6e5 SHA1 976c5bc7907a2e3a7a6ef83fcae779f69119c6da SHA256 8871bfc9c0f115e14a837402d92f625fecc471a432dd714d9f8861d37b437245
+MISC ChangeLog 2531 RMD160 aa26eea2129d00ef8ec888e2a758ad6dbbc59eaa SHA1 59bdfac2336331006b26413b676d5c1e7044b06f SHA256 3529ae1ad55e0c7033723b1f8c0c40b9f10ff549d5791848ab8227727d86dab4
 MISC metadata.xml 155 RMD160 654eebe07944b4d18c58e4a54c50758eceead53e SHA1 967490b59f5185a6849cb5583390dd0d0b0dd512 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7
diff --git a/dev-libs/qsa/qsa-1.0.1.ebuild b/dev-libs/qsa/qsa-1.0.1.ebuild
index 093ad9832b71..d305cedfe878 100644
--- a/dev-libs/qsa/qsa-1.0.1.ebuild
+++ b/dev-libs/qsa/qsa-1.0.1.ebuild
@@ -1,38 +1,40 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.0.1.ebuild,v 1.7 2007/03/14 21:40:21 troll Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.0.1.ebuild,v 1.8 2008/07/27 20:15:59 carlo Exp $
+
+EAPI=1
 
 inherit eutils qt3
 
 IUSE=""
 S="${WORKDIR}/${PN}-x11-free-${PV}"
-DESCRIPTION="QSA version ${PV}"
+DESCRIPTION="Qt Script for Applications."
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc amd64"
 SRC_URI="ftp://ftp.trolltech.com/qsa/source/${PN}-x11-free-${PV}.tar.gz"
 HOMEPAGE="http://www.trolltech.com/"
 
-DEPEND="$(qt_min_version 3.2)"
+DEPEND="x11-libs/qt:3"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}-no-examples.diff
-	epatch ${FILESDIR}/${P}-sandbox-fix.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-examples.diff
+	epatch "${FILESDIR}"/${P}-sandbox-fix.diff
 }
 
 src_compile() {
-	./configure -prefix ${D}${QTDIR} -no-ide || die "configure failed"
+	./configure -prefix "${D}${QTDIR}" -no-ide || die "configure failed"
 	emake || die "make failed"
 }
 
 src_install() {
 
-	sed -e "s:${S}:${QTBASE}:g" ${S}/.qmake.cache > ${D}/${QTBASE}/.qmake.cache
+	sed -e "s:${S}:${QTBASE}:g" "${S}"/.qmake.cache > "${D}/${QTBASE}"/.qmake.cache
 
 	make install
-	dodoc INSTALL README LICENSE.GPL
+	dodoc INSTALL README
 }
diff --git a/dev-libs/qsa/qsa-1.1.1.ebuild b/dev-libs/qsa/qsa-1.1.1.ebuild
index 7b9bdc3abfcc..e1c705dc915b 100644
--- a/dev-libs/qsa/qsa-1.1.1.ebuild
+++ b/dev-libs/qsa/qsa-1.1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.1.1.ebuild,v 1.10 2007/06/26 01:55:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.1.1.ebuild,v 1.11 2008/07/27 20:15:59 carlo Exp $
+
+EAPI=1
 
 inherit eutils qt3
 
@@ -15,23 +17,23 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc examples ide threads"
 
-DEPEND="$(qt_min_version 3.2)"
+DEPEND="x11-libs/qt:3"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	! use ide && epatch ${FILESDIR}/${P}-without-examples-using-ide.diff
+	cd "${S}"
+	! use ide && epatch "${FILESDIR}"/${P}-without-examples-using-ide.diff
 
 	if use examples; then
-		epatch ${FILESDIR}/${P}-with-examples.diff
-		epatch ${FILESDIR}/${P}-example-enums.pro.diff
+		epatch "${FILESDIR}"/${P}-with-examples.diff
+		epatch "${FILESDIR}"/${P}-example-enums.pro.diff
 	else
-		epatch ${FILESDIR}/${P}-without-examples.diff
+		epatch "${FILESDIR}"/${P}-without-examples.diff
 	fi
 
-	epatch ${FILESDIR}/${P}-sandbox-fix.diff
+	epatch "${FILESDIR}"/${P}-sandbox-fix.diff
 }
 
 src_compile() {
@@ -46,10 +48,10 @@ src_compile() {
 }
 
 src_install() {
-	into ${QTDIR}
+	into "${QTDIR}"
 
 	#includes
-	insinto ${QTDIR}/include
+	insinto "${QTDIR}"/include
 	doins src/qsa/qsaglobal.h
 	doins src/qsa/qsconfig.h
 	doins src/qsa/qsargument.h
@@ -64,21 +66,21 @@ src_install() {
 	doins src/ide/qsworkbench.h
 
 	#QSA mkspec feature
-	insinto ${QTDIR}/mkspecs/${QMAKESPEC}
+	insinto "${QTDIR}"/mkspecs/${QMAKESPEC}
 	doins src/qsa/qsa.prf
 
 	#libs
 	dolib lib/libqsa.so.1.1.1
-	cd ${D}/${QTDIR}/lib
+	cd "${D}/${QTDIR}"/lib
 	ln -s libqsa.so.1.1.1 libqsa.so.1.1
 	ln -s libqsa.so.1.1 libqsa.so.1
 	ln -s libqsa.so.1 libqsa.so
 	cd -
-	insinto ${QTDIR}/lib
+	insinto "${QTDIR}"/lib
 	doins lib/libqsa.prl
 
 	#QSA plugin (SEditor) for Qt designer
-	insinto ${QTDIR}/plugins/designer
+	insinto "${QTDIR}"/plugins/designer
 	doins plugins/designer/libqseditorplugin.so
 
 	#documentation
diff --git a/dev-libs/qsa/qsa-1.1.5.ebuild b/dev-libs/qsa/qsa-1.1.5.ebuild
index 9103ed5ac8fe..6119cff03bb8 100644
--- a/dev-libs/qsa/qsa-1.1.5.ebuild
+++ b/dev-libs/qsa/qsa-1.1.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.1.5.ebuild,v 1.2 2007/06/26 01:55:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qsa/qsa-1.1.5.ebuild,v 1.3 2008/07/27 20:15:59 carlo Exp $
+
+EAPI=1
 
 inherit eutils qt3
 
@@ -15,22 +17,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc examples ide threads"
 
-DEPEND="$(qt_min_version 3.2)"
+DEPEND="x11-libs/qt:3"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	! use ide && epatch ${FILESDIR}/${PN}-1.1.1-without-examples-using-ide.diff
+	cd "${S}"
+	! use ide && epatch "${FILESDIR}"/${PN}-1.1.1-without-examples-using-ide.diff
 
 	if use examples; then
-		epatch ${FILESDIR}/${PN}-1.1.1-with-examples.diff
+		epatch "${FILESDIR}"/${PN}-1.1.1-with-examples.diff
 	else
-		epatch ${FILESDIR}/${PN}-1.1.1-without-examples.diff
+		epatch "${FILESDIR}"/${PN}-1.1.1-without-examples.diff
 	fi
 
-	epatch ${FILESDIR}/${PN}-1.1.1-sandbox-fix.diff
+	epatch "${FILESDIR}"/${PN}-1.1.1-sandbox-fix.diff
 }
 
 src_compile() {
@@ -45,10 +47,10 @@ src_compile() {
 }
 
 src_install() {
-	into ${QTDIR}
+	into "${QTDIR}"
 
 	#includes
-	insinto ${QTDIR}/include
+	insinto "${QTDIR}"/include
 	doins src/qsa/qsaglobal.h
 	doins src/qsa/qsconfig.h
 	doins src/qsa/qsargument.h
@@ -63,21 +65,21 @@ src_install() {
 	doins src/ide/qsworkbench.h
 
 	#QSA mkspec feature
-	insinto ${QTDIR}/mkspecs/${QMAKESPEC}
+	insinto "${QTDIR}"/mkspecs/${QMAKESPEC}
 	doins src/qsa/qsa.prf
 
 	#libs
 	dolib lib/libqsa.so.${PV}
-	cd ${D}/${QTDIR}/lib
+	cd "${D}/${QTDIR}"/lib
 	ln -s libqsa.so.${PV} libqsa.so.1.1
 	ln -s libqsa.so.1.1 libqsa.so.1
 	ln -s libqsa.so.1 libqsa.so
 	cd -
-	insinto ${QTDIR}/lib
+	insinto "${QTDIR}"/lib
 	doins lib/libqsa.prl
 
 	#QSA plugin (SEditor) for Qt designer
-	insinto ${QTDIR}/plugins/designer
+	insinto "${QTDIR}"/plugins/designer
 	doins plugins/designer/libqseditorplugin.so
 
 	#documentation