Version bump. Remove old.

Package-Manager: portage-2.1.7.17/cvs/Linux i686

6 files changed, 180 insertions, 395 deletions

diff --git a/www-misc/vdradmin-am/ChangeLog b/www-misc/vdradmin-am/ChangeLog
index 7012ecbcd42f..1bdddd3f5a32 100644
--- a/www-misc/vdradmin-am/ChangeLog
+++ b/www-misc/vdradmin-am/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2010/03/16 17:18:49 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.8 2010/04/11 17:22:39 billie Exp $
+
+*vdradmin-am-3.6.7 (11 Apr 2010)
+
+  11 Apr 2010; Daniel Pielmeier <billie@gentoo.org> -files/vdradmin-rc-3,
+  -vdradmin-am-3.6.2.ebuild, -vdradmin-am-3.6.4.ebuild,
+  +vdradmin-am-3.6.7.ebuild:
+  Version bump. Remove old.
 
 *vdradmin-am-3.6.6 (16 Mar 2010)
 
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index 1da69b8bd685..6527b4ef5b55 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -4,13 +4,11 @@ AUX vdradmin-3.6.6.init 1955 RMD160 274b9b7c3126bf862979e6a6f19fa896a10dd091 SHA
 AUX vdradmin-3.6.6.logrotate 116 RMD160 bf4e29e03b515306521a9e5c8e20445622ff4ea0 SHA1 99d26a22124c7d3821b4871fc3aa5914b90b97c0 SHA256 2eb705ff7ab186d2a0287d3e91afe7d59be39f896fd9a62d875d8f13db1312af
 AUX vdradmin-4 1233 RMD160 69642b2cd806403bc35c5793320c69e9667e47b7 SHA1 f0ae719ac48d2f5a6b28fcf881546a6508297dd1 SHA256 a2389c1f3ba47885a2711c407b876c067b3a2867fbcddc4c05fc54d9eadf08e3
 AUX vdradmin-am-config-autoflush.diff 654 RMD160 f6d0a31c424c6a45d8786d2b98e9872e5e3ded5f SHA1 1a4b61fa0c218cecffb6530cabe5c59577b1df67 SHA256 1687001c6114cb373643982fb73a78e7656c70d253e9ff0d89b7ed466133f950
-AUX vdradmin-rc-3 1243 RMD160 fb8930b6a54b087d396d8da5cf30c0f52ad5d99b SHA1 d2a43268d548811bb303b3e3a0e3f85efbe9c9d9 SHA256 b26fe417beaa7332a876928aa5f9effc5ee925ad85da9a6351ad299c9eb5f808
-DIST vdradmin-am-3.6.2.tar.bz2 685651 RMD160 5b01d0da1305093e6da35728f13af5671db02bcd SHA1 3b71d1a87639995a1b716986c9f8fa9a2a7c9410 SHA256 53821d339b3e17f42948a68baa289134d6f79f41cef96db13bb14b4cbf69f188
 DIST vdradmin-am-3.6.4.tar.bz2 718142 RMD160 e8e4f6da9b20e5696598ac1493549a154ebb9f7b SHA1 c65ca82df04891ac3b71d3e46e0d2b6d4355bd4f SHA256 aa956001b47feaaf7297d89fb15bfc17eeeb2c6125123abe7ce134e7d0ceb6b0
 DIST vdradmin-am-3.6.6.tar.bz2 662288 RMD160 35a1e6eed8c9ca542256360288059119741db9dc SHA1 5d02f7007f9a2fbd9d930c47e44d25c334cc1f39 SHA256 08ceaca45e860f61ce363e46e134d77d4c03a630f2309f2dfca66c07788b988e
-EBUILD vdradmin-am-3.6.2.ebuild 4590 RMD160 f9bf969cd3a2bb91f6b189f17085dd8a0290eff9 SHA1 940d5b371f9bf0a4de96f7a4a90135c9d71e16b3 SHA256 39e29dac5cac8c1229c39b4dd3a9eade1c59755787862685f3583b263ac20b3e
+DIST vdradmin-am-3.6.7.tar.bz2 545850 RMD160 d48dea7caf30716d2dac4132612160d1c35fa596 SHA1 68c380ed038a36968c72fb5462eaebb2f97eb61d SHA256 48fb4edb16f65e7f340bd57b4d205c1718e37f40d22bf3a76515812f3f45b39b
 EBUILD vdradmin-am-3.6.4-r1.ebuild 4870 RMD160 610d40fe6e8373fc43a592d65226d31d6c61458f SHA1 bbe9d3c8bda17f8537c5eb6dd18ded292ed5d616 SHA256 fade8f6f14a37749581b40c87dec4564e09f51927df7c1dc50512fd3d529b48c
-EBUILD vdradmin-am-3.6.4.ebuild 4613 RMD160 828c18566360097fc36d4e7b3cbda6dd2cf6765c SHA1 83bd267f4e7acd88e952794abac15439dad427f8 SHA256 37e728941a57e75fb28be9f0f3b2af8f4a12f9442d6a02996d479dd33fedaa86
 EBUILD vdradmin-am-3.6.6.ebuild 4450 RMD160 64fa092f6463cccc7f4bae53deb7bad502ee1ae7 SHA1 c955d2481a4fbe584c6d34d0934e02d6f28467fd SHA256 5a07eb2b4ebacd8e6425860dcc99b5fa1a6368bfbfb911a14e3b5f6fbf960fcb
-MISC ChangeLog 7859 RMD160 83bee5efcbbdb6bf6c68fa39483ea56dee602229 SHA1 cc322481bd43281ebe7b2e6953a9d31af76cbff4 SHA256 9950cae916e110732af4a242b3c59a0a9c962f1b0a690d06915a3edcf026d07f
+EBUILD vdradmin-am-3.6.7.ebuild 4450 RMD160 da57a0ffd9e590a38518252ef34a7ee4f8f2a88f SHA1 adacc23ebbad141ddb969d2ab0e175764ef659a0 SHA256 9049cea9485f7a84f858b651b797ebb0ae5d0b69151266081a0a7bd954032418
+MISC ChangeLog 8081 RMD160 463e4bb2e42ca7263f4e53f3e437a40eb6e1fb79 SHA1 9a7ec15dd71d605c73ba42fc648b063c6eb0f082 SHA256 fc81ae270ce21a451ce18aaf8119b6dc851f653064ae3db3ed164a46d42a051d
 MISC metadata.xml 748 RMD160 ce0254901737f368bfeb829b70d30c271c25bf14 SHA1 0ba36d4140d383486008e64ac7b9c84ce4c73cc6 SHA256 eb1d48cf2b7dfb0b9810fb1ce3c76fdd25c00fd1e4a93dfdf4b89b04f8024470
diff --git a/www-misc/vdradmin-am/files/vdradmin-rc-3 b/www-misc/vdradmin-am/files/vdradmin-rc-3
deleted file mode 100644
index 9933c7eecc00..000000000000
--- a/www-misc/vdradmin-am/files/vdradmin-rc-3
+++ /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-rc-3,v 1.1 2009/04/11 23:23:28 hd_brummy 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}" --pidfile /var/tmp/vdradmin/vdradmind.pid \
-		--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/www-misc/vdradmin-am/vdradmin-am-3.6.2.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.2.ebuild
deleted file mode 100644
index 41eb85f3435f..000000000000
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2009 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.2.ebuild,v 1.3 2009/07/19 18:06:47 tove 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=""
-
-DEPEND="dev-lang/perl
-	dev-perl/Template-Toolkit
-	>=virtual/perl-IO-Compress-1.2.2
-	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() {
-	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_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
-}
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.4.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.4.ebuild
deleted file mode 100644
index 95604b2f7910..000000000000
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.4.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2009 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.ebuild,v 1.2 2009/07/19 18:06:47 tove 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=""
-
-DEPEND="dev-lang/perl
-	dev-perl/Template-Toolkit
-	>=virtual/perl-IO-Compress-1.2.2
-	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() {
-	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_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
-	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
-}
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.7.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.7.ebuild
new file mode 100644
index 000000000000..ba8fd3d034c7
--- /dev/null
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.7.ebuild
@@ -0,0 +1,169 @@
+# 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.7.ebuild,v 1.1 2010/04/11 17:22:39 billie Exp $
+
+EAPI=2
+
+inherit eutils ssl-cert
+
+DESCRIPTION="WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html"
+SRC_URI="http://andreas.vdr-developer.org/download/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="LGPL-2.1"
+IUSE="ipv6 ssl +vdr"
+
+DEPEND="dev-lang/perl
+	dev-perl/Template-Toolkit
+	dev-perl/libwww-perl
+	dev-perl/URI
+	dev-perl/Locale-gettext
+	virtual/perl-IO-Compress
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	ssl? ( dev-perl/IO-Socket-SSL )
+	vdr? ( media-video/vdr )
+	perl-core/libnet
+	dev-perl/Authen-SASL
+	dev-perl/Digest-HMAC"
+RDEPEND="${DEPEND}"
+
+ETC_DIR=/etc/vdradmin
+CERTS_DIR=/etc/vdradmin/certs
+LIB_DIR=/usr/share/vdradmin
+LOG_DIR=/var/log/vdradmin
+PID_DIR=/var/run/vdradmin
+CACHE_DIR=/var/cache/vdradmin
+VDRADMIN_USER=vdradmin
+VDRADMIN_GROUP=vdradmin
+
+create_ssl_cert() {
+	# The ssl-cert eclass is not flexible enough so do some steps manually
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-vdradmin-am}"
+	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+	gen_cnf || return 1
+
+	gen_key 1 || return 1
+	gen_csr 1 || return 1
+	gen_crt 1 || return 1
+}
+
+pkg_setup() {
+	enewuser ${VDRADMIN_USER} -1 /bin/bash ${CACHE_DIR} ${VDRADMIN_GROUP}
+	enewgroup ${VDRADMIN_GROUP}
+
+	if ! use vdr; then
+		elog
+		elog "You can run vdradmin-am outside a vdr install. For minimal"
+		elog "functionality you need access to the epg.data file of your VDR."
+	fi
+}
+
+src_prepare() {
+	sed -i vdradmind.pl \
+		-e "/COMPILE_DIR/s-/tmp-${CACHE_DIR}-" \
+		-e "s-FILES_IN_SYSTEM    = 0;-FILES_IN_SYSTEM    = 1;-g"
+}
+
+src_configure() { : ; }
+
+src_compile() { : ; }
+
+src_install() {
+	newinitd "${FILESDIR}"/vdradmin-3.6.6.init vdradmin
+	newconfd "${FILESDIR}"/vdradmin-3.6.6.conf vdradmin
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/vdradmin-3.6.6.logrotate 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/*
+
+	newman vdradmind.pl.1 vdradmind.8
+
+	dodoc CREDITS HISTORY INSTALL README* REQUIREMENTS FAQ ChangeLog
+	docinto contrib
+	dodoc "${S}"/contrib/*
+
+	diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
+	keepdir "${ETC_DIR}"
+	keepdir "${CACHE_DIR}"
+	keepdir "${LOG_DIR}"
+	keepdir "${PID_DIR}"
+	use ssl && keepdir "${CERTS_DIR}"
+}
+
+pkg_preinst() {
+	if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
+		cp "${ROOT}"${ETC_DIR}/vdradmind.conf "${D}"${ETC_DIR}/vdradmind.conf
+	else
+		elog
+		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 the default-values"
+		elog "do not match your installation or change them in the Setup-Menu"
+		elog "of the Web-Interface."
+	fi
+}
+
+pkg_postinst() {
+	if use ipv6; then
+		elog
+		elog "To make use of the ipv6 protocol"
+		elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+	fi
+
+	if use ssl; then
+		elog
+		elog "To use ssl connection to your vdr"
+		elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+
+		if [[ ! -f "${ROOT}${CERTS_DIR}/server-cert.pem" && \
+			! -f "${ROOT}${CERTS_DIR}/server-key.pem" ]]; then
+			create_ssl_cert
+			local base=$(get_base 1)
+			install -m0400 "${base}.key" "${ROOT}${CERTS_DIR}/server-key.pem"
+			install -m0444 "${base}.crt" "${ROOT}${CERTS_DIR}/server-cert.pem"
+		fi
+	fi
+
+	elog
+	elog "To extend vdradmin-am you can emerge"
+	elog ">=media-plugins/vdr-epgsearch-0.9.25 to search the EPG"
+	elog "media-plugins/vdr-streamdev for livetv streaming"
+	elog "media-video/vdr with USE=\"liemikuutio\" to rename recordings"
+	elog "on the machine running the VDR you connect to with vdradmin-am."
+}
+
+pkg_config() {
+	/usr/bin/vdradmind -c
+}