Remove old.

(Portage version: 2.1.8.3/cvs/Linux i686)

5 files changed, 6 insertions, 250 deletions

diff --git a/www-misc/vdradmin-am/ChangeLog b/www-misc/vdradmin-am/ChangeLog
index fec601248ab5..e846bae8c1d4 100644
--- a/www-misc/vdradmin-am/ChangeLog
+++ b/www-misc/vdradmin-am/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-misc/vdradmin-am
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.13 2010/07/17 12:51:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.14 2010/07/18 13:23:01 billie Exp $
+
+  18 Jul 2010; Daniel Pielmeier <billie@gentoo.org> -files/confd-2,
+  -vdradmin-am-3.6.4-r1.ebuild, -files/vdradmin-4,
+  -files/vdradmin-am-config-autoflush.diff:
+  Remove old.
 
   17 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
   vdradmin-am-3.6.7.ebuild:
diff --git a/www-misc/vdradmin-am/files/confd-2 b/www-misc/vdradmin-am/files/confd-2
deleted file mode 100644
index c77b6056db64..000000000000
--- a/www-misc/vdradmin-am/files/confd-2
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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:
-#
-# If you want vdradmin to run on a port below 1024 you
-# should nevertheless have vdradmin running as root.
-#
-VDRADMIN_USER="vdradmin"
diff --git a/www-misc/vdradmin-am/files/vdradmin-4 b/www-misc/vdradmin-am/files/vdradmin-4
deleted file mode 100644
index 43ef2b199934..000000000000
--- a/www-misc/vdradmin-am/files/vdradmin-4
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/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/www-misc/vdradmin-am/files/vdradmin-4,v 1.1 2009/04/11 23:23:28 hd_brummy Exp $
-
-depend() {
-	use 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}" --pidfile /var/tmp/vdradmin/vdradmind.pid \
-		--exec /usr/bin/perl /usr/bin/vdradmind
-	else
-		start-stop-daemon --start --background --chuid "${VDRADMIN_USER}" --exec /usr/bin/vdradmind
-	fi
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping vdradmin-am"
-	start-stop-daemon --stop --quiet --pidfile /var/tmp/vdradmin/vdradmind.pid
-	eend $?
-}
diff --git a/www-misc/vdradmin-am/files/vdradmin-am-config-autoflush.diff b/www-misc/vdradmin-am/files/vdradmin-am-config-autoflush.diff
deleted file mode 100644
index fb87e362d9ff..000000000000
--- a/www-misc/vdradmin-am/files/vdradmin-am-config-autoflush.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/www-misc/vdradmin-am/vdradmin-am-3.6.4-r1.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.4-r1.ebuild
deleted file mode 100644
index 29d5b781b073..000000000000
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.4-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.4-r1.ebuild,v 1.4 2010/02/06 19:34:10 zzam 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-IO-Compress-1.2.2
-	vdr? ( media-video/vdr )
-	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() {
-	enewgroup ${VDRADMIN_GROUP}
-	enewuser ${VDRADMIN_USER} -1 /bin/bash ${TMP_DIR} ${VDRADMIN_GROUP}
-
-	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 --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 -c
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${ROOT}"${ETC_DIR}/vdradmind.conf
-}