Version bumped.

Package-Manager: portage-2.1.3.9

4 files changed, 213 insertions, 9 deletions

diff --git a/net-www/vdradmin-am/ChangeLog b/net-www/vdradmin-am/ChangeLog
index 1455b31f3c3d..31e21e4d395f 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.21 2007/08/27 12:25:39 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/vdradmin-am/ChangeLog,v 1.22 2007/09/21 10:47:59 zzam Exp $
+
+*vdradmin-am-3.6.0 (21 Sep 2007)
+
+  21 Sep 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +vdradmin-am-3.6.0.ebuild:
+  Version bumped.
 
 *vdradmin-am-3.6.0_rc (27 Aug 2007)
 
diff --git a/net-www/vdradmin-am/Manifest b/net-www/vdradmin-am/Manifest
index 915f1174abba..eb966259331a 100644
--- a/net-www/vdradmin-am/Manifest
+++ b/net-www/vdradmin-am/Manifest
@@ -14,12 +14,17 @@ 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.3.tar.bz2 532120 RMD160 393c3068ab7e8ba8cc5420bd3099005676c6013e SHA1 2e3af767b20a7c6527488c7397159d8d1fd90229 SHA256 06ac48d085dba0ee5d041574886c097ae3e0674288d695738011b092f07692ba
+DIST vdradmin-am-3.6.0.tar.bz2 562438 RMD160 280b4279cf7b3c26e66e00b7019a451dc736b150 SHA1 54d1fd442c1c2a432ef781a2c98f0650431b89d3 SHA256 ef55246451c71ae11444a7a1e5b1413ab92ddd8508c698025df7c17d23f9cae9
 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 4856 RMD160 f24e102b4064ee0b5d24a196c0de4476ef989cff SHA1 56a8b388c7e58668dc484ad7d3a366dc635fe476 SHA256 65fbd43bc7f69e680859f791b23186bd47dd1bd7257170c43fab8dc120c3df35
+MD5 52143aa8e5ea61c2d5d0ba5a98bdd146 vdradmin-am-3.6.0.ebuild 4856
+RMD160 f24e102b4064ee0b5d24a196c0de4476ef989cff vdradmin-am-3.6.0.ebuild 4856
+SHA256 65fbd43bc7f69e680859f791b23186bd47dd1bd7257170c43fab8dc120c3df35 vdradmin-am-3.6.0.ebuild 4856
 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
@@ -28,10 +33,10 @@ EBUILD vdradmin-am-3.6.0_rc.ebuild 4785 RMD160 e677abdfc195eca7b017078e758a6c302
 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 4178 RMD160 3c6e9a9352566474bf1287950f1f5e1c2817f992 SHA1 d521599d301f4c9222c8bc24912c86c3d5c00d54 SHA256 08e78af89cd580f3ec7e3825c98aa5e89fbfc259aefb0f9979b3ff04243543ba
-MD5 a1aae03a0e694e96a18ad5f4713fe4c7 ChangeLog 4178
-RMD160 3c6e9a9352566474bf1287950f1f5e1c2817f992 ChangeLog 4178
-SHA256 08e78af89cd580f3ec7e3825c98aa5e89fbfc259aefb0f9979b3ff04243543ba ChangeLog 4178
+MISC ChangeLog 4313 RMD160 218b93da2c8a5aa8847c4f30cd18efde44229d08 SHA1 b2c4d85ad82eb455b60a1930b792bcb88a079e03 SHA256 222175a832fa01b95630101a452ae1c3af56e2e328f06af5e49bffc98e243fab
+MD5 8dfcd621f4317ea860c20441a98a7e5b ChangeLog 4313
+RMD160 218b93da2c8a5aa8847c4f30cd18efde44229d08 ChangeLog 4313
+SHA256 222175a832fa01b95630101a452ae1c3af56e2e328f06af5e49bffc98e243fab ChangeLog 4313
 MISC metadata.xml 502 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 SHA1 cedec19d978ffb5fb76276d81da21e191678d787 SHA256 4f9650b92fce31432cc276364f35336489bf2a89151125295570d39752044818
 MD5 f8b74843a483dd4f645aa5da4ef6eee9 metadata.xml 502
 RMD160 4fcf3db9843f5cfbc9f3f20a740cf0f1b914d2d2 metadata.xml 502
@@ -39,6 +44,9 @@ SHA256 4f9650b92fce31432cc276364f35336489bf2a89151125295570d39752044818 metadata
 MD5 c74868c4be49412616a158ba6d1f1af5 files/digest-vdradmin-am-3.5.3 256
 RMD160 95322e3d0677e3e691b1bfeb75a89f40b068dab8 files/digest-vdradmin-am-3.5.3 256
 SHA256 5a9485da16325ef7e5a33c9ef0e6df25060e456b440e3dac02975ca1e3142e8e files/digest-vdradmin-am-3.5.3 256
+MD5 aea0cee61b880f1d3ed4fd0006206f42 files/digest-vdradmin-am-3.6.0 256
+RMD160 9b3983797aa49557bc3b56b5fb984d96b0b856ac files/digest-vdradmin-am-3.6.0 256
+SHA256 97a97258955e2343226dda512377823b525eb5f10912c3ced4f735cd00185d5d files/digest-vdradmin-am-3.6.0 256
 MD5 9ccb6fba9bea3ef0ff664f0d42acce61 files/digest-vdradmin-am-3.6.0_beta 268
 RMD160 d2bd7c8a3c4fabb77ed824643848f550a6b96084 files/digest-vdradmin-am-3.6.0_beta 268
 SHA256 4a1b5b4dc0c98dde5d83d8039239f3343bf01b1102eab50c1411944b06afd61a files/digest-vdradmin-am-3.6.0_beta 268
@@ -46,9 +54,9 @@ 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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG0sLRt2vP6XvVdOcRArcFAKC8xr4Pqulug4mIEO0g9gMxMU28jgCeNFpE
-a4vQh93PAOtahL4vVcTcq7o=
-=X9D9
+iD8DBQFG86Fot2vP6XvVdOcRAqTsAJ9pHnrZhWYdzPdDufRozvFs1b58MwCg0k94
+vVxN9vgnxcyoOtWfHbrfeMM=
+=sw5y
 -----END PGP SIGNATURE-----
diff --git a/net-www/vdradmin-am/files/digest-vdradmin-am-3.6.0 b/net-www/vdradmin-am/files/digest-vdradmin-am-3.6.0
new file mode 100644
index 000000000000..e5bb0b4ec5a6
--- /dev/null
+++ b/net-www/vdradmin-am/files/digest-vdradmin-am-3.6.0
@@ -0,0 +1,3 @@
+MD5 c12d8020a3afa688efedd5bab28c63a9 vdradmin-am-3.6.0.tar.bz2 562438
+RMD160 280b4279cf7b3c26e66e00b7019a451dc736b150 vdradmin-am-3.6.0.tar.bz2 562438
+SHA256 ef55246451c71ae11444a7a1e5b1413ab92ddd8508c698025df7c17d23f9cae9 vdradmin-am-3.6.0.tar.bz2 562438
diff --git a/net-www/vdradmin-am/vdradmin-am-3.6.0.ebuild b/net-www/vdradmin-am/vdradmin-am-3.6.0.ebuild
new file mode 100644
index 000000000000..e8bedcc6acf6
--- /dev/null
+++ b/net-www/vdradmin-am/vdradmin-am-3.6.0.ebuild
@@ -0,0 +1,187 @@
+# 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.1 2007/09/21 10:47:59 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-"
+
+	# fix wrong encoding in .po
+	sed -i po/it.po \
+		-e 's/8859-1s/8859-1/'
+}
+
+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
+}