public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/
@ 2015-09-17 20:56 James Le Cuirot
  0 siblings, 0 replies; 12+ messages in thread
From: James Le Cuirot @ 2015-09-17 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     af62f31f5ff65cc75271d0bad5263f8681df57d7
Author:     William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Wed Sep 16 22:12:47 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 18:11:31 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af62f31f

dev-java/log4j: Dropped jmx use flag as it is in the jdk/jre since 1.5

 dev-java/log4j/log4j-1.2.17-r2.ebuild | 71 +++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/dev-java/log4j/log4j-1.2.17-r2.ebuild b/dev-java/log4j/log4j-1.2.17-r2.ebuild
new file mode 100644
index 0000000..565e202
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.17-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc javamail jms jmx source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A low-overhead robust logging package for Java"
+SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
+HOMEPAGE="http://logging.apache.org/log4j/"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc javamail jms jmx source"
+
+CDEPEND="javamail? (
+			dev-java/oracle-javamail:0
+			java-virtuals/jaf:0
+		)
+		jms? (
+			java-virtuals/jms:0
+		)"
+
+RDEPEND=">=virtual/jre-1.6
+		${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+		${CDEPEND}"
+
+MY_P="apache-${P}"
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	rm -rf dist || die
+	java-pkg_filter-compiler jikes
+	rm -v *.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_BUILD_TARGET="log4j.jar"
+EANT_EXTRA_ARGS="-Djaxp-present=true -Djmx-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 jms; then
+		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
+	fi
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r site/*
+		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
+		java-pkg_dojavadoc --symlink apidocs site/apidocs
+	fi
+
+	if use source; then
+		java-pkg_dosrc src/main/java/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/
@ 2015-09-17 20:56 James Le Cuirot
  0 siblings, 0 replies; 12+ messages in thread
From: James Le Cuirot @ 2015-09-17 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     7353ebbad0d74ee2aab5c1d133740407e2c9f369
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 20:56:10 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 20:56:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7353ebba

dev-java/log4j: Remove old

Package-Manager: portage-2.2.20.1

 dev-java/log4j/log4j-1.2.17-r1.ebuild | 84 -----------------------------------
 dev-java/log4j/log4j-1.2.17.ebuild    | 80 ---------------------------------
 2 files changed, 164 deletions(-)

diff --git a/dev-java/log4j/log4j-1.2.17-r1.ebuild b/dev-java/log4j/log4j-1.2.17-r1.ebuild
deleted file mode 100644
index 9b57f95..0000000
--- a/dev-java/log4j/log4j-1.2.17-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc javamail jms jmx source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A low-overhead robust logging package for Java"
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://logging.apache.org/log4j/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc javamail jms jmx source"
-
-CDEPEND="javamail? (
-			dev-java/oracle-javamail:0
-			java-virtuals/jaf:0
-		)
-		jmx? (
-			dev-java/sun-jmx:0
-		)
-		jms? (
-			java-virtuals/jms:0
-		)"
-
-RDEPEND=">=virtual/jre-1.6
-		${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-		${CDEPEND}"
-
-MY_P="apache-${P}"
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	rm -rf dist || die
-	java-pkg_filter-compiler jikes
-	rm -v *.jar || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="log4j.jar"
-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
-		if use javamail; then
-			EANT_GENTOO_CLASSPATH+=","
-		fi
-
-		EANT_GENTOO_CLASSPATH+="sun-jmx"
-		EANT_EXTRA_ARGS+=" -Djmx-present=true"
-	fi
-
-	if use jms; then
-		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
-	fi
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r site/*
-		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
-		java-pkg_dojavadoc --symlink apidocs site/apidocs
-	fi
-
-	if use source; then
-		java-pkg_dosrc src/main/java/*
-	fi
-}

diff --git a/dev-java/log4j/log4j-1.2.17.ebuild b/dev-java/log4j/log4j-1.2.17.ebuild
deleted file mode 100644
index a16563b..0000000
--- a/dev-java/log4j/log4j-1.2.17.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc javamail jms jmx source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A low-overhead robust logging package for Java"
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://logging.apache.org/log4j/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc javamail jms jmx source"
-
-CDEPEND="javamail? (
-			java-virtuals/javamail
-			java-virtuals/jaf
-		)
-		jmx? ( dev-java/sun-jmx )
-		jms? ( java-virtuals/jms )"
-
-RDEPEND=">=virtual/jre-1.6
-		${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-		${CDEPEND}"
-
-MY_P="apache-${P}"
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	rm -rf dist || die
-	java-pkg_filter-compiler jikes
-	rm -v *.jar || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="log4j.jar"
-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
-		if use javamail; then
-			EANT_GENTOO_CLASSPATH+=","
-		fi
-
-		EANT_GENTOO_CLASSPATH+="sun-jmx"
-		EANT_EXTRA_ARGS+=" -Djmx-present=true"
-	fi
-
-	if use jms; then
-		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
-	fi
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r site/*
-		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
-		java-pkg_dojavadoc --symlink apidocs site/apidocs
-	fi
-
-	if use source; then
-		java-pkg_dosrc src/main/java/*
-	fi
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/
@ 2015-10-14  9:38 James Le Cuirot
  0 siblings, 0 replies; 12+ messages in thread
From: James Le Cuirot @ 2015-10-14  9:38 UTC (permalink / raw
  To: gentoo-commits

commit:     bb4510cd6fb18e60483e76fda4d7f6cdff721dfc
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 09:38:05 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 09:38:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb4510cd

dev-java/log4j: Clean up USE flags

No revbump necessary here. Fixes bug #563040.

Package-Manager: portage-2.2.20.1

 dev-java/log4j/log4j-1.2.17-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/log4j/log4j-1.2.17-r2.ebuild b/dev-java/log4j/log4j-1.2.17-r2.ebuild
index 565e202..f20c311 100644
--- a/dev-java/log4j/log4j-1.2.17-r2.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-r2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-JAVA_PKG_IUSE="doc javamail jms jmx source"
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://logging.apache.org/log4j/"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc javamail jms jmx source"
+IUSE="javamail jms"
 
 CDEPEND="javamail? (
 			dev-java/oracle-javamail:0


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/
@ 2015-10-18 18:57 Patrice Clement
  0 siblings, 0 replies; 12+ messages in thread
From: Patrice Clement @ 2015-10-18 18:57 UTC (permalink / raw
  To: gentoo-commits

commit:     af52d4a0b01b6069c3e5cee87e50a11714cd730a
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 18:55:36 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 18:56:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af52d4a0

dev-java/log4j: Mend classpath when using javamail and swap javamail with oracle-javamail. Fixes bug 563438.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/log4j/log4j-1.2.17-r3.ebuild | 71 +++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
new file mode 100644
index 0000000..1da34e9
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A low-overhead robust logging package for Java"
+SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
+HOMEPAGE="http://logging.apache.org/log4j/"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="javamail jms"
+
+CDEPEND="javamail? (
+			dev-java/oracle-javamail:0
+			java-virtuals/jaf:0
+		)
+		jms? (
+			java-virtuals/jms:0
+		)"
+
+RDEPEND=">=virtual/jre-1.6
+		${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+		${CDEPEND}"
+
+MY_P="apache-${P}"
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	rm -rf dist || die
+	java-pkg_filter-compiler jikes
+	rm -v *.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_BUILD_TARGET="log4j.jar"
+EANT_EXTRA_ARGS="-Djaxp-present=true -Djmx-present=true"
+EANT_DOC_TARGET=""
+
+src_compile() {
+	if use javamail; then
+		EANT_GENTOO_CLASSPATH+="oracle-javamail,jaf"
+		EANT_EXTRA_ARGS+=" -Djavamail-present=true"
+	fi
+	if use jms; then
+		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
+	fi
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r site/*
+		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
+		java-pkg_dojavadoc --symlink apidocs site/apidocs
+	fi
+
+	if use source; then
+		java-pkg_dosrc src/main/java/*
+	fi
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/
@ 2015-12-03 21:19 Patrice Clement
  0 siblings, 0 replies; 12+ messages in thread
From: Patrice Clement @ 2015-12-03 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     bddcb90cbc29bebf42906d3df13b066eb7be232e
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 17:10:07 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 21:19:03 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bddcb90c

dev-java/log4j: Clean up unused USE flag.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/log4j/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-java/log4j/metadata.xml b/dev-java/log4j/metadata.xml
index 1b3f29e..d5511ab 100644
--- a/dev-java/log4j/metadata.xml
+++ b/dev-java/log4j/metadata.xml
@@ -5,6 +5,5 @@
   <use>
     <flag name="javamail">Build the SMTPAppender</flag>
     <flag name="jms">Build the JMSAppender</flag>
-    <flag name="jmx">Build org.apace.log4j.jmx</flag>
   </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/
@ 2015-12-03 21:19 Patrice Clement
  0 siblings, 0 replies; 12+ messages in thread
From: Patrice Clement @ 2015-12-03 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     6243c9708fc548253965e41f725956f98613271e
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 17:09:29 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 21:19:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6243c970

dev-java/log4j: Clean up old.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/log4j/Manifest               |  1 -
 dev-java/log4j/log4j-1.2.16.ebuild    | 70 ----------------------------------
 dev-java/log4j/log4j-1.2.17-r2.ebuild | 71 -----------------------------------
 3 files changed, 142 deletions(-)

diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index 7fc2d24..b68b117 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,2 +1 @@
-DIST apache-log4j-1.2.16.tar.gz 2791979 SHA256 3a93ef38eb7ac9f851626d8b27cde7db1bfc78c1b587520fd740a0ab03e44c89 SHA512 d519c761579ce632a388164d9e492cf0327c4ed96522c92e3d9addfdb2c3a12b4a63a6ff7fc7455236bda61e265c1521ddf39cd8dfeac3e8c808ca982acaee97 WHIRLPOOL 07c67669d8670e7a624f14f3757b2be595a5f05b59e4c98b6ac0af12ead0a52b9608dc1068ef4737aee8cb653f3a81ca0a96fdcf7efb36f06e51a2b30f33d969
 DIST log4j-1.2.17.tar.gz 2864448 SHA256 a528e3771ee6234661b5eb0fa02e14faee89dfec38de94088c163ddf2a0a8663 SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8 WHIRLPOOL 1fc1b420e78bb56ca05282c81f12d5911f8966228194a8f5090a32cfa0403332b36589c7841b06c3bfd602f0f13cdf8342e678de01446e4260cffd8a57a6c175

diff --git a/dev-java/log4j/log4j-1.2.16.ebuild b/dev-java/log4j/log4j-1.2.16.ebuild
deleted file mode 100644
index 88f4d8e..0000000
--- a/dev-java/log4j/log4j-1.2.16.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-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 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-# 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? ( java-virtuals/jms )"
-
-RDEPEND=">=virtual/jre-1.4
-		${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-		${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	rm -rf dist/
-	java-pkg_filter-compiler jikes
-	rm -v *.jar || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="log4j.jar"
-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=$(java-pkg_getjars jms)"
-	fi
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	# the build still builds files with older version in name
-	java-pkg_newjar dist/lib/${PN}-1.2.15.jar ${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r site/*
-		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
-		java-pkg_dojavadoc --symlink apidocs site/apidocs
-	fi
-	use source && java-pkg_dosrc src/main/java/*
-}

diff --git a/dev-java/log4j/log4j-1.2.17-r2.ebuild b/dev-java/log4j/log4j-1.2.17-r2.ebuild
deleted file mode 100644
index f20c311..0000000
--- a/dev-java/log4j/log4j-1.2.17-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A low-overhead robust logging package for Java"
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://logging.apache.org/log4j/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="javamail jms"
-
-CDEPEND="javamail? (
-			dev-java/oracle-javamail:0
-			java-virtuals/jaf:0
-		)
-		jms? (
-			java-virtuals/jms:0
-		)"
-
-RDEPEND=">=virtual/jre-1.6
-		${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-		${CDEPEND}"
-
-MY_P="apache-${P}"
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	rm -rf dist || die
-	java-pkg_filter-compiler jikes
-	rm -v *.jar || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="log4j.jar"
-EANT_EXTRA_ARGS="-Djaxp-present=true -Djmx-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 jms; then
-		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
-	fi
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r site/*
-		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
-		java-pkg_dojavadoc --symlink apidocs site/apidocs
-	fi
-
-	if use source; then
-		java-pkg_dosrc src/main/java/*
-	fi
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/
@ 2015-12-03 21:19 Patrice Clement
  0 siblings, 0 replies; 12+ messages in thread
From: Patrice Clement @ 2015-12-03 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     7ef3441bf2787508af962859b63873fe41147677
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 17:08:58 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 21:18:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef3441b

dev-java/log4j: Stable for amd64. Retroactively stable for the remaining arches using the ALLARCHES policy.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/log4j/log4j-1.2.17-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
index 1da34e9..6727a50 100644
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://logging.apache.org/log4j/"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="javamail jms"
 
 CDEPEND="javamail? (


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/
@ 2017-07-05  9:56 Patrice Clement
  0 siblings, 0 replies; 12+ messages in thread
From: Patrice Clement @ 2017-07-05  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     37cd080b9d968d8c5fa7f39daac2a40f55837bd2
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 20:35:29 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 09:50:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37cd080b

dev-java/log4j: remove java-virtuals/jaf dependency.

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-java/log4j/log4j-1.2.17-r3.ebuild | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
index 8ad08cbf8d1..99065ce40fb 100644
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
@@ -14,27 +15,24 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ppc64 x86"
 IUSE="javamail jms"
 
-CDEPEND="javamail? (
-			dev-java/oracle-javamail:0
-			java-virtuals/jaf:0
-		)
-		jms? (
-			java-virtuals/jms:0
-		)"
+CDEPEND="
+	javamail? ( dev-java/oracle-javamail:0 )
+	jms? ( java-virtuals/jms:0 )"
 
-RDEPEND=">=virtual/jre-1.6
-		${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
-DEPEND=">=virtual/jdk-1.6
-		${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6"
 
 MY_P="apache-${P}"
 S="${WORKDIR}/${MY_P}"
 
-java_prepare() {
-	rm -rf dist || die
-	java-pkg_filter-compiler jikes
-	rm -v *.jar || die
+src_prepare() {
+	default
+	java-pkg_clean
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
@@ -45,9 +43,10 @@ EANT_DOC_TARGET=""
 
 src_compile() {
 	if use javamail; then
-		EANT_GENTOO_CLASSPATH+="oracle-javamail,jaf"
+		EANT_GENTOO_CLASSPATH+="oracle-javamail"
 		EANT_EXTRA_ARGS+=" -Djavamail-present=true"
 	fi
+
 	if use jms; then
 		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
 	fi
@@ -58,7 +57,7 @@ src_compile() {
 src_install() {
 	java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
 
-	if use doc ; then
+	if use doc; then
 		java-pkg_dohtml -r site/*
 		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
 		java-pkg_dojavadoc --symlink apidocs site/apidocs


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/
@ 2017-07-13 12:13 Alexis Ballier
  0 siblings, 0 replies; 12+ messages in thread
From: Alexis Ballier @ 2017-07-13 12:13 UTC (permalink / raw
  To: gentoo-commits

commit:     4f77bdc351a5ea1be27e907952c118be35e20d59
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 12:12:22 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 12:13:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f77bdc3

dev-java/log4j: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/log4j/log4j-1.2.17-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
index 99065ce40fb..0707d2074e3 100644
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://logging.apache.org/log4j/"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="javamail jms"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/
@ 2018-02-02  9:05 Fabian Groffen
  0 siblings, 0 replies; 12+ messages in thread
From: Fabian Groffen @ 2018-02-02  9:05 UTC (permalink / raw
  To: gentoo-commits

commit:     3c3c17b592e8b61efc475526afaa45dac3ad7e6a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  2 08:50:57 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Feb  2 09:05:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c3c17b5

dev-java/log4j: marked ~amd64-linux

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-java/log4j/log4j-1.2.17-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
index 0707d2074e3..fb7e7820dbe 100644
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://logging.apache.org/log4j/"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux"
 IUSE="javamail jms"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/
@ 2021-04-05 10:34 Miroslav Šulc
  0 siblings, 0 replies; 12+ messages in thread
From: Miroslav Šulc @ 2021-04-05 10:34 UTC (permalink / raw
  To: gentoo-commits

commit:     9e0ab3927fc357258c927cd61043b0f2b2cfcb6a
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Apr  1 11:07:39 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 10:34:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e0ab392

dev-java/log4j: MAVEN_ID

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20210/commits/d4ed824d89636975dad13a88a7c16ced740bba76
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/log4j/log4j-1.2.17-r3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
index fb7e7820dbe..0fa931af9d4 100644
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="log4j:log4j:1.2.17"
 
 inherit java-pkg-2 java-ant-2
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/
@ 2021-05-16 18:58 Sam James
  0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2021-05-16 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     ab0e79448ebc35c45538a34f8a08ca9839c2763e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 18:57:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 16 18:57:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0e7944

dev-java/log4j: Stabilize 1.2.17-r3 arm64, #784407

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/log4j/log4j-1.2.17-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
index 0fa931af9d4..ee8247958b4 100644
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://logging.apache.org/log4j/"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux"
 IUSE="javamail jms"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2021-05-16 18:58 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-13 12:13 [gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/ Alexis Ballier
  -- strict thread matches above, loose matches on Subject: below --
2021-05-16 18:58 Sam James
2021-04-05 10:34 Miroslav Šulc
2018-02-02  9:05 Fabian Groffen
2017-07-05  9:56 Patrice Clement
2015-12-03 21:19 Patrice Clement
2015-12-03 21:19 Patrice Clement
2015-12-03 21:19 Patrice Clement
2015-10-18 18:57 Patrice Clement
2015-10-14  9:38 James Le Cuirot
2015-09-17 20:56 James Le Cuirot
2015-09-17 20:56 James Le Cuirot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox