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/files/, dev-libs/libvterm/
Date: Sat, 01 Oct 2022 01:29:45
Message-Id: 1664587771.7ca331f7ccf11b82794e3871db1d9cc1b1c2efa9.sam@gentoo
1 commit: 7ca331f7ccf11b82794e3871db1d9cc1b1c2efa9
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 1 01:20:48 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 1 01:29:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca331f7
7
8 dev-libs/libvterm: drop 0.2, 0.2-r1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-libs/libvterm/Manifest | 1 -
13 .../libvterm/files/libvterm-0.2-slibtool.patch | 103 ---------------------
14 dev-libs/libvterm/libvterm-0.2-r1.ebuild | 40 --------
15 dev-libs/libvterm/libvterm-0.2.ebuild | 42 ---------
16 4 files changed, 186 deletions(-)
17
18 diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
19 index 115db5509890..251907a5c150 100644
20 --- a/dev-libs/libvterm/Manifest
21 +++ b/dev-libs/libvterm/Manifest
22 @@ -1,3 +1,2 @@
23 DIST libvterm-0.1.4.tar.gz 69122 BLAKE2B 4f0acc9ec6755c4a840e5df6c32c44e12c5316b5c5918d0e8eada19d819736c3e5b9090b468e32b3141a7fbb5ba226e365be27d6d1d9ca22f9f5e365fc3971c2 SHA512 90b5d47417e3f469df5c6574a27d12bd6bd1571d17cab7c4ac0ee61b1dbcb6361987f6fdfd11e314ea32f8958ec165c319a34d0f77288947c7cbc11de697d524
24 -DIST libvterm-0.2.tar.gz 79712 BLAKE2B db17d15550a595652368edd7ee0ccab2a69effa79677a23d6ee94731fc05d685df0de843d2e953cd59d2077922e72834d7ab09eaf5260aed869d9511cfd224a7 SHA512 bc99ae4fbdc165ced92c10fb0168ae6da2ed702208064616fefcd42aba71c57b7d42a08bc5b0e7e1ebda8cc4b5682d16059bdd2edfb12fbd8ac97527e854b14c
25 DIST libvterm-0.3.tar.gz 83861 BLAKE2B a2e8e9d80698880d87f9d26977a4e3dec7b520c3096d0ca6f7823254eeebe51666380ed2a5c05c923dd8b138f15c87e671fdfb03e5511c01711e112cdda9867a SHA512 2a7b6831476465d6a9f7c792406f4e3c4eca0c3dbce4b7031f2646c87e33692128a3d3ce27e1541403772cc0b5eface7bd41325e1e5300c3915bfc0bac97a896
26
27 diff --git a/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch b/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch
28 deleted file mode 100644
29 index 5f6356da2761..000000000000
30 --- a/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch
31 +++ /dev/null
32 @@ -1,103 +0,0 @@
33 -From: orbea <orbea@××××××.net>
34 -Date: Thu, 14 Jul 2022 13:18:26 -0700
35 -Subject: [PATCH] build: Add a minimal configures script
36 -
37 -When building libvterm with slibtool using the rlibtool symlink the
38 -build will fail when the generated libtool is not found. This file is
39 -required with rlibtool so that the build can determine if the build
40 -should be shared, static or both.
41 -
42 -This can be solved by adding a minimal configure script.
43 -
44 -The build steps are now:
45 -
46 -autoreconf -fi
47 -./configure
48 -make
49 -make install
50 -
51 -diff --git a/Makefile b/Makefile.in
52 -similarity index 90%
53 -rename from Makefile
54 -rename to Makefile.in
55 -index e3c1c39..70e7ca2 100644
56 ---- a/Makefile
57 -+++ b/Makefile.in
58 -@@ -1,13 +1,13 @@
59 --ifeq ($(shell uname),Darwin)
60 -- LIBTOOL ?= glibtool
61 --else
62 -- LIBTOOL ?= libtool
63 --endif
64 -+top_builddir = @top_builddir@
65 -+
66 -+LIBTOOL = @LIBTOOL@
67 -
68 - ifneq ($(VERBOSE),1)
69 - LIBTOOL +=--quiet
70 - endif
71 -
72 -+CC = @CC@
73 -+
74 - override CFLAGS +=-Wall -Iinclude -std=c99 -Wpedantic
75 -
76 - ifeq ($(shell uname),SunOS)
77 -@@ -36,20 +36,21 @@ INCFILES=$(TBLFILES:.tbl=.inc)
78 -
79 - HFILES_INT=$(sort $(wildcard src/*.h)) $(HFILES)
80 -
81 --VERSION_MAJOR=0
82 --VERSION_MINOR=2
83 -+VERSION_MAJOR=@VERSION_MAJOR@
84 -+VERSION_MINOR=@VERSION_MINOR@
85 -
86 - VERSION_CURRENT=0
87 - VERSION_REVISION=0
88 - VERSION_AGE=0
89 -
90 --VERSION=$(VERSION_MAJOR).$(VERSION_MINOR)
91 -+VERSION=@PACKAGE_VERSION@
92 -
93 --PREFIX=/usr/local
94 --BINDIR=$(PREFIX)/bin
95 --LIBDIR=$(PREFIX)/lib
96 --INCDIR=$(PREFIX)/include
97 --MANDIR=$(PREFIX)/share/man
98 -+prefix=@prefix@
99 -+exec_prefix=@exec_prefix@
100 -+BINDIR=@bindir@
101 -+LIBDIR=@libdir@
102 -+INCDIR=@includedir@
103 -+MANDIR=@mandir@
104 - MAN3DIR=$(MANDIR)/man3
105 -
106 - all: $(LIBRARY) $(BINFILES)
107 -@@ -73,7 +74,7 @@ src/encoding.lo: $(INCFILES)
108 -
109 - bin/%: bin/%.c $(LIBRARY)
110 - @echo CC $<
111 -- @$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< -lvterm $(LDFLAGS)
112 -+ @$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
113 -
114 - t/harness.lo: t/harness.c $(HFILES)
115 - @echo CC $<
116 -diff --git a/configure.ac b/configure.ac
117 -new file mode 100644
118 -index 0000000..39f7767
119 ---- /dev/null
120 -+++ b/configure.ac
121 -@@ -0,0 +1,14 @@
122 -+m4_define([version_major], [0])
123 -+m4_define([version_minor], [2])
124 -+
125 -+AC_INIT([libvterm], [version_major.version_minor])
126 -+AC_CONFIG_FILES([Makefile])
127 -+
128 -+LT_INIT
129 -+
130 -+AC_SUBST([top_builddir], [$abs_builddir])
131 -+
132 -+AC_SUBST([VERSION_MAJOR], [version_major])
133 -+AC_SUBST([VERSION_MINOR], [version_minor])
134 -+
135 -+AC_OUTPUT
136
137 diff --git a/dev-libs/libvterm/libvterm-0.2-r1.ebuild b/dev-libs/libvterm/libvterm-0.2-r1.ebuild
138 deleted file mode 100644
139 index 3e8037c9ec7b..000000000000
140 --- a/dev-libs/libvterm/libvterm-0.2-r1.ebuild
141 +++ /dev/null
142 @@ -1,40 +0,0 @@
143 -# Copyright 1999-2022 Gentoo Authors
144 -# Distributed under the terms of the GNU General Public License v2
145 -
146 -EAPI=8
147 -
148 -inherit autotools
149 -
150 -DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
151 -HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
152 -SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
153 -
154 -LICENSE="MIT"
155 -SLOT="0"
156 -# Fedora have a revert patch for now:
157 -# https://src.fedoraproject.org/rpms/libvterm/blob/rawhide/f/libvterm-0.2-fix-resize-buffer.patch
158 -# so let's see if 0.2.1 is any better or if this is actually needed for us?
159 -#KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
160 -
161 -BDEPEND="
162 - dev-lang/perl
163 - virtual/pkgconfig
164 -"
165 -
166 -PATCHES=(
167 - "${FILESDIR}"/${P}-slibtool.patch # 779034
168 -)
169 -
170 -src_prepare() {
171 - default
172 - eautoreconf
173 -}
174 -
175 -src_compile() {
176 - emake VERBOSE=1
177 -}
178 -
179 -src_install() {
180 - emake VERBOSE=1 DESTDIR="${D}" install
181 - find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
182 -}
183
184 diff --git a/dev-libs/libvterm/libvterm-0.2.ebuild b/dev-libs/libvterm/libvterm-0.2.ebuild
185 deleted file mode 100644
186 index 84e1e689e51e..000000000000
187 --- a/dev-libs/libvterm/libvterm-0.2.ebuild
188 +++ /dev/null
189 @@ -1,42 +0,0 @@
190 -# Copyright 1999-2022 Gentoo Authors
191 -# Distributed under the terms of the GNU General Public License v2
192 -
193 -EAPI=8
194 -
195 -inherit flag-o-matic toolchain-funcs
196 -
197 -DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
198 -HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
199 -SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
200 -
201 -LICENSE="MIT"
202 -SLOT="0"
203 -# Fedora have a revert patch for now:
204 -# https://src.fedoraproject.org/rpms/libvterm/blob/rawhide/f/libvterm-0.2-fix-resize-buffer.patch
205 -# so let's see if 0.2.1 is any better or if this is actually needed for us?
206 -#KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
207 -
208 -BDEPEND="
209 - dev-lang/perl
210 - sys-devel/libtool
211 - virtual/pkgconfig
212 -"
213 -RDEPEND="!dev-libs/libvterm-neovim"
214 -
215 -src_compile() {
216 - tc-export CC
217 -
218 - append-cflags -fPIC
219 - emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
220 - LIBDIR="${EPREFIX}/usr/$(get_libdir)"
221 -}
222 -
223 -src_install() {
224 - emake \
225 - VERBOSE=1 \
226 - PREFIX="${EPREFIX}/usr" \
227 - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
228 - DESTDIR="${D}" install
229 -
230 - find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
231 -}