[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Mikle Kolyada]

commit:     f21a19b37284f7bf9e2c14842f2ea8aa1faa7b99
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 20:50:21 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 20:50:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f21a19b3

dev-java/commons-logging: amd64 stable wrt bug #556866

Package-Manager: portage-2.2.20.1

 dev-java/commons-logging/commons-logging-1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2.ebuild b/dev-java/commons-logging/commons-logging-1.2.ebuild
index e1edb14..aa4f49f 100644
--- a/dev-java/commons-logging/commons-logging-1.2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-logkit log4j servletapi avalon-framework"
 
 COMMON_DEP="

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Mikle Kolyada]

commit:     392eddcaf1fd1bbc751d58cfe0d7050f0c43eb71
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 14:14:10 2015 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 14:14:43 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=392eddca

dev-java/commons-logging: x86 stable wrt bug #556866

Package-Manager: portage-2.2.20.1

 dev-java/commons-logging/commons-logging-1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2.ebuild b/dev-java/commons-logging/commons-logging-1.2.ebuild
index aa4f49f..b6bff75 100644
--- a/dev-java/commons-logging/commons-logging-1.2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-logkit log4j servletapi avalon-framework"
 
 COMMON_DEP="

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Patrice Clement]

commit:     c284d4257afa9f83ae7f520db35650036ba806f3
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 19:31:14 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 19:33:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c284d425

dev-java/commons-logging: Stable for ppc+ppc64. Fixes bug 556866.

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

 dev-java/commons-logging/commons-logging-1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2.ebuild b/dev-java/commons-logging/commons-logging-1.2.ebuild
index b6bff75..6f1ff9c 100644
--- a/dev-java/commons-logging/commons-logging-1.2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-logkit log4j servletapi avalon-framework"
 
 COMMON_DEP="

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Patrice Clement]

commit:     07149d583f446ab4f7285b0770460e6ee2fa27e1
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 19:32:57 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 19:33:34 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07149d58

dev-java/commons-logging: Remove old.

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

 dev-java/commons-logging/Manifest                  |  1 -
 .../commons-logging/commons-logging-1.1.1.ebuild   | 74 ----------------------
 2 files changed, 75 deletions(-)

diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 69ad80a..7a11d85 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,2 +1 @@
-DIST commons-logging-1.1.1-src.tar.gz 190670 SHA256 b49a79fa78ebfae15dc46ae6f0144fee6b94ab608a25518c54609d3419909eb2 SHA512 ccba6cb8078807219dfe4a771c2e6f5569190b52ca00a605a0445b53697d9162c62237fc34ead2960146603b018769f406fe9e47b2eefe0d0fb6ad993c669974 WHIRLPOOL b28ad3dcad851ccbe7fffe9968426b67fb3b6a372de85aa6adb055db5f3eaf621d63f81b9bf74dd6d4958fd681b29272898fc6907b5681a431af0772f876ec16
 DIST commons-logging-1.2-src.tar.gz 188536 SHA256 49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 WHIRLPOOL fe31832404d9071d73fba940021ab664998ffa9867a88c2078918547cc6a23a06339f33f5d74f8b6ea5aaeeb86cd94c0aef6c6195e454a651b8fc492a1a6b5f8

diff --git a/dev-java/commons-logging/commons-logging-1.1.1.ebuild b/dev-java/commons-logging/commons-logging-1.1.1.ebuild
deleted file mode 100644
index d7ce033..0000000
--- a/dev-java/commons-logging/commons-logging-1.1.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="1"
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries"
-HOMEPAGE="http://commons.apache.org/logging/"
-SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="avalon-logkit log4j servletapi avalon-framework"
-
-COMMON_DEP="
-	avalon-logkit? ( dev-java/avalon-logkit:1.2 )
-	log4j? ( dev-java/log4j:0 )
-	servletapi? ( java-virtuals/servlet-api:2.3 )
-	avalon-framework? ( dev-java/avalon-framework:4.2 )"
-# ATTENTION: Add this when log4j-1.3 is out
-#	=dev-java/log4j-1.3*
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src/"
-
-RESTRICT="!servletapi? ( test )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	# TODO file upstream -nichoj
-	epatch "${FILESDIR}/${P}-servletapi.patch"
-
-	# bug 200918
-	java-ant_ignore-system-classes
-
-	# bug #208098
-	echo "jdk.1.4.present=true" > build.properties
-	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties
-	# ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
-	#echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
-	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
-	use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties
-	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
-	java-pkg_filter-compiler jikes ecj-3.2
-
-	if use test && ! use servletapi; then
-		eerror "Tests need use servletapi, tests not executed"
-	fi
-}
-
-EANT_BUILD_TARGET="compile"
-
-src_install() {
-	java-osgi_newjar-fromfile "target/${P}-SNAPSHOT.jar" "${FILESDIR}/${P}-manifest" "Apache Commons Logging"
-	java-pkg_newjar target/${PN}-api-${PV}-SNAPSHOT.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-adapters-${PV}-SNAPSHOT.jar ${PN}-adapters.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	dohtml PROPOSAL.html STATUS.html || die
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/java/org
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[James Le Cuirot]

commit:     a5e68f7eff5d7c836a1b977d2c2eab5749870ef7
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 21:44:59 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 21:47:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e68f7e

dev-java/commons-logging: Use newer deps, fix tests, general tidy up

 - Use newer avalon-logkit so we can kill 1.2
 - Use newer servlet-api because it's very compatible
 - log4j 1.3 was never actually released
 - java-pkg-2_src_test isn't called automatically
 - jikes is dead and we don't really support other compilers anyway

Package-Manager: portage-2.2.28

 .../commons-logging/commons-logging-1.2-r1.ebuild  | 66 ++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
new file mode 100644
index 0000000..0dc2cc8
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 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 java-osgi
+
+DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
+HOMEPAGE="http://commons.apache.org/logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="avalon-framework avalon-logkit log4j servletapi test"
+RESTRICT="!servletapi? ( test )"
+
+CDEPEND="avalon-framework? ( dev-java/avalon-framework:4.2 )
+	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
+	log4j? ( dev-java/log4j:0 )
+	servletapi? ( java-virtuals/servlet-api:3.1 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src"
+
+EANT_BUILD_TARGET="compile"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	epatch "${FILESDIR}/${P}-servletapi.patch"
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties
+
+	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
+	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties
+	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties
+	use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties
+}
+
+src_install() {
+	local pkg=org.apache.commons.logging
+	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
+	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml PROPOSAL.html || die
+	use doc && java-pkg_dojavadoc target/docs/
+	use source && java-pkg_dosrc src/main/java/org
+}
+
+src_test() {
+	java-pkg-2_src_test
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Michael Weber]

commit:     a57739eb746f6c53dcf80c3def92f9a88d4855e4
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 00:34:19 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 00:34:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57739eb

dev-java/commons-logging: ppc64 stable (bug 605924).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-java/commons-logging/commons-logging-1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
index 879d0663df..81ac713b62 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://commons.apache.org/logging/"
 SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!servletapi? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Alexis Ballier]

commit:     a23a609e32d9c9b5de6940ac16a576626f3042e9
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 12:12:05 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=a23a609e

dev-java/commons-logging: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/commons-logging/commons-logging-1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
index d3522a12fd7..7395698dde9 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://commons.apache.org/logging/"
 SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!servletapi? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[James Le Cuirot]

commit:     3ee951f48488a6b3d8cbfc09977b2aaa1f9663d0
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 21:58:41 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 22:01:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee951f4

dev-java/commons-logging: Remove old 1.2

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 .../commons-logging/commons-logging-1.2.ebuild     | 70 ----------------------
 1 file changed, 70 deletions(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2.ebuild b/dev-java/commons-logging/commons-logging-1.2.ebuild
deleted file mode 100644
index 024eb121b50..00000000000
--- a/dev-java/commons-logging/commons-logging-1.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
-HOMEPAGE="http://commons.apache.org/logging/"
-SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="avalon-logkit log4j servletapi avalon-framework"
-
-COMMON_DEP="
-	avalon-logkit? ( dev-java/avalon-logkit:1.2 )
-	log4j? ( dev-java/log4j:0 )
-	servletapi? ( java-virtuals/servlet-api:2.3 )
-	avalon-framework? ( dev-java/avalon-framework:4.2 )"
-# ATTENTION: Add this when log4j-1.3 is out
-#	=dev-java/log4j-1.3*
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEP}
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src/"
-
-RESTRICT="!servletapi? ( test )"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	# TODO file upstream -nichoj
-	epatch "${FILESDIR}/${P}-servletapi.patch"
-
-	# bug 200918
-	java-ant_ignore-system-classes
-
-	# bug #208098
-	echo "jdk.1.4.present=true" > build.properties
-	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties
-	# ATTENTION: Add this when log4j-1.3 is out (check the SLOT)
-	#echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties
-	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
-	use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties
-	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
-	java-pkg_filter-compiler jikes ecj-3.2
-
-	if use test && ! use servletapi; then
-		eerror "Tests need use servletapi, tests not executed"
-	fi
-}
-
-EANT_BUILD_TARGET="compile"
-
-src_install() {
-	java-osgi_newjar "target/${P}.jar" "org.apache.commons.logging" "Apache Commons Logging" "org.apache.commons.logging;version=\"${PV}\", org.apache.commons.logging.impl;version=\"${PV}\""
-	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	dohtml PROPOSAL.html || die
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/main/java/org
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[James Le Cuirot]

commit:     df95321ca7e8c5669dfc8216b5738695d7930174
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 21:58:15 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 22:01:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df95321c

dev-java/commons-logging: amd64, x86 stable using ALLARCHES (#605924)

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 dev-java/commons-logging/commons-logging-1.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
index 7395698dde9..e39e1e32894 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://commons.apache.org/logging/"
 SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!servletapi? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Patrice Clement]

commit:     d865bf61655e46f7c83d864c6a8d5a49c0f49704
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 10:11:35 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 10:27:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d865bf61

dev-java/commons-logging: EAPI 6 bump.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../commons-logging/commons-logging-1.2-r2.ebuild  | 89 ++++++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
new file mode 100644
index 00000000000..bb17056e251
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
+HOMEPAGE="https://commons.apache.org/logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="avalon-framework avalon-logkit log4j servletapi test"
+RESTRICT="!servletapi? ( test )"
+
+CDEPEND="
+	log4j? ( dev-java/log4j:0 )
+	servletapi? ( java-virtuals/servlet-api:3.1 )
+	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
+	avalon-framework? ( dev-java/avalon-framework:4.2 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET=""
+
+PATCH=(
+	# patch to make the build.xml respect no servletapi
+	"${FILESDIR}/${P}-servletapi.patch"
+	"${FILESDIR}/${P}-gentoo.patch"
+)
+
+DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
+
+src_prepare() {
+	default
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties || die
+
+	if use servletapi; then
+		echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die
+	fi
+	if use avalon-framework; then
+		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
+	fi
+	if use avalon-logkit; then
+		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
+	fi
+	if use log4j; then
+		echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties || die
+	fi
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	if use doc; then
+		ejavadoc -d api -sourcepath src/main/java -subpackages org || die
+	fi
+}
+
+src_install() {
+	local pkg="org.apache.commons.logging"
+	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
+	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
+
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc src/main/java/org
+}
+
+src_test() {
+	java-pkg-2_src_test
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Patrice Clement]

commit:     300bbfeadd6383d672c55889dd00eee6302be0f3
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 19:55:57 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 22:35:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=300bbfea

dev-java/commons-logging: fix compilation failure.

Closes: https://bugs.gentoo.org/647868
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../commons-logging/commons-logging-1.2-r2.ebuild  | 30 ++++++++--------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
index bb17056e251..9d530b2fd23 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
@@ -34,28 +34,22 @@ DEPEND="
 
 S="${WORKDIR}/${P}-src"
 
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_BUILD_TARGET="compile"
-EANT_DOC_TARGET=""
-
-PATCH=(
-	# patch to make the build.xml respect no servletapi
-	"${FILESDIR}/${P}-servletapi.patch"
-	"${FILESDIR}/${P}-gentoo.patch"
-)
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
 
 DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
 
 src_prepare() {
 	default
 
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	epatch "${FILESDIR}/${P}-servletapi.patch"
+
 	# bug #208098
 	echo "jdk.1.4.present=true" > build.properties || die
 
-	if use servletapi; then
-		echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die
-	fi
 	if use avalon-framework; then
 		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
 	fi
@@ -65,22 +59,20 @@ src_prepare() {
 	if use log4j; then
 		echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties || die
 	fi
-}
 
-src_compile() {
-	java-pkg-2_src_compile
-	if use doc; then
-		ejavadoc -d api -sourcepath src/main/java -subpackages org || die
+	if use servletapi; then
+		echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die
 	fi
 }
 
 src_install() {
-	local pkg="org.apache.commons.logging"
+	local pkg=org.apache.commons.logging
 	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
 	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
 	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
 
-	use doc && java-pkg_dojavadoc api
+	einstalldocs
+	use doc && java-pkg_dojavadoc target/docs/
 	use source && java-pkg_dosrc src/main/java/org
 }
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Patrice Clement]

commit:     33b8c81a952d78993f96f1200920481056be36ef
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Tue Apr 10 21:52:01 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 21:03:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b8c81a

dev-java/commons-logging: http->https.

Also some formatting changes on -r1 to make it match -r2.

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-java/commons-logging/commons-logging-1.2-r1.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
index be6e19cbc56..d31cbb5b606 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -8,8 +8,9 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2 java-osgi
 
 DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
-HOMEPAGE="http://commons.apache.org/logging/"
+HOMEPAGE="https://commons.apache.org/logging/"
 SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -21,10 +22,12 @@ CDEPEND="avalon-framework? ( dev-java/avalon-framework:4.2 )
 	log4j? ( dev-java/log4j:0 )
 	servletapi? ( java-virtuals/servlet-api:3.1 )"
 
-RDEPEND="${CDEPEND}
+RDEPEND="
+	${CDEPEND}
 	>=virtual/jre-1.6"
 
-DEPEND="${CDEPEND}
+DEPEND="
+	${CDEPEND}
 	>=virtual/jdk-1.6
 	test? ( dev-java/ant-junit:0 )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     6cb8b61f2fd7a91da3f4a27df84733e385c3e058
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Apr 18 20:54:15 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 17:57:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb8b61f

dev-java/commons-logging: 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/20456/commits/d1d2b82a5ae4424ab46b8355d3bd22e323497b69
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
index e36cb359aad..3c903e12ee7 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-logging:commons-logging:1.2"
 
 inherit java-pkg-2 java-ant-2 java-osgi
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     097ceebc70ffed974f1e862b3c7dc85c637a9501
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Apr 21 09:45:30 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 10:00:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=097ceebc

dev-java/commons-logging: remove obsolete

Bug: https://bugs.gentoo.org/784767
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/20485
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../commons-logging/commons-logging-1.2-r2.ebuild  | 82 ----------------------
 1 file changed, 82 deletions(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
deleted file mode 100644
index 3c903e12ee7..00000000000
--- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-logging:commons-logging:1.2"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
-HOMEPAGE="https://commons.apache.org/logging/"
-SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="avalon-framework avalon-logkit log4j servletapi test"
-RESTRICT="!test? ( test ) !servletapi? ( test )"
-
-CDEPEND="
-	log4j? ( dev-java/log4j:0 )
-	servletapi? ( java-virtuals/servlet-api:3.1 )
-	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
-	avalon-framework? ( dev-java/avalon-framework:4.2 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src"
-
-EANT_BUILD_TARGET="compile"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
-
-DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	eapply "${FILESDIR}/${P}-servletapi.patch"
-
-	# bug #208098
-	echo "jdk.1.4.present=true" > build.properties || die
-
-	if use avalon-framework; then
-		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
-	fi
-	if use avalon-logkit; then
-		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
-	fi
-	if use log4j; then
-		echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties || die
-	fi
-
-	if use servletapi; then
-		echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die
-	fi
-}
-
-src_install() {
-	local pkg=org.apache.commons.logging
-	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
-	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
-
-	einstalldocs
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/main/java/org
-}
-
-src_test() {
-	java-pkg-2_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     eefedcc8a610892342944b4fd86ca8b6fdbe23d5
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Apr 21 09:43:40 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 10:00:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eefedcc8

dev-java/commons-logging: EAPI 7, java min 1.8

Bug: https://bugs.gentoo.org/784767
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../commons-logging/commons-logging-1.2-r3.ebuild  | 82 ++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
new file mode 100644
index 00000000000..c81c87a1e7e
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-logging:commons-logging:1.2"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
+HOMEPAGE="https://commons.apache.org/logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="avalon-framework avalon-logkit log4j servletapi test"
+RESTRICT="!test? ( test ) !servletapi? ( test )"
+
+CDEPEND="
+	log4j? ( dev-java/log4j:0 )
+	servletapi? ( java-virtuals/servlet-api:3.1 )
+	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
+	avalon-framework? ( dev-java/avalon-framework:4.2 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src"
+
+EANT_BUILD_TARGET="compile"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
+
+DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	eapply "${FILESDIR}/${P}-servletapi.patch"
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties || die
+
+	if use avalon-framework; then
+		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
+	fi
+	if use avalon-logkit; then
+		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
+	fi
+	if use log4j; then
+		echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties || die
+	fi
+
+	if use servletapi; then
+		echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die
+	fi
+}
+
+src_install() {
+	local pkg=org.apache.commons.logging
+	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
+	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
+
+	einstalldocs
+	use doc && java-pkg_dojavadoc target/docs/
+	use source && java-pkg_dosrc src/main/java/org
+}
+
+src_test() {
+	java-pkg-2_src_test
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     679c816adee5cfd206657872d055cc25dfa21124
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 10:00:27 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 10:00:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=679c816a

dev-java/commons-logging: switched 1.2-r3 to tomcat-servlet-api:4.0

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r3.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index c81c87a1e7e..43b5a612518 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -14,15 +14,15 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
 
 CDEPEND="
-	log4j? ( dev-java/log4j:0 )
-	servletapi? ( java-virtuals/servlet-api:3.1 )
 	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
-	avalon-framework? ( dev-java/avalon-framework:4.2 )"
+	avalon-framework? ( dev-java/avalon-framework:4.2 )
+	log4j? ( dev-java/log4j:0 )
+	servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
 
 RDEPEND="
 	${CDEPEND}
@@ -62,7 +62,7 @@ src_prepare() {
 	fi
 
 	if use servletapi; then
-		echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die
+		echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die
 	fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Sergei Trofimovich]

commit:     a47cac103445f26ff4f8d4a3a289c6ae380c9727
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 09:16:37 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 09:18:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47cac10

dev-java/commons-logging: keyworded 1.2-r3 for ppc64

keyworded wrt bug #784776

Package-Manager: Portage-3.0.18, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index 43b5a612518..bc6d4e26fd4 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Agostino Sarubbo]

commit:     b140a9f6cc466e3f38ced47a99f8439efc59c356
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 18:18:10 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat May  1 18:19:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b140a9f6

dev-java/commons-logging: amd64 stable wrt bug #784767

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index bc6d4e26fd4..8abf39696e2 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Sergei Trofimovich]

commit:     805cddf5cd24b7ab2d1d81d4aa9960b26ab8e413
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu May  6 07:06:57 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu May  6 07:22:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=805cddf5

dev-java/commons-logging: stable 1.2-r3 for ppc64

stable wrt bug #784767

Package-Manager: Portage-3.0.18, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index 8abf39696e2..0b487ad920d 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Agostino Sarubbo]

commit:     af88ccb825f577076170f9a0c3c0a8bca804af8e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun May  9 09:17:02 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun May  9 09:17:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af88ccb8

dev-java/commons-logging: x86 stable wrt bug #784767

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index 0b487ad920d..adffeb36c05 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     807a472115cbe4f42c8091bf08bc89034f8643f6
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun May  9 10:02:37 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun May  9 10:02:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807a4721

dev-java/commons-logging: removed obsolete 1.2-r1

Bug: https://bugs.gentoo.org/784767
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../commons-logging/commons-logging-1.2-r1.ebuild  | 68 ----------------------
 1 file changed, 68 deletions(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
deleted file mode 100644
index 890c4bea49a..00000000000
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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 java-osgi
-
-DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
-HOMEPAGE="https://commons.apache.org/logging/"
-SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="avalon-framework avalon-logkit log4j servletapi test"
-RESTRICT="!test? ( test ) !servletapi? ( test )"
-
-CDEPEND="avalon-framework? ( dev-java/avalon-framework:4.2 )
-	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
-	log4j? ( dev-java/log4j:0 )
-	servletapi? ( java-virtuals/servlet-api:3.1 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src"
-
-EANT_BUILD_TARGET="compile"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	epatch "${FILESDIR}/${P}-servletapi.patch"
-
-	# bug #208098
-	echo "jdk.1.4.present=true" > build.properties
-
-	use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
-	use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties
-	use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties
-	use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties
-}
-
-src_install() {
-	local pkg=org.apache.commons.logging
-	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
-	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
-
-	dodoc RELEASE-NOTES.txt
-	dohtml PROPOSAL.html
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/main/java/org
-}
-
-src_test() {
-	java-pkg-2_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Sam James]

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

dev-java/commons-logging: Stabilize 1.2-r3 arm64, #784407

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

 dev-java/commons-logging/commons-logging-1.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index adffeb36c05..1be76e85241 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     774db98c4095508bab67dbc6ab600a0d17c8d2ed
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jan 26 12:08:52 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jan 27 08:17:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=774db98c

dev-java/commons-logging: REQUIRED_USE="doc?

Closes: https://bugs.gentoo.org/820863
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23964
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index 86716083acb8..4635bb99ffe2 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
+REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
 RESTRICT="!test? ( test ) !servletapi? ( test )"
 
 CDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     c6b542e104cc0376c56318e9fc62479e0c9527c1
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Dec 31 15:44:45 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 09:43:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6b542e1

dev-java/commons-logging: Switch to log4j-12-api:2

Closes: https://bugs.gentoo.org/830921
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24106/commits/077433f7667e2891b1527053b817c29921bd7d1d
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../commons-logging/commons-logging-1.2-r4.ebuild  | 88 ++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r4.ebuild b/dev-java/commons-logging/commons-logging-1.2-r4.ebuild
new file mode 100644
index 000000000000..9358fff71a26
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.2-r4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-logging:commons-logging:1.2"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
+HOMEPAGE="https://commons.apache.org/logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="avalon-framework avalon-logkit log4j servletapi test"
+REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
+RESTRICT="!test? ( test ) !servletapi? ( test )"
+
+CDEPEND="
+	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
+	avalon-framework? ( dev-java/avalon-framework:4.2 )
+	log4j? ( dev-java/log4j-12-api:2 )
+	servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src"
+
+EANT_BUILD_TARGET="compile"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
+
+DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	eapply "${FILESDIR}/${P}-servletapi.patch"
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties || die
+
+	if use avalon-framework; then
+		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
+		EANT_GENTOO_CLASSPATH+=" avalon-framework-4.2"
+	fi
+	if use avalon-logkit; then
+		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
+		EANT_GENTOO_CLASSPATH+=" avalon-logkit-2.0"
+	fi
+	if use log4j; then
+		echo "log4j12.jar=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)" >> build.properties || die
+		EANT_GENTOO_CLASSPATH+=" log4j-12-api-2 log4j-core-2"
+	fi
+
+	if use servletapi; then
+		echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die
+		EANT_GENTOO_CLASSPATH+=" tomcat-servlet-api-4.0"
+	fi
+}
+
+src_install() {
+	local pkg=org.apache.commons.logging
+	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
+	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
+
+	einstalldocs
+	use doc && java-pkg_dojavadoc target/docs/
+	use source && java-pkg_dosrc src/main/java/org
+}
+
+src_test() {
+	java-pkg-2_src_test
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Arthur Zamarin]

commit:     dd4942ad87dd4794396d6b623e5cc04ab47a4078
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 18:53:11 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 18:53:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4942ad

dev-java/commons-logging: Keyword 1.2-r4 arm, #833985

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r4.ebuild b/dev-java/commons-logging/commons-logging-1.2-r4.ebuild
index 9358fff71a26..d32f9e36c65e 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r4.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
 RESTRICT="!test? ( test ) !servletapi? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     de2db80524e6e55868462ac22d89c48ff37e341a
Author:     Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sat Feb 26 02:59:49 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 08:48:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2db805

dev-java/commons-logging: Let build.xml accept log4j-12-api as Log4j 1.2

Closes: https://bugs.gentoo.org/834036
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24352
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 ...1.2-r4.ebuild => commons-logging-1.2-r5.ebuild} | 48 ++++++++++++++++++----
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r4.ebuild b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
similarity index 53%
rename from dev-java/commons-logging/commons-logging-1.2-r4.ebuild
rename to dev-java/commons-logging/commons-logging-1.2-r5.ebuild
index d32f9e36c65e..cfe4860720b9 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r4.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
@@ -22,7 +22,11 @@ RESTRICT="!test? ( test ) !servletapi? ( test )"
 CDEPEND="
 	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
 	avalon-framework? ( dev-java/avalon-framework:4.2 )
-	log4j? ( dev-java/log4j-12-api:2 )
+	log4j? (
+		dev-java/log4j-12-api:2
+		dev-java/log4j-api:2
+		dev-java/log4j-core:2
+	)
 	servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
 
 RDEPEND="
@@ -38,7 +42,6 @@ S="${WORKDIR}/${P}-src"
 
 EANT_BUILD_TARGET="compile"
 JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
 JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
 
 DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
@@ -55,20 +58,41 @@ src_prepare() {
 
 	if use avalon-framework; then
 		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
-		EANT_GENTOO_CLASSPATH+=" avalon-framework-4.2"
 	fi
 	if use avalon-logkit; then
 		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
-		EANT_GENTOO_CLASSPATH+=" avalon-logkit-2.0"
 	fi
 	if use log4j; then
-		echo "log4j12.jar=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)" >> build.properties || die
-		EANT_GENTOO_CLASSPATH+=" log4j-12-api-2 log4j-core-2"
+		# log4j12.jar can only contain path to one single file because
+		# build.xml decides whether the Log4JLogger should be built with
+		# <available file="${log4j12.jar}" property="log4j12.present"/>,
+		# and a value that contains multiple file paths will cause the
+		# test to return a negative result.  However, classes from multiple
+		# Log4j 2 JARs are needed to compile the sources.  So, we combine
+		# them into a single JAR on the go.
+		# https://bugs.gentoo.org/834036
+		mkdir -p "${T}/log4j-2" ||
+			die "Failed to create temporary directory for Log4j 2 classes"
+		pushd "${T}/log4j-2" > /dev/null ||
+			die "Failed to enter temporary directory for Log4j 2 classes"
+
+		local jar="$(java-config -j)"
+		local dep
+		for dep in log4j-{12-api,api,core}; do
+			# Assuming SLOT="2" for Log4j 2 dependencies
+			"${jar}" -xf "$(java-pkg_getjar "${dep}-2" "${dep}.jar")" ||
+				die "Failed to extract files from ${dep}-2 installed on system"
+		done
+		"${jar}" -cf log4j-2.jar . || die "Failed to create JAR for Log4j"
+
+		popd > /dev/null ||
+			die "Failed to leave temporary directory for Log4j 2 classes"
+
+		echo "log4j12.jar=${T}/log4j-2/log4j-2.jar" >> build.properties || die
 	fi
 
 	if use servletapi; then
 		echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die
-		EANT_GENTOO_CLASSPATH+=" tomcat-servlet-api-4.0"
 	fi
 }
 
@@ -84,5 +108,15 @@ src_install() {
 }
 
 src_test() {
+	# Do not run Log4j tests because these tests use an Appender to verify
+	# logging correctness.  The log4j-12-api bridge no longer supports using an
+	# Appender for verifications since the methods for adding an Appender in
+	# the bridge "are largely no-ops".  This means an Appender's state would
+	# never be changed by log4j-12-api after new messages are logged.  The test
+	# cases, however, expect changes to the Appender's state in such an event,
+	# so they would fail with log4j-12-api.
+	# https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
+	sed -i -e "/^log4j12\.jar=/d" build.properties ||
+		die "Failed to skip Log4j tests by modifying build.properties"
 	java-pkg-2_src_test
 }

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Arthur Zamarin]

commit:     a02d8ffa8db335e39c302721ce58444c1f87d453
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 26 11:53:26 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 26 11:53:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a02d8ffa

dev-java/commons-logging: Keyword 1.2-r5 arm64, #833985

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
index cfe4860720b9..f93740de50e1 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
 RESTRICT="!test? ( test ) !servletapi? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Jakov Smolić]

commit:     b70ed328643c75b670fcf9f230f413518f40c8d6
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 11:08:08 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 11:08:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b70ed328

dev-java/commons-logging: Stabilize 1.2-r5 amd64, #835505

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
index f93740de50e1..96d3bb3a0e4e 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
 RESTRICT="!test? ( test ) !servletapi? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Jakov Smolić]

commit:     4188105d8954b0e474d602e551e565ca0d7ca10c
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 11:08:58 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 11:08:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4188105d

dev-java/commons-logging: Stabilize 1.2-r5 x86, #835505

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
index 96d3bb3a0e4e..8a87c4f8a376 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
 RESTRICT="!test? ( test ) !servletapi? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Agostino Sarubbo]

commit:     6f63e487c593971e12d244f1881c2a9e0ca37cc0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 11:47:42 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 11:47:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f63e487

dev-java/commons-logging: ppc64 stable wrt bug #835505

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
index 8a87c4f8a376..97e47eb67520 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
 RESTRICT="!test? ( test ) !servletapi? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Arthur Zamarin]

commit:     dfb885e914615119fa5d139e51c8b35de9f3170d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 16:47:44 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 16:47:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfb885e9

dev-java/commons-logging: Stabilize 1.2-r5 arm64, #835505

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.2-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
index 97e47eb67520..b3a0f8533760 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="avalon-framework avalon-logkit log4j servletapi test"
 REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
 RESTRICT="!test? ( test ) !servletapi? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Arthur Zamarin]

commit:     eb4d2ad987eae9741590ec2de985da00c887c776
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Mar 31 17:19:31 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 18:58:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb4d2ad9

dev-java/commons-logging: Drop 1.2-r3

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24834
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../commons-logging/commons-logging-1.2-r3.ebuild  | 83 ----------------------
 1 file changed, 83 deletions(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
deleted file mode 100644
index 4635bb99ffe2..000000000000
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="commons-logging:commons-logging:1.2"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
-HOMEPAGE="https://commons.apache.org/logging/"
-SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="avalon-framework avalon-logkit log4j servletapi test"
-REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
-RESTRICT="!test? ( test ) !servletapi? ( test )"
-
-CDEPEND="
-	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
-	avalon-framework? ( dev-java/avalon-framework:4.2 )
-	log4j? ( dev-java/log4j:0 )
-	servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src"
-
-EANT_BUILD_TARGET="compile"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
-
-DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	eapply "${FILESDIR}/${P}-servletapi.patch"
-
-	# bug #208098
-	echo "jdk.1.4.present=true" > build.properties || die
-
-	if use avalon-framework; then
-		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
-	fi
-	if use avalon-logkit; then
-		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
-	fi
-	if use log4j; then
-		echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties || die
-	fi
-
-	if use servletapi; then
-		echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die
-	fi
-}
-
-src_install() {
-	local pkg=org.apache.commons.logging
-	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
-	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
-	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
-
-	einstalldocs
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/main/java/org
-}
-
-src_test() {
-	java-pkg-2_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     ef98d31b3a3cc88ffb9662cd214205220bc80afe
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Oct 14 17:36:36 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 17:41:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef98d31b

dev-java/commons-logging: use jakarta-servlet-api

Closes: https://bugs.gentoo.org/877113
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/27781
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{commons-logging-1.2-r5.ebuild => commons-logging-1.2-r6.ebuild}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild b/dev-java/commons-logging/commons-logging-1.2-r6.ebuild
similarity index 96%
rename from dev-java/commons-logging/commons-logging-1.2-r5.ebuild
rename to dev-java/commons-logging/commons-logging-1.2-r6.ebuild
index b3a0f8533760..8c38a37bc9cb 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r5.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r6.ebuild
@@ -27,7 +27,7 @@ CDEPEND="
 		dev-java/log4j-api:2
 		dev-java/log4j-core:2
 	)
-	servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
+	servletapi? ( dev-java/jakarta-servlet-api:4 )"
 
 RDEPEND="
 	${CDEPEND}
@@ -92,7 +92,7 @@ src_prepare() {
 	fi
 
 	if use servletapi; then
-		echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die
+		echo "servletapi.jar=$(java-pkg_getjars jakarta-servlet-api-4 )" >> build.properties || die
 	fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     036d6a13a4f8b6288caae648525c3b49ed4584f7
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Jan  4 17:04:29 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 06:16:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=036d6a13

dev-java/commons-logging: add 1.3.0_pre20230317

- Uses snapshot with many fixes and updates
- Drops dependencies on dev-java/avalon-{logkit,framework}
- Switches to java-pkg-simple.eclass
- Tests still tbd, https://bugs.gentoo.org/839681

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30217
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-logging/Manifest                  |   1 +
 .../commons-logging-1.3.0_pre20230317.ebuild       | 102 +++++++++++++++++++++
 dev-java/commons-logging/metadata.xml              |  27 ++++--
 3 files changed, 120 insertions(+), 10 deletions(-)

diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 7831dfb07830..caa33d505a88 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1 +1,2 @@
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
+DIST commons-logging-1.3.0_pre20230317.tar.gz 184981 BLAKE2B 00d171a8345907dc2686d1eff1130b7fd1ef653c8f2a7c6b5e45e6522f3d195ba695d93371add97a2d459451e3757ef9ec21f483f0cd37a6bcbb98e76e1b446f SHA512 737058214bfa86c11c2d7b450132a15824652c80ffae6208c3a8fc2386e7b2c7c61b39fd2b75008373f611e4bbed26e851f98f910d3e6f33df4f85f35c0a5462

diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild
new file mode 100644
index 000000000000..3fb433092d18
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-logging:commons-logging:1.3.0"
+# Not yet supported, see https://bugs.gentoo.org/839681
+# JAVA_TESTING_FRAMEWORKS="junit-vintage"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems"
+HOMEPAGE="https://commons.apache.org/proper/commons-logging/"
+MY_COMMIT="058cf5ee350cd83d1ab28b000ad6be903ca160c5"
+SRC_URI="https://github.com/apache/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="log4j"
+
+CDEPEND="
+	log4j? (
+		dev-java/log4j-12-api:2
+		dev-java/log4j-api:2
+		dev-java/log4j-core:2
+	)
+"
+
+DEPEND="${CDEPEND}
+	dev-java/javax-servlet-api:2.5
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( README.md src/changes/changes.xml )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.logging"
+JAVA_ENCODING="iso-8859-1"
+JAVA_CLASSPATH_EXTRA="javax-servlet-api-2.5"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	# https://avalon.apache.org/closed.html Apache Avalon has closed.
+	rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die
+	rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die
+
+	if use !log4j; then
+		rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die
+		rm -r src/test/java/org/apache/commons/logging/log4j || die
+	fi
+}
+
+src_compile() {
+	if use log4j; then
+		JAVA_GENTOO_CLASSPATH="log4j-12-api-2,log4j-api-2,log4j-core-2"
+	fi
+	java-pkg-simple_src_compile
+
+	pushd target/classes > /dev/null || die
+
+	# Need Automatic-Module-Name also for the other JAR files
+	jar xvf ../../commons-logging.jar META-INF/MANIFEST.MF || die
+
+	# https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L215-L236
+	jar -cvfm ../../commons-logging-api.jar META-INF/MANIFEST.MF \
+		$(find . -type f -name '*.class' \
+		! -name 'Jdk13LumberjackLogger.class' \
+		! -name 'ServletContextCleaner.class' \
+		) || die
+
+	# https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L240-L257
+	jar -cvfm ../../commons-logging-adapters.jar META-INF/MANIFEST.MF \
+		$(find . -type f -path './org/apache/commons/logging/impl/**.class' \
+		! -name 'WeakHashtable*.class' \
+		! -name 'LogFactoryImpl*.class' \
+		) || die
+
+	popd > /dev/null || die
+}
+
+# https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L396-L407
+# src_test() {
+# 	JAVA_TEST_EXTRA_ARGS=(
+# 		-Dtestclasses="commons-logging-tests.jar"
+# 		-Dcommons-logging="commons-logging.jar"
+# 		-Dcommons-logging-api="commons-logging-api.jar"
+# 		-Dcommons-logging-adapters="commons-logging-adapters.jar"
+# 	)
+# 	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+# 	JAVA_TEST_SRC_DIR="src/test/java"
+# 	if use log4j; then
+# 		JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
+# 	fi
+# 	JAVA_TEST_EXTRA_ARGS+=" -Dservlet-api=$(java-pkg_getjars javax-servlet-api-2.5)"
+# 	java-pkg-simple_src_test
+# }

diff --git a/dev-java/commons-logging/metadata.xml b/dev-java/commons-logging/metadata.xml
index 929f4e61cf4e..c3b68538712d 100644
--- a/dev-java/commons-logging/metadata.xml
+++ b/dev-java/commons-logging/metadata.xml
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <use>
-    <flag name="avalon-framework">Add optional support for avalon-framework</flag>
-    <flag name="avalon-logkit">Add optional support for avalon-logkit</flag>
-    <flag name="log4j">Add optional support for log4j</flag>
-    <flag name="servletapi">Add optional support for servletapi</flag>
-  </use>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://issues.apache.org/jira/projects/LOGGING/issues/</bugs-to>
+		<remote-id type="github">apache/commons-logging</remote-id>
+	</upstream>
+	<use>
+		<flag name="avalon-framework">Add optional support for avalon-framework</flag>
+		<flag name="avalon-logkit">Add optional support for avalon-logkit</flag>
+		<flag name="log4j">Add optional support for log4j</flag>
+		<flag name="servletapi">Add optional support for servletapi</flag>
+	</use>
+	<longdescription>
+		Apache Commons Logging is a thin adapter allowing configurable bridging to other, well known logging systems.
+	</longdescription>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     f51fb4fa0861c948556bddb1ebf6cfaf9b4579be
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Mar 20 11:20:07 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 06:08:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51fb4fa

dev-java/commons-logging: add 1.3.0_pre20230319, drop 1.3.0_pre20230317

- enables tests except log4j tests
- also installs commons-logging-api.jar
  and commons-logging-adapters.jar

Closes: https://bugs.gentoo.org/902121
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30255
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-logging/Manifest                  |  2 +-
 ...ld => commons-logging-1.3.0_pre20230319.ebuild} | 60 ++++++++++++++--------
 dev-java/commons-logging/metadata.xml              |  1 +
 3 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index caa33d505a88..3ae886c05c09 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,2 +1,2 @@
 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-DIST commons-logging-1.3.0_pre20230317.tar.gz 184981 BLAKE2B 00d171a8345907dc2686d1eff1130b7fd1ef653c8f2a7c6b5e45e6522f3d195ba695d93371add97a2d459451e3757ef9ec21f483f0cd37a6bcbb98e76e1b446f SHA512 737058214bfa86c11c2d7b450132a15824652c80ffae6208c3a8fc2386e7b2c7c61b39fd2b75008373f611e4bbed26e851f98f910d3e6f33df4f85f35c0a5462
+DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e

diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
similarity index 57%
rename from dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild
rename to dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
index 3fb433092d18..548d30669d48 100644
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230317.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
@@ -5,14 +5,13 @@ EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="commons-logging:commons-logging:1.3.0"
-# Not yet supported, see https://bugs.gentoo.org/839681
-# JAVA_TESTING_FRAMEWORKS="junit-vintage"
+JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems"
 HOMEPAGE="https://commons.apache.org/proper/commons-logging/"
-MY_COMMIT="058cf5ee350cd83d1ab28b000ad6be903ca160c5"
+MY_COMMIT="d376d3128663e53de4af948e161291e7ec0c6ec1"
 SRC_URI="https://github.com/apache/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
@@ -52,7 +51,6 @@ src_prepare() {
 
 	if use !log4j; then
 		rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die
-		rm -r src/test/java/org/apache/commons/logging/log4j || die
 	fi
 }
 
@@ -84,19 +82,41 @@ src_compile() {
 	popd > /dev/null || die
 }
 
-# https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L396-L407
-# src_test() {
-# 	JAVA_TEST_EXTRA_ARGS=(
-# 		-Dtestclasses="commons-logging-tests.jar"
-# 		-Dcommons-logging="commons-logging.jar"
-# 		-Dcommons-logging-api="commons-logging-api.jar"
-# 		-Dcommons-logging-adapters="commons-logging-adapters.jar"
-# 	)
-# 	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-# 	JAVA_TEST_SRC_DIR="src/test/java"
-# 	if use log4j; then
-# 		JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
-# 	fi
-# 	JAVA_TEST_EXTRA_ARGS+=" -Dservlet-api=$(java-pkg_getjars javax-servlet-api-2.5)"
-# 	java-pkg-simple_src_test
-# }
+https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L396-L407
+src_test() {
+	# Do not run Log4j tests because these tests use an Appender to verify
+	# logging correctness.  The log4j-12-api bridge no longer supports using an
+	# Appender for verifications since the methods for adding an Appender in
+	# the bridge "are largely no-ops".  This means an Appender's state would
+	# never be changed by log4j-12-api after new messages are logged.  The test
+	# cases, however, expect changes to the Appender's state in such an event,
+	# so they would fail with log4j-12-api.
+	# https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
+	rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger
+	rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger
+	rm -r src/test/java/org/apache/commons/logging/log4j || die
+
+	JAVA_TEST_EXCLUDES=(
+		org.apache.commons.logging.security.SecurityForbiddenTestCase # 2 tests 1 failing
+		org.apache.commons.logging.jdk14.TestHandler # No runnable methods
+	)
+	JAVA_TEST_EXTRA_ARGS=(
+		-Dservlet-api="$(java-pkg_getjars javax-servlet-api-2.5)"
+		-Dcommons-logging="commons-logging.jar"
+		-Dcommons-logging-api="commons-logging-api.jar"
+		-Dcommons-logging-adapters="commons-logging-adapters.jar"
+		-Dtestclasses="target/test-classes"
+	)
+	if use log4j; then
+		JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
+	fi
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+	JAVA_TEST_SRC_DIR="src/test/java"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dojar commons-logging-api.jar commons-logging-adapters.jar
+}

diff --git a/dev-java/commons-logging/metadata.xml b/dev-java/commons-logging/metadata.xml
index c3b68538712d..6d5d06dd2376 100644
--- a/dev-java/commons-logging/metadata.xml
+++ b/dev-java/commons-logging/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://issues.apache.org/jira/projects/LOGGING/issues/</bugs-to>
+		<doc>https://commons.apache.org/proper/commons-logging/guide.html</doc>
 		<remote-id type="github">apache/commons-logging</remote-id>
 	</upstream>
 	<use>

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Sven Wegener]

commit:     dd148ddaee31bc22dad53bd86f3d42bbd9b03539
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 08:59:15 2023 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 09:04:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd148dda

dev-java/commons-logging: remove stray url from global scope

Bug: https://bugs.gentoo.org/902121
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
index 548d30669d48..b478d6426af2 100644
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
@@ -82,7 +82,6 @@ src_compile() {
 	popd > /dev/null || die
 }
 
-https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L396-L407
 src_test() {
 	# Do not run Log4j tests because these tests use an Appender to verify
 	# logging correctness.  The log4j-12-api bridge no longer supports using an

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Sam James]

commit:     b64c5ba07d0cdc9d8a64fb706ba95c42b0cd8a39
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 04:02:16 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 04:02:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64c5ba0

dev-java/commons-logging: Stabilize 1.3.0_pre20230319 arm64, #904672

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

 dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
index b478d6426af2..78119f70a2ef 100644
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="log4j"
 
 CDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Arthur Zamarin]

commit:     7bfeb1a6d4a7bb08fa890e6b3f9f98ad96371cde
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 04:14:34 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 04:14:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bfeb1a6

dev-java/commons-logging: Stabilize 1.3.0_pre20230319 ppc64, #904672

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
index 78119f70a2ef..b8d815aa94f1 100644
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="log4j"
 
 CDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Sam James]

commit:     a1f3a0e9c8888d46316c7d32ae58b82dc752323e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 05:00:55 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 05:01:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f3a0e9

dev-java/commons-logging: Stabilize 1.3.0_pre20230319 amd64, #904672

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

 dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
index 278f802c55fd..fae791f5d474 100644
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="log4j"
 
 CDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Sam James]

commit:     cda3264c305269f6865fb0d75527dc1cc5380a66
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 05:00:53 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 05:01:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda3264c

dev-java/commons-logging: Stabilize 1.3.0_pre20230319 x86, #904672

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

 dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
index b8d815aa94f1..278f802c55fd 100644
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="log4j"
 
 CDEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     5225edd801133472adbe6a9be5122f9991bee85b
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Dec 16 07:24:18 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 10:55:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5225edd8

dev-java/commons-logging: add 1.3.1

Temporarily drops all tests, need to revisit
after solving https://bugs.gentoo.org/921398

Bug: https://bugs.gentoo.org/923601
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36096
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-logging/Manifest                  |   2 +
 .../commons-logging/commons-logging-1.3.1.ebuild   | 153 +++++++++++++++++++++
 2 files changed, 155 insertions(+)

diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 25360c6e9487..9f2bae1c3096 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1 +1,3 @@
 DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e
+DIST commons-logging-1.3.1-src.tar.gz 189156 BLAKE2B 23308b2bff6ea67620b0f07f49a63ffdbd07833fc0d9a6654386f4c17c9125abef5ad2afb6d8c798dcb98bc3e99bd8d94d35b9deec569c3aec1dde20f69e1a1d SHA512 ffda970d086601df4b476caf8bd01d1bdc22dd7f8846a22287036f7f000ce6cf0a757d16621910f041f8d90aa6066819454b3977dd005ca66817bec59e91e91f
+DIST commons-logging-1.3.1-src.tar.gz.asc 488 BLAKE2B 3225a62f6269224f1b52907631be03d97cde65d1c7a76c06b6a23b9e30b1cee08b048eb4fdaa41b0a6b5bcf090b54c9dc54307fb1629b039b786fd426572a4d1 SHA512 6f13f85a5aeab1099ebfca38a6173384050b1f1c2e7eac93d978587c92751ddd24d583e39bc5a949f0caec66ca141d265147e63e9e2afea2094bda4667936a86

diff --git a/dev-java/commons-logging/commons-logging-1.3.1.ebuild b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
new file mode 100644
index 000000000000..1f9180268241
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-logging:commons-logging:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems"
+HOMEPAGE="https://commons.apache.org/proper/commons-logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/logging/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="log4j"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+COMMON_DEPEND="
+	dev-java/jakarta-servlet-api:4
+	dev-java/slf4j-api:0
+	log4j? (
+		dev-java/log4j-12-api:2
+		dev-java/log4j-api:2
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-11:*"
+
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( NOTICE.txt src/changes/changes.xml )
+HTML_DOCS=( PROPOSAL.html )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.logging"
+JAVA_ENCODING="iso-8859-1"
+JAVA_GENTOO_CLASSPATH="
+	jakarta-servlet-api-4
+	slf4j-api
+"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# javax-servlet-api and log4j* do not presently provide module-info
+	cat > src/main/java/module-info.java <<-EOF || die
+		module org.apache.commons.logging {
+		//	requires static org.apache.logging.log4j;
+			requires static org.slf4j;
+			requires static java.logging;
+		//	requires static log4j;
+		//	requires static servlet.api;
+		//	requires static org.apache.log4j;
+			requires java.base;
+			exports org.apache.commons.logging;
+			exports org.apache.commons.logging.impl;
+			uses org.apache.commons.logging.LogFactory;
+		}
+	EOF
+
+	# https://avalon.apache.org/closed.html Apache Avalon has closed.
+	rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die
+	rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die
+
+	if use !log4j; then
+		rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die
+		rm src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java || die
+	else
+		JAVA_GENTOO_CLASSPATH+="
+			log4j-12-api-2
+			log4j-api-2
+		"
+	fi
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	pushd target/classes > /dev/null || die
+
+	# Need Automatic-Module-Name also for the other JAR files
+	jar xvf ../../commons-logging.jar META-INF/MANIFEST.MF || die
+
+	# pom.xml, lines 81-103
+	jar -cvfm ../../commons-logging-api.jar META-INF/MANIFEST.MF \
+		$(find . -type f -name '*.class' \
+		! -name 'Jdk13LumberjackLogger.class' \
+		! -name 'ServletContextCleaner.class' \
+		) || die
+
+	# pom.xml, lines 205-124
+	jar -cvfm ../../commons-logging-adapters.jar META-INF/MANIFEST.MF \
+		$(find . -type f -path './org/apache/commons/logging/impl/**.class' \
+		! -name 'WeakHashtable*.class' \
+		! -name 'LogFactoryImpl*.class' \
+		) || die
+
+	popd > /dev/null || die
+}
+
+src_test() {
+	# Do not run Log4j tests because these tests use an Appender to verify
+	# logging correctness.  The log4j-12-api bridge no longer supports using an
+	# Appender for verifications since the methods for adding an Appender in
+	# the bridge "are largely no-ops".  This means an Appender's state would
+	# never be changed by log4j-12-api after new messages are logged.  The test
+	# cases, however, expect changes to the Appender's state in such an event,
+	# so they would fail with log4j-12-api.
+	# https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
+	rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger
+	rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger
+	rm -r src/test/java/org/apache/commons/logging/log4j || die
+	rm src/test/java/org/apache/commons/logging/log4j2/CallerInformationTestCase.java || die
+	# error: package ch.qos.logback.classic does not exist
+	rm src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java || die
+
+	JAVA_TEST_EXCLUDES=(
+		org.apache.commons.logging.jdk14.TestHandler # No runnable methods
+		# junit.framework.AssertionFailedError: Wrong factory retrieved through
+		# ServiceLoader: org.apache.commons.logging.impl.Slf4jLogFactory
+		org.apache.commons.logging.serviceloader.ServiceLoaderTestCase
+		# junit.framework.ComparisonFailure: Log class expected:<...ommons.logging.impl.[NoOp]Log>
+		# but was:<...ommons.logging.impl.[Slf4jLogFactory$Slf4j]Log>
+		org.apache.commons.logging.noop.NoOpLogTestCase
+	)
+	JAVA_TEST_EXTRA_ARGS=(
+		-Dservlet-api="$(java-pkg_getjars jakarta-servlet-api-4)"
+		-Dcommons-logging="commons-logging.jar"
+		-Dcommons-logging-api="commons-logging-api.jar"
+		-Dcommons-logging-adapters="commons-logging-adapters.jar"
+		-Dtestclasses="target/test-classes"
+	)
+	if use log4j; then
+		JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
+	fi
+	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+	JAVA_TEST_SRC_DIR="src/test/java"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dojar commons-logging-api.jar commons-logging-adapters.jar
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Sam James]

commit:     fd1618a2c2695a95fc8dd32608532bbedcc4fefd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 03:19:00 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 18 03:19:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd1618a2

dev-java/commons-logging: Stabilize 1.3.1 amd64, #930196

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

 dev-java/commons-logging/commons-logging-1.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.3.1.ebuild b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
index 1f9180268241..5282596b66ae 100644
--- a/dev-java/commons-logging/commons-logging-1.3.1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="log4j"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Sam James]

commit:     0221998e243c0d98f848566db280f3dc1c1f18e6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 03:19:01 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 18 03:19:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0221998e

dev-java/commons-logging: Stabilize 1.3.1 x86, #930196

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

 dev-java/commons-logging/commons-logging-1.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.3.1.ebuild b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
index 5282596b66ae..f01253ce833d 100644
--- a/dev-java/commons-logging/commons-logging-1.3.1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="log4j"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Sam James]

commit:     5117a91fb9796bb8e24e195b629eab5440b82b0f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 03:50:55 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 18 03:50:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5117a91f

dev-java/commons-logging: Stabilize 1.3.1 ppc64, #930196

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

 dev-java/commons-logging/commons-logging-1.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.3.1.ebuild b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
index f01253ce833d..574295ae434b 100644
--- a/dev-java/commons-logging/commons-logging-1.3.1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="log4j"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Arthur Zamarin]

commit:     6dd7a86797de7a928ba3325a2ef6125d448f40bd
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 17:40:14 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun May 19 17:40:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd7a867

dev-java/commons-logging: Stabilize 1.3.1 arm64, #930196

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/commons-logging/commons-logging-1.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.3.1.ebuild b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
index 574295ae434b..d070c40f2dee 100644
--- a/dev-java/commons-logging/commons-logging-1.3.1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P}-src"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="log4j"
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     edb44e0606891b780f9798fd1afced271fca2a85
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun May 19 19:30:58 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon May 20 07:50:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edb44e06

dev-java/commons-logging: drop 1.3.0_pre20230319

Closes: https://bugs.gentoo.org/923601
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36746
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-logging/Manifest                  |   1 -
 .../commons-logging-1.3.0_pre20230319.ebuild       | 121 ---------------------
 2 files changed, 122 deletions(-)

diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 9f2bae1c3096..e45becaca4a5 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,3 +1,2 @@
-DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e
 DIST commons-logging-1.3.1-src.tar.gz 189156 BLAKE2B 23308b2bff6ea67620b0f07f49a63ffdbd07833fc0d9a6654386f4c17c9125abef5ad2afb6d8c798dcb98bc3e99bd8d94d35b9deec569c3aec1dde20f69e1a1d SHA512 ffda970d086601df4b476caf8bd01d1bdc22dd7f8846a22287036f7f000ce6cf0a757d16621910f041f8d90aa6066819454b3977dd005ca66817bec59e91e91f
 DIST commons-logging-1.3.1-src.tar.gz.asc 488 BLAKE2B 3225a62f6269224f1b52907631be03d97cde65d1c7a76c06b6a23b9e30b1cee08b048eb4fdaa41b0a6b5bcf090b54c9dc54307fb1629b039b786fd426572a4d1 SHA512 6f13f85a5aeab1099ebfca38a6173384050b1f1c2e7eac93d978587c92751ddd24d583e39bc5a949f0caec66ca141d265147e63e9e2afea2094bda4667936a86

diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
deleted file mode 100644
index e7ce766be362..000000000000
--- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="commons-logging:commons-logging:1.3.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems"
-HOMEPAGE="https://commons.apache.org/proper/commons-logging/"
-MY_COMMIT="d376d3128663e53de4af948e161291e7ec0c6ec1"
-SRC_URI="https://github.com/apache/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="log4j"
-
-CDEPEND="
-	log4j? (
-		dev-java/log4j-12-api:2
-		dev-java/log4j-api:2
-		dev-java/log4j-core:2
-	)
-"
-
-DEPEND="${CDEPEND}
-	dev-java/javax-servlet-api:2.5
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( README.md src/changes/changes.xml )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.logging"
-JAVA_ENCODING="iso-8859-1"
-JAVA_CLASSPATH_EXTRA="javax-servlet-api-2.5"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	# https://avalon.apache.org/closed.html Apache Avalon has closed.
-	rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die
-	rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die
-
-	if use !log4j; then
-		rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die
-	fi
-}
-
-src_compile() {
-	if use log4j; then
-		JAVA_GENTOO_CLASSPATH="log4j-12-api-2,log4j-api-2,log4j-core-2"
-	fi
-	java-pkg-simple_src_compile
-
-	pushd target/classes > /dev/null || die
-
-	# Need Automatic-Module-Name also for the other JAR files
-	jar xvf ../../commons-logging.jar META-INF/MANIFEST.MF || die
-
-	# https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L215-L236
-	jar -cvfm ../../commons-logging-api.jar META-INF/MANIFEST.MF \
-		$(find . -type f -name '*.class' \
-		! -name 'Jdk13LumberjackLogger.class' \
-		! -name 'ServletContextCleaner.class' \
-		) || die
-
-	# https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L240-L257
-	jar -cvfm ../../commons-logging-adapters.jar META-INF/MANIFEST.MF \
-		$(find . -type f -path './org/apache/commons/logging/impl/**.class' \
-		! -name 'WeakHashtable*.class' \
-		! -name 'LogFactoryImpl*.class' \
-		) || die
-
-	popd > /dev/null || die
-}
-
-src_test() {
-	# Do not run Log4j tests because these tests use an Appender to verify
-	# logging correctness.  The log4j-12-api bridge no longer supports using an
-	# Appender for verifications since the methods for adding an Appender in
-	# the bridge "are largely no-ops".  This means an Appender's state would
-	# never be changed by log4j-12-api after new messages are logged.  The test
-	# cases, however, expect changes to the Appender's state in such an event,
-	# so they would fail with log4j-12-api.
-	# https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
-	rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger
-	rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger
-	rm -r src/test/java/org/apache/commons/logging/log4j || die
-
-	JAVA_TEST_EXCLUDES=(
-		org.apache.commons.logging.security.SecurityForbiddenTestCase # 2 tests 1 failing
-		org.apache.commons.logging.jdk14.TestHandler # No runnable methods
-	)
-	JAVA_TEST_EXTRA_ARGS=(
-		-Dservlet-api="$(java-pkg_getjars javax-servlet-api-2.5)"
-		-Dcommons-logging="commons-logging.jar"
-		-Dcommons-logging-api="commons-logging-api.jar"
-		-Dcommons-logging-adapters="commons-logging-adapters.jar"
-		-Dtestclasses="target/test-classes"
-	)
-	if use log4j; then
-		JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
-	fi
-	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-	JAVA_TEST_SRC_DIR="src/test/java"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_dojar commons-logging-api.jar commons-logging-adapters.jar
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     f7b547859f9279cffe166ae708a32054a53aa602
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Sep 30 08:19:17 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 09:34:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b54785

dev-java/commons-logging: add 1.3.4

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/38836/commits/826b9b6b5c1ffaab0f6f08b3e3080f98dba3ae61
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/commons-logging/Manifest                  |   2 +
 .../commons-logging/commons-logging-1.3.4.ebuild   | 194 +++++++++++++++++++++
 2 files changed, 196 insertions(+)

diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index e45becaca4a5..7e4642ee4d7d 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,2 +1,4 @@
 DIST commons-logging-1.3.1-src.tar.gz 189156 BLAKE2B 23308b2bff6ea67620b0f07f49a63ffdbd07833fc0d9a6654386f4c17c9125abef5ad2afb6d8c798dcb98bc3e99bd8d94d35b9deec569c3aec1dde20f69e1a1d SHA512 ffda970d086601df4b476caf8bd01d1bdc22dd7f8846a22287036f7f000ce6cf0a757d16621910f041f8d90aa6066819454b3977dd005ca66817bec59e91e91f
 DIST commons-logging-1.3.1-src.tar.gz.asc 488 BLAKE2B 3225a62f6269224f1b52907631be03d97cde65d1c7a76c06b6a23b9e30b1cee08b048eb4fdaa41b0a6b5bcf090b54c9dc54307fb1629b039b786fd426572a4d1 SHA512 6f13f85a5aeab1099ebfca38a6173384050b1f1c2e7eac93d978587c92751ddd24d583e39bc5a949f0caec66ca141d265147e63e9e2afea2094bda4667936a86
+DIST commons-logging-1.3.4-src.tar.gz 195717 BLAKE2B ba691ea0033c14f54fcb525faeadd4b330e063f73175c5ee40a4f50f159f1b264efb9f40661c4af3902ddca7d43f8f9b84e7a77bf1eeb3b237b31f566fc98aab SHA512 a4049d8d7ea0d97f337e169fa5f572e32be1882e07102ab004d8b2de74170cb075a251ee9603590d6e10bee5933651e8e33e108a734fc100e8b2d5acd669cb44
+DIST commons-logging-1.3.4-src.tar.gz.asc 488 BLAKE2B a9cdc993891ff39bb8ebeaa3eefdecee1adb062ed77449dfa1dad75a43cf5aa5678f014d24765ebff7b761498abfc795d3bb68359a73f8de98cb4ac115cb68da SHA512 1c132b87f03ca54887172e45c36e1d8c66d4f12a2a6a2da84e0d6cf3ac2cd2366193829fac0393837371bc1cd34215cd6318c9e7ea6c406c11d9f0dce28b3143

diff --git a/dev-java/commons-logging/commons-logging-1.3.4.ebuild b/dev-java/commons-logging/commons-logging-1.3.4.ebuild
new file mode 100644
index 000000000000..e440061c3289
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.3.4.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-logging:commons-logging:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems"
+HOMEPAGE="https://commons.apache.org/proper/commons-logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/logging/source/${P}-src.tar.gz.asc )"
+S="${WORKDIR}/${P}-src"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="log4j"
+
+# src/test/java/org/apache/commons/logging/tccl/logfactory/AdaptersTcclTestCase.java:26:
+# error: cannot find symbol
+# import org.apache.commons.logging.impl.Log4jApiLogFactory;
+#                                       ^
+#   symbol:   class Log4jApiLogFactory
+#   location: package org.apache.commons.logging.impl
+REQUIRED_USE="test? ( log4j )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+
+COMMON_DEPEND="
+	dev-java/jakarta-servlet-api:4
+	dev-java/slf4j-api:0
+	log4j? (
+		dev-java/log4j-12-api:2
+		dev-java/log4j-api:2
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/commons-io:1
+		dev-java/junit:5
+	)
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( NOTICE.txt src/changes/changes.xml )
+HTML_DOCS=( PROPOSAL.html )
+
+JAVA_GENTOO_CLASSPATH="
+	jakarta-servlet-api-4
+	slf4j-api
+"
+
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# https://avalon.apache.org/closed.html Apache Avalon has closed.
+	rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die
+	rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die
+
+	if use !log4j; then
+		rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die
+		rm src/main/java/org/apache/commons/logging/impl/Log4jApiLogFactory.java || die
+	else
+		JAVA_GENTOO_CLASSPATH+="
+			log4j-12-api-2
+			log4j-api-2
+		"
+	fi
+}
+
+src_compile() {
+	# getting dependencies into the modulepath
+	DEPENDENCIES=(
+		jakarta-servlet-api-4
+		slf4j-api
+		$(use log4j && echo log4j-12-api-2)
+		$(use log4j && echo log4j-api-2)
+	)
+	local modulepath
+	for dependency in ${DEPENDENCIES[@]}; do
+		modulepath="${modulepath}:$(java-pkg_getjars --build-only ${dependency})"
+	done
+
+	local JAVA_MODULE_NAME="org.apache.${PN/-/.}"
+	JAVA_JAR_FILENAME="${JAVA_MODULE_NAME}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	# generate module-info.java
+	jdeps \
+		--module-path "${modulepath}" \
+		--add-modules=ALL-MODULE-PATH \
+		--generate-module-info src/main \
+		--multi-release 9 \
+		"${JAVA_MODULE_NAME}.jar" || die
+
+	# compile module-info.java
+	ejavac \
+		-source 9 -target 9 \
+		--module-path "${modulepath}" \
+		--patch-module "${JAVA_MODULE_NAME}"="${JAVA_MODULE_NAME}.jar" \
+		-d target/versions/9 \
+		src/main/"${JAVA_MODULE_NAME}"/versions/9/module-info.java
+
+	# package
+	JAVA_JAR_FILENAME="${PN}.jar"
+	jar cvf "${JAVA_JAR_FILENAME}" \
+		-C target/classes . \
+		--release 9 -C target/versions/9 . || die
+	java-pkg-simple_src_compile
+
+	pushd target/classes > /dev/null || die
+
+	# pom.xml, lines 81-103
+	jar -cvf ../../commons-logging-api.jar \
+		$(find . -type f -name '*.class' \
+		! -name 'Jdk13LumberjackLogger.class' \
+		! -name 'ServletContextCleaner.class' \
+		) || die
+
+	# pom.xml, lines 205-124
+	jar -cvf ../../commons-logging-adapters.jar \
+		$(find . -type f -path './org/apache/commons/logging/impl/**.class' \
+		! -name 'WeakHashtable*.class' \
+		! -name 'LogFactoryImpl*.class' \
+		) || die
+
+	popd > /dev/null || die
+}
+
+src_test() {
+	# Do not run Log4j tests because these tests use an Appender to verify
+	# logging correctness.  The log4j-12-api bridge no longer supports using an
+	# Appender for verifications since the methods for adding an Appender in
+	# the bridge "are largely no-ops".  This means an Appender's state would
+	# never be changed by log4j-12-api after new messages are logged.  The test
+	# cases, however, expect changes to the Appender's state in such an event,
+	# so they would fail with log4j-12-api.
+	# https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html
+	rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger
+	rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger
+	rm -r src/test/java/org/apache/commons/logging/log4j || die
+	rm src/test/java/org/apache/commons/logging/log4j2/CallerInformationTestCase.java || die
+	# error: package ch.qos.logback.classic does not exist
+	rm src/test/java/org/apache/commons/logging/slf4j/CallerInformationTestCase.java || die
+
+	JAVA_TEST_EXCLUDES=(
+		org.apache.commons.logging.jdk14.TestHandler # No runnable methods
+		# junit.framework.AssertionFailedError: Wrong factory retrieved through
+		# ServiceLoader: org.apache.commons.logging.impl.Slf4jLogFactory
+		org.apache.commons.logging.serviceloader.ServiceLoaderTestCase
+		# junit.framework.ComparisonFailure: Log class expected:<...ommons.logging.impl.[NoOp]Log>
+		# but was:<...ommons.logging.impl.[Slf4jLogFactory$Slf4j]Log>
+		org.apache.commons.logging.noop.NoOpLogTestCase
+		# org.junit.runners.model.InvalidTestClassyyError: Invalid test class
+		org.apache.commons.logging.LogSourceTest	# No runnable methods
+		# junit.framework.AssertionFailedError: Logging config succeeded when context class loader was null!
+		org.apache.commons.logging.LoadTestCase
+		# junit.framework.AssertionFailedError:
+		# expected:<org.apache.commons.logging.PathableClassLoader@1edf1c96>
+		# but was:<org.apache.commons.logging.PathableClassLoader@15615099>
+		org.apache.commons.logging.tccl.logfactory.AdaptersTcclTestCase
+	)
+	JAVA_TEST_EXTRA_ARGS=(
+		-Dcommons-lang3="$(java-pkg_getjars commons-lang-3.6)"
+		-Dlog4j-api="commons-logging-api.jar"
+		-Dservlet-api="$(java-pkg_getjars jakarta-servlet-api-4)"
+		-Dcommons-logging="commons-logging.jar"
+		-Dcommons-logging-api="commons-logging-api.jar"
+		-Dcommons-logging-adapters="commons-logging-adapters.jar"
+		-Dtestclasses="target/test-classes"
+	)
+	if use log4j; then
+		JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)"
+	fi
+	JAVA_TEST_GENTOO_CLASSPATH="commons-io-1 commons-lang-3.6 junit-4 junit-5"
+	JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+	JAVA_TEST_SRC_DIR="src/test/java"
+	java-pkg-simple_src_test
+}

[gentoo-commits] repo/gentoo:master commit in: dev-java/commons-logging/

[Miroslav Šulc]

commit:     5d1dd5cf68545305888050f7f5a6aa25a24cb260
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Oct 16 16:24:36 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 09:04:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1dd5cf

dev-java/commons-logging: drop wrong compilation

It was overwriting the freshly packaged ${PN}.jar with a wrong one.

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/38836/commits/8c0fef4ff3be41a191452e40394bb5bcf0f10f1c
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{commons-logging-1.3.4.ebuild => commons-logging-1.3.4-r1.ebuild}    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-java/commons-logging/commons-logging-1.3.4.ebuild b/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild
similarity index 99%
rename from dev-java/commons-logging/commons-logging-1.3.4.ebuild
rename to dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild
index e440061c3289..6e95be004825 100644
--- a/dev-java/commons-logging/commons-logging-1.3.4.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.3.4-r1.ebuild
@@ -121,7 +121,6 @@ src_compile() {
 	jar cvf "${JAVA_JAR_FILENAME}" \
 		-C target/classes . \
 		--release 9 -C target/versions/9 . || die
-	java-pkg-simple_src_compile
 
 	pushd target/classes > /dev/null || die