stop using $IMAGE

Package-Manager: portage-2.1.2.2

diff --git a/net-dialup/minicom/minicom-2.1-r2.ebuild b/net-dialup/minicom/minicom-2.1-r2.ebuild
index c2f25921e02792e2575b546e1b931c2d5f294b41..cb2c70e1cf742a9617f60245f103174953daa5f8 100644 (file)
--- a/net-dialup/minicom/minicom-2.1-r2.ebuild
+++ b/net-dialup/minicom/minicom-2.1-r2.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/net-dialup/minicom/minicom-2.1-r2.ebuild,v 1.12 2006/11/18 12:21:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.1-r2.ebuild,v 1.13 2007/03/10 14:52:00 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -52,5 +52,5 @@ src_install() {
 
 pkg_preinst() {
        [[ -s /etc/minicom/minirc.dfl ]] \
-               && rm -f "${IMAGE}"/etc/minicom/minirc.dfl
+               && rm -f "${D}"/etc/minicom/minirc.dfl
 }

diff --git a/net-dialup/misdn/misdn-1.0.4.ebuild b/net-dialup/misdn/misdn-1.0.4.ebuild
index 1f091327cf6d522790a334a9105af6e359ce3c80..463629717c065d95df69030cfb84d9af98dce3fc 100644 (file)
--- a/net-dialup/misdn/misdn-1.0.4.ebuild
+++ b/net-dialup/misdn/misdn-1.0.4.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/net-dialup/misdn/misdn-1.0.4.ebuild,v 1.4 2007/02/10 09:09:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-1.0.4.ebuild,v 1.5 2007/03/10 14:50:27 vapier Exp $
 
 inherit eutils linux-mod
 
@@ -13,11 +13,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 
-RDEPEND=">=net-dialup/capi4k-utils-20050718
-       sys-devel/bc"
-
-S="${WORKDIR}/${MY_P}/drivers/isdn/hardware/mISDN"
-
 # list of echo canceller use flags,
 # first active in this list is selected (=order does matter)
 MISDN_EC_FLAGS="ecmg2 eckb1 ecmark2"
@@ -29,6 +24,11 @@ MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB" "HFCMINI" "XHFC" "SPEEDF
 IUSE="ecaggressive ${MISDN_EC_FLAGS}"
 for i in ${MISDN_MODULES[@]}; do IUSE="${IUSE} misdn_cards_${i}"; done
 
+RDEPEND=">=net-dialup/capi4k-utils-20050718
+       sys-devel/bc"
+
+S=${WORKDIR}/${MY_P}/drivers/isdn/hardware/mISDN
+
 ### Begin: Helper functions
 
 select_echo_cancel() {
@@ -165,11 +165,11 @@ src_install() {
 
 pkg_preinst() {
        if [ -e "${ROOT}"/etc/misdn-init.conf ]; then
-               cp "${ROOT}"/etc/misdn-init.conf "${IMAGE}"/etc
+               cp "${ROOT}"/etc/misdn-init.conf "${D}"/etc
        else
-               sed -i -e "s:/etc/misdn-init.conf:${IMAGE}\0:" "${IMAGE}"/usr/sbin/misdn-init
-               "${IMAGE}"/usr/sbin/misdn-init config
-               sed -i -e "s:${IMAGE}/etc/misdn-init.conf:/etc/misdn-init.conf:" "${IMAGE}"/usr/sbin/misdn-init
+               sed -i -e "s:/etc/misdn-init.conf:${D}\0:" "${D}"/usr/sbin/misdn-init
+               "${D}"/usr/sbin/misdn-init config
+               sed -i -e "s:${D}/etc/misdn-init.conf:/etc/misdn-init.conf:" "${D}"/usr/sbin/misdn-init
        fi
 }