From: Paul de Vrieze Date: Fri, 3 Dec 2004 10:04:39 +0000 (+0000) Subject: Disable jikes and fix a small bug in src_config X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ed46587f96fe76aa409a326557f00f9d659f97f;p=gentoo.git Disable jikes and fix a small bug in src_config --- diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index f69c5f321ed4..b39f624a6c77 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,14 @@ # 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.124 2004/11/30 09:08:34 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.125 2004/12/03 10:04:39 pauldv Exp $ + + 03 Dec 2004; subversion-1.1.1-r3.ebuild: + Fix a small bug in the config function, now checking for existence, not + file existene in the src_config function. Thanks to John Croisant + in bug #73186 for pointing this out. + + 03 Dec 2004; subversion-1.1.1-r3.ebuild: + Disable jikes for now as jikes is broken 30 Nov 2004; subversion-1.1.1-r3.ebuild: Mark stable diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index c51c3e088483..be4856717015 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -1,6 +1,6 @@ -MD5 8184e67765adbc6f1f017f81efecaa37 ChangeLog 21678 +MD5 96725720d2e68b87b76f85d67ccea83c ChangeLog 22051 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222 -MD5 331fdc507ed8cb72ead3f24015664a41 subversion-1.1.1-r3.ebuild 10909 +MD5 57a89f4ba00dec5949b2ec46c5aad92e subversion-1.1.1-r3.ebuild 10994 MD5 76fbed9ef27746928125c0403de48f6c subversion-1.0.9.ebuild 9589 MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136 MD5 53809180b5372b204b32db3962b409ba files/digest-subversion-1.1.1-r3 70 diff --git a/dev-util/subversion/subversion-1.1.1-r3.ebuild b/dev-util/subversion/subversion-1.1.1-r3.ebuild index 60c57cd4db43..f12fc8788e5e 100644 --- a/dev-util/subversion/subversion-1.1.1-r3.ebuild +++ b/dev-util/subversion/subversion-1.1.1-r3.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-r3.ebuild,v 1.3 2004/11/30 09:08:34 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.1-r3.ebuild,v 1.4 2004/12/03 10:04:39 pauldv Exp $ inherit elisp-common libtool python eutils bash-completion @@ -11,7 +11,7 @@ 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" +IUSE="ssl apache2 berkdb python emacs perl java" S=${WORKDIR}/${P/_rc/-rc} @@ -28,8 +28,9 @@ RDEPEND="apache2? ( >=net-www/apache-2.0.49 ) DEPEND="${RDEPEND} || ( >=sys-devel/autoconf-2.59 =sys-devel/autoconf-2.57* ) - !=sys-devel/autoconf-2.58 - jikes? (dev-java/jikes)" + !=sys-devel/autoconf-2.58" +# Does not work because jikes is broken +# jikes? (dev-java/jikes)" # Allow for custion repository locations. # This can't be in pkg_setup because the variable needs to be available to @@ -95,7 +96,8 @@ src_compile() { use apache2 || myconf="${myconf} --without-apxs" myconf="${myconf} $(use_enable java javahl)" - use java && myconf="${myconf} $(use_with jikes)" +# use java && myconf="${myconf} $(use_with jikes)" + use java && myconf="${myconf} --without-jikes" if use python || use perl; then myconf="${myconf} --with-swig" @@ -318,7 +320,7 @@ pkg_config() { fi einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..." - if [[ -f ${SVN_REPOS_LOC}/repos ]]; then + if [[ -e ${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