Merge svnserve.confd and svnserve.confd2.

Package-Manager: portage-HEAD/cvs/Linux x86_64

6 files changed, 16 insertions, 30 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 8fdeff0a873c..fdac0b0f3344 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/subversion
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.429 2010/05/26 21:28:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.430 2010/06/22 16:49:37 arfrever Exp $
+
+  22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  subversion-1.6.9.ebuild, subversion-1.6.11.ebuild, files/svnserve.confd,
+  -files/svnserve.confd2:
+  Merge svnserve.confd and svnserve.confd2.
 
 *subversion-1.6.11 (26 May 2010)
 
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 7e5feeba12f4..b9501e5786d7 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -2,14 +2,13 @@ AUX 70svn-gentoo.el 443 RMD160 300189eea80dfefa0f2a8479f67d255b39fd2adb SHA1 245
 AUX subversion-1.6.0-disable_linking_against_unneeded_libraries.patch 1769 RMD160 89d165463a2e8a7e2ae5855bc4e4e290f20416ae SHA1 3fc9a49e80992b13b016d1c56babae43957f1b91 SHA256 a54a4dd37e197d030b9d56b2954e4cd38f8a7f1b191cfe59f863b75a164d5f96
 AUX subversion-1.6.2-local_library_preloading.patch 6412 RMD160 3b072c5f9d3c1f43e3be20959a24632db0c9f82c SHA1 85a3d394861a53e3919ef6fc243542af7df17b46 SHA256 50b83dd31eaf5ed577b7656dcd06e314d3acd31814089f4e3eba014a1efa442d
 AUX subversion-1.6.3-kwallet_window.patch 10012 RMD160 d469e0fc8d9fd2ef8c857e5e303eeb24309e7f0d SHA1 9c99b63bc5abf54f642e447af1aa2f814cecb8ab SHA256 5304f39189bed6f83a8342593f23819cf2e12c2288c9daba23dcd78913fd79de
-AUX svnserve.confd 323 RMD160 cbf4d810d9f41bac1611004741170d1047cbeef0 SHA1 39e922bc777ba847eb85d421d92f560f84b895b5 SHA256 90d3e2532715a6230ebf65023566a6591eed4b3fc12abbca0d2fb7949e146006
-AUX svnserve.confd2 320 RMD160 dc1e74d06d9bd3eeb1a8dfd20aacebecd8378abb SHA1 557191219c3afa90126b8a2bfe7dd62b8a09eb82 SHA256 c70655c073dc06f538c5acdbcd49e216f4be2c859ce395bdf78757a1eeccab00
+AUX svnserve.confd 322 RMD160 e291d91f05da848a3517aa76611c1f05527c11e4 SHA1 c07020ea270b787ddf0dbb738391e20d3c8347af SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97
 AUX svnserve.initd 817 RMD160 59f4e8e983d4595b7c27615889a9c0809d015a18 SHA1 483b47512fb444c0f752ad4eb6c3252f659a967e SHA256 6b483e211b5c311079605e246fca9228c7e5762d27a023fa4c4529fdaa766b08
 AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2
 AUX vc-svn.el 16847 RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 SHA1 4d1a5a9331ff96e943244a6d5538e4f0abeac9e7 SHA256 b4979d5df9fba02dbc8ad71d813229222e95ee1e8e89dec3060611d2d6be87aa
 DIST subversion-1.6.11.tar.bz2 5486069 RMD160 fbd41610f1044916a84c39bf786332e864d0e6d4 SHA1 36cf9d39c14e5bd8d713302ac770c3964fe196b3 SHA256 64bd000ae30470d343c0725758bdd8288143393308eedc511c7826bb6731e59c
 DIST subversion-1.6.9.tar.bz2 5478554 RMD160 5f085c053657dc8d0048944265dbe436892a94fb SHA1 477aa89e60de7974ac0aa921cc369b4c2907693c SHA256 05526f92fcb612bdc3bab0d5e218e25847bf10846e047ce244e33859b205111c
-EBUILD subversion-1.6.11.ebuild 31061 RMD160 7b952e2ed2978fabcc2186da8a1f18c881c215e6 SHA1 e7b9dffa94849cdbd41d331a0d79ca57bf6b36d8 SHA256 76d904fb0b270cc9b02fbfdd9ad18377e1e67a07aaa2371e78d1d00877f9741f
-EBUILD subversion-1.6.9.ebuild 27330 RMD160 684f5a81d79e33a41bca018594c655adecca1864 SHA1 c7b37a3e2b1dc4f3e6e176aad996861e02dbd122 SHA256 0738675a7d1950ba792cc33d4f842046eab0ac9121c16930acf1fb88ac0cb55e
-MISC ChangeLog 71029 RMD160 a3bc140dd742b589f2b3ca457576dbc1c1b278a9 SHA1 b2e4f96746d315bde242c00bc8f000b04fd084a9 SHA256 cb1680c5a3288718f8affd9988786225104cbf3992e39def5a285fcbc87d7e9a
+EBUILD subversion-1.6.11.ebuild 30978 RMD160 86e6990d1f1d62790552ba8a3e3c2cd6e54114f6 SHA1 67edbff86f69164e3852e86db716222fd264dd4d SHA256 e90d50b752af53e527cc6a6421dd418e7d16a693fc26688b1277f54ce0ff240e
+EBUILD subversion-1.6.9.ebuild 27248 RMD160 c5002d2fdca3dad934e2b1478649c6ef13a5fa09 SHA1 52761b843edcc31a3aeb5f9518a716516f9de00a SHA256 723bc2c3c44fbecfdbf27e6b47fe903969f02c2d468484d6ddd52a0db25f1635
+MISC ChangeLog 71248 RMD160 08bc3f5f53cb9629c207c76e16f5dbc4fc68a2d0 SHA1 d0f901a7b89e0a9c9f9a5a414b1d86063e3b4537 SHA256 87690d34e0952865d3f2792ec49184033ab2dfe983219545793690f8d9c0764d
 MISC metadata.xml 794 RMD160 6e8968481ac256000ec54f71bac21c7b4cbde1cc SHA1 c753273c54c52d52187cb886e35dc08726f1b97e SHA256 3d7a28065aaf0e28837de71ccde29de53a074b5b3ede715c1b412cf5a43aaeac
diff --git a/dev-util/subversion/files/svnserve.confd b/dev-util/subversion/files/svnserve.confd
index 832d375aa292..83997ce92719 100644
--- a/dev-util/subversion/files/svnserve.confd
+++ b/dev-util/subversion/files/svnserve.confd
@@ -6,5 +6,5 @@
 #SVNSERVE_OPTS="--root=/var/svn"
 
 # User and group as which to run svnserve
-#SVNSERVE_USER="apache"
-#SVNSERVE_GROUP="apache"
+#SVNSERVE_USER="svn"
+#SVNSERVE_GROUP="svnusers"
diff --git a/dev-util/subversion/files/svnserve.confd2 b/dev-util/subversion/files/svnserve.confd2
deleted file mode 100644
index b487a4097583..000000000000
--- a/dev-util/subversion/files/svnserve.confd2
+++ /dev/null
@@ -1,10 +0,0 @@
-# The commented variables in this file are the defaults that are used
-# in the init-script.  You don't need to uncomment them except to
-# customize them to different values.
-
-# Options for svnserve
-#SVNSERVE_OPTS="--root=/var/svn"
-
-# User and group as which to run svnserve
-SVNSERVE_USER="svn"
-SVNSERVE_GROUP="svnusers"
diff --git a/dev-util/subversion/subversion-1.6.11.ebuild b/dev-util/subversion/subversion-1.6.11.ebuild
index a0068bb9ce15..9dbc803ac286 100644
--- a/dev-util/subversion/subversion-1.6.11.ebuild
+++ b/dev-util/subversion/subversion-1.6.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.11.ebuild,v 1.1 2010/05/26 21:28:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.11.ebuild,v 1.2 2010/06/22 16:49:37 arfrever Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -682,11 +682,7 @@ EOF
 
 	# Install svnserve init-script and xinet.d snippet, bug 43245.
 	newinitd "${FILESDIR}"/svnserve.initd svnserve
-	if use apache2; then
-		newconfd "${FILESDIR}"/svnserve.confd svnserve
-	else
-		newconfd "${FILESDIR}"/svnserve.confd2 svnserve
-	fi
+	newconfd "${FILESDIR}"/svnserve.confd svnserve
 	insinto /etc/xinetd.d
 	newins "${FILESDIR}"/svnserve.xinetd svnserve
 
diff --git a/dev-util/subversion/subversion-1.6.9.ebuild b/dev-util/subversion/subversion-1.6.9.ebuild
index 051d40b62267..328268c94dc8 100644
--- a/dev-util/subversion/subversion-1.6.9.ebuild
+++ b/dev-util/subversion/subversion-1.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.9.ebuild,v 1.8 2010/03/28 18:17:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.9.ebuild,v 1.9 2010/06/22 16:49:37 arfrever Exp $
 
 EAPI="2"
 
@@ -603,11 +603,7 @@ EOF
 
 	# Install svnserve init-script and xinet.d snippet, bug 43245.
 	newinitd "${FILESDIR}"/svnserve.initd svnserve
-	if use apache2; then
-		newconfd "${FILESDIR}"/svnserve.confd svnserve
-	else
-		newconfd "${FILESDIR}"/svnserve.confd2 svnserve
-	fi
+	newconfd "${FILESDIR}"/svnserve.confd svnserve
 	insinto /etc/xinetd.d
 	newins "${FILESDIR}"/svnserve.xinetd svnserve