another step futher, still unusable

2 files changed, 77 insertions, 69 deletions

diff --git a/dev-util/subversion/files/digest-subversion-0.8.0 b/dev-util/subversion/files/digest-subversion-0.8.0
index 8f8703719d06..3dc61920982d 100644
--- a/dev-util/subversion/files/digest-subversion-0.8.0
+++ b/dev-util/subversion/files/digest-subversion-0.8.0
@@ -1,7 +1,6 @@
-MD5 4bb18321eab2f6f88b9b8cade0c8459a apr_20020207232410.tar.gz 697596
-MD5 19326c624f2561a09eb8167f0e926f80 apr-util_20020207232416.tar.gz 184998
+MD5 1bfd2c284437f5e8b8944962e2faff95 apr_20020208112804.tar.gz 697607
+MD5 b2b3c95f8a38aa6a8753644d64f413f6 apr-util_20020208112819.tar.gz 185038
 MD5 10c84c06700d841a2f50a7e49baa742b autoconf-2.52.tar.bz2 632887
 MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
 MD5 cea9af10feb49aa9e6cae8a8b86c02e9 httpd-2_0_31-alpha.tar.gz 3861625
-MD5 a5e6812bbc94097a58e5c57a9c4572ea neon-0.18.5.tar.gz 476494
 MD5 7335ea5fef7eb796c648490ab70a5f8b subversion-r909.tar.gz 3880260
diff --git a/dev-util/subversion/subversion-0.8.0.ebuild b/dev-util/subversion/subversion-0.8.0.ebuild
index 70336b9825e7..6977f0597bf3 100644
--- a/dev-util/subversion/subversion-0.8.0.ebuild
+++ b/dev-util/subversion/subversion-0.8.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Geert Bevin <gbevin@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.8.0.ebuild,v 1.2 2002/02/08 03:03:35 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.8.0.ebuild,v 1.3 2002/02/08 12:41:47 gbevin Exp $
 
 S=${WORKDIR}/svn
 S_APACHE=${WORKDIR}/httpd-2_0_31
@@ -9,7 +9,8 @@ S_APR=${WORKDIR}/apr
 S_APRUTIL=${WORKDIR}/apr-util
 S_AUTOCONF=${WORKDIR}/autoconf-2.52
 S_BDB=${WORKDIR}/db-4.0.14/build_unix
-S_NEON=${WORKDIR}/neon-0.18.5
+S_SVNCLIENT=${WORKDIR}/svnclient
+S_SVNSERVER=${WORKDIR}/svnserver
 I_APACHE=${WORKDIR}/tmpinstall_httpd-2_0_31
 I_AUTOCONF=${WORKDIR}/tmpinstall_autoconf-2.52
 I_BDB=${WORKDIR}/tmpinstall_db-4.0.14
@@ -19,11 +20,10 @@ I_SVNSERVER=${WORKDIR}/tmpinstall_svnserver
 DESCRIPTION="A compelling replacement for CVS"
 SRC_URI="http://www.tigris.org/files/15/63/subversion-r909.tar.gz
 	http://www.sleepycat.com/update/4.0.14/db-4.0.14.tar.gz
-	http://cvs.apache.org/snapshots/apr/apr_20020207232410.tar.gz
-	http://cvs.apache.org/snapshots/apr-util/apr-util_20020207232416.tar.gz
+	http://cvs.apache.org/snapshots/apr/apr_20020208112804.tar.gz
+	http://cvs.apache.org/snapshots/apr-util/apr-util_20020208112819.tar.gz
 	http://www.apache.org/dist/httpd/httpd-2_0_31-alpha.tar.gz
-	ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.52.tar.bz2
-	http://www.webdav.org/neon/neon-0.18.5.tar.gz"
+	ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.52.tar.bz2"
 HOMEPAGE="http://subversion.tigris.org/"
 
 DEPEND="virtual/glibc
@@ -49,84 +49,61 @@ src_compile() {
 	    --localstatedir=/var/lib \
 		--host=${CHOST}"
 
+	# configure berkeley db
+	cd ${S_BDB}
+	../dist/configure \
+	    $svnpaths || die "../dist/configure of berkeley db failed"
+	# build berkeley db
+	emake || die "make of berkeley db failed"
+	# install temporary version of berkeley db
+	make prefix=${I_BDB} install || die "temporary installation of berkeley db failed"
+	# make the system pick up the installed berkeley db libs before others
+	export LD_LIBRARY_PATH="${I_BDB}/lib"
+	
 	# bootstrap subversion from version 0.8.0
-#	cd ${WORKDIR}/subversion-r909
-#	./configure \
-#		--enable-maintainer-mode \
-#		--disable-shared
-#	emake || die "make of subversion bootstrap failed"
+	cd ${WORKDIR}/subversion-r909
+	./configure \
+		--with-berkeley-db=${I_BDB} \
+		--enable-maintainer-mode \
+		--disable-shared
+	emake || die "make of subversion bootstrap failed"
 
 	# get latest subversion version from cvs
-#	cd ${WORKDIR}
-#	subversion-r909/subversion/clients/cmdline/svn checkout http://svn.collab.net/repos/svn/trunk -d svn
+	cd ${WORKDIR}
+	subversion-r909/subversion/clients/cmdline/svn checkout http://svn.collab.net/repos/svn/trunk -d svn
+	# remove old bootstrap version
+	rm -rf ${WORKDIR}/subversion-r909
 	
 	# configure autoconf
-#	cd ${S_AUTOCONF}
-#	./configure \
-#		--prefix=${I_AUTOCONF} \
-#		--infodir=${I_AUTOCONF}/share/info \
-#		--mandir=${I_AUTOCONF}/share/man \
-#		--target=${CHOST} || die "./configure of autoconf failed"
+	cd ${S_AUTOCONF}
+	./configure \
+		--prefix=${I_AUTOCONF} \
+		--infodir=${I_AUTOCONF}/share/info \
+		--mandir=${I_AUTOCONF}/share/man \
+		--target=${CHOST} || die "./configure of autoconf failed"
 	# build autoconf
-#	emake || die "make of autoconf failed"
+	emake || die "make of autoconf failed"
 	# install temporary version of autoconf
-#	make install || die "temporary installation of autoconf failed"
+	make install || die "temporary installation of autoconf failed"
 	# set the correct paths so that this new version of autoconf will be picked up instead
 	# of the old version that gentoo uses by default
 	export PATH="$I_AUTOCONF/bin:$PATH"
 
-	# configure berkeley db
-#	cd ${S_BDB}
-#	../dist/configure \
-##	    $svnpaths || die "../dist/configure of berkeley db failed"
-	# build berkeley db
-#	emake || die "make of berkeley db failed"
-	# install temporary version of berkeley db
-#	make prefix=${I_BDB} install || die "temporary installation of berkeley db failed"
-	# make the system pick up the installed berkeley db libs before others
-	export LD_LIBRARY_PATH="${I_BDB}/lib"
-	
-	# configure apache
-#	cd ${S_APACHE}
-#	./buildconf
-#	./configure \
-#		$svnpaths \
-#		--enable-so \
-#		--enable-dav \
-#		--with-dbm=db4 \
-#		--with-berkeley-db=${I_BDB} \
-#		--enable-maintainer-mode || die "./configure of apache failed"
-#	make depend
-	# fix the apache sources to correctly work with LD_LIBRARY_PATH
-#	mv srclib/pcre/Makefile srclib/pcre/Makefile_orig
-#	sed -e "s#./dftables#LD_LIBRARY_PATH=\"${LD_LIBRARY_PATH}\" ./dftables#" \
-#		srclib/pcre/Makefile_orig > srclib/pcre/Makefile
-#	mv server/Makefile server/Makefile_orig
-#	sed -e "s#./gen_test_char#LD_LIBRARY_PATH=\"${LD_LIBRARY_PATH}\" ./gen_test_char#" \
-#		server/Makefile_orig > server/Makefile
-	# build apache
-#	emake || die "make of apache failed"
-	# install temporary version of apache
-#	make prefix=${I_APACHE} install || die "temporary installation of apache failed"
-	# change the paths in apxs to point to the temporarly installed version of apache
-	# this will make subversions dav module install there
-#	mv ${I_APACHE}/bin/apxs ${I_APACHE}/bin/apxs_orig
-#	sed -e "s#/usr/svn#${I_APACHE}#" \
-#		${I_APACHE}/bin/apxs_orig > ${I_APACHE}/bin/apxs
-#	chmod +x ${I_APACHE}/bin/apxs
-
 	cd ${S}
 	# create a link to the apr and apr-utils sources
 	ln -sf ${S_APR} apr
 	ln -sf ${S_APRUTIL} apr-util
-	ln -sf ${S_NEON} neon
 	# generate the configure scripts
 	sh ./autogen.sh || die "autoconf of subversion failed"
 	
+	# make subversion client build directory
+	mkdir -p ${S_SVNCLIENT}
 	# configure subversion client
-	./configure \
+	cd ${S_SVNCLIENT}
+	../svn/configure \
 		$svnpaths \
 		--with-berkeley-db=${I_BDB} \
+		--with-neon=/usr \
 		--enable-maintainer-mode \
 		--disable-shared || die "./configure of subversion client failed"
 	# build subversion client
@@ -136,7 +113,38 @@ src_compile() {
 		prefix=${I_SVNCLIENT} \
 		mandir=${I_SVNCLIENT}/share/man \
 		infodir=${I_SVNCLIENT}/share/info install || die "temporary installation of subversion client failed"
-		
+	
+	return
+
+	# configure apache
+	cd ${S_APACHE}
+	./buildconf
+	./configure \
+		$svnpaths \
+		--enable-so \
+		--enable-dav \
+		--with-dbm=db4 \
+		--with-berkeley-db=${I_BDB} \
+		--enable-maintainer-mode || die "./configure of apache failed"
+	make depend
+	# fix the apache sources to correctly work with LD_LIBRARY_PATH
+	mv srclib/pcre/Makefile srclib/pcre/Makefile_orig
+	sed -e "s#./dftables#LD_LIBRARY_PATH=\"${LD_LIBRARY_PATH}\" ./dftables#" \
+		srclib/pcre/Makefile_orig > srclib/pcre/Makefile
+	mv server/Makefile server/Makefile_orig
+	sed -e "s#./gen_test_char#LD_LIBRARY_PATH=\"${LD_LIBRARY_PATH}\" ./gen_test_char#" \
+		server/Makefile_orig > server/Makefile
+	# build apache
+	emake || die "make of apache failed"
+	# install temporary version of apache
+	make prefix=${I_APACHE} install || die "temporary installation of apache failed"
+	# change the paths in apxs to point to the temporarly installed version of apache
+	# this will make subversions dav module install there
+	mv ${I_APACHE}/bin/apxs ${I_APACHE}/bin/apxs_orig
+	sed -e "s#/usr/svn#${I_APACHE}#" \
+		${I_APACHE}/bin/apxs_orig > ${I_APACHE}/bin/apxs
+	chmod +x ${I_APACHE}/bin/apxs
+
 	# configure subversion server
 	mkdir ../svnserver_obj
 	cd ../svnserver_obj
@@ -157,10 +165,11 @@ src_compile() {
 
 src_install () {
 	mkdir -p ${D}/usr/svn
+	mkdir -p ${D}/usr/svn/lib
 
-	cp -av ${I_BDB}/* ${D}/usr/svn || die "installation of berkeley db failed"
-	cp -av ${I_APACHE}/* ${D}/usr/svn || die "installation of apache failed"
 	cp -av ${I_SVNCLIENT}/* ${D}/usr/svn || die "installation of subversion client failed"
+	cp -av ${I_BDB}/lib/* ${D}/usr/svn/lib || die "installation of berkeley db failed"
+	cp -av ${I_APACHE}/* ${D}/usr/svn || die "installation of apache failed"
 	
 	cd ${D}/usr/svn
 	for x in bin/apxs \