From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- dev-java/jboss-logging/Manifest | 1 + .../files/jboss-logging-3.1.3-r1-build.xml | 224 +++++++++++++++++++++ .../files/jboss-logging-3.1.4-MDC.patch | 152 ++++++++++++++ .../files/jboss-logging-3.1.4-build.xml | 202 +++++++++++++++++++ dev-java/jboss-logging/jboss-logging-3.1.4.ebuild | 52 +++++ dev-java/jboss-logging/metadata.xml | 9 + 6 files changed, 640 insertions(+) create mode 100644 dev-java/jboss-logging/Manifest create mode 100644 dev-java/jboss-logging/files/jboss-logging-3.1.3-r1-build.xml create mode 100644 dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch create mode 100644 dev-java/jboss-logging/files/jboss-logging-3.1.4-build.xml create mode 100644 dev-java/jboss-logging/jboss-logging-3.1.4.ebuild create mode 100644 dev-java/jboss-logging/metadata.xml (limited to 'dev-java/jboss-logging') diff --git a/dev-java/jboss-logging/Manifest b/dev-java/jboss-logging/Manifest new file mode 100644 index 000000000000..b81da140abe8 --- /dev/null +++ b/dev-java/jboss-logging/Manifest @@ -0,0 +1 @@ +DIST jboss-logging-3.1.4.tar.gz 25018 SHA256 805053336b77c4c62e89a920ef9b80cfc6577964fcdcadb7c3ab43b017e1c734 SHA512 633b18b079089444a5f7406a6a2b29100abd2c752306ada4fda0c15f07a60a363d67616e2521ec079f1df37ecdadcbb46e26819a9f5647e3d1a18219c494b73a WHIRLPOOL b60657d39425309c7917a9019b957d83898462c142bdfd95fe5ba1d8c91cb6b0d119515810747f68db15623d389f955c8a1adaafbebb58860570ad9994bffb14 diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.3-r1-build.xml b/dev-java/jboss-logging/files/jboss-logging-3.1.3-r1-build.xml new file mode 100644 index 000000000000..f024bcc74854 --- /dev/null +++ b/dev-java/jboss-logging/files/jboss-logging-3.1.3-r1-build.xml @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =================================== WARNING =================================== + JUnit is not present in your $ANT_HOME/lib directory. Tests not executed. + =============================================================================== + + + + + + + + + <![CDATA[JBoss Logging 3.1.3.GA]]> +
<![CDATA[JBoss Logging 3.1.3.GA]]>
+
<![CDATA[JBoss Logging 3.1.3.GA]]>
+ <![CDATA[<i>Copyright &#169; 2012 Red Hat, Inc.</i>]]> + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
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> mdcMap = new ThreadLocal>(); ++ private final ThreadLocal> mdcMap = new ThreadLocal>(); + + public Object getMdc(String key) { + return mdcMap.get() == null ? null : mdcMap.get().get(key); + } + +- public Map getMdcMap() { ++ public Map getMdcMap() { + return mdcMap.get(); + } + +- public Object putMdc(String key, Object value) { +- Map map = mdcMap.get(); ++ public Object putMdc(String key, String value) { ++ Map map = mdcMap.get(); + if (map == null) { +- map = new HashMap(); ++ map = new HashMap(); + mdcMap.set(map); + } + return map.put(key, value); + } + + public void removeMdc(String key) { +- Map map = mdcMap.get(); ++ Map 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 getMdcMap() { ++ public Map 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 getMdcMap() { ++ public Map 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 getMdcMap() { ++ public Map 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 getMap() { ++ public static Map 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 getMdcMap(); ++ Map 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + =================================== WARNING =================================== + JUnit is not present in your $ANT_HOME/lib directory. Tests not executed. + =============================================================================== + + + + + + + + + <![CDATA[JBoss Logging 3.1.4.GA]]> +
<![CDATA[JBoss Logging 3.1.4.GA]]>
+
<![CDATA[JBoss Logging 3.1.4.GA]]>
+ <![CDATA[<i>Copyright &#169; 2012 Red Hat, Inc.</i>]]> + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild new file mode 100644 index 000000000000..d4c3725843e7 --- /dev/null +++ b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="JBoss logging framework" +HOMEPAGE="http://www.jboss.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.GA.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" + +COMMON_DEPEND="dev-java/jboss-logmanager:0 + >=dev-java/slf4j-api-1.7.7 + dev-java/log4j:0" + +RDEPEND=">=virtual/jre-1.6 + ${COMMON_DEPEND}" + +DEPEND=">=virtual/jdk-1.6 + ${COMMON_DEPEND}" + +S="${WORKDIR}/${P}.GA/" + +EANT_GENTOO_CLASSPATH="jboss-logmanager,slf4j-api,log4j" +JAVA_ANT_REWRITE_CLASSPATH="true" + +java_prepare() { + 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 + # 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 :| + # This patch mends this mistake. + epatch "${FILESDIR}"/"${P}"-MDC.patch +} + +src_install() { + java-pkg_newjar target/${PN}-3.1.4.GA.jar + + if use doc; then + java-pkg_dojavadoc target/site/apidocs + fi + use source && java-pkg_dosrc src/main/java/org +} diff --git a/dev-java/jboss-logging/metadata.xml b/dev-java/jboss-logging/metadata.xml new file mode 100644 index 000000000000..34e7aafc4655 --- /dev/null +++ b/dev-java/jboss-logging/metadata.xml @@ -0,0 +1,9 @@ + + + + java + + jboss-logging/jboss-logging + + + -- cgit v1.2.3-65-gdbad