Do not install havp.config.in.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 22 insertions, 17 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/Manifest b/net-proxy/havp/Manifest
index 66523180e681..7d4dfa0a1863 100644
--- a/net-proxy/havp/Manifest
+++ b/net-proxy/havp/Manifest
@@ -8,13 +8,13 @@ DIST havp-0.91.tar.gz 118400 SHA256 c2f56422c4bb5756d36b8fe0123b2d86e01e76147a2a
 DIST havp-0.92a.tar.gz 121987 SHA256 0dec86390b5738184aa7155af0c66dd00a97476fcd7377bcec8f1f0bf50f0e9a SHA512 3eb742519795a7d10520bdc1c78af0d3bf580a56e14f90bff9f519607a4e82cbf704372bd6da2fc05fcd436d580f4c226874d8df7770d22e2160b5d01afb9c62 WHIRLPOOL 9459d3bab10ed5a6b9053b72795f1e3729765665804fd01f5bae64170510a4427212357ff987cfbb4e93c9770702bb23d18d37dbfdfbc37958f16ff6890178f2
 EBUILD havp-0.90-r1.ebuild 1803 SHA256 6ce5354d74f6bc8a07c5d2fcf3c8d44a4dc8061efd3b72e1907c646955edc63e SHA512 22d6eb9fb3ae7dbaee2356ebd166da7ee5cba155ebf7ed1eb846db900593bcdbc4980b50915f8a46c596957c2e523ab7a4ab08ba152a2f1fc78f9b72c9c4485f WHIRLPOOL e7b5aeb2c00d22bf7fc9d42c9576b45cbc844682d8f4bc54d478ed34c376fbc493cc6d2fcbe0831c8c44840e9b448a7e2c3e7f2a3f7734aaf4a706b804414098
 EBUILD havp-0.91.ebuild 1744 SHA256 46289764dada010043b6fcd60dc3c03c7c172ce3e267c065beadbf95cea186d1 SHA512 9aab0f1b4d059ebe5f64cd1e37caacb5ecb33601c69c73b685b9524ac4e0bb9c6203e47b9bee1ae0cad78736c7c9ca9595134d8128dbeb57c721bf0c66d987b3 WHIRLPOOL d5c6ed2b2e84c268e5c55009776a0d27e61e65b4abe2f5481a7afd7e2b92cb7265a52a3e0dbc4083a22a6ce40da8482d0f8443703c0fcaa8563200d22cff6681
-EBUILD havp-0.92a.ebuild 1667 SHA256 e36b42a47043ecfac9e84dad0822414113528fc2072c4b0ec8a9f354fa7171dc SHA512 31f6d6c8223698eef4dbf5ebbafed2f9158e352a61d7f6e008e68c6008f1823f3a927528dfaf2613d04bc82ed4bd31242db32199cc564ee9444c9c03c4d30fa2 WHIRLPOOL e9538c1def4323ab14fc774ab98fe4d6622f06356a6848bac9d637d37c6862d9572e15aa913f676a2dc67d314af450ea46d2c7feebf86beff2dbf5104bdcd753
-MISC ChangeLog 5329 SHA256 a93f7f261f3d3572f47e1f2308e8ccd83034c16bfd3bb9f754115b60f2aab37a SHA512 d685f935aacd016606db890d1656d01d35c3a713ea6e17ac1cd566ea9c7f39c5bc1ea11fb9e5cd7dd3b6759087bd1622e0a7265d30ec5db27195cc2e59b12f82 WHIRLPOOL d6f360a864d161deb5ec387a7cd6146e94474ebf2f5c4c1207b769632c7cd5cbbce6601069cda85aaf3b7d49c8696a0fd4d3a6c8ebb03d9f97fac63b285812d5
+EBUILD havp-0.92a.ebuild 1716 SHA256 6aedeb92b483bfa02067e7ee60fad1bb7fe9a93c094617375f93d65a97f82ddb SHA512 4d505bee095c22a408914beb6b77b0ad3af4d6004ac870d501e4de71a3cd9faf1ba7392e53757567e2898c91915fc822aa8a2fdc9efc923027a3682137627b27 WHIRLPOOL 19112543f6f7c5b1ed44340efaec7de95ec893629ccc5e8394db4185ca45a688ff883a0894d8d668df54e0f0bfe5536291656081be00b17e3fca74b385dbf82b
+MISC ChangeLog 5429 SHA256 570b97a5031505d14b84c08b8fdf1a657d49991f161343b71033863571f524db SHA512 6815bf3553e4a1eb60a9233da90c44ff8a53fc840546289c6f217face494ff1b2e850912d95bc8fddfa2fa284e86d408761a37dda61804214a6e8c8871b8bf4e WHIRLPOOL 4b0b6c29e6bf2ce505314cb7b2ed67627d185d43aef5259fa2e6f6d35c3e9aeb22ea61857a3d4d59d1088403240ead7ac8e60790b9016fb4e682bbed9b66bd4e
 MISC metadata.xml 309 SHA256 26c5dece4fe203c9ae4847405314a340fb86058060c9536a92dd7471f4f03d0d SHA512 9e3b8d9d19b20e646025ff490179b60cae73364c5e1cb33c404d8d201f893c9969e4c9d10cf709c5d03b5ff8f916ddd16bebc41c9f58a13383c642c16c3c66c1 WHIRLPOOL 08358cbc5f3f0edfce777c71819e5631e4cf0162474f96da28883972c1c55ef41d8a737ca74b4b5b6574d8b33bf70fc43c3542a00cdd4a7a48c6fe19723428d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDsTTMACgkQVWmRsqeSphMntQCdFrnDH35yj6+3+JlxidQAixYV
-/k4AnjIoM3Tht9EeIUnngaEUaiypU5Dt
-=yWJL
+iEYEAREIAAYFAlDsUgQACgkQVWmRsqeSphPz8wCdH20+qI31fkW6AncDqqIWzLic
+EacAn33i4TC8WtnfmHBebJG4c7VGQkdB
+=P6xq
 -----END PGP SIGNATURE-----
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
 }