* [gentoo-commits] gentoo-x86 commit in dev-util/subversion: ChangeLog metadata.xml subversion-1.4.6.ebuild subversion-1.4.4-r4.ebuild subversion-1.3.2-r4.ebuild
@ 2007-12-28 12:59 Benedikt Boehm (hollow)
0 siblings, 0 replies; only message in thread
From: Benedikt Boehm (hollow) @ 2007-12-28 12:59 UTC (permalink / raw
To: gentoo-commits
hollow 07/12/28 12:59:31
Modified: ChangeLog metadata.xml
Added: subversion-1.4.6.ebuild
Removed: subversion-1.4.4-r4.ebuild
subversion-1.3.2-r4.ebuild
Log:
version bump (fixes #128624, #203257 and maybe #199639, #200082); cleanup
(Portage version: 2.1.4_rc11)
Revision Changes Path
1.285 dev-util/subversion/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.285&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.285&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?r1=1.284&r2=1.285
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- ChangeLog 14 Nov 2007 01:17:20 -0000 1.284
+++ ChangeLog 28 Dec 2007 12:59:30 -0000 1.285
@@ -1,6 +1,15 @@
# ChangeLog for dev-util/subversion
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.284 2007/11/14 01:17:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.285 2007/12/28 12:59:30 hollow Exp $
+
+*subversion-1.4.6 (28 Dec 2007)
+
+ 28 Dec 2007; Benedikt Böhm <hollow@gentoo.org>
+ -files/subversion-1.3.2-neon-0.26.patch,
+ -files/subversion-1.4.3-neon-0.26.3.patch, metadata.xml,
+ -subversion-1.3.2-r4.ebuild, -subversion-1.4.4-r4.ebuild,
+ +subversion-1.4.6.ebuild:
+ version bump (fixes #128624, #203257 and maybe #199639, #200082); cleanup
14 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
subversion-1.4.5.ebuild:
1.4 dev-util/subversion/metadata.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/metadata.xml?r1=1.3&r2=1.4
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml 8 May 2007 07:37:12 -0000 1.3
+++ metadata.xml 28 Dec 2007 12:59:30 -0000 1.4
@@ -2,7 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>apache</herd>
- <maintainer>
- <email>pauldv@gentoo.org</email>
- </maintainer>
</pkgmetadata>
1.1 dev-util/subversion/subversion-1.4.6.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild?rev=1.1&content-type=text/plain
Index: subversion-1.4.6.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v 1.1 2007/12/28 12:59:30 hollow Exp $
inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
DESCRIPTION="A compelling replacement for CVS."
HOMEPAGE="http://subversion.tigris.org/"
SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2"
LICENSE="Subversion"
SLOT="0"
IUSE="apache2 berkdb debug doc emacs extras java nls nowebdav perl python ruby svnserve vim-syntax"
RESTRICT="test"
COMMONDEPEND=">=dev-libs/apr-util-1.2.8
berkdb? ( =sys-libs/db-4* )
doc? ( app-doc/doxygen )
emacs? ( virtual/emacs )
nls? ( sys-devel/gettext )
!nowebdav? ( >=net-misc/neon-0.26 )
ruby? ( >=dev-lang/ruby-1.8.2 dev-lang/swig )
perl? ( >=dev-lang/perl-5.8.8 dev-lang/swig )
python? ( >=dev-lang/python-2.0 dev-lang/swig )"
RDEPEND="${COMMONDEPEND}
java? ( >=virtual/jre-1.4 )
perl? ( dev-perl/URI )"
DEPEND="${COMMONDEPEND}
java? ( >=virtual/jdk-1.4 )
>=sys-devel/autoconf-2.59"
want_apache
S="${WORKDIR}"/${P/_rc/-rc}
# Allow for custom repository locations.
# This can't be in pkg_setup because the variable needs to be available to
# pkg_config.
: ${SVN_REPOS_LOC:=/var/svn}
pkg_setup() {
if use berkdb ; then
if ! built_with_use 'dev-libs/apr-util' berkdb ; then
eerror "dev-libs/apr-util is missing USE=berkdb"
die "dev-libs/apr-util is missing USE=berkdb"
fi
if has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]] ; then
echo
ewarn "Presently you have $(best_version dev-util/subversion) installed."
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 !*'
ewarn
ewarn "More details on dumping:"
ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
echo
die "Ensure that you dump your repository first"
fi
fi
java-pkg-opt-2_pkg_setup
}
src_unpack() {
unpack ${A}
cd "${S}"
# assure we don't use the included libs by accident
rm -Rf neon apr apr-util
epatch "${FILESDIR}"/subversion-1.4-db4.patch
epatch "${FILESDIR}"/subversion-1.1.1-perl-vendor.patch
epatch "${FILESDIR}"/subversion-hotbackup-config.patch
epatch "${FILESDIR}"/subversion-1.3.1-neon-config.patch
epatch "${FILESDIR}"/subversion-apr_cppflags.patch
epatch "${FILESDIR}"/subversion-1.4.3-debug-config.patch
sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.2\)"/\1 0.26.3 0.26.4"/' \
-i configure.in
sed -e "s:apr-config:$(apr_config):g" \
-e "s:apu-config:$(apu_config):g" \
-i build/ac-macros/{find_,}ap*
export WANT_AUTOCONF=2.5
autoconf
sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
elibtoolize
use emacs && cp "${FILESDIR}"/vc-svn.el "${S}"/contrib/client-side/vc-svn.el
}
src_compile() {
local myconf=
myconf="${myconf} $(use_enable java javahl)"
use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}"
if use python || use perl || use ruby ; then
myconf="${myconf} --with-swig"
else
myconf="${myconf} --without-swig"
fi
if use nowebdav ; then
myconf="${myconf} --without-neon"
else
myconf="${myconf} --with-neon=/usr"
fi
append-flags $(/usr/bin/$(apr_config) --cppflags)
econf ${myconf} \
--with-apr=/usr/bin/$(apr_config) \
--with-apr-util=/usr/bin/$(apu_config) \
$(use_with apache2 apxs ${APXS2}) \
$(use_with berkdb berkeley-db) \
$(use_enable debug maintainer-mode) \
$(use_enable nls) \
--disable-experimental-libtool \
--disable-mod-activation \
|| die "econf failed"
# Respect the user LDFLAGS
export SWIG_LDFLAGS="${LDFLAGS}"
# Build subversion, but do it in a way that is safe for parallel builds.
# Also apparently the included apr has 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.
( emake external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "Compilation of ${PN} failed"
if use python ; then
# Building fails without the apache apr-util as includes are wrong.
emake swig-py || die "Compilation of ${PN} Python bindings failed"
fi
if use perl ; then
# Work around a buggy Makefile.PL, bug 64634
mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
emake swig-pl || die "Compilation of ${PN} Perl bindings failed"
fi
if use ruby ; then
emake swig-rb || die "Compilation of ${PN} Ruby bindings 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 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "make javahl failed"
fi
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"
elisp-compile "${S}"/doc/svn-doc.el || die "emacs modules failed"
elisp-compile "${S}"/doc/tools/svnbook.el || die "emacs modules failed"
fi
if use doc ; then
doxygen doc/doxygen.conf || die "doxygen failed"
fi
}
src_install () {
python_version
PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
make DESTDIR="${D}" install || die "Installation of ${PN} failed"
if use python ; then
make DESTDIR="${D}" DISTUTIL_PARAM="--prefix=${D}" LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" install-swig-py \
|| die "Installation of ${PN} Python bindings failed"
# move python bindings
dodir "${PYTHON_DIR}/site-packages"
mv "${D}"/usr/$(get_libdir)/svn-python/svn "${D}${PYTHON_DIR}/site-packages"
mv "${D}"/usr/$(get_libdir)/svn-python/libsvn "${D}${PYTHON_DIR}/site-packages"
rm -Rf "${D}"/usr/$(get_libdir)/svn-python
fi
if use perl ; then
make DESTDIR="${D}" install-swig-pl || die "Installation of ${PN} Perl bindings failed"
fixlocalpod
fi
if use ruby ; then
make DESTDIR="${D}" install-swig-rb || die "Installation of ${PN} Ruby bindings failed"
fi
if use java ; then
make DESTDIR="${D}" install-javahl || die "make install-javahl failed"
java-pkg_regso "${D}"/usr/$(get_libdir)/libsvnjavahl*.so
java-pkg_dojar "${D}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
rm -Rf "${D}"/usr/$(get_libdir)/svn-javahl/*.jar
fi
# Install apache2 module config
if use apache2 ; then
MOD="${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"
dodir "${APACHE2_MODULES_CONFDIR}"
cat <<EOF >"${D}/${APACHE2_MODULES_CONFDIR}"/47_mod_dav_svn.conf
<IfDefine SVN>
<IfModule !mod_dav_svn.c>
LoadModule dav_svn_module ${MOD}/mod_dav_svn.so
</IfModule>
<IfDefine SVN_AUTHZ>
<IfModule !mod_authz_svn.c>
LoadModule authz_svn_module ${MOD}/mod_authz_svn.so
</IfModule>
</IfDefine>
# example configuration:
#<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
# Bug 43179 - Install bash-completion if user wishes
dobashcompletion tools/client-side/bash_completion subversion
rm -f tools/client-side/bash_completion
# Install hot backup script, bug 54304
newbin tools/backup/hot-backup.py svn-hot-backup
rm -fr tools/backup
# The svn_load_dirs script is installed by Debian and looks like a good
# candidate for us to install as well
if use perl ; then
newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
fi
rm -f contrib/client-side/svn_load_dirs.pl
# Install svnserve init-script and xinet.d snippet, bug 43245
if use svnserve; then
newinitd "${FILESDIR}"/svnserve.initd svnserve
if use apache2 ; then
newconfd "${FILESDIR}"/svnserve.confd svnserve
else
newconfd "${FILESDIR}"/svnserve.confd2 svnserve
fi
insinto /etc/xinetd.d
newins "${FILESDIR}"/svnserve.xinetd svnserve
fi
# Install documentation
dodoc BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README TRANSLATING
dodoc tools/xslt/svnindex.{css,xsl}
rm -fr tools/xslt
if use doc ; then
dohtml doc/doxygen/html/*
cp -R notes "${D}usr/share/doc/${PF}"
ecompressdir "/usr/share/doc/${PF}/notes"
fi
# Install Vim syntax files.
if use vim-syntax ; then
insinto /usr/share/vim/vimfiles/syntax
doins contrib/client-side/svn.vim
fi
rm -f contrib/client-side/svn.vim
# Install emacs lisps
if use emacs ; then
elisp-install ${PN} contrib/client-side/psvn/psvn.el*
elisp-install ${PN}/compat contrib/client-side/vc-svn.el*
elisp-install ${PN} doc/svn-doc.el*
elisp-install ${PN} doc/tools/svnbook.el*
touch "${D}${SITELISP}/${PN}/compat/.nosearch"
elisp-site-file-install "${FILESDIR}"/70svn-gentoo.el
fi
rm -fr contrib/client-side/psvn/
rm -f contrib/client-side/vc-svn.el*
# Install extra files
if use extras ; then
find contrib tools '(' -name "*.bat" -o -name "*.in" ')' -print0 | xargs -0 rm -f
rm -fr tools/{dev,po}
dodir "/usr/share/${PN}"
cp -R contrib tools "${D}usr/share/${PN}"
fi
}
pkg_preinst() {
# Compare versions of Berkeley DB.
if use berkdb && [[ -f "${ROOT}usr/bin/svn" ]] ; then
OLD_BDB_VERSION="$(scanelf -qn "${ROOT}usr/lib/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
NEW_BDB_VERSION="$(scanelf -qn "${D}usr/lib/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
CHANGED_BDB_VERSION=1
fi
fi
}
pkg_postinst() {
use emacs && elisp-site-regen
use perl && perl-module_pkg_postinst
elog "Subversion Server Notes"
elog "-----------------------"
elog
elog "If you intend to run a server, a repository needs to be created using"
elog "svnadmin (see man svnadmin) or the following command to create it in"
elog "${SVN_REPOS_LOC}:"
elog
elog " emerge --config =${CATEGORY}/${PF}"
elog
elog "Subversion has multiple server types, take your pick:"
elog
if use svnserve; then
elog " - svnserve daemon: "
elog " 1. edit /etc/conf.d/svnserve"
elog " 2. start daemon: /etc/init.d/svnserve start"
elog " 3. make persistent: rc-update add svnserve default"
elog
elog " - svnserve via xinetd:"
elog " 1. edit /etc/xinetd.d/svnserve (remove disable line)"
elog " 2. restart xinetd.d: /etc/init.d/xinetd restart"
elog
fi
elog " - svn over ssh:"
elog " 1. Fix the repository permissions:"
elog " groupadd svnusers"
elog " chown -R root:svnusers ${SVN_REPOS_LOC}/repos/"
elog " chmod -R g-w ${SVN_REPOS_LOC}/repos"
elog " chmod -R g+rw ${SVN_REPOS_LOC}/repos/db"
elog " chmod -R g+rw ${SVN_REPOS_LOC}/repos/locks"
elog " 2. create an svnserve wrapper in /usr/local/bin to set the umask you"
elog " want, for example:"
elog " #!/bin/bash"
elog " . /etc/conf.d/svnserve"
elog " umask 002"
elog " exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\""
elog
if use apache2; then
elog " - http-based server:"
elog " 1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
elog " 2. create an htpasswd file:"
elog " htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
elog
fi
elog "If you intend to use svn-hot-backup, you can specify the number of"
elog "backups to keep per repository by specifying an environment variable."
elog "If you want to keep e.g. 2 backups, do the following:"
elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
elog "echo 'SVN_HOTBACKUP_NUM_BACKUPS=2' >> /etc/env.d/80subversion"
elog
if [[ -n "${CHANGED_BDB_VERSION}" ]]; then
ewarn "You upgraded from an older version of Berkely DB and may experience"
ewarn "problems with your repository. Run the following commands as root to fix it:"
ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos"
ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
fi
}
pkg_postrm() {
use emacs && elisp-site-regen
use perl && perl-module_pkg_postrm
}
pkg_config() {
if [[ ! -x "${ROOT}usr/bin/svnadmin" ]] ; then
die "You seem to only have built the Subversion client"
fi
einfo ">>> Initializing the database in ${ROOT}${SVN_REPOS_LOC} ..."
if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]] ; then
echo "A subversion repository already exists and I will not overwrite it."
echo "Delete ${ROOT}${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
else
mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf"
einfo ">>> Populating repository directory ..."
# create initial repository
"${ROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
einfo ">>> Setting repository permissions ..."
if use svnserve; then
SVNSERVE_USER="$(. ${ROOT}etc/conf.d/svnserve ; echo ${SVNSERVE_USER})"
SVNSERVE_GROUP="$(. ${ROOT}etc/conf.d/svnserve ; echo ${SVNSERVE_GROUP})"
fi
if use apache2 ; then
[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
else
[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
enewgroup "${SVNSERVE_GROUP}"
enewuser "${SVNSERVE_USER}" -1 -1 ${SVN_REPOS_LOC} "${SVNSERVE_GROUP}"
fi
chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos"
chmod -Rf 755 "${ROOT}${SVN_REPOS_LOC}/repos"
fi
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-12-28 12:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-28 12:59 [gentoo-commits] gentoo-x86 commit in dev-util/subversion: ChangeLog metadata.xml subversion-1.4.6.ebuild subversion-1.4.4-r4.ebuild subversion-1.3.2-r4.ebuild Benedikt Boehm (hollow)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox