bump, thx to M.Dummer for testing

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x34C2808A

3 files changed, 193 insertions, 8 deletions

diff --git a/www-misc/vdradmin-am/ChangeLog b/www-misc/vdradmin-am/ChangeLog
index bd5e476c04e5..ac30a37127cf 100644
--- a/www-misc/vdradmin-am/ChangeLog
+++ b/www-misc/vdradmin-am/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-misc/vdradmin-am
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.35 2014/07/29 17:29:20 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.36 2014/10/03 11:33:13 hd_brummy Exp $
+
+*vdradmin-am-3.6.10 (03 Oct 2014)
+
+  03 Oct 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdradmin-am-3.6.10.ebuild:
+  bump, thx to M.Dummer for testing
 
   29 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> vdradmin-am-3.6.9-r3.ebuild,
   vdradmin-am-3.6.9.ebuild:
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index afa2633e74cf..6c1523d3dab0 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -6,17 +6,18 @@ AUX vdradmin-3.6.6.logrotate 116 SHA256 2eb705ff7ab186d2a0287d3e91afe7d59be39f89
 AUX vdradmin-3.6.7.init 1988 SHA256 d903fb0ee336a9bd8c27054c89c5493465d38fd7f9089eb4759ef8b7fd862bc5 SHA512 2703b738450cdd33eb30ccf235f4aaa09f8913100005931a73e6bf8227e20fdb32902f2653d2b805f8ddd83bd99554972d3ea696c18c934e7e227fdb2337a0e4 WHIRLPOOL 3a740e7b7187a7b814f77578dbd648fcdc36d8e8013af6d142ad07ec1058fb8ddbe702fa95c4ce1c9e27d9be62ffbd88d1addef894b1d545c3cabc6841351a1c
 AUX vdradmind.conf 92 SHA256 e1ca8d661db9b3077495b2b51e1292e3dda531d840cbce0170f1b6d0597c3b05 SHA512 d54253b0eb684dfcfa924e141b5f0975cea659f3258a519afd625e692855de45d9c863a8d9eb11d4b16597fa76eee955694350f224b443733b238071b3ad9d16 WHIRLPOOL f5362fd588a1a8c202be29a923f6454f1ed45a94ed305e1858921f372b166455fbca56e7bd2ac0da5cb1a33d99be056d52705699c713bea53af4c48830c66640
 AUX vdradmind.service 278 SHA256 7e6288d205c401e0e5facc740a7825082a84f35a8668caa51043b6224cf86d1a SHA512 e862d5a54e0f9b1b8c3604933ccea840e1256fac49f1b93cd7c6446f9aa4f6b8371fbd8d8b767574efe2420c7141e7af0cd5578733311a94377db8797de32b28 WHIRLPOOL 850b7a8b8cc4e4b4767e604de2c8ab9d3e11f45b91931f4ec51b8aea896240882baf74877975f66e38a902990e3187ff5b75b8ed2ef80147ab1da4c64ea48fb6
+DIST vdradmin-am-3.6.10.tar.bz2 606665 SHA256 a206b85f26860d0adc65bea93756445bf418db1d19e51c83b1caa3355cd496a6 SHA512 f7546f79b786ca383c0846656e74bd69dc9faf57fe5794ffd68776123497ec2a96c2f131801e3d5d19247ac36eaa896801e1ac9cd11291418abb518ba208e597 WHIRLPOOL 91286787f4693a6f5045d50661668254c66afe155866f5c8d3dfa9c2744c36b6109098914bb8f136b2b96af05465d6872310d6b8a7e6f431d2315646dbaaa495
 DIST vdradmin-am-3.6.9.tar.bz2 562006 SHA256 5f0421ca0ea2b4c7669d5332d43b04af8b0c40d2964dd152a265c18f4d7f2715 SHA512 1c84ce56da238db6ab2a2fc3d59582945440436e174b3998c21b6bcb5b99c914a195728aa24fef7de8841c3be09b6e9976497acd873e768aab5fdaacddd473d5 WHIRLPOOL 25f21395fda80a35b7e67fdcf1bdf2a789af73ba59c049d3604da8ecd4863e85c2e551334757d0ac53bfc33d128747ee570520171648be3818a406baa23b0737
+EBUILD vdradmin-am-3.6.10.ebuild 4857 SHA256 f5a6cca47b4398b5da91decaab428bda859b97eaf40c963bc04a001c959d4a1f SHA512 9480b11e0512ec5fa804dc721aa708649c884f16d84259d7bd9cb828f5ac9ea864cb87783a9006b74408e9a48cf035dd52eb8da8b2d0f6663f20f714566a3253 WHIRLPOOL a342ffae31482f3e6ae5bb5ca86447bf7e1323e9323573a3756ba716764f2aaed2533ac383b95897496d3316151aadb3a42e75dc2367fa9e3f0490bdf5de375a
 EBUILD vdradmin-am-3.6.9-r3.ebuild 4857 SHA256 998c31b5c5be87c639ede072e3614f96d691f3d553599636559243a8f77e3eb7 SHA512 2bd2756c1f9e473ac7f65e750ced32423797f1f6db85d5db52e76f14088d4250f6ce6bc051695218a58e2823342675800073c9437907c4b79ea2db0f5184a04a WHIRLPOOL 7e773337aede3fb7b007d716e9e07066e7b3dd8ef8ee5a64c3f92f9f963f83f72437cf2c3e59150d1bb1db16b3d5bd1067299808356165873f99b2b3d27bcd80
 EBUILD vdradmin-am-3.6.9.ebuild 4439 SHA256 cdeaef9787b3f03bab25ecb156be833cb5862204f785ed8e9a9eef5fdb986546 SHA512 9227a634e8aba4cb8614a18618a866acae5b66c87692acb8912a119717f73096a31750fa6f10e0c822271c3095771038689722c879be0fa81c4b5621f3f44bc8 WHIRLPOOL b91dbbcae5566dd672277c742aef2ca1df52ecd50dd1759a3f79ca370f8705346f5c0dc17a9f3f6727a7206fdc55eee4dde7a3d13b4bce918de07d2898bcda81
-MISC ChangeLog 11993 SHA256 b7b69ed1ccff5cd1bc0210df7d0c0122030c7ac3eaa2bdac9e53973b25e2565d SHA512 b3a31a37e922bc3cec28820f78b1fdb956814e2ede96ba5a0856c42f4d0f3554cf8b27422f9c63a6c203fd52d089c7a46d3797f56620ab57752b64331117fab8 WHIRLPOOL 09f0d6551b6456fe3a67c13b9bc213c15bbab7c799473a0bbb40cb24a2c9fc76b2f1796215a8b4e1ac9a58c58ec2ea593443b4079eb2951052113b817ad9eb1c
+MISC ChangeLog 12152 SHA256 495a169ee2245a7d95bc5f494750a45678a6b1749c627023577eadcad2fe35eb SHA512 150c2b13840835c6d4f1c3a522e11bc9c5d714dba8eb7825e2ebd69417e82f0e08c9097fa7c15c5fc7a0aa7695608c38cb6556ad0bd96557f0e161e35e84f079 WHIRLPOOL 415e040d395c504982bbc592c8d67f342ded2cceb59bd0db92305d5f71aada735a2f68321ac1d83ea663dbe2cb2d334b5e073fba40858d956b41ae9f50ec9562
 MISC metadata.xml 652 SHA256 40a987f0caed004be4922c4d2a5f96472db5dc68aede439e3541a35c6ee8d412 SHA512 3803d4ebf228328849889e188f7e69d2d58e760ef0798f33a312e709672fa46e1ae8a3ea0f68946d4b98aa9c378d1e6549290c85fc75708eaa02cac145e3ceb6 WHIRLPOOL df37f3b6b8be798811eddc5a68d3543632a22ea1e7860ac7a16a8e089e46c01831d6b398e889f84ad40412e010300e55023f2e213a07f6e96c157d3c537a1ae7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iJwEAQEIAAYFAlPX2ygACgkQG9wOWsQutdZbgAQAz4qtYK/AkmFmB9rBvVptkKtC
-Nfg8EkcwJLWw4Sc6vJJILLz6vZuyA37wgHvw/qSthaqpOnRyUfd6Mp5PTkw8wqPQ
-nAih5lJuY1zd8aF09S7V8U606MObjPzV4IKpBx/DrQGQvpPBQRDXv5PaUGEFBiLB
-aU3yGYDOOxlkZ7J3734=
-=hMJW
+iD8DBQFULol+dn07HTTCgIoRCHawAJ0ZpZ9A2qRmuZ6tpg9hfAzjlnnV/ACguc15
+u5zBSNlXH1YrzOfFK5vyxQY=
+=aCFX
 -----END PGP SIGNATURE-----
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
new file mode 100644
index 000000000000..1f3af09f0bb7
--- /dev/null
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.10.ebuild,v 1.1 2014/10/03 11:33:13 hd_brummy Exp $
+
+EAPI=5
+
+inherit eutils ssl-cert systemd user
+
+DESCRIPTION="WWW Admin for the Video Disk Recorder"
+HOMEPAGE="http://andreas.vdr-developer.org/vdradmin-am/index.html"
+SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 ssl"
+
+DEPEND="dev-lang/perl
+	dev-perl/Template-Toolkit
+	dev-perl/libwww-perl
+	dev-perl/URI
+	dev-perl/Locale-gettext
+	virtual/perl-IO-Compress
+	ipv6? ( dev-perl/IO-Socket-INET6 )
+	ssl? ( dev-perl/IO-Socket-SSL )
+	virtual/perl-libnet
+	dev-perl/Authen-SASL
+	dev-perl/Digest-HMAC"
+RDEPEND="${DEPEND}"
+
+ETC_DIR=/etc/vdradmin
+CERTS_DIR=/etc/vdradmin/certs
+LIB_DIR=/usr/share/vdradmin
+CACHE_DIR=/var/cache/vdradmin
+VDRADMIN_USER=vdradmin
+VDRADMIN_GROUP=vdradmin
+
+create_ssl_cert() {
+	# The ssl-cert eclass is not flexible enough so do some steps manually
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-vdradmin-am}"
+	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+	gen_cnf || return 1
+
+	gen_key 1 || return 1
+	gen_csr 1 || return 1
+	gen_crt 1 || return 1
+}
+
+pkg_setup() {
+	enewgroup ${VDRADMIN_GROUP}
+	enewuser ${VDRADMIN_USER} -1 /bin/bash ${CACHE_DIR} ${VDRADMIN_GROUP}
+}
+
+src_unpack() {
+	unpack ${A}
+	cp "${FILESDIR}"/vdradmind.service "${WORKDIR}"/vdradmind.service
+}
+
+src_prepare() {
+	sed -i vdradmind.pl \
+		-e "s-FILES_IN_SYSTEM    = 0;-FILES_IN_SYSTEM    = 1;-g" || die
+
+	if use ipv6; then
+		sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ipv6:" \
+			-i "${WORKDIR}"/vdradmind.service
+	fi
+
+	if use ssl; then
+		sed -e "s:/usr/bin/vdradmind:/usr/bin/vdradmind --ssl:" \
+			-i "${WORKDIR}"/vdradmind.service
+	fi
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/vdradmin-3.6.7.init vdradmin
+	newconfd "${FILESDIR}"/vdradmin-3.6.6.conf vdradmin
+
+	systemd_dounit "${WORKDIR}"/vdradmind.service
+	systemd_dotmpfilesd "${FILESDIR}"/vdradmind.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/vdradmin-3.6.6.logrotate vdradmin
+
+	newbin vdradmind.pl vdradmind
+
+	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/*
+
+	newman vdradmind.pl.1 vdradmind.8
+
+	dodoc CREDITS ChangeLog FAQ HISTORY INSTALL README* REQUIREMENTS
+	docinto contrib
+	dodoc "${S}"/contrib/*
+
+	diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
+	keepdir ${ETC_DIR}
+	use ssl && keepdir ${CERTS_DIR}
+}
+
+pkg_preinst() {
+	install -m 0644 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} /dev/null \
+		"${D}"${ETC_DIR}/vdradmind.conf || die
+
+	if [[ -f "${ROOT}"${ETC_DIR}/vdradmind.conf ]]; then
+		cp "${ROOT}"${ETC_DIR}/vdradmind.conf \
+			"${D}"${ETC_DIR}/vdradmind.conf || die
+	else
+		elog
+		elog "Creating a new config-file."
+		echo
+
+		cat <<-EOF > "${D}"${ETC_DIR}/vdradmind.conf
+			VDRCONFDIR = "${ROOT%/}"/etc/vdr
+			VIDEODIR = "${ROOT%/}"/var/vdr/video
+			EPG_FILENAME = "${ROOT%/}"/var/vdr/video/epg.data
+			EPGIMAGES = "${ROOT%/}"/var/vdr/video/epgimages
+			PASSWORD = gentoo-vdr
+			USERNAME = gentoo-vdr
+		EOF
+		# Feed it with newlines
+		yes "" \
+			| "${D}"/usr/bin/vdradmind --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 ${PN}\" if the default-values"
+		elog "do not match your installation or change them in the Setup-Menu"
+		elog "of the Web-Interface."
+	fi
+}
+
+pkg_postinst() {
+	if use ipv6; then
+		elog
+		elog "To make use of the ipv6 protocol"
+		elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+	fi
+
+	if use ssl; then
+		elog
+		elog "To use ssl connection to your vdr"
+		elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
+
+		if [[ ! -f "${ROOT}"${CERTS_DIR}/server-cert.pem || \
+			! -f "${ROOT}"${CERTS_DIR}/server-key.pem ]]; then
+			create_ssl_cert
+			local base=$(get_base 1)
+			install -D -m 0400 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+				"${base}".key "${ROOT}"${CERTS_DIR}/server-key.pem || die
+			install -D -m 0444 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP} \
+				"${base}".crt "${ROOT}"${CERTS_DIR}/server-cert.pem || die
+		fi
+	fi
+
+	elog
+	elog "To extend ${PN} you can emerge"
+	elog ">=media-plugins/vdr-epgsearch-0.9.25 to search the EPG,"
+	elog "media-plugins/vdr-streamdev for livetv streaming and/or"
+	elog "media-video/vdr with USE=\"liemikuutio/vasarajanauloja/none\" "
+	elog "(depend on your vdr version) to rename recordings"
+	elog "on the machine running the VDR you connect to with ${PN}."
+}
+
+pkg_config() {
+	"${ROOT}"/usr/bin/vdradmind -c
+}