dont use IMAGE and fix USE=nvram usage

Package-Manager: portage-2.1.2.2

3 files changed, 26 insertions, 28 deletions

diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 76f89d852ed4..0774af46edc8 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 DIST gentoo-vdr-scripts-0.3.7.tar.bz2 24794 RMD160 29715b69be2f9f1a22caa79aa54d259c42c4582b SHA1 e3b73d51204ff98a63d3edaba5f38ad913302d53 SHA256 5f71ee9461b1963e5e88166b636230ed4a00f84fc38c44799477ba811c902ead
 DIST gentoo-vdr-scripts-0.3.8.tar.bz2 26450 RMD160 681c08fc2502269229d677b2ffc05cb3705f4fde SHA1 31532746f4f72be7c712177902ac7ba5c0d886e8 SHA256 6a7cd90d83dca22be79a55665c422dcd92755a019594f86b741a04a6742cc2ce
-EBUILD gentoo-vdr-scripts-0.3.7.ebuild 3661 RMD160 2d30fbab5564492dc28935d3e0ad5f22c78b9ec0 SHA1 321a2ad101d16ef277bfae2a36f01e47273628dc SHA256 f43eb4fc843a0cb2108c271d803b4d2832945777a26a58dd6fc5977cd73dfa0a
-MD5 054cb5e37ead42cc7647f5c227f35fc5 gentoo-vdr-scripts-0.3.7.ebuild 3661
-RMD160 2d30fbab5564492dc28935d3e0ad5f22c78b9ec0 gentoo-vdr-scripts-0.3.7.ebuild 3661
-SHA256 f43eb4fc843a0cb2108c271d803b4d2832945777a26a58dd6fc5977cd73dfa0a gentoo-vdr-scripts-0.3.7.ebuild 3661
-EBUILD gentoo-vdr-scripts-0.3.8.ebuild 3671 RMD160 2313d95d47af0d6d8b769a1634c4015af8255452 SHA1 53ce4be7348c7be83ea07be040752b29caa1ef52 SHA256 f374b5cf86fba2f3f52dcf2ac17040342a0dadd0d38ab1b5dc622b2f02c77fa2
-MD5 263c28e8739ad7c1b9c896861450d122 gentoo-vdr-scripts-0.3.8.ebuild 3671
-RMD160 2313d95d47af0d6d8b769a1634c4015af8255452 gentoo-vdr-scripts-0.3.8.ebuild 3671
-SHA256 f374b5cf86fba2f3f52dcf2ac17040342a0dadd0d38ab1b5dc622b2f02c77fa2 gentoo-vdr-scripts-0.3.8.ebuild 3671
+EBUILD gentoo-vdr-scripts-0.3.7.ebuild 3646 RMD160 b758913e25a69d54fb614f65e95de16f101334be SHA1 8ae3967068d16422c84168bead896f4cf6063571 SHA256 8b530bcee1bd43286f871982da2c083aa23448583e7b401be555cb5881174521
+MD5 d0e8358003d46f8eb7995bc6d05fe135 gentoo-vdr-scripts-0.3.7.ebuild 3646
+RMD160 b758913e25a69d54fb614f65e95de16f101334be gentoo-vdr-scripts-0.3.7.ebuild 3646
+SHA256 8b530bcee1bd43286f871982da2c083aa23448583e7b401be555cb5881174521 gentoo-vdr-scripts-0.3.7.ebuild 3646
+EBUILD gentoo-vdr-scripts-0.3.8.ebuild 3646 RMD160 5525016c5b22cf3de5b49007db3bdf4190325b32 SHA1 a29dd8053c3b5078da9b74012dedbb236f567256 SHA256 bd4f67acdb030fa049f5a324bbafefebdade0360b5154b43fcf2aa62af11f2f1
+MD5 5ab8b94eff73bb1c63a2fb283c60f205 gentoo-vdr-scripts-0.3.8.ebuild 3646
+RMD160 5525016c5b22cf3de5b49007db3bdf4190325b32 gentoo-vdr-scripts-0.3.8.ebuild 3646
+SHA256 bd4f67acdb030fa049f5a324bbafefebdade0360b5154b43fcf2aa62af11f2f1 gentoo-vdr-scripts-0.3.8.ebuild 3646
 MISC ChangeLog 15164 RMD160 16cdebb04eefb5047de34c586e6569f3b65fc7d8 SHA1 7d8710f905819f79fa741e10796c53be72b2d9e8 SHA256 2aeb1db8bfe8de14bc0b021c40d668c689c04dd2d8a930ba9bc6cb2f584650ed
 MD5 a921ccbdaa0d1736ce820b352af7e059 ChangeLog 15164
 RMD160 16cdebb04eefb5047de34c586e6569f3b65fc7d8 ChangeLog 15164
@@ -28,7 +28,7 @@ SHA256 3aca0cd650e4513d72878d443ae584cff62a624d848e82e0fccfcd8a05fda7ec files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF1luTt2vP6XvVdOcRAnBdAJ4pZ/pdywIOFFBmK+IAOy2iEUUq9QCgnsFJ
-KnynduGUO7FvC1Xpiiqmp4U=
-=/WzN
+iD8DBQFF8sUw8bi6rjpTunYRAvqDAJ4mHFCcOshOU6wzuYCKZMZiokk8DgCg3pZ9
+NOM4ctxjUhjbdlgyKRC40SI=
+=/imH
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.7.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.7.ebuild
index 1cdc0a176932..a0eb450d05a9 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.7.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.7.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/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.7.ebuild,v 1.5 2007/02/17 01:34:05 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.7.ebuild,v 1.6 2007/03/10 14:48:06 vapier Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 KEYWORDS="~amd64 ~ppc x86"
 
-RDEPEND="nvram? ( x86? ( sys-power/nvram-wakeup ) )
+RDEPEND="nvram? ( sys-power/nvram-wakeup )
 		app-admin/sudo
 		!<media-tv/vdr-dvd-scripts-0.0.2"
 
@@ -59,12 +59,12 @@ pkg_preinst() {
 	fi
 	if [[ ${PLUGINS_NEW} > 0 ]]; then
 		einfo "Using existing /etc/conf.d/vdr.plugins"
-		cp ${ROOT}/etc/conf.d/vdr.plugins ${IMAGE}/etc/conf.d/vdr.plugins
+		cp ${ROOT}/etc/conf.d/vdr.plugins ${D}/etc/conf.d/vdr.plugins
 	else
 		einfo "Using PLUGINS from /etc/conf.d/vdr"
 		local PLUGIN
 		for PLUGIN in $(source ${ROOT}/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> ${IMAGE}/etc/conf.d/vdr.plugins
+			echo ${PLUGIN} >> ${D}/etc/conf.d/vdr.plugins
 		done
 	fi
 }
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.8.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.8.ebuild
index 66f0dad13fb8..c84698bad2c3 100644
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.8.ebuild
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.8.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.8.ebuild,v 1.4 2007/02/17 01:34:05 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.3.8.ebuild,v 1.5 2007/03/10 14:48:06 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
 HOMEPAGE="http://www.gentoo.org/"
-LICENSE="GPL-2"
-SLOT="0"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	http://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
 
+LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="nvram? ( x86? ( sys-power/nvram-wakeup ) )
-		app-admin/sudo
-		!<media-tv/vdr-dvd-scripts-0.0.2"
-
 IUSE="nvram"
 
+RDEPEND="nvram? ( sys-power/nvram-wakeup )
+	app-admin/sudo
+	!<media-tv/vdr-dvd-scripts-0.0.2"
+
 VDR_HOME=/var/vdr
 
 pkg_setup() {
@@ -33,7 +32,7 @@ pkg_setup() {
 
 src_install() {
 	local myopts=""
-	if use x86; then
+	if use nvram ; then
 		myopts="${myopts} NVRAM=1"
 	fi
 
@@ -59,12 +58,12 @@ pkg_preinst() {
 	fi
 	if [[ ${PLUGINS_NEW} > 0 ]]; then
 		einfo "Using existing /etc/conf.d/vdr.plugins"
-		cp ${ROOT}/etc/conf.d/vdr.plugins ${IMAGE}/etc/conf.d/vdr.plugins
+		cp ${ROOT}/etc/conf.d/vdr.plugins ${D}/etc/conf.d/vdr.plugins
 	else
 		einfo "Using PLUGINS from /etc/conf.d/vdr"
 		local PLUGIN
 		for PLUGIN in $(source ${ROOT}/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> ${IMAGE}/etc/conf.d/vdr.plugins
+			echo ${PLUGIN} >> ${D}/etc/conf.d/vdr.plugins
 		done
 	fi
 }
@@ -91,7 +90,7 @@ pkg_postinst() {
 		elog
 	fi
 
-	if use x86 && use !nvram; then
+	if ! use nvram ; then
 		elog "nvram wakeup is now optional."
 		elog "To make use of it enable the use flag nvram for ${PN}"
 		elog "or just emerge nvram-wakeup."
@@ -138,4 +137,3 @@ pkg_config() {
 		einfo "Edited /etc/sudoers"
 	fi
 }
-