gentoo resync : 23.03.2018

5 files changed, 9 insertions, 58 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index eb86ba07ff1e..7916ad8f7011 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/datamash/Manifest b/sci-calculators/datamash/Manifest
index 2655ccf689e0..46c486d1464c 100644
--- a/sci-calculators/datamash/Manifest
+++ b/sci-calculators/datamash/Manifest
@@ -1,6 +1,6 @@
 AUX datamash-1.2-libcrypto.patch 839 BLAKE2B bdd4b2eb1f7a840cc2fdeced4ac2bfde05c3826cafac3f043bea493d2494c30e8168166dcb1529897e8cf8e49b187a023a0f18c144481cb3629197de797d9297 SHA512 f7bac5d4ec43736e04217a5c15d29344fafd47afa1034149ecebe229aa18539649a74df31c93c8be8db0aec1d16e12efa285faaf0039756bdf12b4fb10e03cbf
-DIST datamash-1.1.1.tar.gz 1912118 BLAKE2B 256d3cc6e69b2bd6c16579137cd511a4f352f0073a83f90ff25a28993b72d5babb86bbf9525dc42146455b2b5f839a28d3ff5f611cd40384486a545a730fdd39 SHA512 8932ed5ec357348108cd559acada3bfdc12ee4e360d709d74a6a661bc55f80223baa493d9185be8816b550ef86ff1f760249deb77cbeee9aa1f4178043a1938f
 DIST datamash-1.2.tar.gz 1922522 BLAKE2B 877a596aa486756199431d6eaae8f2005bf34b20cae9c94e94441069b0153b15bbab067198a7be9bf76c3e305067f5f1c8980274fcaf37f232748a3c99d61ed8 SHA512 afb0960ffa881e1112394f5e0355c7a6efea13d6bdcbccb9830a6cde617e13701ca361d62c8283b7a64a27135b2f54a75970b17a7d73a5f0ba914ab70f05c086
-EBUILD datamash-1.1.1.ebuild 533 BLAKE2B 5de4eb6491ca9e93b66f389d9c069507a5550fcd57cf149a498f7e194fa9de644b1c116c058ed5eb5933c438857fade43d06dd52611ab8eef6039b299db2000a SHA512 90a4b64825da8bd0367484a878750591eee157228da9d03ca87215ce64bbe34654fc0e4ad98d6199544def6a902a025dd3b52f2e9f9cf4dbc78e10d9c301af69
+DIST datamash-1.3.tar.gz 1939375 BLAKE2B 4fe08d14ffaca21ce78d5b2781fadc665dfbc87c628338ad63eba09779179e4bfa3f578c1a8018acfbf8b3c7aad0389ee068d1b21718b1f576b6e5e8ed8d03c2 SHA512 3c36dd01035dc114f2fbfcb8746354e496e6c1536f7b5908cf25632d9cbaddfcd06fc26f8883ef845a6ecd85ceb5708bb7edb3d1b1c6efa273ef5ec0b758366a
 EBUILD datamash-1.2.ebuild 656 BLAKE2B 95d0454a774549600fab78d3c716be19261b78321e92ac99f3eda6595dd3512d98f5a7aebb21c984b40d484617deaae77bd70b7d9ac5b76ab8dac072ef5f66fe SHA512 54f592bb186285144d6710482b2b3f4a880dbf5c7b3611c63d5883c901406cadbee966781d939a75a613d6c3a23b69082c918bd24dc319d3cbd94003606ae21b
+EBUILD datamash-1.3.ebuild 603 BLAKE2B 7b4e0d9652693cf925253d2979a14349f4a1e66dcd1fa9f41158aacc0575c6c42df5a0de3c777a6ee6a5292cecd23b2f32dcbfc7bf8d879322de7d7ade76c098 SHA512 39457e47ab6e119cca3d0ab8cd1db2ba98ec5973ee608adba37d493de65c7090829a12bbd59f9444744e8a699d2c102899752c587a3df6f8c54f7f455c35a3a7
 MISC metadata.xml 310 BLAKE2B 3cdfd42d49682ab36ccc013dd4818674fe05abe3749ee328d41877a865de82f69ee4f8e8aa1b5e4bca55c50120489e5896ff0e6a8014ad07e51ae9350ab791b8 SHA512 e8cadaf3fa95d5ac28e177ec1b5e71b3e330aef4237250fe2579bac07249252d5e40e9f1b831244f3b408bd0a02d85dd76acb1e0129a62524870e4c3083dcac7
diff --git a/sci-calculators/datamash/datamash-1.1.1.ebuild b/sci-calculators/datamash/datamash-1.3.ebuild
index 85e141847bc5..0a8743d8dd44 100644
--- a/sci-calculators/datamash/datamash-1.1.1.ebuild
+++ b/sci-calculators/datamash/datamash-1.3.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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="http://www.gnu.org/software/datamash/"
+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"
+IUSE="nls openssl"
 
 CDEPEND="
 	nls? ( sys-devel/gettext )
+	openssl? ( dev-libs/openssl )
 "
 RDEPEND="
 	nls? ( virtual/libintl )
@@ -24,5 +25,7 @@ DEPEND="
 "
 
 src_configure() {
-	econf $(use_enable nls) --with-openssl=no
+	econf \
+		$(use_enable nls) \
+		$(usex openssl --with-openssl={yes,no})
 }
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 027f777cf326..c8ef3aeee5fe 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,5 +1,3 @@
-DIST units-2.14.tar.gz 1177024 BLAKE2B e129e018e79e60eb3bd8f5c1afa693021ea7c4bfaa330fd0fc94046a5defc5d6f52faeb38b898cc95a7b6626fc6e97f5091d84c7c310842b68dc7f1b4b6c781d SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986
 DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
-EBUILD units-2.14-r1.ebuild 1233 BLAKE2B bd66403525e7368744a81932811aa22b0dc4fe77112d6d568ef4cb56c0ba89abef3f4f9195e1040898cb64e3e03ed39ace677179848780b370313b1281e4938a SHA512 e6d4727b16e7a07817fbe06bcdb7d90049542d22b8987a46aedc7a88d6ce08e7494839e78faf4dc6f6912fc5a746b991c3bb242a353110824cc51d0f61bc7fa6
 EBUILD units-2.16.ebuild 1301 BLAKE2B c2c88bf299514de215d2a14f446a4e119a81d392102bf690314e5c6117fc6440dc7095f1173b7a8f4f37169b765e02bd771bc4fc8f8f2f6b97652fcf7520f525 SHA512 78696d32f52f9590f8e31f8989a67d35f034bea82c564f5d6d1e2f360f4f5d429f22f99fb167158376a613d5bc258819608332feabc02a8cd01b70823de94ee2
 MISC metadata.xml 341 BLAKE2B 60596aa39a0a3810573ced2896624fe01b49ed1138c942969bcd97884078cf69ace3d6cb4d0121de7d548da422a4b823982dc2771dea21817c207285b402ad2a SHA512 b32fc161804c8cd09f6b67923911ddfbdc9c5ba6e5dc61e951bbbe6fd54dd495209c519ead1dd46cb62cf5fd90978472f0d58ed2b66cc079c3ca91a36d22e822
diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild
deleted file mode 100644
index 45559228bae3..000000000000
--- a/sci-calculators/units/units-2.14-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="xml"
-inherit eutils python-single-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? (
-		dev-python/unidecode[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-DEPEND=${RDEPEND}
-
-pkg_setup() {
-	use units_cur && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf ac_cv_path_PYTHON=no
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog NEWS README
-
-	# we're intentionally delaying this since 'make install' would
-	# get confused if we shove 'units_cur' there, and there is no real
-	# need to add more complexity for it
-	if use units_cur; then
-		local pyver
-		python_is_python3 && pyver=3 || pyver=2
-		sed -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
-			"units_cur${pyver}" > units_cur || die
-		python_doscript units_cur
-	fi
-}