Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/eterm/
Date: Sun, 30 Jul 2017 07:27:32
Message-Id: 1501399626.d7e5dbbec54b1e527193a1c402c5f805031c465d.dilfridge@gentoo
1 commit: d7e5dbbec54b1e527193a1c402c5f805031c465d
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 30 07:26:30 2017 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 30 07:27:06 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e5dbbe
7
8 x11-terms/eterm: Uses git now as vcs; EAPI bump
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.3
11
12 x11-terms/eterm/eterm-9999.ebuild | 26 +++++++++++++-------------
13 1 file changed, 13 insertions(+), 13 deletions(-)
14
15 diff --git a/x11-terms/eterm/eterm-9999.ebuild b/x11-terms/eterm/eterm-9999.ebuild
16 index a18c51aaaf6..dfc9e2055db 100644
17 --- a/x11-terms/eterm/eterm-9999.ebuild
18 +++ b/x11-terms/eterm/eterm-9999.ebuild
19 @@ -1,16 +1,14 @@
20 -# Copyright 1999-2015 Gentoo Foundation
21 +# Copyright 1999-2017 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI="3"
25 +EAPI=6
26 inherit eutils autotools
27
28 MY_P=Eterm-${PV}
29
30 if [[ ${PV} == "9999" ]] ; then
31 - ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/eterm/Eterm"
32 - inherit subversion
33 - SRC_URI=""
34 - KEYWORDS=""
35 + EGIT_REPO_URI="https://git.enlightenment.org/apps/eterm.git"
36 + inherit git-r3
37 else
38 SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
39 !minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
40 @@ -24,7 +22,8 @@ LICENSE="BSD"
41 SLOT="0"
42 IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
43
44 -RDEPEND="x11-libs/libX11
45 +RDEPEND="
46 + x11-libs/libX11
47 x11-libs/libXmu
48 x11-libs/libXt
49 x11-libs/libICE
50 @@ -34,23 +33,24 @@ RDEPEND="x11-libs/libX11
51 >=x11-libs/libast-0.6.1
52 media-libs/imlib2[X]
53 media-fonts/font-misc-misc
54 - escreen? ( app-misc/screen )"
55 + escreen? ( app-misc/screen )
56 +"
57 DEPEND="${RDEPEND}"
58
59 if [[ ${PV} == "9999" ]] ; then
60 - S=${WORKDIR}/${ECVS_MODULE}
61 + S=${WORKDIR}/${P}
62 else
63 S=${WORKDIR}/${MY_P}
64 fi
65
66 src_unpack() {
67 if [[ ${PV} == "9999" ]] ; then
68 - subversion_src_unpack
69 - cd "${S}"
70 + git-r3_src_unpack
71 + cd "${S}" || die
72 eautoreconf
73 else
74 unpack ${MY_P}.tar.gz
75 - cd "${S}"
76 + cd "${S}" || die
77 use minimal || unpack Eterm-bg-${PV}.tar.gz
78 fi
79 }
80 @@ -71,7 +71,7 @@ src_configure() {
81 }
82
83 src_install() {
84 - emake DESTDIR="${D}" install || die
85 + emake DESTDIR="${D}" install
86 dodoc ChangeLog README ReleaseNotes
87 use escreen && dodoc doc/README.Escreen
88 dodoc bg/README.backgrounds