Revert trapni's broken changes, and do my own version of them

(Portage version: 2.0.51.19)

5 files changed, 23 insertions, 335 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 1ade9c4f01d8..3b4c60698985 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.151 2005/04/10 20:20:46 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.152 2005/04/13 12:36:46 pauldv Exp $
+
+  13 Apr 2005; <pauldv@gentoo.org> -subversion-1.1.4-r1.ebuild,
+  subversion-1.1.4.ebuild:
+  Revert trapni's broken changes and change the webdav useflag into a 
+  nowebdav useflag. As the default behaviour is not changed, the change is 
+  incorporated in the normal 1.1.4 ebuild and the 1.1.4-r1 version has 
+  been removed.
 
   10 Apr 2005; Christian Parpart <trapni@gentoo.org>
   subversion-1.1.4-r1.ebuild:
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 0f389c2a9955..69147f38ff9d 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -2,15 +2,14 @@ MD5 45a85cebbc89a857febb16444d76044c ChangeLog 25996
 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
 MD5 c342955038a5165af58910d6ee25d2ac subversion-1.0.9.ebuild 9522
 MD5 3db85bb4971d58be7ea793852b406184 subversion-1.1.1-r3.ebuild 10929
+MD5 f975e6f4012f7a463e639a37a8730575 subversion-1.1.4.ebuild 10161
 MD5 3f83683d616c92808b7199860bea02fd subversion-1.1.3-r1.ebuild 10164
 MD5 c77e2ea6e0c1ee1cdc37e9153ec50100 subversion-1.1.3.ebuild 11096
-MD5 f975e6f4012f7a463e639a37a8730575 subversion-1.1.4.ebuild 10161
-MD5 02548aa9a430007345b6d7804180dbc2 subversion-1.1.4-r1.ebuild 10524
+MD5 e75beb37d444587537122d3f0acb70e5 subversion-1.1.4-r2.ebuild 10278
 MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
 MD5 b355b623d5259b4b1ff75eead17fac0b files/digest-subversion-1.0.9 70
 MD5 53809180b5372b204b32db3962b409ba files/digest-subversion-1.1.1-r3 70
-MD5 1c207179f5bf0b148528312cbc37632d files/digest-subversion-1.1.3 70
-MD5 1c207179f5bf0b148528312cbc37632d files/digest-subversion-1.1.3-r1 70
+MD5 7b437b7eacfb1d909047bbeb0ec1b9bc files/digest-subversion-1.1.4 70
 MD5 062d550a01e930b20be035b5616cadbe files/subversion-1.1.0-build.patch 771
 MD5 b8146e2661f55257aef6d41e79897b63 files/subversion-1.1.1-perl-vendor.patch 713
 MD5 bfb75d87b1dc5be163d736a697bb2216 files/subversion-1.1.2-perl.patch 24982
@@ -18,5 +17,7 @@ MD5 ce6f3698724b55cf49e647727207cca5 files/subversion-db4.patch 563
 MD5 8de1f6e76dcb072171a09aaba2fd3b2b files/svnserve.confd 323
 MD5 fa7b69a910c49825166c9f1aa302eca7 files/svnserve.initd 686
 MD5 9f06ce72de714decff8fad3a674fb64d files/svnserve.xinetd 334
-MD5 7b437b7eacfb1d909047bbeb0ec1b9bc files/digest-subversion-1.1.4 70
 MD5 7b437b7eacfb1d909047bbeb0ec1b9bc files/digest-subversion-1.1.4-r1 70
+MD5 1c207179f5bf0b148528312cbc37632d files/digest-subversion-1.1.3 70
+MD5 1c207179f5bf0b148528312cbc37632d files/digest-subversion-1.1.3-r1 70
+MD5 7b437b7eacfb1d909047bbeb0ec1b9bc files/digest-subversion-1.1.4-r2 70
diff --git a/dev-util/subversion/files/digest-subversion-1.1.4-r1 b/dev-util/subversion/files/digest-subversion-1.1.4-r1
deleted file mode 100644
index c54ef7cd042b..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.1.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e557ae65b6b8d7577cc7704ede85a23 subversion-1.1.4.tar.bz2 6737067
diff --git a/dev-util/subversion/subversion-1.1.4-r1.ebuild b/dev-util/subversion/subversion-1.1.4-r1.ebuild
deleted file mode 100644
index 4177a59e1436..000000000000
--- a/dev-util/subversion/subversion-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.4-r1.ebuild,v 1.4 2005/04/11 11:17:33 seemant Exp $
-
-inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache
-
-DESCRIPTION="A compelling replacement for CVS"
-HOMEPAGE="http://subversion.tigris.org/"
-SRC_URI="http://subversion.tigris.org/tarballs/${P/_rc/-rc}.tar.bz2"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ssl apache2 berkdb python emacs perl java nls webdav"
-RESTRICT="maketest"
-
-# Presently subversion doesn't build with swig-1.3.22, bug 65424
-RDEPEND="apache2? ( ${APACHE2_DEPEND} )
-	>=dev-libs/apr-util-0.9.5
-	python? ( =dev-lang/swig-1.3.21 >=dev-lang/python-2.0 )
-	perl? ( =dev-lang/swig-1.3.21 >=dev-lang/perl-5.8 )
-	webdav? ( >=net-misc/neon-0.24.7 )
-	berkdb? ( =sys-libs/db-4* )
-	java? ( virtual/jdk )
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59"
-# Does not work because jikes is broken
-#	jikes? (dev-java/jikes)"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-# Allow for custion repository locations.
-# This can't be in pkg_setup because the variable needs to be available to
-# pkg_config.
-: ${SVN_REPOS_LOC:=/var/svn}
-
-pkg_setup() {
-	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]]; then
-		echo
-		ewarn "Presently you have $(best_version subversion)"
-		ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
-		ewarn "So you MUST dump your repositories before upgrading."
-		ewarn
-		ewarn 'After doing so call emerge with SVN_DUMPED=1 emerge !*'
-		ewarn
-		ewarn "More details on dumping:"
-		ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
-		echo
-		die "Ensure that you dump your repository first"
-	fi
-
-	if ! use webdav; then
-		echo
-		ewarn "Please note, that subversion has now a new local useflag added."
-		ewarn
-		ewarn "This useflag, webdav, will let you optionally provide the"
-		ewarn "ability to decide whether you want the \`svn\` client to"
-		ewarn "support URL schemes like http:// and https:// or not."
-		echo
-		ebeep
-		epause
-	fi
-}
-
-src_unpack() {
-	unpack ${P/_rc/-rc}.tar.bz2
-	cd ${S}
-
-	epatch ${FILESDIR}/subversion-db4.patch
-	epatch ${FILESDIR}/subversion-1.1.1-perl-vendor.patch
-
-	export WANT_AUTOCONF=2.5
-	elibtoolize
-	autoconf
-	(cd apr; autoconf)
-	(cd apr-util; autoconf)
-	sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
-}
-
-src_compile() {
-	local myconf
-	myconf="--with-apr=/usr --with-apr-util=/usr"
-
-	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
-	use apache2 || myconf="${myconf} --without-apxs"
-
-	myconf="${myconf} $(use_enable java javahl)"
-#	use java && myconf="${myconf} $(use_with jikes)"
-	use java && myconf="${myconf} --without-jikes"
-
-	if use python || use perl; then
-		myconf="${myconf} --with-swig"
-	else
-		myconf="${myconf} --without-swig"
-	fi
-
-	append-flags `/usr/bin/apr-config --cppflags`
-
-	econf ${myconf} \
-		$(use_with ssl) \
-		$(use_with berkdb berkeley-db) \
-		$(use_with python) \
-		$(use_enable nls) \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-neon=/usr \
-		--disable-experimental-libtool \
-		--disable-mod-activation || die "econf failed"
-
-	# Build subversion, but do it in a way that is safe for parallel builds.
-	# Also apparently the included apr has a libtool that doesn't like -L flags.
-	# So not specifying it at all when not building apache modules and only
-	# specify it for internal parts otherwise.
-	( emake external-all && emake LT_LDFLAGS="-L${D}/usr/lib" local-all ) || die "make of subversion failed"
-
-	if use python; then
-		# Building fails without the apache apr-util as includes are wrong.
-		emake swig-py || die "subversion python bindings failed"
-	fi
-
-	if use perl; then
-		# Work around a buggy Makefile.PL, bug 64634
-		mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
-		make swig-pl || die "Perl library building failed"
-	fi
-
-	if use java; then
-		# ensure that the destination dir exists, else some compilation fails
-		mkdir -p ${S}/subversion/bindings/java/javahl/classes
-		# Compile javahl
-		make JAVACFLAGS="-source 1.3 -encoding iso8859-1" javahl || die "Compilation failed"
-	fi
-
-	if use emacs; then
-		einfo "compiling emacs support"
-		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
-		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
-	fi
-
-	# svn-config isn't quite built correctly; it contains references to
-	# @SVN_DB_LIBS@ and @SVN_DB_INCLUDES@.  It appears the best thing is to remove that.  #64634
-	sed -i 's/@SVN_DB_[^@]*@//g' svn-config || die "sed failed"
-}
-
-
-src_install () {
-	python_version
-	PYTHON_DIR=/usr/lib/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-
-#	This might not be necessary with the new install
-#	if [[ -e ${D}/usr/lib/apache2 ]]; then
-#		if [ "${APACHE2_MODULESDIR}" != "/usr/lib/apache2/modules" ]; then
-#			mkdir -p ${D}/`dirname ${APACHE2_MODULESDIR}`
-#			mv ${D}/usr/lib/apache2/modules ${D}/${APACHE2_MODULESDIR}
-#			rmdir ${D}/usr/lib/apache2 2>/dev/null
-#		fi
-#	fi
-
-
-	dobin svn-config
-	if use python; then
-		make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}  LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed"
-
-		# move python bindings
-		mkdir -p ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/lib/svn-python/svn ${D}${PYTHON_DIR}/site-packages
-		mv ${D}/usr/lib/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
-		rmdir ${D}/usr/lib/svn-python
-	fi
-	if use perl; then
-		make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
-	fi
-	if use java; then
-		make DESTDIR="${D}" install-javahl || die "installation failed"
-	fi
-
-	# Install apache module config
-	if useq apache2; then
-		mkdir -p ${D}/${APACHE2_MODULES_CONFDIR}
-		cat <<EOF >${D}/${APACHE2_MODULES_CONFDIR}/47_mod_dav_svn.conf
-<IfDefine SVN>
-	<IfModule !mod_dav_svn.c>
-		LoadModule dav_svn_module	modules/mod_dav_svn.so
-	</IfModule>
-	<Location /svn/repos>
-		DAV svn
-		SVNPath ${SVN_REPOS_LOC}/repos
-		AuthType Basic
-		AuthName "Subversion repository"
-		AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
-		Require valid-user
-	</Location>
-	<IfDefine SVN_AUTHZ>
-		<IfModule !mod_authz_svn.c>
-			LoadModule authz_svn_module	${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\/}/mod_authz_svn.so
-		</IfModule>
-	</IfDefine>
-</IfDefine>
-EOF
-	fi
-
-	# Bug 43179 - Install bash-completion if user wishes
-	dobashcompletion tools/client-side/bash_completion subversion
-
-	# Install hot backup script, bug 54304
-	newbin tools/backup/hot-backup.py svn-hot-backup
-
-	# The svn_load_dirs script is installed by Debian and looks like a good
-	# candidate for us to install as well
-	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245
-	exeinto /etc/init.d ; newexe ${FILESDIR}/svnserve.initd svnserve
-	insinto /etc/conf.d ; newins ${FILESDIR}/svnserve.confd svnserve
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
-
-	# Install documentation
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-	find contrib tools -name \*.in -print0 | xargs -0 rm -f
-	cp -r --parents tools/{client-side,examples,hook-scripts} ${D}/usr/share/doc/${PF}/
-	cp -r --parents contrib/hook-scripts ${D}/usr/share/doc/${PF}/
-
-	docinto notes
-	for f in notes/*
-	do
-		[[ -f ${f} ]] && dodoc ${f}
-	done
-
-	# Install the book in it's own dir
-	docinto book
-	cd ${S}
-	echo "installing html book"
-	dohtml -r doc/book/book/svn-book.html doc/book/book/styles.css doc/book/book/images || die "Installing book failed"
-
-	# Install emacs lisps
-	if use emacs; then
-		insinto /usr/share/emacs/site-lisp/subversion
-		doins contrib/client-side/psvn/psvn.el*
-		doins contrib/client-side/vc-svn.el*
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-}
-
-src_test() {
-	ewarn "Testing does not work for subversion"
-}
-
-pkg_postinst() {
-	use emacs >/dev/null && elisp-site-regen
-
-	einfo "Subversion Server Notes"
-	einfo "-----------------------"
-	einfo
-
-	einfo "If you intend to run a server, a repository needs to be created using"
-	einfo "svnadmin (see man svnadmin) or the following command to create it in"
-	einfo "/var/svn:"
-	einfo
-	einfo "    ebuild /path/to/ebuild/${PF}.ebuild config"
-	einfo
-	einfo "If you upgraded from an older version of berkely db and experience"
-	einfo "problems with your repository then run the following commands as root:"
-	einfo "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-	einfo "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	einfo
-	einfo "Subversion has multiple server types, take your pick:"
-	einfo
-	einfo " - svnserve daemon: "
-	einfo "   1. edit /etc/conf.d/svnserve"
-	einfo "   2. start daemon: /etc/init.d/svnserve start"
-	einfo "   3. make persistent: rc-update add svnserve default"
-	einfo
-	einfo " - svnserve via xinetd:"
-	einfo "   1. edit /etc/xinetd.d/svnserve (remove disable line)"
-	einfo "   2. restart xinetd.d: /etc/init.d/xinetd restart"
-	einfo
-	einfo " - svn over ssh:"
-	einfo "   1. create an svnserve wrapper in /usr/local/bin to set the umask you"
-	einfo "      want, for example:"
-	einfo "         #!/bin/bash"
-	einfo "         umask 002"
-	einfo "         exec /usr/bin/svnserve \"\$@\""
-	einfo
-
-	if use apache2 >/dev/null; then
-		einfo " - http-based server:"
-		einfo "   1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
-		einfo "   2. create an htpasswd file:"
-		einfo "      htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	has_version virtual/emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if [[ ! -x /usr/bin/svnadmin ]]; then
-		die "You seem to only have build the subversion client"
-	fi
-
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e ${SVN_REPOS_LOC}/repos ]]; then
-		echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p ${SVN_REPOS_LOC}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.1.4.ebuild b/dev-util/subversion/subversion-1.1.4.ebuild
index e4974f1b5a04..9f7eb7a10c6c 100644
--- a/dev-util/subversion/subversion-1.1.4.ebuild
+++ b/dev-util/subversion/subversion-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.4.ebuild,v 1.1 2005/04/05 09:31:50 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.4.ebuild,v 1.2 2005/04/13 12:36:47 pauldv Exp $
 
 inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache
 
@@ -11,7 +11,7 @@ SRC_URI="http://subversion.tigris.org/tarballs/${P/_rc/-rc}.tar.bz2"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ssl apache2 berkdb python emacs perl java nls"
+IUSE="ssl apache2 berkdb python emacs perl java nls nowebdav"
 RESTRICT="maketest"
 
 # Presently subversion doesn't build with swig-1.3.22, bug 65424
@@ -19,7 +19,7 @@ RDEPEND="apache2? ( ${APACHE2_DEPEND} )
 	>=dev-libs/apr-util-0.9.5
 	python? ( =dev-lang/swig-1.3.21 >=dev-lang/python-2.0 )
 	perl? ( =dev-lang/swig-1.3.21 >=dev-lang/perl-5.8 )
-	>=net-misc/neon-0.24.7
+	!nowebdav? ( >=net-misc/neon-0.24.7 )
 	berkdb? ( =sys-libs/db-4* )
 	java? ( virtual/jdk )
 	emacs? ( virtual/emacs )"
@@ -83,6 +83,12 @@ src_compile() {
 		myconf="${myconf} --without-swig"
 	fi
 
+	if use nowebdav; then
+		myconf="${myconf} --without-neon"
+	else
+		myconf="${myconf} --with-neon=/usr"
+	fi		
+
 	append-flags `/usr/bin/apr-config --cppflags`
 
 	econf ${myconf} \
@@ -92,7 +98,6 @@ src_compile() {
 		$(use_enable nls) \
 		--with-apr=/usr \
 		--with-apr-util=/usr \
-		--with-neon=/usr \
 		--disable-experimental-libtool \
 		--disable-mod-activation || die "econf failed"