Fixing GCJ detect

Package-Manager: portage-2.0.53_rc7

diff --git a/dev-java/cairo-java/ChangeLog b/dev-java/cairo-java/ChangeLog
index f8ebacff3439333c827db6d4e5b36a4b7233e17a..8b3cf7c63eecd239e2ef635753909bb3d9ecff57 100644 (file)
--- a/dev-java/cairo-java/ChangeLog
+++ b/dev-java/cairo-java/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/cairo-java
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/ChangeLog,v 1.1 2005/11/12 23:34:27 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/ChangeLog,v 1.2 2005/11/15 03:44:46 compnerd Exp $
+
+  15 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  cairo-java-1.0.1.ebuild:
+  GCJ detection fix
 
 *cairo-java-1.0.1 (12 Nov 2005)
 

diff --git a/dev-java/cairo-java/Manifest b/dev-java/cairo-java/Manifest
index 2549feab62d128c080fb656308539978a393c166..25e1d59f29262e3a4abf1a3d6a07d3dbc5eb52e4 100644 (file)
--- a/dev-java/cairo-java/Manifest
+++ b/dev-java/cairo-java/Manifest
@@ -1,5 +1,5 @@
-MD5 11c23bed128884e03e8f0445e5d15781 ChangeLog 410
-MD5 e11ab769558e4f92111a3e6cb3460c33 cairo-java-1.0.1.ebuild 1979
+MD5 235b257a84c460613e04679d54b0b66a ChangeLog 514
+MD5 34677ef049df34f94b98850edc0119e7 cairo-java-1.0.1.ebuild 1998
 MD5 f629db15b5df144efde17453c0c98c34 files/cairo_jni_includes.patch 841
 MD5 a74a4781b3ab4f8d361c0b71dd4fae6d files/digest-cairo-java-1.0.1 68
 MD5 9fe190d25d088cdf4fd038710fd4ee93 metadata.xml 335

diff --git a/dev-java/cairo-java/cairo-java-1.0.1.ebuild b/dev-java/cairo-java/cairo-java-1.0.1.ebuild
index 69bd6507cf0ac94aa0c0de160fa58c122ce189bb..6be173a55494b7b5afbf014ea1f93e06200f8ec3 100644 (file)
--- a/dev-java/cairo-java/cairo-java-1.0.1.ebuild
+++ b/dev-java/cairo-java/cairo-java-1.0.1.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/cairo-java/cairo-java-1.0.1.ebuild,v 1.2 2005/11/13 00:00:29 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cairo-java/cairo-java-1.0.1.ebuild,v 1.3 2005/11/15 03:44:46 compnerd Exp $
 
 # Must be before the gnome.org inherit
 GNOME_TARBALL_SUFFIX="gz"
@@ -31,12 +31,14 @@ RDEPEND=">=virtual/jre-1.4
                 ${DEPS}"
 
 pkg_setup() {
-       if use gcj -a ! built_with_use sys-devel/gcc gcj ; then
-               ewarn
-               ewarn "You must build gcc with the gcj support to build with gcj"
-               ewarn
-               ebeep 5
-               die "No GCJ support found!"
+       if use gcj ; then
+               if ! built_with_use sys-devel/gcc gcj ; then
+                       ewarn
+                       ewarn "You must build gcc with the gcj support to build with gcj"
+                       ewarn
+                       ebeep 5
+                       die "No GCJ support found!"
+               fi
        fi
 }