Version bumped.

Package-Manager: portage-2.1.2-r4

4 files changed, 207 insertions, 8 deletions

diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog
index 3c3aacdd44b5..4f9fb57d0cc7 100644
--- a/net-www/vdradmin-am/ChangeLog
+++ b/net-www/vdradmin-am/ChangeLog
@@ -1,6 +1,12 @@
 # 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.12 2007/01/21 13:22:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.13 2007/01/25 13:08:48 zzam Exp $
+
+*vdradmin-am-3.5.3 (25 Jan 2007)
+
+  25 Jan 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +vdradmin-am-3.5.3.ebuild:
+  Version bumped.
 
 *vdradmin-am-3.5.2-r2 (21 Jan 2007)
 
diff --git a/net-www/vdradmin-am/Manifest b/net-www/vdradmin-am/Manifest
index 610284aa4836..12c1d1bfb42e 100644
--- a/net-www/vdradmin-am/Manifest
+++ b/net-www/vdradmin-am/Manifest
@@ -26,6 +26,7 @@ DIST vdradmin-am-3.4.7.tar.bz2 506628 RMD160 04413c1a767c668f0bb8d68dfe016fa449d
 DIST vdradmin-am-3.5.0.tar.bz2 506174 RMD160 e2ec7300c83cd3749e275c2be3ef85286219c24f SHA1 d0f7e5a5d1b1a00f37064068d9874d04ef898a74 SHA256 638007f7c160b857edcef5368b7888948ead2571a2bf8882e4dc054b99ca7ab8
 DIST vdradmin-am-3.5.1.tar.bz2 530000 RMD160 54e7d858173646208dc87da7ae2455f6da181ffc SHA1 80fffbd9650d776b335e73b6407ceb17b6e83982 SHA256 55481c6adba273874291b721f1c5d539d5d0cd34ed26c9498dc73f8e80f281ea
 DIST vdradmin-am-3.5.2.tar.bz2 529968 RMD160 e1fdbc260f7b44eedda767dd8d383ea645321871 SHA1 e5e0a59dc8ca24ffbe40408ad191cf66313c016d SHA256 41aa6fcedb40bcc65c71660636871e09e3957892cf6ffd9a583969e680b8ca4e
+DIST vdradmin-am-3.5.3.tar.bz2 532243 RMD160 c5919844f13c3fe39cbcba2850f39db15d79efeb SHA1 e7306b2dfda0f8609ec9dc71f3ee3b6cccd27597 SHA256 fc7220d9c868600b991b93596353898f8a7a22e80d1fa5fab0ddddf028d72ff1
 EBUILD vdradmin-am-3.4.6.ebuild 1342 RMD160 96d5470b389eab3daea3d471c5657ab07e3797be SHA1 33e2623857161942d641cfe31724cdbac03a3500 SHA256 01280cf41d01ec893b5fafa3aa01865c2971d4bd96e4789c46f4d73dbf312fd4
 MD5 51af9774dd7e8ee1fed2da2ad6b3df14 vdradmin-am-3.4.6.ebuild 1342
 RMD160 96d5470b389eab3daea3d471c5657ab07e3797be vdradmin-am-3.4.6.ebuild 1342
@@ -50,10 +51,14 @@ EBUILD vdradmin-am-3.5.2-r2.ebuild 4745 RMD160 fb600751fc461c7ed9d4418d0b6dd2e98
 MD5 0af6ae675f85109d5c0644a3f013b318 vdradmin-am-3.5.2-r2.ebuild 4745
 RMD160 fb600751fc461c7ed9d4418d0b6dd2e98c5a6bbf vdradmin-am-3.5.2-r2.ebuild 4745
 SHA256 41324c04363554530d6be89ff050e5c9f2783d4eb59623c3a78cb9b796d0ae22 vdradmin-am-3.5.2-r2.ebuild 4745
-MISC ChangeLog 2836 RMD160 212de1a9a3b459d506a7e5b5cbebef6584588ad9 SHA1 132147b2e165888a12433c1c4b3eebfc2094bc64 SHA256 026a15ae5c7b4b5535aaff7749001cda1e29a3e39e5f846873281c6c73665d34
-MD5 34bb770b3e55152691f3deedac75fb74 ChangeLog 2836
-RMD160 212de1a9a3b459d506a7e5b5cbebef6584588ad9 ChangeLog 2836
-SHA256 026a15ae5c7b4b5535aaff7749001cda1e29a3e39e5f846873281c6c73665d34 ChangeLog 2836
+EBUILD vdradmin-am-3.5.3.ebuild 4742 RMD160 695b76313bf948f0a9f85456437d9310177d9519 SHA1 ec34ac56dc29a7201cb400589fbdead9293a1838 SHA256 2d7fa1616decacbe4495b9ca0accb46cd453092832a83babd5d2ca40f17b8bbb
+MD5 55b1a422d6927b229ff2e544785c7115 vdradmin-am-3.5.3.ebuild 4742
+RMD160 695b76313bf948f0a9f85456437d9310177d9519 vdradmin-am-3.5.3.ebuild 4742
+SHA256 2d7fa1616decacbe4495b9ca0accb46cd453092832a83babd5d2ca40f17b8bbb vdradmin-am-3.5.3.ebuild 4742
+MISC ChangeLog 2971 RMD160 218438a82c3bc35835f1576a1decc41a1eaafe63 SHA1 b2a732fa4720f2c5d2e9272dcd69fc01078bf895 SHA256 aa0c78330c86ab84aa5bf83709b245090ac023b5453eeb16d85723bc8fa680f1
+MD5 38187e310dea37159174055d04d1d203 ChangeLog 2971
+RMD160 218438a82c3bc35835f1576a1decc41a1eaafe63 ChangeLog 2971
+SHA256 aa0c78330c86ab84aa5bf83709b245090ac023b5453eeb16d85723bc8fa680f1 ChangeLog 2971
 MISC metadata.xml 502 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 SHA1 cedec19d978ffb5fb76276d81da21e191678d787 SHA256 4f9650b92fce31432cc276364f35336489bf2a89151125295570d39752044818
 MD5 f8b74843a483dd4f645aa5da4ef6eee9 metadata.xml 502
 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 metadata.xml 502
@@ -76,10 +81,13 @@ SHA256 2554f0fecdc5261f0b409e5c7e495769580ea44d5364ca7f53c80228f4232e14 files/di
 MD5 2dcc653f2dd21d9e521aec3c6c1bd5be files/digest-vdradmin-am-3.5.2-r2 256
 RMD160 0405cd3bad1ec700e1f4570a7ac453f51377663e files/digest-vdradmin-am-3.5.2-r2 256
 SHA256 04b08f6f57c6fe7c67a646d650043f25f58d3a68e20c30ca3f91235de5e8d22d files/digest-vdradmin-am-3.5.2-r2 256
+MD5 4d02a01a214be583dc429f3655c798a1 files/digest-vdradmin-am-3.5.3 256
+RMD160 dfe2c872a5b6403ba813d473a2961405bf0fb4b4 files/digest-vdradmin-am-3.5.3 256
+SHA256 32710b1733cb62d968ee87a7e8762a933c41daefc1e10af0e10fcfe930887764 files/digest-vdradmin-am-3.5.3 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFs2kVt2vP6XvVdOcRAlHTAKCZXStUXQ3oKab0FIuMUptl71T2PgCcC1oU
-HICJ9y3LyiirE22KDJN1f/4=
-=fG74
+iD8DBQFFuKvnt2vP6XvVdOcRAlYgAKC72z4tudi2YVVblidwSPtGAOQn9gCeKVbT
+KWiGbaaJzVHKgB895hvEsOg=
+=aair
 -----END PGP SIGNATURE-----
diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.3 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.3
new file mode 100644
index 000000000000..226092276409
--- /dev/null
+++ b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.3
@@ -0,0 +1,3 @@
+MD5 3f501e2b0ff6be88ddd3e99bcac4774c vdradmin-am-3.5.3.tar.bz2 532243
+RMD160 c5919844f13c3fe39cbcba2850f39db15d79efeb vdradmin-am-3.5.3.tar.bz2 532243
+SHA256 fc7220d9c868600b991b93596353898f8a7a22e80d1fa5fab0ddddf028d72ff1 vdradmin-am-3.5.3.tar.bz2 532243
diff --git a/net-www/vdradmin-am/vdradmin-am-3.5.3.ebuild b/net-www/vdradmin-am/vdradmin-am-3.5.3.ebuild
new file mode 100644
index 000000000000..bd9b26f3f544
--- /dev/null
+++ b/net-www/vdradmin-am/vdradmin-am-3.5.3.ebuild
@@ -0,0 +1,182 @@
+# 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.1 2007/01/25 13:08:48 zzam Exp $
+
+inherit eutils
+
+DESCRIPTION="WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://andreas.vdr-developer.org/"
+SRC_URI="http://andreas.vdr-developer.org/download/${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
+
+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
+}
+