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

(Portage version: 2.1.4.4)

4 files changed, 51 insertions, 41 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/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