1 |
commit: 793c8f7f0336a7f4de053851dc62ae767197e90b |
2 |
Author: Amy Winston <amynka <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 10 13:15:19 2015 +0000 |
4 |
Commit: Amy Winston <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 10 13:15:19 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=793c8f7f |
7 |
|
8 |
x11-wm/jwm:EAPI bump,slot dependencies fix,add config file,X11 session wrapper added. By wraeth. |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
x11-wm/jwm/jwm-2.3.2.ebuild | 21 +++++++++------------ |
13 |
1 file changed, 9 insertions(+), 12 deletions(-) |
14 |
|
15 |
diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild |
16 |
index 6263aef..6b8baaf 100644 |
17 |
--- a/x11-wm/jwm/jwm-2.3.2.ebuild |
18 |
+++ b/x11-wm/jwm/jwm-2.3.2.ebuild |
19 |
@@ -1,8 +1,8 @@ |
20 |
-# Copyright 1999-2013 Gentoo Foundation |
21 |
+# Copyright 1999-2015 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
# $Id$ |
24 |
|
25 |
-EAPI=4 |
26 |
+EAPI=5 |
27 |
inherit eutils |
28 |
|
29 |
DESCRIPTION="Very fast and lightweight still powerful window manager for X" |
30 |
@@ -21,8 +21,8 @@ RDEPEND="xpm? ( x11-libs/libXpm ) |
31 |
x11-libs/libXau |
32 |
x11-libs/libXdmcp |
33 |
truetype? ( x11-libs/libXft ) |
34 |
- png? ( media-libs/libpng ) |
35 |
- jpeg? ( virtual/jpeg ) |
36 |
+ png? ( media-libs/libpng:= ) |
37 |
+ jpeg? ( virtual/jpeg:= ) |
38 |
bidi? ( dev-libs/fribidi ) |
39 |
dev-libs/expat" |
40 |
DEPEND="${RDEPEND} |
41 |
@@ -49,18 +49,15 @@ src_install() { |
42 |
dodir /usr/share/man |
43 |
emake BINDIR="${D}/usr/bin" SYSCONF="${D}/etc" \ |
44 |
MANDIR="${D}/usr/share/man" install |
45 |
- rm "${D}"/etc/system.jwmrc |
46 |
|
47 |
- echo "#!/bin/sh" > jwm |
48 |
- echo "exec /usr/bin/jwm" >> jwm |
49 |
- exeinto /etc/X11/Sessions |
50 |
- doexe jwm |
51 |
+ make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions" |
52 |
|
53 |
dodoc README.md example.jwmrc ChangeLog |
54 |
} |
55 |
|
56 |
pkg_postinst() { |
57 |
- einfo "Put an appropriate configuration file in /etc/system.jwmrc" |
58 |
- einfo "or in ~/.jwmrc." |
59 |
+ einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc" |
60 |
+ einfo "or per-user by creating a configuration file in ~/.jwmrc" |
61 |
+ einfo |
62 |
einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/" |
63 |
-} |
64 |
+} |
65 |
\ No newline at end of file |