[gentoo-commits] repo/gentoo:master commit in: x11-wm/spectrwm/

["Ben Kohler" <bkohler@gentoo.org>]

commit:     7a46d24421c689e39582e0dda4bc7648e7719e6c
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 29 15:57:35 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Mar 29 15:57:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a46d244

x11-wm/spectrwm: drop accidental adds

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 ...less-iwd-fix-one-last-COMMON_DEPEND-usage.patch | 28 ---------------------
 x11-wm/spectrwm/foo.patch                          | 29 ----------------------
 2 files changed, 57 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
deleted file mode 100644
index 2766a34a6ba..00000000000
--- a/x11-wm/spectrwm/0001-net-wireless-iwd-fix-one-last-COMMON_DEPEND-usage.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e98e032462cb92d9871ec2fc3ac417cec5cc7f97 Mon Sep 17 00:00:00 2001
-From: Ben Kohler <bkohler@gentoo.org>
-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 <bkohler@gentoo.org>
----
- 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
deleted file mode 100644
index 33bf233d1a9..00000000000
--- a/x11-wm/spectrwm/foo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 00522598eab59b612c7ba31b77deb4258c8af009
-Author: Ben Kohler <bkohler@gentoo.org>
-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 <bkohler@gentoo.org>
-
-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