Version bumped.

svn path=/testing/; revision=94

4 files changed, 202 insertions, 4 deletions

diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog
index f8db293..eaaead9 100644
--- a/net-www/vdradmin-am/ChangeLog
+++ b/net-www/vdradmin-am/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +vdradmin-am-3.5.0.ebuild:
+  Version bumped.
+
   07 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
   -vdradmin-am-3.4.7-r1.ebuild, -files/vdradmin-am-3.4.7_opera-search.diff,
   -vdradmin-am-3.5.0_beta.ebuild:
diff --git a/net-www/vdradmin-am/Manifest b/net-www/vdradmin-am/Manifest
index e57b9e7..9e5bbec 100644
--- a/net-www/vdradmin-am/Manifest
+++ b/net-www/vdradmin-am/Manifest
@@ -10,19 +10,27 @@ AUX vdradmin-am-config-autoflush.diff 654 RMD160 f6d0a31c424c6a45d8786d2b98e9872
 MD5 910bd87790a16ac3303e6641151ade65 files/vdradmin-am-config-autoflush.diff 654
 RMD160 f6d0a31c424c6a45d8786d2b98e9872e5e3ded5f files/vdradmin-am-config-autoflush.diff 654
 SHA256 1687001c6114cb373643982fb73a78e7656c70d253e9ff0d89b7ed466133f950 files/vdradmin-am-config-autoflush.diff 654
+DIST vdradmin-am-3.5.0.tar.bz2 506174 RMD160 e2ec7300c83cd3749e275c2be3ef85286219c24f SHA1 d0f7e5a5d1b1a00f37064068d9874d04ef898a74 SHA256 638007f7c160b857edcef5368b7888948ead2571a2bf8882e4dc054b99ca7ab8
 DIST vdradmin-am-3.5.0rc.tar.bz2 505874 RMD160 979c528546ecd106bf754b5ca90b5688e2884b46 SHA1 b74d8cdb85fefda6403211abee9bca7e394d74b9 SHA256 4a990fc92a5db324078d3c6a2a2dca4910ff5f44c62f84e5dbd4b3510d18ad08
+EBUILD vdradmin-am-3.5.0.ebuild 4677 RMD160 1eb97d9703659779c3e1adbec136daa08dba841a SHA1 af1f8116516be43fe901aed5dea53fdf470f5ceb SHA256 e8ea8d18d2993daaed4307215b3770584c1465839f792d2d693bffd94146ce05
+MD5 03c65a2bf12b83febe2b77575704a40a vdradmin-am-3.5.0.ebuild 4677
+RMD160 1eb97d9703659779c3e1adbec136daa08dba841a vdradmin-am-3.5.0.ebuild 4677
+SHA256 e8ea8d18d2993daaed4307215b3770584c1465839f792d2d693bffd94146ce05 vdradmin-am-3.5.0.ebuild 4677
 EBUILD vdradmin-am-3.5.0_rc.ebuild 4677 RMD160 1eb97d9703659779c3e1adbec136daa08dba841a SHA1 af1f8116516be43fe901aed5dea53fdf470f5ceb SHA256 e8ea8d18d2993daaed4307215b3770584c1465839f792d2d693bffd94146ce05
 MD5 03c65a2bf12b83febe2b77575704a40a vdradmin-am-3.5.0_rc.ebuild 4677
 RMD160 1eb97d9703659779c3e1adbec136daa08dba841a vdradmin-am-3.5.0_rc.ebuild 4677
 SHA256 e8ea8d18d2993daaed4307215b3770584c1465839f792d2d693bffd94146ce05 vdradmin-am-3.5.0_rc.ebuild 4677
-MISC ChangeLog 2719 RMD160 46d3872e438c5f51cb9bb0cdfe12f91362a48242 SHA1 6bed5e333e33aadb92fc4477273f27d9f8813563 SHA256 80222e649a88dad5d6ee5667d704e89f806b2b958db46bf2e9b61eb51b4c7340
-MD5 8781facadfc38720c11f0b73b0ce5115 ChangeLog 2719
-RMD160 46d3872e438c5f51cb9bb0cdfe12f91362a48242 ChangeLog 2719
-SHA256 80222e649a88dad5d6ee5667d704e89f806b2b958db46bf2e9b61eb51b4c7340 ChangeLog 2719
+MISC ChangeLog 2820 RMD160 557ebf25bba8dc7900ff0cc9b49d977c69c56966 SHA1 67a39a424da9422e25f8295814cba238b2124ac6 SHA256 45d99a7ca84cb9bb008a99d466ee5d470a090f08f3461d789805a8ec887ac77f
+MD5 7e54aec63d381773f3b93174aefce893 ChangeLog 2820
+RMD160 557ebf25bba8dc7900ff0cc9b49d977c69c56966 ChangeLog 2820
+SHA256 45d99a7ca84cb9bb008a99d466ee5d470a090f08f3461d789805a8ec887ac77f ChangeLog 2820
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 MD5 3cafef7c72bb98475ad53d15e79ff845 metadata.xml 251
 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 metadata.xml 251
 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f metadata.xml 251
+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 204c5a6e6d08dddd7f9c6791e76a913f files/digest-vdradmin-am-3.5.0_rc 262
 RMD160 8ef487af17623dde625bf4b2344bafe787169c2b files/digest-vdradmin-am-3.5.0_rc 262
 SHA256 ef12d14703299337fc0aafff09c257bc8c6facc8753be40022cdb8ff6609c3c9 files/digest-vdradmin-am-3.5.0_rc 262
diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.0 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.0
new file mode 100644
index 0000000..d4774ff
--- /dev/null
+++ b/net-www/vdradmin-am/files/digest-vdradmin-am-3.5.0
@@ -0,0 +1,3 @@
+MD5 945102178caec3f0012dc3aaffcf1014 vdradmin-am-3.5.0.tar.bz2 506174
+RMD160 e2ec7300c83cd3749e275c2be3ef85286219c24f vdradmin-am-3.5.0.tar.bz2 506174
+SHA256 638007f7c160b857edcef5368b7888948ead2571a2bf8882e4dc054b99ca7ab8 vdradmin-am-3.5.0.tar.bz2 506174
diff --git a/net-www/vdradmin-am/vdradmin-am-3.5.0.ebuild b/net-www/vdradmin-am/vdradmin-am-3.5.0.ebuild
new file mode 100644
index 0000000..797fa93
--- /dev/null
+++ b/net-www/vdradmin-am/vdradmin-am-3.5.0.ebuild
@@ -0,0 +1,183 @@
+# 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.4.7.ebuild,v 1.2 2006/10/15 12:44:52 hd_brummy Exp $
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+S=${WORKDIR}/${MY_P}
+
+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/${MY_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
+}
+