| 1 |
zmedico 07/10/02 04:43:53 |
| 2 |
|
| 3 |
Modified: portage-2.0.51.22-r3.ebuild |
| 4 |
Log: |
| 5 |
Fix variable quoting so repoman won't complain. |
| 6 |
(Portage version: 2.2_pre7901) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.11 sys-apps/portage/portage-2.0.51.22-r3.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild?rev=1.11&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild?rev=1.11&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild?r1=1.10&r2=1.11 |
| 14 |
|
| 15 |
Index: portage-2.0.51.22-r3.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild,v |
| 18 |
retrieving revision 1.10 |
| 19 |
retrieving revision 1.11 |
| 20 |
diff -u -r1.10 -r1.11 |
| 21 |
--- portage-2.0.51.22-r3.ebuild 10 Mar 2007 14:31:25 -0000 1.10 |
| 22 |
+++ portage-2.0.51.22-r3.ebuild 2 Oct 2007 04:43:53 -0000 1.11 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild,v 1.10 2007/03/10 14:31:25 vapier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild,v 1.11 2007/10/02 04:43:53 zmedico Exp $ |
| 28 |
|
| 29 |
inherit toolchain-funcs flag-o-matic |
| 30 |
|
| 31 |
@@ -27,7 +27,7 @@ |
| 32 |
src_unpack() { |
| 33 |
unpack ${A} |
| 34 |
cd "${S}" |
| 35 |
- patch -p1 < ${FILESDIR}/2.0.51.22-fixes.patch |
| 36 |
+ patch -p1 < "${FILESDIR}"/2.0.51.22-fixes.patch |
| 37 |
} |
| 38 |
|
| 39 |
src_compile() { |
| 40 |
@@ -65,12 +65,14 @@ |
| 41 |
|
| 42 |
if ! python_has_lchown; then |
| 43 |
cd "${S}"/src/python-missingos |
| 44 |
- ./setup.py install --root ${D} || die "Failed to install missingos module" |
| 45 |
+ ./setup.py install --root "${D}" || \ |
| 46 |
+ die "Failed to install missingos module" |
| 47 |
fi |
| 48 |
|
| 49 |
if use x86-fbsd; then |
| 50 |
cd "${S}"/src/bsd-flags |
| 51 |
- ./setup.py install --root ${D} || die "Failed to install bsd-chflags module" |
| 52 |
+ ./setup.py install --root "${D}" || \ |
| 53 |
+ die "Failed to install bsd-chflags module" |
| 54 |
fi |
| 55 |
|
| 56 |
dodir /usr/lib/portage/bin |
| 57 |
@@ -106,32 +108,32 @@ |
| 58 |
dosym ../lib/portage/bin/regenworld /usr/sbin/regenworld |
| 59 |
dosym ../lib/portage/bin/emerge-webrsync /usr/sbin/emerge-webrsync |
| 60 |
|
| 61 |
- doenvd ${FILESDIR}/05portage.envd |
| 62 |
+ doenvd "${FILESDIR}"/05portage.envd |
| 63 |
} |
| 64 |
|
| 65 |
pkg_preinst() { |
| 66 |
if has livecvsportage ${FEATURES} && [ "${ROOT}" = "/" ]; then |
| 67 |
- rm -rf ${D}/usr/lib/portage/pym/* |
| 68 |
- mv ${D}/usr/lib/portage/bin/tbz2tool ${T} |
| 69 |
- rm -rf ${D}/usr/lib/portage/bin/* |
| 70 |
- mv ${T}/tbz2tool ${D}/usr/lib/portage/bin/ |
| 71 |
+ rm -rf "${D}"usr/lib/portage/pym/* |
| 72 |
+ mv "${D}"usr/lib/portage/bin/tbz2tool "${T}" |
| 73 |
+ rm -rf "${D}"usr/lib/portage/bin/* |
| 74 |
+ mv "${T}"/tbz2tool "${D}"usr/lib/portage/bin/ |
| 75 |
else |
| 76 |
- rm /usr/lib/portage/pym/*.pyc >& /dev/null |
| 77 |
- rm /usr/lib/portage/pym/*.pyo >& /dev/null |
| 78 |
+ rm "${ROOT}"usr/lib/portage/pym/*.pyc >& /dev/null |
| 79 |
+ rm "${ROOT}"usr/lib/portage/pym/*.pyo >& /dev/null |
| 80 |
fi |
| 81 |
} |
| 82 |
|
| 83 |
pkg_postinst() { |
| 84 |
local x |
| 85 |
|
| 86 |
- [ -f "${ROOT}etc/make.conf" ] || touch ${ROOT}etc/make.conf |
| 87 |
+ [ -f "${ROOT}"etc/make.conf ] || touch "${ROOT}"etc/make.conf |
| 88 |
|
| 89 |
install -o root -g portage -m 0755 -d "${ROOT}/etc/portage" |
| 90 |
|
| 91 |
if [ ! -f "${ROOT}/var/lib/portage/world" ] && |
| 92 |
- [ -f ${ROOT}/var/cache/edb/world ] && |
| 93 |
- [ ! -h ${ROOT}/var/cache/edb/world ]; then |
| 94 |
- mv ${ROOT}/var/cache/edb/world ${ROOT}/var/lib/portage/world |
| 95 |
+ [ -f "${ROOT}"/var/cache/edb/world ] && |
| 96 |
+ [ ! -h "${ROOT}"/var/cache/edb/world ]; then |
| 97 |
+ mv "${ROOT}"/var/cache/edb/world "${ROOT}"/var/lib/portage/world |
| 98 |
ln -s ../../lib/portage/world /var/cache/edb/world |
| 99 |
fi |
| 100 |
|
| 101 |
@@ -155,7 +157,7 @@ |
| 102 |
elog " /etc/portage/profile/virtuals and will not be modified by portage." |
| 103 |
echo |
| 104 |
|
| 105 |
- for X in ${ROOT}etc/._cfg????_make.globals; do |
| 106 |
+ for X in "${ROOT}"etc/._cfg????_make.globals; do |
| 107 |
# Overwrite the globals file automatically. |
| 108 |
[ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals" |
| 109 |
done |
| 110 |
|
| 111 |
|
| 112 |
|
| 113 |
-- |
| 114 |
gentoo-commits@g.o mailing list |
Archives