diff options
| -rw-r--r-- | dev-java/log4j/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/log4j/log4j-1.2.14-r1.ebuild | 61 | ||||
| -rw-r--r-- | dev-java/log4j/log4j-1.2.15-r1.ebuild | 73 |
3 files changed, 5 insertions, 135 deletions
diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog index 4490cb83330e..720addca9600 100644 --- a/dev-java/log4j/ChangeLog +++ b/dev-java/log4j/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/log4j # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.81 2010/01/23 13:27:51 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.82 2010/03/20 14:12:55 betelgeuse Exp $ + + 20 Mar 2010; Petteri Räty <betelgeuse@gentoo.org> + -log4j-1.2.14-r1.ebuild, -log4j-1.2.15-r1.ebuild: + Remove old ebuilds. 23 Jan 2010; Alexis Ballier <aballier@gentoo.org> log4j-1.2.15-r2.ebuild: keyword ~x86-fbsd, bug #296236 diff --git a/dev-java/log4j/log4j-1.2.14-r1.ebuild b/dev-java/log4j/log4j-1.2.14-r1.ebuild deleted file mode 100644 index e407b4442031..000000000000 --- a/dev-java/log4j/log4j-1.2.14-r1.ebuild +++ /dev/null @@ -1,61 +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.14-r1.ebuild,v 1.7 2008/02/13 04:16:05 ali_bush Exp $ - -inherit java-pkg-2 java-ant-2 - -MY_P="logging-${P}" -DESCRIPTION="A low-overhead robust logging package for Java" -SRC_URI="mirror://apache/logging/log4j/${PV}/${MY_P}.tar.gz" -HOMEPAGE="http://logging.apache.org/log4j/" -LICENSE="Apache-1.1" -SLOT="0" -KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd" -# jikes support disabled: bug #108819 -IUSE="doc javamail jms jmx source" - -RDEPEND=">=virtual/jre-1.4 - javamail? ( dev-java/sun-javamail dev-java/sun-jaf ) - jmx? ( dev-java/sun-jmx ) - jms? ( =dev-java/openjms-bin-0.7.6 )" - -# 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 - source? ( app-arch/zip ) - ${RDEPEND}" - -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 sun-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 - - use doc && java-pkg_dohtml -r docs/* - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/log4j/log4j-1.2.15-r1.ebuild b/dev-java/log4j/log4j-1.2.15-r1.ebuild deleted file mode 100644 index 03f37d05c0b9..000000000000 --- a/dev-java/log4j/log4j-1.2.15-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2010 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-r1.ebuild,v 1.6 2010/01/16 19:09:56 armin76 Exp $ - -EAPI=1 -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 ~ia64 ppc ppc64 x86" -# jikes support disabled: bug #108819 -IUSE="doc javamail jms jmx source" - -CDEPEND="javamail? ( java-virtuals/javamail java-virtuals/jaf ) - jmx? ( dev-java/sun-jmx:0 ) - 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* ))" - -DEPEND=">=virtual/jdk-1.4 - ${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - rm -rf dist/ - java-pkg_filter-compiler jikes -} - -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" -EANT_EXTRA_ARGS="-Djaxp-present=true" -EANT_DOC_TARGET="" - -src_compile() { - if use javamail; then - EANT_GENTOO_CLASSPATH+="javamail,jaf" - EANT_EXTRA_ARGS+=" -Djavamail-present=true" - fi - if use jmx; then - use javamail && EANT_GENTOO_CLASSPATH+="," - EANT_GENTOO_CLASSPATH+="sun-jmx" - EANT_EXTRA_ARGS+=" -Djmx-present=true" - fi - if use jms; then - EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=/opt/openjms/lib/jms-1.0.2a.jar" - fi - java-pkg-2_src_compile -} - -src_install() { - java-pkg_newjar dist/lib/${P}.jar ${PN}.jar - - if use doc ; then - java-pkg_dohtml -r site/* - rm -fr "${D}/usr/share/doc/${PF}/html/apidocs" - java-pkg_dojavadoc --symlink apidocs site/apidocs - fi - use source && java-pkg_dosrc src/main/java/* -} |