gentoo (valentine's day) resync : 14.02.2021

7 files changed, 22 insertions, 89 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index a45d845cafd9..93011eb8ee4d 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/bc-gh/Manifest b/sci-calculators/bc-gh/Manifest
index 4c7f4ff5371f..297293d98018 100644
--- a/sci-calculators/bc-gh/Manifest
+++ b/sci-calculators/bc-gh/Manifest
@@ -1,3 +1,5 @@
 DIST bc-3.2.3.tar.xz 225420 BLAKE2B 6d1ec825a03f77a8024ff69f80eaa09301effc1281663aaf33c530d89c917b9cad41813aca731577fae1eb8dfb1c6e3023e54da0cfd89ea2e5aa413f84c347b3 SHA512 efd040d46f2ed1eff5a2eb336e55fd465176c23c728935ee488a474b2f0c8dddd275805ee3be79f20afc523a183adb3d88a0e7bee095047912cf70741e2c0b32
+DIST bc-3.2.6.tar.xz 234964 BLAKE2B 4127d1910ee33f7f113c8dd3604bf7c5efacbcb3ae163d943ca9c62e6b1e9769f32766034931aaa3f2251f825cef86e812aaf1974fec643dbe355156c33a8054 SHA512 4b1f43bb0bcd720d2140d41e089aa78fe8d07903fb745ed1a641ffe25fe46f439e480a1e11b687b7555881bd1ee4044c071c50e4bacd579b8909c704db7a6ede
 EBUILD bc-gh-3.2.3.ebuild 469 BLAKE2B 57a00dbc077c768449ea40a0e02a9a5ec54bfe0aac1d0b0d02aa9153559fc52b0b9de63c771a68908f49ccda6d7d37683fa499dc7d59199119ad7917c25f2d70 SHA512 8fdf5ab52e9d391b4622b693aa30296c9838275c54d15de312db40957819ab378acc3a0e0a76b5221d0497c28082a640c70973ddcf55209d1601050975db6d3f
+EBUILD bc-gh-3.2.6.ebuild 469 BLAKE2B de445258a29c37f7d6539dcc0be67c3531e4489fd7ccc10441816ce84f0b425c8ae656276071e09efbc0841cf05a807342d2a6a9f5959c14120e59aa435014ed SHA512 3af7bf904de23c93e952b1f713a747770899cb7cc819a0120acc04ad2db22145f50de34512c3b90ed5e227a5a82616a50063dc6ee956de8cddf0276ca04b6c61
 MISC metadata.xml 941 BLAKE2B 89c83ee3282f1344a8c0243597f178c6acf696ca4ed5f6eafaefbb451487e659b0bc49927a8bec8f07469b4b3ba66d3e0c2d919ee9d9e40792bc7731145bf76c SHA512 be367aa0eb1befcfddcda11253bf959f5467a9687e6522756708ee19672302ebd4bf4f9d6920e3acc43666ee97fa8d48abe62dd666a33fc70fc5675c1c22b79e
diff --git a/sci-calculators/bc-gh/bc-gh-3.2.6.ebuild b/sci-calculators/bc-gh/bc-gh-3.2.6.ebuild
new file mode 100644
index 000000000000..89c8c7658afa
--- /dev/null
+++ b/sci-calculators/bc-gh/bc-gh-3.2.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Implementation of POSIX bc with GNU extensions"
+HOMEPAGE="https://github.com/gavinhoward/bc"
+SRC_URI="https://github.com/gavinhoward/bc/releases/download/${PV}/bc-${PV}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+S="${WORKDIR}/bc-${PV}"
+
+src_configure() {
+	EXECSUFFIX="-gh" PREFIX="${EPREFIX}/usr" ./configure.sh -GTl || die
+}
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 542f79b06d47..943c3bcc8a18 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,8 +1,5 @@
 AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457a08ddbe98e85cd3c195c149215de8753aa72fec618ccf4bdf584002c507cc53532ee92af6e8097c7fa2573628de34b17c SHA512 f54fb5d006263f89ff8c376f100066d79883b68a30441e8665ca4d8a6aa061e5c697c715ccb93c67a692145a44a441862039e5249e4795159f1c43a12ffe1c97
-AUX units-2.20-WIN32.patch 395 BLAKE2B 5f6cee1a4ca07be73979efc6060b0225cf0a52114085dc31d1259d7a09f131d9a3d8ab91d3f2f995b41e9a3eb3299bbb09575e8c2677cee33e2ccad05abbd628 SHA512 b79d1cea6542a8360f9ba8e6a0bdbc69ade2ccd58bcda53851f6368b6c91a98ca6d2f757028bfc141c9ad8773117972d480e99063800394bcd9c5d3ba2ab61dc
 AUX units-2.20-readerror.patch 306 BLAKE2B 7007ed50539043f1b21a9676c8d1ff377d1d6e1d9e1d3e4bca9e4dcda520d77cddc28abe35333cd1cb4a5d451264d94f22bc6594a5f1fd15488d5d5e1d5bf12d SHA512 4d1acb3ca6e4bd2874854cfa27e8bc5418ef30d628589eace8011733556835feb30630a2b37bb1e5e975392fe75e684b48f31a9b2624b8703714dbb501f6f27d
-DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d
 DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62
-EBUILD units-2.20.ebuild 1235 BLAKE2B dc9517a26c3807a9981ce5628eb6163c1017ce41b42e44a3b8f3f390e03e003b611e72a39dddc87c8ff4893e22b1d487dc7bebf0671e588dcb3c130359239a34 SHA512 53996a63dabcc1e0550cfe8f011658c7decd8cb020be9230bb309d7e5d6ac4c8bd3eebb487c1d74cce28b0a5eb97bac143d48d25e9be5d8f613555cd20ec2bae
-EBUILD units-2.21.ebuild 1200 BLAKE2B ac3dc7b3983aebb366fdb377269b5603dc45d4c9878959c7ac71d981237828c895bb0b3ab027b098501bb82bbd24f2d3e938619a50abd271d15cf632f0b4b002 SHA512 d0885549b3dea3bc6be76667ecfd3d8403144173db114fb85b976adcda59051819a99d57dedef5e0bc713f6200387ce4a5fb70ac6f5786f6e171c6200d7a4234
+EBUILD units-2.21.ebuild 1196 BLAKE2B b10d3326f7e25664ab11ed85d56e5d4b74a8b930e15ec463f78a77089e057acb167fc5e89412ffcb6c3804d02b5441eb2e805a57de3f3cb149bf752465701449 SHA512 c081bc4ce4e1dce3bf3f83f6c8e313474df9c65032e02f86827d122472ed3608f6e26147b4107258199a0134dba92bb6478d90cfb459bedac727c24127d89fa3
 MISC metadata.xml 269 BLAKE2B 212fd839faa71081ff89c999bc77e37b69c5c618f9e1527ed9402ad14af7072432fcd3eaa3ced4dd20a45929c054095d652ab6c18a1642be436b345436ed48a7 SHA512 bcb2f5dd279dd126273909fdaf0c3ee89f0eb050938317ba26e75532a742e7eb496669bea134494071ec30b3475a3ffc70b47035de404e8c1f7bc1034012e917
diff --git a/sci-calculators/units/files/units-2.20-WIN32.patch b/sci-calculators/units/files/units-2.20-WIN32.patch
deleted file mode 100644
index fbe7599831c4..000000000000
--- a/sci-calculators/units/files/units-2.20-WIN32.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/units.c
-+++ b/units.c
-@@ -4087,7 +4087,9 @@
- checkcwd (char *file)
- {
-   FILE *fp;
-+#ifdef _WIN32
-   char *p;
-+#endif
- 
-   fp = fopen(file, "r");
-   if (fp){
-@@ -4630,7 +4630,10 @@
- printversion()
- {
-   int exists;
--  char *unitsfile, *localemap;
-+  char *unitsfile;
-+#ifdef _WIN32
-+  char *localemap;
-+#endif
- 
-   if (flags.verbose == 0) {
-     printf("GNU Units version %s\n", VERSION);
diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild
deleted file mode 100644
index f63f622a0410..000000000000
--- a/sci-calculators/units/units-2.20.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit python-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+units-cur"
-REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/readline:=
-	units-cur? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/future[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
-	"${FILESDIR}"/${PN}-2.20-WIN32.patch
-	"${FILESDIR}"/${PN}-2.20-readerror.patch
-)
-DOCS=(
-	ChangeLog NEWS README
-)
-
-src_configure() {
-	econf \
-		--sharedstatedir="${EPREFIX}"/var/lib \
-		ac_cv_path_PYTHON=no
-}
-
-src_compile() {
-	emake ${PN}
-}
-
-src_install() {
-	default
-
-	if use units-cur; then
-		sed \
-			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
-			-e 's|^#!|&/usr/bin/python|g' \
-			units_cur_inst > units_cur || die
-		python_foreach_impl python_doscript units_cur
-	fi
-}
diff --git a/sci-calculators/units/units-2.21.ebuild b/sci-calculators/units/units-2.21.ebuild
index b076d9c868b4..27e2401c7804 100644
--- a/sci-calculators/units/units-2.21.ebuild
+++ b/sci-calculators/units/units-2.21.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+units-cur"
 REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )"