Fix initscript on openrc, thanks to Daniel Pielmeier <daniel.pielmeier@googlemail.com>.

Package-Manager: portage-2.1.4.4

4 files changed, 249 insertions, 3 deletions

diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog
index 4d6886d272fd..733b1d8aa453 100644
--- a/net-www/vdradmin-am/ChangeLog
+++ b/net-www/vdradmin-am/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/vdradmin-am
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.24 2007/12/20 14:38:01 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.25 2008/02/29 10:23:28 zzam Exp $
+
+*vdradmin-am-3.6.1-r1 (29 Feb 2008)
+
+  29 Feb 2008; Matthias Schwarzott <zzam@gentoo.org> +files/vdradmin-rc-3,
+  +vdradmin-am-3.6.1-r1.ebuild:
+  Fix initscript on openrc, thanks to Daniel Pielmeier
+  <daniel.pielmeier@googlemail.com>.
 
 *vdradmin-am-3.6.1 (20 Dec 2007)
 
diff --git a/net-www/vdradmin-am/Manifest b/net-www/vdradmin-am/Manifest
index 59415bf3ef12..35415d3c8e66 100644
--- a/net-www/vdradmin-am/Manifest
+++ b/net-www/vdradmin-am/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX confd-2 295 RMD160 292ac9960158dc09b5c31adf85b49c29a5f2ca1b SHA1 07f5964bb3eaa0962d37ae7af0d049246cdb4ac5 SHA256 87d9c7449946c2724e0ddeb4de7c2eeee492b99f813131e47dafd9e860f8649f
 AUX vdradmin-2 997 RMD160 fa852d404935c840d49ffe962598b0f96d509e2e SHA1 03675132806213317e5200feeff76ccad03762f4 SHA256 63ac1bd5d6e5008923a1d9ffb9869a7645794969fe95e4098277804c498ff365
 AUX vdradmin-am-config-autoflush.diff 654 RMD160 f6d0a31c424c6a45d8786d2b98e9872e5e3ded5f SHA1 1a4b61fa0c218cecffb6530cabe5c59577b1df67 SHA256 1687001c6114cb373643982fb73a78e7656c70d253e9ff0d89b7ed466133f950
+AUX vdradmin-rc-3 1191 RMD160 a0aa7bd29679c9f17ba49b113f9d5f632aa343b9 SHA1 a92d0ee7c2122e3002b64e5eff3e1a1c68056445 SHA256 f83fa6f94307c6cfd450a35110df309112953006c7c486107846c2f6d8447ed3
 DIST vdradmin-am-3.5.3.tar.bz2 532120 RMD160 393c3068ab7e8ba8cc5420bd3099005676c6013e SHA1 2e3af767b20a7c6527488c7397159d8d1fd90229 SHA256 06ac48d085dba0ee5d041574886c097ae3e0674288d695738011b092f07692ba
 DIST vdradmin-am-3.6.0.tar.bz2 562795 RMD160 abf8085fdfa84155ac4e9f2a5a06c526bdb51149 SHA1 3981f37aca77e9f6be28db0e3f6921ac0f611621 SHA256 4e822a3a4482ec0d5dec087b8f68201675e030e929093f20662cde355d6c3e53
 DIST vdradmin-am-3.6.0beta.tar.bz2 542066 RMD160 a894c53dc34042c5430dfb9e5a75c090661d3881 SHA1 0a5335702a9f8014ccd60f7d1fda46e0c240df28 SHA256 5e4eb3b94e73506bdb230425324e1c63a87d6e76efafe7459e7fd13a96c7de02
@@ -10,6 +14,14 @@ EBUILD vdradmin-am-3.5.3.ebuild 4774 RMD160 98c9059b4874d45f5b8c7c316315149ce62f
 EBUILD vdradmin-am-3.6.0.ebuild 4818 RMD160 8508cefb3e6f288f0f68daad4423ef1276dec28a SHA1 4ad177d724ef52763cf918ead7628a4082f96d1b SHA256 59c5afeba5c5e8e8ebca02195376a65cc5b1ee78e63f8e4c2fb00bf97364b05e
 EBUILD vdradmin-am-3.6.0_beta.ebuild 4823 RMD160 aeea6fb79750609fdc3e95c270492fc819498547 SHA1 09774e23d6d3389a7589a8b50ad564ae8b5e221a SHA256 33115d1d5bf27ca894eb654c91db2af634a447a057ec38abdda4b1519c75f077
 EBUILD vdradmin-am-3.6.0_rc.ebuild 4821 RMD160 c08f93933c576ad469471ad7289ac3e3fdb82d8f SHA1 5c71f35e3cb663e2a4215a9dae89e02cb1471b9f SHA256 f78a821d80294c244e070b3176b83d7f124bce7ece3bc5b5d61ec7599dce7722
+EBUILD vdradmin-am-3.6.1-r1.ebuild 4824 RMD160 fdf10aedbb644fbdd1d05e33b513d1263297f81b SHA1 a77372b80559e480431a6c2851d121cb9e99c50d SHA256 3b357a208cc13318f7c95bb266cdf179340b1feb8d139ec585b8f64b4e0a4ca2
 EBUILD vdradmin-am-3.6.1.ebuild 4818 RMD160 88634cbfb32b433ec959a7909635641a89d9e39f SHA1 b7223020f8bddb45e5f5e06601dc439562843757 SHA256 5e1f149fb0dbca1414753bb41e02357be784aa6e3ade2033c04b38e0d4de20bf
-MISC ChangeLog 4689 RMD160 db3266575fe8d827a5c7fa60d4031dbadc1564e0 SHA1 4f9a0a656586d2e22b532c5a1acbc4fecb57d101 SHA256 050bb7b2d7f00b102d9cfc4a02d62b15e35382f44df49648b257eb66c8c36e71
+MISC ChangeLog 4926 RMD160 f62cb0e291b373cfb2544026d5ae7bb69ca402a1 SHA1 4a19087293453f15ca3d6d727124fe19460bb78a SHA256 824992e05ab23ae5219215e4720279926684e21edc2df0817e4975d8391ebd2e
 MISC metadata.xml 502 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 SHA1 cedec19d978ffb5fb76276d81da21e191678d787 SHA256 4f9650b92fce31432cc276364f35336489bf2a89151125295570d39752044818
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHx90pt2vP6XvVdOcRAg0WAKDU75Pl+bmufJhmCTVR58KStdZBvQCfZDH2
+P9xO3S4mjUz65zFJMwSaYyU=
+=hXg2
+-----END PGP SIGNATURE-----
diff --git a/net-www/vdradmin-am/files/vdradmin-rc-3 b/net-www/vdradmin-am/files/vdradmin-rc-3
new file mode 100755
index 000000000000..d04725321532
--- /dev/null
+++ b/net-www/vdradmin-am/files/vdradmin-rc-3
@@ -0,0 +1,44 @@
+#!/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-rc-3,v 1.1 2008/02/29 10:23:29 zzam Exp $
+
+depend() {
+	need vdr
+}
+
+set_charset() {
+	local capfile=/usr/share/vdr/capabilities.sh
+	[ -e "${capfile}" ] && . ${capfile}
+	if [ "${CAP_UTF8}" = "1" -o "${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}
+
+	# Guarantee that vdradmin can access its tmp-dir
+	chown -R "${VDRADMIN_USER}:vdradmin" /var/tmp/vdradmin
+
+	set_charset
+	if [ -x /etc/init.d/root ]; then
+		# running on baselayout-2/openrc
+		start-stop-daemon --start --background --chuid "${VDRADMIN_USER}" --exec /usr/bin/perl /usr/bin/vdradmind.pl
+	else
+		start-stop-daemon --start --background --chuid "${VDRADMIN_USER}" --exec /usr/bin/vdradmind.pl
+	fi
+	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/vdradmin-am-3.6.1-r1.ebuild b/net-www/vdradmin-am/vdradmin-am-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..bc81754095d1
--- /dev/null
+++ b/net-www/vdradmin-am/vdradmin-am-3.6.1-r1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2008 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.6.1-r1.ebuild,v 1.1 2008/02/29 10:23:28 zzam Exp $
+
+inherit eutils
+
+MY_P="${P/_/}"
+
+DESCRIPTION="WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://andreas.vdr-developer.org/"
+SRC_URI="http://andreas.vdr-developer.org/download/${MY_P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="unicode"
+
+DEPEND="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
+	dev-perl/URI
+	unicode? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}"
+
+ETC_DIR="/etc/vdradmin"
+LIB_DIR="/usr/share/vdradmin"
+VDRADMIN_USER="vdradmin"
+VDRADMIN_GROUP="vdradmin"
+TMP_DIR=/var/tmp/vdradmin
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewuser ${VDRADMIN_USER} -1 /bin/bash ${TMP_DIR}
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-config-autoflush.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-rc-3 vdradmin
+	newconfd "${FILESDIR}"/confd-2 vdradmin
+
+	dobin vdradmind.pl
+
+	insinto ${LIB_DIR}/template
+	doins -r "${S}"/template/*
+
+	insinto ${LIB_DIR}/lib/Template/Plugin
+	doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
+
+	insinto /usr/share/locale/
+	doins -r "${S}"/locale/*
+
+	exeinto ${LIB_DIR}
+	doexe autotimer2searchtimer.pl
+
+	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
+		elog "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'
+
+		[[ ${PIPESTATUS[1]} == "0" ]] || die "Failed to create initial configuration."
+
+		elog
+		elog "Created default user/password: gentoo-vdr/gentoo-vdr"
+		elog
+		elog "you can run \"emerge --config vdradmin-am\" if"
+		elog "the default-values for vdr does not match your"
+		elog "installation or change it in Setup-Menu of Web-Interface."
+		elog
+	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
+			elog "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
+
+	local DEST=/etc/vdr/plugins/epgsearch/epgsearch.conf
+	local SOURCE=${ETC_DIR}/vdradmind.at
+	if [[ -s ${ROOT}${SOURCE} ]]; then
+		ewarn "If you used the autotimer of vdradmin,"
+		ewarn "it is a good idea to convert them now"
+		ewarn "to use with epgsearch."
+		ewarn
+		if [[ ! -d ${ROOT}/etc/vdr/plugins/epgsearch ]]; then
+			ewarn "# install -d -o vdr -g vdr /etc/vdr/plugins/epgsearch"
+		fi
+
+		local SIZE=0
+
+		[[ -e ${DEST} ]] && SIZE=$(grep '^[^#]' ${ROOT}${DEST}|wc -l)
+
+		ewarn "If vdr is running with epgsearch-Plugin loaded you can use (recommended):"
+		local BASE_CMD="${LIB_DIR}/autotimer2searchtimer.pl -i ${SOURCE}"
+		ewarn "# ${BASE_CMD} -s"
+
+		ewarn
+		ewarn "Else you can use this:"
+		if [[ ${SIZE} == 0 ]]; then
+			ewarn "# ${BASE_CMD} -o ${DEST}"
+		else
+			ewarn "You already have some timers defined!."
+			ewarn "# ${BASE_CMD} -o ${DEST}.new"
+			ewarn
+			ewarn "You need to merge epgsearch.conf and epgsearch.conf.new on your own."
+			ewarn
+		fi
+		ewarn "# chown vdr:vdr ${DEST}"
+		ewarn
+		ewarn "If you are sure that epgsearch has got all your timer,"
+		ewarn "then you can delete vdradmin-autotimers."
+		ewarn "# rm ${SOURCE}"
+	fi
+}
+
+pkg_config() {
+	/usr/bin/vdradmind.pl -c
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${ROOT}"${ETC_DIR}/vdradmind.conf
+}