From: Torsten Veller <tove@gentoo.org>
Date: Sun, 29 Apr 2007 18:24:38 +0000 (+0000)
Subject: Fix *initd, *confd and *envd calls (#173884, #174266)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d5216c3619799a8ab4837ecebd1b99390653b281;p=gentoo.git

Fix *initd, *confd and *envd calls (#173884, #174266)
Package-Manager: portage-2.1.2.5
---

diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index e17513908f22..8dfb44cc6c73 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -85,10 +85,10 @@ EBUILD subversion-1.3.2-r3.ebuild 11680 RMD160 b77350b64b3a8483b28a573092b934464
 MD5 0576c5439449519b98689891891255af subversion-1.3.2-r3.ebuild 11680
 RMD160 b77350b64b3a8483b28a573092b9344649493f43 subversion-1.3.2-r3.ebuild 11680
 SHA256 4f520b9e4f38af4f08a623b0ff479520806a4a055cc541f100cf4f2ca8542a3e subversion-1.3.2-r3.ebuild 11680
-EBUILD subversion-1.4.3.ebuild 11787 RMD160 6765567a10e519456129d681cb798cd6ff89364b SHA1 7e4a3dfc66a17e9d1161ad4442dc9ff3cb41a88d SHA256 959914d6b865e7623369cdc1371ca7c4e0039ec0ca7056df09ad5deef7235990
-MD5 2af5cac0be79a66a2f478db2681d4abd subversion-1.4.3.ebuild 11787
-RMD160 6765567a10e519456129d681cb798cd6ff89364b subversion-1.4.3.ebuild 11787
-SHA256 959914d6b865e7623369cdc1371ca7c4e0039ec0ca7056df09ad5deef7235990 subversion-1.4.3.ebuild 11787
+EBUILD subversion-1.4.3.ebuild 11792 RMD160 40446a6a8fbc93dc31ef301a7cfac744c7ddfa5c SHA1 14864bde84ade301c3b1b4b363b1079d6b5431f6 SHA256 a2bb7e556ac8b920935b080b0b6c5da31e8e021e29f66736c4c06de84255f7e4
+MD5 9169e73dc9f8990ff1c07605753347cc subversion-1.4.3.ebuild 11792
+RMD160 40446a6a8fbc93dc31ef301a7cfac744c7ddfa5c subversion-1.4.3.ebuild 11792
+SHA256 a2bb7e556ac8b920935b080b0b6c5da31e8e021e29f66736c4c06de84255f7e4 subversion-1.4.3.ebuild 11792
 MISC ChangeLog 44009 RMD160 0bcb8ae3f354493451a93f1976449eb0ec6ff741 SHA1 349f6833567212f827417fb7f4c9f97706df9b91 SHA256 a4a1660cdb190e6b0c41445b50f9178635f94d1b253ddb37afa6c7ecc755a617
 MD5 2b2032b693059897385839e1e83f13c2 ChangeLog 44009
 RMD160 0bcb8ae3f354493451a93f1976449eb0ec6ff741 ChangeLog 44009
@@ -112,7 +112,7 @@ SHA256 84e50e103dcf562174d9e6337847220a875b7607f73e8307fd60ac18aeb05e27 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGM71TV3J2n04EauwRAisBAKCzSakejWeTDhYnWY6YGYsWoep13gCfQZLy
-IhrHpIZf0iDApod+cNBOYlM=
-=yqdN
+iD8DBQFGNOLuV3J2n04EauwRAu5JAKCwZ6zOjOyr2Lz7yAwqxHYNvAW1vgCfVwaH
+SM4SX7uE0sJa9SMB3lrlVR8=
+=7Y9g
 -----END PGP SIGNATURE-----
diff --git a/dev-util/subversion/subversion-1.4.3.ebuild b/dev-util/subversion/subversion-1.4.3.ebuild
index e0fe4b485511..2814cc45a4d9 100644
--- a/dev-util/subversion/subversion-1.4.3.ebuild
+++ b/dev-util/subversion/subversion-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.3.ebuild,v 1.10 2007/04/28 21:31:54 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.3.ebuild,v 1.11 2007/04/29 18:24:38 tove Exp $
 
 inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
 
@@ -234,13 +234,12 @@ EOF
 
 	# Install svnserve init-script and xinet.d snippet, bug 43245
 	newinitd ${FILESDIR}/svnserve.initd svnserve
-	newconfd ${FILESDIR}/svnserve.xinetd svnserve
+	insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
 
-	insinto /etc/conf.d
 	if use apache2 >/dev/null; then
-		newins ${FILESDIR}/svnserve.confd svnserve
+		newconfd ${FILESDIR}/svnserve.confd svnserve
 	else
-		newins ${FILESDIR}/svnserve.confd2 svnserve
+		newconfd ${FILESDIR}/svnserve.confd2 svnserve
 	fi
 
 	# Install documentation