bug #171947; added version to run vdradmin-am on a vdr-less install, use -vdr then

(Portage version: 2.1.6.4/cvs/Linux 2.6.21-xen-main-r1 i686)

4 files changed, 201 insertions, 3 deletions

diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog
index 0f9deac1f386..47c4234fb6ad 100644
--- a/net-www/vdradmin-am/ChangeLog
+++ b/net-www/vdradmin-am/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-www/vdradmin-am
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.29 2009/01/05 21:02:19 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.30 2009/01/13 18:00:02 hd_brummy Exp $
+
+  13 Jan 2009; Joerg Bornkessel <hd_brummy@gentoo.org> files/vdradmin-4,
+  metadata.xml, +vdradmin-am-3.6.4-r1.ebuild:
+  bug #171947; added version to run vdradmin-am on a vdr-less install, use
+  -vdr then
+
+*vdradmin-am-3.6.4-r1 (07 Jan 2009)
+
+  07 Jan 2009; Joerg Bornkessel <hd_brummy@gentoo.org> files/vdradmin-4,
+  +vdradmin-am-3.6.4-r1.ebuild:
+  #171947 vdradmin-am can now install on vdr-less system if use-flag vdr is
+  disabled; using EAPI to enable use-flag vdr by default
 
 *vdradmin-am-3.6.4 (05 Jan 2009)
 
diff --git a/net-www/vdradmin-am/files/vdradmin-4 b/net-www/vdradmin-am/files/vdradmin-4
index 1b5ac1b2a067..442d8697f4c5 100644
--- a/net-www/vdradmin-am/files/vdradmin-4
+++ b/net-www/vdradmin-am/files/vdradmin-4
@@ -1,10 +1,10 @@
 #!/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-4,v 1.1 2009/01/05 21:02:19 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/files/vdradmin-4,v 1.2 2009/01/13 18:00:03 hd_brummy Exp $
 
 depend() {
-	need vdr
+	use vdr
 }
 
 set_charset() {
diff --git a/net-www/vdradmin-am/metadata.xml b/net-www/vdradmin-am/metadata.xml
index e6790ba2b842..613721190802 100644
--- a/net-www/vdradmin-am/metadata.xml
+++ b/net-www/vdradmin-am/metadata.xml
@@ -13,4 +13,10 @@
 		Zentraler Dienst um ueber einen Browser den VDR zu programmiern
 		und zu steuern.
 	</longdescription>
+	<use>
+		<flag name="vdr">
+			Support for media-video/vdr.
+			Disable this if the VDR you want to control runs at a remote machine.
+		</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-www/vdradmin-am/vdradmin-am-3.6.4-r1.ebuild b/net-www/vdradmin-am/vdradmin-am-3.6.4-r1.ebuild
new file mode 100644
index 000000000000..29a455729012
--- /dev/null
+++ b/net-www/vdradmin-am/vdradmin-am-3.6.4-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2009 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.4-r1.ebuild,v 1.1 2009/01/13 18:00:02 hd_brummy Exp $
+
+EAPI="1"
+
+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="+vdr"
+
+DEPEND="dev-lang/perl
+	dev-perl/Template-Toolkit
+	>=virtual/perl-Compress-Zlib-1.2.2
+	vdr? ( media-video/vdr )
+	virtual/perl-Compress-Zlib
+	dev-perl/Locale-gettext
+	dev-perl/Authen-SASL
+	dev-perl/Digest-HMAC
+	dev-perl/URI
+	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}
+
+	if ! use vdr; then
+		elog "You can run vdradmin-am outside a vdr install"
+		elog "but be shure for minimal functionality,"
+		elog "you have access to vdr's epg.data file"
+	fi
+}
+
+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_install() {
+	newinitd "${FILESDIR}"/vdradmin-4 vdradmin
+	newconfd "${FILESDIR}"/confd-2 vdradmin
+
+	newbin vdradmind.pl vdradmind
+
+	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
+
+	doman vdradmind.pl.1
+
+	dodoc HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ ChangeLog
+	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
+}
+
+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
+}