Fixing GCJ detection

Package-Manager: portage-2.0.53_rc7

12 files changed, 60 insertions, 36 deletions

diff --git a/dev-java/libgconf-java/ChangeLog b/dev-java/libgconf-java/ChangeLog
index 79995183445e..da17b26ff896 100644
--- a/dev-java/libgconf-java/ChangeLog
+++ b/dev-java/libgconf-java/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/libgconf-java
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/ChangeLog,v 1.9 2005/11/12 23:45:49 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/ChangeLog,v 1.10 2005/11/15 03:54:59 compnerd Exp $
+
+  15 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  libgconf-java-2.12.1.ebuild:
+  Fixing up GCJ detection
 
 *libgconf-java-2.12.1 (12 Nov 2005)
 
diff --git a/dev-java/libgconf-java/Manifest b/dev-java/libgconf-java/Manifest
index 360a23b37390..cefe8f1379f9 100644
--- a/dev-java/libgconf-java/Manifest
+++ b/dev-java/libgconf-java/Manifest
@@ -6,6 +6,6 @@ MD5 4028a5325b5787c89a1eceddb66bc437 files/libgconf-java-2.10.0_fix-install-dir.
 MD5 03c4b5ccb943b51e5259e5046ff30719 files/libgconf-java-2.8.2_gentoo-PN-SLOT.patch 994
 MD5 073d974cdf39c3e94b0da21e0b2e9231 files/libgconf-java-2.8.3.1_gentoo-PN-SLOT.patch 508
 MD5 48b501573839b1a057b784392842ecc8 libgconf-java-2.10.1.ebuild 2277
-MD5 f7b55aa8c18448b678158a40d322184d libgconf-java-2.12.1.ebuild 1792
+MD5 7993ef8a0948e405d563bb94c7a04102 libgconf-java-2.12.1.ebuild 1811
 MD5 d172708ae5e53ab4f75b1c3eabc95712 libgconf-java-2.8.3.1.ebuild 2912
 MD5 7fb48767f052a6a6dee17d585c1cbd32 metadata.xml 1142
diff --git a/dev-java/libgconf-java/libgconf-java-2.12.1.ebuild b/dev-java/libgconf-java/libgconf-java-2.12.1.ebuild
index 04dd8fddda7b..de17e968ddac 100644
--- a/dev-java/libgconf-java/libgconf-java-2.12.1.ebuild
+++ b/dev-java/libgconf-java/libgconf-java-2.12.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/libgconf-java/libgconf-java-2.12.1.ebuild,v 1.2 2005/11/13 00:06:25 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgconf-java/libgconf-java-2.12.1.ebuild,v 1.3 2005/11/15 03:54:59 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
 }
 
diff --git a/dev-java/libglade-java/ChangeLog b/dev-java/libglade-java/ChangeLog
index 6d0b1009d464..0e52409f1866 100644
--- a/dev-java/libglade-java/ChangeLog
+++ b/dev-java/libglade-java/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/libglade-java
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/ChangeLog,v 1.10 2005/11/12 23:43:16 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/ChangeLog,v 1.11 2005/11/15 03:53:21 compnerd Exp $
+
+  15 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  libglade-java-2.12.1.ebuild:
+  Fixing GCJ detection
 
 *libglade-java-2.12.1 (12 Nov 2005)
 
diff --git a/dev-java/libglade-java/Manifest b/dev-java/libglade-java/Manifest
index 2054967275ca..afb97a592f62 100644
--- a/dev-java/libglade-java/Manifest
+++ b/dev-java/libglade-java/Manifest
@@ -7,6 +7,6 @@ MD5 c068d53842b2d7d7efdca61acf5d72ca files/libglade-java-2.8.2_gentoo-PN-SLOT.pa
 MD5 7ac5fbc0483956edf0634e70b501ce1a files/libglade-java-2.8.2_signal-connection-fix.patch 630
 MD5 7ca0226e8641ea6429ce47f0d1cc1bde files/libglade-java-2.8.3.1_gentoo-PN-SLOT.patch 508
 MD5 30c5218eed8bad631361d05b99348f79 libglade-java-2.10.1.ebuild 2808
-MD5 1507d6c3978e28aa65ced6590a2c37bb libglade-java-2.12.1.ebuild 1872
+MD5 388ef3e8528291ae2f9f5f0cf5c11e86 libglade-java-2.12.1.ebuild 1891
 MD5 3d7aa8d97e0886161e0fb14447b73757 libglade-java-2.8.3.1.ebuild 3261
 MD5 84e24b210bedf1c21ac6137a4ed60f84 metadata.xml 1405
diff --git a/dev-java/libglade-java/libglade-java-2.12.1.ebuild b/dev-java/libglade-java/libglade-java-2.12.1.ebuild
index b2480253dac2..2f8f7169f826 100644
--- a/dev-java/libglade-java/libglade-java-2.12.1.ebuild
+++ b/dev-java/libglade-java/libglade-java-2.12.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/libglade-java/libglade-java-2.12.1.ebuild,v 1.2 2005/11/13 00:05:27 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libglade-java/libglade-java-2.12.1.ebuild,v 1.3 2005/11/15 03:53:21 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
 }
 
diff --git a/dev-java/libgnome-java/ChangeLog b/dev-java/libgnome-java/ChangeLog
index 63dd1219c46b..173dc8f9e4b1 100644
--- a/dev-java/libgnome-java/ChangeLog
+++ b/dev-java/libgnome-java/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/libgnome-java
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.12 2005/11/12 23:40:45 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/ChangeLog,v 1.13 2005/11/15 03:51:14 compnerd Exp $
+
+  15 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  libgnome-java-2.12.1.ebuild:
+  Fixing GCJ detection
 
 *libgnome-java-2.12.1 (12 Nov 2005)
 
diff --git a/dev-java/libgnome-java/Manifest b/dev-java/libgnome-java/Manifest
index 5c694ce2b54d..49b722aa294f 100644
--- a/dev-java/libgnome-java/Manifest
+++ b/dev-java/libgnome-java/Manifest
@@ -6,6 +6,6 @@ MD5 6ab1ec4f4e7665d6f1e73d04e5ffea0d files/libgnome-java-2.10.0_fix-install-dir.
 MD5 b5f8aad83ed35026438574e04a3122ac files/libgnome-java-2.8.2_gentoo-PN-SLOT.patch 1310
 MD5 d8bbcf350e68bf0a42c37ecbef32c8dd files/libgnome-java-2.8.3.1_gentoo-PN-SLOT.patch 508
 MD5 677f2ff3ed6ec775266bf63bf1f2987d libgnome-java-2.10.1.ebuild 2725
-MD5 2fe6e14ebf70365e97f702fcb8040c4f libgnome-java-2.12.1.ebuild 1858
+MD5 2e3dba92502e47dfd7537ffbf12de8d2 libgnome-java-2.12.1.ebuild 1877
 MD5 acbe31cfb56cfba1a61ab0197a594370 libgnome-java-2.8.3.1.ebuild 3062
 MD5 fb1bed94b41f514c97fb402200db1eec metadata.xml 1102
diff --git a/dev-java/libgnome-java/libgnome-java-2.12.1.ebuild b/dev-java/libgnome-java/libgnome-java-2.12.1.ebuild
index 4862474ac2c5..6e434ec5ac6c 100644
--- a/dev-java/libgnome-java/libgnome-java-2.12.1.ebuild
+++ b/dev-java/libgnome-java/libgnome-java-2.12.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/libgnome-java/libgnome-java-2.12.1.ebuild,v 1.2 2005/11/13 00:04:12 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgnome-java/libgnome-java-2.12.1.ebuild,v 1.3 2005/11/15 03:51:14 compnerd Exp $
 
 # Must be before the gnome.org inherit
 GNOME_TARBALL_SUFFIX="gz"
@@ -32,12 +32,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
 }
 
diff --git a/dev-java/libgtk-java/ChangeLog b/dev-java/libgtk-java/ChangeLog
index faaf4a66a0e6..7fed497772cb 100644
--- a/dev-java/libgtk-java/ChangeLog
+++ b/dev-java/libgtk-java/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/libgtk-java
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.11 2005/11/12 23:37:57 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/ChangeLog,v 1.12 2005/11/15 03:47:54 compnerd Exp $
+
+  15 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
+  libgtk-java-2.8.1.ebuild:
+  Fixing GCJ detection
 
 *libgtk-java-2.8.1 (12 Nov 2005)
 
diff --git a/dev-java/libgtk-java/Manifest b/dev-java/libgtk-java/Manifest
index 7878cb176d77..a87bd087867b 100644
--- a/dev-java/libgtk-java/Manifest
+++ b/dev-java/libgtk-java/Manifest
@@ -15,5 +15,5 @@ MD5 4130379b76854eac4060c133f20a765d files/libgtk-java-2.4.8.1_gentoo-PN-SLOT.pa
 MD5 894895a802ebec44935045bc8f800c2f libgtk-java-2.4.8.1.ebuild 3350
 MD5 b022186c8e04efb63e91009731c12120 libgtk-java-2.4.9.ebuild 2892
 MD5 856b0e851f16dddc9002d7e1ee2c603e libgtk-java-2.6.2-r1.ebuild 2820
-MD5 f6a2d8e602d96ed4f62d7bbacc20fafe libgtk-java-2.8.1.ebuild 2085
+MD5 822a3b6100eebe9d55401c77c472e013 libgtk-java-2.8.1.ebuild 2104
 MD5 8d139287f93dc4241b670299688f0ae0 metadata.xml 1075
diff --git a/dev-java/libgtk-java/libgtk-java-2.8.1.ebuild b/dev-java/libgtk-java/libgtk-java-2.8.1.ebuild
index 42d875c2403a..4bebb73389b7 100644
--- a/dev-java/libgtk-java/libgtk-java-2.8.1.ebuild
+++ b/dev-java/libgtk-java/libgtk-java-2.8.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/libgtk-java/libgtk-java-2.8.1.ebuild,v 1.2 2005/11/13 00:03:17 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libgtk-java/libgtk-java-2.8.1.ebuild,v 1.3 2005/11/15 03:47:54 compnerd Exp $
 
 # Must be before the gnome.org inherit
 GNOME_TARBALL_SUFFIX="gz"
@@ -32,12 +32,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
 }