* [gentoo-commits] repo/gentoo:master commit in: sci-calculators/orpie/files/, sci-calculators/orpie/
@ 2016-02-07 22:43 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2016-02-07 22:43 UTC (permalink / raw
To: gentoo-commits
commit: 79af85fc5f101a70f1aafcf5565904ff42de3d8a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 7 22:43:01 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 7 22:43:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79af85fc
sci-calculators/orpie: Version bump to 1.5.2
Gentoo-Bug: 532776
* EAPI=6
* Add missing dependency on dev-ml/camlp4 (thanks Quentin Minster)
* Amend patches for -p1
Package-Manager: portage-2.2.27
sci-calculators/orpie/Manifest | 1 +
.../orpie/files/orpie-1.5.1-nogsl.patch | 4 +-
...e-1.5.1-nogsl.patch => orpie-1.5.2-nogsl.patch} | 37 ++++++++++++----
sci-calculators/orpie/orpie-1.5.2.ebuild | 49 ++++++++++++++++++++++
4 files changed, 81 insertions(+), 10 deletions(-)
diff --git a/sci-calculators/orpie/Manifest b/sci-calculators/orpie/Manifest
index 06f3378..3945241 100644
--- a/sci-calculators/orpie/Manifest
+++ b/sci-calculators/orpie/Manifest
@@ -1 +1,2 @@
DIST orpie-1.5.1.tar.gz 370851 SHA256 f68ee37a5351c1dd32a68edae253a22a913fc2124bace1f6cf19cc2d422100cd SHA512 026afcaf37016f07397ba19629a92c5bdffbbec6d25b5f96e9367274afbf7468a7d6626b4ae81d1c9b426dde3a2c66a97e9b48c54dfb3a8079f0d59906f0efb7 WHIRLPOOL 30ba5f026ffc1f704a08d6090eabe6d47f8dfe96ec49ba6a6a772dd85337a54fe7de2b382015e832fc0058e7449a1829fedc6fc87683a074d0cac82dad48150e
+DIST orpie-1.5.2.tar.gz 379583 SHA256 de557fc7f608c6cb1f44a965d3ae07fc6baf2b02a0d7994b89d6a0e0d87d3d6d SHA512 5deed6d8e8e68ce5286f4d5183315b585adef38f205805ff6ccbbbf3983c97a468e370d0d44ebe2dff596de0ad9dba20401dbc0e4e9bc176bc93b118fd1cc11a WHIRLPOOL 390c681dbc72d9730cbf22551ffa951f77e7a3589bf10c244fd1c0a3bc2ad81107ff8f5ede196b6486f50ed8f106554a8db03b04979cd5a88da31de4c1aeb836
diff --git a/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch b/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch
index 45894f2..8719bfd 100644
--- a/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch
+++ b/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2010-06-03 21:02:14.000000000 +0100
-+++ Makefile.in 2010-06-03 21:02:49.000000000 +0100
+--- orpie-1.5.1/Makefile.in.orig 2010-06-03 21:02:14.000000000 +0100
++++ orpie-1.5.1/Makefile.in 2010-06-03 21:02:49.000000000 +0100
@@ -38,7 +38,7 @@
CURSES_LIB = @CURSES_LIB@
GSL_LIB = @GSL_LIB@
diff --git a/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch b/sci-calculators/orpie/files/orpie-1.5.2-nogsl.patch
similarity index 54%
copy from sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch
copy to sci-calculators/orpie/files/orpie-1.5.2-nogsl.patch
index 45894f2..75a56a7 100644
--- a/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch
+++ b/sci-calculators/orpie/files/orpie-1.5.2-nogsl.patch
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2010-06-03 21:02:14.000000000 +0100
-+++ Makefile.in 2010-06-03 21:02:49.000000000 +0100
-@@ -38,7 +38,7 @@
+--- orpie-1.5.2/Makefile.in
++++ orpie-1.5.2/Makefile.in
+@@ -44,7 +44,7 @@
CURSES_LIB = @CURSES_LIB@
GSL_LIB = @GSL_LIB@
@@ -8,8 +8,8 @@
+INCLUDES = -I ./curses -I /usr/lib/ocaml/gsl -I ./units
BFLAGS = -pp camlp4o -g $(INCLUDES) -thread
OFLAGS = -pp camlp4o $(INCLUDES) -thread
- BLFLAGS = -custom -cclib '@LDFLAGS@ $(CURSES_LIB) $(GSL_LIB) -lm'
-@@ -72,16 +72,8 @@
+ BLFLAGS = -custom -cclib '$(LDFLAGS) $(CURSES_LIB) $(GSL_LIB) -lm'
+@@ -78,17 +78,8 @@
CURSES_BOBJS = $(CURSES_CMO) $(CURSES_COBJS)
CURSES_OOBJS = $(CURSES_CMX) $(CURSES_COBJS)
@@ -18,9 +18,10 @@
- gsl/gsl_vector_complex_flat.cmo gsl/gsl_matrix_complex_flat.cmo gsl/gsl_vectmat.cmo \
- gsl/gsl_permut.cmo gsl/gsl_linalg.cmo gsl/gsl_fun.cmo
-GSL_CMX = $(GSL_CMO:.cmo=.cmx)
--GSL_COBJS = gsl/mlgsl_error.o gsl/mlgsl_blas.o gsl/mlgsl_blas_complex.o gsl/mlgsl_complex.o \
-- gsl/mlgsl_matrix_complex.o gsl/mlgsl_matrix_double.o gsl/mlgsl_vector_double.o gsl/mlgsl_permut.o \
-- gsl/mlgsl_linalg.o gsl/mlgsl_linalg_complex.o gsl/mlgsl_fun.o gsl/mlgsl_math.o gsl/mlgsl_sf.o
+-GSL_COBJS = gsl/mlgsl_error.o gsl/mlgsl_blas.o gsl/mlgsl_blas_complex.o gsl/mlgsl_complex.o gsl/mlgsl_blas_float.o \
+- gsl/mlgsl_blas_complex_float.o gsl/mlgsl_matrix_complex.o gsl/mlgsl_matrix_double.o gsl/mlgsl_matrix_float.o \
+- gsl/mlgsl_matrix_complex_float.o gsl/mlgsl_vector_double.o gsl/mlgsl_vector_float.o \
+- gsl/mlgsl_permut.o gsl/mlgsl_linalg.o gsl/mlgsl_linalg_complex.o gsl/mlgsl_fun.o gsl/mlgsl_math.o gsl/mlgsl_sf.o
-GSL_BOBJS = $(GSL_COBJS) $(GSL_CMO)
-GSL_OOBJS = $(GSL_COBJS) $(GSL_CMX)
+GSL_BOBJS = /usr/lib/ocaml/gsl/gsl.cma
@@ -28,3 +29,23 @@
UNITS_CMO = units/units.cmo
UNITS_CMX = $(UNITS_CMO:.cmo=.cmx)
+@@ -324,7 +305,7 @@
+ config.status: configure
+ ./config.status --recheck
+
+-configure: configure.in
++configure: configure.ac
+ autoconf
+
+ # clean
+--- orpie-1.5.2/curses_keys.ml
++++ orpie-1.5.2/curses_keys.ml
+@@ -19,7 +19,7 @@
+ *)
+
+ open Curses;;
+-
++open Curses_assist;;
+
+ begin
+ let std = initscr () in
diff --git a/sci-calculators/orpie/orpie-1.5.2.ebuild b/sci-calculators/orpie/orpie-1.5.2.ebuild
new file mode 100644
index 0000000..ed7cc74
--- /dev/null
+++ b/sci-calculators/orpie/orpie-1.5.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A fullscreen RPN calculator for the console"
+HOMEPAGE="http://pessimization.com/software/orpie/"
+SRC_URI="http://pessimization.com/software/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="dev-ml/ocamlgsl
+ sys-libs/ncurses:0=
+ || ( <dev-lang/ocaml-4.02 dev-ml/camlp4 )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.5.1-ocaml311.patch"
+ "${FILESDIR}/${P}-nogsl.patch"
+ "${FILESDIR}/${PN}-1.5.1-orpierc.patch"
+ "${FILESDIR}/${PN}-1.5.1-tinfo.patch"
+)
+
+src_prepare() {
+ default
+ sed -i -e "s:/usr:${EPREFIX}/usr:g" Makefile.in || die
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_compile() {
+ # TODO: fix missing edges in dependency graph
+ emake -j1
+}
+
+src_install() {
+ default
+ if use doc; then
+ dodoc doc/manual.pdf
+ docinto html/
+ dodoc doc/manual.html
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-calculators/orpie/files/, sci-calculators/orpie/
@ 2017-01-18 21:40 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2017-01-18 21:40 UTC (permalink / raw
To: gentoo-commits
commit: c891896441d7b6eb6baf247c92fe33ee13025d60
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 21:00:15 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 21:40:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8918964
sci-calculators/orpie: Remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3533
sci-calculators/orpie/Manifest | 1 -
.../orpie/files/orpie-1.5.1-nogsl.patch | 30 -------------
sci-calculators/orpie/orpie-1.5.1-r1.ebuild | 33 ---------------
sci-calculators/orpie/orpie-1.5.1.ebuild | 25 -----------
sci-calculators/orpie/orpie-1.5.2.ebuild | 49 ----------------------
5 files changed, 138 deletions(-)
diff --git a/sci-calculators/orpie/Manifest b/sci-calculators/orpie/Manifest
index 3945241..09d334d 100644
--- a/sci-calculators/orpie/Manifest
+++ b/sci-calculators/orpie/Manifest
@@ -1,2 +1 @@
-DIST orpie-1.5.1.tar.gz 370851 SHA256 f68ee37a5351c1dd32a68edae253a22a913fc2124bace1f6cf19cc2d422100cd SHA512 026afcaf37016f07397ba19629a92c5bdffbbec6d25b5f96e9367274afbf7468a7d6626b4ae81d1c9b426dde3a2c66a97e9b48c54dfb3a8079f0d59906f0efb7 WHIRLPOOL 30ba5f026ffc1f704a08d6090eabe6d47f8dfe96ec49ba6a6a772dd85337a54fe7de2b382015e832fc0058e7449a1829fedc6fc87683a074d0cac82dad48150e
DIST orpie-1.5.2.tar.gz 379583 SHA256 de557fc7f608c6cb1f44a965d3ae07fc6baf2b02a0d7994b89d6a0e0d87d3d6d SHA512 5deed6d8e8e68ce5286f4d5183315b585adef38f205805ff6ccbbbf3983c97a468e370d0d44ebe2dff596de0ad9dba20401dbc0e4e9bc176bc93b118fd1cc11a WHIRLPOOL 390c681dbc72d9730cbf22551ffa951f77e7a3589bf10c244fd1c0a3bc2ad81107ff8f5ede196b6486f50ed8f106554a8db03b04979cd5a88da31de4c1aeb836
diff --git a/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch b/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch
deleted file mode 100644
index 8719bfd..00000000
--- a/sci-calculators/orpie/files/orpie-1.5.1-nogsl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- orpie-1.5.1/Makefile.in.orig 2010-06-03 21:02:14.000000000 +0100
-+++ orpie-1.5.1/Makefile.in 2010-06-03 21:02:49.000000000 +0100
-@@ -38,7 +38,7 @@
- CURSES_LIB = @CURSES_LIB@
- GSL_LIB = @GSL_LIB@
-
--INCLUDES = -I ./curses -I ./gsl -I ./units
-+INCLUDES = -I ./curses -I /usr/lib/ocaml/gsl -I ./units
- BFLAGS = -pp camlp4o -g $(INCLUDES) -thread
- OFLAGS = -pp camlp4o $(INCLUDES) -thread
- BLFLAGS = -custom -cclib '@LDFLAGS@ $(CURSES_LIB) $(GSL_LIB) -lm'
-@@ -72,16 +72,8 @@
- CURSES_BOBJS = $(CURSES_CMO) $(CURSES_COBJS)
- CURSES_OOBJS = $(CURSES_CMX) $(CURSES_COBJS)
-
--GSL_CMO = gsl/gsl_error.cmo gsl/gsl_blas.cmo gsl/gsl_complex.cmo gsl/gsl_matrix.cmo gsl/gsl_matrix_complex.cmo \
-- gsl/gsl_vector.cmo gsl/gsl_vector_complex.cmo gsl/gsl_vector_flat.cmo gsl/gsl_matrix_flat.cmo \
-- gsl/gsl_vector_complex_flat.cmo gsl/gsl_matrix_complex_flat.cmo gsl/gsl_vectmat.cmo \
-- gsl/gsl_permut.cmo gsl/gsl_linalg.cmo gsl/gsl_fun.cmo
--GSL_CMX = $(GSL_CMO:.cmo=.cmx)
--GSL_COBJS = gsl/mlgsl_error.o gsl/mlgsl_blas.o gsl/mlgsl_blas_complex.o gsl/mlgsl_complex.o \
-- gsl/mlgsl_matrix_complex.o gsl/mlgsl_matrix_double.o gsl/mlgsl_vector_double.o gsl/mlgsl_permut.o \
-- gsl/mlgsl_linalg.o gsl/mlgsl_linalg_complex.o gsl/mlgsl_fun.o gsl/mlgsl_math.o gsl/mlgsl_sf.o
--GSL_BOBJS = $(GSL_COBJS) $(GSL_CMO)
--GSL_OOBJS = $(GSL_COBJS) $(GSL_CMX)
-+GSL_BOBJS = /usr/lib/ocaml/gsl/gsl.cma
-+GSL_OOBJS = /usr/lib/ocaml/gsl/gsl.cmxa
-
- UNITS_CMO = units/units.cmo
- UNITS_CMX = $(UNITS_CMO:.cmo=.cmx)
diff --git a/sci-calculators/orpie/orpie-1.5.1-r1.ebuild b/sci-calculators/orpie/orpie-1.5.1-r1.ebuild
deleted file mode 100644
index c1bce7c..00000000
--- a/sci-calculators/orpie/orpie-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils autotools
-
-DESCRIPTION="A fullscreen RPN calculator for the console"
-HOMEPAGE="http://pessimization.com/software/orpie/"
-SRC_URI="http://pessimization.com/software/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-ml/ocamlgsl
- sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-ocaml311.patch
- epatch "${FILESDIR}"/${P}-nogsl.patch
- epatch "${FILESDIR}"/${P}-orpierc.patch
- epatch "${FILESDIR}"/${P}-tinfo.patch
- sed -i -e "s:/usr:${EPREFIX}/usr:g" Makefile.in || die
- eautoreconf
-}
-
-src_install() {
- default
- use doc && dodoc doc/manual.pdf && dohtml doc/manual.html
-}
diff --git a/sci-calculators/orpie/orpie-1.5.1.ebuild b/sci-calculators/orpie/orpie-1.5.1.ebuild
deleted file mode 100644
index ad57b01..00000000
--- a/sci-calculators/orpie/orpie-1.5.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="A fullscreen RPN calculator for the console"
-HOMEPAGE="http://pessimization.com/software/orpie/"
-SRC_URI="http://pessimization.com/software/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc -sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/ocaml
- sys-libs/ncurses
- sci-libs/gsl"
-
-RDEPEND="${DEPEND}"
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc README ChangeLog doc/TODO || die
- insinto /usr/share/doc/${PF}
- doins doc/manual.pdf doc/manual.html || die
-}
diff --git a/sci-calculators/orpie/orpie-1.5.2.ebuild b/sci-calculators/orpie/orpie-1.5.2.ebuild
deleted file mode 100644
index ed7cc74..00000000
--- a/sci-calculators/orpie/orpie-1.5.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A fullscreen RPN calculator for the console"
-HOMEPAGE="http://pessimization.com/software/orpie/"
-SRC_URI="http://pessimization.com/software/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-ml/ocamlgsl
- sys-libs/ncurses:0=
- || ( <dev-lang/ocaml-4.02 dev-ml/camlp4 )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.5.1-ocaml311.patch"
- "${FILESDIR}/${P}-nogsl.patch"
- "${FILESDIR}/${PN}-1.5.1-orpierc.patch"
- "${FILESDIR}/${PN}-1.5.1-tinfo.patch"
-)
-
-src_prepare() {
- default
- sed -i -e "s:/usr:${EPREFIX}/usr:g" Makefile.in || die
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_compile() {
- # TODO: fix missing edges in dependency graph
- emake -j1
-}
-
-src_install() {
- default
- if use doc; then
- dodoc doc/manual.pdf
- docinto html/
- dodoc doc/manual.html
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-calculators/orpie/files/, sci-calculators/orpie/
@ 2022-03-21 10:41 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2022-03-21 10:41 UTC (permalink / raw
To: gentoo-commits
commit: 7c7f6b4235d25400f6d8c409d3d0ebd56b521ff9
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 10:41:08 2022 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 10:41:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c7f6b42
sci-calculators/orpie: 1.6.1 bump
Bugs: https://bugs.gentoo.org/677660
Bugs: https://bugs.gentoo.org/716602
Bugs: https://bugs.gentoo.org/832679
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-calculators/orpie/Manifest | 1 +
.../orpie/files/orpie-1.6.1-orpierc.patch | 11 ++++++++
.../orpie/files/orpie-1.6.1-rcfile.patch | 14 ++++++++++
sci-calculators/orpie/metadata.xml | 4 +++
sci-calculators/orpie/orpie-1.6.1.ebuild | 32 ++++++++++++++++++++++
5 files changed, 62 insertions(+)
diff --git a/sci-calculators/orpie/Manifest b/sci-calculators/orpie/Manifest
index 095995b428a5..c0a31cd341e2 100644
--- a/sci-calculators/orpie/Manifest
+++ b/sci-calculators/orpie/Manifest
@@ -1 +1,2 @@
DIST orpie-1.5.2.tar.gz 379583 BLAKE2B c27eedd0d065d31ea49b542e9edf3936b5f38dd83d579a3a951c89d35509774461761238492753a3ec4098a46c87568f992004b79c7f2745ea50427618984d4b SHA512 5deed6d8e8e68ce5286f4d5183315b585adef38f205805ff6ccbbbf3983c97a468e370d0d44ebe2dff596de0ad9dba20401dbc0e4e9bc176bc93b118fd1cc11a
+DIST release-1.6.1.tar.gz 277420 BLAKE2B 9b29155a62d183ea83e6bddcae62440063bb0befeff72be28be6e0e76444c830047d81c3b8eab090c8eacc81c777b347c06b01af4b5337538d046f90dadf4a23 SHA512 df998e96cef53ef595178dfb9b51a17d5b22a8ccd894a543fa3130e5ab2204ea367706a79b1f53307f97c22ec7ce866be2097a4588ffeb0479d804f56706f248
diff --git a/sci-calculators/orpie/files/orpie-1.6.1-orpierc.patch b/sci-calculators/orpie/files/orpie-1.6.1-orpierc.patch
new file mode 100644
index 000000000000..6679d645e86d
--- /dev/null
+++ b/sci-calculators/orpie/files/orpie-1.6.1-orpierc.patch
@@ -0,0 +1,11 @@
+--- a/etc/orpierc
++++ b/etc/orpierc
+@@ -4,7 +4,7 @@
+ # directory for storing Orpie data
+ set datadir="~/.orpie/"
+ # editor used for fullscreen viewing of stack elements
+-set editor="vi"
++set editor="${EDITOR}"
+ # whether or not to hide the help panel
+ set hide_help="false"
+ # whether or not to conserve memory in favor of faster rendering
diff --git a/sci-calculators/orpie/files/orpie-1.6.1-rcfile.patch b/sci-calculators/orpie/files/orpie-1.6.1-rcfile.patch
new file mode 100644
index 000000000000..19e861fd078e
--- /dev/null
+++ b/sci-calculators/orpie/files/orpie-1.6.1-rcfile.patch
@@ -0,0 +1,14 @@
+--- a/src/orpie/rcfile.ml 2022-03-21 11:25:42.405186025 +0100
++++ b/src/orpie/rcfile.ml 2022-03-21 11:24:44.477121172 +0100
+@@ -916,10 +916,7 @@
+ let rcfile_fullpath =
+ (* expand out any occurrences of ${prefix} that autoconf
+ * decides to insert *)
+- let prefix_regex = Str.regexp "\\${prefix}" in
+- let expanded_sysconfdir = Str.global_replace prefix_regex
+- Install.prefix Install.sysconfdir in
+- Utility.join_path expanded_sysconfdir "orpierc"
++ "/etc/orpie/orpierc"
+ in
+ begin try (open_in home_rcfile, home_rcfile)
+ with Sys_error error_str ->
diff --git a/sci-calculators/orpie/metadata.xml b/sci-calculators/orpie/metadata.xml
index dfde1a89b577..722736cfa60d 100644
--- a/sci-calculators/orpie/metadata.xml
+++ b/sci-calculators/orpie/metadata.xml
@@ -5,6 +5,10 @@
<email>sci@gentoo.org</email>
<name>Gentoo Science Project</name>
</maintainer>
+ <maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>ML</name>
+ </maintainer>
<longdescription lang="en">
Orpie is a fullscreen RPN calculator for the console. Its operation is
similar to that of modern HP calculators, but data entry has been
diff --git a/sci-calculators/orpie/orpie-1.6.1.ebuild b/sci-calculators/orpie/orpie-1.6.1.ebuild
new file mode 100644
index 000000000000..4f85a71de71b
--- /dev/null
+++ b/sci-calculators/orpie/orpie-1.6.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A fullscreen RPN calculator for the console"
+HOMEPAGE="http://pessimization.com/software/orpie/"
+SRC_URI="https://github.com/pelzlpj/${PN}/archive/release-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/gsl-ocaml:=
+ dev-ml/curses:=
+ dev-ml/camlp5":=
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}-release-${PV}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-orpierc.patch
+ "${FILESDIR}"/${P}-rcfile.patch
+)
+
+src_install() {
+ dune_src_install
+ mv "${D}"/{/usr,}/etc || die
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-calculators/orpie/files/, sci-calculators/orpie/
@ 2022-03-25 7:05 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2022-03-25 7:05 UTC (permalink / raw
To: gentoo-commits
commit: c3e0909a62a238edfe9a1f8618ddf580a967ffc7
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 07:04:27 2022 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 07:04:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e0909a
sci-calculators/orpie: remove old
Closes: https://bugs.gentoo.org/677660
Closes: https://bugs.gentoo.org/716602
Closes: https://bugs.gentoo.org/832679
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
sci-calculators/orpie/Manifest | 1 -
.../orpie/files/orpie-1.5.1-ocaml311.patch | 200 ---------------------
.../orpie/files/orpie-1.5.1-orpierc.patch | 11 --
.../orpie/files/orpie-1.5.1-tinfo.patch | 10 --
.../orpie/files/orpie-1.5.2-nogsl.patch | 51 ------
sci-calculators/orpie/orpie-1.5.2-r1.ebuild | 47 -----
6 files changed, 320 deletions(-)
diff --git a/sci-calculators/orpie/Manifest b/sci-calculators/orpie/Manifest
index c0a31cd341e2..cf44ad13b857 100644
--- a/sci-calculators/orpie/Manifest
+++ b/sci-calculators/orpie/Manifest
@@ -1,2 +1 @@
-DIST orpie-1.5.2.tar.gz 379583 BLAKE2B c27eedd0d065d31ea49b542e9edf3936b5f38dd83d579a3a951c89d35509774461761238492753a3ec4098a46c87568f992004b79c7f2745ea50427618984d4b SHA512 5deed6d8e8e68ce5286f4d5183315b585adef38f205805ff6ccbbbf3983c97a468e370d0d44ebe2dff596de0ad9dba20401dbc0e4e9bc176bc93b118fd1cc11a
DIST release-1.6.1.tar.gz 277420 BLAKE2B 9b29155a62d183ea83e6bddcae62440063bb0befeff72be28be6e0e76444c830047d81c3b8eab090c8eacc81c777b347c06b01af4b5337538d046f90dadf4a23 SHA512 df998e96cef53ef595178dfb9b51a17d5b22a8ccd894a543fa3130e5ab2204ea367706a79b1f53307f97c22ec7ce866be2097a4588ffeb0479d804f56706f248
diff --git a/sci-calculators/orpie/files/orpie-1.5.1-ocaml311.patch b/sci-calculators/orpie/files/orpie-1.5.1-ocaml311.patch
deleted file mode 100644
index d1535f900958..000000000000
--- a/sci-calculators/orpie/files/orpie-1.5.1-ocaml311.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff -Naru orpie-1.5.1/Makefile.in orpie-1.5.1_1/Makefile.in
---- orpie-1.5.1/Makefile.in 2007-09-13 23:31:23.000000000 -0400
-+++ orpie-1.5.1_1/Makefile.in 2010-05-12 11:44:33.000000000 -0400
-@@ -257,10 +257,7 @@
- units/%.cmo : units/%.ml
- $(OCAMLC) -c $(UNITS_BFLAGS) $<
-
--units/%.o : units/%.ml
-- $(OCAMLOPT) -c $(UNITS_OFLAGS) $<
--
--units/%.cmx : units/%.ml
-+units/%.o units/%.cmx : units/%.ml
- $(OCAMLOPT) -c $(UNITS_OFLAGS) $<
-
-
-@@ -271,22 +268,15 @@
- %.cmo : %.ml
- $(OCAMLC) -c $(BFLAGS) $<
-
--%.o : %.ml
-- $(OCAMLOPT) -c $(OFLAGS) $<
--
--%.cmx : %.ml
-+%.o %.cmx : %.ml
- $(OCAMLOPT) -c $(OFLAGS) $<
-
- %.ml : %.mll
- $(OCAMLLEX) $<
-
--%.ml : %.mly
-+%.ml %.mli : %.mly
- $(OCAMLYACC) -v $<
-
--%.mli : %.mly
-- $(OCAMLYACC) -v $<
--
--
-
- # Emacs tags
- ############
-diff -Naru orpie-1.5.1/gsl/gsl_blas.ml orpie-1.5.1_1/gsl/gsl_blas.ml
---- orpie-1.5.1/gsl/gsl_blas.ml 2007-09-13 23:31:23.000000000 -0400
-+++ orpie-1.5.1_1/gsl/gsl_blas.ml 2010-05-12 11:24:11.000000000 -0400
-@@ -118,6 +118,7 @@
-
- (** {3 Single precision} *)
-
-+(*
- open Gsl_vector.Single
- open Gsl_matrix.Single
-
-@@ -187,6 +188,7 @@
- alpha:float -> a:matrix -> b:matrix -> unit
- = "ml_gsl_blas_strsm_bc" "ml_gsl_blas_strsm"
- end
-+*)
-
-
- (** {3 Complex} *)
-@@ -274,6 +276,7 @@
-
- (** {3 Complex single precision} *)
-
-+(*
- open Gsl_vector_complex.Single
- open Gsl_matrix_complex.Single
- open Gsl_complex
-@@ -354,3 +357,4 @@
- a:matrix -> b:matrix -> beta:float -> c:matrix -> unit
- = "ml_gsl_blas_cher2k_bc" "ml_gsl_blas_cher2k"
- end
-+*)
-diff -Naru orpie-1.5.1/gsl/gsl_blas.mli orpie-1.5.1_1/gsl/gsl_blas.mli
---- orpie-1.5.1/gsl/gsl_blas.mli 2007-09-13 23:31:23.000000000 -0400
-+++ orpie-1.5.1_1/gsl/gsl_blas.mli 2010-05-12 11:23:36.000000000 -0400
-@@ -118,6 +118,7 @@
-
- (** {3 Single precision} *)
-
-+(*
- open Gsl_vector.Single
- open Gsl_matrix.Single
-
-@@ -187,6 +188,7 @@
- alpha:float -> a:matrix -> b:matrix -> unit
- = "ml_gsl_blas_strsm_bc" "ml_gsl_blas_strsm"
- end
-+*)
-
-
- (** {3 Complex} *)
-@@ -274,6 +276,7 @@
-
- (** {3 Complex single precision} *)
-
-+(*
- open Gsl_vector_complex.Single
- open Gsl_matrix_complex.Single
- open Gsl_complex
-@@ -354,3 +357,4 @@
- a:matrix -> b:matrix -> beta:float -> c:matrix -> unit
- = "ml_gsl_blas_cher2k_bc" "ml_gsl_blas_cher2k"
- end
-+*)
-diff -Naru orpie-1.5.1/gsl/gsl_matrix.ml orpie-1.5.1_1/gsl/gsl_matrix.ml
---- orpie-1.5.1/gsl/gsl_matrix.ml 2007-09-13 23:31:23.000000000 -0400
-+++ orpie-1.5.1_1/gsl/gsl_matrix.ml 2010-05-12 11:22:51.000000000 -0400
-@@ -86,6 +86,7 @@
-
-
- \f
-+(*
- module Single =
- struct
- type float_mat_bigarr =
-@@ -164,3 +165,4 @@
- external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_float_transpose_memcpy"
- external transpose_in_place : matrix -> unit = "ml_gsl_matrix_float_transpose"
- end
-+*)
-diff -Naru orpie-1.5.1/gsl/gsl_matrix.mli orpie-1.5.1_1/gsl/gsl_matrix.mli
---- orpie-1.5.1/gsl/gsl_matrix.mli 2007-09-13 23:31:23.000000000 -0400
-+++ orpie-1.5.1_1/gsl/gsl_matrix.mli 2010-05-12 11:22:42.000000000 -0400
-@@ -45,6 +45,7 @@
- external transpose_in_place : matrix -> unit = "ml_gsl_matrix_transpose"
-
-
-+(*
- module Single : sig
-
- type float_mat_bigarr =
-@@ -87,3 +88,4 @@
- external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_float_transpose_memcpy"
- external transpose_in_place : matrix -> unit = "ml_gsl_matrix_float_transpose"
- end
-+*)
-diff -Naru orpie-1.5.1/gsl/gsl_matrix_complex.ml orpie-1.5.1_1/gsl/gsl_matrix_complex.ml
---- orpie-1.5.1/gsl/gsl_matrix_complex.ml 2007-09-13 23:31:23.000000000 -0400
-+++ orpie-1.5.1_1/gsl/gsl_matrix_complex.ml 2010-05-12 11:24:59.000000000 -0400
-@@ -108,6 +108,7 @@
-
-
- \f
-+(*
- module Single =
- struct
- type complex_float_mat_bigarr =
-@@ -208,3 +209,4 @@
- external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_complex_float_transpose_memcpy"
- external transpose_in_place : matrix -> unit = "ml_gsl_matrix_complex_float_transpose"
- end
-+*)
-diff -Naru orpie-1.5.1/gsl/gsl_matrix_complex.mli orpie-1.5.1_1/gsl/gsl_matrix_complex.mli
---- orpie-1.5.1/gsl/gsl_matrix_complex.mli 2007-09-13 23:31:23.000000000 -0400
-+++ orpie-1.5.1_1/gsl/gsl_matrix_complex.mli 2010-05-12 11:25:00.000000000 -0400
-@@ -51,6 +51,7 @@
- external transpose_in_place : matrix -> unit = "ml_gsl_matrix_complex_transpose"
-
-
-+(*
- module Single : sig
-
- type complex_float_mat_bigarr =
-@@ -96,3 +97,4 @@
- external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_complex_float_transpose_memcpy"
- external transpose_in_place : matrix -> unit = "ml_gsl_matrix_complex_float_transpose"
- end
-+*)
-diff -Naru orpie-1.5.1/gsl/gsl_vector.ml orpie-1.5.1_1/gsl/gsl_vector.ml
---- orpie-1.5.1/gsl/gsl_vector.ml 2007-09-13 23:31:23.000000000 -0400
-+++ orpie-1.5.1_1/gsl/gsl_vector.ml 2010-05-12 11:22:19.000000000 -0400
-@@ -95,6 +95,7 @@
-
-
- \f
-+(*
- module Single =
- struct
- type float_vector_bigarr =
-@@ -178,3 +179,4 @@
- external minmax_index : vector -> int * int
- = "ml_gsl_vector_float_minmaxindex"
- end
-+*)
-diff -Naru orpie-1.5.1/gsl/gsl_vector.mli orpie-1.5.1_1/gsl/gsl_vector.mli
---- orpie-1.5.1/gsl/gsl_vector.mli 2007-09-13 23:31:23.000000000 -0400
-+++ orpie-1.5.1_1/gsl/gsl_vector.mli 2010-05-12 11:22:19.000000000 -0400
-@@ -65,6 +65,7 @@
-
- (** {3 Single precision} *)
-
-+(*
- module Single : sig
- type float_vector_bigarr =
- (float, Bigarray.float32_elt, Bigarray.c_layout) Bigarray.Array1.t
-@@ -121,3 +122,4 @@
-
- val subvector : vector -> off:int -> len:int -> vector
- end
-+*)
diff --git a/sci-calculators/orpie/files/orpie-1.5.1-orpierc.patch b/sci-calculators/orpie/files/orpie-1.5.1-orpierc.patch
deleted file mode 100644
index a9ca1dd366f0..000000000000
--- a/sci-calculators/orpie/files/orpie-1.5.1-orpierc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- orpie-1.5.1.orig/orpierc
-+++ orpie-1.5.1/orpierc
-@@ -4,7 +4,7 @@
- # directory for storing Orpie data
- set datadir="~/.orpie/"
- # editor used for fullscreen viewing of stack elements
--set editor="vi"
-+set editor="${EDITOR}"
- # whether or not to hide the help panel
- set hide_help="false"
- # whether or not to conserve memory in favor of faster rendering
diff --git a/sci-calculators/orpie/files/orpie-1.5.1-tinfo.patch b/sci-calculators/orpie/files/orpie-1.5.1-tinfo.patch
deleted file mode 100644
index f9611cbb5198..000000000000
--- a/sci-calculators/orpie/files/orpie-1.5.1-tinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -34,6 +34,7 @@
- fi
- fi
- LIBS="$mp_save_LIBS"
-+ AC_SEARCH_LIBS([stdscr], [tinfo curses], [CURSES_LIB="$CURSES_LIB $ac_res"],)
- ])dnl
-
-
diff --git a/sci-calculators/orpie/files/orpie-1.5.2-nogsl.patch b/sci-calculators/orpie/files/orpie-1.5.2-nogsl.patch
deleted file mode 100644
index 75a56a79c0e6..000000000000
--- a/sci-calculators/orpie/files/orpie-1.5.2-nogsl.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- orpie-1.5.2/Makefile.in
-+++ orpie-1.5.2/Makefile.in
-@@ -44,7 +44,7 @@
- CURSES_LIB = @CURSES_LIB@
- GSL_LIB = @GSL_LIB@
-
--INCLUDES = -I ./curses -I ./gsl -I ./units
-+INCLUDES = -I ./curses -I /usr/lib/ocaml/gsl -I ./units
- BFLAGS = -pp camlp4o -g $(INCLUDES) -thread
- OFLAGS = -pp camlp4o $(INCLUDES) -thread
- BLFLAGS = -custom -cclib '$(LDFLAGS) $(CURSES_LIB) $(GSL_LIB) -lm'
-@@ -78,17 +78,8 @@
- CURSES_BOBJS = $(CURSES_CMO) $(CURSES_COBJS)
- CURSES_OOBJS = $(CURSES_CMX) $(CURSES_COBJS)
-
--GSL_CMO = gsl/gsl_error.cmo gsl/gsl_blas.cmo gsl/gsl_complex.cmo gsl/gsl_matrix.cmo gsl/gsl_matrix_complex.cmo \
-- gsl/gsl_vector.cmo gsl/gsl_vector_complex.cmo gsl/gsl_vector_flat.cmo gsl/gsl_matrix_flat.cmo \
-- gsl/gsl_vector_complex_flat.cmo gsl/gsl_matrix_complex_flat.cmo gsl/gsl_vectmat.cmo \
-- gsl/gsl_permut.cmo gsl/gsl_linalg.cmo gsl/gsl_fun.cmo
--GSL_CMX = $(GSL_CMO:.cmo=.cmx)
--GSL_COBJS = gsl/mlgsl_error.o gsl/mlgsl_blas.o gsl/mlgsl_blas_complex.o gsl/mlgsl_complex.o gsl/mlgsl_blas_float.o \
-- gsl/mlgsl_blas_complex_float.o gsl/mlgsl_matrix_complex.o gsl/mlgsl_matrix_double.o gsl/mlgsl_matrix_float.o \
-- gsl/mlgsl_matrix_complex_float.o gsl/mlgsl_vector_double.o gsl/mlgsl_vector_float.o \
-- gsl/mlgsl_permut.o gsl/mlgsl_linalg.o gsl/mlgsl_linalg_complex.o gsl/mlgsl_fun.o gsl/mlgsl_math.o gsl/mlgsl_sf.o
--GSL_BOBJS = $(GSL_COBJS) $(GSL_CMO)
--GSL_OOBJS = $(GSL_COBJS) $(GSL_CMX)
-+GSL_BOBJS = /usr/lib/ocaml/gsl/gsl.cma
-+GSL_OOBJS = /usr/lib/ocaml/gsl/gsl.cmxa
-
- UNITS_CMO = units/units.cmo
- UNITS_CMX = $(UNITS_CMO:.cmo=.cmx)
-@@ -324,7 +305,7 @@
- config.status: configure
- ./config.status --recheck
-
--configure: configure.in
-+configure: configure.ac
- autoconf
-
- # clean
---- orpie-1.5.2/curses_keys.ml
-+++ orpie-1.5.2/curses_keys.ml
-@@ -19,7 +19,7 @@
- *)
-
- open Curses;;
--
-+open Curses_assist;;
-
- begin
- let std = initscr () in
diff --git a/sci-calculators/orpie/orpie-1.5.2-r1.ebuild b/sci-calculators/orpie/orpie-1.5.2-r1.ebuild
deleted file mode 100644
index 21ac64004a62..000000000000
--- a/sci-calculators/orpie/orpie-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A fullscreen RPN calculator for the console"
-HOMEPAGE="http://pessimization.com/software/orpie/"
-SRC_URI="http://pessimization.com/software/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-ml/gsl-ocaml
- sys-libs/ncurses:0=
- dev-ml/camlp4"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.5.1-ocaml311.patch"
- "${FILESDIR}/${PN}-1.5.2-nogsl.patch"
- "${FILESDIR}/${PN}-1.5.1-orpierc.patch"
- "${FILESDIR}/${PN}-1.5.1-tinfo.patch"
-)
-
-src_prepare() {
- default
- sed -i -e "s:/usr:${EPREFIX}/usr:g" Makefile.in || die
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_compile() {
- # TODO: fix missing edges in dependency graph
- emake -j1
-}
-
-src_install() {
- if use doc; then
- dodoc doc/manual.pdf
- HTML_DOCS=( doc/manual.html )
- fi
- default
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-25 7:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-07 22:43 [gentoo-commits] repo/gentoo:master commit in: sci-calculators/orpie/files/, sci-calculators/orpie/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2017-01-18 21:40 David Seifert
2022-03-21 10:41 Alfredo Tupone
2022-03-25 7:05 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox