Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/aewm/, x11-wm/aewm/files/
Date: Sun, 15 Dec 2019 10:12:37
Message-Id: 1576404752.39b0defc694f7005cb3f2705dd6d5d2bd672a97d.jer@gentoo
1 commit: 39b0defc694f7005cb3f2705dd6d5d2bd672a97d
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 15 10:12:11 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 15 10:12:32 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b0defc
7
8 x11-wm/aewm: Install uncompressed man pages
9
10 Package-Manager: Portage-2.3.81, Repoman-2.3.20
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 x11-wm/aewm/aewm-1.3.12-r1.ebuild | 47 ++++++++++++++
14 x11-wm/aewm/files/aewm-1.3.12-r1-gentoo.patch | 92 +++++++++++++++++++++++++++
15 2 files changed, 139 insertions(+)
16
17 diff --git a/x11-wm/aewm/aewm-1.3.12-r1.ebuild b/x11-wm/aewm/aewm-1.3.12-r1.ebuild
18 new file mode 100644
19 index 00000000000..e0a143a9009
20 --- /dev/null
21 +++ b/x11-wm/aewm/aewm-1.3.12-r1.ebuild
22 @@ -0,0 +1,47 @@
23 +# Copyright 1999-2019 Gentoo Authors
24 +# Distributed under the terms of the GNU General Public License v2
25 +
26 +EAPI=7
27 +inherit toolchain-funcs
28 +
29 +DESCRIPTION="A minimalistic X11 window manager"
30 +HOMEPAGE="https://www.red-bean.com/decklin/aewm/"
31 +SRC_URI="${HOMEPAGE}${P}.tar.bz2"
32 +
33 +LICENSE="MIT 9wm"
34 +SLOT="0"
35 +KEYWORDS="~amd64 ~ppc ~x86"
36 +
37 +RDEPEND="
38 + dev-libs/glib:2
39 + x11-libs/gtk+:2
40 + x11-libs/libX11
41 + x11-libs/libXext
42 + x11-libs/libXft
43 +"
44 +DEPEND="
45 + ${RDEPEND}
46 + virtual/pkgconfig
47 + x11-base/xorg-proto
48 +"
49 +PATCHES=(
50 + "${FILESDIR}"/${P}-r1-gentoo.patch
51 +)
52 +
53 +src_compile() {
54 + emake \
55 + CC="$(tc-getCC)" \
56 + CFLAGS="${CFLAGS}" \
57 + LDFLAGS="${LDFLAGS}" \
58 + PKG_CONFIG="$(tc-getPKG_CONFIG)"
59 +}
60 +
61 +src_install() {
62 + emake \
63 + DESTDIR="${ED}" \
64 + MANDIR="${ED}"/usr/share/man/man1 \
65 + XROOT="/usr" \
66 + install
67 +
68 + dodoc NEWS README
69 +}
70
71 diff --git a/x11-wm/aewm/files/aewm-1.3.12-r1-gentoo.patch b/x11-wm/aewm/files/aewm-1.3.12-r1-gentoo.patch
72 new file mode 100644
73 index 00000000000..a08aa2760ed
74 --- /dev/null
75 +++ b/x11-wm/aewm/files/aewm-1.3.12-r1-gentoo.patch
76 @@ -0,0 +1,92 @@
77 +--- a/Makefile
78 ++++ b/Makefile
79 +@@ -6,12 +6,12 @@
80 + XROOT = /usr/X11R6
81 +
82 + # Uncomment to enable Shape extension support
83 +-#OPT_WMFLAGS += -DSHAPE
84 ++OPT_WMFLAGS += -DSHAPE
85 + #OPT_WMLIB += -lXext
86 +
87 + # Uncomment to add Xft support
88 +-#OPT_WMFLAGS += -DXFT `pkg-config --cflags xft`
89 +-#OPT_WMLIB += `pkg-config --libs xft` -lXext
90 ++OPT_WMFLAGS += -DXFT $(shell $(PKG_CONFIG) --cflags xft xext)
91 ++OPT_WMLIB += $(shell $(PKG_CONFIG) --libs xft xext)
92 +
93 + # Uncomment for debugging (abandon all hope, ye who enter here)
94 + #OPT_WMFLAGS += -DDEBUG
95 +@@ -46,7 +46,7 @@
96 +
97 + X11FLAGS = -I$(XROOT)/include
98 + WMFLAGS = $(X11FLAGS) $(OPT_WMFLAGS)
99 +-GTKFLAGS = `pkg-config --cflags gtk+-2.0`
100 ++GTKFLAGS = $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
101 +
102 + $(PLAINOBJ): %.o: %.c
103 + $(CC) $(CFLAGS) -c $< -o $@
104 +@@ -60,37 +60,36 @@
105 + $(GTKOBJ): %.o: %.c
106 + $(CC) $(CFLAGS) $(GTKFLAGS) -c $< -o $@
107 +
108 +-X11LIB = -L$(XROOT)/lib -lX11
109 ++X11LIB = $(shell $(PKG_CONFIG) --libs x11)
110 + WMLIB = $(X11LIB) $(OPT_WMLIB)
111 +-GTKLIB = `pkg-config --libs gtk+-2.0`
112 ++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0)
113 +
114 + $(PLAINBIN): %: %.o
115 +- $(CC) $^ -o $@
116 ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
117 +
118 + $(X11BIN): %: %.o
119 +- $(CC) $^ $(X11LIB) -o $@
120 ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(X11LIB) -o $@
121 +
122 + $(WMBIN): %:
123 +- $(CC) $^ $(WMLIB) -o $@
124 ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(WMLIB) -o $@
125 +
126 + $(GTKBIN): %: %.o
127 +- $(CC) $^ $(GTKLIB) -o $@
128 ++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(GTKLIB) $(X11LIB) -o $@
129 +
130 + AEMAN = aewm.1x aeclients.1x
131 + AERC = aewmrc clientsrc
132 +
133 + install: all
134 + mkdir -p $(BINDIR) $(MANDIR) $(CFGDIR)
135 +- install -s $(ALLBIN) $(BINDIR)
136 ++ install $(ALLBIN) $(BINDIR)
137 + for i in $(AEMAN); do \
138 + install -m 644 doc/$$i $(MANDIR); \
139 +- gzip -9 $(MANDIR)/$$i; \
140 + done
141 + for i in $(AERC); do \
142 + install -m 644 doc/$$i.ex $(CFGDIR)/$$i; \
143 + done
144 + for i in $(PLAINBIN) $(X11BIN) $(GTKBIN); do \
145 +- ln -sf aeclients.1x.gz $(MANDIR)/$$i.1x.gz; \
146 ++ ln -sf aeclients.1x $(MANDIR)/$$i.1x; \
147 + done
148 +
149 + clean:
150 +--- a/doc/aewmrc.ex
151 ++++ b/doc/aewmrc.ex
152 +@@ -3,7 +3,7 @@
153 +
154 + # Titlebar font. "fixed" is the default.
155 +
156 +-font "lucidasans-10"
157 ++font "fixed"
158 +
159 + # Window colors
160 +
161 +--- a/doc/clientsrc.ex
162 ++++ b/doc/clientsrc.ex
163 +@@ -10,4 +10,4 @@
164 + cmd "Gaim" "gaim"
165 + end
166 +
167 +-cmd "Logout" "skill aesession"
168 ++cmd "Logout" "pkill aesession"