fix deps, small cleanup

(Portage version: 2.0.51.22-r1)

9 files changed, 20 insertions, 133 deletions

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index e61c84015eb0..621cf2db3992 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/log4j
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.29 2005/05/26 14:10:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.30 2005/07/09 16:07:01 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> -log4j-1.2.8.ebuild,
+  -log4j-1.2.8-r1.ebuild, -log4j-1.2.8-r2.ebuild, log4j-1.2.9.ebuild:
+  fix deps, small cleanup
 
   26 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> log4j-1.2.9.ebuild:
   Stable on sparc
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index 64bad2212877..d86350826c46 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,20 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 954ae1598ec997d4db76c8eb1f184cf0 ChangeLog 3314
-MD5 c2546aa1a79097b1e10bc88b24a94938 log4j-1.2.8-r1.ebuild 674
-MD5 c122dc508f53c13eef2f7b4bdce0d9c9 log4j-1.2.8-r2.ebuild 1439
-MD5 a11e537f3891459ed8de0009f257a918 log4j-1.2.8.ebuild 672
+MD5 e71652cc7837804842b06bead1ccc21b log4j-1.2.9.ebuild 1561
+MD5 7ed338d9934d41c64ff60afcec4fca09 ChangeLog 3481
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 89badcc5af3f56b2ea3b28b942b91164 log4j-1.2.9.ebuild 1521
-MD5 276671ae9ccf96d2b40482786f50071d files/digest-log4j-1.2.8 72
-MD5 276671ae9ccf96d2b40482786f50071d files/digest-log4j-1.2.8-r1 72
-MD5 276671ae9ccf96d2b40482786f50071d files/digest-log4j-1.2.8-r2 72
 MD5 d55e5a6d5e0b3b7044122df1b3c55830 files/digest-log4j-1.2.9 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCldjzKRy60XGEcJIRAl2wAJ9om3M04KPiDbBQBhJ3SE8KxCSW8gCeMy8f
-ECFnDpqZuv9SGBLTK8tjPWA=
-=Pn2o
------END PGP SIGNATURE-----
diff --git a/dev-java/log4j/files/digest-log4j-1.2.8 b/dev-java/log4j/files/digest-log4j-1.2.8
deleted file mode 100644
index 1646c4dd939a..000000000000
--- a/dev-java/log4j/files/digest-log4j-1.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dfc8cd57a4f2b42177b14f147c9dab3d jakarta-log4j-1.2.8.tar.gz 2513781
diff --git a/dev-java/log4j/files/digest-log4j-1.2.8-r1 b/dev-java/log4j/files/digest-log4j-1.2.8-r1
deleted file mode 100644
index 1646c4dd939a..000000000000
--- a/dev-java/log4j/files/digest-log4j-1.2.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dfc8cd57a4f2b42177b14f147c9dab3d jakarta-log4j-1.2.8.tar.gz 2513781
diff --git a/dev-java/log4j/files/digest-log4j-1.2.8-r2 b/dev-java/log4j/files/digest-log4j-1.2.8-r2
deleted file mode 100644
index 1646c4dd939a..000000000000
--- a/dev-java/log4j/files/digest-log4j-1.2.8-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dfc8cd57a4f2b42177b14f147c9dab3d jakarta-log4j-1.2.8.tar.gz 2513781
diff --git a/dev-java/log4j/log4j-1.2.8-r1.ebuild b/dev-java/log4j/log4j-1.2.8-r1.ebuild
deleted file mode 100644
index ed82706d1846..000000000000
--- a/dev-java/log4j/log4j-1.2.8-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.3 2005/01/26 21:52:47 corsair 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 sparc ppc amd64"
-IUSE="doc"
-DEPEND=">=virtual/jdk-1.2"
-S="${WORKDIR}/jakarta-${P}"
-
-src_compile() { :; }
-
-src_install() {
-	cd dist/lib
-	mv log4j-${PV}.jar ${PN}.jar
-	java-pkg_dojar ${PN}.jar
-	use doc && java-pkg_dohtml -r docs/*
-}
-
diff --git a/dev-java/log4j/log4j-1.2.8-r2.ebuild b/dev-java/log4j/log4j-1.2.8-r2.ebuild
deleted file mode 100644
index 8ffafd15159d..000000000000
--- a/dev-java/log4j/log4j-1.2.8-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 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.6 2005/01/26 21:52:47 corsair 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 ~amd64 ppc64"
-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
-
-	cd ${S}
-	use doc && java-pkg_dohtml -r docs/*
-}
-
diff --git a/dev-java/log4j/log4j-1.2.8.ebuild b/dev-java/log4j/log4j-1.2.8.ebuild
deleted file mode 100644
index 3a2ce3b438f4..000000000000
--- a/dev-java/log4j/log4j-1.2.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.13 2005/01/26 21:52:47 corsair 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 sparc ppc amd64"
-IUSE="doc"
-DEPEND=">=virtual/jdk-1.2"
-S="${WORKDIR}/jakarta-${P}"
-
-src_compile() { :; }
-
-src_install() {
-	cd dist/lib
-	mv log4j-${PV}.jar ${PN}.jar
-	java-pkg_dojar ${PN}.jar
-	use doc && java-pkg_dohtml -r docs/*
-}
-
diff --git a/dev-java/log4j/log4j-1.2.9.ebuild b/dev-java/log4j/log4j-1.2.9.ebuild
index 776eb8e33296..85ab48ca1bc1 100644
--- a/dev-java/log4j/log4j-1.2.9.ebuild
+++ b/dev-java/log4j/log4j-1.2.9.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.9.ebuild,v 1.9 2005/05/26 14:10:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.9.ebuild,v 1.10 2005/07/09 16:07:01 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="A low-overhead robust logging package for Java"
 SRC_URI="mirror://apache/logging/log4j/${PV}/logging-${P}.tar.gz"
 HOMEPAGE="http://jakarta.apache.org"
-
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc64 sparc ppc"
 IUSE="doc javamail jikes jms jmx source"
 
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4
 	javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin )
 	jmx? ( dev-java/jmx )
 	jms? ( =dev-java/openjms-bin-0.7.6 )"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )
+	${RDEPEND}"
 
 S="${WORKDIR}/logging-${P}"
 
@@ -33,18 +33,17 @@ src_unpack() {
 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"
+	use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar) -Dactivation.jar$(java-pkg_getjar sun-jaf-bin activation.jar)"
+	use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar jmx jmxtools.jar)"
+	use jms && die "axxo fix openjms!"
+	use jms && antflags="${antflags} -Djms.jar=$(java-pkg_getjar openjms jms.jar)"
 	ant ${antflags} || die "compilation error"
 }
 
 src_install() {
-	cd dist/lib
-	mv log4j-${PV}.jar ${PN}.jar
-	java-pkg_dojar ${PN}.jar
+	java-pkg_newjar dist/lib/log4j-${PV}.jar ${PN}.jar
 
-	use doc && java-pkg_dohtml -r ${S}/docs/*
-	use source && java-pkg_dosrc ${S}/src/java/*
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/java/*
 }