Version bumped. Fixed quoting.

Package-Manager: portage-2.1.4_rc10

8 files changed, 294 insertions, 92 deletions

diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog
index 091abd2e87a8..4d6886d272fd 100644
--- a/net-www/vdradmin-am/ChangeLog
+++ b/net-www/vdradmin-am/ChangeLog
@@ -1,6 +1,14 @@
 # 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.23 2007/09/21 11:16:55 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.24 2007/12/20 14:38:01 zzam Exp $
+
+*vdradmin-am-3.6.1 (20 Dec 2007)
+
+  20 Dec 2007; Matthias Schwarzott <zzam@gentoo.org>
+  vdradmin-am-3.5.3.ebuild, vdradmin-am-3.6.0_beta.ebuild,
+  vdradmin-am-3.6.0_rc.ebuild, vdradmin-am-3.6.0.ebuild,
+  +vdradmin-am-3.6.1.ebuild:
+  Version bumped. Fixed quoting.
 
   21 Sep 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdradmin-am-3.6.0.ebuild:
diff --git a/net-www/vdradmin-am/Manifest b/net-www/vdradmin-am/Manifest
index 1e014f32831e..12c277115d36 100644
--- a/net-www/vdradmin-am/Manifest
+++ b/net-www/vdradmin-am/Manifest
@@ -17,26 +17,31 @@ DIST vdradmin-am-3.5.3.tar.bz2 532120 RMD160 393c3068ab7e8ba8cc5420bd3099005676c
 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
 DIST vdradmin-am-3.6.0rc.tar.bz2 552971 RMD160 f783be98fee9b2f73608ae37e29fd9e82e012781 SHA1 4e1c634eeab5462d2378cfa5d365efbe3f186485 SHA256 353e79b39a3150c9d9dfdd862eab14e8ce0bf1a79c804fd76b665cd012752412
-EBUILD vdradmin-am-3.5.3.ebuild 4743 RMD160 9727c671834c509b0c07a6b4653ade2cb48aac2c SHA1 1a374243381a884583adcafebf3bd3e924f6cf03 SHA256 36dbb3e63828988ade3fb2c5f593be42f71192b808206115fbc8f319fde8167b
-MD5 9f6e56fe097fb73d94478c07aa0447b1 vdradmin-am-3.5.3.ebuild 4743
-RMD160 9727c671834c509b0c07a6b4653ade2cb48aac2c vdradmin-am-3.5.3.ebuild 4743
-SHA256 36dbb3e63828988ade3fb2c5f593be42f71192b808206115fbc8f319fde8167b vdradmin-am-3.5.3.ebuild 4743
-EBUILD vdradmin-am-3.6.0.ebuild 4782 RMD160 ab73b291ce365306066336d5e22d88f259413ad5 SHA1 04e0058108edb8f17ec64ca17843cbf5f0c1aafc SHA256 4c07c70560c20c5f4ae7739215cfecb096f18163bfb8c329bf0d2f370163f9f4
-MD5 c22f129e1cd6764dc803fb13c3374023 vdradmin-am-3.6.0.ebuild 4782
-RMD160 ab73b291ce365306066336d5e22d88f259413ad5 vdradmin-am-3.6.0.ebuild 4782
-SHA256 4c07c70560c20c5f4ae7739215cfecb096f18163bfb8c329bf0d2f370163f9f4 vdradmin-am-3.6.0.ebuild 4782
-EBUILD vdradmin-am-3.6.0_beta.ebuild 4787 RMD160 efc553fd55202bc1c0d04f7ed1c2c97950be7dce SHA1 0abda3ca4abd6c6fe2ac6f71fc997b3fc9097361 SHA256 aa9070f12ee9d3d7d1316e2fc41b3cc7957090071618e8dc473caf8c05518d2a
-MD5 1f999b2b178914b0e0c12728cea33df8 vdradmin-am-3.6.0_beta.ebuild 4787
-RMD160 efc553fd55202bc1c0d04f7ed1c2c97950be7dce vdradmin-am-3.6.0_beta.ebuild 4787
-SHA256 aa9070f12ee9d3d7d1316e2fc41b3cc7957090071618e8dc473caf8c05518d2a vdradmin-am-3.6.0_beta.ebuild 4787
-EBUILD vdradmin-am-3.6.0_rc.ebuild 4785 RMD160 e677abdfc195eca7b017078e758a6c302dbe88cc SHA1 fca72a299b87befe8005978fc5f7c6b51020032c SHA256 5866fd0cbdc98ae0fa29321800d22115749ccf3e2a5bd369c8e25bf2c7fa0b13
-MD5 c6722999f0bf265d1b32e048a0b5021b vdradmin-am-3.6.0_rc.ebuild 4785
-RMD160 e677abdfc195eca7b017078e758a6c302dbe88cc vdradmin-am-3.6.0_rc.ebuild 4785
-SHA256 5866fd0cbdc98ae0fa29321800d22115749ccf3e2a5bd369c8e25bf2c7fa0b13 vdradmin-am-3.6.0_rc.ebuild 4785
-MISC ChangeLog 4423 RMD160 aaab7b04b194383b3322b77537bb12b2becca002 SHA1 796874a9812bc3cc3c88b5d98720093dac160cd7 SHA256 3d4b94e3eec317093548a844f77f2dcf3a0c08d34d29afd378c370072f7aa33d
-MD5 b5ff95b3cd565e7bff16da2d938b6328 ChangeLog 4423
-RMD160 aaab7b04b194383b3322b77537bb12b2becca002 ChangeLog 4423
-SHA256 3d4b94e3eec317093548a844f77f2dcf3a0c08d34d29afd378c370072f7aa33d ChangeLog 4423
+DIST vdradmin-am-3.6.1.tar.bz2 544532 RMD160 57ed82040133201807225196613410f0b2690d5b SHA1 0a988b770fa42aee257dd52819f608e4abafab39 SHA256 51e32da015f78f8b334a650703567bf6a471fd028fddf50295a50f92fe9ad9a4
+EBUILD vdradmin-am-3.5.3.ebuild 4774 RMD160 98c9059b4874d45f5b8c7c316315149ce62fec14 SHA1 aaf9c9238f6793f236056e665c898b96e2c2cc6a SHA256 ef54799278f6780316d91c5429b2b28a70fdb2a3d7299f22d10820b3ebbf6557
+MD5 36fb24566c5a68fe02f20c9d98e0d547 vdradmin-am-3.5.3.ebuild 4774
+RMD160 98c9059b4874d45f5b8c7c316315149ce62fec14 vdradmin-am-3.5.3.ebuild 4774
+SHA256 ef54799278f6780316d91c5429b2b28a70fdb2a3d7299f22d10820b3ebbf6557 vdradmin-am-3.5.3.ebuild 4774
+EBUILD vdradmin-am-3.6.0.ebuild 4818 RMD160 8508cefb3e6f288f0f68daad4423ef1276dec28a SHA1 4ad177d724ef52763cf918ead7628a4082f96d1b SHA256 59c5afeba5c5e8e8ebca02195376a65cc5b1ee78e63f8e4c2fb00bf97364b05e
+MD5 2f962309e7b54d2d0ee0d2ecf82add6e vdradmin-am-3.6.0.ebuild 4818
+RMD160 8508cefb3e6f288f0f68daad4423ef1276dec28a vdradmin-am-3.6.0.ebuild 4818
+SHA256 59c5afeba5c5e8e8ebca02195376a65cc5b1ee78e63f8e4c2fb00bf97364b05e vdradmin-am-3.6.0.ebuild 4818
+EBUILD vdradmin-am-3.6.0_beta.ebuild 4823 RMD160 aeea6fb79750609fdc3e95c270492fc819498547 SHA1 09774e23d6d3389a7589a8b50ad564ae8b5e221a SHA256 33115d1d5bf27ca894eb654c91db2af634a447a057ec38abdda4b1519c75f077
+MD5 83e65828d7d2b1b5811be056ff82495e vdradmin-am-3.6.0_beta.ebuild 4823
+RMD160 aeea6fb79750609fdc3e95c270492fc819498547 vdradmin-am-3.6.0_beta.ebuild 4823
+SHA256 33115d1d5bf27ca894eb654c91db2af634a447a057ec38abdda4b1519c75f077 vdradmin-am-3.6.0_beta.ebuild 4823
+EBUILD vdradmin-am-3.6.0_rc.ebuild 4821 RMD160 c08f93933c576ad469471ad7289ac3e3fdb82d8f SHA1 5c71f35e3cb663e2a4215a9dae89e02cb1471b9f SHA256 f78a821d80294c244e070b3176b83d7f124bce7ece3bc5b5d61ec7599dce7722
+MD5 74f20178244c3ef14fd03d5dc90e225c vdradmin-am-3.6.0_rc.ebuild 4821
+RMD160 c08f93933c576ad469471ad7289ac3e3fdb82d8f vdradmin-am-3.6.0_rc.ebuild 4821
+SHA256 f78a821d80294c244e070b3176b83d7f124bce7ece3bc5b5d61ec7599dce7722 vdradmin-am-3.6.0_rc.ebuild 4821
+EBUILD vdradmin-am-3.6.1.ebuild 4818 RMD160 88634cbfb32b433ec959a7909635641a89d9e39f SHA1 b7223020f8bddb45e5f5e06601dc439562843757 SHA256 5e1f149fb0dbca1414753bb41e02357be784aa6e3ade2033c04b38e0d4de20bf
+MD5 90f83d225ac1893b667bb078b6718490 vdradmin-am-3.6.1.ebuild 4818
+RMD160 88634cbfb32b433ec959a7909635641a89d9e39f vdradmin-am-3.6.1.ebuild 4818
+SHA256 5e1f149fb0dbca1414753bb41e02357be784aa6e3ade2033c04b38e0d4de20bf vdradmin-am-3.6.1.ebuild 4818
+MISC ChangeLog 4689 RMD160 db3266575fe8d827a5c7fa60d4031dbadc1564e0 SHA1 4f9a0a656586d2e22b532c5a1acbc4fecb57d101 SHA256 050bb7b2d7f00b102d9cfc4a02d62b15e35382f44df49648b257eb66c8c36e71
+MD5 d2601635c8e911fd2da14b05fdb9522c ChangeLog 4689
+RMD160 db3266575fe8d827a5c7fa60d4031dbadc1564e0 ChangeLog 4689
+SHA256 050bb7b2d7f00b102d9cfc4a02d62b15e35382f44df49648b257eb66c8c36e71 ChangeLog 4689
 MISC metadata.xml 502 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 SHA1 cedec19d978ffb5fb76276d81da21e191678d787 SHA256 4f9650b92fce31432cc276364f35336489bf2a89151125295570d39752044818
 MD5 f8b74843a483dd4f645aa5da4ef6eee9 metadata.xml 502
 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 metadata.xml 502
@@ -53,10 +58,13 @@ SHA256 4a1b5b4dc0c98dde5d83d8039239f3343bf01b1102eab50c1411944b06afd61a files/di
 MD5 f874497a144497fc20e9357c7692dde6 files/digest-vdradmin-am-3.6.0_rc 262
 RMD160 5c0c7eca501eb1496aae11c5d6833fe84bee4c48 files/digest-vdradmin-am-3.6.0_rc 262
 SHA256 5c59dbe0eb863852f9e8f3f1958a4387c5cae43139578e789c4ea37a5e45fa32 files/digest-vdradmin-am-3.6.0_rc 262
+MD5 2a029f4888e4ee28e815fb34ae70c0c3 files/digest-vdradmin-am-3.6.1 256
+RMD160 9d7d3f0dd5bd522f8a630fb8587ea000e1fdc0cc files/digest-vdradmin-am-3.6.1 256
+SHA256 d1949880ad9429c4d881dc1a2f0f01fbfef18feaf9dcac2c7090952ac57fa877 files/digest-vdradmin-am-3.6.1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG86gtt2vP6XvVdOcRAnXuAKDnPG1xk1iolIUiXdKvoHjlQ0X3/gCfZwbo
-6vk2bX7P6x8H96wuzOO6mC4=
-=7GFL
+iD8DBQFHan5Vt2vP6XvVdOcRAoQnAJ0UvBsSrYZMPS61oGFFr7qehl20tgCgq3FC
+g4H+cnvxRtc9g2uSfuDVmec=
+=UBDc
 -----END PGP SIGNATURE-----
diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.6.1 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.6.1
new file mode 100644
index 000000000000..62422772a738
--- /dev/null
+++ b/net-www/vdradmin-am/files/digest-vdradmin-am-3.6.1
@@ -0,0 +1,3 @@
+MD5 5045fa4ad646dc76a7b1045e4f4c790c vdradmin-am-3.6.1.tar.bz2 544532
+RMD160 57ed82040133201807225196613410f0b2690d5b vdradmin-am-3.6.1.tar.bz2 544532
+SHA256 51e32da015f78f8b334a650703567bf6a471fd028fddf50295a50f92fe9ad9a4 vdradmin-am-3.6.1.tar.bz2 544532
diff --git a/net-www/vdradmin-am/vdradmin-am-3.5.3.ebuild b/net-www/vdradmin-am/vdradmin-am-3.5.3.ebuild
index d2e2d16952fa..08535fc3ae89 100644
--- a/net-www/vdradmin-am/vdradmin-am-3.5.3.ebuild
+++ b/net-www/vdradmin-am/vdradmin-am-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.5.3.ebuild,v 1.3 2007/07/15 04:40:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.5.3.ebuild,v 1.4 2007/12/20 14:38:01 zzam Exp $
 
 inherit eutils
 
@@ -38,8 +38,8 @@ pkg_setup() {
 src_unpack() {
 
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-config-autoflush.diff
+	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-"
@@ -51,33 +51,33 @@ src_compile() {
 		einfo "no need to compile"
 	else
 		einfo "additionally generating utf8 locales"
-		${S}/make.sh utf8add || die
-		${S}/make.sh po || die
+		"${S}"/make.sh utf8add || die
+		"${S}"/make.sh po || die
 	fi
 }
 
 src_install() {
 
-	newinitd ${FILESDIR}/vdradmin-2 vdradmin
-	newconfd ${FILESDIR}/confd-2 vdradmin
+	newinitd "${FILESDIR}"/vdradmin-2 vdradmin
+	newconfd "${FILESDIR}"/confd-2 vdradmin
 
 	dobin vdradmind.pl
 
 	insinto ${LIB_DIR}/template
-	doins -r ${S}/template/*
+	doins -r "${S}"/template/*
 
 	insinto ${LIB_DIR}/lib/Template/Plugin
-	doins -r ${S}/lib/Template/Plugin/JavaScript.pm
+	doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
 
 	insinto /usr/share/locale/
-	doins -r ${S}/locale/*
+	doins -r "${S}"/locale/*
 
 	exeinto ${LIB_DIR}
 	doexe autotimer2searchtimer.pl
 
 	dodoc HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ
 	docinto contrib
-	dodoc ${S}/contrib/*
+	dodoc "${S}"/contrib/*
 
 	diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
 	keepdir "${ETC_DIR}"
@@ -88,12 +88,12 @@ src_install() {
 
 pkg_preinst() {
 	if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
-		cp ${ROOT}${ETC_DIR}/vdradmind.conf ${D}${ETC_DIR}/vdradmind.conf
+		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
+		cat <<-EOF > "${D}${ETC_DIR}/vdradmind.conf"
 			VDRCONFDIR = /etc/vdr
 			VIDEODIR = /var/vdr/video
 			EPG_FILENAME = /var/vdr/video/epg.data
@@ -103,7 +103,7 @@ pkg_preinst() {
 		EOF
 		# feed it with newlines
 		yes "" \
-		  | ${D}/usr/bin/vdradmind.pl --cfgdir ${D}${ETC_DIR} --config \
+		  | "${D}"/usr/bin/vdradmind.pl --cfgdir "${D}"${ETC_DIR} --config \
 		  |sed -e 's/: /: \n/g'
 
 		[[ ${PIPESTATUS[1]} == "0" ]] || die "Failed to create initial configuration."
@@ -116,7 +116,7 @@ pkg_preinst() {
 		elog "installation or change it in Setup-Menu of Web-Interface."
 		elog
 	fi
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${D}${ETC_DIR}/vdradmind.conf
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${D}"${ETC_DIR}/vdradmind.conf
 }
 
 pkg_postinst() {
@@ -124,7 +124,7 @@ pkg_postinst() {
 		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}
+			chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${ROOT}"${ETC_DIR}
 		fi
 	fi
 
@@ -175,5 +175,5 @@ pkg_postinst() {
 
 pkg_config() {
 	/usr/bin/vdradmind.pl -c
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}/vdradmind.conf
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${ROOT}"${ETC_DIR}/vdradmind.conf
 }
diff --git a/net-www/vdradmin-am/vdradmin-am-3.6.0.ebuild b/net-www/vdradmin-am/vdradmin-am-3.6.0.ebuild
index facf4150f6d4..8d29914420ca 100644
--- a/net-www/vdradmin-am/vdradmin-am-3.6.0.ebuild
+++ b/net-www/vdradmin-am/vdradmin-am-3.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.0.ebuild,v 1.2 2007/09/21 11:16:55 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.6.0.ebuild,v 1.3 2007/12/20 14:38:01 zzam Exp $
 
 inherit eutils
 
@@ -42,8 +42,8 @@ pkg_setup() {
 src_unpack() {
 
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-config-autoflush.diff
+	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-"
@@ -55,33 +55,33 @@ src_compile() {
 		einfo "no need to compile"
 	else
 		einfo "additionally generating utf8 locales"
-		${S}/make.sh utf8add || die
-		${S}/make.sh po || die
+		"${S}"/make.sh utf8add || die
+		"${S}"/make.sh po || die
 	fi
 }
 
 src_install() {
 
-	newinitd ${FILESDIR}/vdradmin-2 vdradmin
-	newconfd ${FILESDIR}/confd-2 vdradmin
+	newinitd "${FILESDIR}"/vdradmin-2 vdradmin
+	newconfd "${FILESDIR}"/confd-2 vdradmin
 
 	dobin vdradmind.pl
 
 	insinto ${LIB_DIR}/template
-	doins -r ${S}/template/*
+	doins -r "${S}"/template/*
 
 	insinto ${LIB_DIR}/lib/Template/Plugin
-	doins -r ${S}/lib/Template/Plugin/JavaScript.pm
+	doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
 
 	insinto /usr/share/locale/
-	doins -r ${S}/locale/*
+	doins -r "${S}"/locale/*
 
 	exeinto ${LIB_DIR}
 	doexe autotimer2searchtimer.pl
 
 	dodoc HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ
 	docinto contrib
-	dodoc ${S}/contrib/*
+	dodoc "${S}"/contrib/*
 
 	diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
 	keepdir "${ETC_DIR}"
@@ -92,12 +92,12 @@ src_install() {
 
 pkg_preinst() {
 	if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
-		cp ${ROOT}${ETC_DIR}/vdradmind.conf ${D}${ETC_DIR}/vdradmind.conf
+		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
+		cat <<-EOF > "${D}"${ETC_DIR}/vdradmind.conf
 			VDRCONFDIR = /etc/vdr
 			VIDEODIR = /var/vdr/video
 			EPG_FILENAME = /var/vdr/video/epg.data
@@ -107,7 +107,7 @@ pkg_preinst() {
 		EOF
 		# feed it with newlines
 		yes "" \
-		  | ${D}/usr/bin/vdradmind.pl --cfgdir ${D}${ETC_DIR} --config \
+		  | "${D}"/usr/bin/vdradmind.pl --cfgdir "${D}"${ETC_DIR} --config \
 		  |sed -e 's/: /: \n/g'
 
 		[[ ${PIPESTATUS[1]} == "0" ]] || die "Failed to create initial configuration."
@@ -120,7 +120,7 @@ pkg_preinst() {
 		elog "installation or change it in Setup-Menu of Web-Interface."
 		elog
 	fi
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${D}${ETC_DIR}/vdradmind.conf
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${D}"${ETC_DIR}/vdradmind.conf
 }
 
 pkg_postinst() {
@@ -128,7 +128,7 @@ pkg_postinst() {
 		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}
+			chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${ROOT}"${ETC_DIR}
 		fi
 	fi
 
@@ -179,5 +179,5 @@ pkg_postinst() {
 
 pkg_config() {
 	/usr/bin/vdradmind.pl -c
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}/vdradmind.conf
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${ROOT}"${ETC_DIR}/vdradmind.conf
 }
diff --git a/net-www/vdradmin-am/vdradmin-am-3.6.0_beta.ebuild b/net-www/vdradmin-am/vdradmin-am-3.6.0_beta.ebuild
index 9560e86122e0..3d125afc23ee 100644
--- a/net-www/vdradmin-am/vdradmin-am-3.6.0_beta.ebuild
+++ b/net-www/vdradmin-am/vdradmin-am-3.6.0_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.0_beta.ebuild,v 1.1 2007/08/18 20:38:25 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.6.0_beta.ebuild,v 1.2 2007/12/20 14:38:01 zzam Exp $
 
 inherit eutils
 
@@ -42,8 +42,8 @@ pkg_setup() {
 src_unpack() {
 
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-config-autoflush.diff
+	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-"
@@ -55,33 +55,33 @@ src_compile() {
 		einfo "no need to compile"
 	else
 		einfo "additionally generating utf8 locales"
-		${S}/make.sh utf8add || die
-		${S}/make.sh po || die
+		"${S}"/make.sh utf8add || die
+		"${S}"/make.sh po || die
 	fi
 }
 
 src_install() {
 
-	newinitd ${FILESDIR}/vdradmin-2 vdradmin
-	newconfd ${FILESDIR}/confd-2 vdradmin
+	newinitd "${FILESDIR}"/vdradmin-2 vdradmin
+	newconfd "${FILESDIR}"/confd-2 vdradmin
 
 	dobin vdradmind.pl
 
 	insinto ${LIB_DIR}/template
-	doins -r ${S}/template/*
+	doins -r "${S}"/template/*
 
 	insinto ${LIB_DIR}/lib/Template/Plugin
-	doins -r ${S}/lib/Template/Plugin/JavaScript.pm
+	doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
 
 	insinto /usr/share/locale/
-	doins -r ${S}/locale/*
+	doins -r "${S}"/locale/*
 
 	exeinto ${LIB_DIR}
 	doexe autotimer2searchtimer.pl
 
 	dodoc HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ
 	docinto contrib
-	dodoc ${S}/contrib/*
+	dodoc "${S}"/contrib/*
 
 	diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
 	keepdir "${ETC_DIR}"
@@ -92,12 +92,12 @@ src_install() {
 
 pkg_preinst() {
 	if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
-		cp ${ROOT}${ETC_DIR}/vdradmind.conf ${D}${ETC_DIR}/vdradmind.conf
+		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
+		cat <<-EOF > "${D}"${ETC_DIR}/vdradmind.conf
 			VDRCONFDIR = /etc/vdr
 			VIDEODIR = /var/vdr/video
 			EPG_FILENAME = /var/vdr/video/epg.data
@@ -107,7 +107,7 @@ pkg_preinst() {
 		EOF
 		# feed it with newlines
 		yes "" \
-		  | ${D}/usr/bin/vdradmind.pl --cfgdir ${D}${ETC_DIR} --config \
+		  | "${D}"/usr/bin/vdradmind.pl --cfgdir "${D}"${ETC_DIR} --config \
 		  |sed -e 's/: /: \n/g'
 
 		[[ ${PIPESTATUS[1]} == "0" ]] || die "Failed to create initial configuration."
@@ -120,7 +120,7 @@ pkg_preinst() {
 		elog "installation or change it in Setup-Menu of Web-Interface."
 		elog
 	fi
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${D}${ETC_DIR}/vdradmind.conf
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${D}"${ETC_DIR}/vdradmind.conf
 }
 
 pkg_postinst() {
@@ -128,7 +128,7 @@ pkg_postinst() {
 		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}
+			chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${ROOT}"${ETC_DIR}
 		fi
 	fi
 
@@ -179,5 +179,5 @@ pkg_postinst() {
 
 pkg_config() {
 	/usr/bin/vdradmind.pl -c
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}/vdradmind.conf
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${ROOT}"${ETC_DIR}/vdradmind.conf
 }
diff --git a/net-www/vdradmin-am/vdradmin-am-3.6.0_rc.ebuild b/net-www/vdradmin-am/vdradmin-am-3.6.0_rc.ebuild
index d0ca130ed95e..5c169bc5c688 100644
--- a/net-www/vdradmin-am/vdradmin-am-3.6.0_rc.ebuild
+++ b/net-www/vdradmin-am/vdradmin-am-3.6.0_rc.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.0_rc.ebuild,v 1.1 2007/08/27 12:25:39 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/vdradmin-am-3.6.0_rc.ebuild,v 1.2 2007/12/20 14:38:01 zzam Exp $
 
 inherit eutils
 
@@ -42,8 +42,8 @@ pkg_setup() {
 src_unpack() {
 
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-config-autoflush.diff
+	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-"
@@ -55,33 +55,33 @@ src_compile() {
 		einfo "no need to compile"
 	else
 		einfo "additionally generating utf8 locales"
-		${S}/make.sh utf8add || die
-		${S}/make.sh po || die
+		"${S}"/make.sh utf8add || die
+		"${S}"/make.sh po || die
 	fi
 }
 
 src_install() {
 
-	newinitd ${FILESDIR}/vdradmin-2 vdradmin
-	newconfd ${FILESDIR}/confd-2 vdradmin
+	newinitd "${FILESDIR}"/vdradmin-2 vdradmin
+	newconfd "${FILESDIR}"/confd-2 vdradmin
 
 	dobin vdradmind.pl
 
 	insinto ${LIB_DIR}/template
-	doins -r ${S}/template/*
+	doins -r "${S}"/template/*
 
 	insinto ${LIB_DIR}/lib/Template/Plugin
-	doins -r ${S}/lib/Template/Plugin/JavaScript.pm
+	doins -r "${S}"/lib/Template/Plugin/JavaScript.pm
 
 	insinto /usr/share/locale/
-	doins -r ${S}/locale/*
+	doins -r "${S}"/locale/*
 
 	exeinto ${LIB_DIR}
 	doexe autotimer2searchtimer.pl
 
 	dodoc HISTORY INSTALL CREDITS README* REQUIREMENTS FAQ
 	docinto contrib
-	dodoc ${S}/contrib/*
+	dodoc "${S}"/contrib/*
 
 	diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
 	keepdir "${ETC_DIR}"
@@ -92,12 +92,12 @@ src_install() {
 
 pkg_preinst() {
 	if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
-		cp ${ROOT}${ETC_DIR}/vdradmind.conf ${D}${ETC_DIR}/vdradmind.conf
+		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
+		cat <<-EOF > "${D}"${ETC_DIR}/vdradmind.conf
 			VDRCONFDIR = /etc/vdr
 			VIDEODIR = /var/vdr/video
 			EPG_FILENAME = /var/vdr/video/epg.data
@@ -107,7 +107,7 @@ pkg_preinst() {
 		EOF
 		# feed it with newlines
 		yes "" \
-		  | ${D}/usr/bin/vdradmind.pl --cfgdir ${D}${ETC_DIR} --config \
+		  | "${D}"/usr/bin/vdradmind.pl --cfgdir "${D}"${ETC_DIR} --config \
 		  |sed -e 's/: /: \n/g'
 
 		[[ ${PIPESTATUS[1]} == "0" ]] || die "Failed to create initial configuration."
@@ -120,7 +120,7 @@ pkg_preinst() {
 		elog "installation or change it in Setup-Menu of Web-Interface."
 		elog
 	fi
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${D}${ETC_DIR}/vdradmind.conf
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${D}"${ETC_DIR}/vdradmind.conf
 }
 
 pkg_postinst() {
@@ -128,7 +128,7 @@ pkg_postinst() {
 		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}
+			chown -R ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${ROOT}"${ETC_DIR}
 		fi
 	fi
 
@@ -179,5 +179,5 @@ pkg_postinst() {
 
 pkg_config() {
 	/usr/bin/vdradmind.pl -c
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} ${ROOT}${ETC_DIR}/vdradmind.conf
+	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${ROOT}"${ETC_DIR}/vdradmind.conf
 }
diff --git a/net-www/vdradmin-am/vdradmin-am-3.6.1.ebuild b/net-www/vdradmin-am/vdradmin-am-3.6.1.ebuild
new file mode 100644
index 000000000000..76d14efbe6d7
--- /dev/null
+++ b/net-www/vdradmin-am/vdradmin-am-3.6.1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2007 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.ebuild,v 1.1 2007/12/20 14:38:01 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-2 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
+}