* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2016-06-21 21:04 Michał Górny
0 siblings, 0 replies; 18+ messages in thread
From: Michał Górny @ 2016-06-21 21:04 UTC (permalink / raw
To: gentoo-commits
commit: 9675d96cfe244033e97dd7034b95c5af251405e3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 21:01:45 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 21:02:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9675d96c
dev-ml/lablgl: Remove another := slot op from || dep
dev-ml/lablgl/lablgl-1.05.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/lablgl/lablgl-1.05.ebuild b/dev-ml/lablgl/lablgl-1.05.ebuild
index b8a7a5e..fd3d046 100644
--- a/dev-ml/lablgl/lablgl-1.05.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
tk? (
>=dev-lang/tcl-8.3:0=
>=dev-lang/tk-8.3:0=
- || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] )
+ || ( dev-ml/labltk <dev-lang/ocaml-4.02[tk] )
)
"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2016-06-23 11:26 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2016-06-23 11:26 UTC (permalink / raw
To: gentoo-commits
commit: 1d902702b6356287e3182ed199aaffccd42c34f2
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 09:00:28 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 11:23:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d902702
Revert "dev-ml/lablgl: Remove another := slot op from || dep"
This reverts commit 9675d96cfe244033e97dd7034b95c5af251405e3.
This commit is wrong in several aspects:
- Such changes should come with a revbump
- Removing := deps causes packages not to be rebuilt on upgrades, causing
barely understandable build failures when upgrading, later on.
Thanks to this commit, people that have installed those packages will
likely experience those failures with the upcoming ocaml 4.03 unmask.
- This is a non maintainer commit where no discussion at all happened with the
maintainers during the 3 days between bug report and mass commit.
Such discussion could have prevented the above mentioned breakage.
Proper fix is to drop the backward compatibility part of the || () dep. This fix
was slowly moving forward whenever possible and noticed. Main blocker for this is
bug #463018 which requires taking extra care for not breaking the stable tree
nor needlessly preventing future stabilization of packages.
dev-ml/lablgl/lablgl-1.05.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/lablgl/lablgl-1.05.ebuild b/dev-ml/lablgl/lablgl-1.05.ebuild
index 33ec477..bb69c5d 100644
--- a/dev-ml/lablgl/lablgl-1.05.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
tk? (
>=dev-lang/tcl-8.3:0=
>=dev-lang/tk-8.3:0=
- || ( dev-ml/labltk <dev-lang/ocaml-4.02[tk] )
+ || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] )
)
"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2016-06-23 11:45 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2016-06-23 11:45 UTC (permalink / raw
To: gentoo-commits
commit: ee5338c3c615cd1188179f144410026bfb5d9131
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 11:42:51 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 11:42:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee5338c3
dev-ml/lablgl: remove old
Package-Manager: portage-2.3.0_rc1
dev-ml/lablgl/Manifest | 1 -
dev-ml/lablgl/lablgl-1.04-r1.ebuild | 93 -------------------------------------
2 files changed, 94 deletions(-)
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index be08e81..717d526 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -1,2 +1 @@
-DIST lablgl-1.04.tar.gz 410525 SHA256 3fedf5537069481b95836e8495380c742af7b87cfecd105fff1b98e40cac3b3e SHA512 6ae9ed365c390e06bba45214e62ad1479f96cec8087672d543fb18bd20643be0adf52c53e3b19031976eb833880be1f30c3c705d87dea5f7ed4488b57781e084 WHIRLPOOL efb03beeb18277d374c7fbbdf32aa2be4d7f2e23c31322de2b2e37d6b636e44bb4432bdca08c401af326abc4f729c21df2551e63a90193a5bbea95d7018d05d0
DIST lablgl-1.05.tar.gz 296597 SHA256 d8ff03e35b970d2b23a942f9e6ed65da5a6c123986bd0ecf5424a6205af34b61 SHA512 e8bf7d993610912d50ec3a6c18a24d2ff7d0727a41fe102e745050bb83ee02a9995e8b1b8c7dbd94f6b2a8363145f22e9772e36253dced762a63ec3c6c54379d WHIRLPOOL 74e9b15b2085d82c90f73cdf1d5330ced5cdc484d9775fe83c1cfdae6784e113d21ef53bdbb88ea02615bda0cc824f730fc0772dba3b486b2298c8dedcd9476f
diff --git a/dev-ml/lablgl/lablgl-1.04-r1.ebuild b/dev-ml/lablgl/lablgl-1.04-r1.ebuild
deleted file mode 100644
index ffab372..0000000
--- a/dev-ml/lablgl/lablgl-1.04-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit multilib eutils toolchain-funcs
-
-IUSE="doc glut +ocamlopt"
-#tk"
-
-DESCRIPTION="Objective CAML interface for OpenGL"
-HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
-LICENSE="BSD"
-
-# >=dev-lang/ocaml-3.10.2:=[tk?,ocamlopt?]
-RDEPEND="
- >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libX11
- virtual/opengl
- virtual/glu
- glut? ( media-libs/freeglut )
- "
-# tk? ( >=dev-lang/tcl-8.3:0= >=dev-lang/tk-8.3:0= )
-
-DEPEND="${RDEPEND}"
-
-SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd"
-S=${WORKDIR}/lablGL-${PV}
-
-src_configure() {
- # make configuration file
- echo "BINDIR=/usr/bin" > Makefile.config
- echo "GLLIBS = -lGL -lGLU" >> Makefile.config
- if use glut; then
- echo "GLUTLIBS = -lglut" >> Makefile.config
- else
- echo "GLUTLIBS = " >> Makefile.config
- fi
- echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config
- echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config
- echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config
- echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config
-}
-
-src_compile() {
- #if use tk; then
- # emake -j1 togl || die "failed to build togl"
- # if use ocamlopt; then
- # emake -j1 toglopt || die "failed to build native code togl"
- # fi
- #fi
-
- emake -j1 lib || die "failed to build the library"
- if use ocamlopt; then
- emake -j1 libopt || die "failed to build native code library"
- fi
-
- if use glut; then
- emake -j1 glut || die "failed to build glut"
- if use ocamlopt; then
- emake -j1 glutopt || die "failed to build native code glutopt"
- fi
- fi
-}
-
-src_install () {
- # Makefile do not use mkdir so the library is not installed
- # but copied as a 'stublibs' file.
- dodir /usr/$(get_libdir)/ocaml/stublibs
-
- # Same for lablglut's toplevel
- dodir /usr/bin
-
- BINDIR=${ED}/usr/bin
- BASE=${ED}/usr/$(get_libdir)/ocaml
- emake BINDIR="${BINDIR}" INSTALLDIR="${BASE}/lablGL" DLLDIR="${BASE}/stublibs" install || die "make install failed"
-
- dodoc README CHANGES
-
- if use doc ; then
- insinto /usr/share/doc/${PF}
- mv Togl/examples{,.togl}
- doins -r Togl/examples.togl
-
- mv LablGlut/examples{,.glut}
- doins -r LablGlut/examples.glut
- fi
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2016-06-23 11:45 Alexis Ballier
0 siblings, 0 replies; 18+ messages in thread
From: Alexis Ballier @ 2016-06-23 11:45 UTC (permalink / raw
To: gentoo-commits
commit: 22c99e90fb290499be706fa067a88709ea3edd27
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 11:44:49 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 11:44:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c99e90
dev-ml/lablgl: drop backward compat deps on labltk/camlp4, bug #586304
Package-Manager: portage-2.3.0_rc1
dev-ml/lablgl/lablgl-1.05-r1.ebuild | 95 +++++++++++++++++++++++++++++++++++++
1 file changed, 95 insertions(+)
diff --git a/dev-ml/lablgl/lablgl-1.05-r1.ebuild b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
new file mode 100644
index 0000000..362a3ba
--- /dev/null
+++ b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib eutils toolchain-funcs
+
+IUSE="doc glut +ocamlopt tk"
+
+DESCRIPTION="Objective CAML interface for OpenGL"
+HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
+LICENSE="BSD"
+
+RDEPEND="
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libX11
+ virtual/opengl
+ virtual/glu
+ dev-ml/camlp4:=
+ glut? ( media-libs/freeglut )
+ tk? (
+ >=dev-lang/tcl-8.3:0=
+ >=dev-lang/tk-8.3:0=
+ dev-ml/labltk:=
+ )
+ "
+
+DEPEND="${RDEPEND}"
+
+SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+src_configure() {
+ # make configuration file
+ echo "BINDIR=/usr/bin" > Makefile.config
+ echo "GLLIBS = -lGL -lGLU" >> Makefile.config
+ if use glut; then
+ echo "GLUTLIBS = -lglut" >> Makefile.config
+ else
+ echo "GLUTLIBS = " >> Makefile.config
+ fi
+ echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config
+ echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config
+ echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config
+ echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config
+}
+
+src_compile() {
+ if use tk; then
+ emake togl
+ if use ocamlopt; then
+ emake toglopt
+ fi
+ fi
+
+ emake lib
+ if use ocamlopt; then
+ emake libopt
+ fi
+
+ if use glut; then
+ emake glut
+ if use ocamlopt; then
+ emake glutopt
+ fi
+ fi
+}
+
+src_install () {
+ # Makefile do not use mkdir so the library is not installed
+ # but copied as a 'stublibs' file.
+ dodir /usr/$(get_libdir)/ocaml/stublibs
+
+ # Same for lablglut's toplevel
+ dodir /usr/bin
+
+ BINDIR=${ED}/usr/bin
+ BASE=${ED}/usr/$(get_libdir)/ocaml
+ emake BINDIR="${BINDIR}" INSTALLDIR="${BASE}/lablGL" DLLDIR="${BASE}/stublibs" install
+
+ dodoc README CHANGES
+
+ if use doc ; then
+ insinto /usr/share/doc/${PF}
+ mv Togl/examples{,.togl}
+ doins -r Togl/examples.togl
+
+ mv LablGlut/examples{,.glut}
+ doins -r LablGlut/examples.glut
+ fi
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2016-06-25 21:02 Michał Górny
0 siblings, 0 replies; 18+ messages in thread
From: Michał Górny @ 2016-06-25 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 7be4f45576b72217fe7bb854264217f652f9250f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 20:51:02 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 21:02:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be4f455
dev-ml/lablgl: Copy stable keywords over for minor dep change, #586914
dev-ml/lablgl/lablgl-1.05-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/lablgl/lablgl-1.05-r1.ebuild b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
index 362a3ba..4a670bc 100644
--- a/dev-ml/lablgl/lablgl-1.05-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}"
SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
src_configure() {
# make configuration file
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2016-06-29 21:14 Michał Górny
0 siblings, 0 replies; 18+ messages in thread
From: Michał Górny @ 2016-06-29 21:14 UTC (permalink / raw
To: gentoo-commits
commit: dd53a48c812d3859e3e5addfa38c0014d509511f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 20:30:23 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 21:14:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd53a48c
dev-ml/lablgl: Support camlp4/labltk in -r1 only, #586914
Restrict the 1.05 ebuild to support old OCaml only to solve the :=-in-||
problem. 1.05-r1 is stable on all architectures supporting camlp4,
and -r0 is only kept for stable ia64 & sparc users.
dev-ml/lablgl/lablgl-1.05.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-ml/lablgl/lablgl-1.05.ebuild b/dev-ml/lablgl/lablgl-1.05.ebuild
index bb69c5d..20f1f9e 100644
--- a/dev-ml/lablgl/lablgl-1.05.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05.ebuild
@@ -19,12 +19,12 @@ RDEPEND="
x11-libs/libX11
virtual/opengl
virtual/glu
- || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+ <dev-lang/ocaml-4.02.0
glut? ( media-libs/freeglut )
tk? (
>=dev-lang/tcl-8.3:0=
>=dev-lang/tk-8.3:0=
- || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] )
+ <dev-lang/ocaml-4.02[tk]
)
"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2017-01-14 17:14 Mikle Kolyada
0 siblings, 0 replies; 18+ messages in thread
From: Mikle Kolyada @ 2017-01-14 17:14 UTC (permalink / raw
To: gentoo-commits
commit: 6ff13fef6be3dca9322b7313778f66f5da97127c
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 17:13:42 2017 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 17:13:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff13fef
dev-ml/lablgl: ia64 stable
Package-Manager: portage-2.3.0
dev-ml/lablgl/lablgl-1.05-r1.ebuild | 4 +-
dev-ml/lablgl/lablgl-1.05.ebuild | 95 -------------------------------------
2 files changed, 2 insertions(+), 97 deletions(-)
diff --git a/dev-ml/lablgl/lablgl-1.05-r1.ebuild b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
index 4a670bc..d9796cf 100644
--- a/dev-ml/lablgl/lablgl-1.05-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}"
SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
src_configure() {
# make configuration file
diff --git a/dev-ml/lablgl/lablgl-1.05.ebuild b/dev-ml/lablgl/lablgl-1.05.ebuild
deleted file mode 100644
index 20f1f9e..00000000
--- a/dev-ml/lablgl/lablgl-1.05.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit multilib eutils toolchain-funcs
-
-IUSE="doc glut +ocamlopt tk"
-
-DESCRIPTION="Objective CAML interface for OpenGL"
-HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
-LICENSE="BSD"
-
-RDEPEND="
- >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libX11
- virtual/opengl
- virtual/glu
- <dev-lang/ocaml-4.02.0
- glut? ( media-libs/freeglut )
- tk? (
- >=dev-lang/tcl-8.3:0=
- >=dev-lang/tk-8.3:0=
- <dev-lang/ocaml-4.02[tk]
- )
- "
-
-DEPEND="${RDEPEND}"
-
-SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-src_configure() {
- # make configuration file
- echo "BINDIR=/usr/bin" > Makefile.config
- echo "GLLIBS = -lGL -lGLU" >> Makefile.config
- if use glut; then
- echo "GLUTLIBS = -lglut" >> Makefile.config
- else
- echo "GLUTLIBS = " >> Makefile.config
- fi
- echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config
- echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config
- echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config
- echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config
-}
-
-src_compile() {
- if use tk; then
- emake togl
- if use ocamlopt; then
- emake toglopt
- fi
- fi
-
- emake lib
- if use ocamlopt; then
- emake libopt
- fi
-
- if use glut; then
- emake glut
- if use ocamlopt; then
- emake glutopt
- fi
- fi
-}
-
-src_install () {
- # Makefile do not use mkdir so the library is not installed
- # but copied as a 'stublibs' file.
- dodir /usr/$(get_libdir)/ocaml/stublibs
-
- # Same for lablglut's toplevel
- dodir /usr/bin
-
- BINDIR=${ED}/usr/bin
- BASE=${ED}/usr/$(get_libdir)/ocaml
- emake BINDIR="${BINDIR}" INSTALLDIR="${BASE}/lablGL" DLLDIR="${BASE}/stublibs" install
-
- dodoc README CHANGES
-
- if use doc ; then
- insinto /usr/share/doc/${PF}
- mv Togl/examples{,.togl}
- doins -r Togl/examples.togl
-
- mv LablGlut/examples{,.glut}
- doins -r LablGlut/examples.glut
- fi
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2017-04-05 17:50 Markus Meier
0 siblings, 0 replies; 18+ messages in thread
From: Markus Meier @ 2017-04-05 17:50 UTC (permalink / raw
To: gentoo-commits
commit: ce134813ea55bfb8fa7c8d1937c9a562ad65feed
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 5 17:32:39 2017 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Apr 5 17:49:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce134813
dev-ml/lablgl: add ~arm, bug #611014
Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --include-arches="arm"
dev-ml/lablgl/lablgl-1.05-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/lablgl/lablgl-1.05-r1.ebuild b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
index 11e6f13818d..6725c096691 100644
--- a/dev-ml/lablgl/lablgl-1.05-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}"
SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
src_configure() {
# make configuration file
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2020-10-20 3:50 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2020-10-20 3:50 UTC (permalink / raw
To: gentoo-commits
commit: a384ecb6adc5eb44d9d40fa77e0661f921cbdfb3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 03:45:33 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 03:45:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a384ecb6
dev-ml/lablgl: bump to 1.06
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ml/lablgl/Manifest | 1 +
dev-ml/lablgl/lablgl-1.06.ebuild | 92 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 93 insertions(+)
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index 4f9c842e590..1fd832851a1 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -1 +1,2 @@
DIST lablgl-1.05.tar.gz 296597 BLAKE2B 01fff39607f0b4e965737c6fec53cbd3b154bb2df3528fd37626ac87c6cb46a29f97881a242206310b1bd576fb9dfc72ede1eb24cf287ddfc55194b8d55eb83d SHA512 e8bf7d993610912d50ec3a6c18a24d2ff7d0727a41fe102e745050bb83ee02a9995e8b1b8c7dbd94f6b2a8363145f22e9772e36253dced762a63ec3c6c54379d
+DIST lablgl-1.06.tar.gz 567281 BLAKE2B 90e42d3f131b2a416b5a1fb9933fbf1178911aabfd571274e987c8e7da12a3c57673268b5e0300950f3b03ddb363626ad93fe3e647e5e7058ee48c0b130fcbfc SHA512 169ac4ed8eaf3635c107c57cd03a76a64fc16a8d3ba1ad261b7e4dcda985c0a83059421e72233f645aec21a1ec27b980530b4ffb7013fba31d446b16521b3f4c
diff --git a/dev-ml/lablgl/lablgl-1.06.ebuild b/dev-ml/lablgl/lablgl-1.06.ebuild
new file mode 100644
index 00000000000..1b6cd22e065
--- /dev/null
+++ b/dev-ml/lablgl/lablgl-1.06.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Objective CAML interface for OpenGL"
+HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
+SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc glut +ocamlopt tk"
+
+RDEPEND="
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libX11
+ virtual/opengl
+ virtual/glu
+ glut? ( media-libs/freeglut )
+ tk? (
+ >=dev-lang/tcl-8.3:0=
+ >=dev-lang/tk-8.3:0=
+ dev-ml/labltk:=
+ )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ # make configuration file
+ echo "BINDIR=/usr/bin" > Makefile.config || die
+ echo "GLLIBS = -lGL -lGLU" >> Makefile.config || die
+ if use glut; then
+ echo "GLUTLIBS = -lglut" >> Makefile.config || die
+ else
+ echo "GLUTLIBS = " >> Makefile.config || die
+ fi
+ echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config || die
+ echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config || die
+ echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config || die
+ echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config || die
+}
+
+src_compile() {
+ if use tk; then
+ emake togl
+ if use ocamlopt; then
+ emake toglopt
+ fi
+ fi
+
+ emake lib
+ if use ocamlopt; then
+ emake libopt
+ fi
+
+ if use glut; then
+ emake glut
+ if use ocamlopt; then
+ emake glutopt
+ fi
+ fi
+}
+
+src_install() {
+ # Makefile do not use mkdir so the library is not installed
+ # but copied as a 'stublibs' file.
+ dodir /usr/$(get_libdir)/ocaml/stublibs
+
+ # Same for lablglut's toplevel
+ if use tk ; then
+ dodir /usr/bin
+ fi
+
+ BINDIR="${ED}/usr/bin"
+ BASE="${ED}/usr/$(get_libdir)/ocaml"
+ emake BINDIR="${BINDIR}" INSTALLDIR="${BASE}/lablGL" DLLDIR="${BASE}/stublibs" install
+
+ dodoc README CHANGES
+
+ if use doc ; then
+ mv Togl/examples{,.togl} || die
+ dodoc -r Togl/examples.togl
+
+ mv LablGlut/examples{,.glut} || die
+ dodoc -r LablGlut/examples.glut
+ fi
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2020-10-20 3:50 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2020-10-20 3:50 UTC (permalink / raw
To: gentoo-commits
commit: f7d6ecb979c70e0a333fb581ca73fff615f91b86
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 03:46:57 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 03:46:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d6ecb9
dev-ml/lablgl: fix DeprecatedInsinto in older version
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ml/lablgl/lablgl-1.05-r1.ebuild | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/dev-ml/lablgl/lablgl-1.05-r1.ebuild b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
index 702b90543fa..d99d7d1f793 100644
--- a/dev-ml/lablgl/lablgl-1.05-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
@@ -5,12 +5,15 @@ EAPI="5"
inherit multilib eutils toolchain-funcs
-IUSE="doc glut +ocamlopt tk"
-
DESCRIPTION="Objective CAML interface for OpenGL"
HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
LICENSE="BSD"
+SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc glut +ocamlopt tk"
+
RDEPEND="
>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
x11-libs/libXext
@@ -26,26 +29,21 @@ RDEPEND="
dev-ml/labltk:=
)
"
-
DEPEND="${RDEPEND}"
-SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
src_configure() {
# make configuration file
- echo "BINDIR=/usr/bin" > Makefile.config
- echo "GLLIBS = -lGL -lGLU" >> Makefile.config
+ echo "BINDIR=/usr/bin" > Makefile.config || die
+ echo "GLLIBS = -lGL -lGLU" >> Makefile.config || die
if use glut; then
- echo "GLUTLIBS = -lglut" >> Makefile.config
+ echo "GLUTLIBS = -lglut" >> Makefile.config || die
else
- echo "GLUTLIBS = " >> Makefile.config
+ echo "GLUTLIBS = " >> Makefile.config || die
fi
- echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config
- echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config
- echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config
- echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config
+ echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config || die
+ echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config || die
+ echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config || die
+ echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config || die
}
src_compile() {
@@ -77,18 +75,17 @@ src_install() {
# Same for lablglut's toplevel
dodir /usr/bin
- BINDIR=${ED}/usr/bin
- BASE=${ED}/usr/$(get_libdir)/ocaml
+ BINDIR="${ED}/usr/bin"
+ BASE="${ED}/usr/$(get_libdir)/ocaml"
emake BINDIR="${BINDIR}" INSTALLDIR="${BASE}/lablGL" DLLDIR="${BASE}/stublibs" install
dodoc README CHANGES
if use doc ; then
- insinto /usr/share/doc/${PF}
mv Togl/examples{,.togl}
- doins -r Togl/examples.togl
+ dodoc -r Togl/examples.togl
mv LablGlut/examples{,.glut}
- doins -r LablGlut/examples.glut
+ dodoc -r LablGlut/examples.glut
fi
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2020-10-26 6:00 Tim Harder
0 siblings, 0 replies; 18+ messages in thread
From: Tim Harder @ 2020-10-26 6:00 UTC (permalink / raw
To: gentoo-commits
commit: 1b61b0c8e294654c7b1dc5a1ad405d6feeab9483
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 05:56:08 2020 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 05:57:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b61b0c8
dev-ml/lablgl: remove old
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
dev-ml/lablgl/lablgl-1.06.ebuild | 92 ----------------------------------------
1 file changed, 92 deletions(-)
diff --git a/dev-ml/lablgl/lablgl-1.06.ebuild b/dev-ml/lablgl/lablgl-1.06.ebuild
deleted file mode 100644
index 1b6cd22e065..00000000000
--- a/dev-ml/lablgl/lablgl-1.06.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Objective CAML interface for OpenGL"
-HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
-SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc glut +ocamlopt tk"
-
-RDEPEND="
- >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libX11
- virtual/opengl
- virtual/glu
- glut? ( media-libs/freeglut )
- tk? (
- >=dev-lang/tcl-8.3:0=
- >=dev-lang/tk-8.3:0=
- dev-ml/labltk:=
- )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- # make configuration file
- echo "BINDIR=/usr/bin" > Makefile.config || die
- echo "GLLIBS = -lGL -lGLU" >> Makefile.config || die
- if use glut; then
- echo "GLUTLIBS = -lglut" >> Makefile.config || die
- else
- echo "GLUTLIBS = " >> Makefile.config || die
- fi
- echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config || die
- echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config || die
- echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config || die
- echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config || die
-}
-
-src_compile() {
- if use tk; then
- emake togl
- if use ocamlopt; then
- emake toglopt
- fi
- fi
-
- emake lib
- if use ocamlopt; then
- emake libopt
- fi
-
- if use glut; then
- emake glut
- if use ocamlopt; then
- emake glutopt
- fi
- fi
-}
-
-src_install() {
- # Makefile do not use mkdir so the library is not installed
- # but copied as a 'stublibs' file.
- dodir /usr/$(get_libdir)/ocaml/stublibs
-
- # Same for lablglut's toplevel
- if use tk ; then
- dodir /usr/bin
- fi
-
- BINDIR="${ED}/usr/bin"
- BASE="${ED}/usr/$(get_libdir)/ocaml"
- emake BINDIR="${BINDIR}" INSTALLDIR="${BASE}/lablGL" DLLDIR="${BASE}/stublibs" install
-
- dodoc README CHANGES
-
- if use doc ; then
- mv Togl/examples{,.togl} || die
- dodoc -r Togl/examples.togl
-
- mv LablGlut/examples{,.glut} || die
- dodoc -r LablGlut/examples.glut
- fi
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2021-04-21 18:55 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-04-21 18:55 UTC (permalink / raw
To: gentoo-commits
commit: 04069153a592e59906ca630138406f1d041c8cd8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 18:54:45 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 18:54:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04069153
dev-ml/lablgl: Stabilize 1.06-r1 ppc, #784605
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ml/lablgl/lablgl-1.06-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-ml/lablgl/lablgl-1.06-r1.ebuild b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
index 427234ccf7b..d1c69a19b46 100644
--- a/dev-ml/lablgl/lablgl-1.06-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc glut +ocamlopt tk"
RDEPEND="
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2021-04-21 18:55 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-04-21 18:55 UTC (permalink / raw
To: gentoo-commits
commit: 688b53826341a0d5ae57ede626103dc8fac0a786
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 18:55:01 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 18:55:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688b5382
dev-ml/lablgl: Stabilize 1.06-r1 ppc64, #784605
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ml/lablgl/lablgl-1.06-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/lablgl/lablgl-1.06-r1.ebuild b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
index d1c69a19b46..4e158449871 100644
--- a/dev-ml/lablgl/lablgl-1.06-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc glut +ocamlopt tk"
RDEPEND="
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2021-04-22 2:59 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-04-22 2:59 UTC (permalink / raw
To: gentoo-commits
commit: 4ca0e0fb4329879cde08bf9d999b8fe8ad129936
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 02:59:16 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 02:59:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca0e0fb
dev-ml/lablgl: Stabilize 1.06-r1 x86, #784605
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ml/lablgl/lablgl-1.06-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/lablgl/lablgl-1.06-r1.ebuild b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
index 4e158449871..d1e7611100e 100644
--- a/dev-ml/lablgl/lablgl-1.06-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc glut +ocamlopt tk"
RDEPEND="
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2021-04-22 20:15 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-04-22 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 6d0ae0f590ecd3f723270030851497b099d34369
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 20:12:48 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 20:12:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0ae0f5
dev-ml/lablgl: Stabilize 1.06-r1 amd64, #784605
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ml/lablgl/lablgl-1.06-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/lablgl/lablgl-1.06-r1.ebuild b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
index d1e7611100e..bf898cbd35d 100644
--- a/dev-ml/lablgl/lablgl-1.06-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc glut +ocamlopt tk"
RDEPEND="
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2021-05-01 21:33 Andreas Sturmlechner
0 siblings, 0 replies; 18+ messages in thread
From: Andreas Sturmlechner @ 2021-05-01 21:33 UTC (permalink / raw
To: gentoo-commits
commit: 39c088d71f32349306a1ead6a7ea6c0dec165881
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 1 21:32:48 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 1 21:32:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39c088d7
dev-ml/lablgl: Drop 1.05-r1, EAPI5--
Closes: https://bugs.gentoo.org/784605
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-ml/lablgl/Manifest | 1 -
dev-ml/lablgl/lablgl-1.05-r1.ebuild | 91 -------------------------------------
2 files changed, 92 deletions(-)
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index 1fd832851a1..ec64e13dd5d 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -1,2 +1 @@
-DIST lablgl-1.05.tar.gz 296597 BLAKE2B 01fff39607f0b4e965737c6fec53cbd3b154bb2df3528fd37626ac87c6cb46a29f97881a242206310b1bd576fb9dfc72ede1eb24cf287ddfc55194b8d55eb83d SHA512 e8bf7d993610912d50ec3a6c18a24d2ff7d0727a41fe102e745050bb83ee02a9995e8b1b8c7dbd94f6b2a8363145f22e9772e36253dced762a63ec3c6c54379d
DIST lablgl-1.06.tar.gz 567281 BLAKE2B 90e42d3f131b2a416b5a1fb9933fbf1178911aabfd571274e987c8e7da12a3c57673268b5e0300950f3b03ddb363626ad93fe3e647e5e7058ee48c0b130fcbfc SHA512 169ac4ed8eaf3635c107c57cd03a76a64fc16a8d3ba1ad261b7e4dcda985c0a83059421e72233f645aec21a1ec27b980530b4ffb7013fba31d446b16521b3f4c
diff --git a/dev-ml/lablgl/lablgl-1.05-r1.ebuild b/dev-ml/lablgl/lablgl-1.05-r1.ebuild
deleted file mode 100644
index e247ba03cdc..00000000000
--- a/dev-ml/lablgl/lablgl-1.05-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Objective CAML interface for OpenGL"
-HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
-LICENSE="BSD"
-
-SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc glut +ocamlopt tk"
-
-RDEPEND="
- >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libX11
- virtual/opengl
- virtual/glu
- dev-ml/camlp4:=
- glut? ( media-libs/freeglut )
- tk? (
- >=dev-lang/tcl-8.3:0=
- >=dev-lang/tk-8.3:0=
- dev-ml/labltk:=
- )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- # make configuration file
- echo "BINDIR=/usr/bin" > Makefile.config || die
- echo "GLLIBS = -lGL -lGLU" >> Makefile.config || die
- if use glut; then
- echo "GLUTLIBS = -lglut" >> Makefile.config || die
- else
- echo "GLUTLIBS = " >> Makefile.config || die
- fi
- echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config || die
- echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config || die
- echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config || die
- echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config || die
-}
-
-src_compile() {
- if use tk; then
- emake togl
- if use ocamlopt; then
- emake toglopt
- fi
- fi
-
- emake lib
- if use ocamlopt; then
- emake libopt
- fi
-
- if use glut; then
- emake glut
- if use ocamlopt; then
- emake glutopt
- fi
- fi
-}
-
-src_install() {
- # Makefile do not use mkdir so the library is not installed
- # but copied as a 'stublibs' file.
- dodir /usr/$(get_libdir)/ocaml/stublibs
-
- # Same for lablglut's toplevel
- dodir /usr/bin
-
- BINDIR="${ED}/usr/bin"
- BASE="${ED}/usr/$(get_libdir)/ocaml"
- emake BINDIR="${BINDIR}" INSTALLDIR="${BASE}/lablGL" DLLDIR="${BASE}/stublibs" install
-
- dodoc README CHANGES
-
- if use doc ; then
- mv Togl/examples{,.togl} || die
- dodoc -r Togl/examples.togl
-
- mv LablGlut/examples{,.glut} || die
- dodoc -r LablGlut/examples.glut
- fi
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2022-03-10 2:32 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2022-03-10 2:32 UTC (permalink / raw
To: gentoo-commits
commit: 7753b9b64661794edc79a3b6de4afb8ba6407abe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 02:32:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 02:32:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7753b9b6
dev-ml/lablgl: force serial build
This isn't a super-active upstream package and it's got a tonne
of make targets, so let's just force serial build for now, even
if not ideal :(
Closes: https://bugs.gentoo.org/834870
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-ml/lablgl/lablgl-1.06-r1.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dev-ml/lablgl/lablgl-1.06-r1.ebuild b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
index df8a4dfc434a..0e2f61f22bb7 100644
--- a/dev-ml/lablgl/lablgl-1.06-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
@@ -48,6 +48,9 @@ src_configure() {
}
src_compile() {
+ # Workaround for bug #834870
+ MAKEOPTS+=" -j1"
+
if use tk; then
emake togl
if use ocamlopt; then
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/
@ 2023-02-15 18:38 Matt Turner
0 siblings, 0 replies; 18+ messages in thread
From: Matt Turner @ 2023-02-15 18:38 UTC (permalink / raw
To: gentoo-commits
commit: ceb54aefe851e13e5b3208e029a152a511dda95a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 18:30:03 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 18:36:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceb54aef
dev-ml/lablgl: Drop alpha keywords
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-ml/lablgl/lablgl-1.06-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/lablgl/lablgl-1.06-r1.ebuild b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
index 0e2f61f22bb7..ad423b758d54 100644
--- a/dev-ml/lablgl/lablgl-1.06-r1.ebuild
+++ b/dev-ml/lablgl/lablgl-1.06-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/garrigue/lablgl/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc glut +ocamlopt tk"
RDEPEND="
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2023-02-15 18:38 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-29 21:14 [gentoo-commits] repo/gentoo:master commit in: dev-ml/lablgl/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-02-15 18:38 Matt Turner
2022-03-10 2:32 Sam James
2021-05-01 21:33 Andreas Sturmlechner
2021-04-22 20:15 Sam James
2021-04-22 2:59 Sam James
2021-04-21 18:55 Sam James
2021-04-21 18:55 Sam James
2020-10-26 6:00 Tim Harder
2020-10-20 3:50 Sam James
2020-10-20 3:50 Sam James
2017-04-05 17:50 Markus Meier
2017-01-14 17:14 Mikle Kolyada
2016-06-25 21:02 Michał Górny
2016-06-23 11:45 Alexis Ballier
2016-06-23 11:45 Alexis Ballier
2016-06-23 11:26 Alexis Ballier
2016-06-21 21:04 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox