gentoo Easter resync : 12.04.2020

10 files changed, 39 insertions, 127 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 95d31399ef7f..872f57a38e5b 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/datamash/Manifest b/sci-calculators/datamash/Manifest
index 1530b4a960c4..1a911a722ecc 100644
--- a/sci-calculators/datamash/Manifest
+++ b/sci-calculators/datamash/Manifest
@@ -1,5 +1,7 @@
 DIST datamash-1.4.tar.gz 2013538 BLAKE2B 7be0d146e24c9d5e4e739e4884dda30c52089410b39b77e80e2265f134aaf3fb4db097b2b138497ed117028191a8a1bd0b82d2754f96bb5473d79b7785e1e1af SHA512 1c47d70c9d7fa5ab2fd2a8cb1d40817ca07e8501628997ae370884fd0a4e926c0718f49f54a5f91eb4db847296bc120db3dd19fc12a92bfe8d2e7d6f2ded5aec
 DIST datamash-1.5.tar.gz 2086985 BLAKE2B 3b377d5886ac7de0066c30ffa7a8923230b928514274be10b213d1a0631709b1c940a4da07709d0cb67a6719f5da9b9f045b8a5bb519370b64a677d20547aa17 SHA512 9f7bff0858a7519ef8efc30ef39c3e99f17e81ed847f1edce6ff28e1191d52fbc173baa5d21d6852effbbf2af800604920d92d412f45519700a9b5809da0e8fa
+DIST datamash-1.6.tar.gz 2103174 BLAKE2B 8ef0817df65392bf22d3e748e48292e225a437d16e797301f8e8d67d2d85ee8f4b6f010f6714d02001761b176ad97598f5815636bc92b7dbfdd30b9119e5df0b SHA512 bd4e147e68f9b71d04a2c8150fc3726720aff111a9d1ce873ec0fbcd1fc0f12369e866327180f0561e68a1085bff042673cd97a9ad146edeccca3a1bdc45ac18
 EBUILD datamash-1.4.ebuild 601 BLAKE2B d02c99ccbaf8b2887d503170eca0dcf21b6b3537ee6085830229f61fbc4c036d62456d8c52e0fdfea85b96126d678d1b36da1cac849265f434563296a21a6e0e SHA512 ed49c45bb61cb4c53407a74a35eb92d261fceb495e3cdaad9df7cb731899a58d91cfdd138df8e8faba7fb1565cc7ed31224c9d89afe3b9d5361b47b0ee7a7158
 EBUILD datamash-1.5.ebuild 623 BLAKE2B 64ea8062e2dc182d76b562944c86688ac61aeeef3ec3263275576caff3081566e49aa5a10b9cfa559d9401c02f31f62ee1fe5f84ed17e9b0997253981fc463c2 SHA512 a764f5b8c260631573d4f1aad99bed300affe1d614d086f054b599a10a129a2d80807042b9e4dbe80556b42e264d411ca5e7a808353d7b1ef321fa7b37f3e473
+EBUILD datamash-1.6.ebuild 623 BLAKE2B f11b4e90ca448292a766e79fbd8718af25ca6514481534cd72a619bca9db71cc57be26869b61943baf0d06a22dd3f314e4406ff7aa10ed6b4b105dce76bec063 SHA512 5ebf03cf5b4fd99c2d4d2950dd4a5956ac7c443b95063dacc5d359807f96678cc363dc2e990873af12c2a70da5d27af64771f6d6f98a6ee9fa4d38678297f9e9
 MISC metadata.xml 396 BLAKE2B 0d89182c943e98ca9975608a49368af7250f0a02ad0111c38b22e29487dd04d1e8cd4a31db564e7dd4a81a920a34559b48ccdfd08f7b659fb12363705536b2c4 SHA512 f95651480cc76dff603952f66377e0f41cec06ea141a94e8597466e362d09f99d83b15b2f40dbc7df78cd1400c6bda9a2cac50be66504ebe6af89b24de0ac30f
diff --git a/sci-calculators/datamash/datamash-1.6.ebuild b/sci-calculators/datamash/datamash-1.6.ebuild
new file mode 100644
index 000000000000..b46eb24c3af7
--- /dev/null
+++ b/sci-calculators/datamash/datamash-1.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="command-line program for basic numeric, textual and statistical operations"
+HOMEPAGE="https://www.gnu.org/software/datamash/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="linux-crypto nls openssl"
+
+CDEPEND="
+	openssl? ( dev-libs/openssl )
+"
+RDEPEND="
+	${CDEPEND}
+	nls? ( virtual/libintl )
+"
+BDEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with openssl) \
+		$(use_with linux-crypto)
+}
diff --git a/sci-calculators/gonvert/Manifest b/sci-calculators/gonvert/Manifest
deleted file mode 100644
index d3671b95ec89..000000000000
--- a/sci-calculators/gonvert/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0.2.23-paths.patch 2756 BLAKE2B 6cfdc09e6a6e09e144b4e06ea16742311056eb56aff957846267174434abc983c59ab8ea033801bc05b155ebd6e3c203629287cb86296a90ed425bf4515d0b47 SHA512 72ec21802f0c365efc1dff067f17c4ea07ad74a84588859de000efec2f7830e330ea0470ea04983c8622aa2f8099ddef4336a23d3367caaf0033e19dc90b978e
-DIST gonvert-0.2.39.tar.gz 125040 BLAKE2B 359a2d616ec63b4a343600395b2fdd5a4bc266f847cedf0ac03f7578906a88628dbf8406265ddf21affa790e96572c2f099adf32203f1b80e5ddf48be1c203a1 SHA512 508c4fe4a453f68ea48787843b96b7f6ee6706e7a264c5698ceb5cba3b90996f506e67230d37b2750db69921aba90f56d4eca2a21531c33aa5cdd95e2ca9ea4b
-EBUILD gonvert-0.2.39-r1.ebuild 815 BLAKE2B 3743e21889e666f3c7ebed47dd7c28307734392697157882c0c1f59feaea60ec16600e8ece39e0b608383b0cae8f324dbd8d9a42235b249f5d0680ecd83f7b20 SHA512 e3c12aaad18a38e9f12bebc335d6132e66658f9ee15519d0b9769c4a189a02948932f1d744998a28bd3a40ad8d4135ea09768b0bdd012cc0e0d0936988c54e5f
-MISC metadata.xml 708 BLAKE2B a684e94e0169269142c1f915a10593cfeddac8d2321af3eaa57ac7c5b4467030210c6bc03207e66918ad3f97fad70aa7bdabbd74d1bb70633fc8e01bd0d7755a SHA512 c88b8e10790e10f415ddd0c1453f976767c5b51722936d37a9c423f016c6ac3ae0e19e1103a61f09fb381f6ffc64318012068df50b53e2655e92cbfef663edd5
diff --git a/sci-calculators/gonvert/files/0.2.23-paths.patch b/sci-calculators/gonvert/files/0.2.23-paths.patch
deleted file mode 100644
index 72a39758236a..000000000000
--- a/sci-calculators/gonvert/files/0.2.23-paths.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -uNr gonvert-0.2.23.ORIG//gonvert gonvert-0.2.23/gonvert
---- gonvert-0.2.23.ORIG//gonvert	2010-05-02 15:56:46.807041971 +0100
-+++ gonvert-0.2.23/gonvert	2010-05-02 15:57:06.840166944 +0100
-@@ -739,9 +739,9 @@
- if os.path.exists('gonvert.glade'):
- 	homepath=''
- 	pixmapspath='pixmaps/'
--elif os.path.exists('/usr/local/share/gonvert/gonvert.glade'):
--	homepath='/usr/local/share/gonvert/'
--	pixmapspath='/usr/local/share/pixmaps/'
-+elif os.path.exists('/usr/share/gonvert/gonvert.glade'):
-+	homepath='/usr/share/gonvert/'
-+	pixmapspath='/usr/share/pixmaps/'
- else:
- 	#look for it in the installed directory
- 	homepath=sys.path[0] + '/../share/gonvert/'
-diff -uNr gonvert-0.2.23.ORIG//Makefile gonvert-0.2.23/Makefile
---- gonvert-0.2.23.ORIG//Makefile	2010-05-02 15:56:46.808041940 +0100
-+++ gonvert-0.2.23/Makefile	2010-05-02 15:57:06.840166944 +0100
-@@ -4,7 +4,7 @@
- VERSION=$(shell head -3 $(NAME) | grep version | cut -d\" -f2)
- 
- #DESTDIR can be defined when calling make ie. make install DESTDIR=$RPM_BUILD_ROOT
--prefix  = /usr/local
-+prefix  = /usr
- bindir  = $(prefix)/bin
- datadir = $(prefix)/share
- docdir  = $(datadir)/doc
-@@ -18,7 +18,7 @@
- 	install -D -m0644 gonvert.glade $(DESTDIR)$(datadir)/gonvert/gonvert.glade
- 	install -d -m0755 $(DESTDIR)$(datadir)/pixmaps/
- 	install -m0644 pixmaps/*.png $(DESTDIR)$(datadir)/pixmaps/
--	install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/gnome/apps/Utilities/gonvert.desktop
-+	install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/applications/gonvert.desktop
- 	install -d -m0755 $(DESTDIR)$(docdir)/gonvert/
- 	install -m0644 doc/* $(DESTDIR)$(docdir)/gonvert/
- 
-@@ -27,7 +27,7 @@
- 	install -D -m0644 gonvert.glade $(DESTDIR)$(datadir)/gonvert/gonvert.glade
- 	install -d -m0755 $(DESTDIR)$(datadir)/pixmaps/
- 	install -m0644 pixmaps/*.png $(DESTDIR)$(datadir)/pixmaps/
--	install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/gnome/apps/Utilities/gonvert.desktop
-+	install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/applications/gonvert.desktop
- 	install -d -m0755 $(DESTDIR)$(docdir)/gonvert/
- 	install -m0644 doc/* $(DESTDIR)$(docdir)/gonvert/
- 	install -m0644 i18n/pl_messages.gmo /usr/share/locale/pl/LC_MESSAGES/gonvert.mo
-@@ -37,7 +37,7 @@
- 	rm -f  $(bindir)/gonvert
- 	rm -rf $(datadir)/gonvert*
- 	rm -rf $(docdir)/gonvert*
--	rm -f /usr/share/gnome/apps/Utilities/$(NAME).desktop
-+	rm -f /usr/share/applications/$(NAME).desktop
- 	rm -f /usr/share/pixmaps/$(NAME).png
- 
- uninstall_pl:
-@@ -45,7 +45,7 @@
- 	rm -f  $(bindir)/gonvert
- 	rm -rf $(datadir)/gonvert*
- 	rm -rf $(docdir)/gonvert*
--	rm -f /usr/share/gnome/apps/Utilities/$(NAME).desktop
-+	rm -f /usr/share/applications/$(NAME).desktop
- 	rm -f /usr/share/pixmaps/$(NAME).png
- 	rm -f /usr/share/locale/pl/LC_MESSAGES/gonvert.mo
- 
diff --git a/sci-calculators/gonvert/gonvert-0.2.39-r1.ebuild b/sci-calculators/gonvert/gonvert-0.2.39-r1.ebuild
deleted file mode 100644
index 77c107f5fb2c..000000000000
--- a/sci-calculators/gonvert/gonvert-0.2.39-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Unit conversion utility written in PyGTK"
-HOMEPAGE="http://unihedron.com/projects/gonvert/index.php"
-SRC_URI="http://unihedron.com/projects/gonvert/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/0.2.23-paths.patch )
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr"
-	python_fix_shebang "${ED%/}"/usr/bin
-	rm -fr "${ED%/}/usr/share/doc/${PN}" || die
-	einstalldocs
-}
diff --git a/sci-calculators/gonvert/metadata.xml b/sci-calculators/gonvert/metadata.xml
deleted file mode 100644
index d7e425a15e64..000000000000
--- a/sci-calculators/gonvert/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  gonvert is a conversion utility that allows conversion between many
-  units like CGS, Ancient, Imperial with many categories like length,
-  mass, numbers, etc. All units converted values shown at once as you
-  type. Easy to add/change your own units. Written in
-  Python,pygtk,libgade.
-</longdescription>
-</pkgmetadata>
diff --git a/sci-calculators/pcalc/Manifest b/sci-calculators/pcalc/Manifest
index 6fafc4b03c51..5558846336cb 100644
--- a/sci-calculators/pcalc/Manifest
+++ b/sci-calculators/pcalc/Manifest
@@ -1,5 +1,5 @@
 DIST pcalc-3.tar.xz 66908 BLAKE2B 40473405f564d5dc5fd43f6f7fc4a80d41d7c9b09f8f6915408313aa45ecaa860b27debe0131fa0450b9b62a7ed4157bc433c7866910211551c6b159113cecc3 SHA512 55b6644300a8eb5224df5a0885907c10847df7ab6296d012eb2bb638876687ddbe23d5b76e31ac6ff4c159e44940d5cf6ba747f2a410943fdc25c9d9855fd60e
 DIST pcalc-4.tar.xz 68948 BLAKE2B f7d17e3ebf76aeccd9b7c74fe6ecfa7de94d8450d302e3b094b57f4050e0be2448887ea131496ab00ee140d0a44b0dd8d5b5564feb8fdc47d2fbbe5010af73d9 SHA512 6492ca89c5f60549f9388d8b7edad21c1c912feea0ee1a1271d730a63832c3b562b1a6bc9f69a0bd3118407906646c8d8fbed6c6d9a62db6a6bbde22579c1fd0
-EBUILD pcalc-3-r1.ebuild 566 BLAKE2B f32f0a5dedb5ce38a5fc9270f0089775f593159bcc4e084d65c4666a00e5b64f32535a032f116abf3408758cf7e24d698f865c6c67faca7785eb2633592c6953 SHA512 83c325a47b92210637e4440aff9a2f905eb2b9eaae2cff3d78c4b7c912d6c141ac68efcb5c218ea98b4858f3dcd3058237b39dfb3841ba6d09ef5aec05ee87c5
-EBUILD pcalc-4.ebuild 581 BLAKE2B 029f4f5db7a1e5109cb62ed27d967c9c43b286fb0be546b8ea7ab1914f36610ef84db93cd8ff7ad93cb0becf5a9cd80f40b5c608ac92c453fd340cd32d6cc971 SHA512 a7cdf3f58bb0d17a8ec8e80a723fb1de7299e818aee04d01a9b7a0439d758537e1ee7bcef023be1f6961755c140d3900af5dc0a00108c48060d39df55913e98a
+EBUILD pcalc-3-r1.ebuild 564 BLAKE2B 4cae91a61ccd46a23c796970051fb3a4f58589ac7ea998212967c81a99b74f7c02a7ba7dcc174a7b0cb882a56d9d1d823f0248cf4d28936d0a223ff9126c4dcf SHA512 b7fb9903f1cf3aff9b4816eeb49918e5747527ab4b9ffebc6c758f609bff1d6037b70e1f6fbbd2a3eb1f32eeea8d0a036811f7e01353ef298a86fa92aa56c7af
+EBUILD pcalc-4.ebuild 574 BLAKE2B 48dc569394ad21fa72897e882f458e63702932079dcbf3ba555ae081b30de8756a151f6bb25a2f00566e09e6607af5cbf3c92c48563ec815f88816a96d4c9bbd SHA512 7493319098c26de588cc54e6d9887f4949108f9e57f92e8bece7cbf080fc28265c03dffc766b0005cba756090cab956364b1fddc0a6169c34f13740b6031df15
 MISC metadata.xml 380 BLAKE2B 966f815d92d6c5680629d5bb6bf5b6124aa1bf6a747d914c94e66148a6e7d8b53e9931e56436a99d0ccc5bbbea1cb6e2a0bb3054fa31a4dd6f7fad54f279893f SHA512 45ac8682dd7d9e8c414354090b2733f3c715e9b76db3ab3e1e852282bf460f3a6881626d49c73b7975fbc238485ed38881187dd4c392469108bad1b15022465a
diff --git a/sci-calculators/pcalc/pcalc-3-r1.ebuild b/sci-calculators/pcalc/pcalc-3-r1.ebuild
index 650dbb7d6c24..4d977fbdf7ce 100644
--- a/sci-calculators/pcalc/pcalc-3-r1.ebuild
+++ b/sci-calculators/pcalc/pcalc-3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pcalc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-devel/flex"
diff --git a/sci-calculators/pcalc/pcalc-4.ebuild b/sci-calculators/pcalc/pcalc-4.ebuild
index 0b083d621208..6f7040033fed 100644
--- a/sci-calculators/pcalc/pcalc-4.ebuild
+++ b/sci-calculators/pcalc/pcalc-4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pcalc/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-devel/flex"