gentoo auto-resync : 20:04:2023 - 11:59:50

6 files changed, 3 insertions, 203 deletions

diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 49b93635bc80..f99584f68989 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,7 +1,3 @@
-AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
-AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
-DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
 DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e
-EBUILD commons-logging-1.2-r6.ebuild 4146 BLAKE2B 3d9d1e7121406deb2cfbb50ce274df70a0c165d99870f77a69068447e68588bd43b259b076bd5dc2e853a4d79e2df80844caaebd4d4dfe095701f3c4799a98c6 SHA512 7bee2954d057db0c3bbfd3b8bba6b7c9e1cc2f708b5d85070defde51fb6c9d2f8f10b1be122fcfadabfaffc612d2b63ef355818cc6a14253a9de05b79c0c0dde
-EBUILD commons-logging-1.3.0_pre20230319.ebuild 4232 BLAKE2B ed7da971dfb3e962ebdf328afab4d1f126efdeb48cbe14e34d85bd166980a3c6efe5a87ae565728e6df8ea2a0bd2ee0b1548a76d0050bfc37c89fa0a1e448915 SHA512 278663f90115823b5f832caf311801a3067a63218a5bfd86470dfaafce60f29f0672edf2a1fbef0226cb0da6f1b0a24d91aa8f79b4c99ed442b6fc5177dae3df
-MISC metadata.xml 925 BLAKE2B 4834c919748bbef9b8ac9cbb0545a3b13cdd8c97f0ce6039e09f5fa63522f0506e89ab1749fb273d7cf511414b4d16f661ac156f953dfee1ac3a01f6723b1b99 SHA512 3ea4a17834b877e710c618d6a9669275e76b6305b4c090b4b2462c54a132da20c9f39063c8e9763e712ae21f4c86ca8d02892a47039184dd3ed1680fee8b5849
+EBUILD commons-logging-1.3.0_pre20230319.ebuild 4229 BLAKE2B 9611fd81e67a1a21c6a6f87638c8a5b1413688406dd8336c8580aa02daf59f4be3d5372bc80144771d2d6c066c8b43a0f0cd33eff8bff00ee92dc9f8ecad783b SHA512 da522092c9a1dacdedcdbf3c979e8d24e15323d61e94010a0b053135b300234640fcc79690939b592cfbb9c818af1c37eb9a95af9776b546d65faa026c8dc416
+MISC metadata.xml 549 BLAKE2B b20c8451a73329dbdb8aa88120543b948014115d754a84e8a77a8f61b9134277a7849fc10e35323c028a32d69f6e45702200e06af4481bf5238f5d848b3ccc03 SHA512 105c2bdf3eed380f11be1b8987a08fbcf1b6e6cbbb00c0e38e4813875865abd65c9be85267d5b49486913fdb0635b7329b5c4e84a86d9f93f9dcdad74c336ff0
diff --git a/dev-java/commons-logging/commons-logging-1.2-r6.ebuild b/dev-java/commons-logging/commons-logging-1.2-r6.ebuild
deleted file mode 100644
index 8c38a37bc9cb..000000000000
--- a/dev-java/commons-logging/commons-logging-1.2-r6.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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 ~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 )"
-
-CDEPEND="
-	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
-	avalon-framework? ( dev-java/avalon-framework:4.2 )
-	log4j? (
-		dev-java/log4j-12-api:2
-		dev-java/log4j-api:2
-		dev-java/log4j-core:2
-	)
-	servletapi? ( dev-java/jakarta-servlet-api:4 )"
-
-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
-		# 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_getjars jakarta-servlet-api-4 )" >> 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() {
-	# 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
-}
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..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="
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
deleted file mode 100644
index a654ce1fc763..000000000000
--- a/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -773,4 +773,23 @@
-     </fail>
-   </target>
- 
-+  <target depends="" name="javadoc" description="o Generate javadoc" >
-+    <mkdir dir="${build.home}/docs" >
-+    </mkdir>
-+    <tstamp >
-+      <format pattern="2001-yyyy" property="year" >
-+      </format>
-+    </tstamp>
-+    <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation. All Rights Reserved." >
-+    </property>
-+    <property name="title" value="Logging 1.1 API" >
-+    </property>
-+    <javadoc use="true" author="true" sourcepath="src/main/java" destdir="${build.home}/docs" version="true" private="true" packagenames="org.apache.commons.logging.*" >
-+      <classpath >
-+        <path refid="javadoc.classpath" >
-+        </path>
-+      </classpath>
-+    </javadoc>
-+  </target>
-+
- </project>
diff --git a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
deleted file mode 100644
index a9fccba8d5c1..000000000000
--- a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -279,6 +279,8 @@
-                classpathref="compile.classpath"
-                classname="org.apache.log.Logger"/>
- 
-+    <available classname="javax.servlet.ServletContextEvent" property="servletapi.present" classpathref="compile.classpath" ignoresystemclasses="true" ></available>
-+
-     <available property="avalon-framework.present"
-                classpathref="compile.classpath"
-                classname="org.apache.avalon.framework.logger.Logger"/>
-@@ -315,6 +317,13 @@
-     </echo>
-   </target>
-   
-+  <target depends="init,discovery" unless="servletapi.present" name="servletapi-warning" >
-+    <echo >
-+    *** WARNING ***
-+    ServletAPI not found: Cannot Build ServletContextCleaner
-+	</echo>
-+  </target>
-+  
-   <target name="avalon-framework-warning" unless='avalon-framework.present' depends='init,discovery'>
-     <echo>
-     *** WARNING ***
-@@ -337,7 +346,7 @@
-   </target>
-     
-   <target name='warning' 
--    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,compile-1.4'/>
-+    depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/>
- 
-   <target name="compile-only" 
-     depends="prepare,discovery,warning,show-lib-presence,compile-non-log4j,compile-log4j12,compile-log4j13,build-jar"/>
-@@ -365,6 +374,7 @@
-     
-       <exclude name="org/apache/commons/logging/impl/Log4J*.java"/>
- 
-+	  <exclude unless="servletapi.present" name="org/apache/commons/logging/impl/ServletContextCleaner.java" ></exclude>
-       <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"
-                unless="jdk.1.4.present"/>
-       <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
diff --git a/dev-java/commons-logging/metadata.xml b/dev-java/commons-logging/metadata.xml
index 6d5d06dd2376..6f7f23a3f9e5 100644
--- a/dev-java/commons-logging/metadata.xml
+++ b/dev-java/commons-logging/metadata.xml
@@ -11,12 +11,6 @@
 		<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>