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 E6A1915801B for ; Tue, 22 Aug 2023 16:09:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E77372BC01A; Tue, 22 Aug 2023 16:09:57 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 D34842BC01A for ; Tue, 22 Aug 2023 16:09:57 +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 F11BE341288 for ; Tue, 22 Aug 2023 16:09:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F17971045 for ; Tue, 22 Aug 2023 16:09:54 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1692720589.8f7e0b6ef89d51d7b8b06866d4343765d0bc9f91.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/baselayout/baselayout-2.14.ebuild X-VCS-Directories: sys-apps/baselayout/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 8f7e0b6ef89d51d7b8b06866d4343765d0bc9f91 X-VCS-Branch: master Date: Tue, 22 Aug 2023 16:09:54 +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: c6b68789-94f4-48e0-88b3-162e63e1f3cc X-Archives-Hash: d533828adc3c72ae83c98905556f06cf commit: 8f7e0b6ef89d51d7b8b06866d4343765d0bc9f91 Author: William Hubbs gentoo org> AuthorDate: Tue Aug 22 16:09:49 2023 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Aug 22 16:09:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7e0b6e sys-apps/baselayout: remove 2.4 and 2.6 migration code Signed-off-by: William Hubbs gentoo.org> sys-apps/baselayout/baselayout-2.14.ebuild | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/sys-apps/baselayout/baselayout-2.14.ebuild b/sys-apps/baselayout/baselayout-2.14.ebuild index 8cc92f9d92cc..98121cf026dd 100644 --- a/sys-apps/baselayout/baselayout-2.14.ebuild +++ b/sys-apps/baselayout/baselayout-2.14.ebuild @@ -343,23 +343,6 @@ pkg_postinst() { ewarn "You should reboot now to get /run mounted with tmpfs!" fi - for x in ${REPLACING_VERSIONS}; do - if ver_test 2.4 -lt ${x}; then - ewarn "After updating ${EROOT}/etc/profile, please run" - ewarn "env-update && . /etc/profile" - fi - - if ver_test 2.6 -lt ${x}; then - ewarn "Please run env-update then log out and back in to" - ewarn "update your path." - fi - # clean up after 2.5 typos - # https://bugs.gentoo.org/show_bug.cgi?id=656380 - if [[ ${x} == 2.5 ]]; then - rm -fr "${EROOT}/{,usr" || die - fi - done - if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout" ewarn "Please migrate your changes."