From 33715bb64117307f373fd0031d9b0792d88d54df Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@gentoo.org>
Date: Tue, 15 Nov 2005 03:44:46 +0000
Subject: [PATCH] Fixing GCJ detect Package-Manager: portage-2.0.53_rc7

---
 dev-java/cairo-java/ChangeLog               |  6 +++++-
 dev-java/cairo-java/Manifest                |  4 ++--
 dev-java/cairo-java/cairo-java-1.0.1.ebuild | 16 +++++++++-------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/dev-java/cairo-java/ChangeLog b/dev-java/cairo-java/ChangeLog
index f8ebacff3439..8b3cf7c63eec 100644
--- 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 2549feab62d1..25e1d59f2926 100644
--- 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 69bd6507cf0a..6be173a55494 100644
--- 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
 }
 
-- 
2.26.2