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 2234C1382C5 for ; Tue, 26 Jan 2021 11:53:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4134CE0CCF; Tue, 26 Jan 2021 11:53:30 +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 13740E0CCF for ; Tue, 26 Jan 2021 11:53:30 +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 574F8340E06 for ; Tue, 26 Jan 2021 11:53:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CBE9932B for ; Tue, 26 Jan 2021 11:53:26 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1611662005.2cc28a0bd67de3cd475b1393d3170628d89b1ad3.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/apache/apache-2.4.46-r5.ebuild X-VCS-Directories: www-servers/apache/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 2cc28a0bd67de3cd475b1393d3170628d89b1ad3 X-VCS-Branch: master Date: Tue, 26 Jan 2021 11:53:26 +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: 5ad5339e-c35a-44cd-ab3c-ad8ea5d4e770 X-Archives-Hash: c68b6112a6b8576f2d3be6ed050a1fa2 commit: 2cc28a0bd67de3cd475b1393d3170628d89b1ad3 Author: Lars Wendler gentoo org> AuthorDate: Tue Jan 26 11:53:16 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Jan 26 11:53:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc28a0b www-servers/apache: Removed unnecessary slash strip Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> www-servers/apache/apache-2.4.46-r5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www-servers/apache/apache-2.4.46-r5.ebuild b/www-servers/apache/apache-2.4.46-r5.ebuild index c73f4608741..f5c277b6c90 100644 --- a/www-servers/apache/apache-2.4.46-r5.ebuild +++ b/www-servers/apache/apache-2.4.46-r5.ebuild @@ -188,7 +188,7 @@ src_install() { /usr/share/man/man8/{rotatelogs.8,htcacheclean.8} ) for i in ${apache_tools_prune_list[@]} ; do - rm "${ED%/}"/${i} || die "Failed to prune apache-tools bits" + rm "${ED}"/${i} || die "Failed to prune apache-tools bits" done # install apxs in /usr/bin (bug #502384) and put a symlink into the @@ -210,7 +210,7 @@ src_install() { doins "${FILESDIR}"/41_mod_http2.conf # Fix path to apache libdir - sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die + sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die } pkg_postinst() {