Ebuild cleanup.

Package-Manager: portage-2.1.9.35/cvs/Linux i686

3 files changed, 28 insertions, 24 deletions

diff --git a/www-misc/vdradmin-am/ChangeLog b/www-misc/vdradmin-am/ChangeLog
index a3a8b7c7a239..c89787fe5dd2 100644
--- a/www-misc/vdradmin-am/ChangeLog
+++ b/www-misc/vdradmin-am/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-misc/vdradmin-am
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.17 2010/11/07 21:43:12 billie Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/ChangeLog,v 1.18 2011/02/16 19:34:58 billie Exp $
+
+  16 Feb 2011; Daniel Pielmeier <billie@gentoo.org>
+  vdradmin-am-3.6.7-r1.ebuild:
+  Ebuild cleanup.
 
   07 Nov 2010; Daniel Pielmeier <billie@gentoo.org>
   vdradmin-am-3.6.7-r1.ebuild, files/vdradmin-3.6.7.init:
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index 4519e963d22a..3aa8a0fe2924 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -3,7 +3,7 @@ AUX vdradmin-3.6.6.init 1959 RMD160 2a4266e43687d785789494dda40503d3744693d3 SHA
 AUX vdradmin-3.6.6.logrotate 116 RMD160 bf4e29e03b515306521a9e5c8e20445622ff4ea0 SHA1 99d26a22124c7d3821b4871fc3aa5914b90b97c0 SHA256 2eb705ff7ab186d2a0287d3e91afe7d59be39f896fd9a62d875d8f13db1312af
 AUX vdradmin-3.6.7.init 1988 RMD160 d85dc39535f09b92962c7355e5b5a9e38be17db7 SHA1 b7abe4fe58888de341230a2c126482850db78608 SHA256 d903fb0ee336a9bd8c27054c89c5493465d38fd7f9089eb4759ef8b7fd862bc5
 DIST vdradmin-am-3.6.7.tar.bz2 545850 RMD160 d48dea7caf30716d2dac4132612160d1c35fa596 SHA1 68c380ed038a36968c72fb5462eaebb2f97eb61d SHA256 48fb4edb16f65e7f340bd57b4d205c1718e37f40d22bf3a76515812f3f45b39b
-EBUILD vdradmin-am-3.6.7-r1.ebuild 4671 RMD160 43fa1fe0d4cf39865040f70d7df8a9e201cf0b4a SHA1 fffc9e0dc64ed6d7444d7133118f1e23636b67eb SHA256 bb781507d150f73cf81f58b2f72b6db7cb87789727f3bb49ecf2a472adf0331d
+EBUILD vdradmin-am-3.6.7-r1.ebuild 4611 RMD160 5b8ad1dd0c9084906bdb94c755bd607bc2ba283a SHA1 7e21ed2ad9993ed3bdd0938e32f6b0d9c7913eaf SHA256 1b9366d54a579995e530614d750929a08941531644baa1ad901f9914aeaa5ba5
 EBUILD vdradmin-am-3.6.7.ebuild 4449 RMD160 3b74b7578ba56bbd4bf030c840c70741052db9d1 SHA1 d3c019f5925c2feb2c8a10b18ac5b5bae49bf72f SHA256 f218f1969f32d9b3c3c6f7cebe8e767798167bdf03f52bd7202ba8b9b4f427dd
-MISC ChangeLog 9610 RMD160 fecdf60323b11ad633a224aadb9d61c920fe6400 SHA1 58dba71ad17e59ed0e20233b07bacb44754d3a37 SHA256 048899bca7cfab7f0054ee39fc74737c7d6aa9c88191d6acb3dc34078fa5d481
+MISC ChangeLog 9712 RMD160 669fc02a38ef275b7f0a5e9db4c7884aab159ee7 SHA1 4c1b96af015f1709201b39ed627332b84cdc69a4 SHA256 978c1972f74c5257844acf64baa82203a17dfa863a7e532c8040b39bff068da8
 MISC metadata.xml 748 RMD160 ce0254901737f368bfeb829b70d30c271c25bf14 SHA1 0ba36d4140d383486008e64ac7b9c84ce4c73cc6 SHA256 eb1d48cf2b7dfb0b9810fb1ce3c76fdd25c00fd1e4a93dfdf4b89b04f8024470
diff --git a/www-misc/vdradmin-am/vdradmin-am-3.6.7-r1.ebuild b/www-misc/vdradmin-am/vdradmin-am-3.6.7-r1.ebuild
index 0815c2dbf18f..697e58ef9d25 100644
--- a/www-misc/vdradmin-am/vdradmin-am-3.6.7-r1.ebuild
+++ b/www-misc/vdradmin-am/vdradmin-am-3.6.7-r1.ebuild
@@ -1,6 +1,6 @@
-# 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-r1.ebuild,v 1.2 2010/11/07 21:43:12 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/vdradmin-am/vdradmin-am-3.6.7-r1.ebuild,v 1.3 2011/02/16 19:34:58 billie Exp $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ 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"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -61,7 +61,6 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i vdradmind.pl \
-		-e "/COMPILE_DIR/s-/tmp-${CACHE_DIR}-" \
 		-e "s-FILES_IN_SYSTEM    = 0;-FILES_IN_SYSTEM    = 1;-g" || die
 }
 
@@ -85,7 +84,7 @@ src_install() {
 
 	newman vdradmind.pl.1 vdradmind.8 || die
 
-	dodoc CREDITS HISTORY INSTALL README* REQUIREMENTS FAQ ChangeLog || die
+	dodoc CREDITS ChangeLog FAQ HISTORY INSTALL README* REQUIREMENTS || die
 	docinto contrib
 	dodoc "${S}"/contrib/* || die
 
@@ -95,8 +94,12 @@ src_install() {
 }
 
 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
+		cp "${ROOT}"${ETC_DIR}/vdradmind.conf \
+			"${D}"${ETC_DIR}/vdradmind.conf || die
 	else
 		elog
 		elog "Creating a new config-file."
@@ -115,7 +118,8 @@ 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"
@@ -124,9 +128,6 @@ pkg_preinst() {
 		elog "do not match your installation or change them in the Setup-Menu"
 		elog "of the Web-Interface."
 	fi
-
-	chmod 0644 "${D}"${ETC_DIR}/vdradmind.conf || die
-	chown ${VDRADMIN_USER}:${VDRADMIN_GROUP} "${D}"${ETC_DIR}/vdradmind.conf || die
 }
 
 pkg_postinst() {
@@ -141,10 +142,15 @@ pkg_postinst() {
 		elog "To use ssl connection to your vdr"
 		elog "you need to enable it in ${ROOT%/}/etc/conf.d/vdradmin"
 
-		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
+		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
@@ -155,12 +161,6 @@ pkg_postinst() {
 	elog "on the machine running the VDR you connect to with ${PN}."
 }
 
-pkg_postrm() {
-	rm -f "${ROOT}"${CERTS_DIR}/server-{cert,key}.pem
-	rmdir --ignore-fail-on-non-empty "${ROOT}"${CERTS_DIR} \
-		"${ROOT}"${ETC_DIR}
-}
-
 pkg_config() {
 	"${ROOT}"/usr/bin/vdradmind -c
 }