gentoo Easter resync : 12.04.2020

5 files changed, 29 insertions, 51 deletions

diff --git a/dev-util/cligh/Manifest b/dev-util/cligh/Manifest
index fe6d2d4d96ec..dc93b3a5b1ea 100644
--- a/dev-util/cligh/Manifest
+++ b/dev-util/cligh/Manifest
@@ -1,6 +1,4 @@
-DIST cligh-0.1_p20120630.tar.gz 7848 BLAKE2B 4690330e4b353244bc1e7065759637fa9d1de0b412357f00ebbc432e88b6fb00718ba1177900e3bad77c0a0ce8bb3b0defe3de1004137c3ebe73d9d255739291 SHA512 1be944a18cad117ddceb5461f0f53c083f34afe32c79d5ce9494c587fa5d8b8f7c7acc3f7447e18677b7fce2fa96ed7bb34a228b5528f19fe4933a24fefa933d
-DIST cligh-0.2.tar.gz 7844 BLAKE2B 001e597ee60fd8b9e378c96f1ad4ab9dcf42de049bc2a914f8dece12048beebe0ec04b095cad64508af611b2fe52ca43fcf62b5bded74b3336359be85fef1235 SHA512 9b6e5e187324ccc1d9264aa259f648231f46aa443b75682206a17626f4f6f594a14538066f5e561c8a296d740506216db4cbd6ef7a9d25338a9d641cec7e3b9c
-EBUILD cligh-0.1_p20120630.ebuild 545 BLAKE2B 9480e10e97945bcdf10623417fc745ddd7f6a3751d3255d5b23e4ccd99cb5c3ce818268050a33090547df764cd90e839c4641fc45316ccb44b23022428a847e1 SHA512 fd32a8b47b20d93fc89888c1120f34bf2dde9698550e1b6eeea3bfd155cace25cf6109787dc0ce95f9829bc8e7d0efc3d6f5ad2c6fc317e240163f1c7d115217
-EBUILD cligh-0.2.ebuild 482 BLAKE2B fc1a2f481f693f513b3baacbe283408b26f4681a16f96be98435546bc66ab084ec9f10709bb7ea23d364ab980c1c06542bb78c1142479de868159dd7205abc2d SHA512 e26bd6b4af345ff67c145a55e27dfa37fdc12765a1437d17972c7ae9d7e418785c7649bcd127be9e72575a6de8a6ea032b0ac6fd9f3a545b235a07a203fe6746
-EBUILD cligh-9999.ebuild 469 BLAKE2B df181e7959b02de776a5e3130ecddb4ad8d60f2140482a9e58316063eeb25050bafcfaa93a141487a3c1a1033a64391cb57fff82ada2a44a49639b99eb681d41 SHA512 aa660c182dc699119edc982f66b454c6a30cfbad2da42bffa66e6c34598445bbff588aa466794093278d2b733cb757371a9218af30085f22e552c159b5e5e99a
+DIST cligh-0.3.tar.gz 8043 BLAKE2B 496c7d169463a2ecec66ac193480503eb4f5207c8e874fedd8a8a50047f5a3e480dc3c8f7cd401e1c1360a9fa1ae918adfd4f2e5ba928f8ff68df8032d8360af SHA512 85aa702c15e6f19b0118c642944d3151648f38d8f9e86a93f4d4c03c28245548e9910d21edc19f3ada338c33b995fee7bb03e6bafd99499d58cdba35b37faca8
+EBUILD cligh-0.3.ebuild 487 BLAKE2B b4d14f011297666b8915e2a179cc045b1b4d15aa05629e00997e3730b1a0172b97f144c53e1aa4e9b8d941fad32a083843f692cdeedd2a3347fe318db4c5164a SHA512 5ef00b3a9d7635ff81c4b24181cae54ebfa29d6d42a6ffe958eb8e15a8c808f6de5b45604e639b06f4e980979cbf11af3ed113d460ba8fd4874b539c667b10fb
+EBUILD cligh-9999.ebuild 476 BLAKE2B 022452dfafaf2f33921aba89c57b1f8b336a377bd277bea5348c2f68417286216fd1c9e41f0254d3782c8e63d6861689f2e0e1744a378a50fb2f1e4c4361d087 SHA512 b598785128a40a5ac918692ecd79d7ce3f5064a2126da47be3482f0c3592fc486420243514a96ecb1dafc9f21abba3086720681cc1f76fd47c6280c2d49c0334
 MISC metadata.xml 322 BLAKE2B 17e6d135ed46dac64053e30754ace41a45926ea930b32b4c41493eb67d03ff851301b07e4d42c37f6eef1150546eeec67994d9f3795af7197a376435acb68d2a SHA512 3d76d3e71460441beecd4bfdfd96f033d0701a2fa71918b9ffe222c4354ee5d716415ebb1aeff43818bc34a428ca60ef34894c44cee0256244f118e2b54d090d
diff --git a/dev-util/cligh/cligh-0.1_p20120630.ebuild b/dev-util/cligh/cligh-0.1_p20120630.ebuild
deleted file mode 100644
index 2727bd726c2f..000000000000
--- a/dev-util/cligh/cligh-0.1_p20120630.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Command-line interface to GitHub"
-HOMEPAGE="http://the-brannons.com/software/cligh.html"
-SRC_URI="https://github.com/CMB/cligh/archive/401ce7405d3dc7a90bd519dce8ae9be3bdef43ac.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cligh/cligh-0.2.ebuild b/dev-util/cligh/cligh-0.2.ebuild
deleted file mode 100644
index 88c4d2017c48..000000000000
--- a/dev-util/cligh/cligh-0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line interface to GitHub"
-HOMEPAGE="http://the-brannons.com/software/cligh.html"
-SRC_URI="http://the-brannons.com/software/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/cligh/cligh-0.3.ebuild b/dev-util/cligh/cligh-0.3.ebuild
new file mode 100644
index 000000000000..e5589bdcd205
--- /dev/null
+++ b/dev-util/cligh/cligh-0.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line interface to GitHub"
+HOMEPAGE="https://the-brannons.com/software/cligh.html"
+SRC_URI="https://the-brannons.com/software/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]"
diff --git a/dev-util/cligh/cligh-9999.ebuild b/dev-util/cligh/cligh-9999.ebuild
index 808fce4ea2dd..186acb99add1 100644
--- a/dev-util/cligh/cligh-9999.ebuild
+++ b/dev-util/cligh/cligh-9999.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Command-line interface to GitHub"
-HOMEPAGE="http://the-brannons.com/software/cligh.html"
+HOMEPAGE="https://the-brannons.com/software/cligh.html"
 EGIT_REPO_URI="https://github.com/CMB/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
-DEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
+RDEPEND="dev-python/PyGithub[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"