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 58A0F1382C5 for ; Wed, 10 Mar 2021 07:24:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86EC8E083B; Wed, 10 Mar 2021 07:24:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6E00FE083B for ; Wed, 10 Mar 2021 07:24:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0B7EE340CDA for ; Wed, 10 Mar 2021 07:24:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BE2A4A8 for ; Wed, 10 Mar 2021 07:24:18 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1615361054.2bfec260e57586d91de7da25029f893eef1094ea.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/rxvt-unicode/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild X-VCS-Directories: x11-terms/rxvt-unicode/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 2bfec260e57586d91de7da25029f893eef1094ea X-VCS-Branch: master Date: Wed, 10 Mar 2021 07:24:18 +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: 01d5a83a-2a46-461c-af30-0d06f98e6fe7 X-Archives-Hash: dc363ab10859afada9557839d5447e2e commit: 2bfec260e57586d91de7da25029f893eef1094ea Author: Fabian Groffen gentoo org> AuthorDate: Wed Mar 10 07:24:01 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Mar 10 07:24:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bfec260 x11-terms/rxvt-unicode: fix build on Prefix Closes: https://bugs.gentoo.org/506500 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild | 5 ++++- x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild index 4f49bd38126..d72cdf336d7 100644 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild +++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r7.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools desktop systemd +inherit autotools desktop systemd prefix COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch" @@ -54,6 +54,9 @@ src_prepare() { # kill the rxvt-unicode terminfo file - #192083 sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed" + # use xsubpp from Prefix - #506500 + hprefixify -q '"' -w "/xsubpp/" src/Makefile.in + eautoreconf } diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild index f5856323843..71119ddbc14 100644 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild +++ b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools cvs desktop vcs-clean +inherit autotools cvs desktop vcs-clean prefix DESCRIPTION="rxvt clone with xft and unicode support" HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html" @@ -56,6 +56,9 @@ src_prepare() { # kill the rxvt-unicode terminfo file - #192083 sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed" + # use xsubpp from Prefix - #506500 + hprefixify -q '"' -w "/xsubpp/" src/Makefile.in + eautoreconf }