commit:     5419b754e5c7e5265e623a3124c5371687f02b15
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 18:32:30 2020 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 22:57:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5419b754

dev-util/buildbot-pkg: Version bump, clean vulnerable versions

Gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=711702
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 dev-util/buildbot-pkg/Manifest                     |  4 +-
 dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild    | 49 ----------------------
 dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild    | 49 ----------------------
 ...pkg-0.9.12.ebuild => buildbot-pkg-2.8.0.ebuild} | 28 +++----------
 4 files changed, 6 insertions(+), 124 deletions(-)

diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index a78d6f88a10..769c73417a0 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,4 +1,2 @@
-DIST buildbot-pkg-0.9.12.tar.gz 4446 BLAKE2B 
e8077d3b212c968694d2d9e5018c9c985acbff592dbccfeb59543a507f263133268dde57efcacfabb90ea61c3184d34dced21f8e269f619d505166e68c76d43e
 SHA512 
5b9847747924b7e04ae7584f549fa498715e293c6dbdbfef1fe5896c8c96cd65471a908b48c46a32eddbcf8f7b3642402974b4ed3319cf42e90028e772b5e34b
-DIST buildbot-pkg-1.1.2.tar.gz 4838 BLAKE2B 
437fd8c7d293622b8499c45072d03912cb196afa97f06220cd3279ad01d2426e399e9c95ee063146dd8713f0284981c8a42b79f44028aebd19cbd5a4fe518eff
 SHA512 
11fcf96907274b699da23c667d7a634b1af3752b9edf651e3fd50f030bdd80d3170013ac2c789fc2943d2ca8a84cb02b5caaeb60e646a54cf8b89a5e701e21b5
-DIST buildbot-pkg-1.3.0.tar.gz 4835 BLAKE2B 
d035060ebf1e5823979adea8b7d31a13cc7bf3382eab571090d68db23b476e2fb959deaf249e6d4f2f3b44cf453c407dd0fd39e54a4e5a3d41462b125c573505
 SHA512 
b8e53de24cd41e31417a4259396fa080c7dad48b5ad2b15d5c9de9eb3fb35196a84f48ba589e8a077382e8a14d760f6148056bbe30972f0542512404e8efbefb
 DIST buildbot-pkg-2.7.0.tar.gz 4754 BLAKE2B 
568c59e9ba60fb2a221794ea7cba44d0a1fb1f4e41368dfcc9199208733fdacb8052a90b64368e8cf5bd906c02ff2d4fddd65dfe4ea117566f176924d4dec621
 SHA512 
9a6b67dbee28ed352671c2da3b14a416761f49bee2e77cf7f55936cbd4556e5509a420c13c7d4d88756e01de8e1268e08b43fa48ac0cf6a00dbff8566042a33b
+DIST buildbot-pkg-2.8.0.tar.gz 4768 BLAKE2B 
c07e7a46681319ebf2d5bdc1a2228218d9b48378cb877277b1e9c88285f4ac4246eea4cea8018d652b8beba01587ccd9c5e25464645f283ba7e8400c7a8efbe4
 SHA512 
962b1b8c56d15ad3b40148d2802630b34f808d7699747e8c97c9a5f48c7b4cdf6762c4994da4fb1a495ae9fa9fa1e1ee2d5076b4eaeb593f9c2090d2329c03cc

diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild 
b/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
deleted file mode 100644
index 2b270c46a06..00000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_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.org/project/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}/${PN}-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch"
-)
-
-python_install_all() {
-       distutils-r1_python_install_all
-}

diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild 
b/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
deleted file mode 100644
index 2b270c46a06..00000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_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.org/project/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}/${PN}-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch"
-)
-
-python_install_all() {
-       distutils-r1_python_install_all
-}

diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild 
b/dev-util/buildbot-pkg/buildbot-pkg-2.8.0.ebuild
similarity index 51%
rename from dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
rename to dev-util/buildbot-pkg/buildbot-pkg-2.8.0.ebuild
index 818b0848056..24f94f8cc0d 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-2.8.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git";
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-[[ ${PV} == *9999 ]] && inherit git-r3
 inherit distutils-r1
 
 MY_PV="${PV/_p/.post}"
@@ -15,31 +14,14 @@ 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.org/project/buildbot-pkg/";
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+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
+KEYWORDS="~amd64"
 
 # 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}
-
-python_install_all() {
-       distutils-r1_python_install_all
-}

Reply via email to