From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- dev-java/netty-common/Manifest | 4 +- .../netty-common/netty-common-4.0.36-r1.ebuild | 71 ---------------------- .../netty-common/netty-common-4.0.36-r2.ebuild | 2 +- dev-java/netty-common/netty-common-4.0.36.ebuild | 62 ------------------- 4 files changed, 2 insertions(+), 137 deletions(-) delete mode 100644 dev-java/netty-common/netty-common-4.0.36-r1.ebuild delete mode 100644 dev-java/netty-common/netty-common-4.0.36.ebuild (limited to 'dev-java/netty-common') diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest index 4015717cdc66..e5736cb154fd 100644 --- a/dev-java/netty-common/Manifest +++ b/dev-java/netty-common/Manifest @@ -1,5 +1,3 @@ DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6 -EBUILD netty-common-4.0.36-r1.ebuild 1985 BLAKE2B c7cf7c00ae6c9e38070f469fdd3b15941b3f9d2e52282602dbecd4c923ce847417cafa7af247145fff8eed8fe82208e61a9f56283ed82c061a11953e7afa29d7 SHA512 eea2879c06b4d2eb695cb9f24a1275d2b78408a986a5f845fdaa1174c8bb50ab3807f78ff3ed9ba0d01403bb1086ee8c4fc9eb0e777f8910b615a1d8c97692aa -EBUILD netty-common-4.0.36-r2.ebuild 1958 BLAKE2B 76261b2ac5ab0a0163ba27953360767a382d2a2b2e3fd16ad962dc14c197b71a49876bf1c64f2900f5b1e78f840b4cd841823822e4339c9f0742ead7e0c787fa SHA512 0742d56a578577bb26c7833b5f28d9dcced6607b8c280626efefe8ed689612f3acbc3e38bdf6ec4ca66ff141dcde9f24ba6f6621e7edd294e6bcb7ab9124225d -EBUILD netty-common-4.0.36.ebuild 1603 BLAKE2B 20210d9a3d5f26ca914d2ca739c59cfe2ebeac66ba59f1d7a8a00cb0b2cadf0e146f341d3c79b6de762513f89bc00c8fc42df8bd29b80297d810dde211299920 SHA512 d5aa89abcc60bd5313693773b9a24bd0fcde2ad7623f246fbad156c7251831507dbfa6d671fcfe1de0957ce8c165e6e04079df93881bba0c5730dcdf2e70fde0 +EBUILD netty-common-4.0.36-r2.ebuild 1954 BLAKE2B 78138e80ea4aae375307b578428552ca59fa9888e36393d5e32f7ecd1004c9e9f3114d70c1222614f59d74f16556ccce750dc618cbdf2364e13cb3d81a53b7e0 SHA512 ecdd4650655632fa53141d8e0339ea5d980891fe53ddd0c50328c1566a9683807d30ba783599390134808cd4fa8cb7418191704c7225a53016b35f6cda18cf8a MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a diff --git a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild b/dev-java/netty-common/netty-common-4.0.36-r1.ebuild deleted file mode 100644 index dadd4d4a6f1e..000000000000 --- a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild +++ /dev/null @@ -1,71 +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" - -inherit java-pkg-2 java-pkg-simple - -MY_PN="netty" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Async event-driven framework for high performance network applications" -HOMEPAGE="https://netty.io/" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="test" - -# Same test failures as before the revbump still occur. See https://bugs.gentoo.org/827221 -RESTRICT="test" - -CDEPEND="dev-java/commons-logging:0 - dev-java/javassist:3 - dev-java/log4j:0 - dev-java/slf4j-api:0" - -RDEPEND="virtual/jre:1.8 - ${CDEPEND}" - -# It does not build with java 11, https://bugs.gentoo.org/788364 -# src/main/java/io/netty/util/internal/Cleaner0.java:44: error: cannot find symbol -# Cleaner cleaner = (Cleaner) cleanerField.get(direct); -# ^ -# symbol: class Cleaner -# location: class Cleaner0 -DEPEND="virtual/jdk:1.8 - ${CDEPEND} - test? ( - dev-java/asm:4 - dev-java/cglib:3 - dev-java/easymock:3.2 - dev-java/hamcrest-core:1.3 - dev-java/hamcrest-library:1.3 - dev-java/junit:4 - dev-java/mockito:0 - dev-java/objenesis:0 - dev-java/slf4j-simple:0 - )" - -S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}" -JAVA_SRC_DIR="src/main/java" -JAVA_GENTOO_CLASSPATH="commons-logging,javassist-3,log4j,slf4j-api" - -src_prepare() { - default - # Needs Mockito 1.10. - rm -v src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java || die -} - -src_test() { - cd src/test/java || die - - local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},asm-4,cglib-3,easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis,slf4j-simple)" - local TESTS=$(find * -name "*Test.java") - TESTS="${TESTS//.java}" - TESTS="${TESTS//\//.}" - - ejavac -cp "${CP}" -d . $(find * -name "*.java") - ejunit4 -classpath "${CP}" ${TESTS} -} diff --git a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild index 9536f39175b8..3b2e51daa692 100644 --- a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild +++ b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" IUSE="test" # Same test failures as before the revbumps still occur. See https://bugs.gentoo.org/827221 diff --git a/dev-java/netty-common/netty-common-4.0.36.ebuild b/dev-java/netty-common/netty-common-4.0.36.ebuild deleted file mode 100644 index 6abc0507c74b..000000000000 --- a/dev-java/netty-common/netty-common-4.0.36.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 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-pkg-simple - -MY_PN="netty" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Async event-driven framework for high performance network applications" -HOMEPAGE="https://netty.io/" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -CDEPEND="dev-java/commons-logging:0 - dev-java/javassist:3 - dev-java/log4j:0 - dev-java/slf4j-api:0" - -RDEPEND=">=virtual/jre-1.7 - ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.7 - ${CDEPEND} - test? ( - dev-java/asm:4 - dev-java/cglib:3 - dev-java/easymock:3.2 - dev-java/hamcrest-core:1.3 - dev-java/hamcrest-library:1.3 - dev-java/junit:4 - dev-java/mockito:0 - dev-java/objenesis:0 - dev-java/slf4j-simple:0 - )" - -S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}" -JAVA_SRC_DIR="src/main/java" -JAVA_GENTOO_CLASSPATH="commons-logging,javassist-3,log4j,slf4j-api" - -java_prepare() { - # Needs Mockito 1.10. - rm -v src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java || die -} - -src_test() { - cd src/test/java || die - - local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},asm-4,cglib-3,easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis,slf4j-simple)" - local TESTS=$(find * -name "*Test.java") - TESTS="${TESTS//.java}" - TESTS="${TESTS//\//.}" - - ejavac -cp "${CP}" -d . $(find * -name "*.java") - ejunit4 -classpath "${CP}" ${TESTS} -} -- cgit v1.2.3