| 1 |
commit: a5f1156d2eaac56b8a9fc2216e6a7fe8e0f31d40 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 5 15:35:31 2019 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 5 15:35:46 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f1156d |
| 7 |
|
| 8 |
x11-wm/dwm: Version 6.2 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
| 11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-wm/dwm/Manifest | 1 + |
| 14 |
x11-wm/dwm/{dwm-9999.ebuild => dwm-6.2.ebuild} | 28 ++++++++++---------------- |
| 15 |
x11-wm/dwm/dwm-9999.ebuild | 18 ++++------------- |
| 16 |
3 files changed, 16 insertions(+), 31 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest |
| 19 |
index 86858fc902f..43f0792e48a 100644 |
| 20 |
--- a/x11-wm/dwm/Manifest |
| 21 |
+++ b/x11-wm/dwm/Manifest |
| 22 |
@@ -1 +1,2 @@ |
| 23 |
DIST dwm-6.1.tar.gz 25887 BLAKE2B 36c3aa36b8371b993ac845faaebd738f8295d3bed34a1a97075d8449cb3a2febec746b21858071579e27021502c7e184fcb0750997eacce471b968bac0e555bf SHA512 875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1 |
| 24 |
+DIST dwm-6.2.tar.gz 25273 BLAKE2B 2bb9e5b900a1d73f3eb94cb8454580ec98930dbacbabec1f2bbd394eb96696873434b6ddea4ac95eb9d171de2c09c5d4ca0b30649836f7e25f4769f44d25a6eb SHA512 01abcab954e5b7c20d011e6fd9c28025271fea2e85610c928812f7c6a09f99d7f9e93d11ffc2d6a7aca894b3fa7e507c6c2fe5f26ff5ddcfc650a9bbaaa41e06 |
| 25 |
|
| 26 |
diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-6.2.ebuild |
| 27 |
similarity index 55% |
| 28 |
copy from x11-wm/dwm/dwm-9999.ebuild |
| 29 |
copy to x11-wm/dwm/dwm-6.2.ebuild |
| 30 |
index 27c5d18fe7a..0344b44e716 100644 |
| 31 |
--- a/x11-wm/dwm/dwm-9999.ebuild |
| 32 |
+++ b/x11-wm/dwm/dwm-6.2.ebuild |
| 33 |
@@ -1,16 +1,16 @@ |
| 34 |
-# Copyright 1999-2018 Gentoo Foundation |
| 35 |
+# Copyright 1999-2019 Gentoo Authors |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
-EAPI=6 |
| 39 |
-inherit git-r3 toolchain-funcs |
| 40 |
+EAPI=7 |
| 41 |
+inherit savedconfig toolchain-funcs |
| 42 |
|
| 43 |
DESCRIPTION="a dynamic window manager for X11" |
| 44 |
HOMEPAGE="https://dwm.suckless.org/" |
| 45 |
-EGIT_REPO_URI="https://git.suckless.org/dwm" |
| 46 |
+SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz" |
| 47 |
|
| 48 |
LICENSE="MIT" |
| 49 |
SLOT="0" |
| 50 |
-KEYWORDS="" |
| 51 |
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" |
| 52 |
IUSE="xinerama" |
| 53 |
|
| 54 |
RDEPEND=" |
| 55 |
@@ -28,19 +28,11 @@ src_prepare() { |
| 56 |
default |
| 57 |
|
| 58 |
sed -i \ |
| 59 |
- -e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall/" \ |
| 60 |
- -e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \ |
| 61 |
- -e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \ |
| 62 |
- -e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \ |
| 63 |
- -e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \ |
| 64 |
- -e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \ |
| 65 |
- -e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \ |
| 66 |
- -e "s/\/freetype2/\ -I\/usr\/include\/freetype2/" \ |
| 67 |
+ -e "s/ -Os / /" \ |
| 68 |
+ -e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \ |
| 69 |
config.mk || die |
| 70 |
- sed -i \ |
| 71 |
- -e '/@echo CC/d' \ |
| 72 |
- -e 's|@${CC}|$(CC)|g' \ |
| 73 |
- Makefile || die |
| 74 |
+ |
| 75 |
+ restore_config config.h |
| 76 |
} |
| 77 |
|
| 78 |
src_compile() { |
| 79 |
@@ -61,4 +53,6 @@ src_install() { |
| 80 |
doins "${FILESDIR}"/dwm.desktop |
| 81 |
|
| 82 |
dodoc README |
| 83 |
+ |
| 84 |
+ save_config config.h |
| 85 |
} |
| 86 |
|
| 87 |
diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild |
| 88 |
index 27c5d18fe7a..900dc238896 100644 |
| 89 |
--- a/x11-wm/dwm/dwm-9999.ebuild |
| 90 |
+++ b/x11-wm/dwm/dwm-9999.ebuild |
| 91 |
@@ -1,7 +1,7 @@ |
| 92 |
-# Copyright 1999-2018 Gentoo Foundation |
| 93 |
+# Copyright 1999-2019 Gentoo Authors |
| 94 |
# Distributed under the terms of the GNU General Public License v2 |
| 95 |
|
| 96 |
-EAPI=6 |
| 97 |
+EAPI=7 |
| 98 |
inherit git-r3 toolchain-funcs |
| 99 |
|
| 100 |
DESCRIPTION="a dynamic window manager for X11" |
| 101 |
@@ -28,19 +28,9 @@ src_prepare() { |
| 102 |
default |
| 103 |
|
| 104 |
sed -i \ |
| 105 |
- -e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall/" \ |
| 106 |
- -e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \ |
| 107 |
- -e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \ |
| 108 |
- -e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \ |
| 109 |
- -e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \ |
| 110 |
- -e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \ |
| 111 |
- -e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \ |
| 112 |
- -e "s/\/freetype2/\ -I\/usr\/include\/freetype2/" \ |
| 113 |
+ -e "s/ -Os / /" \ |
| 114 |
+ -e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \ |
| 115 |
config.mk || die |
| 116 |
- sed -i \ |
| 117 |
- -e '/@echo CC/d' \ |
| 118 |
- -e 's|@${CC}|$(CC)|g' \ |
| 119 |
- Makefile || die |
| 120 |
} |
| 121 |
|
| 122 |
src_compile() { |
Archives