diff options
author | 2004-01-28 12:56:11 +0000 | |
---|---|---|
committer | 2004-01-28 12:56:11 +0000 | |
commit | 30e2aacaaca12db808fc25a222ae6f20f43d3d16 (patch) | |
tree | 38d789bdf15b8ff9e19d6a00b3b6e2d918350951 /dev-util/subversion | |
parent | Version bumped. Cleaned out old ebuilds. (diff) | |
download | historical-30e2aacaaca12db808fc25a222ae6f20f43d3d16.tar.gz historical-30e2aacaaca12db808fc25a222ae6f20f43d3d16.tar.bz2 historical-30e2aacaaca12db808fc25a222ae6f20f43d3d16.zip |
new upstream version
Diffstat (limited to 'dev-util/subversion')
-rw-r--r-- | dev-util/subversion/ChangeLog | 7 | ||||
-rw-r--r-- | dev-util/subversion/Manifest | 16 | ||||
-rw-r--r-- | dev-util/subversion/files/digest-subversion-0.37.0 | 1 | ||||
-rw-r--r-- | dev-util/subversion/subversion-0.37.0.ebuild | 259 |
4 files changed, 275 insertions, 8 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index 511c086cb6f8..39c0fe45c334 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.46 2004/01/15 14:36:16 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.47 2004/01/28 12:56:00 pauldv Exp $ + +*subversion-0.37.0 (28 Jan 2004) + + 28 Jan 2004; Paul de Vrieze <pauldv@gentoo.org> subversion-0.37.0.ebuild: + New upstream version. Also taking new apache locations into account 15 Jan 2004; Paul de Vrieze <pauldv@gentoo.org> subversion-0.35.1.ebuild: Things actually work with autoconf-2.59, so changing the dependency. diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index 9b224545cd4b..cee4c0c0d7b0 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -1,18 +1,20 @@ -MD5 f53b7f305c57dc8c901201d0516a0a7e subversion-0.28.0.ebuild 8034 -MD5 c0209e31b005b5c99a3cdc033eb4aea9 subversion-0.34.0.ebuild 7737 -MD5 dcd3a81a4bd93eaac8f0c118c25ea72e subversion-0.30.0.ebuild 7572 +MD5 722119af145ccc96f0798145c6009e1c subversion-0.28.0.ebuild 8032 +MD5 75c2bee0ffc04b77b670a39f4c93e195 subversion-0.34.0.ebuild 7735 +MD5 90baa3c06a36189018ce4d4016f9e943 subversion-0.30.0.ebuild 7570 +MD5 0defd457c300dbf161120b24a2ed71b9 subversion-0.37.0.ebuild 7927 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222 -MD5 cc5b2f213a7b5bef3c8488c94d951725 ChangeLog 8427 -MD5 18ab767c48b474ea7d3c8f2a2536cd5d subversion-0.32.1.ebuild 8137 +MD5 2b76e353bb0ddf9e10318aae3d7b4bbf ChangeLog 8608 +MD5 a6e39b789f01207748b9eda8df8ba72c subversion-0.32.1.ebuild 8136 MD5 96c37b538c43b2213ed1222415c91cac subversion-0.27.0.ebuild 7887 -MD5 3e2b7510b9bd2c114db99887dd2a4f91 subversion-0.31.0.ebuild 8279 -MD5 2fca5ac96de898647e38bb9b81ad0b92 subversion-0.35.1.ebuild 7739 +MD5 acedaafe3f4b8379055c983cade07dfc subversion-0.31.0.ebuild 8277 +MD5 48e87e9f0ce09bda6fdaff08cd99b29d subversion-0.35.1.ebuild 7737 MD5 c055aef559559580f75e60ede5051e79 files/digest-subversion-0.28.0 130 MD5 335ccf779acbf11679a47b048afd56d0 files/digest-subversion-0.34.0 70 MD5 2addfcd2a73da5548c1fcbb279794e8f files/digest-subversion-0.35.1 70 MD5 e232822bee0a8ed00f6b9d7805b83307 files/digest-subversion-0.27.0 132 MD5 69cf99186dd88a6b26c6c121fc4c16a9 files/digest-subversion-0.32.1 132 MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136 +MD5 1f6ba3ba6f91cb0b284c0a8facb912e6 files/digest-subversion-0.37.0 70 MD5 72aa5ab58a4d6274b6035ce3370e5c3f files/subversion-db4.patch 556 MD5 c239e1be5d94572ff970508d3ac8f9b0 files/digest-subversion-0.30.0 135 MD5 86365b02198a65328b2f189759d9e3d3 files/digest-subversion-0.31.0 132 diff --git a/dev-util/subversion/files/digest-subversion-0.37.0 b/dev-util/subversion/files/digest-subversion-0.37.0 new file mode 100644 index 000000000000..f5271133878e --- /dev/null +++ b/dev-util/subversion/files/digest-subversion-0.37.0 @@ -0,0 +1 @@ +MD5 048c4d17d5880dc8f3699020eac56224 subversion-0.37.0.tar.gz 7501295 diff --git a/dev-util/subversion/subversion-0.37.0.ebuild b/dev-util/subversion/subversion-0.37.0.ebuild new file mode 100644 index 000000000000..44a79a4f4bdd --- /dev/null +++ b/dev-util/subversion/subversion-0.37.0.ebuild @@ -0,0 +1,259 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.37.0.ebuild,v 1.1 2004/01/28 12:56:11 pauldv Exp $ + +inherit elisp-common libtool + +DESCRIPTION="A compelling replacement for CVS" +SRC_URI="http://subversion.tigris.org/tarballs/${P}.tar.gz" +HOMEPAGE="http://subversion.tigris.org/" +PYTHON_DIR=`python-config | sed -e "s,\(.*-L\)\(/usr/lib.*\)\(/config.*\),\2,"` + +SLOT="0" +LICENSE="Apache-1.1" +KEYWORDS="~x86" +IUSE="ssl apache2 berkdb python emacs" + +S=${WORKDIR}/${PN}-${PV} + +#Allow for custion repository locations +if [ "${SVN_REPOS_LOC}x" = "x" ]; then + SVN_REPOS_LOC="/var/svn" +fi + +# +# +# Note that to disable the server part of subversion you need to specify +# USE="-berkdb" emerge subversion. +# +# + +RDEPEND="python? ( >=dev-lang/python-2.0 ) + apache2? ( >=net-www/apache-2.0.48 ) + !apache2? ( !>=net-www/apache-2* ) + !dev-libs/apr + python? ( =dev-lang/swig-1.3.19 ) + >=net-misc/neon-0.24.4 + berkdb? ( =sys-libs/db-4* )" + +DEPEND="${RDEPEND} + !=sys-devel/autoconf-2.58*" + +pkg_setup() { + if has_version '<dev-util/subversion-0.34.0' && [ "${SVN_DUMPED}" == "" ]; then + einfo "" + ewarn ": Now 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 !!" + einfo "" + einfo "More details on dumping:" + einfo "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO" + die "ensure that you dump your repository first" + fi + + 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 ${PN}-${PV}.tar.gz + cd ${S} + + patch -p1 <${FILESDIR}/subversion-db4.patch + export WANT_AUTOCONF_2_5=1 + elibtoolize + autoconf + (cd apr; autoconf) + (cd apr-util; autoconf) +# sed -i -e 's,\(subversion/svnversion/svnversion\)\(>.*svn-revision.txt\),echo "external" \2,' Makefile.in +} + +src_compile() { + local myconf + + 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" + + use berkdb && myconf="${myconf} --with-berkeley-db" + use berkdb || myconf="${myconf} --without-berkeley-db" + + use python && myconf="${myconf} --with-python=/usr/bin/python --with-swig" + use python || myconf="${myconf} --without-python --without-swig" + + econf ${myconf} \ + --with-neon=/usr \ + --disable-experimental-libtool \ + --disable-mod-activation ||die "configuration failed" + + + # build subversion, but do it in a way that is safe for paralel builds + # Also apparently the included apr does have 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 + if use apache2; then + ( emake external-all && emake LT_LDFLAGS="-L${D}/usr/lib" local-all ) || die "make of subversion failed" + else + ( emake external-all && emake local-all ) || die "make of subversion failed" + fi + + #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 + if use emacs; then + emacs -batch -f batch-byte-compile contrib/client-side/vc-svn.el || die + emacs -batch -f batch-byte-compile contrib/client-side/psvn/psvn.el || die + fi +} + + +src_install () { + use apache2 && mkdir -p ${D}/etc/apache2/conf + + make DESTDIR=${D} install || die "Installation of subversion failed" + if [ -e ${D}/usr/lib/apache2 ]; then + if has_version '>=net-www/apache-2.0.48-r2'; then + mv ${D}/usr/lib/apache2/modules ${D}/usr/lib/apache2-extramodules + rmdir ${D}/usr/lib/apache2 + else + mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules + fi + fi + + if use python; then + if use berkdb; 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" + # 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}${PYTHON_DIR}/site-packages + cp -r tools/cvs2svn/rcsparse ${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 + fi + + dodoc BUGS COMMITTERS COPYING HACKING INSTALL 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 + + # 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 + + + + #Install apache module config + if use apache2; 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 ${SVN_REPOS_LOC}/repos + AuthType Basic + AuthName "Subversion repository" + AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers + Require valid-user + </Location> +</IfDefine> +EOF + fi +} + +pkg_postinst() { + + use emacs && elisp-site-regen + if use berkdb; then + if use apache2; 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" + einfo "" + einfo "If you upgraded from an older version of berkely db and experience" + einfo "problems with your repository then run the following command:" + einfo " su apache -c \"db4_recover -h /path/to/repos\"" + + if use apache2; then + einfo "" + einfo "To allow web access a htpasswd file needs to be created using the" + einfo "following command:" + einfo " htpasswd2 -m -c ${SVN_REPOS_LOC}/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_postrm() { + use 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 [ -f ${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 +} |