From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 10 Mar 2007 14:52:36 +0000 (+0000)
Subject: stop using $IMAGE
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=52315d60e74cdc0f268b9ae3b59a1a33a6caf226;p=gentoo.git

stop using $IMAGE
Package-Manager: portage-2.1.2.2
---

diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.3.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.3.ebuild
index 8f9f3fe1a45f..f6d92ad65433 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.3.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.3.ebuild,v 1.8 2006/08/15 19:38:50 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.3.ebuild,v 1.9 2007/03/10 14:51:44 vapier Exp $
 
 DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -31,5 +31,5 @@ src_install() {
 }
 
 pkg_preinst() {
-	chgrp portage ${IMAGE}/var/delta-webrsync
+	chgrp portage ${D}/var/delta-webrsync
 }
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r1.ebuild
index ae1211b2e916..2122e4bf69bc 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r1.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r1.ebuild,v 1.2 2006/11/08 18:00:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r1.ebuild,v 1.3 2007/03/10 14:51:44 vapier Exp $
 
 inherit eutils
 
@@ -33,5 +33,5 @@ src_install() {
 }
 
 pkg_preinst() {
-	chgrp portage ${IMAGE}/var/delta-webrsync
+	chgrp portage ${D}/var/delta-webrsync
 }
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r2.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r2.ebuild
index e603a0b446e7..b6ec2adf224c 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r2.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r2.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/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r2.ebuild,v 1.5 2007/01/30 04:39:27 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r2.ebuild,v 1.6 2007/03/10 14:51:44 vapier Exp $
 
 inherit eutils
 
@@ -8,8 +8,8 @@ DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 SRC_URI="mirror://gentoo/${P}"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
 IUSE=""
 
@@ -18,21 +18,23 @@ RDEPEND=">=sys-apps/portage-2.1.1-r1
 	>=dev-util/diffball-0.6.5
 	x86? ( app-arch/tarsync )"
 
+S=${WORKDIR}
+
 src_unpack() {
-	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die "failed cping $P"
-	epatch "${FILESDIR}/3.5.1-metadata.patch"
-	epatch "${FILESDIR}/3.5.1-md5sum.patch"
-	epatch "${FILESDIR}/3.5.1-post_sync.patch"
+	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die "failed cping ${P}"
+	epatch "${FILESDIR}"/3.5.1-metadata.patch
+	epatch "${FILESDIR}"/3.5.1-md5sum.patch
+	epatch "${FILESDIR}"/3.5.1-post_sync.patch
 }
 
 src_compile() { :; }
 
 src_install() {
-	newbin "${WORKDIR}/${P}" "${PN}" || die "failed copying ${P}"
+	newbin ${P} ${PN} || die "failed copying ${P}"
 	keepdir /var/delta-webrsync
 	fperms 0770 /var/delta-webrsync
 }
 
 pkg_preinst() {
-	chgrp portage ${IMAGE}/var/delta-webrsync
+	chgrp portage "${D}"/var/delta-webrsync
 }
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1.ebuild
index 31dc9a067bd3..502999c24ada 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1.ebuild,v 1.6 2006/10/10 18:18:59 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1.ebuild,v 1.7 2007/03/10 14:51:44 vapier Exp $
 
 DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
@@ -30,5 +30,5 @@ src_install() {
 }
 
 pkg_preinst() {
-	chgrp portage ${IMAGE}/var/delta-webrsync
+	chgrp portage ${D}/var/delta-webrsync
 }
diff --git a/app-portage/herdstat/herdstat-1.1.1_p7.ebuild b/app-portage/herdstat/herdstat-1.1.1_p7.ebuild
index d2d03da89b53..ed81f520b4eb 100644
--- a/app-portage/herdstat/herdstat-1.1.1_p7.ebuild
+++ b/app-portage/herdstat/herdstat-1.1.1_p7.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/app-portage/herdstat/herdstat-1.1.1_p7.ebuild,v 1.10 2007/01/24 03:42:33 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/herdstat-1.1.1_p7.ebuild,v 1.11 2007/03/10 14:49:44 vapier Exp $
 
 inherit bash-completion toolchain-funcs
 
@@ -41,7 +41,7 @@ src_install() {
 }
 
 pkg_preinst() {
-	chgrp portage ${IMAGE}/var/lib/herdstat
+	chgrp portage ${D}/var/lib/herdstat
 }
 
 pkg_postinst() {
diff --git a/app-portage/herdstat/herdstat-1.1.2.ebuild b/app-portage/herdstat/herdstat-1.1.2.ebuild
index 7ac94c7cec7b..293fabb7cc2f 100644
--- a/app-portage/herdstat/herdstat-1.1.2.ebuild
+++ b/app-portage/herdstat/herdstat-1.1.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/app-portage/herdstat/herdstat-1.1.2.ebuild,v 1.3 2007/01/24 03:42:33 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/herdstat-1.1.2.ebuild,v 1.4 2007/03/10 14:49:44 vapier Exp $
 
 inherit bash-completion
 
@@ -49,7 +49,7 @@ src_install() {
 }
 
 pkg_preinst() {
-	chgrp portage ${IMAGE}/var/lib/herdstat
+	chgrp portage ${D}/var/lib/herdstat
 }
 
 pkg_postinst() {
diff --git a/app-portage/herdstat/herdstat-1.1.91-r1.ebuild b/app-portage/herdstat/herdstat-1.1.91-r1.ebuild
index 41fc252b9a06..0825b99ab04b 100644
--- a/app-portage/herdstat/herdstat-1.1.91-r1.ebuild
+++ b/app-portage/herdstat/herdstat-1.1.91-r1.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/app-portage/herdstat/herdstat-1.1.91-r1.ebuild,v 1.2 2007/02/28 15:05:55 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/herdstat-1.1.91-r1.ebuild,v 1.3 2007/03/10 14:49:44 vapier Exp $
 
 inherit bash-completion eutils
 
@@ -18,11 +18,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc readline test"
 
 RDEPEND=">=dev-cpp/libherdstat-0.2.0
-		 readline? ( sys-libs/readline )"
+	 readline? ( sys-libs/readline )"
 DEPEND="${RDEPEND}
-		>=sys-apps/sed-4
-		dev-util/pkgconfig
-		doc? ( dev-python/docutils )"
+	>=sys-apps/sed-4
+	dev-util/pkgconfig
+	doc? ( dev-python/docutils )"
 
 pkg_setup() {
 	if has test $FEATURES && ! use test ; then
@@ -32,13 +32,13 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	if ! use readline ; then
-		epatch ${FILESDIR}/${PN}-1.1.91-undefined-lhp.patch
+		epatch "${FILESDIR}"/${PN}-1.1.91-undefined-lhp.patch
 	fi
 
-	epatch ${FILESDIR}/herds-xml-location-update.patch
+	epatch "${FILESDIR}"/herds-xml-location-update.patch
 }
 
 src_compile() {
@@ -69,13 +69,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	chgrp portage ${IMAGE}/var/lib/herdstat
+	chgrp portage "${D}"/var/lib/herdstat
 }
 
 pkg_postinst() {
 	# remove any previous caches, as it's possible that the internal
 	# format has changed, and may cause bugs.
-	rm -f ${ROOT}/var/lib/herdstat/*cache*
+	rm -f "${ROOT}"/var/lib/herdstat/*cache*
 
 	elog
 	elog "You must be in the portage group to use herdstat."
diff --git a/app-portage/porthole/porthole-0.5.0.ebuild b/app-portage/porthole/porthole-0.5.0.ebuild
index 6bd880c2a96e..92dbadb973f9 100644
--- a/app-portage/porthole/porthole-0.5.0.ebuild
+++ b/app-portage/porthole/porthole-0.5.0.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.5.0.ebuild,v 1.2 2006/02/27 20:41:43 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.5.0.ebuild,v 1.3 2007/03/10 14:52:36 vapier Exp $
 
 inherit distutils
 
 DESCRIPTION="A GTK+-based frontend to Portage"
 HOMEPAGE="http://porthole.sourceforge.net"
 SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
 IUSE="debug nls"
+
 RDEPEND=">=dev-lang/python-2.3
 	>=sys-apps/portage-2.0.51-r3
 	>=dev-python/pygtk-2.4.0
@@ -18,23 +20,22 @@ RDEPEND=">=dev-lang/python-2.3
 	>=gnome-base/libglade-2.5.0
 	nls? ( virtual/libintl )
 	debug? ( >=dev-python/pycrash-0.4_pre3 )"
-
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.14 )"
 
 src_install() {
 	distutils_src_install
-	chmod -R a+rX ${D}/usr/share/porthole
+	chmod -R a+rX "${D}"/usr/share/porthole
 	dodoc TODO README NEWS AUTHORS COPYING MANIFEST
 	keepdir /var/log/porthole
 	fperms g+w /var/log/porthole
 	# Compile localizations if necessary
-	if use nls; then
-		cd ${D}/usr/share/porthole
+	if use nls ; then
+		cd "${D}"/usr/share/porthole
 		./pocompile.sh
 	fi
 }
 
 pkg_preinst() {
-	chgrp portage ${IMAGE}/var/log/porthole
+	chgrp portage "${D}"/var/log/porthole
 }