From 8eccda982236f2cfe9188bdcaffd9168134f39a9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 27 Jan 2023 13:58:28 +0000 Subject: gentoo auto-resync : 27:01:2023 - 13:58:28 --- sci-misc/Manifest.gz | Bin 2750 -> 2582 bytes sci-misc/flashdot/Manifest | 6 -- .../flashdot/files/flashdot-1.1.4-Makefile.patch | 10 ---- .../flashdot/files/flashdot-1.1.4-gsl-ocaml.patch | 23 -------- .../flashdot/files/flashdot-1.1.4-ocaml-4.09.patch | 22 ------- sci-misc/flashdot/flashdot-1.1.4-r1.ebuild | 64 --------------------- sci-misc/flashdot/metadata.xml | 12 ---- 7 files changed, 137 deletions(-) delete mode 100644 sci-misc/flashdot/Manifest delete mode 100644 sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch delete mode 100644 sci-misc/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch delete mode 100644 sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch delete mode 100644 sci-misc/flashdot/flashdot-1.1.4-r1.ebuild delete mode 100644 sci-misc/flashdot/metadata.xml (limited to 'sci-misc') diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz index a07623c684f9..625324139619 100644 Binary files a/sci-misc/Manifest.gz and b/sci-misc/Manifest.gz differ diff --git a/sci-misc/flashdot/Manifest b/sci-misc/flashdot/Manifest deleted file mode 100644 index 2ae2b2e69d08..000000000000 --- a/sci-misc/flashdot/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX flashdot-1.1.4-Makefile.patch 300 BLAKE2B c771a361aedb8eafd0e8e376b71889ec41a4d75330f172481890d7b39251dc09e3c1961de87acd435579031fe82206550422872c6cf54359137f246b7afed5f3 SHA512 034c946c4d1ec7905ebc370b7a59418b4e63903f684d9da4c3be3d89747b12b5f25ce786a967f66250b5095401f76541ecfee78ca205859477527c7a42e2d13c -AUX flashdot-1.1.4-gsl-ocaml.patch 1045 BLAKE2B 43809e76d518a755cc9bb2e0a0eca1d4e54cd749081f710a34ef96bc4af201452673a25b8a5e431839d148cbab10f69638c5b98539b9d969d262026677efccdc SHA512 010edd228c29189bb07eec81ec3b0ceb968ccfa99f6cf85d1d1b2b1b8b2af040b674e75fdf57662cdbb6ca076b9ea02d5164530ef91012bb3e9ea89de9457f0b -AUX flashdot-1.1.4-ocaml-4.09.patch 736 BLAKE2B dbef65cd2a61062b70c509970bfe9d574493c371e8ebdc81f6c1bdb15e7c38ca01938c11461e973b7285a0fc69b368f31a30b4b00027fba4e5e482ff6d5384bb SHA512 3cf6b9c4b5290c02915112646e8456b76a6931882d998647001a9c38af1aff0ee48d75617aae75f5cca442d8932dfdcb1342b5cad044f019af72bd29d64f7408 -DIST flashdot-1.1.4.tar.bz2 464763 BLAKE2B bed4b23ad21a8526714820ebf113e53a775dff39c0fcd3cdde847fb0a46ffbde5cd3f62ae2b92584ff1ad5c3b1b0a939130c3a182905b16503b60c1321a90e78 SHA512 2c7f803ca002f8a2d9205a6148c3bf602aa79c04fb67444cdfb23626706777d8463739f119ff124b58f7dc30c75750f95045fab4059540936082cfda7deea8c0 -EBUILD flashdot-1.1.4-r1.ebuild 1502 BLAKE2B 3b30ce3d0d4f9c9d373dd5461141de349bd6202b7e3893df552f104a10f6f8dc010b4b723d07554e0e2b505c8ade0f0d5b63b09a714a7a6f3e3024dcc7421224 SHA512 1789dcec6b4043c2b683d4b9545aec257e6cd3be09f83ffbc67ffe6442138f732496dd32cabe7493c08ad2692125dd9e1b3282359a86adebfb1e052c71ec924e -MISC metadata.xml 427 BLAKE2B 1fce303158c98ae384772601c9beda1b3463e4788fff19047741b7d76b8cfda2743b255bd8a1d2bb68facca576d6d0d3751bcd89bd382dc2e8da942c8f45aabc SHA512 70817c09e9eb61fdded563779021905bf2879e1f96ffbe15f5703ae9c3a8435d111838818aa18fe8992e835c505fcb518cd5bf319bc3d14c062fb9451482e2a3 diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch b/sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch deleted file mode 100644 index 077367bd2ab0..000000000000 --- a/sci-misc/flashdot/files/flashdot-1.1.4-Makefile.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/mathexpr/Makefile 2022-03-22 10:51:43.081062080 +0100 -+++ b/mathexpr/Makefile 2022-03-22 10:53:37.226190652 +0100 -@@ -72,6 +72,6 @@ - # Dependencies - depend: -- $(OCAMLDEP) $(OCAMLINCS) *.mli *.ml > depend -+ $(OCAMLDEP) -I $(XMLLIGHTDIR) $(OCAMLINCSLOCAL) *.mli *.ml > depend - - include depend - diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch b/sci-misc/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch deleted file mode 100644 index 4e94e5b84eb1..000000000000 --- a/sci-misc/flashdot/files/flashdot-1.1.4-gsl-ocaml.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix errors caused by wrong parameter type: -* File "mathexpr.ml", line 423, characters 55-56: -* Error: This expression has type int but an expression was expected of type -* float - ---- flashdot-1.1.4/mathexpr/mathexpr.ml -+++ flashdot-1.1.4/mathexpr/mathexpr.ml -@@ -419,7 +419,6 @@ - | "NegativeBinomial" -> - let p = float'_of_string (aod cont_type "P" "1.0") in - let n = float'_of_string (aod cont_type "N" "1.0") in -- (*uncomment this for ocamlgsl > 0.5 ::::let n = int_of_float n in::::*) - fun () -> foi (Gsl_randist.negative_binomial rng p n) - | "Pascal" -> - let p = float'_of_string (aod cont_type "P" "1.0") in -@@ -4094,7 +4093,6 @@ - | "NegativeBinomialPDF" -> - let p = float'_of_string (aod cont_type "P" "1.0") in - let n = float'_of_string (aod cont_type "N" "1.0") in -- (*uncomment this for ocamlgsl > 0.5 ::::let n = int_of_float n in::::*) - fun x -> Gsl_randist.negative_binomial_pdf (int_of_float x) p n - | "PascalPDF" -> - let p = float'_of_string (aod cont_type "P" "1.0") in diff --git a/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch b/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch deleted file mode 100644 index 285a2c746e20..000000000000 --- a/sci-misc/flashdot/files/flashdot-1.1.4-ocaml-4.09.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/fls/fls.ml 2021-04-26 16:24:25.363442099 +0200 -+++ b/fls/fls.ml 2021-04-26 20:10:54.965405870 +0200 -@@ -750,7 +750,7 @@ - match input inp s 0 1024 with - 0 -> Buffer.contents res - | n -> -- Buffer.add_substring res s 0 n; -+ Buffer.add_subbytes res s 0 n; - fill_buff () - in - let s = fill_buff () in ---- a/mathexpr/mathexpr.ml 2022-03-22 12:36:30.252580025 +0100 -+++ b/mathexpr/mathexpr.ml 2022-03-22 12:32:10.594137416 +0100 -@@ -2859,7 +2859,7 @@ - while true do - let n = input f strbuf 0 1024 in - if n = 0 then raise Exit else -- Buffer.add_substring resbuf strbuf 0 n -+ Buffer.add_subbytes resbuf strbuf 0 n - done; - Buffer.contents resbuf - with Exit -> Buffer.contents resbuf diff --git a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild deleted file mode 100644 index 1843fa0f3f89..000000000000 --- a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Generator for psychophysical experiments" -HOMEPAGE="http://www.flashdot.info/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~tomka/files/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="+ocamlopt" - -DEPEND=" - >=dev-lang/ocaml-3.10:=[ocamlopt?] - dev-ml/gsl-ocaml:= - dev-ml/lablgl:=[glut] - dev-ml/ocamlsdl:=[opengl] - x11-apps/xdpyinfo" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/${P}-gsl-ocaml.patch" - "${FILESDIR}"/${P}-Makefile.patch - "${FILESDIR}"/${P}-ocaml-4.09.patch -) - -src_prepare() { - default - MAKEOPTS="-j1" - use ocamlopt || MAKEOPTS+=" TARGETS=flashdot_bytecode BYTECODENAME=flashdot" - sed -i \ - -e "s|^VERSION.*|VERSION := ${PV}|" \ - Makefile \ - || die - sed -i \ - -e 's:Gsl_matrix:Gsl.Matrix:g' \ - -e 's:Gsl_rng:Gsl.Rng:g' \ - -e 's:Gsl_randist:Gsl.Randist:g' \ - -e 's:Gsl_sf:Gsl.Sf:g' \ - -e 's:Gsl_math:Gsl.Math:g' \ - -e 's:Gsl_vector:Gsl.Vector:g' \ - -e 's:Gsl_permut:Gsl.Permut:g' \ - -e 's:Gsl_linalg:Gsl.Linalg:g' \ - -e 's:Gsl_cdf:Gsl.Cdf:g' \ - mathexpr/mathexpr.ml \ - mathexpr/mathexpr.mli \ - mathexpr/random_rng.ml \ - mathexpr/sequences.ml \ - mathexpr/multibin.ml \ - flashdot.ml \ - || die -} - -src_configure() { - ./configure --prefix=/usr || die -} - -src_install() { - emake DESTDIR="${D}" CALLMODE=script install - rm "${D}"/usr/share/doc/${PN}/copyright* || die - mv "${D}"/usr/share/doc/{${PN},${PF}} || die -} diff --git a/sci-misc/flashdot/metadata.xml b/sci-misc/flashdot/metadata.xml deleted file mode 100644 index 2af31d9443ce..000000000000 --- a/sci-misc/flashdot/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - sci@gentoo.org - Gentoo Science Project - - - FlashDot is a program for generating and presenting visual perceptual experiments that require a high temporal - precision. - - -- cgit v1.2.3