summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2007-10-03 18:00:36 +0000
committerCaleb Tennis <caleb@gentoo.org>2007-10-03 18:00:36 +0000
commit5f3abfc48a8e056d417d4d7596bda20d37907008 (patch)
treee3c5480fd58493d865581dcc87fea87506db7364 /x11-libs
parentAdd ~sparc keyword at AT request --- Bug #194629 (diff)
downloadhistorical-5f3abfc48a8e056d417d4d7596bda20d37907008.tar.gz
historical-5f3abfc48a8e056d417d4d7596bda20d37907008.tar.bz2
historical-5f3abfc48a8e056d417d4d7596bda20d37907008.zip
Fix some quoting issues
Package-Manager: portage-2.1.3.9
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt/ChangeLog5
-rw-r--r--x11-libs/qt/Manifest16
-rw-r--r--x11-libs/qt/qt-4.3.2.ebuild36
3 files changed, 30 insertions, 27 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index f7da01a0c208..b74ee4d62c53 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -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@gentoo.org> qt-4.3.2.ebuild:
+ Fix some quoting issues
*qt-4.3.2 (03 Oct 2007)
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 51db2e11c3b1..ebffa152a5b6 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -165,14 +165,14 @@ EBUILD qt-4.3.1.ebuild 8585 RMD160 441439ac14de2cd5bb12bce86ec88ac3d8797e14 SHA1
MD5 42a62a8619d60b6615c2c4eaf8a273c6 qt-4.3.1.ebuild 8585
RMD160 441439ac14de2cd5bb12bce86ec88ac3d8797e14 qt-4.3.1.ebuild 8585
SHA256 9e879347de621b856d1cd8bd7d93c4b0a9b1ffc916cef59f9ca5497b57f4416b qt-4.3.1.ebuild 8585
-EBUILD qt-4.3.2.ebuild 8519 RMD160 664f95b0e67383ce6b9b34b39acdd9b9f415acca SHA1 fa2b2ebde26afb478adb8dc90c52e1d54893558c SHA256 3a571e5f5fbf593ffcba76722d35c7ddc9cf93e5a1a343cf4f05e623818cb11c
-MD5 11fbe8384c7f94a1ab6b758fd4725f3b qt-4.3.2.ebuild 8519
-RMD160 664f95b0e67383ce6b9b34b39acdd9b9f415acca qt-4.3.2.ebuild 8519
-SHA256 3a571e5f5fbf593ffcba76722d35c7ddc9cf93e5a1a343cf4f05e623818cb11c qt-4.3.2.ebuild 8519
-MISC ChangeLog 34772 RMD160 3cd88705d207546df8116859a02eee37de37b755 SHA1 fc4a8be1eb1eb3a25ba21dd7571c196b07402c0a SHA256 96f1796acb6154dbd6ed590c4d50d1e622418c99f1a6e2d1857d6a804e37de26
-MD5 89b8f6433a81861df8fbf9e06e8ba23b ChangeLog 34772
-RMD160 3cd88705d207546df8116859a02eee37de37b755 ChangeLog 34772
-SHA256 96f1796acb6154dbd6ed590c4d50d1e622418c99f1a6e2d1857d6a804e37de26 ChangeLog 34772
+EBUILD qt-4.3.2.ebuild 8555 RMD160 a1d5e45840496af432d94ed43a285778d0c11b88 SHA1 c192296f3f5eb60c9d2a707cd2d47b340401993c SHA256 17481a905d8660142888722afe37d532ad05894ea7b5d68c6d24b6d06b8f99ca
+MD5 8b4878866ac1bc2fe3cb6f42afa4aded qt-4.3.2.ebuild 8555
+RMD160 a1d5e45840496af432d94ed43a285778d0c11b88 qt-4.3.2.ebuild 8555
+SHA256 17481a905d8660142888722afe37d532ad05894ea7b5d68c6d24b6d06b8f99ca qt-4.3.2.ebuild 8555
+MISC ChangeLog 34863 RMD160 e90bfc375a7f06ba91dcf09109a4cb477864e690 SHA1 edfeadff5c2cb1b9ff8fcc936a2f71745ae8de12 SHA256 9cb9d20f9e1398dcf8bfe9bca97838a803ac3e976dee6c107c32abba060015a7
+MD5 c83277f921ac072bc935915427224507 ChangeLog 34863
+RMD160 e90bfc375a7f06ba91dcf09109a4cb477864e690 ChangeLog 34863
+SHA256 9cb9d20f9e1398dcf8bfe9bca97838a803ac3e976dee6c107c32abba060015a7 ChangeLog 34863
MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
diff --git a/x11-libs/qt/qt-4.3.2.ebuild b/x11-libs/qt/qt-4.3.2.ebuild
index cea991a1ea46..a393ea50b0b7 100644
--- a/x11-libs/qt/qt-4.3.2.ebuild
+++ b/x11-libs/qt/qt-4.3.2.ebuild
@@ -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 @@ qt_mkspecs_dir() {
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 @@ src_unpack() {
# 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 @@ src_unpack() {
# 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 @@ src_install() {
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