1 |
commit: 553eb3a91bf4e38e73a39661ca48079d99e67ae5 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 24 17:40:15 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 24 17:40:15 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553eb3a9 |
7 |
|
8 |
x11-wm/echinus: Port to EAPI 7 |
9 |
|
10 |
Package-Manager: Portage-2.3.82, Repoman-2.3.20 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
x11-wm/echinus/echinus-0.4.9.ebuild | 32 +++++++++++++------------- |
14 |
x11-wm/echinus/files/echinus-0.4.9-gentoo.diff | 22 ++++++++++++++++++ |
15 |
2 files changed, 38 insertions(+), 16 deletions(-) |
16 |
|
17 |
diff --git a/x11-wm/echinus/echinus-0.4.9.ebuild b/x11-wm/echinus/echinus-0.4.9.ebuild |
18 |
index 6ed20ef6b80..21454373228 100644 |
19 |
--- a/x11-wm/echinus/echinus-0.4.9.ebuild |
20 |
+++ b/x11-wm/echinus/echinus-0.4.9.ebuild |
21 |
@@ -1,9 +1,9 @@ |
22 |
-# Copyright 1999-2018 Gentoo Authors |
23 |
+# Copyright 1999-2019 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
-EAPI=4 |
27 |
+EAPI=7 |
28 |
|
29 |
-inherit eutils toolchain-funcs multilib |
30 |
+inherit toolchain-funcs |
31 |
|
32 |
DESCRIPTION="A window manager for X in the spirit of dwm" |
33 |
HOMEPAGE="https://plhk.ru/" |
34 |
@@ -14,30 +14,30 @@ SLOT="0" |
35 |
KEYWORDS="~amd64 ~x86" |
36 |
IUSE="xrandr" |
37 |
|
38 |
-RDEPEND="x11-libs/libX11 |
39 |
+RDEPEND=" |
40 |
+ x11-libs/libX11 |
41 |
x11-libs/libXft |
42 |
xrandr? ( x11-libs/libXrandr )" |
43 |
-DEPEND="${RDEPEND} |
44 |
- virtual/pkgconfig" |
45 |
-DOCS=( README ) |
46 |
+DEPEND="${RDEPEND}" |
47 |
+BDEPEND="virtual/pkgconfig" |
48 |
|
49 |
-pkg_setup() { |
50 |
- tc-export CC |
51 |
- use xrandr && export MULTIHEAD=1 |
52 |
-} |
53 |
+PATCHES=( "${FILESDIR}"/${P}-gentoo.diff ) |
54 |
|
55 |
-src_prepare() { |
56 |
- epatch "${FILESDIR}"/${P}-gentoo.diff |
57 |
- sed -i -e "s|CONFDIR|/usr/share/${PN}|g" echinus.1 README || die |
58 |
+src_configure() { |
59 |
+ use xrandr && export MULTIHEAD=1 |
60 |
sed -i -e "s|/usr/lib|/usr/$(get_libdir)|g" config.mk || die |
61 |
+ |
62 |
+ tc-export CC |
63 |
} |
64 |
|
65 |
src_install() { |
66 |
dobin ${PN} |
67 |
doman ${PN}.1 |
68 |
- dodoc README |
69 |
+ einstalldocs |
70 |
+ |
71 |
insinto /usr/share/${PN} |
72 |
doins {close,iconify,max}.xbm ${PN}rc |
73 |
+ |
74 |
insinto /usr/share/xsessions |
75 |
doins "${FILESDIR}"/${PN}.desktop |
76 |
} |
77 |
@@ -51,7 +51,7 @@ pkg_postinst() { |
78 |
elog "" |
79 |
fi |
80 |
elog "A standard config file with its pixmaps has been installed to:" |
81 |
- elog "${EPREFIX}/usr/share/${PN}/examples" |
82 |
+ elog "${EROOT}/usr/share/${PN}/examples" |
83 |
elog "Copy this folder to ~/.${PN}/ and modify the echinusrc as you wish." |
84 |
elog "" |
85 |
elog "For changing the modkey you can use \"Echinus*modkey: X\"" |
86 |
|
87 |
diff --git a/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff b/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff |
88 |
index 75b8b48c121..2bada877b17 100644 |
89 |
--- a/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff |
90 |
+++ b/x11-wm/echinus/files/echinus-0.4.9-gentoo.diff |
91 |
@@ -48,6 +48,17 @@ |
92 |
# Solaris |
93 |
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" |
94 |
#LDFLAGS = ${LIBS} |
95 |
+--- a/echinus.1 |
96 |
++++ b/echinus.1 |
97 |
+@@ -40,7 +40,7 @@ |
98 |
+ loads the configuration file from |
99 |
+ .Pa ~/.echinus/echinusrc, |
100 |
+ if present, then looks for the system-wide configuration file |
101 |
+-.Pa CONFDIR/echinusrc . |
102 |
++.Pa /usr/share/echinus/echinusrc . |
103 |
+ .El |
104 |
+ .Pp |
105 |
+ The following notation is used in this page: |
106 |
--- a/Makefile |
107 |
+++ b/Makefile |
108 |
@@ -19,13 +19,13 @@ |
109 |
@@ -66,3 +77,14 @@ |
110 |
|
111 |
clean: |
112 |
@echo cleaning |
113 |
+--- a/README |
114 |
++++ b/README |
115 |
+@@ -22,7 +22,7 @@ |
116 |
+ On new install: |
117 |
+ |
118 |
+ % mkdir ~/.echinus |
119 |
+-% cp -r CONFDIR ~/.echinus |
120 |
++% cp -r /usr/share/echinus ~/.echinus |
121 |
+ |
122 |
+ 1.Configuration file |
123 |
+ -------------------- |