1 |
commit: 6eaf7b8b42f48f3f08aa7f18461a4bb9ba11cc0a |
2 |
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Nov 23 20:06:32 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 2 13:03:17 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eaf7b8b |
7 |
|
8 |
x11-terms/eterm: EAPI 3 -> 6 |
9 |
|
10 |
libXmu dependency was removed upstream |
11 |
https://git.enlightenment.org/apps/eterm.git/commit/?id=c81f5795de828ab88232f5a7481437f17b9e6831 |
12 |
|
13 |
Package-Manager: Portage-2.3.16, Repoman-2.3.6 |
14 |
Closes: https://github.com/gentoo/gentoo/pull/6273 |
15 |
|
16 |
x11-terms/eterm/Manifest | 4 +- |
17 |
x11-terms/eterm/eterm-0.9.6-r1.ebuild | 62 +++++++++++++++++++++++++ |
18 |
x11-terms/eterm/eterm-0.9.6.ebuild | 85 ----------------------------------- |
19 |
3 files changed, 64 insertions(+), 87 deletions(-) |
20 |
|
21 |
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest |
22 |
index 5d89a30677e..179e40cf1d3 100644 |
23 |
--- a/x11-terms/eterm/Manifest |
24 |
+++ b/x11-terms/eterm/Manifest |
25 |
@@ -1,4 +1,4 @@ |
26 |
DIST Eterm-0.9.5.tar.gz 796872 SHA256 63ad6e3d89571a72d8302274ebb00d569b8789e24fae038beaee7aa4b8362bd2 SHA512 ef16ec5ddf0dd91ed4c40eff2289f7a61aa5c0fbf3b95bd14afe38557572f586f1dcd459c258cdfadb1dfbc1c50874492c9cc69ee4152a569b097e86c0d7cc44 WHIRLPOOL a9f9b3ad8343caa084a4cfd9b900d15eb90b657dd5cfdf4746e0d42ab84bc8b7ee6a9e17c4da658cec44d69b30a682900a753d178ad42ae58bc87b15dbb16522 |
27 |
-DIST Eterm-0.9.6.tar.gz 831756 SHA256 72b907aa64f8bcf053f2ecbc8a2e243c6de353a94ecaf579ff2c4e3ae5d7e13c SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe WHIRLPOOL 51a958675fba197ec0dd069028e6a6066ab1133c030ddaad1bccf8c2e541b5063b0612ae7db80e40f30331ab5930da2b7d628b21c7da4d64eb9697163f05d90b |
28 |
+DIST Eterm-0.9.6.tar.gz 831756 BLAKE2B cd309f2bd74c44066d5811845c2cfe7407064186ce445246af352e3dfe47c5a6a58730069f653bb15891b2fdde7d6e84eaf1b92e64978552aab36bd20dee10a1 SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe |
29 |
DIST Eterm-bg-0.9.5.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8 WHIRLPOOL f03b6432d406b7882ab28f80fd0f4b63bee15d8c720a54eb42f400f7cae51c2d96641656b5e779d5ccdc19c098b1c54e03d1dc0cb27a344dad5a5c5181b571a1 |
30 |
-DIST Eterm-bg-0.9.6.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8 WHIRLPOOL f03b6432d406b7882ab28f80fd0f4b63bee15d8c720a54eb42f400f7cae51c2d96641656b5e779d5ccdc19c098b1c54e03d1dc0cb27a344dad5a5c5181b571a1 |
31 |
+DIST Eterm-bg-0.9.6.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8 |
32 |
|
33 |
diff --git a/x11-terms/eterm/eterm-0.9.6-r1.ebuild b/x11-terms/eterm/eterm-0.9.6-r1.ebuild |
34 |
new file mode 100644 |
35 |
index 00000000000..f7c451c110e |
36 |
--- /dev/null |
37 |
+++ b/x11-terms/eterm/eterm-0.9.6-r1.ebuild |
38 |
@@ -0,0 +1,62 @@ |
39 |
+# Copyright 1999-2017 Gentoo Foundation |
40 |
+# Distributed under the terms of the GNU General Public License v2 |
41 |
+ |
42 |
+EAPI=6 |
43 |
+ |
44 |
+DESCRIPTION="A vt102 terminal emulator for X" |
45 |
+HOMEPAGE="http://www.eterm.org/" |
46 |
+SRC_URI=" |
47 |
+ http://www.eterm.org/download/${P^}.tar.gz |
48 |
+ !minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )" |
49 |
+ |
50 |
+LICENSE="BSD" |
51 |
+SLOT="0" |
52 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos" |
53 |
+IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter" |
54 |
+ |
55 |
+RDEPEND=" |
56 |
+ x11-libs/libX11 |
57 |
+ x11-libs/libXt |
58 |
+ x11-libs/libICE |
59 |
+ x11-libs/libSM |
60 |
+ x11-proto/xextproto |
61 |
+ x11-proto/xproto |
62 |
+ x11-libs/libast |
63 |
+ media-libs/imlib2[X] |
64 |
+ media-fonts/font-misc-misc |
65 |
+ escreen? ( app-misc/screen ) |
66 |
+" |
67 |
+DEPEND="${RDEPEND}" |
68 |
+ |
69 |
+DOCS=( ChangeLog README ReleaseNotes bg/README.backgrounds ) |
70 |
+PATCHES=( "${FILESDIR}"/${P}-asm-gnu-stack.patch ) |
71 |
+ |
72 |
+S=${WORKDIR}/${P^} |
73 |
+ |
74 |
+src_unpack() { |
75 |
+ unpack ${P^}.tar.gz |
76 |
+ cd "${S}" || die |
77 |
+ use minimal || unpack Eterm-bg-${PV}.tar.gz |
78 |
+} |
79 |
+ |
80 |
+src_configure() { |
81 |
+ export TIC="true" |
82 |
+ econf \ |
83 |
+ --disable-static \ |
84 |
+ $(use_enable escreen) \ |
85 |
+ --with-imlib \ |
86 |
+ --enable-trans \ |
87 |
+ $(use_enable cpu_flags_x86_mmx mmx) \ |
88 |
+ $(use_enable cpu_flags_x86_sse2 sse2) \ |
89 |
+ $(use_enable unicode multi-charset) \ |
90 |
+ $(use_enable utempter utmp) \ |
91 |
+ --with-delete=execute \ |
92 |
+ --with-backspace=auto |
93 |
+} |
94 |
+ |
95 |
+src_install() { |
96 |
+ use escreen && DOCS+=( doc/README.Escreen ) |
97 |
+ default |
98 |
+ # We don't install headers to link against this library |
99 |
+ rm -f "${ED%/}"/usr/*/libEterm.{so,la} || die |
100 |
+} |
101 |
|
102 |
diff --git a/x11-terms/eterm/eterm-0.9.6.ebuild b/x11-terms/eterm/eterm-0.9.6.ebuild |
103 |
deleted file mode 100644 |
104 |
index 9743d88c9aa..00000000000 |
105 |
--- a/x11-terms/eterm/eterm-0.9.6.ebuild |
106 |
+++ /dev/null |
107 |
@@ -1,85 +0,0 @@ |
108 |
-# Copyright 1999-2015 Gentoo Foundation |
109 |
-# Distributed under the terms of the GNU General Public License v2 |
110 |
- |
111 |
-EAPI="3" |
112 |
-inherit eutils autotools |
113 |
- |
114 |
-MY_P=Eterm-${PV} |
115 |
- |
116 |
-if [[ ${PV} == "9999" ]] ; then |
117 |
- ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/eterm/Eterm" |
118 |
- inherit subversion |
119 |
- SRC_URI="" |
120 |
- KEYWORDS="" |
121 |
-else |
122 |
- SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz |
123 |
- !minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )" |
124 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos" |
125 |
-fi |
126 |
- |
127 |
-DESCRIPTION="A vt102 terminal emulator for X" |
128 |
-HOMEPAGE="http://www.eterm.org/" |
129 |
- |
130 |
-LICENSE="BSD" |
131 |
-SLOT="0" |
132 |
-IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter" |
133 |
- |
134 |
-RDEPEND="x11-libs/libX11 |
135 |
- x11-libs/libXmu |
136 |
- x11-libs/libXt |
137 |
- x11-libs/libICE |
138 |
- x11-libs/libSM |
139 |
- x11-proto/xextproto |
140 |
- x11-proto/xproto |
141 |
- >=x11-libs/libast-0.6.1 |
142 |
- media-libs/imlib2[X] |
143 |
- media-fonts/font-misc-misc |
144 |
- escreen? ( app-misc/screen )" |
145 |
-DEPEND="${RDEPEND}" |
146 |
- |
147 |
-if [[ ${PV} == "9999" ]] ; then |
148 |
- S=${WORKDIR}/${ECVS_MODULE} |
149 |
-else |
150 |
- S=${WORKDIR}/${MY_P} |
151 |
-fi |
152 |
- |
153 |
-src_unpack() { |
154 |
- if [[ ${PV} == "9999" ]] ; then |
155 |
- subversion_src_unpack |
156 |
- cd "${S}" |
157 |
- eautoreconf |
158 |
- else |
159 |
- unpack ${MY_P}.tar.gz |
160 |
- cd "${S}" |
161 |
- use minimal || unpack Eterm-bg-${PV}.tar.gz |
162 |
- fi |
163 |
-} |
164 |
- |
165 |
-src_prepare() { |
166 |
- epatch "${FILESDIR}"/${P}-asm-gnu-stack.patch #440618 |
167 |
-} |
168 |
- |
169 |
-src_configure() { |
170 |
- export TIC="true" |
171 |
- econf \ |
172 |
- --disable-static \ |
173 |
- $(use_enable escreen) \ |
174 |
- --with-imlib \ |
175 |
- --enable-trans \ |
176 |
- $(use_enable cpu_flags_x86_mmx mmx) \ |
177 |
- $(use_enable cpu_flags_x86_sse2 sse2) \ |
178 |
- $(use_enable unicode multi-charset) \ |
179 |
- $(use_enable utempter utmp) \ |
180 |
- --with-delete=execute \ |
181 |
- --with-backspace=auto |
182 |
-} |
183 |
- |
184 |
-src_install() { |
185 |
- emake DESTDIR="${D}" install || die |
186 |
- dodoc ChangeLog README ReleaseNotes |
187 |
- use escreen && dodoc doc/README.Escreen |
188 |
- dodoc bg/README.backgrounds |
189 |
- |
190 |
- # We don't install headers to link against this library |
191 |
- rm -f "${D}"/usr/*/libEterm.{so,la} |
192 |
-} |