New upstream version of subversion, a small fix in the old ebuild, and a split in the new one that will only build the apache module if the apache2 use flag is specified

5 files changed, 218 insertions, 6 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 079ebc22dc66..798fb9d9b580 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,10 +1,21 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.8 2003/04/25 11:36:33 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.9 2003/04/26 14:07:16 pauldv Exp $
+
+*subversion-0.21.0 (26 Apr 2003)
+
+  26 Apr 2003; Paul de Vrieze<pauldv@gentoo.org> subversion-0.21.0.ebuild:
+  New upstream version. Also do not build the apache module if the apache2 use
+  flag is not specified. As in this case subversion provides its own apr libs,
+  it actually blocks on apache2.
 
 *subversion-0.20.1 (25 Apr 2003)
 
-  25 Apr 2003; <pauldv@gentoo.org> subversion-0.20.1.ebuild:
+  26 Apr 2003; Paul de Vrieze <pauldv@gentoo.org> subversion-0.20.1.ebuild:
+  Fixed a small error in the config script. It did not ensure the existence of
+  /home/svn resulting in a failure.
+
+  25 Apr 2003; Paul de Vrieze <pauldv@gentoo.org> subversion-0.20.1.ebuild:
   Added || die to the make install parts
 
   15 Mar 2003; Martin Schlemmer <azarah@gentoo.org> subversion-0.10_pre1.ebuild :
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 40bc04923aa3..c7b3c94f590e 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,7 +1,7 @@
 MD5 5a81f23433cf70576fec6ed89e379959 subversion-0.10_pre1.ebuild 8049
-MD5 509c99f9d6840e4abed36d69fbe07f35 ChangeLog 911
-MD5 ae4b37c31e8c4b4405195a56428e3ee7 subversion-0.20.1.ebuild 5541
-MD5 8ba264ffcb8c8d04a5081513ed2d5dc6 subversion-0.21.0.ebuild 5541
+MD5 e31992951f2e57dc2d2175fcd40fb214 ChangeLog 1419
+MD5 0cd9da329abd48b932c86384484a07f2 subversion-0.20.1.ebuild 5562
+MD5 e19b488a6a45522ee97efd2bfa199c87 subversion-0.21.0.ebuild 6316
 MD5 8208be10eefcdc258afb4ca8d410a06c files/digest-subversion-0.10_pre1 446
 MD5 8761867d2d9c80254eb9945021b552fa files/digest-subversion-0.20.1 132
 MD5 d3250565b5dca16ba84df4bb5075992b files/digest-subversion-0.21.0 132
diff --git a/dev-util/subversion/files/digest-subversion-0.21.0 b/dev-util/subversion/files/digest-subversion-0.21.0
new file mode 100644
index 000000000000..6e1c8346e8d0
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-0.21.0
@@ -0,0 +1,2 @@
+MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
+MD5 b2ad91127fb652e764b750f4c0002528 subversion-0.21.0.tar.gz 7713475
diff --git a/dev-util/subversion/subversion-0.20.1.ebuild b/dev-util/subversion/subversion-0.20.1.ebuild
index 0bb485ef4d54..7b4c8621a2f3 100644
--- a/dev-util/subversion/subversion-0.20.1.ebuild
+++ b/dev-util/subversion/subversion-0.20.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.20.1.ebuild,v 1.2 2003/04/25 11:36:33 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.20.1.ebuild,v 1.3 2003/04/26 14:07:16 pauldv Exp $
 
 
 DESCRIPTION="A compelling replacement for CVS"
@@ -165,6 +165,7 @@ pkg_config() {
         echo "A subversion repository already exists and I will not overwrite it."
 		echo "Delete /home/svn/repos first if you're sure you want to have a clean version."
 	else
+		mkdir -p /home/svn
 		einfo ">>> Populating repository directory ..."
 		# create initial repository
 		/usr/bin/svnadmin create /home/svn/repos
diff --git a/dev-util/subversion/subversion-0.21.0.ebuild b/dev-util/subversion/subversion-0.21.0.ebuild
new file mode 100644
index 000000000000..9d81a2eee742
--- /dev/null
+++ b/dev-util/subversion/subversion-0.21.0.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.21.0.ebuild,v 1.1 2003/04/26 14:07:16 pauldv Exp $
+
+
+DESCRIPTION="A compelling replacement for CVS"
+SRC_URI="http://www.sleepycat.com/update/4.0.14/db-4.0.14.tar.gz
+	http://subversion.tigris.org/files/documents/15/3712/${P}.tar.gz"
+HOMEPAGE="http://subversion.tigris.org/"
+
+SLOT="0"
+LICENSE="Apache-1.1"
+KEYWORDS="~x86"
+IUSE="ssl apache2"
+
+S_DB="${WORKDIR}/db-4.0.14/build_unix"
+
+DEPEND=">=dev-lang/python-2.0
+	>=sys-apps/diffutils-2.7.7
+	>=sys-devel/libtool-1.4.1-r1
+	>=sys-devel/bison-1.28-r3
+	apache2? ( >=net-www/apache-2.0.44 )
+	!apache2? ( !>=apache-2* )
+	!dev-libs/apr
+	~sys-devel/m4-1.4
+	>=dev-lang/swig-1.3.16
+	>=net-misc/neon-0.23.8"
+
+RDEPEND=">=dev-lang/python-2.0
+	>=sys-apps/diffutils-2.7.7
+	~sys-devel/m4-1.4"
+
+pkg_setup() {
+	if use apache2; then
+		einfo "The apache2 subversion module will be built, and libapr from the"
+		einfo "apache package will be used instead of the included"
+	else
+		einfo "Please note that subversion and apache2 cannot be installed"
+		einfo "simultaneously without specifying the apache2 use flag. This is"
+		einfo "because subversion installs its own libapr and libapr-util in that"
+		einfo "case."
+	fi
+}
+	
+src_unpack() {
+	cd ${WORKDIR}
+	unpack ${P}.tar.gz
+	unpack db-4.0.14.tar.gz
+	cd ${S}
+#	cat packages/rpm/redhat-8.x/install.patch | \
+#	sed -e "s,RPM_BUILD_ROOT,DESTDIR,g" -e "s,usr/lib/httpd/modules,usr/lib/apache2-extramodules,g" | patch -p1
+}
+
+src_compile() {
+	cd ${S_DB}
+	../dist/configure \
+                --prefix=/usr \
+                --mandir=/usr/share/man \
+                --infodir=/usr/share/info \
+                --datadir=/usr/share \
+                --sysconfdir=/etc \
+                --localstatedir=/var/lib \
+                --disable-compat185 \
+                --disable-cxx \
+		--disable-tcl \
+		--disable-java \
+		--disable-shared \
+		--with-uniquename
+	make || die "db make failed"
+	[ -e ${WORKDIR}/dbinst ] && rm -rf ${WORKDIR}/dbinst
+	mkdir -p ${WORKDIR}/dbinst/lib
+	make prefix=${WORKDIR}/dbinst install ||die
+	mkdir ${WORKDIR}/dbinst/include/db4
+	cp ${WORKDIR}/dbinst/include/*.h ${WORKDIR}/dbinst/include/db4
+	mv ${WORKDIR}/dbinst/lib/libdb.a ${WORKDIR}/dbinst/lib/libdb4.a
+	cat <<EOF >${WORKDIR}/dbinst/lib/libdb4.so
+GROUP( ${WORKDIR}/dbinst/lib/libdb4.a /usr/lib/libdb.so)
+EOF
+
+	cd ${S}
+	use ssl && myconf="${myconf} --with-ssl"
+	use ssl || myconf="${myconf} --without-ssl"
+
+	LDFLAGS="-L${S}/subversion/libsvn_client/.libs \
+        -L${S}/subversion/libsvn_delta/.libs \
+        -L${S}/subversion/libsvn_diff/.libs \
+        -L${S}/subversion/libsvn_fs/.libs \
+        -L${S}/subversion/libsvn_repos/.libs \
+        -L${S}/subversion/libsvn_ra/.libs \
+        -L${S}/subversion/libsvn_ra_dav/.libs \
+        -L${S}/subversion/libsvn_ra_local/.libs \
+        -L${S}/subversion/libsvn_ra_svn/.libs \
+        -L${S}/subversion/libsvn_subr/.libs \
+        -L${S}/subversion/libsvn_wc/.libs \
+	-L${WORKDIR}/dbinst/lib"
+
+
+	use apache2 && myconf="${myconf} --with-apxs=/usr/sbin/apxs2 \
+		--with-apr=/usr --with-apr-util=/usr"
+	use apache2 || myconf="${myconf} --without-apxs"
+
+	LDFLAGS=${LDFLAGS} econf ${myconf} \
+		--with-berkeley-db=${WORKDIR}/dbinst \
+		--with-neon=/usr \
+		--disable-mod-activation \
+		--with-python=/usr/bin/python \
+		--with-swig ||die "configuration failed"
+	# build subversion
+	emake || die "make of subversion failed"
+	#building fails without the apache apr-util as includes are wrong.
+	if [ use apache2 ]; then
+		emake swig-py || die "subversion python bindings failed"
+	else
+		emake SVN_APR_INCLUDES="-I${S}/apr/include -I${S}/apr-util/include" swig-py || die "subversion python bindings failed"
+	fi
+}
+
+
+src_install () {
+	mkdir -p ${D}/etc/apache2/conf
+	mkdir -p ${D}/etc/share
+
+	mkdir -p ${D}/usr/share/subversion/bin
+	cp ${WORKDIR}/dbinst/bin/* ${D}/usr/share/subversion/bin/
+
+	make DESTDIR=${D} install || die "Installation of subversion failed"
+	make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} || die "Installation of subversion python bindings failed"
+	mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
+	# remove unwanted parts from the image dir
+
+	# install cvs2svn
+	dobin tools/cvs2svn/cvs2svn.py
+	mv ${D}/usr/bin/cvs2svn.py ${D}/usr/bin/cvs2svn
+	doman tools/cvs2svn/cvs2svn.1
+
+	# move python bindings
+	mkdir -p ${D}/usr/lib/python2.2/site-packages
+	cp -r tools/cvs2svn/rcsparse ${D}/usr/lib/python2.2/site-packages
+	mv ${D}/usr/lib/svn-python/svn ${D}/usr/lib/python2.2/site-packages
+	rmdir ${D}/usr/lib/svn-python
+
+	dodoc BUGS COMMITTERS COPYING HACKING IDEAS INSTALL PORTING README
+	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
+
+	# install documentation
+	cd notes
+	for f in *.txt
+	do
+		dodoc ${f}
+	done
+#	mkdir -p ${D}/home/svn/repos
+#	mkdir -p ${D}/home/svn/conf
+	mkdir -p ${D}/etc/apache2/conf/modules.d
+	cat <<EOF >${D}/etc/apache2/conf/modules.d/47_mod_dav_svn.conf
+<IfDefine SVN>
+  <IfModule !mod_dav_svn.c>
+    LoadModule dav_svn_module	extramodules/mod_dav_svn.so
+  </IfModule>
+  <Location /svn/repos>
+    DAV svn
+    SVNPath /home/svn/repos
+    AuthType Basic
+    AuthName "Subversion repository"
+    AuthUserFile /home/svn/conf/svnusers
+    Require valid-user
+  </Location>
+</IfDefine>
+EOF
+
+}
+
+pkg_postinst() {
+	einfo "Subversion has multiple server types. To enable the http based version"
+	einfo "you must edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
+	einfo ""
+	einfo "A repository needs to be created using the ebuild ${N} config command"
+	einfo "To allow web access a htpasswd file needs to be created using the"
+	einfo "following command:"
+	einfo "   htpasswd2 -m -c /home/svn/conf/svnusers USERNAME"
+}
+
+pkg_config() {
+	einfo ">>> Initializing the database ..."
+	if [ -f /home/svn/repos ] ; then
+        echo "A subversion repository already exists and I will not overwrite it."
+		echo "Delete /home/svn/repos first if you're sure you want to have a clean version."
+	else
+		mkdir -p /home/svn
+		einfo ">>> Populating repository directory ..."
+		# create initial repository
+		/usr/bin/svnadmin create /home/svn/repos
+
+		einfo ">>> Setting repository permissions ..."
+		chown -Rf apache.apache /home/svn/repos
+		chmod -Rf 755 /home/svn/repos
+	fi
+}
+