gentoo resync : 20.12.2017

4 files changed, 3 insertions, 61 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 246b68ba6977..8f61ae4332b7 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 64b22049f3af..77cdccda73d0 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,7 +1,5 @@
 DIST units-2.14.tar.gz 1177024 BLAKE2B e129e018e79e60eb3bd8f5c1afa693021ea7c4bfaa330fd0fc94046a5defc5d6f52faeb38b898cc95a7b6626fc6e97f5091d84c7c310842b68dc7f1b4b6c781d SHA512 3cd09a76fb1cccbafaa3e023c791740738c8347425b2645cad1fa768dee3ebde917602cf65988ee8922fed512ec0bc2367f68545450789fc6bf1a79f066a6986
-DIST units-2.15.tar.gz 1178099 BLAKE2B 4f7f7412e21b163302c03d0aa3963acb6cd7fc8e197ce39380ae6cf46d2f1520a73dc3003162831bec5ef2b9fcaaa3ce9b375cab75db353dbef46ae4ba32edb1 SHA512 3fd60acd12142ea3c20bf39184394f300a8284a8946beaf89a8bf2f87c77d8a1ab02189c8a2fd3f93d64517945136fe4ea671edd2d48ea9bae55f9a87b30423f
 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.15.ebuild 1263 BLAKE2B 13d21820720cdb0ea8ce8d0635f27aa22bdca807784019c686eac56584e52c7808c752292b58376cd12b2dd2ee362a99734e0e7646c7ee1590c100d00f07c003 SHA512 c34253b448a5e67114c2b9e19aee0f3fb1bcf399ca23ae88d50fb996e46da0325e0ec832da0f5dcef601492e9d704fd3ee984a6aea9f2ece641e76a10b973f3e
-EBUILD units-2.16.ebuild 1260 BLAKE2B 007876ff14df1617feb74fd6aa13cba1f2d10a351ef93ce748ab85f391807d5c06a2a41a87da0c8ed002ba62453a477770fc19ecada5da0161e153ed0209a43b SHA512 4a2cae82271bc4e1245d07858140d7fb2501e81eedd1a7d42983883f29b77884c6eaaa8691be7017385d7e9aba7a043fd6908f81e204d53538c02f22aae16289
+EBUILD units-2.16.ebuild 1304 BLAKE2B 0d52329322c873803cc510a10523df23226e58c16712b23cb8998c65ee6d25b0755cd2ea80b84e1e68d028655292a9d77c2ea53624d584090b1a6417a78ac86d SHA512 8fe2bf33979f995210ea25a4d9ff5718e53346b8f64e7402f5538a8d6c7577dd0d84b72f2b00818ff15093065f05dd0d200777299d7bb6132b25af452e870221
 MISC metadata.xml 341 BLAKE2B 60596aa39a0a3810573ced2896624fe01b49ed1138c942969bcd97884078cf69ace3d6cb4d0121de7d548da422a4b823982dc2771dea21817c207285b402ad2a SHA512 b32fc161804c8cd09f6b67923911ddfbdc9c5ba6e5dc61e951bbbe6fd54dd495209c519ead1dd46cb62cf5fd90978472f0d58ed2b66cc079c3ca91a36d22e822
diff --git a/sci-calculators/units/units-2.15.ebuild b/sci-calculators/units/units-2.15.ebuild
deleted file mode 100644
index 052a0fabba92..000000000000
--- a/sci-calculators/units/units-2.15.ebuild
+++ /dev/null
@@ -1,57 +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} )
-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? (
-		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-pkg_setup() {
-	use units_cur && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf ac_cv_path_PYTHON=no
-}
-
-src_compile() {
-	emake ${PN}
-}
-
-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
-		sed \
-			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
-			-e 's|^#!|&/usr/bin/python|g' \
-			units_cur_inst > units_cur || die
-		python_fix_shebang units_cur
-		python_doscript units_cur
-	fi
-}
diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16.ebuild
index 2258f3aafd52..aff2577e279e 100644
--- a/sci-calculators/units/units-2.16.ebuild
+++ b/sci-calculators/units/units-2.16.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit eutils python-single-r1
 
 DESCRIPTION="Unit conversion program"
@@ -20,6 +20,7 @@ RDEPEND="
 	units_cur? (
 		${PYTHON_DEPS}
 		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	)
 "
 DEPEND="