gentoo resync : 25.03.2022

6 files changed, 71 insertions, 1 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 7bbdc8f62e2e..23056cb817c6 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/orpie/Manifest b/sci-calculators/orpie/Manifest
index dc30f49b9a95..ea0d60d82c22 100644
--- a/sci-calculators/orpie/Manifest
+++ b/sci-calculators/orpie/Manifest
@@ -2,6 +2,10 @@ AUX orpie-1.5.1-ocaml311.patch 5460 BLAKE2B 03b54360b2a23d1badf73f084af39e4cd263
 AUX orpie-1.5.1-orpierc.patch 357 BLAKE2B 35f2f45a265312873fdd2ff2dcb9d5797cf1dc48ec04d0aab44ecc45e50f19f63b9d6a82317b6b89f1827247ef8fb84194cbcfc35c3cb4dd015035b5504d6527 SHA512 8579f8af07fbc43594eb9e7f0b22e9053fbb0d6f30bb0d849592f29edb4df7fae2535b163d7259eef1e6f99cbdfb5fcdbf715c59e24fbc7b7a7250e798e35485
 AUX orpie-1.5.1-tinfo.patch 186 BLAKE2B 2bb20a459839d54a246241008dd45aa1d16316ea9fcba999a90498f31edd96a45c4230bd5e57d4a88612a8b0ac3f09eba710752c7fe9b7ff0d310dccfaf1ad12 SHA512 efbab46a367dc10e58b2e635d3bce49b9743766c489c2fba20cfc783fd92256c8afc8502c6d1650466400fb32bbca791f1677745b5610a405d369fb7432d7937
 AUX orpie-1.5.2-nogsl.patch 1866 BLAKE2B d36005b6276f85d7754d71287034eb2584e6b69cd9de78a800e6534f7a2424820ee1bab06f47c0322b4f3a1f112fb95a68ef6f3500887772d0eb919d2ec29ce1 SHA512 26b1bcb09e111e87b82424622ec8d5e3ff6c68c3ee5cdd6a2496b175a496296787ff5dc5abde04cb98a8105c3e7a6765bb00912fa1c500fcf7d0e9e6d76f7177
+AUX orpie-1.6.1-orpierc.patch 340 BLAKE2B aa8aef8849fab60283b6e83f06cec54a65f70ab0782fab05da2fa09f24eff240a87b2a966e3220589090b1df9e63ceecb28fba5fbc6a5682c5fa45cdfe953e57 SHA512 fb839cd463c94ea1b254ec9fe613c9249fbc392c561df1356ae728a5db9e58f98f4c5ebd79543a649e95d1b2d2c25e7008365fb076107210d90f04143c9f5ed2
+AUX orpie-1.6.1-rcfile.patch 635 BLAKE2B eacd8a8a4902d8738f27964b5886ea0de0f6471e48a0d31618a3d8adc6948f7074b47bfbbc717d811dad6f0ff1b2f361550ce7786e172a299ebba4b9d466e740 SHA512 b56e9c3f8e8f8f1cb9075665933edcb28b4fb07a848dce381ab08f8b9778f2bc8ae6e075a71d50f2b5793ffc9c70014dc616dc55b86254ff0ff4a1a68fc651d4
 DIST orpie-1.5.2.tar.gz 379583 BLAKE2B c27eedd0d065d31ea49b542e9edf3936b5f38dd83d579a3a951c89d35509774461761238492753a3ec4098a46c87568f992004b79c7f2745ea50427618984d4b SHA512 5deed6d8e8e68ce5286f4d5183315b585adef38f205805ff6ccbbbf3983c97a468e370d0d44ebe2dff596de0ad9dba20401dbc0e4e9bc176bc93b118fd1cc11a
+DIST release-1.6.1.tar.gz 277420 BLAKE2B 9b29155a62d183ea83e6bddcae62440063bb0befeff72be28be6e0e76444c830047d81c3b8eab090c8eacc81c777b347c06b01af4b5337538d046f90dadf4a23 SHA512 df998e96cef53ef595178dfb9b51a17d5b22a8ccd894a543fa3130e5ab2204ea367706a79b1f53307f97c22ec7ce866be2097a4588ffeb0479d804f56706f248
 EBUILD orpie-1.5.2-r1.ebuild 929 BLAKE2B 3b1e5a46a76a86492c8364e4b3397a7802eedf6c2c59dda65f0809b63a9d7b8332390a8dc02de8ce36c1f98fb2182b36106a7fda789cf437120b36b6efd31a2f SHA512 be50c3d368aa48f8c6b7035d17645b3078b9f6e9f1b4b44ec65ab471fa567b8812ed033f9e75eebdd6293cc2593df39448ad22cc907d208f465e227a3f995f6a
-MISC metadata.xml 489 BLAKE2B ecc0c76c4e5888c1fe65386c0f6c6e5c34d6e1c349ea283e34882da3158ab64432318ece18d499e578af76dffbe88f7e0edc7a33abdbbef34eda43c397d0e9dd SHA512 f85c3436d125946c6077c65c61f95b2d7625b8ca4d34f378b27099e36f34ff5abc24d3597836da3bad871bc31510c1f7a406e36fdff25a5d1e5a5655a7ec6779
+EBUILD orpie-1.6.1.ebuild 704 BLAKE2B 2f0d2d3f8adc7f55b4f05f71ace11c74cf7b3819f22dd3c3bf9ff3b5512c5659ad851f12734bd2e04c13b51117a863dfcb09f10b20fbd367ed90db33486cd56b SHA512 18b8c7e5e0d7913bc28c0984449e09fdd3eb7544c2aa6d83344c2fa7a43c7630ca9d58524505f0a5a025d41017297c1fe74c5d0e934b826cea61f1201049509e
+MISC metadata.xml 582 BLAKE2B 57b4d90a7ec4d435c28768829d9f16581f22da2c8530f0c719aed45812845cbf1c0aab5a24d7c3c3d4da2fe7208058240e122c61494931b36f3312221ca2355a SHA512 30e5e97233a482d396a89c1bfb5998fba12fa5671688468d751c7256e4347c482f5903b2f0da05b85756e379a6d998d296eea0ef5c84ca709f5aef2aa8f46588
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..eb285f750783
--- /dev/null
+++ b/sci-calculators/orpie/orpie-1.6.1.ebuild
@@ -0,0 +1,37 @@
+# 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 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/gsl-ocaml:=
+	dev-ml/curses:=
+	dev-ml/num:=
+	dev-ml/camlp5":=
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}-release-${PV}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-orpierc.patch
+	"${FILESDIR}"/${P}-rcfile.patch
+)
+
+src_compile() {
+	PREFIX=/usr dune_src_compile
+}
+
+src_install() {
+	dune_src_install
+	mv "${D}"/{/usr,}/etc || die
+}