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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CF84C138359 for ; Thu, 17 Sep 2020 22:14:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4486E077C; Thu, 17 Sep 2020 22:13:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B0529E077C for ; Thu, 17 Sep 2020 22:13:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06C3433BF34 for ; Thu, 17 Sep 2020 22:13:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7929232C for ; Thu, 17 Sep 2020 22:13:56 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1600378984.cc5c9e638e2f70f2ae217fa0d02d7b4a6b94eea2.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/openjdk/openjdk-8.265_p01.ebuild X-VCS-Directories: dev-java/openjdk/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: cc5c9e638e2f70f2ae217fa0d02d7b4a6b94eea2 X-VCS-Branch: master Date: Thu, 17 Sep 2020 22:13:56 +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: 55f4f5eb-d028-4ef2-b358-211aa5346897 X-Archives-Hash: 195f5bb8518490df24a1ce1e218cd8ba commit: cc5c9e638e2f70f2ae217fa0d02d7b4a6b94eea2 Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Sep 17 21:42:49 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Sep 17 21:43:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5c9e63 dev-java/openjdk: tweak unpack & prepare phases by building forest tructure before src_prepare allows us to apply patches easier and allows users to use /etc/portage/patches with default paths. Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/openjdk-8.265_p01.ebuild | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dev-java/openjdk/openjdk-8.265_p01.ebuild b/dev-java/openjdk/openjdk-8.265_p01.ebuild index cc033b9fde9..5101407a542 100644 --- a/dev-java/openjdk/openjdk-8.265_p01.ebuild +++ b/dev-java/openjdk/openjdk-8.265_p01.ebuild @@ -122,15 +122,16 @@ pkg_setup() { src_unpack() { default - mv -v "jdk${SLOT}u"* "${S}" || die -} + mv -v "jdk${SLOT}u"* "${P}" || die -src_prepare() { - default local repo for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do - mv -v ../"${repo}-"* "${repo}" || die + mv -v "${repo}-"* "${P}/${repo}" || die done +} + +src_prepare() { + default # new warnings in new gcc https://bugs.gentoo.org/685426 sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \ @@ -210,7 +211,7 @@ src_install() { rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die fi - # stupid build system does not remove that + # build system does not remove that if use headless-awt ; then rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \ {,jre/}bin/policytool bin/appletviewer || die