gentoo resync : 06.01.2018

9 files changed, 65 insertions, 95 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7112b3b1345f..f53061eec34a 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 855e4247375a..5f3294eb28cd 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -6,6 +6,7 @@ DIST mongo-tools-3.2.13.tar.gz 2712076 BLAKE2B 66e76e049b6a322e05dea21c241d983eb
 DIST mongo-tools-3.2.16.tar.gz 2720003 BLAKE2B e5cb694549b5c70cd07fc8e891b1a78cffec0f99aab62978c70d38c01d9b1ae9c401f9618d24d9afc036ae66657eac40f710076d177497b51c97b963cff31d86 SHA512 61c8cfd04a36e329c3573b73945d20a5623e1aa0a3430b309530e85e4289a27a46a850ec48ede7f04e66e67e23745ef26f5f4ddcf68ffeb647128e3d2526a724
 DIST mongo-tools-3.2.17.tar.gz 2719970 BLAKE2B 666b67d8abdd10f7fa7c557e3c3906fb3cc6bcfa0b97a05e39e5f1ea923d2beb5ec249b3b0a521c4cce4bd595bf18672d8bce38152f84825bb3fffb058fd3b29 SHA512 62c2540027e07b8276621e08d13657864d16021030e3c8f9bc0d351454319d448f889cf6a48b8467ea3270365376ed0c3beb42ceae3f28357910148c6b4054b2
 DIST mongo-tools-3.4.10.tar.gz 4719399 BLAKE2B 8165248bf58f2ea2b02e365a3609c72b72e98dd5902f176e251fa2add1ad26e90900e06c35dc6db4dbe161e541bedfc1776f5e15bbb41dcc9a7be17800424362 SHA512 b861bb3fb1a32c3aa2efefcf6a13bb6d4783ac1a9b006c477fd04deb338cbf6b7adc3944bc6919513b92bd96b8500813ff4af49c9dec0719ebd2fdaa99bc39a5
+DIST mongo-tools-3.6.1.tar.gz 4693844 BLAKE2B 1c6a600abf41a32cbac37cbcef540957e39b6e4574413ecedacdafc761e62b7bb45c285db985bbae01936fddbde0e8d10aa16cd512bd28ae3b60d072ac18b09e SHA512 15a073e92281b515d16c778ef3f540939dfaeaeb92afb303899ea3a7bbecd2782efa0ba05b9ed271660e9000c6108c05a28e2dec826880867c625d06ac65a0be
 EBUILD mongo-tools-3.0.14.ebuild 1096 BLAKE2B c5cc1d28947e0453483d2429c1b1556e880c84e62d563505e420ba5ddf2b64ee1e54b9bdb609ae43091aec967d24cdd2c350c67f9b2f55347cbf334edd7c2004 SHA512 55b66e2872741425cccb75b367e37b4fca28404d63e77a39920246b6a946bf75335d55ea15c7878eb4382ade2cd95bedec4da9a647968a5e27e577073ff7e82f
 EBUILD mongo-tools-3.0.15.ebuild 1098 BLAKE2B ff13b5f35493bead934b47f56a302467346e50d3c6bbfe5958ece13d223da85aae0fa3dcaf991c79dd6694facd4a58657960260352ffa9ff395e4b0ec8dad6b4 SHA512 a36184581a7cff9543a4a63c13549e9096321c558a983a46bb4248541b777a5e4a2e1323f3c140b3fc2b8176a480042d2140e44b488ac69403524410b4115d8d
 EBUILD mongo-tools-3.2.12.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
@@ -13,4 +14,5 @@ EBUILD mongo-tools-3.2.13.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8
 EBUILD mongo-tools-3.2.16.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
 EBUILD mongo-tools-3.2.17.ebuild 1222 BLAKE2B 9fa9d1407e44dfd3b41f13b828aed85dc7174e6c84634312000065ef0c8c8537005e6b76ee6028df02258333ccf13f7b87d713c96f35798ce9ce072de0ed87dc SHA512 fc34ecd308d0c22832afa41b51f1cfcc2fdd447e7c0269ca434ea01057b3d99366636fb94c86be7336a58f27ff69fd7427f2b15dc62965709fc656a2fc7594a1
 EBUILD mongo-tools-3.4.10.ebuild 1238 BLAKE2B cefa920eea7240d51bf726c4717c7400556e76e63534566825625a842373a72a80e0a843f92574964199710fbc2c1b4522e52bdbc9bd1324288570aa318aac86 SHA512 c37664f0902b8a763181af85dbc2e20a0f2e0d63610fb83cb7f75fe3892b7ef265c2be8341635e052aa723de741872c5dc880672f8b3d1216e7ea5917e1cb13e
+EBUILD mongo-tools-3.6.1.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.1.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.1.ebuild
new file mode 100644
index 000000000000..f8c4a23a746a
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.6.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^stty/d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/python-updater/Manifest b/app-admin/python-updater/Manifest
deleted file mode 100644
index aa7d8960242d..000000000000
--- a/app-admin/python-updater/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST python-updater-0.14.tar.bz2 10354 BLAKE2B 09dda2d14dd0e15285914f86d3e9b9637e70057e7aac8105a5d6590ff698c6ab33cf5a081e1af05730c804fcc9472d195f63340dae60da04823dc98005896e8b SHA512 6d5589326a1dc1cb83c42a0d1cdadce4e33ee25a1699e93475d5167666f06fda900822fa3f5657c473999860a36cfb6f6dd1312b66695e47ad3035404e26b9db
-EBUILD python-updater-0.14.ebuild 1064 BLAKE2B 90f69e9f60f9ec9ff33d2c5f350022e5026d288f00352f055f70815eb8f61723c2d7d9532fb6cdc1e2d03804ab0a9f634bafb729220a687b0f09ceaa0322b47b SHA512 fc62c55e1e3d099be2000ae59c1a1f315b6b0e1709a77717f557cfb09e70de9a94656d373820023b605c418be99d92211e5cda72638835d8a50bc94d09112c85
-EBUILD python-updater-9999.ebuild 926 BLAKE2B 4d9d1c15ca106db0e5657a5f4acddce40122cec8fde3436b8279186300990091851cf79fc438ad3a5e2e24e7b51165d042d62dc0540648d00c7d975afa2ec1d2 SHA512 aa89856534e7ce4993a44b7ef4bc0f41d3e478b8cb6df919c505556ed7778255ed7610648312ef264faf979a8803ea58adb545f22f8f9d2cfcdde8849725d83e
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/app-admin/python-updater/metadata.xml b/app-admin/python-updater/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/app-admin/python-updater/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-admin/python-updater/python-updater-0.14.ebuild b/app-admin/python-updater/python-updater-0.14.ebuild
deleted file mode 100644
index 73a56953cebd..000000000000
--- a/app-admin/python-updater/python-updater-0.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="Script used to reinstall Python packages after changing active Python versions"
-HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/python-updater.git"
-else
-	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND="
-		sys-apps/gentoo-functions
-		sys-apps/help2man
-	"
-fi
-RDEPEND="
-	sys-apps/gentoo-functions
-	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 sys-apps/pkgcore )
-"
-
-src_compile() {
-	[[ ${PV} == 9999 ]] && emake python-updater
-	default
-}
diff --git a/app-admin/python-updater/python-updater-9999.ebuild b/app-admin/python-updater/python-updater-9999.ebuild
deleted file mode 100644
index 8e2df7dfc60b..000000000000
--- a/app-admin/python-updater/python-updater-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="Script used to reinstall Python packages after changing active Python versions"
-HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/python-updater.git"
-else
-	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND="
-		sys-apps/gentoo-functions
-		sys-apps/help2man
-	"
-fi
-RDEPEND="
-	sys-apps/gentoo-functions
-	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 sys-apps/pkgcore )
-"
-
-src_compile() {
-	[[ ${PV} == 9999 ]] && emake python-updater
-	default
-}
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 80d012360fd7..f6e7e3c5830a 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,3 +1,3 @@
 DIST system-config-printer-1.4.8.tar.xz 904068 BLAKE2B dfadfd7f2ef8c37a588d2a4755c977a07c16d3779cf30652ca1056986d5de073fa334a912e4a8e865e88b323888f88b83c5ef8b086e4afafd7bf284c1b597f3d SHA512 9f832f11e0e6bca32a29201b9f78d7a3ea35a46f7484548e5e71e6939fd51065e07325e12bdb1bc577ee606299cfef54759def6564923904a79f27b654ec5304
-EBUILD system-config-printer-1.4.8.ebuild 2593 BLAKE2B 7951f40f4014bcb1759af71974f3854f6c7182a753da8bf4227f236158483c0c0b15cec037b4a105e485d17bdd0e2b10f4375a8103354d3a09c06395bb314bcf SHA512 8534d81c6349e5959d819c38f85a67d29695fc078fe7e2a512ed8042184aa7310cfd6d4225a6341472c0f3e4967ef3921568e41859444362a1d430118d574207
+EBUILD system-config-printer-1.4.8.ebuild 2305 BLAKE2B 594c35c24a8d0ed8c79ed6af9d73069022d3af1d8dd321898dd8b3a1773c38673e2ab26d4b4da065a03e5e54ae738f1d67bc9032a3933dbefc8c4889cae6ce23 SHA512 0e1d651a46c0cfec924aec183fdfbfe175e668d3e0c566838c72527d90a28ab194a92952cda5c9a46999b03487b7441cab4709521f2a5e1757b112d5ab09878f
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
index 5ed82d665477..4dc7fcecc7ff 100644
--- a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -58,13 +58,6 @@ DEPEND="${RDEPEND}
 	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
 "
 
-APP_LINGUAS="ar as bg bn_IN bn br bs ca cs cy da de el en_GB es et fa fi fr gu
-he hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl
-pt_BR pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW"
-for X in ${APP_LINGUAS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
 # Bug 471472
 MAKEOPTS+=" -j1"