Version bump. Remove old.

(Portage version: 2.1.9.42/cvs/Linux i686)

3 files changed, 43 insertions, 98 deletions

diff --git a/www-misc/vdradmin-am/ChangeLog b/www-misc/vdradmin-am/ChangeLog
index f7be3a27e368..c5da7be9c3c2 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.19 2011/02/27 11:21:45 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.20 2011/06/07 17:11:15 billie Exp $
+
+*vdradmin-am-3.6.8 (07 Jun 2011)
+
+  07 Jun 2011; Daniel Pielmeier <billie@gentoo.org> -files/vdradmin-3.6.6.init,
+  -vdradmin-am-3.6.7.ebuild, +vdradmin-am-3.6.8.ebuild:
+  Version bump. Remove old.
 
   27 Feb 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdradmin-am-3.6.7-r1.ebuild:
diff --git a/www-misc/vdradmin-am/files/vdradmin-3.6.6.init b/www-misc/vdradmin-am/files/vdradmin-3.6.6.init
deleted file mode 100644
index 8082613f6bdb..000000000000
--- a/www-misc/vdradmin-am/files/vdradmin-3.6.6.init
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/files/vdradmin-3.6.6.init,v 1.2 2010/04/22 17:11:25 billie Exp $
-
-depend() {
-	use vdr
-}
-
-start() {
-	ebegin "Starting vdradmin"
-
-	: ${VDRADMIN_USER:=vdradmin}
-
-	local vdradmin_opts
-	if [ "${SSL}" = "yes" ]; then vdradmin_opts="${vdradmin_opts} --ssl"; fi
-	if [ "${IPV6}" = "yes" ]; then vdradmin_opts="${vdradmin_opts} --ipv6"; fi
-	vdradmin_opts="${vdradmin_opts} --log ${LOGLEVEL:=4}"
-
-	if [ "${LOGGING}" = "syslog" ]; then
-		sed -i -e "/LOGGING/s-LOGGING.*-LOGGING = 1-" /etc/vdradmin/vdradmind.conf
-		sed -i -e "/LOGFILE/s-LOGFILE.*-LOGFILE = syslog-" /etc/vdradmin/vdradmind.conf
-	elif [ "${LOGGING}" = "file" ]; then
-		local logfile=/var/log/vdradmin/vdradmind.log
-		sed -i -e "/LOGGING/s-LOGGING.*-LOGGING = 1-" /etc/vdradmin/vdradmind.conf
-		sed -i -e "/LOGFILE/s-LOGFILE.*-LOGFILE = vdradmind.log-" /etc/vdradmin/vdradmind.conf
-		if [ ! -e ${logfile} ] ; then touch ${logfile}; fi
-	else
-		sed -i -e "/LOGGING/s-LOGGING.*-LOGGING = 0-" /etc/vdradmin/vdradmind.conf
-	fi
-
-	# Prepare directories
-	local folder
-	chown -R "${VDRADMIN_USER}:vdradmin" /etc/vdradmin
-	for folder in cache log run; do
-		if [ ! -d /var/${folder}/vdradmin ]; then
-			mkdir /var/${folder}/vdradmin
-		fi
-		chown -R "${VDRADMIN_USER}:vdradmin" /var/${folder}/vdradmin
-	done
-
-	if [ -x /etc/init.d/root ]; then
-		# running on baselayout-2/openrc
-		start-stop-daemon --start --background --user "${VDRADMIN_USER}" \
-		--pidfile /var/run/vdradmin/vdradmind.pid \
-		--exec /usr/bin/perl /usr/bin/vdradmind -- ${vdradmin_opts}
-	else
-		start-stop-daemon --start --background --chuid "${VDRADMIN_USER}" \
-		--exec /usr/bin/vdradmind -- ${vdradmin_opts}
-	fi
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping vdradmin"
-	start-stop-daemon --stop --quiet --pidfile /var/run/vdradmin/vdradmind.pid
-	eend $?
-}
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.7.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild
index 3c15ffefb39e..8a9a1ecc5979 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.7.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.7.ebuild,v 1.3 2010/10/26 21:54:14 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.8.ebuild,v 1.1 2011/06/07 17:11:15 billie Exp $
 
-EAPI=2
+EAPI=4
 
 inherit eutils ssl-cert
 
 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/download/${P}.tar.bz2"
+SRC_URI="http://andreas.vdr-developer.org/vdradmin-am/download/${P}.tar.bz2"
 
-KEYWORDS="~amd64 x86"
-SLOT="0"
 LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="ipv6 ssl +vdr"
 
 DEPEND="dev-lang/perl
@@ -32,8 +32,6 @@ RDEPEND="${DEPEND}"
 ETC_DIR=/etc/vdradmin
 CERTS_DIR=/etc/vdradmin/certs
 LIB_DIR=/usr/share/vdradmin
-LOG_DIR=/var/log/vdradmin
-PID_DIR=/var/run/vdradmin
 CACHE_DIR=/var/cache/vdradmin
 VDRADMIN_USER=vdradmin
 VDRADMIN_GROUP=vdradmin
@@ -56,23 +54,18 @@ pkg_setup() {
 
 	if ! use vdr; then
 		elog
-		elog "You can run vdradmin-am outside a vdr install. For minimal"
+		elog "You can run ${PN} outside a vdr install. For minimal"
 		elog "functionality you need access to the epg.data file of your VDR."
 	fi
 }
 
 src_prepare() {
 	sed -i vdradmind.pl \
-		-e "/COMPILE_DIR/s-/tmp-${CACHE_DIR}-" \
-		-e "s-FILES_IN_SYSTEM    = 0;-FILES_IN_SYSTEM    = 1;-g"
+		-e "s-FILES_IN_SYSTEM    = 0;-FILES_IN_SYSTEM    = 1;-g" || die
 }
 
-src_configure() { : ; }
-
-src_compile() { : ; }
-
 src_install() {
-	newinitd "${FILESDIR}"/vdradmin-3.6.6.init vdradmin
+	newinitd "${FILESDIR}"/vdradmin-3.6.7.init vdradmin
 	newconfd "${FILESDIR}"/vdradmin-3.6.6.conf vdradmin
 
 	insinto /etc/logrotate.d
@@ -91,31 +84,32 @@ src_install() {
 
 	newman vdradmind.pl.1 vdradmind.8
 
-	dodoc CREDITS HISTORY INSTALL README* REQUIREMENTS FAQ ChangeLog
+	dodoc CREDITS ChangeLog FAQ HISTORY INSTALL README* REQUIREMENTS
 	docinto contrib
 	dodoc "${S}"/contrib/*
 
 	diropts "-m755 -o ${VDRADMIN_USER} -g ${VDRADMIN_GROUP}"
-	keepdir "${ETC_DIR}"
-	keepdir "${CACHE_DIR}"
-	keepdir "${LOG_DIR}"
-	keepdir "${PID_DIR}"
-	use ssl && keepdir "${CERTS_DIR}"
+	keepdir ${ETC_DIR}
+	use ssl && keepdir ${CERTS_DIR}
 }
 
 pkg_preinst() {
-	if [[ -f ${ROOT}${ETC_DIR}/vdradmind.conf ]]; then
-		cp "${ROOT}"${ETC_DIR}/vdradmind.conf "${D}"${ETC_DIR}/vdradmind.conf
+	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 = /etc/vdr
-			VIDEODIR = /var/vdr/video
-			EPG_FILENAME = /var/vdr/video/epg.data
-			EPGIMAGES = /var/vdr/video/epgimages
+			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
@@ -124,12 +118,13 @@ pkg_preinst() {
 			| "${D}"/usr/bin/vdradmind --cfgdir "${D}"${ETC_DIR} --config \
 			|sed -e 's/: /: \n/g'
 
-		[[ ${PIPESTATUS[1]} == "0" ]] || die "Failed to create initial configuration."
+		[[ ${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 the default-values"
+		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
@@ -147,23 +142,25 @@ pkg_postinst() {
 		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
+		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 -m0400 "${base}.key" "${ROOT}${CERTS_DIR}/server-key.pem"
-			install -m0444 "${base}.crt" "${ROOT}${CERTS_DIR}/server-cert.pem"
+			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 vdradmin-am you can emerge"
-	elog ">=media-plugins/vdr-epgsearch-0.9.25 to search the EPG"
-	elog "media-plugins/vdr-streamdev for livetv streaming"
+	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\" to rename recordings"
-	elog "on the machine running the VDR you connect to with vdradmin-am."
+	elog "on the machine running the VDR you connect to with ${PN}."
 }
 
 pkg_config() {
-	/usr/bin/vdradmind -c
+	"${ROOT}"/usr/bin/vdradmind -c
 }