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.

Package-Manager: portage-2.1.2_rc1-r4

8 files changed, 255 insertions, 9 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/Manifest b/net-www/vdradmin-am/Manifest
index 6d442311ea8b..f7dc31b284a6 100644
--- a/net-www/vdradmin-am/Manifest
+++ b/net-www/vdradmin-am/Manifest
@@ -1,24 +1,44 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX confd-2 185 RMD160 20e71066ea1684ec41a717a48601586cd5619a22 SHA1 ec9f6fd352bc8d07afe8e70e8a58a52c5d769dfd SHA256 adb20ded4e29bf161a7fa85cfe37933d7c37d49f49e1db42a9377b412652e53e
+MD5 77647d9be4b03259417400ccbf30fd75 files/confd-2 185
+RMD160 20e71066ea1684ec41a717a48601586cd5619a22 files/confd-2 185
+SHA256 adb20ded4e29bf161a7fa85cfe37933d7c37d49f49e1db42a9377b412652e53e files/confd-2 185
 AUX vdradmin 516 RMD160 37c2c1b1fb68004bdb3f2f531177841216ef4486 SHA1 3c3181fa16a068d3634377de2564d45e71b39a7c SHA256 7c471799e98359a06124208bf91275d17c87f61d37f6b0c19408780c710c2312
 MD5 3f3c0fb586ac36f9d7eb45fd07172e87 files/vdradmin 516
 RMD160 37c2c1b1fb68004bdb3f2f531177841216ef4486 files/vdradmin 516
 SHA256 7c471799e98359a06124208bf91275d17c87f61d37f6b0c19408780c710c2312 files/vdradmin 516
+AUX vdradmin-2 896 RMD160 bc4b108413545534df90017b70c0d17e7b7ae9ad SHA1 72558d1e5e5d9f32d9fa235edc7e1977d0cae0de SHA256 1c8b5e034b6a1f8b444937290ccf09d7e1cb68381eded6154c65e0a94c15b8f8
+MD5 05e0a319d257336ffee5fa22429ef469 files/vdradmin-2 896
+RMD160 bc4b108413545534df90017b70c0d17e7b7ae9ad files/vdradmin-2 896
+SHA256 1c8b5e034b6a1f8b444937290ccf09d7e1cb68381eded6154c65e0a94c15b8f8 files/vdradmin-2 896
+AUX vdradmin-am-3.4.7_opera-search.diff 865 RMD160 faaa168fbd54e1d80afe849443dceb931a96d299 SHA1 d2ab6e99168e89b4202fcb9bc2a18e8b4ea3f110 SHA256 118acb7bb6ce95b7eba00e82a2501e0edab441d0015f18d0bfa3d6b6688338ff
+MD5 babe3cb0a9bb4b5868f3a5d9611bab61 files/vdradmin-am-3.4.7_opera-search.diff 865
+RMD160 faaa168fbd54e1d80afe849443dceb931a96d299 files/vdradmin-am-3.4.7_opera-search.diff 865
+SHA256 118acb7bb6ce95b7eba00e82a2501e0edab441d0015f18d0bfa3d6b6688338ff files/vdradmin-am-3.4.7_opera-search.diff 865
+AUX vdradmin-am-config-autoflush.diff 654 RMD160 f6d0a31c424c6a45d8786d2b98e9872e5e3ded5f SHA1 1a4b61fa0c218cecffb6530cabe5c59577b1df67 SHA256 1687001c6114cb373643982fb73a78e7656c70d253e9ff0d89b7ed466133f950
+MD5 910bd87790a16ac3303e6641151ade65 files/vdradmin-am-config-autoflush.diff 654
+RMD160 f6d0a31c424c6a45d8786d2b98e9872e5e3ded5f files/vdradmin-am-config-autoflush.diff 654
+SHA256 1687001c6114cb373643982fb73a78e7656c70d253e9ff0d89b7ed466133f950 files/vdradmin-am-config-autoflush.diff 654
 DIST vdradmin-am-3.4.6.tar.bz2 508340 RMD160 9a8039ebf5df52939720ec1d223937e60995c980 SHA1 3a1fffd2802cacc9117dbe749f585e1e1ba9ac4a SHA256 eeb9534f08a41ad3149446707417910e79ef76e958f4f216634557e9675d767a
 DIST vdradmin-am-3.4.7.tar.bz2 506628 RMD160 04413c1a767c668f0bb8d68dfe016fa449d06be6 SHA1 616b1e6d977fdcc20157030ab317e470cc5b2655 SHA256 46a07e9aed77d533a0e4045a733962db36beab025c7eb297eda0c0ec41d6f1c9
 EBUILD vdradmin-am-3.4.6.ebuild 1369 RMD160 652fce28de3d5d8c8da1bc8c337c29eb64446dcd SHA1 bd2eb297fa6f03b9e51297f69e9264ff07fe9d09 SHA256 f48d8435a08b79d61a5b8540e2767073ad5507059bdd4f3ad1ebcb2055a14d72
 MD5 72da23117758c63696c986b5d765e98e vdradmin-am-3.4.6.ebuild 1369
 RMD160 652fce28de3d5d8c8da1bc8c337c29eb64446dcd vdradmin-am-3.4.6.ebuild 1369
 SHA256 f48d8435a08b79d61a5b8540e2767073ad5507059bdd4f3ad1ebcb2055a14d72 vdradmin-am-3.4.6.ebuild 1369
+EBUILD vdradmin-am-3.4.7-r1.ebuild 3454 RMD160 0071631f77e589630d0401b4f473663254bec9fd SHA1 7e56dd8c35a51cf8069757f6cc3ac668c6bfec15 SHA256 bb1600749573b2963da527aee4f19ff3eb5147acad998adf4dc3361fdfebe680
+MD5 04a4738325ae2d22fcd594f26b2824ae vdradmin-am-3.4.7-r1.ebuild 3454
+RMD160 0071631f77e589630d0401b4f473663254bec9fd vdradmin-am-3.4.7-r1.ebuild 3454
+SHA256 bb1600749573b2963da527aee4f19ff3eb5147acad998adf4dc3361fdfebe680 vdradmin-am-3.4.7-r1.ebuild 3454
 EBUILD vdradmin-am-3.4.7.ebuild 1546 RMD160 d1228ec22cd03eac879ab5d94fdceedb7acb3e21 SHA1 505ade310d2a8cd1a7b2b79c377ca55c65fa92c7 SHA256 4def09e2972791cdc1cb59fb6a451111fe0c249cdbeb806722f2857c7ead202a
 MD5 7e63a702ca3eeeebf3fbd31d45f6e64d vdradmin-am-3.4.7.ebuild 1546
 RMD160 d1228ec22cd03eac879ab5d94fdceedb7acb3e21 vdradmin-am-3.4.7.ebuild 1546
 SHA256 4def09e2972791cdc1cb59fb6a451111fe0c249cdbeb806722f2857c7ead202a vdradmin-am-3.4.7.ebuild 1546
-MISC ChangeLog 698 RMD160 1d52bc36aae3aac19a2f44ef7603eab8388637ec SHA1 056b34350b9eb00288d4a5884920b86f5613ad27 SHA256 565a28a5653928145e80ab6dd700bf89f803368810d94fadb9f91127f06ebcef
-MD5 af235c120aabb2bb424e26f9add82b29 ChangeLog 698
-RMD160 1d52bc36aae3aac19a2f44ef7603eab8388637ec ChangeLog 698
-SHA256 565a28a5653928145e80ab6dd700bf89f803368810d94fadb9f91127f06ebcef ChangeLog 698
+MISC ChangeLog 1157 RMD160 809bf2b17beebc38abe5ebd379ac8ac27c9ed6d8 SHA1 11dd5f86450d11013fca0d83088083dcf8cf225a SHA256 83c6ef08ca96bc1cdf36f85a04e373b1586afc1b270c928c9efeee9529b9e88e
+MD5 b79eb29a742cd3ecee6f860151aa3e32 ChangeLog 1157
+RMD160 809bf2b17beebc38abe5ebd379ac8ac27c9ed6d8 ChangeLog 1157
+SHA256 83c6ef08ca96bc1cdf36f85a04e373b1586afc1b270c928c9efeee9529b9e88e ChangeLog 1157
 MISC metadata.xml 502 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 SHA1 cedec19d978ffb5fb76276d81da21e191678d787 SHA256 4f9650b92fce31432cc276364f35336489bf2a89151125295570d39752044818
 MD5 f8b74843a483dd4f645aa5da4ef6eee9 metadata.xml 502
 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 metadata.xml 502
@@ -29,11 +49,13 @@ SHA256 37ca38f7fea28c89564580e9ed0e472f58f355d22c02c3325a7e1d7ee72d7cc5 files/di
 MD5 45cf1c2faf63e70d5bc0267ded5784af files/digest-vdradmin-am-3.4.7 256
 RMD160 4470aa33d90fd5351062e42eff7e83830eb507ae files/digest-vdradmin-am-3.4.7 256
 SHA256 6ebb2dc5335b44c8c533e8015d138f5670b480fd230f3cf22b20ce3cc6147436 files/digest-vdradmin-am-3.4.7 256
+MD5 45cf1c2faf63e70d5bc0267ded5784af files/digest-vdradmin-am-3.4.7-r1 256
+RMD160 4470aa33d90fd5351062e42eff7e83830eb507ae files/digest-vdradmin-am-3.4.7-r1 256
+SHA256 6ebb2dc5335b44c8c533e8015d138f5670b480fd230f3cf22b20ce3cc6147436 files/digest-vdradmin-am-3.4.7-r1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: no further Information
 
-iD8DBQFFMi4Gdn07HTTCgIoRAk79AJ0SuGVYfYMlIQCXtLKqvRtSSa+QaQCghC3i
-CfksZv0bc4OfJt1dr7XeVTM=
-=DgsC
+iD8DBQFFT5irt2vP6XvVdOcRAml7AJoDpPJ49Z9HphlXnlSokAMb8ecgTQCdHY6q
+ulbB6A4Xt2I2NZM7hg744rw=
+=Wg5K
 -----END PGP SIGNATURE-----
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
+}
+