From 8af2bab17f3349db70e323b2e75859aabfc8e839 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 22 Nov 2012 04:02:40 +0000
Subject: drop libjava multilib patch since we do not enable/disable this lib
 independently of the multilib flag -- either you get all of multilib, or you
 get none of it.  if you do not want java, then do not USE=gcj.

---
 4.6.3/gentoo/03_all_java-nomulti.patch | 44 ----------------------------------
 4.6.3/gentoo/README.history            |  3 +++
 2 files changed, 3 insertions(+), 44 deletions(-)
 delete mode 100644 4.6.3/gentoo/03_all_java-nomulti.patch

(limited to '4.6.3')

diff --git a/4.6.3/gentoo/03_all_java-nomulti.patch b/4.6.3/gentoo/03_all_java-nomulti.patch
deleted file mode 100644
index 5fce8b2..0000000
--- a/4.6.3/gentoo/03_all_java-nomulti.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/libjava/configure
-+++ b/libjava/configure
-@@ -1618,6 +1618,8 @@ Optional Features:
-                           default=yes
-   --enable-java-maintainer-mode
-                           allow rebuilding of .class and .h files
-+  --enable-libjava-multilib
-+                          build libjava as multilib
-   --disable-dependency-tracking  speeds up one-time build
-   --enable-dependency-tracking   do not reject slow dependency extractors
-   --enable-maintainer-mode  enable make rules and dependencies not useful
-@@ -3361,6 +3363,16 @@ else
- fi
- 
- 
-+# Check whether --enable-libjava-multilib was given.
-+if test "${enable_libjava_multilib+set}" = set; then
-+  enableval=$enable_libjava_multilib;
-+fi
-+
-+if test "$enable_libjava_multilib" = no; then
-+  multilib=no
-+  ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- 
- 
---- a/libjava/configure.ac
-+++ b/libjava/configure.ac
-@@ -139,6 +139,13 @@ AC_ARG_ENABLE(java-maintainer-mode,
- 	[allow rebuilding of .class and .h files]))
- AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
- 
-+AC_ARG_ENABLE(libjava-multilib,
-+	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
-+if test "$enable_libjava_multilib" = no; then
-+  multilib=no
-+  ac_configure_args="$ac_configure_args --disable-multilib"
-+fi
-+
- # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
- GCC_NO_EXECUTABLES
- 
diff --git a/4.6.3/gentoo/README.history b/4.6.3/gentoo/README.history
index c84886d..62ad1c1 100644
--- a/4.6.3/gentoo/README.history
+++ b/4.6.3/gentoo/README.history
@@ -1,3 +1,6 @@
+1.8		[pending]
+	- 03_all_java-nomulti.patch
+
 1.7		27 Sep 2011
 	+ 15_all_libgfortran-Werror.patch
 
-- 
cgit v1.2.3-65-gdbad