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 E773F138334 for ; Wed, 27 Jun 2018 01:31:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C321AE09F9; Wed, 27 Jun 2018 01:28:48 +0000 (UTC) Received: from mx-out1.startmail.com (mx-out1.startmail.com [145.131.90.139]) (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 68B74E09EA for ; Wed, 27 Jun 2018 01:28:47 +0000 (UTC) From: "Marty E. Plummer" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=startmail.com; s=2017-11; t=1530062926; bh=olqJLCMNPrI5ySpYfRcJRT4mp0rywaRY5ZdHuVExgB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HVXEaNxNSDtlVm/tBUOEyhoIe4i/GDba80NzaoGnhV6y39RwEG4D/5eWffKvTH97f Ssyq2OV57uBphwU7BDkn/v3jUgKCaN+8RlcHBH86g73Gr/hsvN+KsJiG93TWKP7ghn 3/G4FN6A9a6DZw4y43a4ELYugFqsZsbAL4w7ngoK57k5u86FR8l3vPKBVtBpaVObK5 m948to04zGYVrmY6IDZ1bBrbccxxB3NALngvZ9RoHGOxVvp6AHJGOKKcubTDLBPhVl rermGtRN+NaNywtu+F/LV3K2+1dPktGvqYooPXMAIjfSMxYWp2gRiiMYQ7x5OVFQTk hamZ85yY+cC8A== To: gentoo-dev@lists.gentoo.org Cc: "Marty E. Plummer" Subject: [gentoo-dev] [PATCH 06/10] gnome2.eclass: make EAPI 7 ready Date: Tue, 26 Jun 2018 20:27:30 -0500 Message-Id: <20180627012734.1319-7-hanetzer@startmail.com> In-Reply-To: <20180627012734.1319-1-hanetzer@startmail.com> References: <20180627012734.1319-1-hanetzer@startmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: fba2f289-0ca4-4916-b0f1-6ea502548e8b X-Archives-Hash: 84f24fdef88e146389a26bebf9760228 Package-Manager: Portage-2.3.40, Repoman-2.3.9 --- eclass/gnome2.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index c4418df92bb..57eafcd451b 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -256,7 +256,7 @@ gnome2_src_install() { # create bogus directories in /var/lib/ if has ${EAPI:-0} 4 5; then dodir "${sk_tmp_dir}" || die "dodir failed" - emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed" + emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED%/}${sk_tmp_dir} " "$@" install || die "install failed" else default fi @@ -282,14 +282,14 @@ gnome2_src_install() { # Do not keep /var/lib/scrollkeeper because: # 1. The scrollkeeper database is regenerated at pkg_postinst() - # 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg + # 2. ${ED%/}/var/lib/scrollkeeper contains only indexes for the current pkg # thus it makes no sense if pkg_postinst ISN'T run for some reason. - rm -rf "${ED}${sk_tmp_dir}" - rmdir "${ED}/var/lib" 2>/dev/null - rmdir "${ED}/var" 2>/dev/null + rm -rf "${ED%/}${sk_tmp_dir}" + rmdir "${ED%/}/var/lib" 2>/dev/null + rmdir "${ED%/}/var" 2>/dev/null # Make sure this one doesn't get in the portage db - rm -fr "${ED}/usr/share/applications/mimeinfo.cache" + rm -fr "${ED%/}/usr/share/applications/mimeinfo.cache" # Delete all .la files if has ${EAPI:-0} 4; then -- 2.17.1