version bump wrt #252211

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.22-vs2.3.0.34-gentoo x86_64

4 files changed, 50 insertions, 42 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index b85786d01ab9..8e78872c5c38 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/subversion
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.343 2008/11/25 14:25:32 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.344 2009/01/15 08:04:40 hollow Exp $
+
+*subversion-1.5.5 (15 Jan 2009)
+
+  15 Jan 2009; Benedikt Böhm <hollow@gentoo.org> -subversion-1.5.2.ebuild,
+  +subversion-1.5.5.ebuild:
+  version bump wrt #252211
 
   25 Nov 2008; Raúl Porcel <armin76@gentoo.org> subversion-1.5.4.ebuild:
   alpha/arm/ia64 stable wrt #247072
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index a7c21741086e..98e513f5e992 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.5.0/70svn-gentoo.el 435 RMD160 e9f4b2e5511523c124f9ba3781249db2860fe5a7 SHA1 c3a3081f79a579b848369cfae76662a98e97687e SHA256 a39bea9a821aa91c7990dd07e1c2d0cec79f1efaac04e2d61882b7c8d5346a34
 AUX 1.5.0/80subversion-extras 62 RMD160 c334b15a86eaf19129afa5b62558dd47504a4e3d SHA1 ba05e978e7ff7b047ec99225e4d932036c340d26 SHA256 758d07cf161fff5e0afef5791dca641d3af58192ad1e4874c5f5c2c285c1149d
 AUX 1.5.0/disable-unneeded-linking.patch 2409 RMD160 0d7c34cc83eff7d08369128762ed714fabcd1dde SHA1 92b80f6cb30fe569f79368aea66027a6da022c53 SHA256 2ef8fcd9fabfd1a71bdd50e1156cb9d421a7008fccd73b7ae3536e9a30886231
@@ -18,18 +15,11 @@ AUX svnserve.initd 817 RMD160 59f4e8e983d4595b7c27615889a9c0809d015a18 SHA1 483b
 AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2
 AUX vc-svn.el 16847 RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 SHA1 4d1a5a9331ff96e943244a6d5538e4f0abeac9e7 SHA256 b4979d5df9fba02dbc8ad71d813229222e95ee1e8e89dec3060611d2d6be87aa
 DIST subversion-1.4.6.tar.bz2 4680316 RMD160 ae63877b5d0eeb1c4f28c4388f97897efde7244c SHA1 a9c941e2309744f6a2986200698b60da057a7527 SHA256 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
-DIST subversion-1.5.2.tar.bz2 4902078 RMD160 09cf131f059edc313738d754c7b58e4e6f1cec2f SHA1 b44862309d433e93ce0e422137047ca4a2b52403 SHA256 7c4c439035cd75722fa3da27433e2c3a4a2dc88694982a5ceb1ce5169982c7f5
 DIST subversion-1.5.4.tar.bz2 4925141 RMD160 521cd35602a637dba77864926e7636c08e54f3d7 SHA1 0bebb7029fcf3c0638206c22a1ba9526121e4365 SHA256 e24b6257b53988287471f83689846018e8e7b1e1c713da2567ab57b99e45fb40
+DIST subversion-1.5.5.tar.bz2 4940482 RMD160 6400e387b3505180206b61729cb0b11baeae70d3 SHA1 61c9a7209ccef8eff3c0499629d62ed4d3c89988 SHA256 88cf24ba5d589351791709ff7556ababc019ec59f3240ac2087dacabb9ad77be
 EBUILD subversion-1.4.6-r2.ebuild 13839 RMD160 e707dbbf190bf8921caba79b2bfb792290c2d16d SHA1 e975c9db56dd99385b5cb3bab5f0722f2758f74c SHA256 84445d756df2b5030cd700fc0e351016ff20ff94668bc0df5559b382e2835ddc
 EBUILD subversion-1.4.6.ebuild 13825 RMD160 de7a9ddc2f1444c16d5a1916c322e1d9464b8071 SHA1 444e1eff81deecbe38ff4adc711012ca926ee653 SHA256 1588acc6e11034fcc45e6f2046688a770a1a7b237da190237c99777dc1449179
-EBUILD subversion-1.5.2.ebuild 12794 RMD160 c0b3206965e14e64e1c11161100bdf5999f8ad6f SHA1 e1e78580ee5984dd6a231434fb1093cc9aa08a89 SHA256 be9fa1a40c666e54675b5e40dd2dee99c1d8d70f75ad8840788d4337f5d74d59
-EBUILD subversion-1.5.4.ebuild 13393 RMD160 0ef259d6fc6440536d9fb74c1fc24ad08b8c1997 SHA1 13bb283d304eedc5e1e9937be804e41e4db48015 SHA256 17e47cc89d09b11c79a924b8765a90d2bb0944506e54ab434c4a2016aca95a66
-MISC ChangeLog 57704 RMD160 86192139c026e16488ed8a6cfc52c939e524c382 SHA1 e95912924b037b0693320506fcb5fea5695de603 SHA256 1c896d4fecb87789eef0e34ffe69feedc21456a4a008488e87c02e2dd7822ba3
+EBUILD subversion-1.5.4.ebuild 13393 RMD160 476861d4d198a3f48c5e3e463719973275e08c59 SHA1 a1f4bf2f95e2fa4353a35ae58a398e8434d3f538 SHA256 8266ab65ccc52aeced0ad9f0162631c88aa0a1de6b5f7a55e272477305cd522d
+EBUILD subversion-1.5.5.ebuild 13403 RMD160 a7fda156bfd06d13ad8c8d6354799d7526ede07b SHA1 4ed5e593d2651e245608cfff68ee27745d5a79b0 SHA256 b4248441712121ba9f1b189904dee8384be85127d0c4c337b5c09ab1c8d3c8e2
+MISC ChangeLog 57868 RMD160 c8abe3586a8adc7f1199e7c1ac270de92a538f11 SHA1 91b9ecbe28261fb2d4479aec59988795ad07d24f SHA256 2d2ea4398535a66cc157554d2767e9092bbd573b0df41db3be4ad6455ffa0b21
 MISC metadata.xml 958 RMD160 9e4aa5a4dfeef1a81c20121e8e75baf45d0962ca SHA1 c8844225273473a569cefae106533215961c287f SHA256 396a72dd2fddb8fb146ce87fa05692ab9f7d183057c0940d9365f88602a03dc7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkk7vgIACgkQ67wieSYcaxf86ACfbfFA4V56bA2Rq2GHAH9HuwiI
-eMUAn1qbeaBn946dFEUynsbZuvu5O8/f
-=BI9M
------END PGP SIGNATURE-----
diff --git a/dev-util/subversion/subversion-1.5.4.ebuild b/dev-util/subversion/subversion-1.5.4.ebuild
index 5906e91f5da8..7396b2d0959b 100644
--- a/dev-util/subversion/subversion-1.5.4.ebuild
+++ b/dev-util/subversion/subversion-1.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.4.ebuild,v 1.11 2008/12/07 12:13:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.4.ebuild,v 1.12 2009/01/15 08:04:40 hollow Exp $
 
 EAPI="1"
 WANT_AUTOMAKE="none"
diff --git a/dev-util/subversion/subversion-1.5.2.ebuild b/dev-util/subversion/subversion-1.5.5.ebuild
index b305c20efbaf..95725c577a16 100644
--- a/dev-util/subversion/subversion-1.5.2.ebuild
+++ b/dev-util/subversion/subversion-1.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.2.ebuild,v 1.10 2008/11/04 09:28:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.5.ebuild,v 1.1 2009/01/15 08:04:40 hollow Exp $
 
 EAPI="1"
 WANT_AUTOMAKE="none"
@@ -13,7 +13,7 @@ SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2"
 
 LICENSE="Subversion"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="apache2 berkdb debug doc +dso emacs extras java nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
 RESTRICT="test"
 
@@ -136,10 +136,9 @@ src_compile() {
 	fi
 
 	if use emacs; then
-		elisp-compile contrib/client-side/emacs/dsvn.el || die "Compilation of Emacs module failed"
-		elisp-compile contrib/client-side/emacs/psvn.el || die "Compilation of Emacs module failed"
-		elisp-compile doc/svn-doc.el || die "Compilation of Emacs module failed"
-		elisp-compile doc/tools/svnbook.el || die "Compilation of Emacs module failed"
+		elisp-compile contrib/client-side/emacs/{dsvn,psvn,vc-svn}.el \
+			doc/svn-doc.el doc/tools/svnbook.el \
+			|| die "Compilation of Emacs modules failed"
 	fi
 
 	if use extras; then
@@ -251,11 +250,14 @@ EOF
 
 	# Install Emacs Lisps.
 	if use emacs; then
-		elisp-install ${PN} contrib/client-side/emacs/dsvn.el*
-		elisp-install ${PN} contrib/client-side/emacs/psvn.el*
-		elisp-install ${PN} doc/svn-doc.el*
-		elisp-install ${PN} doc/tools/svnbook.el*
-		elisp-site-file-install "${FILESDIR}"/1.5.0/70svn-gentoo.el
+		elisp-install ${PN} contrib/client-side/emacs/{dsvn,psvn}.{el,elc} \
+			doc/svn-doc.{el,elc} doc/tools/svnbook.{el,elc} \
+			|| die "Installation of Emacs modules failed"
+		elisp-install ${PN}/compat contrib/client-side/emacs/vc-svn.{el,elc} \
+			|| die "Installation of Emacs modules failed"
+		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/1.5.0/70svn-gentoo.el \
+			|| die "Installation of Emacs site-init file failed"
 	fi
 	rm -fr contrib/client-side/emacs
 
@@ -316,25 +318,25 @@ pkg_postinst() {
 	elog
 	elog " - svnserve daemon: "
 	elog "   1. Edit /etc/conf.d/svnserve"
-	elog "   2. Start daemon: /etc/init.d/svnserve start"
-	elog "   3. Make persistent: rc-update add svnserve default"
+	elog "   2. Fix the repository permissions (see \"Fixing the repository permissions\")"
+	elog "   3. Start daemon: /etc/init.d/svnserve start"
+	elog "   4. Make persistent: rc-update add svnserve default"
 	elog
 	elog " - svnserve via xinetd:"
 	elog "   1. Edit /etc/xinetd.d/svnserve (remove disable line)"
-	elog "   2. Restart xinetd.d: /etc/init.d/xinetd restart"
+	elog "   2. Fix the repository permissions (see \"Fixing the repository permissions\")"
+	elog "   3. Restart xinetd.d: /etc/init.d/xinetd restart"
 	elog
 	elog " - svn over ssh:"
-	elog "   1. Fix the repository permissions:"
+	elog "   1. Fix the repository permissions (see \"Fixing the repository permissions\")"
+	elog "      Additionally run:"
 	elog "        groupadd svnusers"
-	elog "        chown -R root:svnusers ${SVN_REPOS_LOC}/repos/"
-	elog "        chmod -R g-w ${SVN_REPOS_LOC}/repos"
-	elog "        chmod -R g+rw ${SVN_REPOS_LOC}/repos/db"
-	elog "        chmod -R g+rw ${SVN_REPOS_LOC}/repos/locks"
+	elog "        chown -R root:svnusers ${SVN_REPOS_LOC}/repos"
 	elog "   2. Create an svnserve wrapper in /usr/local/bin to set the umask you"
 	elog "      want, for example:"
 	elog "         #!/bin/bash"
 	elog "         . /etc/conf.d/svnserve"
-	elog "         umask 002"
+	elog "         umask 007"
 	elog "         exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\""
 	elog
 
@@ -343,9 +345,18 @@ pkg_postinst() {
 		elog "   1. Edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
 		elog "   2. Create an htpasswd file:"
 		elog "      htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
+		elog "   3. Fix the repository permissions (see \"Fixing the repository permissions\")"
+		elog "   4. Restart Apache: /etc/init.d/apache2 restart"
 		elog
 	fi
 
+	elog "   Fixing the repository permissions:"
+	elog "        chmod -Rf go-rwx ${SVN_REPOS_LOC}/conf"
+	elog "        chmod -Rf g-w,o-rwx ${SVN_REPOS_LOC}/repos"
+	elog "        chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/db"
+	elog "        chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/locks"
+	elog
+
 	elog "If you intend to use svn-hot-backup, you can specify the number of"
 	elog "backups to keep per repository by specifying an environment variable."
 	elog "If you want to keep e.g. 2 backups, do the following:"
@@ -374,7 +385,7 @@ pkg_config() {
 	einfo ">>> Initializing the database in ${ROOT}${SVN_REPOS_LOC} ..."
 	if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]] ; then
 		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete ${ROOT}${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
+		echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
 	else
 		mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf"
 
@@ -392,9 +403,10 @@ pkg_config() {
 			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
 			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
 			enewgroup "${SVNSERVE_GROUP}"
-			enewuser "${SVNSERVE_USER}" -1 -1 ${SVN_REPOS_LOC} "${SVNSERVE_GROUP}"
+			enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}"
 		fi
 		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos"
-		chmod -Rf 755 "${ROOT}${SVN_REPOS_LOC}/repos"
+		chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos"
 	fi
 }