[gentoo-commits] gentoo-x86 commit in x11-libs/qt: ChangeLog qt-4.3.2.ebuild

[Caleb Tennis (caleb)]

caleb       07/10/03 18:00:36

  Modified:             ChangeLog qt-4.3.2.ebuild
  Log:
  Fix some quoting issues
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.491                x11-libs/qt/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?rev=1.491&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?rev=1.491&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?r1=1.490&r2=1.491

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -r1.490 -r1.491
--- ChangeLog	3 Oct 2007 14:58:26 -0000	1.490
+++ ChangeLog	3 Oct 2007 18:00:36 -0000	1.491
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.490 2007/10/03 14:58:26 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.491 2007/10/03 18:00:36 caleb Exp $
+
+  03 Oct 2007; Caleb Tennis <caleb@g.o> qt-4.3.2.ebuild:
+  Fix some quoting issues
 
 *qt-4.3.2 (03 Oct 2007)
 



1.2                  x11-libs/qt/qt-4.3.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild?r1=1.1&r2=1.2

Index: qt-4.3.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-4.3.2.ebuild	3 Oct 2007 14:58:26 -0000	1.1
+++ qt-4.3.2.ebuild	3 Oct 2007 18:00:36 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild,v 1.1 2007/10/03 14:58:26 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.2.ebuild,v 1.2 2007/10/03 18:00:36 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -116,10 +116,10 @@
 src_unpack() {
 
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/qt-4.2.3-hppa-ldcw-fix.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/qt-4.2.3-hppa-ldcw-fix.patch
 
-	cd ${S}/mkspecs/$(qt_mkspecs_dir)
+	cd "${S}"/mkspecs/$(qt_mkspecs_dir)
 	# set c/xxflags and ldflags
 
 	# Don't let the user go too overboard with flags.  If you really want to, uncomment
@@ -141,7 +141,7 @@
 
 	# The trolls moved the definitions of the above stuff for g++, so we need to edit those files
 	# separately as well.
-	cd ${S}/mkspecs/common
+	cd "${S}"/mkspecs/common
 
 	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \
 		-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \
@@ -154,12 +154,12 @@
 	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
 	sed -i -e "s:X11R6/::" linux.conf
 
-	cd ${S}/qmake
+	cd "${S}"/qmake
 
 	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
 	-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" Makefile.unix
 
-	cd ${S}
+	cd "${S}"
 
 }
 
@@ -228,33 +228,33 @@
 	export PATH="${S}/bin:${PATH}"
 	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
 
-	make INSTALL_ROOT=${D} install_subtargets || die
-	make INSTALL_ROOT=${D} install_qmake || die
-	make INSTALL_ROOT=${D} install_mkspecs || die
+	make INSTALL_ROOT="${D}" install_subtargets || die
+	make INSTALL_ROOT="${D}" install_qmake || die
+	make INSTALL_ROOT="${D}" install_mkspecs || die
 
 	if use doc; then
-		make INSTALL_ROOT=${D} install_htmldocs || die
+		make INSTALL_ROOT="${D}" install_htmldocs || die
 	fi
 
 	# Install the translations.	 This may get use flagged later somehow
-	make INSTALL_ROOT=${D} install_translations || die
+	make INSTALL_ROOT="${D}" install_translations || die
 
 	keepdir "${QTSYSCONFDIR}"
 
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.la
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/*.prl
-	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.la
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.prl
+	sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
 
 	# pkgconfig files refer to WORKDIR/bin as the moc and uic locations.  Fix:
-	sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${D}/${QTLIBDIR}/pkgconfig/*.pc
+	sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
 
 	# Move .pc files into the pkgconfig directory
 	dodir ${QTPCDIR}
-	mv ${D}/${QTLIBDIR}/pkgconfig/*.pc ${D}/${QTPCDIR}
+	mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
 
 	# Install .desktop files, from bug #174033
 	insinto /usr/share/applications
-	doins ${FILESDIR}/qt4/*.desktop
+	doins "${FILESDIR}"/qt4/*.desktop
 
 	# List all the multilib libdirs
 	local libdirs



-- 
gentoo-commits@g.o mailing list