summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/subversion/ChangeLog5
-rw-r--r--dev-util/subversion/Manifest12
-rw-r--r--dev-util/subversion/subversion-0.31.0.ebuild15
3 files changed, 22 insertions, 10 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 332d9454a5e4..24b292fb1f0c 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,9 @@
# 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.38 2003/10/17 19:57:04 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.39 2003/10/22 19:55:29 pauldv Exp $
+
+ 22 Oct 2003; <paul@gentoo.org> subversion-0.31.0.ebuild:
+ Hopefully fix linking issues by taking back some older ebuild code
*subversion-0.28.0 (17 Oct 2003)
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index a3a11533443d..6d5aa6e87005 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,12 +1,12 @@
-MD5 ba66d39ce144753e0b58c50cdfd16f39 ChangeLog 6780
-MD5 f9ff39f6bfa10175352d543164009e78 subversion-0.28.0.ebuild 8033
-MD5 5beb0e419efb23ad3ddf0332fadb63ea subversion-0.27.0.ebuild 7887
MD5 08cce066639ea61a3d84f937e9c3ae00 subversion-0.30.0.ebuild 7572
-MD5 742b4f0fac4e90e377f0dd80f1c625f2 subversion-0.31.0.ebuild 7942
+MD5 5beb0e419efb23ad3ddf0332fadb63ea subversion-0.27.0.ebuild 7887
+MD5 3e2b7510b9bd2c114db99887dd2a4f91 subversion-0.31.0.ebuild 8279
+MD5 f9ff39f6bfa10175352d543164009e78 subversion-0.28.0.ebuild 8033
+MD5 360d05cfd37a1aa6a193562dc161e701 ChangeLog 6909
MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
MD5 e232822bee0a8ed00f6b9d7805b83307 files/digest-subversion-0.27.0 132
-MD5 72aa5ab58a4d6274b6035ce3370e5c3f files/subversion-db4.patch 556
-MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
MD5 c055aef559559580f75e60ede5051e79 files/digest-subversion-0.28.0 130
MD5 c239e1be5d94572ff970508d3ac8f9b0 files/digest-subversion-0.30.0 135
MD5 86365b02198a65328b2f189759d9e3d3 files/digest-subversion-0.31.0 132
+MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
+MD5 72aa5ab58a4d6274b6035ce3370e5c3f files/subversion-db4.patch 556
diff --git a/dev-util/subversion/subversion-0.31.0.ebuild b/dev-util/subversion/subversion-0.31.0.ebuild
index 391f53dee59a..35517c3ac51f 100644
--- a/dev-util/subversion/subversion-0.31.0.ebuild
+++ b/dev-util/subversion/subversion-0.31.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.31.0.ebuild,v 1.3 2003/10/12 14:45:39 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.31.0.ebuild,v 1.4 2003/10/22 19:55:29 pauldv Exp $
inherit elisp-common libtool
@@ -100,6 +100,7 @@ src_compile() {
econf ${myconf} \
--with-neon=/usr \
+ --disable-experimental-libtool \
--disable-mod-activation ||die "configuration failed"
@@ -107,13 +108,21 @@ src_compile() {
# 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
- ( emake external-all && emake local-all ) || die "make of subversion failed"
+ 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
- emake swig-py || die "subversion python bindings failed"
+ 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