Patch for mending Map misuse in order to get the package to compile against

slf4j-api-1.7.7. Fix bug 509602.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

5 files changed, 397 insertions, 12 deletions

diff --git a/dev-java/jboss-logging/ChangeLog b/dev-java/jboss-logging/ChangeLog
index 97594ce703b9..8afc4b719a88 100644
--- a/dev-java/jboss-logging/ChangeLog
+++ b/dev-java/jboss-logging/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jboss-logging
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jboss-logging/ChangeLog,v 1.4 2014/05/10 12:34:44 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jboss-logging/ChangeLog,v 1.5 2015/05/17 21:37:12 monsieurp Exp $
+
+  17 May 2015; Patrice Clement <monsieurp@gentoo.org>
+  +files/jboss-logging-3.1.4-MDC.patch, +files/jboss-logging-3.1.4-build.xml,
+  jboss-logging-3.1.4.ebuild:
+  Patch for mending Map misuse in order to get the package to compile against
+  slf4j-api-1.7.7. Fix bug 509602.
 
 *jboss-logging-3.1.4 (10 May 2014)
 
diff --git a/dev-java/jboss-logging/Manifest b/dev-java/jboss-logging/Manifest
index 0b9cc005fa4a..0247ee8f4d02 100644
--- a/dev-java/jboss-logging/Manifest
+++ b/dev-java/jboss-logging/Manifest
@@ -1,8 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX jboss-logging-3.1.3-r1-build.xml 10497 SHA256 16776bee2a1091cf6b5ae4144a2fa10949953db3e6d388c6280462691f25c9d0 SHA512 8d2e8bdc42f20a28416bdd241f537e6e55af4d29c7c9728452839d2471815560f251e0e8aeb21b67c8f3388a206deba2c86e4618dd0d3572e7bc8e2a897345b8 WHIRLPOOL abed603ac52a124650f491d0bd9241b30fd5a45c7606420dc04030c4eb1505012f33ae95e028da3f92cfc8dd8e707039e338c08acf421334a63a3f25a37e0b3f
+AUX jboss-logging-3.1.4-MDC.patch 5607 SHA256 670a30cef4ffe45f3ad2a1dee902a49b917c6e3333750e5fbd8dc362e3b026e9 SHA512 74ece235664dc49db51e4026902a67773e87655edd1879137da0b0d1cb0fefe20c4e67e3ba0625214d6c85b7f036e07732d07c842947bf312a2ed505c05ab535 WHIRLPOOL 6ea8aa9a9c6cd34247a17ed6048f615918bff24c70144064dea4221913044aad771a10ccf0f6dd6555c57277309c219c431fa85b83b0a459faef4097e6ada1f0
+AUX jboss-logging-3.1.4-build.xml 9295 SHA256 1668c26371950c3a699eeb500717676a904c9168763dedb732dfd0fd871a9cf7 SHA512 a4d1a44ee69d48686ff9d4d32540c74ea3dd0b8198f8bd04e5cf1572db5ae596bdf95bc0bd091cb19dc00b248f5f1a41f4f51271be9bb27be72420cc425d2a14 WHIRLPOOL 7cc82140bc1076d181660fbcaaa394d7458a86121cfc207035638b326b9b53ab7e97c453eeaeec96289faefb6e4f25aa490d6b17ec23c2099e40b7113d21c3e3
 DIST jboss-logging-3.1.3.tar.gz 24989 SHA256 fba22b022984bdaca3c78213957594add4faf7502be157b8dbf2eadccbc23be1 SHA512 9a9b6621d554de2baa23b26c78074063e7c59e05703c2dc710c70167efb581691207b97e4371100802c06a97b149943e098c994d0fb53530a150bf0364b9e63f WHIRLPOOL 8331cfe9f17bb8e6064e9d2d6332b74bba596e953101ec0ce542ffdef8625c46df3363151a952238acbdcae0de1209e162a35a71911b6da4a3784c0980d0cb57
 DIST jboss-logging-3.1.4.tar.gz 25018 SHA256 805053336b77c4c62e89a920ef9b80cfc6577964fcdcadb7c3ab43b017e1c734 SHA512 633b18b079089444a5f7406a6a2b29100abd2c752306ada4fda0c15f07a60a363d67616e2521ec079f1df37ecdadcbb46e26819a9f5647e3d1a18219c494b73a WHIRLPOOL b60657d39425309c7917a9019b957d83898462c142bdfd95fe5ba1d8c91cb6b0d119515810747f68db15623d389f955c8a1adaafbebb58860570ad9994bffb14
 EBUILD jboss-logging-3.1.3-r1.ebuild 1042 SHA256 10df66d88060414fe23230d7e2168a76c47b2ce977a536248b369c343d579d97 SHA512 97637fee75fcd44dbe0cf266600494bc93ffdddf7d66a04729c6751400785364e204cfdbaa960b1eeaccab66a126f1a37bc92255a7f1ec3cea17a9dcc4c9afbb WHIRLPOOL e29dd0beb7b591101e40e06d161069efbdff6746b4dbc6d7b3deed2874e7fcd25248a98288f19d9e59f856fa7d20eb65dcf3dec1fff442a94637fc933cb88cc0
 EBUILD jboss-logging-3.1.3.ebuild 829 SHA256 c00948862ea5886aca9d097114f1f14b49793c41ef2260629f3c4fdb12346854 SHA512 a07c79cdcbab59c796df990d2fede10bfb9d3aa5d9176410db18f857a648edd97748f61a8ba6c25e2a35703708fc8eb7f3c3d603b07e967a48c8638acb510f21 WHIRLPOOL 67dfa971e011557c6cf1e689a4a416194b9b0a0897c9f377768506614efdd1e83f9718f9f1cfb23aa593f1efa62f04919640b72b692ee21e68817cfcfbb5da5a
-EBUILD jboss-logging-3.1.4.ebuild 1052 SHA256 f7076e15f1bf6a37ce018fd8c677e04adb7dc383f8c541d98dff5875c9f82464 SHA512 5c3bbcb89413173818bc11272e74779d4f930a92998cb4c6a6005751504f6a1012eab5669ce20a8a189cf0eaa36e84a18fad2e552a1695f893975ca5d288046a WHIRLPOOL 009e965002de6cf39c8ec4b0c88287078c98d72f9ac8e65ce3135526c371985699921a534378ed8eadaaa9d338e937bb16e530adc468523086c022acdc571484
-MISC ChangeLog 1075 SHA256 c0cf2e836bb0afebacd13d30c648351163d135cf91f82efda4816a9be9c858f6 SHA512 222d54e5934a76371229ffe82c5fbb31bce54152d47a32cfa10a9113012cc709416745c08f8a3c3d3335975360f84ca6b19fb1864b9bc35e081e36d5d5b961b4 WHIRLPOOL ba3a0bf5b9143610c336f1583d3425022ce70b0a324e5efaee1292a4e64a78a980176afccf05034e506b8ec5f51b2bc43084a511ff5da82b09a9cf2c94b4780a
+EBUILD jboss-logging-3.1.4.ebuild 1486 SHA256 2b0b673658d793c412aadf5d84a3b76cf26d3a22eab05f22c53bcc20aa344321 SHA512 07551080b909e85b7496fef2675d476c4fe08072e2954087d83a8583e1f4c46b0433675e54fdda395ab8d3bc9a23702601a7bc41c4134d3b5f4c10e5eb49dcb3 WHIRLPOOL e19a4b332b94fe734ee9786082c78991dcbfb008485e363d671eec95b2385a37805125bb9963c9afe418f247aa99b059a1bdefbb64ea582e77b78725f6ffa93f
+MISC ChangeLog 1354 SHA256 5cb8a19d2f63d73b771c6bb2cba18a75cb3ada2f6ca5f4a55edd89c53494a6a3 SHA512 c208fb514f9ed2572f030b19ad4475ca78c5e315d67ddcbb6200971806fec0a35183aab532855c7855f45b3f213065b0f477947caae1b99064e34a99b178fc0a WHIRLPOOL 5bbecb399c37a367200f610d4d1349eeeaf34f9258f385ab74e61b5e66d61eaeb11c8a73db3ac5fe6a3b5f23d03ea5672586c74a069cc3155014d6a362e4876b
 MISC metadata.xml 251 SHA256 03f958cb6b42ab8f6cecf2e29d0ab8da3537ee8c6607f0514242b3d032accb5f SHA512 c25376564766dd930ee02421a3f27ccb113c2193d5912d8b4ba6e3e5eacee2f3e5ddb19490bcfe38f7dea4cde6823ef48b8933e3e5bd8cda67cef8eec2666763 WHIRLPOOL ce051936bb7cc6a1588e35471e50d0610b99ca04bf1a08663cd82c147501d4022962704176cbd1f8f9843174e5ae90c101cbeb7ddb6a0b3d2275c90f0313d1ed
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVWQmqAAoJEJGRpfGTSRu4lRoH/0OFiJOr5S4u6a/Qm0POovLr
+mrDRemdm+KacLJl9oxnt26qPLpuaGsCrfuWJjTvqvZr+M62kTS6Ro479oXh8EK5x
+8SurcNVh/870dsXLuixlb47597rai04GBirYcVgY5hTisz/lC1Em5oWUfvcGYyd9
+bWF8IU73H92HWut1hcUKQBaLxsX94xSTgNtsnaPycPakAkiLFGoKh99Jv3fBmnI3
+wmbwKNQJtPa2NIpMbU+oys7fNkyPS0yBdk6UTNq8+XCdkl01BGeTrQ4ULSMa7VDd
+1sXItYW38SVMWshQvSlKlkE8v0Vbz/CuAfDi2oaiVIpjOFq87hAsLGrKC5ziXQk=
+=FrQ7
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch b/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
new file mode 100644
index 000000000000..e8a3a50a41fd
--- /dev/null
+++ b/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
@@ -0,0 +1,152 @@
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java.orig	2015-05-17 20:55:35.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java	2015-05-17 20:58:00.000000000 +0000
+@@ -23,27 +23,27 @@
+ 
+ abstract class AbstractMdcLoggerProvider extends AbstractLoggerProvider {
+ 
+-    private final ThreadLocal<Map<String, Object>> mdcMap = new ThreadLocal<Map<String, Object>>();
++    private final ThreadLocal<Map<String, String>> mdcMap = new ThreadLocal<Map<String, String>>();
+ 
+     public Object getMdc(String key) {
+         return mdcMap.get() == null ? null : mdcMap.get().get(key);
+     }
+ 
+-    public Map<String, Object> getMdcMap() {
++    public Map<String, String> getMdcMap() {
+         return mdcMap.get();
+     }
+ 
+-    public Object putMdc(String key, Object value) {
+-        Map<String, Object> map = mdcMap.get();
++    public Object putMdc(String key, String value) {
++        Map<String, String> map = mdcMap.get();
+         if (map == null) {
+-            map = new HashMap<String, Object>();
++            map = new HashMap<String, String>();
+             mdcMap.set(map);
+         }
+         return map.put(key, value);
+     }
+ 
+     public void removeMdc(String key) {
+-        Map<String, Object> map = mdcMap.get();
++        Map<String, String> map = mdcMap.get();
+         if (map == null)
+             return;
+         map.remove(key);
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Log4jLoggerProvider.java.orig	2015-05-17 20:16:57.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Log4jLoggerProvider.java	2015-05-17 21:21:25.157000000 +0000
+@@ -34,11 +34,11 @@
+     }
+ 
+     @SuppressWarnings("unchecked")
+-    public Map<String, Object> getMdcMap() {
++    public Map<String, String> getMdcMap() {
+         return MDC.getContext();
+     }
+ 
+-    public Object putMdc(String key, Object val) {
++    public Object putMdc(String key, String val) {
+         try {
+             return MDC.get(key);
+         } finally {
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java.orig	2015-05-17 20:44:24.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java	2015-05-17 21:22:05.205000000 +0000
+@@ -33,14 +33,14 @@
+         return new Slf4jLogger(name, l);
+     }
+ 
+-    public Object putMdc(final String key, final Object value) {
++    public Object putMdc(final String key, final String value) {
+         try {
+             return MDC.get(key);
+         } finally {
+             if (value == null) {
+                 MDC.remove(key);
+             } else {
+-                MDC.put(key, String.valueOf(value));
++                MDC.put(key, value);
+             }
+         }
+     }
+@@ -54,7 +54,7 @@
+     }
+ 
+     @SuppressWarnings({ "unchecked" })
+-    public Map<String, Object> getMdcMap() {
++    public Map<String, String> getMdcMap() {
+         return MDC.getCopyOfContextMap();
+     }
+ }
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JDKLoggerProvider.java.orig	2015-05-17 21:19:12.964000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JDKLoggerProvider.java	2015-05-17 21:22:41.639000000 +0000
+@@ -23,4 +23,9 @@
+     public Logger getLogger(final String name) {
+         return new JDKLogger(name);
+     }
++
++    @Override
++    public Object putMdc(String key, String value) {
++        return null;
++    }
+ }
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JBossLogManagerProvider.java.orig	2015-05-17 20:15:41.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/JBossLogManagerProvider.java	2015-05-17 21:20:42.844000000 +0000
+@@ -59,8 +59,8 @@
+         }
+     }
+ 
+-    public Object putMdc(final String key, final Object value) {
+-        return MDC.put(key, String.valueOf(value));
++    public Object putMdc(final String key, final String value) {
++        return MDC.put(key, value);
+     }
+ 
+     public Object getMdc(final String key) {
+@@ -72,7 +72,7 @@
+     }
+ 
+     @SuppressWarnings({ "unchecked" })
+-    public Map<String, Object> getMdcMap() {
++    public Map<String, String> getMdcMap() {
+         // we can re-define the erasure of this map because MDC does not make further use of the copy
+         return (Map)MDC.copy();
+     }
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/MDC.java.orig	2015-05-17 19:12:40.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/MDC.java	2015-05-17 21:22:27.689000000 +0000
+@@ -25,7 +25,7 @@
+     private MDC() {
+     }
+ 
+-    public static Object put(String key, Object val) {
++    public static Object put(String key, String val) {
+         return LoggerProviders.PROVIDER.putMdc(key, val);
+     }
+ 
+@@ -37,7 +37,7 @@
+         LoggerProviders.PROVIDER.removeMdc(key);
+     }
+ 
+-    public static Map<String, Object> getMap() {
++    public static Map<String, String> getMap() {
+         return LoggerProviders.PROVIDER.getMdcMap();
+     }
+ }
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/LoggerProvider.java.orig	2015-05-17 19:06:30.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/LoggerProvider.java	2015-05-17 21:21:43.083000000 +0000
+@@ -23,13 +23,13 @@
+ public interface LoggerProvider {
+     Logger getLogger(String name);
+ 
+-    Object putMdc(String key, Object value);
++    Object putMdc(String key, String value);
+ 
+     Object getMdc(String key);
+ 
+     void removeMdc(String key);
+ 
+-    Map<String, Object> getMdcMap();
++    Map<String, String> getMdcMap();
+ 
+     void clearNdc();
+ 
diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml b/dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml
new file mode 100644
index 000000000000..35bbf84f9c39
--- /dev/null
+++ b/dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 5/8/14 3:59 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jboss-logging-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jboss-logging-3.1.4.GA"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"/>
+    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"/>
+    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="true" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false">
+      <doctitle>&lt;![CDATA[JBoss Logging 3.1.4.GA]]&gt;</doctitle>
+      <header>&lt;![CDATA[JBoss Logging 3.1.4.GA]]&gt;</header>
+      <footer>&lt;![CDATA[JBoss Logging 3.1.4.GA]]&gt;</footer>
+      <bottom>&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2012 Red Hat, Inc.&lt;/i&gt;]]&gt;</bottom>
+      <link href="http://java.sun.com/javase/6/docs/api/"/>
+      <doclet name="net.gleamynode.apiviz.APIviz" 
+               path="${maven.repo.local}/org/jboss/apiviz/apiviz/1.2.5.GA/apiviz-1.2.5.GA.jar"/>
+    </javadoc>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="true" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+    </jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+</project>
diff --git a/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
index 9ef732c53daf..83cf02f23b74 100644
--- a/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
+++ b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
@@ -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/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild,v 1.1 2014/05/10 12:34:44 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild,v 1.2 2015/05/17 21:37:12 monsieurp Exp $
 
 EAPI="5"
 
@@ -17,13 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="dev-java/jboss-logmanager:0
-	<dev-java/slf4j-api-1.7.7:0
+	>=dev-java/slf4j-api-1.7.7
 	dev-java/log4j:0"
 
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
 		${COMMON_DEPEND}"
 
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
 		${COMMON_DEPEND}"
 
 S="${WORKDIR}/${P}.GA/"
@@ -32,12 +32,21 @@ EANT_GENTOO_CLASSPATH="jboss-logmanager,slf4j-api,log4j"
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 java_prepare() {
-	cp "${FILESDIR}"/${PN}-3.1.3-r1-build.xml build.xml || die
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+
+	# https://github.com/qos-ch/slf4j/blob/master/slf4j-api/src/main/java/org/slf4j/MDC.java#L226
+	# MDC returns a Map<String, String>
+	# https://github.com/jboss-logging/jboss-logging/blob/master/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java#L57
+	# Yet, for some reason, the JBoss folks have decided that it should return a Map<String, Object> :|
+	# This patch mends this mistake.
+	epatch "${FILESDIR}"/"${P}"-MDC.patch
 }
 
 src_install() {
-	java-pkg_newjar target/${PN}-3.1.3.GA.jar
+	java-pkg_newjar target/${PN}-3.1.4.GA.jar
 
-	use doc && java-pkg_dojavadoc target/site/apidocs
+	if use doc; then
+		java-pkg_dojavadoc target/site/apidocs
+	fi
 	use source && java-pkg_dosrc src/main/java/org
 }