Remove some unused Java-related flags.

9 files changed, 20 insertions, 43 deletions

diff --git a/profiles/default/bsd/ChangeLog b/profiles/default/bsd/ChangeLog
index 26be83646f57..238588219209 100644
--- a/profiles/default/bsd/ChangeLog
+++ b/profiles/default/bsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.175 2015/04/05 14:49:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/ChangeLog,v 1.176 2015/06/20 21:55:22 chewi Exp $
+
+  20 Jun 2015; James Le Cuirot <chewi@gentoo.org>
+  fbsd/amd64/10.1/make.defaults, fbsd/amd64/9.1/make.defaults,
+  fbsd/amd64/9.2/make.defaults, fbsd/package.use.mask, fbsd/use.force,
+  fbsd/x86/10.1/make.defaults, fbsd/x86/9.1/make.defaults,
+  fbsd/x86/9.2/make.defaults:
+  Remove some unused Java-related flags.
 
   05 Apr 2015; Michał Górny <mgorny@gentoo.org>
   +fbsd/amd64/9.1/clang/deprecated, +fbsd/amd64/9.1/deprecated,
diff --git a/profiles/default/bsd/fbsd/amd64/10.1/make.defaults b/profiles/default/bsd/fbsd/amd64/10.1/make.defaults
index e072d9b9445e..4cfb9af53d6f 100644
--- a/profiles/default/bsd/fbsd/amd64/10.1/make.defaults
+++ b/profiles/default/bsd/fbsd/amd64/10.1/make.defaults
@@ -1,11 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/10.1/make.defaults,v 1.1 2015/03/01 18:25:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/10.1/make.defaults,v 1.2 2015/06/20 21:55:23 chewi Exp $
 
 CHOST="x86_64-gentoo-freebsd10.1"
 CHOST_amd64_fbsd="x86_64-gentoo-freebsd10.1"
 CHOST_x86_fbsd="i686-gentoo-freebsd10.1"
-
-# Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
-# Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="java6"
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/make.defaults b/profiles/default/bsd/fbsd/amd64/9.1/make.defaults
index 640042cf11e0..88a4f52911ac 100644
--- a/profiles/default/bsd/fbsd/amd64/9.1/make.defaults
+++ b/profiles/default/bsd/fbsd/amd64/9.1/make.defaults
@@ -1,11 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/make.defaults,v 1.1 2012/08/07 20:52:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/make.defaults,v 1.2 2015/06/20 21:55:23 chewi Exp $
 
 CHOST="x86_64-gentoo-freebsd9.1"
 CHOST_amd64_fbsd="x86_64-gentoo-freebsd9.1"
 CHOST_x86_fbsd="i686-gentoo-freebsd9.1"
-
-# Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
-# Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="java6"
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/make.defaults b/profiles/default/bsd/fbsd/amd64/9.2/make.defaults
index 8c8009f8a229..f548cc811adc 100644
--- a/profiles/default/bsd/fbsd/amd64/9.2/make.defaults
+++ b/profiles/default/bsd/fbsd/amd64/9.2/make.defaults
@@ -1,11 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/make.defaults,v 1.1 2013/08/09 14:11:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/make.defaults,v 1.2 2015/06/20 21:55:23 chewi Exp $
 
 CHOST="x86_64-gentoo-freebsd9.2"
 CHOST_amd64_fbsd="x86_64-gentoo-freebsd9.2"
 CHOST_x86_fbsd="i686-gentoo-freebsd9.2"
-
-# Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
-# Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="java6"
diff --git a/profiles/default/bsd/fbsd/package.use.mask b/profiles/default/bsd/fbsd/package.use.mask
index 3a2a7513ac65..61317d30a80d 100644
--- a/profiles/default/bsd/fbsd/package.use.mask
+++ b/profiles/default/bsd/fbsd/package.use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/package.use.mask,v 1.39 2014/07/07 01:44:52 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/package.use.mask,v 1.40 2015/06/20 21:55:23 chewi Exp $
 
 # As per UberLord's requests
 sys-apps/openrc pam
@@ -70,10 +70,6 @@ app-emulation/wine capi
 # Masked because kerberos is masked
 net-dns/bind gssapi
 
-# Naohiro Aota <naota@gentoo.org> (13 Dec 2011)
-# Masked because sun-j2me-bin does not support BSD
-dev-java/proguard j2me
-
 # Naohiro Aota <naota@gentoo.org> (20 Feb 2012)
 # Ian Stakenvicius <axs@gentoo.org> (30 Apr 2014)
 # Upstream does not support FreeBSD wifi nor crashreporter;
diff --git a/profiles/default/bsd/fbsd/use.force b/profiles/default/bsd/fbsd/use.force
index d221d0ea5cd1..c6a65ae2eb1e 100644
--- a/profiles/default/bsd/fbsd/use.force
+++ b/profiles/default/bsd/fbsd/use.force
@@ -1,5 +1,3 @@
-java5
-
 # Force freebsd-specific variables
 elibc_FreeBSD
 kernel_FreeBSD
diff --git a/profiles/default/bsd/fbsd/x86/10.1/make.defaults b/profiles/default/bsd/fbsd/x86/10.1/make.defaults
index 21050e578e0b..15461bcbb06c 100644
--- a/profiles/default/bsd/fbsd/x86/10.1/make.defaults
+++ b/profiles/default/bsd/fbsd/x86/10.1/make.defaults
@@ -1,9 +1,5 @@
 # Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/10.1/make.defaults,v 1.1 2015/03/01 18:25:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/10.1/make.defaults,v 1.2 2015/06/20 21:55:23 chewi Exp $
 
 CHOST="i486-gentoo-freebsd10.1"
-
-# Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
-# Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="java6"
diff --git a/profiles/default/bsd/fbsd/x86/9.1/make.defaults b/profiles/default/bsd/fbsd/x86/9.1/make.defaults
index ee43dab8846c..2ab8c70b6e10 100644
--- a/profiles/default/bsd/fbsd/x86/9.1/make.defaults
+++ b/profiles/default/bsd/fbsd/x86/9.1/make.defaults
@@ -1,9 +1,5 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/9.1/make.defaults,v 1.1 2012/08/07 20:52:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/9.1/make.defaults,v 1.2 2015/06/20 21:55:23 chewi Exp $
 
 CHOST="i486-gentoo-freebsd9.1"
-
-# Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
-# Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="java6"
diff --git a/profiles/default/bsd/fbsd/x86/9.2/make.defaults b/profiles/default/bsd/fbsd/x86/9.2/make.defaults
index 4a225ae4e519..e21dd076d950 100644
--- a/profiles/default/bsd/fbsd/x86/9.2/make.defaults
+++ b/profiles/default/bsd/fbsd/x86/9.2/make.defaults
@@ -1,9 +1,5 @@
-# Copyright 1999-2012 Gentoo Foundation.
+# Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/9.2/make.defaults,v 1.1 2013/08/09 14:12:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/x86/9.2/make.defaults,v 1.2 2015/06/20 21:55:23 chewi Exp $
 
 CHOST="i486-gentoo-freebsd9.2"
-
-# Diego Pettenò <flameeyes@gentoo.org> (2 Dec 2006)
-# Turn this on by default as we don't have Java 1.4 and 1.5 at all
-USE="java6"