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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5DAE415806E for ; Tue, 30 May 2023 18:01:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8AF57E09F1; Tue, 30 May 2023 18:01:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6EFBAE09F1 for ; Tue, 30 May 2023 18:01:43 +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 59584340A7F for ; Tue, 30 May 2023 18:01:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 825A6A6F for ; Tue, 30 May 2023 18:01:40 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1685469535.2b106da22dbce2245ff14d4a6f72ab762afea55a.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/java-config/java-config-2.3.1-r1.ebuild dev-java/java-config/java-config-2.3.1.ebuild dev-java/java-config/java-config-9999.ebuild X-VCS-Directories: dev-java/java-config/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 2b106da22dbce2245ff14d4a6f72ab762afea55a X-VCS-Branch: master Date: Tue, 30 May 2023 18:01:40 +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: 6b2d6735-0132-428c-8615-9036b8f59fc9 X-Archives-Hash: a132d68f589b5ea20d024d6cfbe0c393 commit: 2b106da22dbce2245ff14d4a6f72ab762afea55a Author: Mike Gilbert gentoo org> AuthorDate: Tue May 30 17:58:55 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue May 30 17:58:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b106da2 dev-java/java-config: replace @GENTOO_PORTAGE_EPREFIX in launcher.bash Closes: https://bugs.gentoo.org/544836 Signed-off-by: Mike Gilbert gentoo.org> .../{java-config-2.3.1.ebuild => java-config-2.3.1-r1.ebuild} | 7 ++++++- dev-java/java-config/java-config-9999.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1-r1.ebuild similarity index 88% rename from dev-java/java-config/java-config-2.3.1.ebuild rename to dev-java/java-config/java-config-2.3.1-r1.ebuild index dd3b743d548d..13f2ded5c0e8 100644 --- a/dev-java/java-config/java-config-2.3.1.ebuild +++ b/dev-java/java-config/java-config-2.3.1-r1.ebuild @@ -7,7 +7,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 +inherit distutils-r1 prefix DESCRIPTION="Java environment configuration query tool" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" @@ -26,6 +26,11 @@ RDEPEND=" sys-apps/baselayout-java sys-apps/portage[${PYTHON_USEDEP}]" +python_configure_all() { + # setup.py fails to update this file + eprefixify src/launcher.bash +} + python_install_all() { distutils-r1_python_install_all diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild index ce28aa1533a0..ee9dad46c7c3 100644 --- a/dev-java/java-config/java-config-9999.ebuild +++ b/dev-java/java-config/java-config-9999.ebuild @@ -7,7 +7,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 +inherit distutils-r1 prefix if [[ ${PV} = *9999 ]]; then inherit git-r3 @@ -32,6 +32,11 @@ RDEPEND=" sys-apps/baselayout-java sys-apps/portage[${PYTHON_USEDEP}]" +python_configure_all() { + # setup.py fails to update this file + eprefixify src/launcher.bash +} + python_install_all() { distutils-r1_python_install_all