From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1J9QFy-0002f4-Aa for garchives@archives.gentoo.org; Mon, 31 Dec 2007 19:25:03 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.2/8.14.0) with SMTP id lBVJOx2Z021247; Mon, 31 Dec 2007 19:24:59 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.2/8.14.0) with ESMTP id lBVJOvRi021208 for ; Mon, 31 Dec 2007 19:24:57 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 2770665476 for ; Mon, 31 Dec 2007 19:24:57 +0000 (UTC) Received: from je_fro by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1J9QFs-0008R6-3D for gentoo-commits@lists.gentoo.org; Mon, 31 Dec 2007 19:24:56 +0000 From: "Jeffrey Gardner (je_fro)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, je_fro@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sci-misc/qcad: qcad-2.0.4.0-r3.ebuild ChangeLog qcad-2.0.4.0-r5.ebuild qcad-2.0.4.0-r1.ebuild qcad-2.0.4.0-r2.ebuild qcad-2.0.4.0-r4.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: qcad-2.0.4.0-r3.ebuild ChangeLog qcad-2.0.4.0-r5.ebuild qcad-2.0.4.0-r1.ebuild qcad-2.0.4.0-r2.ebuild qcad-2.0.4.0-r4.ebuild X-VCS-Directories: sci-misc/qcad X-VCS-Committer: je_fro X-VCS-Committer-Name: Jeffrey Gardner Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: Jeffrey Gardner Date: Mon, 31 Dec 2007 19:24:56 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org X-Archives-Salt: db4f0751-9958-4de1-a03f-f207923de7bd X-Archives-Hash: 91453b679323f4d799eca6cd0b596cac je_fro 07/12/31 19:24:56 Modified: qcad-2.0.4.0-r3.ebuild ChangeLog qcad-2.0.4.0-r5.ebuild qcad-2.0.4.0-r1.ebuild qcad-2.0.4.0-r2.ebuild qcad-2.0.4.0-r4.ebuild Log: Fix tons of quoting errors (Portage version: 2.1.4_rc12) Revision Changes Path 1.12 sci-misc/qcad/qcad-2.0.4.0-r3.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild?rev=1.12&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild?r1=1.11&r2=1.12 Index: qcad-2.0.4.0-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- qcad-2.0.4.0-r3.ebuild 10 Aug 2007 19:43:38 -0000 1.11 +++ qcad-2.0.4.0-r3.ebuild 31 Dec 2007 19:24:55 -0000 1.12 @@ -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/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild,v 1.11 2007/08/10 19:43:38 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r3.ebuild,v 1.12 2007/12/31 19:24:55 je_fro Exp $ inherit kde-functions eutils @@ -24,8 +24,8 @@ src_unpack() { unpack ${A} # Bug 112864 - fix dir unpack bug - touch ${WORKDIR} - cd ${S} + touch "${WORKDIR}" + cd "${S}" echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT" echo >> defs.pro "CONFIG += thread release" echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}" @@ -34,15 +34,15 @@ sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \ die "unable to correct path to qmake in $file" done - epatch ${FILESDIR}/${MY_P}-gentoo.patch - epatch ${FILESDIR}/manual.patch-r1 - epatch ${FILESDIR}/${MY_P}-intptr.patch - cd ${S}/scripts + epatch "${FILESDIR}"/${MY_P}-gentoo.patch + epatch "${FILESDIR}"/manual.patch-r1 + epatch "${FILESDIR}"/${MY_P}-intptr.patch + cd "${S}"/scripts sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \ die "unable to add MAKEOPTS" sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \ || die "unable to set CHOST" - cd ${S}/qcad/src + cd "${S}"/qcad/src sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \ || die "sed failed on assistant path" sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \ @@ -57,14 +57,14 @@ # this is a fake homedir that is writeable under the sandbox, so that the build process # can do anything it wants with it. REALHOME="$HOME" - mkdir -p $T/fakehome/.kde - mkdir -p $T/fakehome/.qt + mkdir -p "${T}"/fakehome/.kde + mkdir -p "${T}"/fakehome/.qt export HOME="$T/fakehome" # things that should access the real homedir [ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/" cd scripts sh build_qcad.sh || die "build failed" - if ! test -f ${S}/qcad/qcad; then + if ! test -f "${S}"/qcad/qcad; then die "no binary created, build failed" fi } @@ -73,13 +73,13 @@ cd qcad dobin qcad dodir /usr/share/${P} - cp -pPR patterns examples fonts qm ${D}/usr/share/${P} + cp -pPR patterns examples fonts qm "${D}"/usr/share/${P} cd .. dodoc README if use doc; then insinto /usr/share/doc/${PF}/ - cd ${WORKDIR} - cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF} + cd "${WORKDIR}" + cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF} fi make_desktop_entry ${PN} ${PN} ${PN} Office } 1.24 sci-misc/qcad/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/ChangeLog?rev=1.24&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/ChangeLog?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/ChangeLog?r1=1.23&r2=1.24 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ChangeLog 10 Aug 2007 19:43:38 -0000 1.23 +++ ChangeLog 31 Dec 2007 19:24:55 -0000 1.24 @@ -1,10 +1,18 @@ # ChangeLog for sci-misc/qcad # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.23 2007/08/10 19:43:38 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/ChangeLog,v 1.24 2007/12/31 19:24:55 je_fro Exp $ + + 31 Dec 2007; Jeff Gardner qcad-2.0.4.0-r1.ebuild, + qcad-2.0.4.0-r2.ebuild, qcad-2.0.4.0-r3.ebuild, qcad-2.0.4.0-r4.ebuild, + qcad-2.0.4.0-r5.ebuild: + Fix tons of quoting errors + + 31 Dec 2007; Jeff Gardner ChangeLog: + Fix my email address *qcad-2.0.4.0-r5 (10 Aug 2007) - 10 Aug 2007; +qcad-2.0.4.0-r5.ebuild: + 10 Aug 2007; +qcad-2.0.4.0-r5.ebuild: Fix make_desktop_entry. 15 Nov 2006; Markus Rothe qcad-2.0.4.0-r3.ebuild: 1.2 sci-misc/qcad/qcad-2.0.4.0-r5.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild?r1=1.1&r2=1.2 Index: qcad-2.0.4.0-r5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qcad-2.0.4.0-r5.ebuild 10 Aug 2007 19:43:38 -0000 1.1 +++ qcad-2.0.4.0-r5.ebuild 31 Dec 2007 19:24:55 -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/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild,v 1.1 2007/08/10 19:43:38 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r5.ebuild,v 1.2 2007/12/31 19:24:55 je_fro Exp $ inherit kde-functions eutils @@ -24,8 +24,8 @@ src_unpack() { unpack ${A} # Bug 112864 - fix dir unpack bug - touch ${WORKDIR} - cd ${S} + touch "${WORKDIR}" + cd "${S}" echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT" echo >> defs.pro "CONFIG += thread release" echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}" @@ -34,15 +34,15 @@ sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \ die "unable to correct path to qmake in $file" done - epatch ${FILESDIR}/${MY_P}-gentoo.patch - epatch ${FILESDIR}/manual.patch-r1 - epatch ${FILESDIR}/${MY_P}-intptr.patch - cd ${S}/scripts + epatch "${FILESDIR}"/${MY_P}-gentoo.patch + epatch "${FILESDIR}"/manual.patch-r1 + epatch "${FILESDIR}"/${MY_P}-intptr.patch + cd "${S}"/scripts sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \ die "unable to add MAKEOPTS" sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \ || die "unable to set CHOST" - cd ${S}/qcad/src + cd "${S}"/qcad/src sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \ || die "sed failed on assistant path" sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \ @@ -57,14 +57,14 @@ # this is a fake homedir that is writeable under the sandbox, so that the build process # can do anything it wants with it. REALHOME="$HOME" - mkdir -p $T/fakehome/.kde - mkdir -p $T/fakehome/.qt + mkdir -p "${T}"/fakehome/.kde + mkdir -p "${T}"/fakehome/.qt export HOME="$T/fakehome" # things that should access the real homedir [ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/" cd scripts sh build_qcad.sh || die "build failed" - if ! test -f ${S}/qcad/qcad; then + if ! test -f "${S}"/qcad/qcad; then die "no binary created, build failed" fi } @@ -77,14 +77,14 @@ chmod ugo+rx qcad dobin qcad dodir /usr/share/${P} - cp -pPR patterns examples fonts qm ${D}/usr/share/${P} + cp -pPR patterns examples fonts qm "${D}"/usr/share/${P} doicon src/xpm/${PN}.xpm make_desktop_entry ${PN} QCad ${PN}.xpm Office cd .. dodoc README if use doc; then insinto /usr/share/doc/${PF}/ - cd ${WORKDIR} - cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF} + cd "${WORKDIR}" + cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF} fi } 1.11 sci-misc/qcad/qcad-2.0.4.0-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild?r1=1.10&r2=1.11 Index: qcad-2.0.4.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qcad-2.0.4.0-r1.ebuild 10 Aug 2007 19:43:38 -0000 1.10 +++ qcad-2.0.4.0-r1.ebuild 31 Dec 2007 19:24:55 -0000 1.11 @@ -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/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild,v 1.10 2007/08/10 19:43:38 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r1.ebuild,v 1.11 2007/12/31 19:24:55 je_fro Exp $ inherit kde-functions eutils @@ -24,7 +24,7 @@ src_unpack() { unpack ${A} # mv doc ${S}/qcad/ - cd ${S} + cd "${S}" echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT" echo >> defs.pro "CONFIG += thread release" echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}" @@ -33,14 +33,14 @@ sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \ die "unable to correct path to qmake in $file" done - epatch ${FILESDIR}/${MY_P}-gentoo.patch - epatch ${FILESDIR}/manual.patch-r1 - cd ${S}/scripts + epatch "${FILESDIR}"/${MY_P}-gentoo.patch + epatch "${FILESDIR}"/manual.patch-r1 + cd "${S}"/scripts sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \ die "unable to add MAKEOPTS" sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \ || die "unable to set CHOST" - cd ${S}/qcad/src + cd "${S}"/qcad/src sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \ || die "sed failed on assistant path" sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \ @@ -55,14 +55,14 @@ # this is a fake homedir that is writeable under the sandbox, so that the build process # can do anything it wants with it. REALHOME="$HOME" - mkdir -p $T/fakehome/.kde - mkdir -p $T/fakehome/.qt + mkdir -p "$T"/fakehome/.kde + mkdir -p "$T"/fakehome/.qt export HOME="$T/fakehome" # things that should access the real homedir [ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/" cd scripts sh build_qcad.sh || die "build failed" - if ! test -f ${S}/qcad/qcad; then + if ! test -f "${S}"/qcad/qcad; then die "no binary created, build failed" fi } @@ -75,13 +75,13 @@ chmod ugo+rx qcad dobin qcad dodir /usr/share/${P} - cp -pPR patterns examples fonts qm ${D}/usr/share/${P} + cp -pPR patterns examples fonts qm "${D}"/usr/share/${P} cd .. dodoc README if use doc; then insinto /usr/share/doc/${PF}/ - cd ${WORKDIR} - cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF} + cd "${WORKDIR}" + cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF} fi make_desktop_entry ${PN} ${PN} ${PN} Office } 1.6 sci-misc/qcad/qcad-2.0.4.0-r2.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild?r1=1.5&r2=1.6 Index: qcad-2.0.4.0-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qcad-2.0.4.0-r2.ebuild 10 Aug 2007 19:43:38 -0000 1.5 +++ qcad-2.0.4.0-r2.ebuild 31 Dec 2007 19:24:55 -0000 1.6 @@ -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/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild,v 1.5 2007/08/10 19:43:38 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r2.ebuild,v 1.6 2007/12/31 19:24:55 je_fro Exp $ inherit kde-functions eutils @@ -24,8 +24,8 @@ src_unpack() { unpack ${A} # Bug 112864 - fix dir unpack bug - touch ${WORKDIR} - cd ${S} + touch "${WORKDIR}" + cd "${S}" echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT" echo >> defs.pro "CONFIG += thread release" echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}" @@ -34,14 +34,14 @@ sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \ die "unable to correct path to qmake in $file" done - epatch ${FILESDIR}/${MY_P}-gentoo.patch - epatch ${FILESDIR}/manual.patch-r1 - cd ${S}/scripts + epatch "${FILESDIR}"/${MY_P}-gentoo.patch + epatch "${FILESDIR}"/manual.patch-r1 + cd "${S}"/scripts sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \ die "unable to add MAKEOPTS" sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \ || die "unable to set CHOST" - cd ${S}/qcad/src + cd "${S}"/qcad/src sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \ || die "sed failed on assistant path" sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \ @@ -56,14 +56,14 @@ # this is a fake homedir that is writeable under the sandbox, so that the build process # can do anything it wants with it. REALHOME="$HOME" - mkdir -p $T/fakehome/.kde - mkdir -p $T/fakehome/.qt - export HOME="$T/fakehome" + mkdir -p "${T}"/fakehome/.kde + mkdir -p "${T}"fakehome/.qt + export HOME="${T}/fakehome" # things that should access the real homedir [ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/" cd scripts sh build_qcad.sh || die "build failed" - if ! test -f ${S}/qcad/qcad; then + if ! test -f "${S}"/qcad/qcad; then die "no binary created, build failed" fi } @@ -76,13 +76,13 @@ chmod ugo+rx qcad dobin qcad dodir /usr/share/${P} - cp -pPR patterns examples fonts qm ${D}/usr/share/${P} + cp -pPR patterns examples fonts qm "${D}"/usr/share/${P} cd .. dodoc README if use doc; then insinto /usr/share/doc/${PF}/ - cd ${WORKDIR} - cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF} + cd "${WORKDIR}" + cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF} fi make_desktop_entry ${PN} ${PN} ${PN} Office } 1.4 sci-misc/qcad/qcad-2.0.4.0-r4.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild?r1=1.3&r2=1.4 Index: qcad-2.0.4.0-r4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qcad-2.0.4.0-r4.ebuild 10 Aug 2007 19:43:38 -0000 1.3 +++ qcad-2.0.4.0-r4.ebuild 31 Dec 2007 19:24:55 -0000 1.4 @@ -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/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild,v 1.3 2007/08/10 19:43:38 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/qcad/qcad-2.0.4.0-r4.ebuild,v 1.4 2007/12/31 19:24:55 je_fro Exp $ inherit kde-functions eutils @@ -24,8 +24,8 @@ src_unpack() { unpack ${A} # Bug 112864 - fix dir unpack bug - touch ${WORKDIR} - cd ${S} + touch "${WORKDIR}" + cd "${S}" echo >> defs.pro "DEFINES += _REENTRANT QT_THREAD_SUPPORT" echo >> defs.pro "CONFIG += thread release" echo >> defs.pro "QMAKE_CFLAGS_RELEASE += ${CFLAGS}" @@ -34,15 +34,15 @@ sed -i -e 's~qmake~${QTDIR}/bin/qmake~g' $file || \ die "unable to correct path to qmake in $file" done - epatch ${FILESDIR}/${MY_P}-gentoo.patch - epatch ${FILESDIR}/manual.patch-r1 - epatch ${FILESDIR}/${MY_P}-intptr.patch - cd ${S}/scripts + epatch "${FILESDIR}"/${MY_P}-gentoo.patch + epatch "${FILESDIR}"/manual.patch-r1 + epatch "${FILESDIR}"/${MY_P}-intptr.patch + cd "${S}"/scripts sed -i -e 's/^make/make ${MAKEOPTS}/' build_qcad.sh || \ die "unable to add MAKEOPTS" sed -i -e 's/^\.\/configure/.\/configure --host=${CHOST}/' build_qcad.sh \ || die "unable to set CHOST" - cd ${S}/qcad/src + cd "${S}"/qcad/src sed -i -e "s:FULLASSISTANTPATH:${QTDIR}/bin:" qc_applicationwindow.cpp \ || die "sed failed on assistant path" sed -i -e "s:QCADDOCPATH:/usr/share/doc/${PF}:" \ @@ -57,14 +57,14 @@ # this is a fake homedir that is writeable under the sandbox, so that the build process # can do anything it wants with it. REALHOME="$HOME" - mkdir -p $T/fakehome/.kde - mkdir -p $T/fakehome/.qt + mkdir -p "${T}"/fakehome/.kde + mkdir -p "${T}"/fakehome/.qt export HOME="$T/fakehome" # things that should access the real homedir [ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/" cd scripts sh build_qcad.sh || die "build failed" - if ! test -f ${S}/qcad/qcad; then + if ! test -f "${S}"/qcad/qcad; then die "no binary created, build failed" fi } @@ -77,13 +77,13 @@ chmod ugo+rx qcad dobin qcad dodir /usr/share/${P} - cp -pPR patterns examples fonts qm ${D}/usr/share/${P} + cp -pPR patterns examples fonts qm "${D}"/usr/share/${P} cd .. dodoc README if use doc; then insinto /usr/share/doc/${PF}/ - cd ${WORKDIR} - cp -pPR qcaddoc.adp cad ${D}usr/share/doc/${PF} + cd "${WORKDIR}" + cp -pPR qcaddoc.adp cad "${D}"usr/share/doc/${PF} fi make_desktop_entry ${PN} ${PN} ${PN} Office } -- gentoo-commits@gentoo.org mailing list