public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/flashdot/
@ 2015-11-23 10:46 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2015-11-23 10:46 UTC (permalink / raw
  To: gentoo-commits

commit:     5c5d388cd7a9888abe57ea54570fb11ee71acc50
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 10:35:19 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 10:46:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5d388c

sci-misc/flashdot: Move use() call to local scope

bump EAPI to 5

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=566554

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-misc/flashdot/flashdot-1.1.4.ebuild | 25 ++++++++++++-------------
 sci-misc/flashdot/metadata.xml          | 12 ++++++------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/sci-misc/flashdot/flashdot-1.1.4.ebuild b/sci-misc/flashdot/flashdot-1.1.4.ebuild
index 13938ad..fe83fa9 100644
--- a/sci-misc/flashdot/flashdot-1.1.4.ebuild
+++ b/sci-misc/flashdot/flashdot-1.1.4.ebuild
@@ -1,34 +1,33 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
+EAPI=5
 
 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"
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
+	 https://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
 
+SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]
+DEPEND="
+	>=dev-lang/ocaml-3.10[ocamlopt?]
 	dev-ml/ocamlsdl
 	dev-ml/ocamlgsl
 	dev-ml/lablgl[glut]
 	x11-apps/xdpyinfo"
 RDEPEND="${DEPEND}"
 
-MAKEOPTS="-j1 VERSION=${PV}"
-use ocamlopt || MAKEOPTS="${MAKEOPTS} TARGETS=flashdot_bytecode BYTECODENAME=flashdot"
-
-src_compile() {
-	emake ${MAKEOPTS} || die "emake failed"
+src_prepare() {
+	MAKEOPTS+=" -j1 VERSION=${PV}"
+	use ocamlopt || MAKEOPTS+=" TARGETS=flashdot_bytecode BYTECODENAME=flashdot"
 }
 
 src_install() {
-	emake ${MAKEOPTS} DESTDIR="${D}" CALLMODE=script install || die "install failed"
+	emake DESTDIR="${D}" CALLMODE=script install
 }

diff --git a/sci-misc/flashdot/metadata.xml b/sci-misc/flashdot/metadata.xml
index 8f23be7..dfc0a9a 100644
--- a/sci-misc/flashdot/metadata.xml
+++ b/sci-misc/flashdot/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>tomka@gentoo.org</email>
-<name>Thomas Kahle</name>
-</maintainer>
-<herd>sci</herd>
-<longdescription lang="en">
+	<maintainer>
+		<email>tomka@gentoo.org</email>
+		<name>Thomas Kahle</name>
+	</maintainer>
+	<herd>sci</herd>
+	<longdescription lang="en">
 FlashDot is a program for generating and presenting visual perceptual experiments that require a high temporal
 precision.
 </longdescription>


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/flashdot/
@ 2017-01-18 21:40 David Seifert
  0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-01-18 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     3edc0f18c07c53d3c970bea31e134536bf0cf9af
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 21:04:42 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 21:40:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3edc0f18

sci-misc/flashdot: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3533

 sci-misc/flashdot/flashdot-1.1.4.ebuild | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/sci-misc/flashdot/flashdot-1.1.4.ebuild b/sci-misc/flashdot/flashdot-1.1.4.ebuild
deleted file mode 100644
index fe83fa9..00000000
--- a/sci-misc/flashdot/flashdot-1.1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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/ocamlsdl
-	dev-ml/ocamlgsl
-	dev-ml/lablgl[glut]
-	x11-apps/xdpyinfo"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	MAKEOPTS+=" -j1 VERSION=${PV}"
-	use ocamlopt || MAKEOPTS+=" TARGETS=flashdot_bytecode BYTECODENAME=flashdot"
-}
-
-src_install() {
-	emake DESTDIR="${D}" CALLMODE=script install
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/flashdot/
@ 2022-03-22 17:46 Alfredo Tupone
  0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2022-03-22 17:46 UTC (permalink / raw
  To: gentoo-commits

commit:     47500a741ead5a2cb6511d057c5078b5210f7653
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 17:46:20 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 17:46:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47500a74

sci-misc/flashdot: fix deps

Closes: https://bugs.gentoo.org/835802
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 sci-misc/flashdot/flashdot-1.1.4-r1.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
index 3266f2b6d7d3..e4d55db5efae 100644
--- a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
+++ b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
@@ -14,10 +14,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+ocamlopt"
 
 DEPEND="
-	>=dev-lang/ocaml-3.10[ocamlopt?]
-	dev-ml/gsl-ocaml
-	dev-ml/lablgl[glut]
-	dev-ml/ocamlsdl
+	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+	dev-ml/gsl-ocaml:=
+	dev-ml/lablgl:=[glut]
+	dev-ml/ocamlsdl:=[opengl]
 	x11-apps/xdpyinfo"
 RDEPEND="${DEPEND}"
 PATCHES=(


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/flashdot/
@ 2022-03-22 17:52 Alfredo Tupone
  0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2022-03-22 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     694c648d217ec1d50a844e873e9ad8eb7f100ba9
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 17:52:33 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 17:52:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694c648d

sci-misc/flashdot: don't call svn

Closes: https://bugs.gentoo.org/835801
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 sci-misc/flashdot/flashdot-1.1.4-r1.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
index e4d55db5efae..0dc3ef755c93 100644
--- a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
+++ b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
@@ -28,8 +28,12 @@ PATCHES=(
 
 src_prepare() {
 	default
-	MAKEOPTS+=" -j1 VERSION=${PV}"
+	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' \


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-misc/flashdot/
@ 2022-03-23 11:35 Alfredo Tupone
  0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2022-03-23 11:35 UTC (permalink / raw
  To: gentoo-commits

commit:     68d017a0c044b388a3ad5ed2a0450c3169a95bba
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 11:35:14 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 11:35:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d017a0

sci-misc/flashdot: fix doc path

Closes: https://bugs.gentoo.org/835837
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 sci-misc/flashdot/flashdot-1.1.4-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
index 0dc3ef755c93..1843fa0f3f89 100644
--- a/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
+++ b/sci-misc/flashdot/flashdot-1.1.4-r1.ebuild
@@ -59,4 +59,6 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" CALLMODE=script install
+	rm "${D}"/usr/share/doc/${PN}/copyright* || die
+	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-23 11:35 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-18 21:40 [gentoo-commits] repo/gentoo:master commit in: sci-misc/flashdot/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2022-03-23 11:35 Alfredo Tupone
2022-03-22 17:52 Alfredo Tupone
2022-03-22 17:46 Alfredo Tupone
2015-11-23 10:46 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox