Fixed to work with JAVA_PKG_STRICT and USE=-javamail. Now does proper build.xml rewri...

Package-Manager: portage-2.1.2_rc2-r3

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index 44fae747a797b8fb8d89935377ff2688977c245c..fdb67bde84cba6f2af7584ccf722dc6455fc0f12 100644 (file)
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/log4j
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.44 2006/12/07 22:36:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.45 2006/12/07 22:52:07 betelgeuse Exp $
+
+  07 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> log4j-1.2.14.ebuild:
+  Fixed to work with JAVA_PKG_STRICT and USE=-javamail. Now does proper
+  build.xml rewriting.
 
   07 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> log4j-1.2.14.ebuild:
   Add ~x86-fbsd keyword.

diff --git a/dev-java/log4j/files/digest-log4j-1.2.11 b/dev-java/log4j/files/digest-log4j-1.2.11
index 9a9eb427e1bcd8f5387d5df73c6c1817680f4ee4..dc3781a7604269ce8196aaf1f17f54abf2754299 100644 (file)
--- a/dev-java/log4j/files/digest-log4j-1.2.11
+++ b/dev-java/log4j/files/digest-log4j-1.2.11
@@ -1 +1,3 @@
 MD5 b67e5a0ebb6eab73edd41b275599f41c logging-log4j-1.2.11.tar.gz 2779734
+RMD160 7e0b7676072b86c67b1b24b35804a6fe22cda9d5 logging-log4j-1.2.11.tar.gz 2779734
+SHA256 f7b0a3d78d992d1472bf61ddb4d8a0a616db30fe905490cd791818c209e367f9 logging-log4j-1.2.11.tar.gz 2779734

diff --git a/dev-java/log4j/files/digest-log4j-1.2.12 b/dev-java/log4j/files/digest-log4j-1.2.12
index 69545f2ffea403bac538f6deb7e1cb1fb1738932..88c057fb7754edde038facf78742be8d7dc2f9be 100644 (file)
--- a/dev-java/log4j/files/digest-log4j-1.2.12
+++ b/dev-java/log4j/files/digest-log4j-1.2.12
@@ -1 +1,3 @@
 MD5 95b60d4cf517c9cf3438fb99e2bd231a logging-log4j-1.2.12.tar.gz 2755723
+RMD160 aea27652b9c61aab3a672d6bd2f259c3509fe1bc logging-log4j-1.2.12.tar.gz 2755723
+SHA256 e25043521dc44248771072f429f4ebb4f3c6cfba46c0981c3bffad1dc866941e logging-log4j-1.2.12.tar.gz 2755723

diff --git a/dev-java/log4j/files/digest-log4j-1.2.9 b/dev-java/log4j/files/digest-log4j-1.2.9
index 205aaae70be3f1750fdc61b137cf1598100a857a..64f44c2ba6b12ecc40d106f638949d6af8d6f772 100644 (file)
--- a/dev-java/log4j/files/digest-log4j-1.2.9
+++ b/dev-java/log4j/files/digest-log4j-1.2.9
@@ -1 +1,3 @@
 MD5 8c2074c42bf2fb1da72e920689c59ad8 logging-log4j-1.2.9.tar.gz 2770729
+RMD160 8907d713cd2df3dde63bf620d0ecc2a0f93b06d6 logging-log4j-1.2.9.tar.gz 2770729
+SHA256 887d9c942d2904328c0af185eae0d0bb7633dd5b931ddd7529517e844827ba6b logging-log4j-1.2.9.tar.gz 2770729

diff --git a/dev-java/log4j/log4j-1.2.12.ebuild b/dev-java/log4j/log4j-1.2.12.ebuild
index e0f5e25a372e62e05f9a7c6e5b308d25d1b3fd0d..0784ed351e6366df4584c034c033a6b8c00c0015 100644 (file)
--- a/dev-java/log4j/log4j-1.2.12.ebuild
+++ b/dev-java/log4j/log4j-1.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.12.ebuild,v 1.5 2006/10/05 18:05:36 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.12.ebuild,v 1.6 2006/12/07 22:52:07 betelgeuse Exp $
 
 inherit java-pkg
 
@@ -23,7 +23,7 @@ RDEPEND=">=virtual/jre-1.4
 #      jms? ( || (=dev-java/openjms-0.7.6* =dev-java/openjms-bin-0.7.6* ))"
 
 # Needs the a newer ant-core because otherwise source 1.1 and target 1.1 fails
-# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to 
+# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to
 # explicitly set the javac.source and javac.target properties in the ebuild.
 
 DEPEND=">=virtual/jdk-1.4

diff --git a/dev-java/log4j/log4j-1.2.13-r1.ebuild b/dev-java/log4j/log4j-1.2.13-r1.ebuild
index 827104dbd68e52bf806e8d21f2ed50d042ff2349..314b6a9585d94be97993b77789234f7a91316459 100644 (file)
--- a/dev-java/log4j/log4j-1.2.13-r1.ebuild
+++ b/dev-java/log4j/log4j-1.2.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.13-r1.ebuild,v 1.3 2006/10/17 02:53:45 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.13-r1.ebuild,v 1.4 2006/12/07 22:52:07 betelgeuse Exp $
 
 inherit java-pkg-2
 
@@ -24,7 +24,7 @@ RDEPEND=">=virtual/jre-1.4
 #      jms? ( || (=dev-java/openjms-0.7.6* =dev-java/openjms-bin-0.7.6* ))"
 
 # Needs the a newer ant-core because otherwise source 1.1 and target 1.1 fails
-# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to 
+# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to
 # explicitly set the javac.source and javac.target properties in the ebuild.
 
 DEPEND=">=virtual/jdk-1.4

diff --git a/dev-java/log4j/log4j-1.2.13.ebuild b/dev-java/log4j/log4j-1.2.13.ebuild
index 1285552d69432bfba9a92be931f97e82828357fe..4627df04f809ad21f9d74ab638c536c9fdb1b47f 100644 (file)
--- a/dev-java/log4j/log4j-1.2.13.ebuild
+++ b/dev-java/log4j/log4j-1.2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.13.ebuild,v 1.2 2006/10/05 18:05:36 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.13.ebuild,v 1.3 2006/12/07 22:52:07 betelgeuse Exp $
 
 inherit java-pkg
 
@@ -24,7 +24,7 @@ RDEPEND=">=virtual/jre-1.4
 #      jms? ( || (=dev-java/openjms-0.7.6* =dev-java/openjms-bin-0.7.6* ))"
 
 # Needs the a newer ant-core because otherwise source 1.1 and target 1.1 fails
-# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to 
+# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to
 # explicitly set the javac.source and javac.target properties in the ebuild.
 
 DEPEND=">=virtual/jdk-1.4

diff --git a/dev-java/log4j/log4j-1.2.14.ebuild b/dev-java/log4j/log4j-1.2.14.ebuild
index 378e1c70e3c88d47082a576e9798e0e664d7b265..026bd3aec539076fbba812a0907fdce30b3bf45a 100644 (file)
--- a/dev-java/log4j/log4j-1.2.14.ebuild
+++ b/dev-java/log4j/log4j-1.2.14.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.14.ebuild,v 1.2 2006/12/07 22:36:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.14.ebuild,v 1.3 2006/12/07 22:52:07 betelgeuse Exp $
 
-inherit java-pkg-2
+inherit java-pkg-2 java-ant-2
 
 MY_P="logging-${P}"
 DESCRIPTION="A low-overhead robust logging package for Java"
@@ -24,7 +24,7 @@ RDEPEND=">=virtual/jre-1.4
 #      jms? ( || (=dev-java/openjms-0.7.6* =dev-java/openjms-bin-0.7.6* ))"
 
 # Needs the a newer ant-core because otherwise source 1.1 and target 1.1 fails
-# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to 
+# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to
 # explicitly set the javac.source and javac.target properties in the ebuild.
 
 DEPEND=">=virtual/jdk-1.4
@@ -38,6 +38,8 @@ src_unpack() {
        unpack ${A}
        cd ${S}
        rm -rf dist/
+       # Takes javamail from system env without this
+       xml-rewrite.py -f build.xml -c -e available -a ignoresystemclasses -v "true"
 }
 
 src_compile() {