corrected path to sed

Package-Manager: portage-2.1_pre4-r1

5 files changed, 158 insertions, 7 deletions

diff --git a/media-tv/gentoo-vdr-scripts/ChangeLog b/media-tv/gentoo-vdr-scripts/ChangeLog
index 00e2258dea3b..5755d47b3e54 100644
--- a/media-tv/gentoo-vdr-scripts/ChangeLog
+++ b/media-tv/gentoo-vdr-scripts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/gentoo-vdr-scripts
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.41 2006/02/07 19:39:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/gentoo-vdr-scripts/ChangeLog,v 1.42 2006/02/12 21:51:41 zzam Exp $
+
+*gentoo-vdr-scripts-0.2.3-r1 (12 Feb 2006)
+
+  12 Feb 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/gentoo-vdr-scripts-0.2.3-sed-path.patch,
+  +gentoo-vdr-scripts-0.2.3-r1.ebuild:
+  corrected path to sed
 
   07 Feb 2006; Matthias Schwarzott <zzam@gentoo.org>
   +files/gentoo-vdr-scripts-0.2.2-config-comment-irctrl.patch,
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index 706ac06d4858..055ceb627fa8 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fc7e8e8855b2d643eedbc51790ea3f22 ChangeLog 8258
-RMD160 86dd080e1c52d5383c8f316fdc293dfe9725c47c ChangeLog 8258
-SHA256 3364405ce1382f56eff9a5239d1e0a2e7e4dfbec776797e38d38c35d76388e83 ChangeLog 8258
+MD5 45a78f5ee9d1fc0b64175cb7cfe70594 ChangeLog 8469
+RMD160 52e784b85adfa3a83f30d77cf1dc13fa0e22d5e7 ChangeLog 8469
+SHA256 8175de3661f9065e52926cc6585188fef48a8aa0a13e011bd72650ac8b725834 ChangeLog 8469
 MD5 f138047c23306296259dd46c6a272ef3 files/digest-gentoo-vdr-scripts-0.2 70
 RMD160 cf00f8968872a3aa00c0e3d239ab6ddb6f2fb57f files/digest-gentoo-vdr-scripts-0.2 70
 SHA256 dfc8798967b9aff50db3951e079b434834407de067b8f1e5ec304a506d389b9b files/digest-gentoo-vdr-scripts-0.2 70
@@ -16,6 +16,9 @@ SHA256 bd1595a4fe85c584f3c8a10157a4876943a7c98fd966bf28f5ec91bbbb0a527c files/di
 MD5 6ab2a9a17ac258d5c9266ec41dde06b8 files/digest-gentoo-vdr-scripts-0.2.3 262
 RMD160 49c7fea92af5fc3042a69133d6e6d7bcfc77dcd3 files/digest-gentoo-vdr-scripts-0.2.3 262
 SHA256 864fd0be170e089c02da9200bb5299d651a9938d24e3c048d984c61fd3cf57e6 files/digest-gentoo-vdr-scripts-0.2.3 262
+MD5 6ab2a9a17ac258d5c9266ec41dde06b8 files/digest-gentoo-vdr-scripts-0.2.3-r1 262
+RMD160 49c7fea92af5fc3042a69133d6e6d7bcfc77dcd3 files/digest-gentoo-vdr-scripts-0.2.3-r1 262
+SHA256 864fd0be170e089c02da9200bb5299d651a9938d24e3c048d984c61fd3cf57e6 files/digest-gentoo-vdr-scripts-0.2.3-r1 262
 MD5 2ecb98838292de6b7446a53a432753b7 files/digest-gentoo-vdr-scripts-0.2_alpha3 77
 RMD160 122da5c15699315c827863106b729cf04ec491ce files/digest-gentoo-vdr-scripts-0.2_alpha3 77
 SHA256 a6e762be96c42c5db38b649e3c8363d46c1f05e8d2f66ab6525a1dfcd2e21757 files/digest-gentoo-vdr-scripts-0.2_alpha3 77
@@ -37,12 +40,18 @@ SHA256 13bb7b5fce7b7609298ee25e9d63971a238941ffa0925156370bd38274540756 files/ge
 MD5 a413a4bc9431ba5a5880e1b12d54d0a4 files/gentoo-vdr-scripts-0.2.3-chuid-option.patch 509
 RMD160 258d377a09283ed1c160e58be261d58f490916b8 files/gentoo-vdr-scripts-0.2.3-chuid-option.patch 509
 SHA256 a18577e8b253ab81b85783a3cc051cb1b9350493f6e6f493d79034911a109c29 files/gentoo-vdr-scripts-0.2.3-chuid-option.patch 509
+MD5 4ae9360791c9fe2a838418ef9182812f files/gentoo-vdr-scripts-0.2.3-sed-path.patch 714
+RMD160 286ea3bc5445b05203e57c44be0139420ce70b9c files/gentoo-vdr-scripts-0.2.3-sed-path.patch 714
+SHA256 363c833d02fb8dbe994b42d8d6a870c8a2539286afc84cf47cdff2dc4c4ede57 files/gentoo-vdr-scripts-0.2.3-sed-path.patch 714
 MD5 d207ee6dbb8a33d2ef231bcde114b195 gentoo-vdr-scripts-0.2.1.ebuild 2640
 RMD160 e4fe99a3472a661da860a89bbbcbc67c3e6d5009 gentoo-vdr-scripts-0.2.1.ebuild 2640
 SHA256 5d45bc91ef77c05bbced572cf811e767a96d59491ce35501617b036d31436489 gentoo-vdr-scripts-0.2.1.ebuild 2640
 MD5 970aebb755d491fd5ed4f4f75dd00ed6 gentoo-vdr-scripts-0.2.2.ebuild 2778
 RMD160 72e09e2044cee8eb51ecbf62b8c5321023675d6c gentoo-vdr-scripts-0.2.2.ebuild 2778
 SHA256 0426fc76a8d7d6b19fc5d8a62aa2fa3796a37ad2f72f0b0a528746a3870ea1b9 gentoo-vdr-scripts-0.2.2.ebuild 2778
+MD5 6a3f572ecb34c0679519fee19e5c17a1 gentoo-vdr-scripts-0.2.3-r1.ebuild 2827
+RMD160 739565ab13a8f172234942196fad1974fe639f2c gentoo-vdr-scripts-0.2.3-r1.ebuild 2827
+SHA256 f9d9192bc4747c99e0b60923a0989ec36a51f7361759868c20ab520accc328c6 gentoo-vdr-scripts-0.2.3-r1.ebuild 2827
 MD5 9261f4270cf42d99bc148cc069568c96 gentoo-vdr-scripts-0.2.3.ebuild 2784
 RMD160 da5b7a4565b33e8bb3484b298f59f6cadfca00be gentoo-vdr-scripts-0.2.3.ebuild 2784
 SHA256 49a7213ae5d02cb92c93f1b69753131602b1a6667d5e8cbfc1318030667be3ce gentoo-vdr-scripts-0.2.3.ebuild 2784
@@ -61,7 +70,7 @@ SHA256 313f79a460281914a7f72cb73e91eec5f5cfec67c79f657743d49036d04951fe metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD6PeJZfSl1Kp5KmoRAlcTAKCIgd505OblFyuClc7qpmzcXdrRGgCfbJVt
-9ur7l/tXjU7C8HvzHyKFVyI=
-=9RkZ
+iD8DBQFD764oZfSl1Kp5KmoRAh/UAJ0amOYcvhbTPH4dqK2lB//Loxed7QCgiytj
+Sa3FsG6scrnTtBKFMj+aAzg=
+=7c3I
 -----END PGP SIGNATURE-----
diff --git a/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.2.3-r1 b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.2.3-r1
new file mode 100644
index 000000000000..5608e565581f
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/files/digest-gentoo-vdr-scripts-0.2.3-r1
@@ -0,0 +1,3 @@
+MD5 c7639949a97b962b70cc9c0d4dc1b275 gentoo-vdr-scripts-0.2.3.tgz 20353
+RMD160 d6d4c05bfa40eeeacde3286f7285336fcc16bb93 gentoo-vdr-scripts-0.2.3.tgz 20353
+SHA256 9ccf8883258245047296dd02dfc9a2baa5081821182085e6a99f83cfeccd3f35 gentoo-vdr-scripts-0.2.3.tgz 20353
diff --git a/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.2.3-sed-path.patch b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.2.3-sed-path.patch
new file mode 100644
index 000000000000..21f144315035
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/files/gentoo-vdr-scripts-0.2.3-sed-path.patch
@@ -0,0 +1,16 @@
+--- usr/lib/vdr/rcscript/pre-start-40-config-files.sh	(Revision 165)
++++ usr/lib/vdr/rcscript/pre-start-40-config-files.sh	(Revision 166)
+@@ -13,11 +13,11 @@
+ 
+ 	if [[ -f /etc/vdr/setup.conf ]]; then
+ 		if [[ -n "${STARTUP_VOLUME}" ]]; then
+-			/usr/bin/sed -i /etc/vdr/setup.conf -e "s/^CurrentVolume =.*\$/CurrentVolume = ${STARTUP_VOLUME}/"
++			/bin/sed -i /etc/vdr/setup.conf -e "s/^CurrentVolume =.*\$/CurrentVolume = ${STARTUP_VOLUME}/"
+ 		fi
+ 
+ 		if [[ -n "${STARTUP_CHANNEL}" ]]; then
+-			/usr/bin/sed -i /etc/vdr/setup.conf -e "s/^CurrentChannel =.*\$/CurrentChannel = ${STARTUP_CHANNEL}/"
++			/bin/sed -i /etc/vdr/setup.conf -e "s/^CurrentChannel =.*\$/CurrentChannel = ${STARTUP_CHANNEL}/"
+ 		fi
+ 	fi
+ 
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.2.3-r1.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..cffea07baaa2
--- /dev/null
+++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-0.2.3-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2006 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.2.3-r1.ebuild,v 1.1 2006/02/12 21:51:41 zzam Exp $
+
+inherit eutils
+
+IUSE="nvram"
+
+SRC_URI="mirror://gentoo/${P}.tgz"
+DESCRIPTION="scripts necessary for use of vdr as a set-top-box"
+HOMEPAGE="http://www.gentoo.org/"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="nvram? ( x86? ( sys-power/nvram-wakeup ) )
+		app-admin/sudo"
+
+VDR_HOME=/var/vdr
+
+pkg_setup() {
+	enewgroup vdr
+	if getent passwd vdr >/dev/null 2>&1; then
+		einfo "Modifying user vdr"
+		usermod -g vdr -s /bin/bash vdr
+		local grp
+		for grp in video audio cdrom; do
+			gpasswd -a vdr ${grp} >/dev/null
+		done
+	else
+		enewuser vdr -1 /bin/bash ${VDR_HOME} vdr,video,audio,cdrom
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-chuid-option.patch
+	epatch ${FILESDIR}/${PN}-0.2.2-config-comment-irctrl.patch
+	epatch ${FILESDIR}/${P}-sed-path.patch
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+	dodoc README TODO ChangeLog
+
+	if use nvram; then
+		if use x86; then
+			make install-nvram DESTDIR="${D}" || die "make install-nvram failed"
+		else
+			ewarn "nvram-wakeup is not available on this architecture."
+		fi
+	fi
+
+	keepdir /var/vdr/shutdown-data
+	keepdir /var/vdr/merged-config-files
+	keepdir /var/vdr/video/dvd-images
+	chown vdr:vdr -R ${D}/var/vdr
+}
+
+pkg_preinst() {
+	local owner
+	local d
+	for d in /etc/vdr /var/vdr; do
+		if [[ -d ${d} ]]; then
+			owner=$(stat ${d} -c "%U")
+			if [[ ${owner} != vdr ]]; then
+				einfo "Changing ownership of ${d}"
+				chown -R vdr:vdr ${d}
+			fi
+		fi
+	done
+}
+
+VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/lib/vdr/bin/vdrshutdown-really.sh"
+
+pkg_postinst() {
+	einfo
+	einfo "To make shutdown work add this line to /etc/sudoers"
+	einfo "    $VDRSUDOENTRY"
+	einfo
+	einfo "or execute this command:"
+	einfo "    emerge --config gentoo-vdr-scripts"
+	einfo
+	ewarn "The default video directory was moved to /var/vdr/video"
+	ewarn "If you have your video directory anywhere else, then"
+	ewarn "change the setting VIDEO in the file /etc/conf.d/vdr."
+	ewarn
+	if use x86 && use !nvram; then
+		ewarn "nvram wakeup is now optional."
+		ewarn "To make use of it enable the use flag nvram."
+	fi
+}
+
+pkg_config() {
+	if grep -q /usr/lib/vdr/bin/vdrshutdown-really.sh ${ROOT}/etc/sudoers; then
+		einfo "sudoers-entry for vdr already in place."
+	else
+		einfo "Adding this line to /etc/sudoers:"
+		einfo "+  ${VDRSUDOENTRY}"
+
+		cd ${T}
+		cat >sudoedit-vdr.sh <<-SUDOEDITOR
+			#!/bin/bash
+			echo "" >> \${1}
+			echo "${VDRSUDOENTRY}" >> \${1}
+		SUDOEDITOR
+		chmod a+x sudoedit-vdr.sh
+
+		VISUAL=${T}/sudoedit-vdr.sh visudo -f ${ROOT}/etc/sudoers || die "visudo failed"
+
+		einfo "Edited /etc/sudoers"
+	fi
+}
+