1 |
commit: 3a74eea2c1fa3b32f774b5128cfc8b1940736458 |
2 |
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Nov 24 06:52:40 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 2 13:03:23 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a74eea2 |
7 |
|
8 |
x11-terms/eterm: Update live ebuild |
9 |
|
10 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
11 |
|
12 |
x11-terms/eterm/eterm-9999.ebuild | 45 +++++++++------------------------------ |
13 |
1 file changed, 10 insertions(+), 35 deletions(-) |
14 |
|
15 |
diff --git a/x11-terms/eterm/eterm-9999.ebuild b/x11-terms/eterm/eterm-9999.ebuild |
16 |
index dfc9e2055db..6d24ce22d91 100644 |
17 |
--- a/x11-terms/eterm/eterm-9999.ebuild |
18 |
+++ b/x11-terms/eterm/eterm-9999.ebuild |
19 |
@@ -2,21 +2,11 @@ |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
|
22 |
EAPI=6 |
23 |
-inherit eutils autotools |
24 |
- |
25 |
-MY_P=Eterm-${PV} |
26 |
- |
27 |
-if [[ ${PV} == "9999" ]] ; then |
28 |
- EGIT_REPO_URI="https://git.enlightenment.org/apps/eterm.git" |
29 |
- inherit git-r3 |
30 |
-else |
31 |
- SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz |
32 |
- !minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )" |
33 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos" |
34 |
-fi |
35 |
+inherit autotools git-r3 |
36 |
|
37 |
DESCRIPTION="A vt102 terminal emulator for X" |
38 |
HOMEPAGE="http://www.eterm.org/" |
39 |
+EGIT_REPO_URI="https://git.enlightenment.org/apps/eterm.git" |
40 |
|
41 |
LICENSE="BSD" |
42 |
SLOT="0" |
43 |
@@ -24,35 +14,23 @@ IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter" |
44 |
|
45 |
RDEPEND=" |
46 |
x11-libs/libX11 |
47 |
- x11-libs/libXmu |
48 |
x11-libs/libXt |
49 |
x11-libs/libICE |
50 |
x11-libs/libSM |
51 |
x11-proto/xextproto |
52 |
x11-proto/xproto |
53 |
- >=x11-libs/libast-0.6.1 |
54 |
+ x11-libs/libast |
55 |
media-libs/imlib2[X] |
56 |
media-fonts/font-misc-misc |
57 |
escreen? ( app-misc/screen ) |
58 |
" |
59 |
DEPEND="${RDEPEND}" |
60 |
|
61 |
-if [[ ${PV} == "9999" ]] ; then |
62 |
- S=${WORKDIR}/${P} |
63 |
-else |
64 |
- S=${WORKDIR}/${MY_P} |
65 |
-fi |
66 |
+DOCS=( ChangeLog README ReleaseNotes bg/README.backgrounds ) |
67 |
|
68 |
-src_unpack() { |
69 |
- if [[ ${PV} == "9999" ]] ; then |
70 |
- git-r3_src_unpack |
71 |
- cd "${S}" || die |
72 |
- eautoreconf |
73 |
- else |
74 |
- unpack ${MY_P}.tar.gz |
75 |
- cd "${S}" || die |
76 |
- use minimal || unpack Eterm-bg-${PV}.tar.gz |
77 |
- fi |
78 |
+src_prepare() { |
79 |
+ default |
80 |
+ eautoreconf |
81 |
} |
82 |
|
83 |
src_configure() { |
84 |
@@ -71,11 +49,8 @@ src_configure() { |
85 |
} |
86 |
|
87 |
src_install() { |
88 |
- emake DESTDIR="${D}" install |
89 |
- dodoc ChangeLog README ReleaseNotes |
90 |
- use escreen && dodoc doc/README.Escreen |
91 |
- dodoc bg/README.backgrounds |
92 |
- |
93 |
+ use escreen && DOCS+=( doc/README.Escreen ) |
94 |
+ default |
95 |
# We don't install headers to link against this library |
96 |
- rm -f "${D}"/usr/*/libEterm.{so,la} |
97 |
+ rm -f "${ED%/}"/usr/*/libEterm.{so,la} || die |
98 |
} |