diff options
17 files changed, 96 insertions, 1457 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index 4bf835a5fcd8..e577fa3ba680 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.120 2004/11/12 16:50:53 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.121 2004/11/12 18:48:59 agriffis Exp $ + +*subversion-1.1.1-r2 (12 Nov 2004) + + 12 Nov 2004; <agriffis@gentoo.org> +files/svnserve.confd, + +files/svnserve.initd, +files/svnserve.xinetd, -subversion-0.27.0.ebuild, + -subversion-0.32.1.ebuild, -subversion-1.0.8.ebuild, + -subversion-1.1.0.ebuild, -subversion-1.1.1-r1.ebuild, + +subversion-1.1.1-r2.ebuild, -subversion-1.1.1.ebuild: + Add svnserve init script and xinetd snippet #43245 -- thanks to Martin Jackson + and Joby Walker. Trim older ebuilds 12 Nov 2004; Aron Griffis <agriffis@gentoo.org> subversion-1.1.1-r1.ebuild: diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index fb5042ff9491..073c5716515a 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -7,6 +7,7 @@ MD5 76fbed9ef27746928125c0403de48f6c subversion-1.0.9.ebuild 9589 MD5 3c9b3b6e54fbc977d3c8157faf01f9b6 subversion-1.1.1.ebuild 9233 MD5 291df7a6a1b5cd387b1ca0a3eedf9645 ChangeLog 20770 MD5 ed2c1d6456f1a28024cf7791822ae3ba subversion-1.1.1-r1.ebuild 10046 +MD5 85d4d643dde528a226dd9b987a49a8fa subversion-1.1.1-r2.ebuild 10869 MD5 062d550a01e930b20be035b5616cadbe files/subversion-1.1.0-build.patch 771 MD5 87d4c36172feaa28b4be6158906f3644 files/digest-subversion-1.0.8 70 MD5 257be4b439c371b285685b3be0e17568 files/digest-subversion-1.1.0 70 @@ -18,3 +19,7 @@ MD5 b355b623d5259b4b1ff75eead17fac0b files/digest-subversion-1.0.9 70 MD5 53809180b5372b204b32db3962b409ba files/digest-subversion-1.1.1 70 MD5 53809180b5372b204b32db3962b409ba files/digest-subversion-1.1.1-r1 70 MD5 b8146e2661f55257aef6d41e79897b63 files/subversion-1.1.1-perl-vendor.patch 713 +MD5 9f06ce72de714decff8fad3a674fb64d files/svnserve.xinetd 334 +MD5 22abab2be882e40cf466808e456a5c6a files/svnserve.initd 580 +MD5 8de1f6e76dcb072171a09aaba2fd3b2b files/svnserve.confd 323 +MD5 53809180b5372b204b32db3962b409ba files/digest-subversion-1.1.1-r2 70 diff --git a/dev-util/subversion/files/digest-subversion-0.27.0 b/dev-util/subversion/files/digest-subversion-0.27.0 deleted file mode 100644 index 61df9343ca82..000000000000 --- a/dev-util/subversion/files/digest-subversion-0.27.0 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz 2701799 -MD5 0f4fa0ebb0b58b83bad9433b8baa3f9a subversion-0.27.0.tar.gz 7326370 diff --git a/dev-util/subversion/files/digest-subversion-0.32.1 b/dev-util/subversion/files/digest-subversion-0.32.1 deleted file mode 100644 index 39b03afe90ec..000000000000 --- a/dev-util/subversion/files/digest-subversion-0.32.1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 b06717a8ef50db4b5c4d380af00bd901 subversion-0.32.1.tar.gz 7234917 -MD5 6b13bf7122876fa7a93a6194bc21efd4 svnadmin-0.27.bz2 582304 diff --git a/dev-util/subversion/files/digest-subversion-1.0.8 b/dev-util/subversion/files/digest-subversion-1.0.8 deleted file mode 100644 index c14116127f58..000000000000 --- a/dev-util/subversion/files/digest-subversion-1.0.8 +++ /dev/null @@ -1 +0,0 @@ -MD5 b2378b7d9d00653249877531a61ef1db subversion-1.0.8.tar.bz2 5978990 diff --git a/dev-util/subversion/files/digest-subversion-1.1.0 b/dev-util/subversion/files/digest-subversion-1.1.0 deleted file mode 100644 index b8f35a3be9b5..000000000000 --- a/dev-util/subversion/files/digest-subversion-1.1.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 a91b0d79b8c8ab8747587037c044c6c9 subversion-1.1.0.tar.bz2 6747545 diff --git a/dev-util/subversion/files/digest-subversion-1.1.1-r1 b/dev-util/subversion/files/digest-subversion-1.1.1-r1 deleted file mode 100644 index 12863208a69b..000000000000 --- a/dev-util/subversion/files/digest-subversion-1.1.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 a180c3fe91680389c210c99def54d9e0 subversion-1.1.1.tar.bz2 6768086 diff --git a/dev-util/subversion/files/digest-subversion-1.1.1 b/dev-util/subversion/files/digest-subversion-1.1.1-r2 index 12863208a69b..12863208a69b 100644 --- a/dev-util/subversion/files/digest-subversion-1.1.1 +++ b/dev-util/subversion/files/digest-subversion-1.1.1-r2 diff --git a/dev-util/subversion/files/svnserve.confd b/dev-util/subversion/files/svnserve.confd new file mode 100644 index 000000000000..832d375aa292 --- /dev/null +++ b/dev-util/subversion/files/svnserve.confd @@ -0,0 +1,10 @@ +# The commented variables in this file are the defaults that are used +# in the init-script. You don't need to uncomment them except to +# customize them to different values. + +# Options for svnserve +#SVNSERVE_OPTS="--root=/var/svn" + +# User and group as which to run svnserve +#SVNSERVE_USER="apache" +#SVNSERVE_GROUP="apache" diff --git a/dev-util/subversion/files/svnserve.initd b/dev-util/subversion/files/svnserve.initd new file mode 100644 index 000000000000..7c43cc1ca83a --- /dev/null +++ b/dev-util/subversion/files/svnserve.initd @@ -0,0 +1,23 @@ +#!/sbin/runscript +# Copyright 2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/files/svnserve.initd,v 1.1 2004/11/12 18:48:59 agriffis Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting svnserve" + start-stop-daemon --start --quiet --background --make-pidfile \ + --pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \ + --chuid ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \ + --foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn} + eend $? +} + +stop() { + ebegin "Stopping svnserve" + start-stop-daemon --stop --quiet --pidfile /var/run/svnserve.pid + eend $? +} diff --git a/dev-util/subversion/files/svnserve.xinetd b/dev-util/subversion/files/svnserve.xinetd new file mode 100644 index 000000000000..f2ff05a84031 --- /dev/null +++ b/dev-util/subversion/files/svnserve.xinetd @@ -0,0 +1,14 @@ +service svnserve +{ + socket_type = stream + wait = no + user = apache + group = apache + umask = 002 + protocol = tcp + log_on_failure += USERID HOST + port = 3690 + server = /usr/bin/svnserve + server_args = -i + disable = yes +} diff --git a/dev-util/subversion/subversion-0.27.0.ebuild b/dev-util/subversion/subversion-0.27.0.ebuild deleted file mode 100644 index bd6373f606a5..000000000000 --- a/dev-util/subversion/subversion-0.27.0.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.27.0.ebuild,v 1.9 2004/06/25 02:47:52 agriffis Exp $ - -inherit libtool - -DB_VERSION="4.0.14" -DESCRIPTION="A compelling replacement for CVS" -SRC_URI="berkdb? ( http://www.sleepycat.com/update/snapshot/db-${DB_VERSION}.tar.gz ) - http://subversion.tigris.org/files/documents/15/5642/${PN}-${PV}.tar.gz" -HOMEPAGE="http://subversion.tigris.org/" - -SLOT="0" -LICENSE="Apache-1.1" -KEYWORDS="~x86" -IUSE="ssl apache2 berkdb python" - -S=${WORKDIR}/${PN}-${PV} - -if [ "${SVN_REPOS_LOC}x" = "x" ]; then - SVN_REPOS_LOC="/home/svn" -fi - -# -# -# Note that to disable the server part of subversion you need to specify -# USE="-berkdb" emerge subversion. -# -# - -S_DB="${WORKDIR}/db-${DB_VERSION}/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? ( !>=net-www/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 ${PN}-${PV}.tar.gz - use berkdb && ( has_version =db-4* || ( - unpack db-${DB_VERSION}.tar.gz - ) ) - cd ${S} - elibtoolize ${S} - patch -p1 <${FILESDIR}/subversion-db4.patch - autoconf -} - -src_compile() { - local myconf - 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}" - 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 -} - - -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 - mv ${D}/usr/lib/svn-python/libsvn ${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 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() { - 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" - if has_version =sys-libs/db-4*; then - 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\"" - fi - if use apache2; then - 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_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} - 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-0.32.1.ebuild b/dev-util/subversion/subversion-0.32.1.ebuild deleted file mode 100644 index 6b6c7e29924f..000000000000 --- a/dev-util/subversion/subversion-0.32.1.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.32.1.ebuild,v 1.6 2004/09/06 18:56:00 ciaranm Exp $ - -inherit elisp-common libtool eutils - -BACKUP_ADMIN="svnadmin-0.27" -BACKUP_ADMIN_DIR="/usr/lib/subversion/bin" -DESCRIPTION="A compelling replacement for CVS" -SRC_URI="http://svn.collab.net/tarballs/${P}.tar.gz - mirror://gentoo/${BACKUP_ADMIN}.bz2" -HOMEPAGE="http://subversion.tigris.org/" - -SLOT="0" -LICENSE="Apache-1.1" -KEYWORDS="~x86 ~ppc" -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="/home/svn" -fi - -# -# -# Note that to disable the server part of subversion you need to specify -# USE="-berkdb" emerge subversion. -# -# - -DEPEND="python? ( >=dev-lang/python-2.0 ) - apache2? ( >=net-www/apache-2.0.47 ) - !apache2? ( !>=net-www/apache-2* ) - !dev-libs/apr - python? ( >=dev-lang/swig-1.3.16 ) - >=net-misc/neon-0.24.2 - berkdb? ( =sys-libs/db-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 - if has_version '<subversion-0.28.0'; then - einfo "" - ewarn ": Now you have $(best_version subversion)" - ewarn " Subversion had chaged the repository filesystem schema from 0.28.0." - ewarn " So you MUST dump your repositories before upgrading." - einfo "" - einfo "More details:" - einfo "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO" - epause 5 - fi -} - -src_unpack() { - cd ${WORKDIR} - unpack ${PN}-${PV}.tar.gz - cd ${S} - - patch -p1 <${FILESDIR}/subversion-db4.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 "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 - emacs -batch -f batch-byte-compile contrib/client-side/psvn/psvn.el - 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 - 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} 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}/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 - mv ${D}/usr/lib/svn-python/libsvn ${D}/usr/lib/python2.2/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 - if use berkdb; then - mkdir -p ${D}/${BACKUP_ADMIN_DIR} - cp ${DISTDIR}/${BACKUP_ADMIN}.bz2 ${D}${BACKUP_ADMIN_DIR} ||die - bunzip2 ${D}${BACKUP_ADMIN_DIR}/${BACKUP_ADMIN}.bz2 ||die - fi - - 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 - - if [ -x ${BACKUP_ADMIN} ]; then - ewarn "" - ewarn "The subversion database format has been changed. For that reason the" - ewarn "old admin utility was kept, and can now be found at the following" - ewarn "location: ${BACKUP_ADMIN}" - ewarn "" - ewarn "For more information look at:" - ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO" - 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 -} diff --git a/dev-util/subversion/subversion-1.0.8.ebuild b/dev-util/subversion/subversion-1.0.8.ebuild deleted file mode 100644 index 6ee72b21c49b..000000000000 --- a/dev-util/subversion/subversion-1.0.8.ebuild +++ /dev/null @@ -1,319 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.0.8.ebuild,v 1.8 2004/10/31 20:10:44 vapier Exp $ - -inherit elisp-common libtool python eutils - -DESCRIPTION="A compelling replacement for CVS" -SRC_URI="http://subversion.tigris.org/tarballs/${P}.tar.bz2" -HOMEPAGE="http://subversion.tigris.org/" - -SLOT="0" -LICENSE="Apache-1.1" -KEYWORDS="x86 sparc ppc amd64 alpha hppa" -IUSE="ssl apache2 berkdb python emacs perl java" - -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.21 - =dev-lang/swig-1.3.19 - ) ) - perl? ( !python? ( || ( =dev-lang/swig-1.3.21 - =dev-lang/swig-1.3.19 - ) ) - >=dev-lang/perl-5.8 ) - >=net-misc/neon-0.24.7 - berkdb? ( =sys-libs/db-4* - java? ( virtual/jdk ) ) - emacs? ( virtual/emacs )" - -DEPEND="${RDEPEND} - || ( - >=sys-devel/autoconf-2.59 - =sys-devel/autoconf-2.57* - ) - !=sys-devel/autoconf-2.58" - -pkg_setup() { - if has_version =sys-devel/autoconf-2.58*; then - die "Subversion WILL NOT BUILD with autoconf-2.58" - fi - - if use berkdb && 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. Specifying the apache2 useflag will also enable the building of" - einfo "the apache2 module." - fi -} - -src_unpack() { - cd ${WORKDIR} - unpack ${PN}-${PV}.tar.bz2 - cd ${S} - - epatch ${FILESDIR}/subversion-db4.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 "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" - use python || myconf="${myconf} --without-python" - - if use python || use perl; then - myconf="${myconf} --with-swig" - else - myconf="${myconf} --without-swig" - fi - - 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 berkdb; then - if use python; 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 - if use perl; then - make swig-pl-lib || die "Perl library building failed" - cd subversion/bindings/swig/perl - APR_CONFIG=/usr/bin/apr-config DESTDIR=${D} perl Makefile.PL - make all - cd ${S} - fi - if use java; then - cd ${S}/subversion/bindings/java/javahl - WANT_AUTOMAKE=1.6 WANT_AUTOCONF=2.53 ./autogen.sh - use apache2 && myconfj="--with-apxs=/usr/sbin/apxs2 \ - --with-apr=/usr --with-apr-util=/usr" - use apache2 || myconfj="" - econf ${myconfj} || die "Configuration failed" - make JAVACFLAGS="-source 1.3 -encoding iso8859-1" || die "Compilation failed" - cd ${S} - fi - fi - cd ${S} - 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 -} - - -src_install () { - use apache2 && mkdir -p ${D}/etc/apache2/conf - - python_version - PYTHON_DIR=/usr/lib/python${PYVER} - - 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 berkdb; then - 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" - # 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 - if use perl; then - make DESTDIR=${D} install-swig-pl-lib || die "Perl library building failed" - cd subversion/bindings/swig/perl - make DESTDIR=${D} install - cd ${S} - fi - if use java; then - cd ${S}/subversion/bindings/java/javahl - make DESTDIR="${D}" install || die "installation failed" - mkdir -p ${D}/usr/lib/svn-javahl/ - mv ${D}/usr/share/svn-javahl.jar ${D}/usr/lib/svn-javahl/ - cd ${S} - 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 useq apache2 && useq berkdb; 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 <path to ${PVR}.ebuild> config\" command" - einfo "or using svnadmin (see man svnadmin) if this subversion install is used as server" - 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() { - 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 [ -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 -} diff --git a/dev-util/subversion/subversion-1.1.0.ebuild b/dev-util/subversion/subversion-1.1.0.ebuild deleted file mode 100644 index 25e2579f8d5e..000000000000 --- a/dev-util/subversion/subversion-1.1.0.ebuild +++ /dev/null @@ -1,298 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.0.ebuild,v 1.10 2004/11/07 03:04:36 mr_bones_ Exp $ - -inherit elisp-common libtool python eutils - -DESCRIPTION="A compelling replacement for CVS" -SRC_URI="http://subversion.tigris.org/tarballs/${P/_rc/-rc}.tar.bz2" -HOMEPAGE="http://subversion.tigris.org/" - -SLOT="0" -LICENSE="Apache-1.1" -KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~alpha ~hppa ~ppc64 ~ia64" -IUSE="ssl apache2 berkdb python emacs perl java jikes" - -S=${WORKDIR}/${P/_rc/-rc} - -#Allow for custion repository locations -if [ "${SVN_REPOS_LOC}x" = "x" ]; then - SVN_REPOS_LOC="/var/svn" -fi - -RDEPEND="python? ( >=dev-lang/python-2.0 ) - apache2? ( >=net-www/apache-2.0.49 ) - !apache2? ( !>=net-www/apache-2* ) - !dev-libs/apr - python? ( || ( =dev-lang/swig-1.3.21 - =dev-lang/swig-1.3.19 - ) ) - perl? ( !python? ( || ( =dev-lang/swig-1.3.21 - =dev-lang/swig-1.3.19 - ) ) - >=dev-lang/perl-5.8 ) - >=net-misc/neon-0.24.7 - berkdb? ( =sys-libs/db-4* - java? ( virtual/jdk ) ) - emacs? ( virtual/emacs )" - -DEPEND="${RDEPEND} - || ( - >=sys-devel/autoconf-2.59 - =sys-devel/autoconf-2.57* - ) - !=sys-devel/autoconf-2.58" - -pkg_setup() { - if has_version =sys-devel/autoconf-2.58*; then - die "Subversion WILL NOT BUILD with autoconf-2.58" - fi - - if use berkdb && 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. Specifying the apache2 useflag will also enable the building of" - einfo "the apache2 module." - fi -} - -src_unpack() { - cd ${WORKDIR} - unpack ${P/_rc/-rc}.tar.bz2 || die "unpacking failed for some strange reason" - cd ${S} - - epatch ${FILESDIR}/subversion-db4.patch - epatch ${FILESDIR}/subversion-1.1.0-build.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 - - 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" - use python || myconf="${myconf} --without-python" - - if use java; then - myconf="${myconf} --enable-javahl" - use jikes && myconf="${myconf} --with-jikes=yes" - use jikes || myconf="${myconf} --without-jikes" - else - myconf="${myconf} --disable-javahl" - fi - - if use python || use perl; then - myconf="${myconf} --with-swig" - else - myconf="${myconf} --without-swig" - fi - - 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 - - if use python; then - #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 - fi - if use perl; then - 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 - - cd ${S} - 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 -} - - -src_install () { - use apache2 && mkdir -p ${D}/etc/apache2/conf - - python_version - PYTHON_DIR=/usr/lib/python${PYVER} - - 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 - - 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 - - dodoc BUGS COMMITTERS COPYING HACKING INSTALL README - dodoc CHANGES - dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl - cp -r tools/hook-scripts ${D}/usr/share/doc/${PF}/ - - # install documentation - 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 - - - - #Install apache module config - if useq 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 SVN_AUTHZ> - <IfModule !authz_svn_module.c> - LoadModule authz_svn_module extramodules/mod_authz_svn.so - </IfModule> - </IfDefine> -</IfDefine> -EOF - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen - 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 <path to ${PVR}.ebuild> config\" command" - einfo "or using svnadmin (see man svnadmin) if this subversion install is used as server" - 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 -} - -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 [ -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 -} diff --git a/dev-util/subversion/subversion-1.1.1-r1.ebuild b/dev-util/subversion/subversion-1.1.1-r2.ebuild index 8440dd530b02..9b9833484df0 100644 --- a/dev-util/subversion/subversion-1.1.1-r1.ebuild +++ b/dev-util/subversion/subversion-1.1.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.1-r1.ebuild,v 1.2 2004/11/12 16:50:54 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.1-r2.ebuild,v 1.1 2004/11/12 18:48:59 agriffis Exp $ inherit elisp-common libtool python eutils bash-completion @@ -222,6 +222,11 @@ EOF # 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 + insinto /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 + # # Past here is all documentation and examples # @@ -257,12 +262,12 @@ EOF } pkg_postinst() { - use emacs && elisp-site-regen - - einfo "Subversion Installation Notes" - einfo "-----------------------------" + 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:" @@ -274,15 +279,31 @@ pkg_postinst() { 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; then - einfo - 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\"" + 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 - 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 } diff --git a/dev-util/subversion/subversion-1.1.1.ebuild b/dev-util/subversion/subversion-1.1.1.ebuild deleted file mode 100644 index 532621a08335..000000000000 --- a/dev-util/subversion/subversion-1.1.1.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.1.ebuild,v 1.2 2004/11/09 16:29:44 agriffis Exp $ - -inherit elisp-common libtool python eutils - -DESCRIPTION="A compelling replacement for CVS" -SRC_URI="http://subversion.tigris.org/tarballs/${P/_rc/-rc}.tar.bz2" -HOMEPAGE="http://subversion.tigris.org/" - -SLOT="0" -LICENSE="Apache-1.1" -KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~alpha ~hppa ~ppc64 ~ia64" -IUSE="ssl apache2 berkdb python emacs perl java jikes" - -S=${WORKDIR}/${P/_rc/-rc} - -#Allow for custion repository locations -if [ "${SVN_REPOS_LOC}x" = "x" ]; then - SVN_REPOS_LOC="/var/svn" -fi - -RDEPEND="python? ( >=dev-lang/python-2.0 ) - apache2? ( >=net-www/apache-2.0.49 ) - !apache2? ( !>=net-www/apache-2* ) - !dev-libs/apr - python? ( || ( =dev-lang/swig-1.3.21 - =dev-lang/swig-1.3.19 - ) ) - perl? ( !python? ( || ( =dev-lang/swig-1.3.21 - =dev-lang/swig-1.3.19 - ) ) - >=dev-lang/perl-5.8 ) - >=net-misc/neon-0.24.7 - berkdb? ( =sys-libs/db-4* - java? ( virtual/jdk ) ) - emacs? ( virtual/emacs )" - -DEPEND="${RDEPEND} - || ( - >=sys-devel/autoconf-2.59 - =sys-devel/autoconf-2.57* - ) - !=sys-devel/autoconf-2.58" - -pkg_setup() { - if has_version =sys-devel/autoconf-2.58*; then - die "Subversion WILL NOT BUILD with autoconf-2.58" - fi - - if use berkdb && 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. Specifying the apache2 useflag will also enable the building of" - einfo "the apache2 module." - fi -} - -src_unpack() { - cd ${WORKDIR} - unpack ${P/_rc/-rc}.tar.bz2 || die "unpacking failed for some strange reason" - cd ${S} - - epatch ${FILESDIR}/subversion-db4.patch - epatch ${FILESDIR}/subversion-1.1.0-build.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 - - 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" - use python || myconf="${myconf} --without-python" - - if use java; then - myconf="${myconf} --enable-javahl" - use jikes && myconf="${myconf} --with-jikes=yes" - use jikes || myconf="${myconf} --without-jikes" - else - myconf="${myconf} --disable-javahl" - fi - - if use python || use perl; then - myconf="${myconf} --with-swig" - else - myconf="${myconf} --without-swig" - fi - - 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 - - if use python; then - #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 - fi - if use perl; then - 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 - - cd ${S} - 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 -} - - -src_install () { - use apache2 && mkdir -p ${D}/etc/apache2/conf - - python_version - PYTHON_DIR=/usr/lib/python${PYVER} - - 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 - - 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 - - dodoc BUGS COMMITTERS COPYING HACKING INSTALL README - dodoc CHANGES - dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl - cp -r tools/hook-scripts ${D}/usr/share/doc/${PF}/ - - # install documentation - 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 - - - - #Install apache module config - if useq 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 SVN_AUTHZ> - <IfModule !authz_svn_module.c> - LoadModule authz_svn_module extramodules/mod_authz_svn.so - </IfModule> - </IfDefine> -</IfDefine> -EOF - fi -} - -pkg_postinst() { - - use emacs && elisp-site-regen - 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 <path to ${PVR}.ebuild> config\" command" - einfo "or using svnadmin (see man svnadmin) if this subversion install is used as server" - 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 -} - -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 [ -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 -} |