diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-10 18:46:06 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-10 18:46:06 +0000 |
| commit | 020785b8e1bc9e8794999348898f362aa44f070c (patch) | |
| tree | 8c413543249e1634cc9ee9f96d8bc6053e1f32d7 /dev-java/jdbc-mysql | |
| parent | Ã~amd64 keyword (diff) | |
| download | gentoo-2-020785b8e1bc9e8794999348898f362aa44f070c.tar.gz gentoo-2-020785b8e1bc9e8794999348898f362aa44f070c.tar.bz2 gentoo-2-020785b8e1bc9e8794999348898f362aa44f070c.zip | |
log4j fix
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-java/jdbc-mysql')
| -rw-r--r-- | dev-java/jdbc-mysql/files/compile-without-log4j.patch | 19 | ||||
| -rw-r--r-- | dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/dev-java/jdbc-mysql/files/compile-without-log4j.patch b/dev-java/jdbc-mysql/files/compile-without-log4j.patch new file mode 100644 index 000000000000..4e3e28ab9700 --- /dev/null +++ b/dev-java/jdbc-mysql/files/compile-without-log4j.patch @@ -0,0 +1,19 @@ +--- src/com/mysql/jdbc/ConnectionProperties.java.orig 2005-07-10 20:42:46.000000000 +0200 ++++ src/com/mysql/jdbc/ConnectionProperties.java 2005-07-10 20:43:16.000000000 +0200 +@@ -26,7 +26,6 @@ + + import com.mysql.jdbc.log.Jdk14Logger; + import com.mysql.jdbc.log.Log; +-import com.mysql.jdbc.log.Log4JLogger; + import com.mysql.jdbc.log.StandardLogger; + + import java.io.UnsupportedEncodingException; +@@ -2392,7 +2391,7 @@ + try { + // Is Log4J available? + Class.forName("org.apache.log4j.Level"); +- setLogger(Log4JLogger.class.getName()); ++ setLogger("org.apache.log4j.Level"); + } catch (Throwable t) { + try { + // Are we running on JDK-1.4? diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild index 81ce9d7116f2..d4e6e98877f1 100644 --- a/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild +++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild,v 1.1 2005/07/10 18:13:26 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild,v 1.2 2005/07/10 18:46:06 axxo Exp $ inherit eutils java-pkg @@ -28,6 +28,7 @@ src_unpack() { unpack ${A} cd ${S} rm -f *.jar + epatch ${FILESDIR}/compile-without-log4j.patch sed -i 's,{buildDir}/MANIFEST.MF,{buildDir}/META-INF/MANIFEST.MF,' build.xml || die "sed failed" |