dev-java/icedtea-web: Remove unnecessary lib checks, closes #574286

Also tighten the glib dependency.

Package-Manager: portage-2.2.27

3 files changed, 42 insertions, 12 deletions

diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch
index 1d03b7c4fd16..551bb9c4ef0b 100644
--- a/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch
+++ b/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch
@@ -1,18 +1,27 @@
 --- Makefile.am.orig	2015-09-11 14:02:04.245280051 +0100
-+++ Makefile.am	2015-12-18 21:37:43.328862431 +0000
-@@ -344,7 +344,7 @@
- $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
- 	mkdir -p $(PLUGIN_DIR) && \
++++ Makefile.am.orig	2016-01-27 22:20:28.288032089 +0000
+@@ -362,7 +362,7 @@ 
+ 
+ $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
  	cd $(PLUGIN_DIR) && \
 -	$(CXX) $(CXXFLAGS) \
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) \
- 	   $(DEFS) $(VERSION_DEFS) \
- 	  -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
- 	  -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
-@@ -362,7 +362,7 @@
+ 	  $(PLUGIN_OBJECTS) \
+ 	  $(GLIB_LIBS) \
+ 	  $(MOZILLA_LIBS) \
+@@ -419,7 +419,7 @@ 
+ 
+ $(CPP_UNITTEST_EXECUTABLE): $(CPP_UNITTEST_FRAMEWORK_LIB) stamps/cpp-unit-tests-compile.stamp 
+ 	cd $(CPP_UNITTEST_DIR) && \
+-	$(CXX) $(CXXFLAGS) \
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) \
+ 	  $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) \
+ 	  $(CPP_UNITTEST_DIR)/*.o \
+ 	  -lrt \
+@@ -1252,7 +1252,7 @@ 
  
- $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
- 	cd $(PLUGIN_DIR) && \
+ $(COVERABLE_PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(COVERABLE_PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
+ 	cd $(COVERABLE_PLUGIN_DIR) && \
 -	$(CXX) $(CXXFLAGS) \
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) \
  	  $(PLUGIN_OBJECTS) \
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch
new file mode 100644
index 000000000000..b0dc15d32c78
--- /dev/null
+++ b/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2015-09-11 14:02:04.250280108 +0100
++++ configure.ac	2016-02-18 09:36:04.684624293 +0000
+@@ -55,17 +55,6 @@
+ IT_SET_VERSION
+ IT_CHECK_XULRUNNER_VERSION
+ 
+-AC_CHECK_LIB(z, main,, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")])
+-dnl Check for libX11 headers and libraries.
+-PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no])
+-if test "x${X11_FOUND}" = xno
+-then
+-  AC_MSG_ERROR([Could not find x11 - \
+-  Try installing libX11-devel.])
+-fi
+-AC_SUBST(X11_CFLAGS)
+-AC_SUBST(X11_LIBS)
+-
+ dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin
+ dnl IT563 - NetX uses sun.security code
+ dnl IT605 - NetX depends on sun.misc.HexDumpEncoder
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild
index 651a655b27e6..4ec469c87440 100644
--- a/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="doc javascript nsplugin tagsoup test"
 RESTRICT="test"
 
 CDEPEND="javascript? ( dev-java/rhino:1.6 )
-	nsplugin? ( >=dev-libs/glib-2.16 )
+	nsplugin? ( >=dev-libs/glib-2.16:2= )
 	tagsoup? ( dev-java/tagsoup:0 )"
 
 DEPEND="${CDEPEND}
@@ -39,7 +39,8 @@ RDEPEND="${CDEPEND}
 src_prepare() {
 	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2779
 	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2780
-	epatch "${FILESDIR}"/${PN}-1.6-{javadoc,no-hg,launchers,respect-ldflags}.patch
+	# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2855
+	epatch "${FILESDIR}"/${PN}-1.6-{javadoc,no-hg,launchers,respect-ldflags,unused-libs}.patch
 
 	if java-pkg_is-vm-version-ge "1.8" ; then
 		sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die