Copied revision from vdr-testing overlay. Contains patch for problem with opera-browser. Init-script disables utf8 for non utf8-enabled vdr. Ebuild now generates a good initial-configuration with correct pathes.

(Portage version: 2.1.2_rc1-r4)

7 files changed, 225 insertions, 1 deletions

diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog
index 75e39fb5c57f..cf978b1164ef 100644
--- a/net-www/vdradmin-am/ChangeLog
+++ b/net-www/vdradmin-am/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-www/vdradmin-am
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.3 2006/10/15 12:44:52 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.4 2006/11/06 20:18:41 zzam Exp $
+
+*vdradmin-am-3.4.7-r1 (06 Nov 2006)
+
+  06 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> +files/confd-2,
+  +files/vdradmin-2, +files/vdradmin-am-3.4.7_opera-search.diff,
+  +files/vdradmin-am-config-autoflush.diff, +vdradmin-am-3.4.7-r1.ebuild:
+  Copied revision from vdr-testing overlay. Contains patch for problem with
+  opera-browser. Init-script disables utf8 for non utf8-enabled vdr. Ebuild
+  now generates a good initial-configuration with correct pathes.
 
   15 Oct 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdradmin-am-3.4.7.ebuild:
diff --git a/net-www/vdradmin-am/files/confd-2 b/net-www/vdradmin-am/files/confd-2
new file mode 100644
index 000000000000..5f79178a44c3
--- /dev/null
+++ b/net-www/vdradmin-am/files/confd-2
@@ -0,0 +1,11 @@
+# Settings for vdradmin-am
+
+# Enable this when you know that your
+# vdr-binary does support utf8
+#
+#VDR_CAN_HANDLE_UTF8=yes
+
+
+# Run vdradmin-am as this user:
+#
+VDRADMIN_USER="vdradmin"
diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.4.7-r1 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.4.7-r1
new file mode 100644
index 000000000000..9e6e1aee7df2
--- /dev/null
+++ b/net-www/vdradmin-am/files/digest-vdradmin-am-3.4.7-r1
@@ -0,0 +1,3 @@
+MD5 b3f862dfa078bdef05b52a841850c65a vdradmin-am-3.4.7.tar.bz2 506628
+RMD160 04413c1a767c668f0bb8d68dfe016fa449d06be6 vdradmin-am-3.4.7.tar.bz2 506628
+SHA256 46a07e9aed77d533a0e4045a733962db36beab025c7eb297eda0c0ec41d6f1c9 vdradmin-am-3.4.7.tar.bz2 506628
diff --git a/net-www/vdradmin-am/files/vdradmin-2 b/net-www/vdradmin-am/files/vdradmin-2
new file mode 100644
index 000000000000..64703cc450c5
--- /dev/null
+++ b/net-www/vdradmin-am/files/vdradmin-2
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/files/vdradmin-2,v 1.1 2006/11/06 20:18:41 zzam Exp $
+
+depend() {
+	need vdr
+}
+
+set_charset() {
+	local capfile=/usr/share/vdr/capabilities.sh
+	[[ -e ${capfile} ]] && source ${capfile}
+	if [[ "${CAP_UTF8}" == "1" || "${VDR_CAN_HANDLE_UTF8}" == "yes" ]]; then
+		# do not clean out utf8
+		:
+	else
+		l=$(locale | sed -e 's/\.[uU][tT][fF]\(-\)\?8//' -e 's/^/export /')
+		eval $l
+	fi
+}
+
+start() {
+	ebegin "Starting vdradmin-am"
+
+	: ${VDRADMIN_USER:=vdradmin}
+	set_charset
+	start-stop-daemon --start --background --chuid ${VDRADMIN_USER} --exec /usr/bin/vdradmind.pl
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping vdradmin-am"
+	start-stop-daemon --stop --quiet --pidfile /var/tmp/vdradmin/vdradmind.pid
+	eend $?
+}
diff --git a/net-www/vdradmin-am/files/vdradmin-am-3.4.7_opera-search.diff b/net-www/vdradmin-am/files/vdradmin-am-3.4.7_opera-search.diff
new file mode 100644
index 000000000000..60062b274635
--- /dev/null
+++ b/net-www/vdradmin-am/files/vdradmin-am-3.4.7_opera-search.diff
@@ -0,0 +1,16 @@
+http://www.vdr-portal.de/board/thread.php?postid=525780#post525780
+fix problems on search function with browser Opera
+
+Joerg Bornkessel <hd_brummy@gentoo.org> 19 Oct 2006
+diff -Naur vdradmin-am-3.4.7.orig/template/default/navigation.html vdradmin-am-3.4.7/template/default/navigation.html
+--- vdradmin-am-3.4.7.orig/template/default/navigation.html	2006-10-19 16:11:26.164534802 +0200
++++ vdradmin-am-3.4.7/template/default/navigation.html	2006-10-19 16:12:23.532120051 +0200
+@@ -66,7 +66,7 @@
+ 
+ 		<form action="vdradmin.pl" method="get" name="FormName" target="main" class="search">
+ 			<input type="text" name="search" /><br />
+-			<input type="submit" name="submit" value="<?% gettext('Search') %?>" /
++			<input type="submit" name="submit" value="<?% gettext('Search') %?>" />
+ 			<input type="hidden" name="aktion" value="prog_summary" />
+ 		</form>
+ 	</div>
diff --git a/net-www/vdradmin-am/files/vdradmin-am-config-autoflush.diff b/net-www/vdradmin-am/files/vdradmin-am-config-autoflush.diff
new file mode 100644
index 000000000000..fb87e362d9ff
--- /dev/null
+++ b/net-www/vdradmin-am/files/vdradmin-am-config-autoflush.diff
@@ -0,0 +1,10 @@
+--- vdradmind.pl.orig	2006-10-19 13:59:19.000000000 +0200
++++ vdradmind.pl	2006-10-19 13:59:54.000000000 +0200
+@@ -343,6 +343,7 @@
+     if (/--config|-c/) {
+         ReadConfig() if (-e $CONFFILE);
+         LoadTranslation();
++	STDOUT->autoflush(1);
+         $CONFIG{VDR_HOST}   = Question(gettext("What's your VDR hostname (e.g video.intra.net)?"),               $CONFIG{VDR_HOST});
+         $CONFIG{VDR_PORT}   = Question(gettext("On which port does VDR listen to SVDRP queries?"),               $CONFIG{VDR_PORT});
+         $CONFIG{SERVERHOST} = Question(gettext("On which address should VDRAdmin-AM listen (0.0.0.0 for any)?"), $CONFIG{SERVERHOST});
diff --git a/net-www/vdradmin-am/vdradmin-am-3.4.7-r1.ebuild b/net-www/vdradmin-am/vdradmin-am-3.4.7-r1.ebuild
new file mode 100644
index 000000000000..e096b0779577
--- /dev/null
+++ b/net-www/vdradmin-am/vdradmin-am-3.4.7-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.4.7-r1.ebuild,v 1.1 2006/11/06 20:18:41 zzam Exp $
+
+inherit eutils
+
+RESTRICT="nostrip"
+
+DESCRIPTION="WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://andreas.vdr-developer.org/"
+SRC_URI="http://andreas.vdr-developer.org/download/${P}.tar.bz2"
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="unicode"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Template-Toolkit
+	>=dev-perl/Compress-Zlib-1.2.2
+	media-video/vdr
+	dev-perl/Compress-Zlib
+	dev-perl/Locale-gettext
+	dev-perl/Authen-SASL
+	dev-perl/Digest-HMAC
+	unicode? ( sys-devel/gettext )"
+
+ETC_DIR="/etc/vdradmin"
+LIB_DIR="/usr/share/vdradmin"
+VDRADMIN_USER="vdradmin"
+VDRADMIN_GROUP="vdradmin"
+TMP_DIR=/var/tmp/vdradmin
+
+pkg_setup() {
+	enewuser ${VDRADMIN_USER} -1 /bin/bash ${TMP_DIR}
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-config-autoflush.diff
+	epatch ${FILESDIR}/${P}_opera-search.diff
+	sed -i vdradmind.pl \
+		-e "/COMPILE_DIR/s-/tmp-${TMP_DIR}-" \
+		-e "s-/var/run/vdradmind.pid-/var/tmp/vdradmin/vdradmind.pid-"
+}
+
+
+src_compile() {
+
+	if ! use unicode; then
+		einfo "no need to compile"
+	else
+		einfo "additionally generating utf8 locales"
+		${S}/make.sh utf8add || die
+		${S}/make.sh po || die
+	fi
+}
+
+src_install() {
+
+	newinitd ${FILESDIR}/vdradmin-2 vdradmin
+	newconfd ${FILESDIR}/confd-2 vdradmin
+
+	dobin vdradmind.pl
+
+	insinto ${LIB_DIR}/template
+	doins -r ${S}/template/*
+
+	insinto ${LIB_DIR}/lib
+	doins -r ${S}/lib/*
+
+	insinto /usr/share/locale/
+	doins -r ${S}/locale/*
+
+	dodoc HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ
+	docinto contrib
+	dodoc ${S}/contrib/*
+
+	diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
+	keepdir "${ETC_DIR}"
+	keepdir "${TMP_DIR}"
+
+	dosed "s:FILES_IN_SYSTEM    = 0;:FILES_IN_SYSTEM    = 1;:g" /usr/bin/vdradmind.pl
+}
+
+pkg_preinst() {
+	if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
+		cp ${ROOT}${ETC_DIR}/vdradmind.conf ${D}${ETC_DIR}/vdradmind.conf
+	else
+		einfo "Creating a new config-file."
+		echo
+
+		cat <<-EOF > ${D}${ETC_DIR}/vdradmind.conf
+			VDRCONFDIR = /etc/vdr
+			VIDEODIR = /var/vdr/video
+			EPG_FILENAME = /var/vdr/video/epg.data
+			EPGIMAGES = /var/vdr/video/epgimages
+			PASSWORD = gentoo-vdr
+			USERNAME = gentoo-vdr
+		EOF
+		# feed it with newlines
+		yes "" \
+		  | ${D}/usr/bin/vdradmind.pl --cfgdir ${D}${ETC_DIR} --config \
+		  |sed -e 's/: /: \n/g'
+
+		einfo
+		einfo "Created default user/password: gentoo-vdr/gentoo-vdr"
+		einfo
+		einfo "you can run \"emerge --config vdradmin-am\" if"
+		einfo "the default-values for vdr does not match your"
+		einfo "installation or change it in Setup-Menu of Web-Interface."
+		echo
+	fi
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${D}${ETC_DIR}/vdradmind.conf
+}
+
+pkg_postinst() {
+	if [[ -d ${ROOT}${ETC_DIR} ]]; then
+		local owner=$(stat ${ROOT}${ETC_DIR} -c "%U")
+		if [[ ${owner} != vdradmin ]]; then
+			einfo "Changing ownership of ${ETC_DIR}."
+			chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}
+		fi
+	fi
+
+	if [[ -d ${ROOT}/tmp/usr/share/vdradmin ]]; then
+		ewarn "You have a leftover directory of vdradmin."
+		ewarn "You can safely remove it with:"
+		ewarn "# rm -rf /tmp/usr/share/vdradmin/template"
+		ewarn "# rmdir -p /tmp/usr/share/vdradmin"
+	fi
+}
+
+pkg_config() {
+	/usr/bin/vdradmind.pl -c
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}/vdradmind.conf
+}
+