summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@gentoo.org>2005-05-22 06:34:45 +0000
committerSaleem Abdulrasool <compnerd@gentoo.org>2005-05-22 06:34:45 +0000
commitf9a71f5dd320a4fbe6bb6d93fb608b07abd3630a (patch)
tree2c5980b0b6cc70cb13fac9a35a4f6c8a5d755137
parentset HOMEPAGE to something clickable (diff)
downloadgentoo-2-f9a71f5dd320a4fbe6bb6d93fb608b07abd3630a.tar.gz
gentoo-2-f9a71f5dd320a4fbe6bb6d93fb608b07abd3630a.tar.bz2
gentoo-2-f9a71f5dd320a4fbe6bb6d93fb608b07abd3630a.zip
Fixing unconditional dependency on jikes from revbump
(Portage version: 2.0.51.22-r1)
-rw-r--r--dev-java/gnu-classpath/ChangeLog6
-rw-r--r--dev-java/gnu-classpath/Manifest14
-rw-r--r--dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild20
3 files changed, 13 insertions, 27 deletions
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 20fc373b8a2c..88bce73358d3 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/gnu-classpath
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.31 2005/05/21 16:50:17 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.32 2005/05/22 06:34:45 compnerd Exp $
+
+ 22 May 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+ gnu-classpath-0.15-r1.ebuild:
+ Fixing unconditional dep on jikes introduced in -r1
*gnu-classpath-0.15-r1 (21 May 2005)
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 8175de1871aa..3a7b1b76772d 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 13fb5597ef24b6b3c85d32659a8fc7bc gnu-classpath-0.15-r1.ebuild 1664
+MD5 05d215c289b3147ca89b25a1254dbe54 gnu-classpath-0.15-r1.ebuild 1666
MD5 a54bef82be228fcad143d0f549eaa6aa gnu-classpath-0.13.ebuild 1279
MD5 9275d3f3eaf2c62c635e4aacf4d0e834 gnu-classpath-0.15.ebuild 1282
MD5 1b1e24effad7122902de9ccd4f395d90 gnu-classpath-0.14.ebuild 1282
-MD5 5cffdcee6b74bb973fdb522631b65950 ChangeLog 4354
+MD5 8460a3c356c444199de05b8a06d4caa6 ChangeLog 4497
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
MD5 2690159fdd3e679de05cd6daed73f4da files/digest-gnu-classpath-0.15-r1 67
MD5 44f281c7cf47c19fe1359a1ebda60db5 files/digest-gnu-classpath-0.13 67
MD5 9b2c43cfbb9e8d325407a9ddd2068a5d files/digest-gnu-classpath-0.14 67
MD5 2690159fdd3e679de05cd6daed73f4da files/digest-gnu-classpath-0.15 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCj2bo06ebR+OMO78RAi6uAKCNyiOPs9BmE2jVbOXdbWM455oA7QCfQnGh
-wPBIDYP2TJoyZEwLpgPPDBo=
-=7vHT
------END PGP SIGNATURE-----
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild
index 04dc0acf7cd7..d3d78b61a350 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild,v 1.1 2005/05/21 16:50:17 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild,v 1.2 2005/05/22 06:34:45 compnerd Exp $
DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java programming language"
SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-${PV}.tar.gz"
@@ -12,17 +12,10 @@ KEYWORDS="~x86 ~sparc ~ppc ~amd64"
IUSE="cairo jikes gtk xml2"
DEPEND="app-arch/zip
- dev-java/jikes"
-RDEPEND="cairo? ( >=x11-libs/cairo-0.3 )
- gtk? (
- media-libs/gdk-pixbuf
- >=x11-libs/gtk+-2
- >=media-libs/libart_lgpl-2.1
- )
- xml2? (
- >=dev-libs/libxml2-2.6.8
- >=dev-libs/libxslt-1.1.11
- )"
+ jikes? ( dev-java/jikes )"
+RDEPEND="cairo? ( >=x11-libs/cairo-0.3.0 )
+ gtk? ( >=x11-libs/gtk+-2 >=media-libs/libart_lgpl-2.1 media-libs/gdk-pixbuf )
+ xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
S=${WORKDIR}/classpath-${PV}
@@ -34,8 +27,7 @@ src_compile() {
# portage.
local compiler="--with-jikes"
- econf \
- ${compiler} \
+ econf ${compiler} \
$(use_enable cairo gtk-cairo) \
$(use_enable gtk gtk-peer) \
$(use_enable xml2 xmlj) \