Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: William Breathitt Gray <vilhelm.gray@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/fbc/, dev-lang/fbc/files/
Date: Thu, 29 Apr 2021 11:56:54
Message-Id: 1619697313.78a236627a03d4eea7c2238601f50650e3ddd823.vilhelm.gray@gentoo
1 commit: 78a236627a03d4eea7c2238601f50650e3ddd823
2 Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
3 AuthorDate: Thu Apr 29 11:55:13 2021 +0000
4 Commit: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
5 CommitDate: Thu Apr 29 11:55:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=78a23662
7
8 dev-lang/fbc: Drop old versions
9
10 Closes: https://bugs.gentoo.org/781002
11 Closes: https://bugs.gentoo.org/781005
12 Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
13
14 dev-lang/fbc/Manifest | 4 -
15 dev-lang/fbc/fbc-1.07.1.ebuild | 89 ---------------------
16 dev-lang/fbc/fbc-1.07.2-r2.ebuild | 61 --------------
17 dev-lang/fbc/fbc-1.07.2.ebuild | 92 ----------------------
18 .../files/fbc-1.07.0-Pass-ltinfo-to-linker.patch | 25 ------
19 5 files changed, 271 deletions(-)
20
21 diff --git a/dev-lang/fbc/Manifest b/dev-lang/fbc/Manifest
22 index ef633a433..f56b456a5 100644
23 --- a/dev-lang/fbc/Manifest
24 +++ b/dev-lang/fbc/Manifest
25 @@ -1,5 +1 @@
26 -DIST FreeBASIC-1.07.1-source-bootstrap.tar.xz 9098748 BLAKE2B 3c3970ab014f79193dad23b6f22c5ffc61d6f588219dcf00f430ce2c9045dc2af8aa42bdad4f1d63d76591aae14b42553cf6ece88052f0dc78e09c6fb5c4d875 SHA512 89250fb4d79e420151bae8208945e26c5d4e63ba8bbb60658b2c5601ceeea238b387d7d7a2b52d60da2243e5d3d31f602c3657394be72a37c256e777be23b0a8
27 -DIST FreeBASIC-1.07.2-source-bootstrap.tar.xz 10700992 BLAKE2B e7016e5f58ae79086c0445bf6a09f33d4335af771422778be407e3351d583522e16f137763e471ba88e47b4318ab5bd2aec882ef5e5ff85cc334b0eccf27fdc5 SHA512 f381d14343496f68d3401ad1a66ff4fb1314270eddebb72ed2bc5624b856c4b29e7e14062f531a5158d892bb73d9aa80ff54fe7c260b4b8967b1330d26b2ecfc
28 -DIST fbc-1.07.1.tar.gz 8938056 BLAKE2B 965425426605b9e0018e066852a67c355d168276b434e6779e151fad38820a956b5b763aad427c6728be4a74b0956b099a0bb8abd0d76fececc6cf8f0204d3c1 SHA512 7d49b9546e242b1c366b2378f71cf1640b85c85e09f4c2bd99ef268e6b4e5e45a710b7a00f7d807245aec518f299d173635572b77483826c1f273e047dbe3679
29 -DIST fbc-1.07.2.tar.gz 9032306 BLAKE2B c44eb74bb0b11f8315cda29e13157ce5f7a92070f0e6df833ad9dda4ebe37db6450afe2b82eb763ebee5ed0c33b4ce458fd3b53430f32da8ad5a71cd84411c67 SHA512 0577203fb8a325f611c88456446721e8bb14656beb235f3965bcd53e14cc7c7fa012a68535ff4c12351fad31d9a22a759f12bc9fe0be5d1dad124d3fe377daaf
30 DIST fbc-1.07.3.tar.gz 9035460 BLAKE2B c0356c36ebd455954993ce5d4a983d06c33abc5bf0a059a44832d441514643c7d08e40268a7b3b9a0cba21368058199be395cc28dd7f87df23d576f78aece276 SHA512 6040248c433db3191678209401ff4a643c500d967d67352f1aeca347648056b0a2cdef25bbb7532fec0351a13984c72e80cb7b00faf3ead6c219422955d148fb
31
32 diff --git a/dev-lang/fbc/fbc-1.07.1.ebuild b/dev-lang/fbc/fbc-1.07.1.ebuild
33 deleted file mode 100644
34 index dff47787b..000000000
35 --- a/dev-lang/fbc/fbc-1.07.1.ebuild
36 +++ /dev/null
37 @@ -1,89 +0,0 @@
38 -# Copyright 1999-2020 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=7
42 -
43 -DESCRIPTION="A free/open source, multi-platform BASIC compiler."
44 -HOMEPAGE="https://www.freebasic.net"
45 -SRC_URI="https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
46 - https://github.com/freebasic/${PN}/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz"
47 -
48 -LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+"
49 -SLOT="0"
50 -KEYWORDS="~amd64 ~x86"
51 -IUSE="gpm libffi opengl X"
52 -
53 -DEPEND="
54 - sys-libs/ncurses:=
55 - gpm? ( sys-libs/gpm )
56 - libffi? ( dev-libs/libffi )
57 - opengl? ( virtual/opengl )
58 - X? (
59 - x11-libs/libX11
60 - x11-libs/libXext
61 - x11-libs/libXpm
62 - x11-libs/libXrandr
63 - x11-libs/libXrender
64 - )"
65 -RDEPEND="${DEPEND}"
66 -
67 -PATCHES=( "${FILESDIR}"/${PN}-1.07.0-Pass-ltinfo-to-linker.patch )
68 -
69 -DOCS="${S}/doc/fbc.1"
70 -
71 -BOOTSTRAP_S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap"
72 -
73 -src_unpack() {
74 - # We only need bootstrap source code if fbc is not already present
75 - if ! has_version dev-lang/fbc; then
76 - unpack FreeBASIC-${PV}-source-bootstrap.tar.xz
77 - fi
78 - unpack ${P}.tar.gz
79 -}
80 -
81 -src_prepare() {
82 - # We only need bootstrap source code if fbc is not already present
83 - if ! has_version dev-lang/fbc; then
84 - cd "${BOOTSTRAP_S}" || die "cd failed"
85 - eapply "${PATCHES[@]}"
86 - cd "${S}" || die "cd failed"
87 - fi
88 - eapply_user
89 -}
90 -
91 -src_compile() {
92 - local fbc="fbc"
93 - local fbcflags=""
94 -
95 - # We only need bootstrap compiler if fbc is not already present
96 - if ! has_version dev-lang/fbc; then
97 - cd "${BOOTSTRAP_S}" || die "cd failed"
98 -
99 - # Build bootstrap compiler
100 - emake bootstrap-minimal
101 -
102 - # Set bootstrap compiler to build fbc
103 - fbc="${BOOTSTRAP_S}/bin/fbc"
104 - fbcflags="-i ${BOOTSTRAP_S}/inc"
105 -
106 - cd "${S}" || die "cd failed"
107 - fi
108 -
109 - local xcflags=(
110 - $(usex gpm "" "-DDISABLE_GPM")
111 - $(usex libffi "" " -DDISABLE_FFI")
112 - $(usex opengl "" " -DDISABLE_OPENGL")
113 - $(usex X "" " -DDISABLE_X11")
114 - )
115 -
116 - # fbc requires a space after the -Wl option
117 - local fblflags=${LDFLAGS//-Wl,/-Wl }
118 -
119 - # Build fbc
120 - emake CFLAGS="${CFLAGS} ${xcflags[*]}" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" TARGET=${CHOST}
121 -}
122 -
123 -src_install() {
124 - emake DESTDIR="${D}" prefix="/usr" TARGET=${CHOST} install
125 - einstalldocs
126 -}
127
128 diff --git a/dev-lang/fbc/fbc-1.07.2-r2.ebuild b/dev-lang/fbc/fbc-1.07.2-r2.ebuild
129 deleted file mode 100644
130 index 2d430eead..000000000
131 --- a/dev-lang/fbc/fbc-1.07.2-r2.ebuild
132 +++ /dev/null
133 @@ -1,61 +0,0 @@
134 -# Copyright 1999-2020 Gentoo Authors
135 -# Distributed under the terms of the GNU General Public License v2
136 -
137 -EAPI=7
138 -
139 -DESCRIPTION="A free/open source, multi-platform BASIC compiler."
140 -HOMEPAGE="https://www.freebasic.net"
141 -SRC_URI="https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
142 -
143 -LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+"
144 -SLOT="0"
145 -KEYWORDS="~amd64 ~x86"
146 -IUSE="gpm libffi opengl X"
147 -
148 -DEPEND="
149 - sys-libs/ncurses:=
150 - gpm? ( sys-libs/gpm )
151 - libffi? ( dev-libs/libffi )
152 - opengl? ( virtual/opengl )
153 - X? (
154 - x11-libs/libX11
155 - x11-libs/libXext
156 - x11-libs/libXpm
157 - x11-libs/libXrandr
158 - x11-libs/libXrender
159 - )
160 -"
161 -RDEPEND="${DEPEND}"
162 -BDEPEND="|| (
163 - dev-lang/fbc
164 - dev-lang/fbc-bootstrap )"
165 -
166 -DOCS="${S}/doc/fbc.1"
167 -
168 -src_compile() {
169 - local xcflags=(
170 - $(usex gpm "" "-DDISABLE_GPM")
171 - $(usex libffi "" " -DDISABLE_FFI")
172 - $(usex opengl "" " -DDISABLE_OPENGL")
173 - $(usex X "" " -DDISABLE_X11")
174 - )
175 -
176 - local fbc="fbc"
177 - local fbcflags=""
178 - # fbc requires a space after the -Wl option
179 - local fblflags="${LDFLAGS//-Wl,/-Wl }"
180 -
181 - if has_version -b dev-lang/fbc-bootstrap; then
182 - fbc="fbc-bootstrap"
183 - fbcflags="-prefix ${EPREFIX}/usr/share/freebasic-bootstrap"
184 - fblflags+=" -prefix ${EPREFIX}/usr/share/freebasic-bootstrap"
185 - fi
186 -
187 - # Build fbc
188 - emake CFLAGS="${CFLAGS} ${xcflags[*]} -I/usr/$(get_libdir)/libffi/include" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" TARGET="${CHOST}"
189 -}
190 -
191 -src_install() {
192 - emake DESTDIR="${D}" prefix="/usr" TARGET="${CHOST}" install
193 - einstalldocs
194 -}
195
196 diff --git a/dev-lang/fbc/fbc-1.07.2.ebuild b/dev-lang/fbc/fbc-1.07.2.ebuild
197 deleted file mode 100644
198 index 2db1af5cd..000000000
199 --- a/dev-lang/fbc/fbc-1.07.2.ebuild
200 +++ /dev/null
201 @@ -1,92 +0,0 @@
202 -# Copyright 1999-2020 Gentoo Authors
203 -# Distributed under the terms of the GNU General Public License v2
204 -
205 -EAPI=7
206 -
207 -DESCRIPTION="A free/open source, multi-platform BASIC compiler."
208 -HOMEPAGE="https://www.freebasic.net"
209 -SRC_URI="
210 - https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
211 - https://github.com/freebasic/${PN}/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz
212 -"
213 -
214 -LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+"
215 -SLOT="0"
216 -KEYWORDS="~amd64 ~x86"
217 -IUSE="gpm libffi opengl X"
218 -
219 -DEPEND="
220 - sys-libs/ncurses:=
221 - gpm? ( sys-libs/gpm )
222 - libffi? ( dev-libs/libffi )
223 - opengl? ( virtual/opengl )
224 - X? (
225 - x11-libs/libX11
226 - x11-libs/libXext
227 - x11-libs/libXpm
228 - x11-libs/libXrandr
229 - x11-libs/libXrender
230 - )
231 -"
232 -RDEPEND="${DEPEND}"
233 -
234 -PATCHES=( "${FILESDIR}"/${PN}-1.07.0-Pass-ltinfo-to-linker.patch )
235 -
236 -DOCS="${S}/doc/fbc.1"
237 -
238 -BOOTSTRAP_S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap"
239 -
240 -src_unpack() {
241 - # We only need bootstrap source code if fbc is not already present
242 - if ! has_version dev-lang/fbc; then
243 - unpack FreeBASIC-${PV}-source-bootstrap.tar.xz
244 - fi
245 - unpack ${P}.tar.gz
246 -}
247 -
248 -src_prepare() {
249 - # We only need bootstrap source code if fbc is not already present
250 - if ! has_version dev-lang/fbc; then
251 - cd "${BOOTSTRAP_S}" || die "cd failed"
252 - eapply "${PATCHES[@]}"
253 - cd "${S}" || die "cd failed"
254 - fi
255 - eapply_user
256 -}
257 -
258 -src_compile() {
259 - local fbc="fbc"
260 - local fbcflags=""
261 -
262 - # We only need bootstrap compiler if fbc is not already present
263 - if ! has_version dev-lang/fbc; then
264 - cd "${BOOTSTRAP_S}" || die "cd failed"
265 -
266 - # Build bootstrap compiler
267 - emake bootstrap-minimal
268 -
269 - # Set bootstrap compiler to build fbc
270 - fbc="${BOOTSTRAP_S}/bin/fbc"
271 - fbcflags="-i ${BOOTSTRAP_S}/inc"
272 -
273 - cd "${S}" || die "cd failed"
274 - fi
275 -
276 - local xcflags=(
277 - $(usex gpm "" "-DDISABLE_GPM")
278 - $(usex libffi "" " -DDISABLE_FFI")
279 - $(usex opengl "" " -DDISABLE_OPENGL")
280 - $(usex X "" " -DDISABLE_X11")
281 - )
282 -
283 - # fbc requires a space after the -Wl option
284 - local fblflags=${LDFLAGS//-Wl,/-Wl }
285 -
286 - # Build fbc
287 - emake CFLAGS="${CFLAGS} ${xcflags[*]}" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" TARGET=${CHOST}
288 -}
289 -
290 -src_install() {
291 - emake DESTDIR="${D}" prefix="/usr" TARGET=${CHOST} install
292 - einstalldocs
293 -}
294
295 diff --git a/dev-lang/fbc/files/fbc-1.07.0-Pass-ltinfo-to-linker.patch b/dev-lang/fbc/files/fbc-1.07.0-Pass-ltinfo-to-linker.patch
296 deleted file mode 100644
297 index 72bd51faf..000000000
298 --- a/dev-lang/fbc/files/fbc-1.07.0-Pass-ltinfo-to-linker.patch
299 +++ /dev/null
300 @@ -1,25 +0,0 @@
301 -From c62adcd85c4e9d8b793a7a4f71fc88f6fbb79798 Mon Sep 17 00:00:00 2001
302 -From: William Breathitt Gray <vilhelm.gray@×××××.com>
303 -Date: Tue, 27 Aug 2019 20:41:07 +0900
304 -Subject: [PATCH] Pass -ltinfo to linker
305 -
306 ----
307 - makefile | 2 +-
308 - 1 file changed, 1 insertion(+), 1 deletion(-)
309 -
310 -diff --git a/makefile b/makefile
311 -index e093bb1..eb3f759 100644
312 ---- a/makefile
313 -+++ b/makefile
314 -@@ -1109,7 +1109,7 @@ endif
315 - # Use gcc to link fbc from the bootstrap .o's
316 - # (assuming the rtlib was built already)
317 - ifneq ($(filter darwin freebsd linux netbsd openbsd solaris,$(TARGET_OS)),)
318 -- BOOTSTRAP_LIBS := -lncurses -lm -pthread
319 -+ BOOTSTRAP_LIBS := -ltinfo -lncurses -lm -pthread
320 - endif
321 - $(BOOTSTRAP_FBC): rtlib $(BOOTSTRAP_OBJ)
322 - $(QUIET_LINK)$(CC) -o $@ $(libdir)/fbrt0.o bootstrap/$(FBTARGET)/*.o $(libdir)/libfb.a $(BOOTSTRAP_LIBS)
323 ---
324 -2.22.1
325 -
Report Message
Find on MARC Find on Google Groups