From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EA8AF15808B for ; Fri, 15 Apr 2022 09:36:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 121FCE08F3; Fri, 15 Apr 2022 09:36:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A721E05AC for ; Fri, 15 Apr 2022 09:36:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BEC11341C13 for ; Fri, 15 Apr 2022 09:36:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE1933B2 for ; Fri, 15 Apr 2022 09:36:11 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1650015305.6c3a10a7a1cee9440e33cfbf7223cddb75584b81.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/netty/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/netty/netty-4.1.35.ebuild X-VCS-Directories: dev-java/netty/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 6c3a10a7a1cee9440e33cfbf7223cddb75584b81 X-VCS-Branch: master Date: Fri, 15 Apr 2022 09:36:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5efadace-1e7d-4795-b141-1d47e00c8665 X-Archives-Hash: a689f712489484f18c52ebbbb492afa1 commit: 6c3a10a7a1cee9440e33cfbf7223cddb75584b81 Author: Florian Schmaus gentoo org> AuthorDate: Fri Apr 15 08:43:06 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Fri Apr 15 09:35:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c3a10a7 dev-java/netty: style changes and minor fixes Signed-off-by: Florian Schmaus gentoo.org> dev-java/netty/netty-4.1.35.ebuild | 41 +++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/dev-java/netty/netty-4.1.35.ebuild b/dev-java/netty/netty-4.1.35.ebuild index fdc4a3046307..93c2ad37726c 100644 --- a/dev-java/netty/netty-4.1.35.ebuild +++ b/dev-java/netty/netty-4.1.35.ebuild @@ -14,7 +14,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Async event-driven framework for high performance network applications" HOMEPAGE="https://netty.io/" -SRC_URI="https://codeload.github.com/netty/netty/tar.gz/netty-${PV}.Final -> ${P}.Final.tar.gz" +SRC_URI="https://github.com/netty/netty/archive/refs/tags/netty-${PV}.Final.tar.gz" LICENSE="Apache-2.0" SLOT="0" @@ -23,7 +23,7 @@ KEYWORDS="~amd64" # We do not build the full range of modules provided by netty but only what # was available before in netty-common, netty-buffer and netty-transport. # Further modules might be added to the array. -modules=( +NETTY_MODULES=( "common" "resolver" "buffer" @@ -73,7 +73,8 @@ DEPEND=" RDEPEND=" >=virtual/jre-1.8:* - ${CP_DEPEND}" + ${CP_DEPEND} +" S="${WORKDIR}/netty-netty-${PV}.Final" @@ -118,15 +119,13 @@ src_prepare() { } src_compile() { + local module # We loop over the modules list and compile the jar files. - for module in "${modules[@]}" ; do \ - - JAVA_SRC_DIR="" - JAVA_RESOURCE_DIRS="" + for module in "${NETTY_MODULES[@]}"; do + JAVA_SRC_DIR=() + JAVA_RESOURCE_DIRS=() JAVA_MAIN_CLASS="" - echo "compiling $module" - JAVA_SRC_DIR=( "$module/src/main/java" "$module/src/module" @@ -139,6 +138,7 @@ src_compile() { JAVA_JAR_FILENAME="$module.jar" + einfo "Compiling netty-${module}" java-pkg-simple_src_compile JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar" @@ -148,12 +148,10 @@ src_compile() { done if use doc; then - - JAVA_SRC_DIR="" + JAVA_SRC_DIR=() JAVA_JAR_FILENAME="ignoreme.jar" - for module in "${modules[@]}" ; do \ - + for module in "${NETTY_MODULES[@]}" ; do # Some modules don't have source code if [[ -d $module/src/main/java/io ]]; then \ JAVA_SRC_DIR+=( "$module/src/main/java" ) @@ -166,38 +164,35 @@ src_compile() { } src_test() { - for module in "${modules[@]}" ; do \ - + local module + for module in "${NETTY_MODULES[@]}"; do JAVA_TEST_SRC_DIR="$module/src/test/java" - JAVA_TEST_RESOURCE_DIRS="" + JAVA_TEST_RESOURCE_DIRS=() # Not all of the modules have test resources. if [[ -d $module/src/test/resources ]]; then \ JAVA_TEST_RESOURCE_DIRS="$module/src/test/resources" fi + einfo "Testing netty-${module}" java-pkg-simple_src_test - done } src_install() { einstalldocs # https://bugs.gentoo.org/789582 - for module in "${modules[@]}" ; do \ - + local module + for module in "${NETTY_MODULES[@]}"; do JAVA_MAIN_CLASS=$( sed -n 's:.*\(.*\):\1:p' $module/pom.xml ) java-pkg_dojar $module.jar # Some modules don't have source code - if [[ -d $module/src/main/java/org ]]; then \ - + if [[ -d $module/src/main/java/org ]]; then if use source; then java-pkg_dosrc "$module/src/main/java/*" fi - fi - done if use doc; then