gentoo auto-resync : 03:12:2022 - 21:00:43

3 files changed, 2 insertions, 100 deletions

diff --git a/dev-java/logback-classic/Manifest b/dev-java/logback-classic/Manifest
index 2e2473772604..dc8ed417d6c7 100644
--- a/dev-java/logback-classic/Manifest
+++ b/dev-java/logback-classic/Manifest
@@ -1,5 +1,3 @@
-DIST logback-1.2.11.tar.gz 4133000 BLAKE2B 09ef74fb92c5a3f10a9ed401b0cc687f9dbc05daf17646f96fa216aefef1a150434b7ba4ca25b6ed751c01dab906c56be5c65908ca9baf6e29cc1a9f55e14773 SHA512 2482f7af5696034e9b412fb3d37be7f0bc7c8a2549808f88b0ae693c0be4f95c41acd82649f76a4572ea5c0bb9f8d7a78b9a64d7af6dd76a0b1b926d7419c084
 DIST logback-1.4.1.tar.gz 760510 BLAKE2B a01aab8b499059669e22a2ab51522b01765bb2802008058bf3ca1a9ddafa06d2827d4129e76dc6f91e960dea2e419087dbcbc6fbced6b560295cda7089ce4a12 SHA512 4e8b0cb7cd7f950d7b6a859bc40cc8a3ddc41e2c7ab1567dc29780f4f05a14fdf34dd569928e1425886226e45979d85587ddf5e1e61665929718336451a0802c
-EBUILD logback-classic-1.2.11-r1.ebuild 3257 BLAKE2B d3b412b78a91e56ccc5b91746d6a604fa1450fa6edd04535b75e558e1d25681f4d774485c50ace1848c3cdfab66dd954fb826ccdcf367b2ebf6a87cc789e7ec4 SHA512 0c0f1066c28106101e806eb2564b00f93f7ab15228ec2eb8499e7306347908d63a38cbd76ef804174b29dfd16777c762fd5da5286cd26dd9c3b659918223b3f5
-EBUILD logback-classic-1.4.1.ebuild 4491 BLAKE2B 1e4fac469c556619ff47e216f9cbd18320f17ca5a2ec5fdf39e2cabe6d79ea0fb2e8da6971eb3b8b351fb7afe60a90fe34a3b3f5c35f94db0d33c1423608370e SHA512 8a3c4bdf8b6a15cd80ccad613c93398202fafe22f8db4ab782531c8a1aa70a4f7fc182817d19d8b9ebef70fab2bab701b7bac8664ffc3fa672a1eccb4e37ccc4
+EBUILD logback-classic-1.4.1.ebuild 4495 BLAKE2B 23c85bdf5ad91857ba524590134c7cd82cc85808f544048100f446ee459b1fd8378842642b6d993e8b42a568943904cfcd2b715f2bfffdd18928f8faac2f0942 SHA512 721e9a3d1ee371f9623ae97bd00ae52547bcd582d5aa45aa49fa5df6ecdd0c756a46af0942d8223cda599bd5b8910e1a24a8a8bddb3e0b000c273a31131f26cd
 MISC metadata.xml 413 BLAKE2B 3ae8c9f27dadfe978d070866e0c0368b89b8532f2aa6fbd3e3fab9e057320e1c6b5c2bc7367cc191e189acaa88384a0b86741d674d1cd711d4dd5ee8a29c9662 SHA512 7c2739ff8e878766487804fabcb39cda969c81e47af7fd51ffebfcb85dbdec10b7eef85b1d9c873561456e1592f6cdb8f82fbb4233abee1f43f323a1c10f9ba2
diff --git a/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild b/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild
deleted file mode 100644
index 10c52f8637b1..000000000000
--- a/dev-java/logback-classic/logback-classic-1.2.11-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/qos-ch/logback/archive/v_1.2.11.tar.gz --slot 0 --keywords "~amd64" --ebuild logback-classic-1.2.11.ebuild
-
-EAPI=8
-
-# No tests, too many dependencies missing
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="ch.qos.logback:logback-classic:1.2.11"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="logback-classic module"
-HOMEPAGE="https://logback.qos.ch"
-SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${PV}.tar.gz"
-
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
-# javax.mail:mail:1.4 -> !!!groupId-not-found!!!
-# javax.servlet:javax.servlet-api:3.1.0 -> !!!groupId-not-found!!!
-# org.codehaus.janino:janino:3.0.6 -> >=dev-java/janino-3.1.6:0
-# org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0
-
-CP_DEPEND="
-	dev-java/janino:0
-	dev-java/javax-mail:0
-	~dev-java/logback-core-${PV}:0
-	dev-java/reflections:0
-	dev-java/slf4j-api:1
-	java-virtuals/servlet-api:3.1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? ch.qos.cal10n.plugins:maven-cal10n-plugin:0.8.1 -> !!!groupId-not-found!!!
-# test? ch.qos.logback:logback-core:1.2.11 -> >=dev-java/logback-core-1.2.11:0
-# test? com.icegreen:greenmail:1.3 -> !!!groupId-not-found!!!
-# test? dom4j:dom4j:1.6.1 -> !!!groupId-not-found!!!
-# test? junit:junit:4.10 -> >=dev-java/junit-4.13.2:4
-# test? log4j:log4j:1.2.17 -> >=dev-java/log4j-1.2.17:0
-# test? org.apache.felix:org.apache.felix.main:2.0.2 -> !!!groupId-not-found!!!
-# test? org.assertj:assertj-core:1.7.1 -> >=dev-java/assertj-core-2.3.0:2
-# test? org.mockito:mockito-core:2.7.9 -> >=dev-java/mockito-4.4.0:4
-# test? org.slf4j:integration:1.7.32 -> !!!artifactId-not-found!!!
-# test? org.slf4j:jul-to-slf4j:1.7.32 -> !!!artifactId-not-found!!!
-# test? org.slf4j:log4j-over-slf4j:1.7.32 -> !!!artifactId-not-found!!!
-# test? org.slf4j:slf4j-api:1.7.32 -> >=dev-java/slf4j-api-1.7.32:0
-# test? org.slf4j:slf4j-ext:1.7.32 -> >=dev-java/slf4j-ext-1.7.36:0
-# test? org.subethamail:subethasmtp:2.1.0 -> !!!groupId-not-found!!!
-
-# Restricting to jdk:1.8
-# src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java:20: error: cannot find symbol
-# import sun.reflect.Reflection;
-#                   ^
-# https://jira.qos.ch/browse/LOGBACK-1343
-DEPEND="
-	virtual/jdk:1.8
-	${CP_DEPEND}"
-#	test? (
-#		dev-java/dom4j:1
-#		dev-java/assertj-core:2
-#		dev-java/log4j-12-api:2
-#		dev-java/logback-core:0
-#		dev-java/mockito:4
-#		dev-java/slf4j-api:0
-#		dev-java/slf4j-ext:0
-#	)
-# "
-
-RDEPEND="
-	virtual/jre:1.8
-	${CP_DEPEND}"
-
-DOCS=( ../README.md )
-
-S="${WORKDIR}/logback-v_${PV}/logback-classic"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="dom4j-1,logback-core,junit-4,log4j,assertj-core-2,mockito-4,slf4j-api,slf4j-ext"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/logback-classic/logback-classic-1.4.1.ebuild b/dev-java/logback-classic/logback-classic-1.4.1.ebuild
index 5538d5f55cf6..3c1d932f9dc1 100644
--- a/dev-java/logback-classic/logback-classic-1.4.1.ebuild
+++ b/dev-java/logback-classic/logback-classic-1.4.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/logback/archive/v_${PV}.tar.gz -> logback-${P
 
 LICENSE="EPL-1.0 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: ${PN}/pom.xml