Remove old revision.

Package-Manager: portage-2.2_rc28/cvs/Linux i686

3 files changed, 16 insertions, 75 deletions

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index 836c07395c49..d6d9125f7c77 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/log4j
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.72 2009/01/07 16:05:24 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.73 2009/05/18 19:49:37 betelgeuse Exp $
+
+  18 May 2009; Petteri Räty <betelgeuse@gentoo.org> -log4j-1.2.15.ebuild:
+  Remove old revision.
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> log4j-1.2.15-r1.ebuild:
   stable ppc64, bug 242980
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index c9cdc6089999..2bd304b02c53 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,7 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST apache-log4j-1.2.15.tar.gz 2099264 RMD160 280adfcd45c291d5bd45fbc5d5a9b0585374e4e0 SHA1 d6daea1586b932b1e38dc3fbac68624372bec6db SHA256 f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31
 DIST logging-log4j-1.2.14.tar.gz 2771881 RMD160 d640c0182deebe1aabf14105b7b89294601bacce SHA1 2365021f8f277e77e281b0e01333ecea7c721e3e SHA256 51e4fcb3c3677fcdb9fe45ca0f73378680537491c9c9e65a9b63c7f54678f90c
 EBUILD log4j-1.2.14-r1.ebuild 2203 RMD160 9645a72741ecbf6ded33bbe55470da76ab5b0dc4 SHA1 cd46504ba69a3f9d5f33ee3baa9d6b827fc8120d SHA256 cb81f2366f02c0b8b025e86356131eef6e258984fef0e92265990d509d8b2d5e
 EBUILD log4j-1.2.15-r1.ebuild 1924 RMD160 f3dc58a26a5ded2a5e36e0c77a253f29f5f2f7a8 SHA1 8d4dd379efe5fb96ec673a493dd3cd078b4ff052 SHA256 acce0a767fda53b89dd1de0015dfd0a1ad381f6379d401107ec28cb974c19495
-EBUILD log4j-1.2.15.ebuild 2396 RMD160 0c3d74a282dfbae287d87e1ea3a981c0a65c0c69 SHA1 1a9be8216c3c1d004c5f009f1fb59866576d5bac SHA256 7b5c2582eaadea83bbcd0a099aa3ae476b1323cec4d54a90908bd1ba974ee304
-MISC ChangeLog 9096 RMD160 f6e2664dc8384436a27338b28b304d81f3f4868e SHA1 12d18d09532771dbf45eb9bb64de1c62448f9d84 SHA256 ab9b5e53d1c19a9efbfb9da8753688ea65e4fdcbc0e4c0bdb65de1ad3293209c
+MISC ChangeLog 9199 RMD160 5410909ae54e6b8f0a950d4cac9c865a317191f5 SHA1 8e7b78c24e6500e851a37f5b05da3273ceb352ea SHA256 013c37a123ae19bf33f3c0b40bdcd295e61be82ef19763c79bf25c681240834c
 MISC metadata.xml 336 RMD160 8e73534440e5bab2c74a32fae436b9da50dcc0f6 SHA1 bcc0f5d89af0df96af4e1402adc3432f5ae82211 SHA256 7639c588f513ed8f1c2392e04ef8846157e7da5f11e8d1dfb111dc8a87dec152
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoRu9MACgkQcxLzpIGCsLS1XQCeOJLI0fBKs1FTtvGM6W2CfyFY
+j4IAnR+/ogovWHbjz3kn+3xBtokfRQJB
+=roh8
+-----END PGP SIGNATURE-----
diff --git a/dev-java/log4j/log4j-1.2.15.ebuild b/dev-java/log4j/log4j-1.2.15.ebuild
deleted file mode 100644
index dc378ebec73e..000000000000
--- a/dev-java/log4j/log4j-1.2.15.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.15.ebuild,v 1.7 2008/05/12 14:14:56 corsair Exp $
-
-JAVA_PKG_IUSE="doc javamail jms jmx source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="apache-${P}"
-DESCRIPTION="A low-overhead robust logging package for Java"
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz"
-HOMEPAGE="http://logging.apache.org/log4j/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-# jikes support disabled: bug #108819
-IUSE="doc javamail jms jmx source"
-
-CDEPEND="javamail? ( java-virtuals/javamail dev-java/sun-jaf )
-		jmx? ( dev-java/sun-jmx )
-		jms? ( =dev-java/openjms-bin-0.7.6 )"
-
-RDEPEND=">=virtual/jre-1.4
-		${CDEPEND}"
-
-# We should get log4j working with openjms but at the moment that would bring
-# a circular dependency.
-#	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
-# explicitly set the javac.source and javac.target properties in the ebuild.
-
-DEPEND=">=virtual/jdk-1.4
-		>=dev-java/ant-core-1.6.5
-		${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -rf dist/
-	# Takes javamail from system env without this
-	java-ant_xml-rewrite -f build.xml -c -e available -a ignoresystemclasses -v "true"
-	java-pkg_filter-compiler jikes
-}
-
-src_compile() {
-	# Because we depend on >=1.4 we always have jaxp
-	local antflags="jar -Djaxp-present=true"
-	use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar javamail mail.jar) -Dactivation.jar=$(java-pkg_getjar sun-jaf activation.jar)"
-	use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)"
-	#use jms && antflags="${antflags} -Djms.jar=$(java-pkg_getjar openjms jms.jar)"
-	use jms && antflags="${antflags} -Djms.jar=/opt/openjms/lib/jms-1.0.2a.jar"
-	eant ${antflags}
-}
-
-src_install() {
-	java-pkg_newjar dist/lib/${P}.jar ${PN}.jar
-
-	if use doc ; then
-		java-pkg_dojavadoc site/apidocs
-		java-pkg_dohtml -r site/*
-		rm -fr "${D}/usr/share/doc/${P}/html/apidocs"
-		cd "${D}/usr/share/doc/${P}/html"
-		ln -s api apidocs
-		cd "${S}"
-	fi
-	use source && java-pkg_dosrc src/main/java/*
-}