monsieurp 15/05/17 21:37:12 Modified: jboss-logging-3.1.4.ebuild ChangeLog Log: 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 <[email protected]> (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.2 dev-java/jboss-logging/jboss-logging-3.1.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild?r1=1.1&r2=1.2 Index: jboss-logging-3.1.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jboss-logging-3.1.4.ebuild 10 May 2014 12:34:44 -0000 1.1 +++ jboss-logging-3.1.4.ebuild 17 May 2015 21:37:12 -0000 1.2 @@ -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 @@ 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 @@ 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 } 1.5 dev-java/jboss-logging/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jboss-logging/ChangeLog?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jboss-logging/ChangeLog?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jboss-logging/ChangeLog?r1=1.4&r2=1.5 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jboss-logging/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ChangeLog 10 May 2014 12:34:44 -0000 1.4 +++ ChangeLog 17 May 2015 21:37:12 -0000 1.5 @@ -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 <[email protected]> + +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)
