Do not install havp.config.in.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key A792A613)

2 files changed, 17 insertions, 12 deletions

diff --git a/net-proxy/havp/ChangeLog b/net-proxy/havp/ChangeLog
index 46d309bb8ddc..1b67e2157c18 100644
--- a/net-proxy/havp/ChangeLog
+++ b/net-proxy/havp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-proxy/havp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.34 2013/01/08 16:45:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.35 2013/01/08 17:06:10 jer Exp $
+
+  08 Jan 2013; Jeroen Roovers <jer@gentoo.org> havp-0.92a.ebuild:
+  Do not install havp.config.in.
 
 *havp-0.92a (08 Jan 2013)
 
diff --git a/net-proxy/havp/havp-0.92a.ebuild b/net-proxy/havp/havp-0.92a.ebuild
index 11e43caa06bc..f246a27bf3a7 100644
--- a/net-proxy/havp/havp-0.92a.ebuild
+++ b/net-proxy/havp/havp-0.92a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.92a.ebuild,v 1.1 2013/01/08 16:45:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.92a.ebuild,v 1.2 2013/01/08 17:06:10 jer Exp $
 
 EAPI=4
 inherit eutils user
@@ -18,8 +18,8 @@ DEPEND="clamav? ( app-antivirus/clamav )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	enewgroup havp
-	enewuser havp -1 -1 /etc/havp havp
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /etc/${PN} ${PN}
 }
 
 src_configure() {
@@ -31,20 +31,22 @@ src_configure() {
 
 src_install() {
 	exeinto /usr/sbin
-	doexe havp/havp
+	doexe ${PN}/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 
-	newinitd "${FILESDIR}/havp.initd" havp
 	insinto /etc
-	doins -r etc/havp
+	rm -r etc/${PN}/${PN}.config.in
+	doins -r etc/${PN}
 
-	diropts -m 0700 -o havp -g havp
-	keepdir /var/log/havp
+	diropts -m 0700 -o ${PN} -g ${PN}
+	keepdir /var/log/${PN}
 
 	dodoc ChangeLog
 }
 
 pkg_postinst() {
-	ewarn "/var/tmp/havp must be on a filesystem with mandatory locks!"
+	ewarn "/var/tmp/${PN} must be on a filesystem with mandatory locks!"
 	ewarn "You should add  \"mand\" to the mount options on the relevant line in /etc/fstab."
 
 	if use ssl; then
@@ -58,7 +60,7 @@ pkg_postinst() {
 	if use clamav; then
 		echo
 		ewarn "If you plan to use clamav daemon, you should make sure clamav user can read"
-		ewarn "/var/tmp/havp content. This can be accomplished by enabling AllowSupplementaryGroups"
-		ewarn "in /etc/clamd.conf and adding clamav user to the havp group."
+		ewarn "/var/tmp/${PN} content. This can be accomplished by enabling AllowSupplementaryGroups"
+		ewarn "in /etc/clamd.conf and adding clamav user to the ${PN} group."
 	fi
 }