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 427861382C5 for ; Mon, 29 Mar 2021 15:44:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 974B7E070D; Mon, 29 Mar 2021 15:44:49 +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 6FCA7E070D for ; Mon, 29 Mar 2021 15:44:49 +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 3D6E133BEA6 for ; Mon, 29 Mar 2021 15:44:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AED8A4C6 for ; Mon, 29 Mar 2021 15:44:46 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1617032681.0aec0bf3d6a07816e9d909442aee77f73da835a7.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/spectrwm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/spectrwm/0001-net-wireless-iwd-fix-one-last-COMMON_DEPEND-usage.patch x11-wm/spectrwm/foo.patch x11-wm/spectrwm/spectrwm-3.4.1.ebuild X-VCS-Directories: x11-wm/spectrwm/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 0aec0bf3d6a07816e9d909442aee77f73da835a7 X-VCS-Branch: master Date: Mon, 29 Mar 2021 15:44:46 +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: 4f84b8fa-7dfe-4926-abca-d0e3835de14b X-Archives-Hash: ee9c6e94ed8bdd0e5b2872d11fe8965d commit: 0aec0bf3d6a07816e9d909442aee77f73da835a7 Author: Ben Kohler gentoo org> AuthorDate: Mon Mar 29 15:44:26 2021 +0000 Commit: Ben Kohler gentoo org> CommitDate: Mon Mar 29 15:44:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aec0bf3 x11-wm/spectrwm: restore prefix support (better than before) Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Ben Kohler gentoo.org> ...less-iwd-fix-one-last-COMMON_DEPEND-usage.patch | 28 +++++++++++++++++++++ x11-wm/spectrwm/foo.patch | 29 ++++++++++++++++++++++ x11-wm/spectrwm/spectrwm-3.4.1.ebuild | 6 ++--- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/x11-wm/spectrwm/0001-net-wireless-iwd-fix-one-last-COMMON_DEPEND-usage.patch b/x11-wm/spectrwm/0001-net-wireless-iwd-fix-one-last-COMMON_DEPEND-usage.patch new file mode 100644 index 00000000000..2766a34a6ba --- /dev/null +++ b/x11-wm/spectrwm/0001-net-wireless-iwd-fix-one-last-COMMON_DEPEND-usage.patch @@ -0,0 +1,28 @@ +From e98e032462cb92d9871ec2fc3ac417cec5cc7f97 Mon Sep 17 00:00:00 2001 +From: Ben Kohler +Date: Mon, 29 Mar 2021 09:38:24 -0500 +Subject: [PATCH] net-wireless/iwd: fix one last COMMON_DEPEND usage + +Closes: https://bugs.gentoo.org/779091 +Package-Manager: Portage-3.0.18, Repoman-3.0.3 +Signed-off-by: Ben Kohler +--- + net-wireless/iwd/iwd-1.13.ebuild | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net-wireless/iwd/iwd-1.13.ebuild b/net-wireless/iwd/iwd-1.13.ebuild +index 438b2aa425c..709afebddeb 100644 +--- a/net-wireless/iwd/iwd-1.13.ebuild ++++ b/net-wireless/iwd/iwd-1.13.ebuild +@@ -29,7 +29,7 @@ DEPEND=" + client? ( sys-libs/readline:0= ) + " + +-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}" ++[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}" + + RDEPEND=" + ${DEPEND} +-- +2.31.1 + diff --git a/x11-wm/spectrwm/foo.patch b/x11-wm/spectrwm/foo.patch new file mode 100644 index 00000000000..33bf233d1a9 --- /dev/null +++ b/x11-wm/spectrwm/foo.patch @@ -0,0 +1,29 @@ +commit 00522598eab59b612c7ba31b77deb4258c8af009 +Author: Ben Kohler +Date: Mon Mar 29 09:06:33 2021 -0500 + + x11-wm/spectrwm: remove incorrect EROOT usage + + Package-Manager: Portage-3.0.18, Repoman-3.0.3 + Signed-off-by: Ben Kohler + +diff --git a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild +index 3b826527316..3b297f77149 100644 +--- a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild ++++ b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild +@@ -36,12 +36,12 @@ src_prepare() { + + src_compile() { + tc-export CC PKG_CONFIG +- emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)" ++ emake -C linux PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" + } + + src_install() { +- emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)" \ +- SYSCONFDIR="${EROOT}/etc" DOCDIR="${EROOT}/usr/share/doc/${P}" \ ++ emake -C linux PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" \ ++ SYSCONFDIR="/etc" DOCDIR="/usr/share/doc/${P}" \ + DESTDIR="${D}" install + + dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh diff --git a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild index 3b297f77149..cbe7e0eeebd 100644 --- a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild +++ b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild @@ -36,12 +36,12 @@ src_prepare() { src_compile() { tc-export CC PKG_CONFIG - emake -C linux PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" + emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" } src_install() { - emake -C linux PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" \ - SYSCONFDIR="/etc" DOCDIR="/usr/share/doc/${P}" \ + emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + SYSCONFDIR="${EPREFIX}/etc" DOCDIR="${EPREFIX}/usr/share/doc/${P}" \ DESTDIR="${D}" install dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh