From: Joerg Bornkessel <hd_brummy@gentoo.org>
Date: Sat, 2 Dec 2006 18:40:50 +0000 (+0000)
Subject: version bump
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9d7eaaba09423fb1ce7a288343efa289a2cb46e;p=gentoo.git

version bump
Package-Manager: portage-2.1.1-r2
---

diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog
index df626e83f9b0..2873171cb684 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.5 2006/11/11 18:43:26 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.6 2006/12/02 18:40:50 hd_brummy Exp $
+
+*vdradmin-am-3.5.1 (02 Dec 2006)
+
+  02 Dec 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdradmin-am-3.5.1.ebuild:
+  version bump
 
 *vdradmin-am-3.5.0 (11 Nov 2006)
 
diff --git a/net-www/vdradmin-am/Manifest b/net-www/vdradmin-am/Manifest
index 41ba810aee00..d9e8f47d6e77 100644
--- a/net-www/vdradmin-am/Manifest
+++ b/net-www/vdradmin-am/Manifest
@@ -24,6 +24,7 @@ SHA256 1687001c6114cb373643982fb73a78e7656c70d253e9ff0d89b7ed466133f950 files/vd
 DIST vdradmin-am-3.4.6.tar.bz2 508340 RMD160 9a8039ebf5df52939720ec1d223937e60995c980 SHA1 3a1fffd2802cacc9117dbe749f585e1e1ba9ac4a SHA256 eeb9534f08a41ad3149446707417910e79ef76e958f4f216634557e9675d767a
 DIST vdradmin-am-3.4.7.tar.bz2 506628 RMD160 04413c1a767c668f0bb8d68dfe016fa449d06be6 SHA1 616b1e6d977fdcc20157030ab317e470cc5b2655 SHA256 46a07e9aed77d533a0e4045a733962db36beab025c7eb297eda0c0ec41d6f1c9
 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
 EBUILD vdradmin-am-3.4.6.ebuild 1369 RMD160 652fce28de3d5d8c8da1bc8c337c29eb64446dcd SHA1 bd2eb297fa6f03b9e51297f69e9264ff07fe9d09 SHA256 f48d8435a08b79d61a5b8540e2767073ad5507059bdd4f3ad1ebcb2055a14d72
 MD5 72da23117758c63696c986b5d765e98e vdradmin-am-3.4.6.ebuild 1369
 RMD160 652fce28de3d5d8c8da1bc8c337c29eb64446dcd vdradmin-am-3.4.6.ebuild 1369
@@ -40,10 +41,14 @@ EBUILD vdradmin-am-3.5.0.ebuild 4615 RMD160 51a65e62e4209a04aef696f1a00c86d3d405
 MD5 f851841538a0ac031c209bf976a14464 vdradmin-am-3.5.0.ebuild 4615
 RMD160 51a65e62e4209a04aef696f1a00c86d3d405b67e vdradmin-am-3.5.0.ebuild 4615
 SHA256 474da00908bb7c1ccedc8c8dd3c212257dbf641a1e43c2d965923b494a78468b vdradmin-am-3.5.0.ebuild 4615
-MISC ChangeLog 1296 RMD160 a83a43401ffef959d2cba9ad701350894433fef9 SHA1 a8a5966a224097b5e2aecc7c8a17c74b9c962427 SHA256 1c78a4a492f3e142a2b5c8b0d6a9ab12b07edee7997f1b33febe6296bc58709c
-MD5 9690563604b762742351b9a6a0893fe8 ChangeLog 1296
-RMD160 a83a43401ffef959d2cba9ad701350894433fef9 ChangeLog 1296
-SHA256 1c78a4a492f3e142a2b5c8b0d6a9ab12b07edee7997f1b33febe6296bc58709c ChangeLog 1296
+EBUILD vdradmin-am-3.5.1.ebuild 4615 RMD160 a9cfe10d177814dfe6ac410466d9daa743d12b06 SHA1 ebac40f78eb09f1a3b894ed3132f924e4d6201ee SHA256 f1cf3abb35e851416562e32c201ffe28acd70e312b9c55da3134842db46f506a
+MD5 f3cd45315310db0c295e5227d6e9a8cc vdradmin-am-3.5.1.ebuild 4615
+RMD160 a9cfe10d177814dfe6ac410466d9daa743d12b06 vdradmin-am-3.5.1.ebuild 4615
+SHA256 f1cf3abb35e851416562e32c201ffe28acd70e312b9c55da3134842db46f506a vdradmin-am-3.5.1.ebuild 4615
+MISC ChangeLog 1430 RMD160 8c080bc8cc53d1fafa955f8f21518ab90fbc2cff SHA1 50ba24061f354d49efdbdf4a4127e32eadd974a6 SHA256 a45ffb6b2c945d322bf708cfb568242cd92eccb7d435fa5e7d81e073e2d15d19
+MD5 b24b25caea72f7e88b2c18c24e199348 ChangeLog 1430
+RMD160 8c080bc8cc53d1fafa955f8f21518ab90fbc2cff ChangeLog 1430
+SHA256 a45ffb6b2c945d322bf708cfb568242cd92eccb7d435fa5e7d81e073e2d15d19 ChangeLog 1430
 MISC metadata.xml 502 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 SHA1 cedec19d978ffb5fb76276d81da21e191678d787 SHA256 4f9650b92fce31432cc276364f35336489bf2a89151125295570d39752044818
 MD5 f8b74843a483dd4f645aa5da4ef6eee9 metadata.xml 502
 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 metadata.xml 502
@@ -60,11 +65,14 @@ SHA256 6ebb2dc5335b44c8c533e8015d138f5670b480fd230f3cf22b20ce3cc6147436 files/di
 MD5 a8be566e8b72d342d50c27497d00f7a2 files/digest-vdradmin-am-3.5.0 256
 RMD160 99a805b11c2b45fc2dadd7b6a0e934abb5cf5045 files/digest-vdradmin-am-3.5.0 256
 SHA256 1fc2d6ab356d90f5cfddc7dc9b6831cf1960b2b29c8011c85293cf9f2b5ee2a3 files/digest-vdradmin-am-3.5.0 256
+MD5 46bbca1ada218400524c7dab0913060e files/digest-vdradmin-am-3.5.1 256
+RMD160 bea77b6c860a693678e789fcc68f891a34a54ae9 files/digest-vdradmin-am-3.5.1 256
+SHA256 2554f0fecdc5261f0b409e5c7e495769580ea44d5364ca7f53c80228f4232e14 files/digest-vdradmin-am-3.5.1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: no further Information
 
-iD8DBQFFVhnadn07HTTCgIoRAvXPAJ9/fqo7PmR1rl9SNPA6kNgZmHUjowCfUbz4
-CBnTScuf1XOIVnPOB9cgCZY=
-=fHoC
+iD8DBQFFcckSdn07HTTCgIoRAsIsAKCBeTS1/hDR6lGUxaeO92lWhtF0fACdHg02
+GzdBHtmIqBtkGDoxEBYpGyg=
+=4oNf
 -----END PGP SIGNATURE-----
diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.1 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.1
new file mode 100644
index 000000000000..c7cc1c280f10
--- /dev/null
+++ b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.1
@@ -0,0 +1,3 @@
+MD5 95b993576f1e5634e13b6ab8380c1d8b vdradmin-am-3.5.1.tar.bz2 530000
+RMD160 54e7d858173646208dc87da7ae2455f6da181ffc vdradmin-am-3.5.1.tar.bz2 530000
+SHA256 55481c6adba273874291b721f1c5d539d5d0cd34ed26c9498dc73f8e80f281ea vdradmin-am-3.5.1.tar.bz2 530000
diff --git a/net-www/vdradmin-am/vdradmin-am-3.5.1.ebuild b/net-www/vdradmin-am/vdradmin-am-3.5.1.ebuild
new file mode 100644
index 000000000000..bb9e228a72c2
--- /dev/null
+++ b/net-www/vdradmin-am/vdradmin-am-3.5.1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2006 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.1.ebuild,v 1.1 2006/12/02 18:40:50 hd_brummy Exp $
+
+inherit eutils
+
+RESTRICT="nostrip"
+
+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="~x86 ~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="unicode"
+
+RDEPEND="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
+	unicode? ( sys-devel/gettext )"
+
+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
+	doins -r ${S}/lib/*
+
+	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
+		einfo "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'
+
+		einfo
+		einfo "Created default user/password: gentoo-vdr/gentoo-vdr"
+		einfo
+		einfo "you can run \"emerge --config vdradmin-am\" if"
+		einfo "the default-values for vdr does not match your"
+		einfo "installation or change it in Setup-Menu of Web-Interface."
+		echo
+	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
+			einfo "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
+}
+