gentoo resync : 02.06.2019

5 files changed, 5 insertions, 38 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index cccaf6f33820..65c488956ba3 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/datamash/Manifest b/sci-calculators/datamash/Manifest
index 4a519346d7c6..e41cf38d335c 100644
--- a/sci-calculators/datamash/Manifest
+++ b/sci-calculators/datamash/Manifest
@@ -1,5 +1,3 @@
-DIST datamash-1.3.tar.gz 1939375 BLAKE2B 4fe08d14ffaca21ce78d5b2781fadc665dfbc87c628338ad63eba09779179e4bfa3f578c1a8018acfbf8b3c7aad0389ee068d1b21718b1f576b6e5e8ed8d03c2 SHA512 3c36dd01035dc114f2fbfcb8746354e496e6c1536f7b5908cf25632d9cbaddfcd06fc26f8883ef845a6ecd85ceb5708bb7edb3d1b1c6efa273ef5ec0b758366a
 DIST datamash-1.4.tar.gz 2013538 BLAKE2B 7be0d146e24c9d5e4e739e4884dda30c52089410b39b77e80e2265f134aaf3fb4db097b2b138497ed117028191a8a1bd0b82d2754f96bb5473d79b7785e1e1af SHA512 1c47d70c9d7fa5ab2fd2a8cb1d40817ca07e8501628997ae370884fd0a4e926c0718f49f54a5f91eb4db847296bc120db3dd19fc12a92bfe8d2e7d6f2ded5aec
-EBUILD datamash-1.3.ebuild 603 BLAKE2B 7b4e0d9652693cf925253d2979a14349f4a1e66dcd1fa9f41158aacc0575c6c42df5a0de3c777a6ee6a5292cecd23b2f32dcbfc7bf8d879322de7d7ade76c098 SHA512 39457e47ab6e119cca3d0ab8cd1db2ba98ec5973ee608adba37d493de65c7090829a12bbd59f9444744e8a699d2c102899752c587a3df6f8c54f7f455c35a3a7
 EBUILD datamash-1.4.ebuild 601 BLAKE2B d02c99ccbaf8b2887d503170eca0dcf21b6b3537ee6085830229f61fbc4c036d62456d8c52e0fdfea85b96126d678d1b36da1cac849265f434563296a21a6e0e SHA512 ed49c45bb61cb4c53407a74a35eb92d261fceb495e3cdaad9df7cb731899a58d91cfdd138df8e8faba7fb1565cc7ed31224c9d89afe3b9d5361b47b0ee7a7158
 MISC metadata.xml 310 BLAKE2B 3cdfd42d49682ab36ccc013dd4818674fe05abe3749ee328d41877a865de82f69ee4f8e8aa1b5e4bca55c50120489e5896ff0e6a8014ad07e51ae9350ab791b8 SHA512 e8cadaf3fa95d5ac28e177ec1b5e71b3e330aef4237250fe2579bac07249252d5e40e9f1b831244f3b408bd0a02d85dd76acb1e0129a62524870e4c3083dcac7
diff --git a/sci-calculators/datamash/datamash-1.3.ebuild b/sci-calculators/datamash/datamash-1.3.ebuild
deleted file mode 100644
index 0a8743d8dd44..000000000000
--- a/sci-calculators/datamash/datamash-1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="nls openssl"
-
-CDEPEND="
-	nls? ( sys-devel/gettext )
-	openssl? ( dev-libs/openssl )
-"
-RDEPEND="
-	nls? ( virtual/libintl )
-"
-DEPEND="
-	${CDEPEND}
-	${RDEPEND}
-"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(usex openssl --with-openssl={yes,no})
-}
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 38d0d6e722c9..4e898bf720b9 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,8 +1,8 @@
 AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457a08ddbe98e85cd3c195c149215de8753aa72fec618ccf4bdf584002c507cc53532ee92af6e8097c7fa2573628de34b17c SHA512 f54fb5d006263f89ff8c376f100066d79883b68a30441e8665ca4d8a6aa061e5c697c715ccb93c67a692145a44a441862039e5249e4795159f1c43a12ffe1c97
 DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
-DIST units-2.17.tar.gz 1185070 BLAKE2B 44db938b214596058cdfaeda7fd8d70161221c196a0971b5a0e03331e30fdeb52db85ab43b721f25efd755f4baee4f92aa6204a85d38703a31ec7cac0cefd689 SHA512 e4114f7dc0e40146f969375511c5d930497cb9502306ef82feac78c8e09a03e84ed0b582ff82e2878beae41702c9612f7a3d28fc6e9ed2cfae708f9feb8b737b
 DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7
+DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8
 EBUILD units-2.16.ebuild 1294 BLAKE2B dc631b71d06b87df88986faa03ee6b0ec48e4c7f07eb874b17ff1a2a53e7a48368d9299d24efd00602c66d23ddb5c35a03037ad3e818ff210c4a1ecbcf2c47e6 SHA512 7f42897d19beb48c360de689484a7483a74a26932d3a8749e53e7b26a99d24b10af9c76ed635f04a0cc5f6aadf27bff43895bfe26d2385c942ad8a7df89ccdc4
-EBUILD units-2.17.ebuild 1401 BLAKE2B 01ab9def5187dc6c9998b73178952dbcb2d3de02fd1984712e95b794a7f1e02a7ede68814eccd6c21b3225adf93f98cf743fd9cadab5d5905c5087ae3f28ee6a SHA512 70f9d4b4335ccc392e3cc843741188df403f61a255e2e67478151899f0fb8ee5c9334e79ca0da59bc80c971eb6fb1bebe53e8f4a891f5008cb053f6c0996ca25
 EBUILD units-2.18.ebuild 1401 BLAKE2B 01ab9def5187dc6c9998b73178952dbcb2d3de02fd1984712e95b794a7f1e02a7ede68814eccd6c21b3225adf93f98cf743fd9cadab5d5905c5087ae3f28ee6a SHA512 70f9d4b4335ccc392e3cc843741188df403f61a255e2e67478151899f0fb8ee5c9334e79ca0da59bc80c971eb6fb1bebe53e8f4a891f5008cb053f6c0996ca25
+EBUILD units-2.19.ebuild 1397 BLAKE2B 88ab2561bb81e8032c815c1191a0ab71eeaef671b9894fbf2ac328712a0b1b7bb80fa64c69f5a397b10c94d80b6fac5b99de1c700ddbc21f8b49f8d61e7bf512 SHA512 2d4c83ee37cec61b3d66f26ae7d0e3086789991ddf18e9087211e9a6a5f66b0284c4ac004877a5c85af095e6c72744bf6f6a16c38c0dadc291d4832ffc89a950
 MISC metadata.xml 341 BLAKE2B 60596aa39a0a3810573ced2896624fe01b49ed1138c942969bcd97884078cf69ace3d6cb4d0121de7d548da422a4b823982dc2771dea21817c207285b402ad2a SHA512 b32fc161804c8cd09f6b67923911ddfbdc9c5ba6e5dc61e951bbbe6fd54dd495209c519ead1dd46cb62cf5fd90978472f0d58ed2b66cc079c3ca91a36d22e822
diff --git a/sci-calculators/units/units-2.17.ebuild b/sci-calculators/units/units-2.19.ebuild
index 4d61f6f6676c..9e35768509d5 100644
--- a/sci-calculators/units/units-2.17.ebuild
+++ b/sci-calculators/units/units-2.19.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit eutils python-single-r1
+inherit python-single-r1
 
 DESCRIPTION="Unit conversion program"
 HOMEPAGE="https://www.gnu.org/software/units/units.html"
@@ -11,7 +11,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} )"