| 1 |
commit: 0aec0bf3d6a07816e9d909442aee77f73da835a7 |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 29 15:44:26 2021 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 29 15:44:41 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aec0bf3 |
| 7 |
|
| 8 |
x11-wm/spectrwm: restore prefix support (better than before) |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
| 12 |
|
| 13 |
...less-iwd-fix-one-last-COMMON_DEPEND-usage.patch | 28 +++++++++++++++++++++ |
| 14 |
x11-wm/spectrwm/foo.patch | 29 ++++++++++++++++++++++ |
| 15 |
x11-wm/spectrwm/spectrwm-3.4.1.ebuild | 6 ++--- |
| 16 |
3 files changed, 60 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..2766a34a6ba |
| 21 |
--- /dev/null |
| 22 |
+++ b/x11-wm/spectrwm/0001-net-wireless-iwd-fix-one-last-COMMON_DEPEND-usage.patch |
| 23 |
@@ -0,0 +1,28 @@ |
| 24 |
+From e98e032462cb92d9871ec2fc3ac417cec5cc7f97 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Ben Kohler <bkohler@g.o> |
| 26 |
+Date: Mon, 29 Mar 2021 09:38:24 -0500 |
| 27 |
+Subject: [PATCH] net-wireless/iwd: fix one last COMMON_DEPEND usage |
| 28 |
+ |
| 29 |
+Closes: https://bugs.gentoo.org/779091 |
| 30 |
+Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 31 |
+Signed-off-by: Ben Kohler <bkohler@g.o> |
| 32 |
+--- |
| 33 |
+ net-wireless/iwd/iwd-1.13.ebuild | 2 +- |
| 34 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 35 |
+ |
| 36 |
+diff --git a/net-wireless/iwd/iwd-1.13.ebuild b/net-wireless/iwd/iwd-1.13.ebuild |
| 37 |
+index 438b2aa425c..709afebddeb 100644 |
| 38 |
+--- a/net-wireless/iwd/iwd-1.13.ebuild |
| 39 |
++++ b/net-wireless/iwd/iwd-1.13.ebuild |
| 40 |
+@@ -29,7 +29,7 @@ DEPEND=" |
| 41 |
+ client? ( sys-libs/readline:0= ) |
| 42 |
+ " |
| 43 |
+ |
| 44 |
+-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}" |
| 45 |
++[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}" |
| 46 |
+ |
| 47 |
+ RDEPEND=" |
| 48 |
+ ${DEPEND} |
| 49 |
+-- |
| 50 |
+2.31.1 |
| 51 |
+ |
| 52 |
|
| 53 |
diff --git a/x11-wm/spectrwm/foo.patch b/x11-wm/spectrwm/foo.patch |
| 54 |
new file mode 100644 |
| 55 |
index 00000000000..33bf233d1a9 |
| 56 |
--- /dev/null |
| 57 |
+++ b/x11-wm/spectrwm/foo.patch |
| 58 |
@@ -0,0 +1,29 @@ |
| 59 |
+commit 00522598eab59b612c7ba31b77deb4258c8af009 |
| 60 |
+Author: Ben Kohler <bkohler@g.o> |
| 61 |
+Date: Mon Mar 29 09:06:33 2021 -0500 |
| 62 |
+ |
| 63 |
+ x11-wm/spectrwm: remove incorrect EROOT usage |
| 64 |
+ |
| 65 |
+ Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 66 |
+ Signed-off-by: Ben Kohler <bkohler@g.o> |
| 67 |
+ |
| 68 |
+diff --git a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild |
| 69 |
+index 3b826527316..3b297f77149 100644 |
| 70 |
+--- a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild |
| 71 |
++++ b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild |
| 72 |
+@@ -36,12 +36,12 @@ src_prepare() { |
| 73 |
+ |
| 74 |
+ src_compile() { |
| 75 |
+ tc-export CC PKG_CONFIG |
| 76 |
+- emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)" |
| 77 |
++ emake -C linux PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" |
| 78 |
+ } |
| 79 |
+ |
| 80 |
+ src_install() { |
| 81 |
+- emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)" \ |
| 82 |
+- SYSCONFDIR="${EROOT}/etc" DOCDIR="${EROOT}/usr/share/doc/${P}" \ |
| 83 |
++ emake -C linux PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" \ |
| 84 |
++ SYSCONFDIR="/etc" DOCDIR="/usr/share/doc/${P}" \ |
| 85 |
+ DESTDIR="${D}" install |
| 86 |
+ |
| 87 |
+ dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh |
| 88 |
|
| 89 |
diff --git a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild |
| 90 |
index 3b297f77149..cbe7e0eeebd 100644 |
| 91 |
--- a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild |
| 92 |
+++ b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild |
| 93 |
@@ -36,12 +36,12 @@ src_prepare() { |
| 94 |
|
| 95 |
src_compile() { |
| 96 |
tc-export CC PKG_CONFIG |
| 97 |
- emake -C linux PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" |
| 98 |
+ emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
| 99 |
} |
| 100 |
|
| 101 |
src_install() { |
| 102 |
- emake -C linux PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" \ |
| 103 |
- SYSCONFDIR="/etc" DOCDIR="/usr/share/doc/${P}" \ |
| 104 |
+ emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
| 105 |
+ SYSCONFDIR="${EPREFIX}/etc" DOCDIR="${EPREFIX}/usr/share/doc/${P}" \ |
| 106 |
DESTDIR="${D}" install |
| 107 |
|
| 108 |
dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh |
Archives