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 958A3158086 for ; Mon, 22 Nov 2021 07:11:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6FF9E0917; Mon, 22 Nov 2021 07:11:09 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEF8DE0917 for ; Mon, 22 Nov 2021 07:11:09 +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 0ED583432C0 for ; Mon, 22 Nov 2021 07:11:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C5018E for ; Mon, 22 Nov 2021 07:11:01 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1637564843.6f46c580900c559ff34f27f4118e9bb70b510c8b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-config/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/gcc-config/gcc-config-2.5-r1.ebuild sys-devel/gcc-config/gcc-config-2.5.ebuild sys-devel/gcc-config/gcc-config-9999.ebuild X-VCS-Directories: sys-devel/gcc-config/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6f46c580900c559ff34f27f4118e9bb70b510c8b X-VCS-Branch: master Date: Mon, 22 Nov 2021 07:11:01 +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: 43f93657-cef6-469c-b35e-654af87b377f X-Archives-Hash: af0090bf52965ac3e57680a8d5428aa5 commit: 6f46c580900c559ff34f27f4118e9bb70b510c8b Author: Sam James gentoo org> AuthorDate: Thu Nov 18 09:25:39 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 22 07:07:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f46c580 sys-devel/gcc-config: warn on obsolete gcj wrapper Bug: https://bugs.gentoo.org/804178 Signed-off-by: Sam James gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/22985 Signed-off-by: Sam James gentoo.org> ...gcc-config-2.5.ebuild => gcc-config-2.5-r1.ebuild} | 8 ++++++++ sys-devel/gcc-config/gcc-config-9999.ebuild | 19 +++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/sys-devel/gcc-config/gcc-config-2.5.ebuild b/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild similarity index 76% rename from sys-devel/gcc-config/gcc-config-2.5.ebuild rename to sys-devel/gcc-config/gcc-config-2.5-r1.ebuild index 692103f6a084..67c6a7ee6316 100644 --- a/sys-devel/gcc-config/gcc-config-2.5.ebuild +++ b/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild @@ -49,4 +49,12 @@ pkg_postinst() { if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then eselect compiler-shadow update all fi + + if ! has_version "sys-devel/gcc[gcj(-)]" && [[ -x "${EROOT}"/usr/bin/gcj ]] ; then + # Warn about obsolete /usr/bin/gcj for bug #804178 + ewarn "Obsolete GCJ wrapper found: ${EROOT}/usr/bin/gcj!" + ewarn "Please delete this file unless you know it is needed (e.g. custom gcj install)." + ewarn "If you have no idea what this means, please delete the file:" + ewarn " rm ${EROOT}/usr/bin/gcj" + fi } diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild index 7e58334302bb..67c6a7ee6316 100644 --- a/sys-devel/gcc-config/gcc-config-9999.ebuild +++ b/sys-devel/gcc-config/gcc-config-9999.ebuild @@ -7,7 +7,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git" inherit git-r3 else - SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz" + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi @@ -39,15 +39,6 @@ src_install() { } pkg_postinst() { - # Scrub eselect-compiler remains. - # To be removed in 2021. - rm -f "${ROOT}"/etc/env.d/05compiler - - # We not longer use the /usr/include/g++-v3 hacks, as - # it is not needed ... - # To be removed in 2021. - rm -f "${ROOT}"/usr/include/g++{,-v3} - # Do we have a valid multi ver setup ? local x for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do @@ -58,4 +49,12 @@ pkg_postinst() { if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then eselect compiler-shadow update all fi + + if ! has_version "sys-devel/gcc[gcj(-)]" && [[ -x "${EROOT}"/usr/bin/gcj ]] ; then + # Warn about obsolete /usr/bin/gcj for bug #804178 + ewarn "Obsolete GCJ wrapper found: ${EROOT}/usr/bin/gcj!" + ewarn "Please delete this file unless you know it is needed (e.g. custom gcj install)." + ewarn "If you have no idea what this means, please delete the file:" + ewarn " rm ${EROOT}/usr/bin/gcj" + fi }