commit: a94a59241c1ad5996e092bf6c06a3f5267b4bcf7 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Fri Jan 27 11:02:03 2023 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Fri Jan 27 11:07:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a94a5924
sci-misc/flashdot: treeclean Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> profiles/package.mask | 5 -- sci-misc/flashdot/Manifest | 1 - .../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(-) diff --git a/profiles/package.mask b/profiles/package.mask index a2a3fe77969c..a6565c66251e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -711,11 +711,6 @@ sci-biology/consed sci-biology/phrap sci-biology/phred -# David Seifert <[email protected]> (2022-12-26) -# EAPI 6, cheesy build system, last release over 13 years ago, no other -# distro packages this. Removal on 2023-01-25. -sci-misc/flashdot - # Ionen Wolkens <[email protected]> (2022-12-24) # Upstream dropped wxGTK support in >=games-emulation/pcsx2-1.7.3773, # and it now always requires Qt6. Masked given Qt6 is also masked in diff --git a/sci-misc/flashdot/Manifest b/sci-misc/flashdot/Manifest deleted file mode 100644 index f7ff8707a5dd..000000000000 --- a/sci-misc/flashdot/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST flashdot-1.1.4.tar.bz2 464763 BLAKE2B bed4b23ad21a8526714820ebf113e53a775dff39c0fcd3cdde847fb0a46ffbde5cd3f62ae2b92584ff1ad5c3b1b0a939130c3a182905b16503b60c1321a90e78 SHA512 2c7f803ca002f8a2d9205a6148c3bf602aa79c04fb67444cdfb23626706777d8463739f119ff124b58f7dc30c75750f95045fab4059540936082cfda7deea8c0 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - FlashDot is a program for generating and presenting visual perceptual experiments that require a high temporal - precision. - </longdescription> -</pkgmetadata>
