From 9f322d80b846d0000268f94422b74c28979e4adf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Jun 2023 09:30:56 +0100 Subject: gentoo auto-resync : 03:06:2023 - 09:30:55 --- dev-java/Manifest.gz | Bin 58795 -> 58299 bytes dev-java/avalon-framework/Manifest | 4 - .../avalon-framework-4.2.0-r4.ebuild | 56 ------------- dev-java/avalon-framework/files/4.2.0-enum.patch | 23 ----- dev-java/avalon-framework/metadata.xml | 8 -- dev-java/avalon-logkit/Manifest | 4 - .../avalon-logkit/avalon-logkit-2.1-r12.ebuild | 93 --------------------- .../files/avalon-logkit-2.1-java7.patch | 30 ------- dev-java/avalon-logkit/metadata.xml | 8 -- dev-java/resin-servlet-api/Manifest | 3 - dev-java/resin-servlet-api/metadata.xml | 8 -- .../resin-servlet-api-4.0.27-r2.ebuild | 41 --------- 12 files changed, 278 deletions(-) delete mode 100644 dev-java/avalon-framework/Manifest delete mode 100644 dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild delete mode 100644 dev-java/avalon-framework/files/4.2.0-enum.patch delete mode 100644 dev-java/avalon-framework/metadata.xml delete mode 100644 dev-java/avalon-logkit/Manifest delete mode 100644 dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild delete mode 100644 dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch delete mode 100644 dev-java/avalon-logkit/metadata.xml delete mode 100644 dev-java/resin-servlet-api/Manifest delete mode 100644 dev-java/resin-servlet-api/metadata.xml delete mode 100644 dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index e92c359f1f54..9a6a6af92861 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest deleted file mode 100644 index 9a2cff13cefb..000000000000 --- a/dev-java/avalon-framework/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX 4.2.0-enum.patch 1086 BLAKE2B 1489abf0aa325060472d55762bc2014bac3c1d5571fddb40ef835be1f59106d0279433eee5e59bcb8e7eef30cd2c2272a840796ce221a490d82f20826ce9a5dc SHA512 076b0c68930da7161ec8068347d05eebc01570b62194126ae28c47af4a559e0d059bf94bb04829dc792441bd6187eba093b966d09b73c45bcdbd05e05f4ad9fc -DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671 -EBUILD avalon-framework-4.2.0-r4.ebuild 1120 BLAKE2B 1a88c200300c902b162542aba9c824d90559230d8a85815f624739e8e5c5e08a11fb7b0ca57bb1586075cda6ac5a8ffe4e36e3294064c02283ad1455ff826d88 SHA512 ed6c26f0f26ae2a8a9ac6e61d0b0bb51dc3d7397ce519ac5880ac4e46432c52a749f0945b2e8c18704af3ff3cfd619c0ad76ad8c4e0e60a9e63f33b5535fd16e -MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild deleted file mode 100644 index f5714760b11b..000000000000 --- a/dev-java/avalon-framework/avalon-framework-4.2.0-r4.ebuild +++ /dev/null @@ -1,56 +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 test" -# The tests themselves are JUnit 3 tests, but using -# junit-4 here causes 61 additional tests to be run -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Avalon Framework" -HOMEPAGE="https://avalon.apache.org/" -SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="4.2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" - -CP_DEPEND=" - dev-java/avalon-logkit:2.0 - dev-java/log4j-12-api:2 -" - -DEPEND=" - >=virtual/jdk-1.8:* - ${CP_DEPEND} - test? ( - dev-java/junit:0 - ) -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" - -S="${WORKDIR}/${PN}" - -PATCHES=( "${FILESDIR}/4.2.0-enum.patch" ) -DOCS=( NOTICE.TXT ) - -JAVA_SRC_DIR=( {api,impl}/src/java ) - -JAVA_TEST_GENTOO_CLASSPATH="junit" -JAVA_TEST_SRC_DIR=( {api,impl}/src/test ) - -src_prepare() { - default # https://bugs.gentoo.org/780585 -} - -src_install() { - java-pkg-simple_src_install - einstalldocs # https://bugs.gentoo.org/789582 -} diff --git a/dev-java/avalon-framework/files/4.2.0-enum.patch b/dev-java/avalon-framework/files/4.2.0-enum.patch deleted file mode 100644 index d4f4d2fcf692..000000000000 --- a/dev-java/avalon-framework/files/4.2.0-enum.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/api/src/java/org/apache/avalon/framework/.Enum.java.swp b/api/src/java/org/apache/avalon/framework/.Enum.java.swp -deleted file mode 100644 -index 1eb30e7..0000000 -Binary files a/api/src/java/org/apache/avalon/framework/.Enum.java.swp and /dev/null differ -diff --git a/api/src/java/org/apache/avalon/framework/Enum.java b/api/src/java/org/apache/avalon/framework/Enum.java -index 6ceba68..37c2aec 100644 ---- a/api/src/java/org/apache/avalon/framework/Enum.java -+++ b/api/src/java/org/apache/avalon/framework/Enum.java -@@ -126,11 +126,11 @@ public abstract class Enum - if( !(o instanceof Enum) ) - return false; - -- final Enum enum = (Enum)o; -+ final Enum enum_ = (Enum)o; - -- if( !getClass().equals( enum.getClass() ) ) -+ if( !getClass().equals( enum_.getClass() ) ) - return false; -- if( m_name != null ? !m_name.equals( enum.m_name ) : enum.m_name != null ) -+ if( m_name != null ? !m_name.equals( enum_.m_name ) : enum_.m_name != null ) - return false; - - return true; diff --git a/dev-java/avalon-framework/metadata.xml b/dev-java/avalon-framework/metadata.xml deleted file mode 100644 index 6021501589e0..000000000000 --- a/dev-java/avalon-framework/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest deleted file mode 100644 index 7143d3c69dac..000000000000 --- a/dev-java/avalon-logkit/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX avalon-logkit-2.1-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7 -DIST avalon-logkit-2.1-src.tar.gz 60218 BLAKE2B 1c35b38a22d95cffabb19e099d42697adf7aa6ad471f6cb62e02a30b6612c8405b9f7473ca61ea4f7f9c1f3b1ece6ee68f7ec711b79672330db3ac9e57642e0d SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a -EBUILD avalon-logkit-2.1-r12.ebuild 2919 BLAKE2B ee191dd23b96ea1efb8698d0a1f032fb7f177074ee52934403fc0a979c00b80e3037a0837ade99d6a7918e5b744969fa5a2c0f21dd709dd2c1b056b97505b267 SHA512 27e9c01ab60b7d21443f9f1600d8231b4d63ffc3f11608c8e8a0ccce459ba08cc2b35afafee6db630ab7d0ed3cf69f3bd580ef4153a50f68c12f31ef2ce360e3 -MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild deleted file mode 100644 index 1bdcb3f071f0..000000000000 --- a/dev-java/avalon-logkit/avalon-logkit-2.1-r12.ebuild +++ /dev/null @@ -1,93 +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 test" - -inherit java-pkg-2 java-ant-2 - -# NB: this project is dead and we should look into removing it from the tree. -# Take a look at the homepage. -# As of February 2022, dev-java/commons-logging is the only consumer of this -# package besides dev-java/avalon-framework. However, commons-logging is still -# used by many other consumers and does not have an updated version that do not -# depend on this package. -DESCRIPTION="Easy-to-use Java logging toolkit" -HOMEPAGE="https://avalon.apache.org/closed.html" -SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz" - -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" -LICENSE="Apache-2.0" -SLOT="2.0" - -CP_DEPEND=" - dev-java/javax-mail:0 - dev-java/jboss-jms-api:1.1 - dev-java/log4j-12-api:2 - java-virtuals/servlet-api:3.0" -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:* - test? ( - dev-java/ant-junit:0 - )" - -src_prepare() { - default - - # Unfortunately, LogFactor5 support is no longer provided by the Log4j 1.x - # bridge in Log4j 2. But it seems that LogFactor5 merely consists of a - # Swing-based GUI that is neither checked by this package's tests nor used - # by reverse dependencies in ::gentoo. If virtually nobody would use - # LogFactor5, components in this package pertaining to it could be simply - # removed to make the migration to Log4j 2 feasible. - # http://people.apache.org/~carnold/log4j/docs/x/logging-log4j-1.2.10/docs/lf5/overview.html - rm -rv src/java/org/apache/log/output/lf5 || - die "Failed to remove support for stale LogFactor5 project" - - # Doesn't like 1.6 / 1.7 changes to JDBC - eapply "${FILESDIR}/${P}-java7.patch" - - java-ant_ignore-system-classes - - java-ant_xml-rewrite \ - -f build.xml \ - -c -e available \ - -a classpathref \ - -v 'build.classpath' || die - - java-pkg_filter-compiler jikes -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_ENCODING="UTF-8" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar "target/${P}.jar" - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/* -} - -pkg_postinst() { - # Display a message about LogFactor5 support drop upon first install - # or upgrade from a version before the drop - local changed_ver="2.1-r11" - local should_show_msg replaced_ver - [[ -z "${REPLACING_VERSIONS}" ]] && should_show_msg=1 # First install - for replaced_ver in ${REPLACING_VERSIONS}; do - if ver_test "${replaced_ver}" -lt "${changed_ver}"; then - should_show_msg=1 - break - fi - done - [[ "${should_show_msg}" ]] || return - ewarn "Due to migration to Log4j 2, this package has to drop LogFactor5" - ewarn "support. As a result, the org.apache.log.output.lf5 Java package" - ewarn "is not available in the JAR installed by this package." -} diff --git a/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch b/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch deleted file mode 100644 index cb2611bf0de4..000000000000 --- a/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nur avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java ---- avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java 2005-08-30 05:03:49.000000000 +0300 -+++ avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java 2011-09-27 08:27:49.313005212 +0300 -@@ -20,7 +20,9 @@ - import java.sql.Connection; - import java.sql.DriverManager; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import javax.sql.DataSource; -+import java.util.logging.Logger; - - /** - * A basic datasource that doesn't do any pooling but just wraps -@@ -111,4 +113,16 @@ - { - m_logWriter = logWriter; - } -+ -+ public boolean isWrapperFor(Class cls) { -+ return false; -+ } -+ -+ public Object unwrap(Class cls) throws SQLException { -+ throw new SQLException("Not a wrapper for " + cls); -+ } -+ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException("Not a supported feature"); -+ } - } diff --git a/dev-java/avalon-logkit/metadata.xml b/dev-java/avalon-logkit/metadata.xml deleted file mode 100644 index 6ef2d50cf07e..000000000000 --- a/dev-java/avalon-logkit/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest deleted file mode 100644 index b1cf9319373a..000000000000 --- a/dev-java/resin-servlet-api/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST resin-4.0.27-src.tar.gz 10291608 BLAKE2B f28833923dbc49e255d5be04bd568705da953476fd10554db727f14667e3120b7278494cf8c59e6b58f825c4f50be8e766b648d7347f71dfda6743e26b157468 SHA512 498de18818f8c1e47919db2415292492ba4879765ad01a5c1a44c4b88bad02267aea245d3225197a62574091ef163910fb0c0924e06d9c9e03e8067dd7aacf08 -EBUILD resin-servlet-api-4.0.27-r2.ebuild 1060 BLAKE2B c31b4051fc5c63884b42fb8dd94e2e69eb4d203f2735306d3d3379ef9a3014479fc2e2e0fd9db6250c73c59fa3ac0422533004e8770c5f3f6bbb80d85fa7d5be SHA512 3ae168d7d78c5a9a20e9d0b0516ef4f02a1285301e9fc06953f97ab666d7a0b2e79ece901e5df48d67e7f1911691fa4e0b1f586bc8a3ccc59bb8141546316643 -MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd diff --git a/dev-java/resin-servlet-api/metadata.xml b/dev-java/resin-servlet-api/metadata.xml deleted file mode 100644 index 6ef2d50cf07e..000000000000 --- a/dev-java/resin-servlet-api/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild deleted file mode 100644 index 62ce67795aea..000000000000 --- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation" -HOMEPAGE="https://caucho.com" -SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz" - -LICENSE="GPL-2" -SLOT="3.0" -KEYWORDS="amd64 ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/resin-${PV}" - -src_prepare() { - default - cd "${S}" - rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar - java-ant_bsfix_files build-common.xml || die -} - -EANT_BUILD_TARGET="servlet16" -EANT_DOC_TARGET="" - -src_install() { - java-pkg_newjar "modules/servlet16/dist/servlet-16.jar" - use source && java-pkg_dosrc "${S}"/modules/servlet16/src/* - - dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar" - java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar" - dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar" - java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar" -} -- cgit v1.2.3