Version bump, and remove some old versions

6 files changed, 235 insertions, 185 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 53cc24da9529..afd5bcdd0ec6 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2003/05/17 13:16:31 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.19 2003/05/28 09:21:19 pauldv Exp $
+
+*subversion-0.23.0 (28 May 2003)
+
+  28 May 2003; Paul de Vrieze <pauldv@gentoo.org> subversion-0.23.0.ebuild:
+  Version bump, and add some more documentation to the docs dir.
 
 *subversion-0.22.2 (17 May 2003)
 
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 3feb30d4b674..22defefa324a 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,12 +1,10 @@
 MD5 a343df53435bdcfc3a4c85f3e9912102 subversion-0.10_pre1.ebuild 8054
-MD5 0c048a923bcd4950809fd32ee0a53b3d ChangeLog 2801
-MD5 ca1f55a8afc4e3f889452aca89d9ebac subversion-0.20.1.ebuild 5566
+MD5 7a0f4da528284283acacd66d9674daa8 ChangeLog 2977
 MD5 fd3ac2ef875451503c8829716f9dc2e2 subversion-0.21.0-r1.ebuild 5721
 MD5 7a45c9dae1829ed6fa2b22ead64c4eab subversion-0.21.0.ebuild 6494
 MD5 85a83ed1c428964a9c891992f01e957f subversion-0.22.2.ebuild 6756
-MD5 972f9fbbbd37604b132924ec62797302 subversion-0.23.0.ebuild 6756
+MD5 57f11b5a0e90abec7a2005821d9f5084 subversion-0.23.0.ebuild 6793
 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
 MD5 d3250565b5dca16ba84df4bb5075992b files/digest-subversion-0.21.0-r1 132
 MD5 d862f716bef7a59fbbbab4c4d709d5a6 files/digest-subversion-0.22.2 132
diff --git a/dev-util/subversion/files/digest-subversion-0.20.1 b/dev-util/subversion/files/digest-subversion-0.20.1
deleted file mode 100644
index 6bdf48b1fe66..000000000000
--- a/dev-util/subversion/files/digest-subversion-0.20.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
-MD5 64b95d41270a68f4749709eb6ce52905 subversion-0.20.1.tar.gz 7645003
diff --git a/dev-util/subversion/files/digest-subversion-0.23.0 b/dev-util/subversion/files/digest-subversion-0.23.0
new file mode 100644
index 000000000000..1f03ce5602e5
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-0.23.0
@@ -0,0 +1,2 @@
+MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799
+MD5 59661f2145976437b371a0ab3a555dbd subversion-0.23.0.tar.gz 7700961
diff --git a/dev-util/subversion/subversion-0.20.1.ebuild b/dev-util/subversion/subversion-0.20.1.ebuild
deleted file mode 100644
index c89d82c2085d..000000000000
--- a/dev-util/subversion/subversion-0.20.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# 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.5 2003/05/12 20:52:38 mholzer Exp $
-
-
-DESCRIPTION="A compelling replacement for CVS"
-SRC_URI="http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz
-	http://subversion.tigris.org/files/documents/15/3440/${P}.tar.gz"
-HOMEPAGE="http://subversion.tigris.org/"
-
-SLOT="0"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86"
-IUSE="ssl"
-
-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
-	>=net-www/apache-2.0.45
-	~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"
-	
-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_fs/.libs \
-        -L${S}/subversion/libsvn_repos/.libs \
-        -L${S}/subversion/libsvn_ra/.libs \
-        -L${S}/subversion/libsvn_auth/.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"
-
-
-	LDFLAGS=${LDFLAGS} econf ${myconf} --with-apxs=/usr/sbin/apxs2 \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--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"
-	emake swig-py || die "subversion python bindings failed"
-}
-
-
-src_install () {
-	mkdir -p ${D}/etc/apache2/conf
-	mkdir -p ${D}/etc/share
-
-#	dolib ${WORKDIR}/dbinst/lib/libdb-*.so
-	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 ${PN} 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
-}
-
diff --git a/dev-util/subversion/subversion-0.23.0.ebuild b/dev-util/subversion/subversion-0.23.0.ebuild
new file mode 100644
index 000000000000..07e6a047841c
--- /dev/null
+++ b/dev-util/subversion/subversion-0.23.0.ebuild
@@ -0,0 +1,225 @@
+# 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.23.0.ebuild,v 1.1 2003/05/28 09:21:20 pauldv Exp $
+
+inherit libtool
+
+DESCRIPTION="A compelling replacement for CVS"
+SRC_URI="http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz
+	http://subversion.tigris.org/files/documents/15/4218/${P}.tar.gz"
+HOMEPAGE="http://subversion.tigris.org/"
+
+SLOT="0"
+LICENSE="Apache-1.1"
+KEYWORDS="~x86"
+IUSE="ssl apache2 berkdb python"
+
+S_DB="${WORKDIR}/db-4.0.14/build_unix"
+
+DEPEND="python? ( >=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.45 )
+	!apache2? ( !>=apache-2* )
+	!dev-libs/apr
+	~sys-devel/m4-1.4
+	python? ( >=dev-lang/swig-1.3.16 )
+	>=net-misc/neon-0.23.8"
+
+RDEPEND="python? ( >=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
+	use berkdb && ( has_version =db-4* || (
+		unpack db-4.0.14.tar.gz
+	) )
+	cd ${S}
+}
+
+src_compile() {
+	local myconf
+	elibtoolize
+	use berkdb && ( has_version =db-4* || (
+		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
+		emake || 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
+	) ) #no db4
+
+	cd ${S}
+	use ssl && myconf="${myconf} --with-ssl"
+	use ssl || myconf="${myconf} --without-ssl"
+
+	use apache2 && myconf="${myconf} --with-apxs=/usr/sbin/apxs2 \
+		--with-apr=/usr --with-apr-util=/usr"
+	use apache2 || myconf="${myconf} --without-apxs"
+	
+	if use berkdb; then
+		has_version =db-4* && myconf="${myconf} --with-berkeley-db"
+		has_version =db-4* || myconf="${myconf} --with-berkeley-db=${WORKDIR}/dbinst" 
+	else
+		myconf="${myconf} --without-berkeley-db"
+	fi
+
+	use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig"
+	use python || myconf="${myconf} --without-python --without-swig"
+
+	echo "myconf=${myconf}"
+	LDFLAGS=${LDFLAGS} econf ${myconf} \
+		--with-neon=/usr \
+		--disable-mod-activation ||die "configuration failed"
+	# build subversion, but do it in a way that is safe for paralel builds
+	( emake external-all && emake local-all ) || die "make of subversion failed"
+
+	#building fails without the apache apr-util as includes are wrong.
+	#Also the python bindings do not work without db installed
+	if use python; then
+		if use berkdb; then
+			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
+		fi
+	fi
+}
+
+
+src_install () {
+	mkdir -p ${D}/etc/apache2/conf
+	mkdir -p ${D}/etc/share
+
+	use berkdb && ( has_version =db-4* || (
+		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"
+	if [ -e ${D}/usr/lib/apache2 ]; then
+		mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules
+	fi
+
+	if use python; then
+		if use berkdb; then
+			make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} || die "Installation of subversion python bindings failed"
+			# 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
+		fi
+	fi
+
+	dodoc BUGS COMMITTERS COPYING HACKING IDEAS INSTALL PORTING README
+	dodoc CHANGES
+	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
+
+	# install documentation
+	docinto notes
+	for f in notes/*
+	do
+		[ -f ${f} ] && dodoc ${f}
+	done
+	cd ${S}
+	echo "installing html book"
+	dohtml -r doc/book/book/book.html doc/book/book/styles.css doc/book/book/images
+	if use apache; then
+		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
+	fi
+}
+
+pkg_postinst() {
+	if use berkdb; then
+		if use apache; then
+			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 ""
+		fi
+		einfo "A repository needs to be created using the ebuild ${PN} config command"
+		if use apache; then
+			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"
+		fi
+	else
+		einfo "Your subversion is client only as the server is only build when"
+		einfo "the berkdb flag is set"
+	fi
+}
+
+pkg_config() {
+	if [ ! -x /usr/bin/svnadmin ]; then
+		die "You seem to only have build the subversion client"
+	fi
+	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
+}
+