gentoo resync : 19.01.2018

3 files changed, 88 insertions, 0 deletions

diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index f42cb17ee3c9..4e4a139383d6 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,9 +1,12 @@
+AUX buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch 959 BLAKE2B c3b72b0a2c1a5afeb69d76b14d91292a45e827d28c82a7975d4a4e73fdcab66a87445aaa621593f98bdd34eb99dd564b9fdf015655906cf53b8f581a00377f97 SHA512 3d2d0e0d4049f623deca4ba050d873761f63fa4cb24cf4c83c52dd7c0f3eec483b6e76353a72b1ee3b0e3a64c54d8174620a3ff93ccdd1474d746d6309b5ae6a
 DIST buildbot-pkg-0.9.10.tar.gz 4422 BLAKE2B bf32d23fa2c2aeb7dab9af84fd095f48a3561522fdb537c8043d46cd520657e6d71028a07448e70a69c5abc4c24370ef9d1ad1da901b9c198778ee8043b64e11 SHA512 d31ef269ddbd042a9064daea526f289f2ec3ffa58dc8f43a8e40ae81b03cfa026f219bcce2ccb83addca0b1da0a8a2d3bc894a400edb9c45f4c0cde7691b5e4d
 DIST buildbot-pkg-0.9.11.tar.gz 4420 BLAKE2B 1930f7416d8037e35603ee2fa7fb739ded5c9a42dcc5f3a4c5b49d49e29932374a369558af9d2c4ef259fe2d016e7c9ee5a31f1a9e520d3c1c77ff5281b14f30 SHA512 63f75f4df2a725caa48d98c09037580c7b6a16609e4063e7aaab8a0e4b7bda4c74da8bf524b7d9a0cf9e909146522af5ffe8f1a5a8617c5f67658cc723f61b2e
 DIST buildbot-pkg-0.9.12.tar.gz 4446 BLAKE2B e8077d3b212c968694d2d9e5018c9c985acbff592dbccfeb59543a507f263133268dde57efcacfabb90ea61c3184d34dced21f8e269f619d505166e68c76d43e SHA512 5b9847747924b7e04ae7584f549fa498715e293c6dbdbfef1fe5896c8c96cd65471a908b48c46a32eddbcf8f7b3642402974b4ed3319cf42e90028e772b5e34b
 DIST buildbot-pkg-0.9.13.tar.gz 4448 BLAKE2B ea270faafa4a271e11ea1e64191dac0aaf9b6bc08e4d70e71746f9e70eadbe9d70555677bf7e9b264ac9146db0cb1cc639d86194b5280ad53fbe29bf073ee718 SHA512 1cf3ea6237062a0d8c3955ae75b76dd1193ed28c32528f341b242fe6dcc50f4300366474dcdce27246166b35cc1ca31df556b5e6481f5027d073122f1c00362d
+DIST buildbot-pkg-0.9.15.post1.tar.gz 4916 BLAKE2B 17f38dd7c0d70a7d07fde7c53128901dee24bda0d6503bea1dacfbf6f14bba17b645f5067e0932a5f03660330c20f647fe6d4c2125fdbf714a5828de314881bf SHA512 1951de2df02d50ba1d7c3bc6db9084acf65f88a9f9f73bf26715c7d14521403580a26efd8294aa5f2de40b986032dd78fe52230e58ad3d298f39d229481fc286
 EBUILD buildbot-pkg-0.9.10.ebuild 1067 BLAKE2B 9d94fd537541931318bc7cf2e6cf386d9ba798955f60dc8331a8b31f3930c7a9636e09460883f8d5a1945a38049278c0cd3673b29c6a5c97ecdfc97d055acf48 SHA512 4efe52a0999ed6ecbe2ab002f2bff90f365b78e8c47272c952211128b94f93b8070925c6784fc1c5655802c8ede02300781670b60d604569c40bdfa855a8ab7f
 EBUILD buildbot-pkg-0.9.11.ebuild 1067 BLAKE2B 9d94fd537541931318bc7cf2e6cf386d9ba798955f60dc8331a8b31f3930c7a9636e09460883f8d5a1945a38049278c0cd3673b29c6a5c97ecdfc97d055acf48 SHA512 4efe52a0999ed6ecbe2ab002f2bff90f365b78e8c47272c952211128b94f93b8070925c6784fc1c5655802c8ede02300781670b60d604569c40bdfa855a8ab7f
 EBUILD buildbot-pkg-0.9.12.ebuild 1067 BLAKE2B 294d93ff6004f532845e7d0351e966d49ee1f0352324475c427c2b1bcc9b429bc94b9632d7c39c325b34ef99f1ba255398082c95a0bb12133ac219f56292c307 SHA512 4182c2166ce82bc5909a6297b35aa443b5960829717f48eb1cc187c12d8b519b6d158e8e06ffc2946893c9d415a833bf1ead4bd36300c124912fe132870ce1a3
 EBUILD buildbot-pkg-0.9.13.ebuild 1073 BLAKE2B e1521bbee6b5ea441388b0343fea8e70a1658c0c4d0b2f9773e1e5281c895eb330928f4da0c0684e3dc4d5cd288eafe321865fbeabb6922b965de425599a2da2 SHA512 b06e0af0cc87c3953438474323481de1cf4731c0878ea20471758ee9733c574365cbdd6ba58977b3129c504c60be83260bf97e3b11c6332595a17bbaebc5308f
+EBUILD buildbot-pkg-0.9.15_p1.ebuild 1152 BLAKE2B 407347193ca18710fac91e872eefd3b04053e1d0fb2a02c82e1317bc4cb5d54a43365fcb4b7c74712f95497abe65354c29c77b868e07df711e3c3b0a0f2a57a8 SHA512 b0d9371df5f876fbac6c92d590697770ae33fa0a4938ce1db0498231bdb62d25b5ff7ecac11bde530a15db5dd2a45f3dab330469a59b9750ed981899d18a5bef
 MISC metadata.xml 1309 BLAKE2B f2c7d28ec175efb170fc4f556b4f0d8beb8e6ca809240739ade425d6258d6617ed97a6cd5abd9a0f9a54e07a520113ad65dd2b912497adb89ef2cafa74038a56 SHA512 8ef3eb044f5b1b072a48a26436fec067a2b299b1cb144df13eaa283370c291225dde8e895b6cefab18ff7632882c9adcc7344b6bd41f0fb8a102d65862102a19
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
new file mode 100644
index 000000000000..42d65473d684
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-pkg"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-Removedevelopmentvirtualenvironmenthack.patch"
+)
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-pkg/files/buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch b/dev-util/buildbot-pkg/files/buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch
new file mode 100644
index 000000000000..ac17539c4e0d
--- /dev/null
+++ b/dev-util/buildbot-pkg/files/buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch
@@ -0,0 +1,36 @@
+From 6d9f81ec15b7b18f8791981a0d65dc4f266022ca Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Mon, 15 Jan 2018 16:27:54 -0800
+Subject: [PATCH] pkg/buildbot_pkg.py: Remove development virtualenvironment
+ hack
+
+This hack is not needed/nor works reliably in non-virtualenv installs.
+---
+ pkg/buildbot_pkg.py | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/buildbot_pkg.py b/buildbot_pkg.py
+index 89847b040..7788e12d6 100644
+--- a/buildbot_pkg.py
++++ b/buildbot_pkg.py
+@@ -33,17 +33,6 @@ import setuptools.command.build_py
+ import setuptools.command.egg_info
+ from setuptools import setup
+ 
+-old_listdir = os.listdir
+-
+-
+-def listdir(path):
+-    # patch listdir to avoid looking into node_modules
+-    l = old_listdir(path)
+-    if "node_modules" in l:
+-        l.remove("node_modules")
+-    return l
+-os.listdir = listdir
+-
+ 
+ def check_output(cmd):
+     """Version of check_output which does not throw error"""
+-- 
+2.15.1
+