1 |
commit: 98abe1c50c9568376cde43c0e8790436fa27af95 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 27 23:56:00 2019 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 27 23:56:00 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98abe1c5 |
7 |
|
8 |
x11-wm/vtwm: EAPI bump |
9 |
|
10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
12 |
|
13 |
.../{vtwm-5.4.7-r1.ebuild => vtwm-5.4.7-r2.ebuild} | 22 +++++++++++----------- |
14 |
1 file changed, 11 insertions(+), 11 deletions(-) |
15 |
|
16 |
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild |
17 |
similarity index 75% |
18 |
rename from x11-wm/vtwm/vtwm-5.4.7-r1.ebuild |
19 |
rename to x11-wm/vtwm/vtwm-5.4.7-r2.ebuild |
20 |
index f1f31db2b33..449d8860060 100644 |
21 |
--- a/x11-wm/vtwm/vtwm-5.4.7-r1.ebuild |
22 |
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild |
23 |
@@ -1,11 +1,11 @@ |
24 |
# Copyright 1999-2019 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
-EAPI="2" |
28 |
+EAPI=7 |
29 |
|
30 |
-inherit eutils toolchain-funcs |
31 |
+inherit toolchain-funcs |
32 |
|
33 |
-DESCRIPTION="one of many TWM descendants and implements a Virtual Desktop" |
34 |
+DESCRIPTION="TWM descendant that implements a Virtual Desktop" |
35 |
HOMEPAGE="http://www.vtwm.org/" |
36 |
SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz" |
37 |
|
38 |
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND} |
39 |
x11-misc/imake" |
40 |
|
41 |
src_prepare() { |
42 |
- epatch "${FILESDIR}"/${P}-do-not-rm.patch |
43 |
+ eapply "${FILESDIR}"/${P}-do-not-rm.patch |
44 |
sed -i Imakefile \ |
45 |
-e 's:-L/usr/local/lib::g' \ |
46 |
-e 's:-I/usr/local/include::g' \ |
47 |
@@ -39,33 +39,33 @@ src_prepare() { |
48 |
-e 's:^\(SOUNDLIB.*\):XCOMM\ \1:' \ |
49 |
-e 's:sound\..::g' \ |
50 |
|| die "sed Imakefile" |
51 |
- epatch "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch |
52 |
+ eapply "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch |
53 |
fi |
54 |
+ default |
55 |
} |
56 |
|
57 |
src_configure() { |
58 |
xmkmf || die "xmkmf failed" |
59 |
- emake depend || die "emake depend" |
60 |
+ emake depend |
61 |
} |
62 |
|
63 |
src_compile() { |
64 |
emake \ |
65 |
CC=$(tc-getCC) \ |
66 |
CCOPTIONS="${CFLAGS}" \ |
67 |
- EXTRA_LDOPTIONS="${LDFLAGS}" \ |
68 |
- || die "emake failed" |
69 |
+ EXTRA_LDOPTIONS="${LDFLAGS}" |
70 |
} |
71 |
|
72 |
src_install() { |
73 |
emake BINDIR=/usr/bin \ |
74 |
LIBDIR=/etc/X11 \ |
75 |
MANPATH=/usr/share/man \ |
76 |
- DESTDIR="${D}" install || die "emake install failed" |
77 |
+ DESTDIR="${D}" install |
78 |
|
79 |
echo "#!/bin/sh" > vtwm |
80 |
echo "xsetroot -cursor_name left_ptr &" >> vtwm |
81 |
echo "/usr/bin/vtwm" >> vtwm |
82 |
exeinto /etc/X11/Sessions |
83 |
- doexe vtwm || die |
84 |
- dodoc doc/{4.7.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST} || die |
85 |
+ doexe vtwm |
86 |
+ dodoc doc/{4.7.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST} |
87 |
} |