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 4570B138350 for ; Fri, 27 Mar 2020 19:48:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AD66E0BDF; Fri, 27 Mar 2020 19:48:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B82D3E0BDF for ; Fri, 27 Mar 2020 19:48:11 +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 4CCE034F937 for ; Fri, 27 Mar 2020 19:48:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0268F186 for ; Fri, 27 Mar 2020 19:48:08 +0000 (UTC) From: "Mike Pagano" 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 Pagano" Message-ID: <1585337778.6d910caa4b1e104dd5e0ff6ae9eccc1d3c97b0dd.mpagano@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/idea-community/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild X-VCS-Directories: dev-util/idea-community/ X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 6d910caa4b1e104dd5e0ff6ae9eccc1d3c97b0dd X-VCS-Branch: master Date: Fri, 27 Mar 2020 19:48:08 +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: b305cfdd-74ce-47ec-ae14-8d6fcef6f934 X-Archives-Hash: 21812ac2ed7ead79b6fb05e3e690cbc0 commit: 6d910caa4b1e104dd5e0ff6ae9eccc1d3c97b0dd Author: Mike Pagano gentoo org> AuthorDate: Fri Mar 27 19:36:18 2020 +0000 Commit: Mike Pagano gentoo org> CommitDate: Fri Mar 27 19:36:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d910caa dev-util/idea-community: Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mike Pagano gentoo.org> .../idea-community-2019.3.3.193.6494.35.ebuild | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild b/dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild index 31255cb3438..fbfcbabe739 100644 --- a/dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild +++ b/dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild @@ -61,9 +61,6 @@ QA_PREBUILT="opt/${PN}-${MY_PV}/*" # jbr11 binary doesn't unpack nicely into a single folder src_unpack() { - echo "S is ${S}" - echo "SRC_URI is ${SRC_URI}" - echo "unpack ${MY_PN}IC-${PV_STRING}.tar.gz" if use !jbr11 ; then default_src_unpack else @@ -80,19 +77,25 @@ src_prepare() { else JRE_DIR=jre fi + if use jbr8; then mv "${WORKDIR}/jre" ./"${JRE_DIR}" + PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}" + else + PLUGIN_DIR="${S}/${JRE_DIR}/lib/" fi - rm -vf "${S}"/"${JRE_DIR}"/lib/*/libavplugin* || die - rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi* || die - rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le || die - rm -vf "${S}"/bin/libdbm64* || die + rm -vf ${PLUGIN_DIR}/libavplugin* + rm -vf ${S}/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi* + rm -vrf ${S}/lib/pty4j-native/linux/ppc64le + rm -vf ${S}/bin/libdbm64* if [[ -d "${S}"/"${JRE_DIR}" ]]; then - for file in "${S}"/"${JRE_DIR}"/lib/amd64/{libfxplugins.so,libjfxmedia.so} + for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so} do - patchelf --set-rpath '$ORIGIN' $file || die + if [[ -f "$file" ]]; then + patchelf --set-rpath '$ORIGIN' $file || die + fi done fi