Now builds from source, thanks too Mark Wolfe <mwolfe@netspace.net.au> #63252

4 files changed, 56 insertions, 12 deletions

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index 1a2dd96ed02c..ae729977a0b8 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/log4j
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.18 2004/09/17 09:29:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.19 2004/09/18 10:03:16 axxo Exp $
+
+*log4j-1.2.8-r2 (18 Sep 2004)
+
+  18 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +log4j-1.2.8-r2.ebuild:
+  Now builds from source, thanks too Mark Wolfe <mwolfe@netspace.net.au>
+  See bug 63252
 
 *log4j-1.2.8-r1 (17 Sep 2004)
 
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index e3adf5b2345b..a9674e466ff7 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6ec118f9267b97c65e83655506041778 log4j-1.2.8-r1.ebuild 662
 MD5 68e66c3590abec59219479bd2fddd44d log4j-1.2.8.ebuild 660
-MD5 c3a3b52c96ad40a7a5f3a41eb8aff59b ChangeLog 1948
+MD5 c8eed6c5abe78ea5d1a601bd99e7d759 log4j-1.2.8-r2.ebuild 1404
+MD5 9eb12991fadbc0e884b1771f6b76f1cd ChangeLog 2126
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 276671ae9ccf96d2b40482786f50071d files/digest-log4j-1.2.8-r1 72
+MD5 276671ae9ccf96d2b40482786f50071d files/digest-log4j-1.2.8-r2 72
 MD5 276671ae9ccf96d2b40482786f50071d files/digest-log4j-1.2.8 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBSq5y/rLF9B432nYRAsblAKCBK3Vy+37LQ9u+p8Ecp56XBlCisgCfePsH
-lvqSrIJxQiNIP5+XvogwYDI=
-=S/aR
------END PGP SIGNATURE-----
diff --git a/dev-java/log4j/files/digest-log4j-1.2.8-r2 b/dev-java/log4j/files/digest-log4j-1.2.8-r2
new file mode 100644
index 000000000000..1646c4dd939a
--- /dev/null
+++ b/dev-java/log4j/files/digest-log4j-1.2.8-r2
@@ -0,0 +1 @@
+MD5 dfc8cd57a4f2b42177b14f147c9dab3d jakarta-log4j-1.2.8.tar.gz 2513781
diff --git a/dev-java/log4j/log4j-1.2.8-r2.ebuild b/dev-java/log4j/log4j-1.2.8-r2.ebuild
new file mode 100644
index 000000000000..0bb9c44c264c
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.8-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.8-r2.ebuild,v 1.1 2004/09/18 10:03:16 axxo Exp $
+
+inherit java-pkg
+
+DESCRIPTION="A low-overhead robust logging package for Java"
+SRC_URI="http://jakarta.apache.org/log4j/jakarta-${P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="jikes doc javamail jmx jms"
+DEPEND=">=virtual/jdk-1.4
+		dev-java/ant-core
+		javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin 	)
+		jmx? ( dev-java/jmx )
+		jms? ( =dev-java/openjms-bin-0.7.6 )
+		jikes? ( dev-java/jikes)"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/jakarta-${P}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm -rf dist/
+}
+
+src_compile() {
+	local antflags="jar"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use javamail && antflags="${antflags} -Djavamail.jar=/usr/share/sun-javamail-bin/lib/mail.jar -Dactivation.jar=/usr/share/sun-jaf-bin/lib/activation.jar"
+	use jmx && antflags="${antflags} -Djmx.jar=/usr/share/jmx/lib/jmxri.jar -Djmx-extra.jar=/usr/share/jmx/lib/jmxtools.jar"
+	use jms && antflags="${antflags} -Djms.jar=/opt/openjms/lib/jms-1.0.2a.jar"
+	ant ${antflags} || die "compilation error"
+}
+
+src_install() {
+	cd dist/lib
+	mv log4j-${PV}.jar ${PN}.jar
+	java-pkg_dojar ${PN}.jar
+	use doc && dohtml -r docs/*
+}
+