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 068FB15817D for ; Fri, 14 Jun 2024 10:00:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D567FE2B80; Fri, 14 Jun 2024 10:00:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 7E6C9E2B80 for ; Fri, 14 Jun 2024 10:00:31 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D04C33BF03 for ; Fri, 14 Jun 2024 10:00:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE15D1CE9 for ; Fri, 14 Jun 2024 10:00:28 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1718359210.41faa907e3a36f4ed00aced3499d469abb865281.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/java-utils-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 41faa907e3a36f4ed00aced3499d469abb865281 X-VCS-Branch: master Date: Fri, 14 Jun 2024 10:00:28 +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: e1bf504e-caf2-4b31-9f10-4b6c5f6a8c6f X-Archives-Hash: 0f6eba95ede5c874eab4193c6073d358 commit: 41faa907e3a36f4ed00aced3499d469abb865281 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Mon Feb 26 09:37:01 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Jun 14 10:00:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41faa907 java-utils-2.eclass: eerror if java-utils-2 is inherited directly Closes: https://bugs.gentoo.org/207098 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> eclass/java-utils-2.eclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index ac0c67942b41..bc6fe9086583 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -34,6 +34,12 @@ export WANT_JAVA_CONFIG="2" has test ${JAVA_PKG_IUSE} && RESTRICT+=" !test? ( test )" +# this eclass must be inherited after java-pkg-2 or java-pkg-opt-2 +# bug #207098 +if ! has java-pkg-2 ${INHERITED} && ! has java-pkg-opt-2 ${INHERITED}; then + eerror "java-utils-2 eclass must not be inherited directly." +fi + # @VARIABLE: JAVA_PKG_E_DEPEND # @INTERNAL # @DESCRIPTION: