From: Petteri Räty Date: Thu, 7 Dec 2006 22:52:07 +0000 (+0000) Subject: Fixed to work with JAVA_PKG_STRICT and USE=-javamail. Now does proper build.xml rewri... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d149301b5939f063f26df2aa3830eb08b12ed1b;p=gentoo.git Fixed to work with JAVA_PKG_STRICT and USE=-javamail. Now does proper build.xml rewriting. Package-Manager: portage-2.1.2_rc2-r3 --- diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog index 44fae747a797..fdb67bde84cb 100644 --- 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 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ò 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 9a9eb427e1bc..dc3781a76042 100644 --- 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 69545f2ffea4..88c057fb7754 100644 --- 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 205aaae70be3..64f44c2ba6b1 100644 --- 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 e0f5e25a372e..0784ed351e63 100644 --- 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 827104dbd68e..314b6a9585d9 100644 --- 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 1285552d6943..4627df04f809 100644 --- 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 378e1c70e3c8..026bd3aec539 100644 --- 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() {