Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libvterm/
Date: Thu, 01 Apr 2021 00:43:55
Message-Id: 1617237802.a009cde154a1a6d2c68de9fbc093917ddc940506.sam@gentoo
1 commit: a009cde154a1a6d2c68de9fbc093917ddc940506
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 1 00:22:59 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 1 00:43:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a009cde1
7
8 dev-libs/libvterm: port to EAPI 7 for old, respect CC
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild | 18 ++++++++++--------
13 dev-libs/libvterm/libvterm-0.1.1.ebuild | 12 +++++++-----
14 dev-libs/libvterm/libvterm-0.1.2.ebuild | 11 +++++++----
15 dev-libs/libvterm/libvterm-0.1.3.ebuild | 9 ++++++---
16 4 files changed, 30 insertions(+), 20 deletions(-)
17
18 diff --git a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
19 index 00da1e7c066..75e2b16d3eb 100644
20 --- a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
21 +++ b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
22 @@ -1,27 +1,28 @@
23 -# Copyright 1999-2020 Gentoo Authors
24 +# Copyright 1999-2021 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 -EAPI=6
28 -inherit eutils flag-o-matic ltprune multilib
29 +EAPI=7
30 +
31 +inherit flag-o-matic toolchain-funcs
32
33 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
34 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
35 SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
36 +S="${WORKDIR}"/libvterm-0.0
37
38 LICENSE="MIT"
39 SLOT="0"
40 KEYWORDS="~amd64 ~arm ~x86"
41
42 -DEPEND="
43 +BDEPEND="
44 sys-devel/libtool
45 virtual/pkgconfig"
46 -
47 RDEPEND="!dev-libs/libvterm-neovim"
48
49 -S=${WORKDIR}/libvterm-0.0
50 -
51 src_compile() {
52 + tc-export CC
53 append-cflags -fPIC
54 +
55 emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
56 }
57
58 @@ -30,5 +31,6 @@ src_install() {
59 PREFIX="${EPREFIX}/usr" \
60 LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
61 DESTDIR="${D}" install
62 - prune_libtool_files
63 +
64 + find "${ED}" -name '*.la' -delete || die
65 }
66
67 diff --git a/dev-libs/libvterm/libvterm-0.1.1.ebuild b/dev-libs/libvterm/libvterm-0.1.1.ebuild
68 index a9f83554b9e..64440bd5eae 100644
69 --- a/dev-libs/libvterm/libvterm-0.1.1.ebuild
70 +++ b/dev-libs/libvterm/libvterm-0.1.1.ebuild
71 @@ -1,8 +1,9 @@
72 -# Copyright 1999-2019 Gentoo Authors
73 +# Copyright 1999-2021 Gentoo Authors
74 # Distributed under the terms of the GNU General Public License v2
75
76 EAPI=7
77 -inherit flag-o-matic
78 +
79 +inherit flag-o-matic toolchain-funcs
80
81 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
82 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
83 @@ -11,18 +12,18 @@ SRC_URI="https://launchpad.net/${PN}/trunk/v$(ver_cut 1-2)/+download/${P}.tar.gz
84 LICENSE="MIT"
85 SLOT="0"
86 KEYWORDS="~amd64 ~arm ~x86"
87 -IUSE=""
88
89 BDEPEND="
90 dev-lang/perl
91 sys-devel/libtool
92 virtual/pkgconfig
93 "
94 -DEPEND=""
95 RDEPEND="!dev-libs/libvterm-neovim"
96
97 src_compile() {
98 + tc-export CC
99 append-cflags -fPIC
100 +
101 emake VERBOSE=1 PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
102 }
103
104 @@ -32,5 +33,6 @@ src_install() {
105 PREFIX="${EPREFIX}/usr" \
106 LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
107 DESTDIR="${D}" install
108 - find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
109 +
110 + find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
111 }
112
113 diff --git a/dev-libs/libvterm/libvterm-0.1.2.ebuild b/dev-libs/libvterm/libvterm-0.1.2.ebuild
114 index 6802cf9d98a..d4ac11e08b8 100644
115 --- a/dev-libs/libvterm/libvterm-0.1.2.ebuild
116 +++ b/dev-libs/libvterm/libvterm-0.1.2.ebuild
117 @@ -1,8 +1,9 @@
118 -# Copyright 1999-2019 Gentoo Authors
119 +# Copyright 1999-2021 Gentoo Authors
120 # Distributed under the terms of the GNU General Public License v2
121
122 EAPI=7
123 -inherit flag-o-matic
124 +
125 +inherit flag-o-matic toolchain-funcs
126
127 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
128 HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
129 @@ -17,11 +18,12 @@ BDEPEND="
130 sys-devel/libtool
131 virtual/pkgconfig
132 "
133 -DEPEND=""
134 RDEPEND="!dev-libs/libvterm-neovim"
135
136 src_compile() {
137 + tc-export CC
138 append-cflags -fPIC
139 +
140 emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
141 LIBDIR="${EPREFIX}/usr/$(get_libdir)"
142 }
143 @@ -32,5 +34,6 @@ src_install() {
144 PREFIX="${EPREFIX}/usr" \
145 LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
146 DESTDIR="${D}" install
147 - find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
148 +
149 + find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
150 }
151
152 diff --git a/dev-libs/libvterm/libvterm-0.1.3.ebuild b/dev-libs/libvterm/libvterm-0.1.3.ebuild
153 index fbc62d84bc3..b228336dfdb 100644
154 --- a/dev-libs/libvterm/libvterm-0.1.3.ebuild
155 +++ b/dev-libs/libvterm/libvterm-0.1.3.ebuild
156 @@ -1,7 +1,8 @@
157 -# Copyright 1999-2020 Gentoo Authors
158 +# Copyright 1999-2021 Gentoo Authors
159 # Distributed under the terms of the GNU General Public License v2
160
161 EAPI=7
162 +
163 inherit flag-o-matic
164
165 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
166 @@ -17,10 +18,11 @@ BDEPEND="
167 sys-devel/libtool
168 virtual/pkgconfig
169 "
170 -DEPEND=""
171 RDEPEND="!dev-libs/libvterm-neovim"
172
173 src_compile() {
174 + tc-export CC
175 +
176 append-cflags -fPIC
177 emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
178 LIBDIR="${EPREFIX}/usr/$(get_libdir)"
179 @@ -32,5 +34,6 @@ src_install() {
180 PREFIX="${EPREFIX}/usr" \
181 LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
182 DESTDIR="${D}" install
183 - find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
184 +
185 + find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
186 }