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 3CA47138330 for ; Thu, 24 May 2018 17:13:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A133AE06CC; Thu, 24 May 2018 17:13:58 +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 8120FE06CC for ; Thu, 24 May 2018 17:13:58 +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 B6003335C07 for ; Thu, 24 May 2018 17:13:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C101257 for ; Thu, 24 May 2018 17:13:56 +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: <1527182024.bc57417ab8fc26344b67634ef95cb9f1cc8b27f5.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-9999.ebuild X-VCS-Directories: sys-apps/baselayout/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: bc57417ab8fc26344b67634ef95cb9f1cc8b27f5 X-VCS-Branch: master Date: Thu, 24 May 2018 17: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-Archives-Salt: 46853f33-d518-4b63-bcf0-c0db9b623156 X-Archives-Hash: 52c6433377c51f75c97a68b764d5d302 commit: bc57417ab8fc26344b67634ef95cb9f1cc8b27f5 Author: William Hubbs gentoo org> AuthorDate: Thu May 24 17:11:35 2018 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu May 24 17:13:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc57417a sys-apps/baselayout: sync live ebuild Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-apps/baselayout/baselayout-9999.ebuild | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index 2d016a01e5b..866701708dc 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -63,11 +63,11 @@ multilib_layout() { # data ... just fall over in that case. local prefix prefix_lst if use split-usr ; then - prefix_lst="${EROOT}"{,usr/,usr/local/} + prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) else - prefix_lst="${EROOT}"{usr/,usr/local/} + prefix_lst=( "${EROOT}"{usr/,usr/local/} ) fi - for prefix in "${prefix_lst}"; do + for prefix in "${prefix_lst[@]}"; do if [ "${SYMLINK_LIB}" = yes ] ; then # we need to make sure "lib" points to the native libdir if [ -h "${prefix}lib" ] ; then @@ -258,6 +258,11 @@ pkg_postinst() { 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" + fi done if [[ -e "${EROOT}"etc/env.d/00basic ]]; then