[gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2016-08-02 18:47 Fabian Groffen
  0 siblings, 0 replies; 18+ messages in thread
From: Fabian Groffen @ 2016-08-02 18:47 UTC (permalink / raw
  To: gentoo-commits

commit:     c78f0d0a67010b4f1e69d6282f2d3020c04ab1f3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 18:46:32 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 18:46:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c78f0d0a

app-admin/diamond: use hprefixify for Prefix

Package-Manager: portage-2.2.28

 app-admin/diamond/diamond-4.0-r1.ebuild | 10 ++++------
 app-admin/diamond/diamond-9999.ebuild   |  8 +++-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild
index a9dbda4..e137272 100644
--- a/app-admin/diamond/diamond-4.0-r1.ebuild
+++ b/app-admin/diamond/diamond-4.0-r1.ebuild
@@ -10,13 +10,13 @@ if [[ ${PV} = 9999* ]]; then
 	S=${WORKDIR}/diamond-${PV}
 else
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${PV}
 fi
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 eutils prefix
 
 DESCRIPTION="Python daemon that collects and publishes system metrics"
 HOMEPAGE="https://github.com/python-diamond/Diamond"
@@ -37,10 +37,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# adjust for Prefix
-	sed -i \
-		-e '/default="\/etc\/diamond\/diamond.conf"/s:=":="'"${EPREFIX}"':' \
-		bin/diamond* \
-		|| die
+	hprefixify bin/diamond*
 
 	# fix necessary to make handlers honour their config, simple sed
 	# doing the same as upstream
@@ -67,6 +64,7 @@ python_install() {
 	sed -i \
 		-e '/pid_file =/s:/var/run:/run:' \
 		"${ED}"/etc/diamond/diamond.conf.example || die
+	hprefixify "${ED}"/etc/diamond/diamond.conf.example
 }
 
 src_install() {

diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild
index cb7f078..656013e 100644
--- a/app-admin/diamond/diamond-9999.ebuild
+++ b/app-admin/diamond/diamond-9999.ebuild
@@ -16,7 +16,7 @@ fi
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1
+inherit distutils-r1 prefix
 
 DESCRIPTION="Python daemon that collects and publishes system metrics"
 HOMEPAGE="https://github.com/python-diamond/Diamond"
@@ -37,10 +37,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# adjust for Prefix
-	sed -i \
-		-e '/default="\/etc\/diamond\/diamond.conf"/s:=":="'"${EPREFIX}"':' \
-		bin/diamond* \
-		|| die
+	hprefixify bin/diamond*
 
 	distutils-r1_src_prepare
 }
@@ -57,6 +54,7 @@ python_install() {
 	sed -i \
 		-e '/pid_file =/s:/var/run:/run:' \
 		"${ED}"/etc/diamond/diamond.conf.example || die
+	hprefixify "${ED}"/etc/diamond/diamond.conf.example
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2017-05-09  9:42 Mikle Kolyada
  0 siblings, 0 replies; 18+ messages in thread
From: Mikle Kolyada @ 2017-05-09  9:42 UTC (permalink / raw
  To: gentoo-commits

commit:     6a098c111d77594f930049a40f24ef173d79db63
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 09:40:50 2017 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue May  9 09:40:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a098c11

app-admin/diamond: amd64/x86 stable wrt bug #617892

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/diamond/diamond-4.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild
index 202cf0c73d4..90c4c2549e9 100644
--- a/app-admin/diamond/diamond-4.0-r1.ebuild
+++ b/app-admin/diamond/diamond-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	S=${WORKDIR}/diamond-${PV}
 else
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${PV}
 fi
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2017-07-11  9:22 Fabian Groffen
  0 siblings, 0 replies; 18+ messages in thread
From: Fabian Groffen @ 2017-07-11  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     2008355b598e298bdfd90213e8e9b2fb20c51516
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 11 09:21:41 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 09:22:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2008355b

app-admin/diamond: version bump to v4.0.515

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-admin/diamond/Manifest               |  1 +
 app-admin/diamond/diamond-4.0.515.ebuild | 70 ++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index de109ba841b..3ca8ebfc740 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -1 +1,2 @@
+DIST python-diamond-4.0.515.tar.gz 620337 SHA256 3e8a1ff06b18d70a850d10689b3c8e041e91237aa8dee16db824ec368c04949f SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5 WHIRLPOOL 39fe60e68b28e706a615c9b6068384b2ffac0710d06f26988341e1f032db4558d0018d7d746c7eef12ad0c0e04969decddd839f6cdc7fc1c01aca31c91e2591e
 DIST python-diamond-4.0.tar.gz 491433 SHA256 e84dd3c87b230d524306a07c3fc7c1db1d9796e3748025e8345a4fa18b162256 SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b WHIRLPOOL 2b1f6124001183058cf282d6e9c51bba0878f26308731266f2c31c549bb42db945c579b49b5a34666e0c05ccbda0163135662a11e59a482f8ef031c49c6005ba

diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
new file mode 100644
index 00000000000..83e5f00615c
--- /dev/null
+++ b/app-admin/diamond/diamond-4.0.515.ebuild
@@ -0,0 +1,70 @@
+# 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
+	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
+	S=${WORKDIR}/diamond-${PV}
+else
+	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S=${WORKDIR}/Diamond-${PV}
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Python daemon that collects and publishes system metrics"
+HOMEPAGE="https://github.com/python-diamond/Diamond"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test mongo mysql snmp redis"
+
+RDEPEND="dev-python/configobj
+	dev-python/setproctitle
+	mongo? ( dev-python/pymongo )
+	mysql? ( dev-python/mysql-python )
+	snmp? ( dev-python/pysnmp )
+	redis? ( dev-python/redis-py )
+	!kernel_linux? ( >=dev-python/psutil-3 )"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock )"
+
+src_prepare() {
+	# adjust for Prefix
+	hprefixify bin/diamond*
+
+	# fix the version (not set in GitHub archive)
+	sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die
+	# fix symlink out of place
+	rm README.md || die
+	cp docs/index.md README.md || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
+}
+
+python_install() {
+	export VIRTUAL_ENV=1
+	distutils-r1_python_install
+	mv "${ED}"/usr/etc "${ED}"/ || die
+	rm "${ED}"/etc/diamond/*.windows  # won't need these
+	sed -i \
+		-e '/pid_file =/s:/var/run:/run:' \
+		"${ED}"/etc/diamond/diamond.conf.example || die
+	hprefixify "${ED}"/etc/diamond/diamond.conf.example
+}
+
+src_install() {
+	distutils-r1_src_install
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/log/diamond
+}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2017-09-17  9:59 Fabian Groffen
  0 siblings, 0 replies; 18+ messages in thread
From: Fabian Groffen @ 2017-09-17  9:59 UTC (permalink / raw
  To: gentoo-commits

commit:     81d97b2fa94796ba3f76b14be521d88788532143
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 09:57:55 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 09:59:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d97b2f

app-admin/diamond: marked ~arm

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 app-admin/diamond/diamond-4.0.515.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
index 83e5f00615c..a10298e45b4 100644
--- a/app-admin/diamond/diamond-4.0.515.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	S=${WORKDIR}/diamond-${PV}
 else
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${PV}
 fi
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2017-12-03 11:27 Fabian Groffen
  0 siblings, 0 replies; 18+ messages in thread
From: Fabian Groffen @ 2017-12-03 11:27 UTC (permalink / raw
  To: gentoo-commits

commit:     c5dea8a8747baaf3792c03dd2f8bc297ad1da531
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  3 11:26:19 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 11:26:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5dea8a8

app-admin/diamond: fix tests, bug #639586

Closes: https://bugs.gentoo.org/639586
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-admin/diamond/Manifest               |  4 ++--
 app-admin/diamond/diamond-4.0.515.ebuild |  9 ++++++++-
 app-admin/diamond/diamond-9999.ebuild    | 11 +++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index 3ca8ebfc740..3cfe85f452f 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -1,2 +1,2 @@
-DIST python-diamond-4.0.515.tar.gz 620337 SHA256 3e8a1ff06b18d70a850d10689b3c8e041e91237aa8dee16db824ec368c04949f SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5 WHIRLPOOL 39fe60e68b28e706a615c9b6068384b2ffac0710d06f26988341e1f032db4558d0018d7d746c7eef12ad0c0e04969decddd839f6cdc7fc1c01aca31c91e2591e
-DIST python-diamond-4.0.tar.gz 491433 SHA256 e84dd3c87b230d524306a07c3fc7c1db1d9796e3748025e8345a4fa18b162256 SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b WHIRLPOOL 2b1f6124001183058cf282d6e9c51bba0878f26308731266f2c31c549bb42db945c579b49b5a34666e0c05ccbda0163135662a11e59a482f8ef031c49c6005ba
+DIST python-diamond-4.0.515.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5
+DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b

diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
index a10298e45b4..6c874d48ed2 100644
--- a/app-admin/diamond/diamond-4.0.515.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.ebuild
@@ -32,7 +32,10 @@ RDEPEND="dev-python/configobj
 	redis? ( dev-python/redis-py )
 	!kernel_linux? ( >=dev-python/psutil-3 )"
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock )"
+	test? (
+		dev-python/mock
+		dev-python/pysnmp
+	)"
 
 src_prepare() {
 	# adjust for Prefix
@@ -48,6 +51,10 @@ src_prepare() {
 }
 
 python_test() {
+	# don't want to depend on docker for just this
+	mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die
+	# fails on binding ports
+	mv src/collectors/portstat/tests/{test,no}_portstat.py || die
 	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
 }
 

diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild
index c37ee683c29..57df76bc074 100644
--- a/app-admin/diamond/diamond-9999.ebuild
+++ b/app-admin/diamond/diamond-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,7 +32,10 @@ RDEPEND="dev-python/configobj
 	redis? ( dev-python/redis-py )
 	!kernel_linux? ( >=dev-python/psutil-3 )"
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock )"
+	test? (
+		dev-python/mock
+		dev-python/pysnmp
+	)"
 
 src_prepare() {
 	# adjust for Prefix
@@ -42,6 +45,10 @@ src_prepare() {
 }
 
 python_test() {
+	# don't want to depend on docker for just this
+	mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die
+	# fails on binding ports
+	mv src/collectors/portstat/tests/{test,no}_portstat.py || die
 	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
 }
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2019-02-21 18:37 Fabian Groffen
  0 siblings, 0 replies; 18+ messages in thread
From: Fabian Groffen @ 2019-02-21 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     8ffd36140a186c7e55768b215ddf58f1d04f8765
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 21 18:35:44 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 18:35:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ffd3614

app-admin/diamond: fix psutil interaction

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-admin/diamond/diamond-4.0.515.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
index 6c874d48ed2..4477513e976 100644
--- a/app-admin/diamond/diamond-4.0.515.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -43,6 +43,9 @@ src_prepare() {
 
 	# fix the version (not set in GitHub archive)
 	sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die
+	# fix psutil usage
+	sed -i -e 's/psutil\.network_io_counters/psutil.net_io_counters/' \
+		src/collectors/network/network.py || die
 	# fix symlink out of place
 	rm README.md || die
 	cp docs/index.md README.md || die


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2019-06-20 18:06 Mikle Kolyada
  0 siblings, 0 replies; 18+ messages in thread
From: Mikle Kolyada @ 2019-06-20 18:06 UTC (permalink / raw
  To: gentoo-commits

commit:     421cdbf145cc9a7916a811faac455ca33745663a
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 18:06:10 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 18:06:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=421cdbf1

app-admin/diamond: amd64 stable wrt bug #666736

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-admin/diamond/diamond-4.0.515.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
index 4477513e976..c5290acd116 100644
--- a/app-admin/diamond/diamond-4.0.515.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	S=${WORKDIR}/diamond-${PV}
 else
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${PV}
 fi
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2019-06-21 11:07 Agostino Sarubbo
  0 siblings, 0 replies; 18+ messages in thread
From: Agostino Sarubbo @ 2019-06-21 11:07 UTC (permalink / raw
  To: gentoo-commits

commit:     0aca87f0be2b276bc5f49e75fe4a40857e79c8b4
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 11:06:34 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 11:06:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aca87f0

app-admin/diamond: x86 stable wrt bug #666736

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 app-admin/diamond/diamond-4.0.515.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
index c5290acd116..6987c28cecd 100644
--- a/app-admin/diamond/diamond-4.0.515.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	S=${WORKDIR}/diamond-${PV}
 else
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${PV}
 fi
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2019-12-07 14:38 Fabian Groffen
  0 siblings, 0 replies; 18+ messages in thread
From: Fabian Groffen @ 2019-12-07 14:38 UTC (permalink / raw
  To: gentoo-commits

commit:     6b7cf0af64a5bdcd3e98b0e89e4202cd3f35ebdf
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  7 14:36:57 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec  7 14:38:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b7cf0af

app-admin/diamond-4.0.515.20180315: bump for py3 support

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-admin/diamond/Manifest                         |  1 +
 ...9999.ebuild => diamond-4.0.515.20180315.ebuild} | 27 +++++++++++++++++-----
 app-admin/diamond/diamond-9999.ebuild              |  7 +++---
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index 3cfe85f452f..d73e7280e28 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -1,2 +1,3 @@
+DIST python-diamond-4.0.515.20180315.tar.gz 673084 BLAKE2B a1903368fc1b540028038a401cf68c772fd04d5d19dc7e3773c9909c1b4ccb5eeba6e184fd46da83e9c0234675e51331a4097a810191ac1a18242cbf96b0456c SHA512 8497362659fa43e4c72bd28d03ff9d8b3ccaab3901cb5e0e1e252340b70a6ab0972db37863daad0d7dd8e92c83a82f9ec151af07ca5fdafee0d214a7061b5f9f
 DIST python-diamond-4.0.515.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5
 DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b

diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-4.0.515.20180315.ebuild
similarity index 64%
copy from app-admin/diamond/diamond-9999.ebuild
copy to app-admin/diamond/diamond-4.0.515.20180315.ebuild
index 57df76bc074..8882dd7f46c 100644
--- a/app-admin/diamond/diamond-9999.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20180315.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
 	S=${WORKDIR}/diamond-${PV}
 else
-	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/Diamond-${PV}
+	GHASH=0f3eb04327d6d3ed5e53a9967d6c9d2c09714a47
+	SRC_URI="https://github.com/python-diamond/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S=${WORKDIR}/Diamond-${GHASH}
 fi
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 prefix
 
@@ -41,6 +42,19 @@ src_prepare() {
 	# adjust for Prefix
 	hprefixify bin/diamond*
 
+	# fix the version (not set in GitHub archive)
+	sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die
+	# fix psutil usage
+	sed -i -e 's/psutil\.network_io_counters/psutil.net_io_counters/' \
+		src/collectors/network/network.py || die
+	# fix symlink out of place
+	rm README.md || die
+	cp docs/index.md README.md || die
+
+	# this module isn't Python3 yet (lambda), if you use this and have a
+	# fix, let me know
+	rm src/diamond/handler/rrdtool.py || die
+
 	distutils-r1_src_prepare
 }
 
@@ -55,6 +69,7 @@ python_test() {
 python_install() {
 	export VIRTUAL_ENV=1
 	distutils-r1_python_install
+	python_optimize
 	mv "${ED}"/usr/etc "${ED}"/ || die
 	rm "${ED}"/etc/diamond/*.windows  # won't need these
 	sed -i \

diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild
index 57df76bc074..73f30e45464 100644
--- a/app-admin/diamond/diamond-9999.ebuild
+++ b/app-admin/diamond/diamond-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
@@ -13,7 +13,7 @@ else
 	S=${WORKDIR}/Diamond-${PV}
 fi
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 prefix
 
@@ -55,6 +55,7 @@ python_test() {
 python_install() {
 	export VIRTUAL_ENV=1
 	distutils-r1_python_install
+	python_optimize
 	mv "${ED}"/usr/etc "${ED}"/ || die
 	rm "${ED}"/etc/diamond/*.windows  # won't need these
 	sed -i \


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2019-12-08 10:31 Fabian Groffen
  0 siblings, 0 replies; 18+ messages in thread
From: Fabian Groffen @ 2019-12-08 10:31 UTC (permalink / raw
  To: gentoo-commits

commit:     545b62b32ebcf72c3163f4e6e9201867a0a47e87
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  8 10:27:16 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Dec  8 10:31:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545b62b3

app-admin/diamond-4.0.515.20170311: bump to python3 branch

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-admin/diamond/Manifest                         |  2 +-
 ...0315.ebuild => diamond-4.0.515.20170311.ebuild} | 17 ++++-
 app-admin/diamond/diamond-9999.ebuild              | 72 ----------------------
 3 files changed, 17 insertions(+), 74 deletions(-)

diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index d73e7280e28..19cd08fe4fa 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -1,3 +1,3 @@
-DIST python-diamond-4.0.515.20180315.tar.gz 673084 BLAKE2B a1903368fc1b540028038a401cf68c772fd04d5d19dc7e3773c9909c1b4ccb5eeba6e184fd46da83e9c0234675e51331a4097a810191ac1a18242cbf96b0456c SHA512 8497362659fa43e4c72bd28d03ff9d8b3ccaab3901cb5e0e1e252340b70a6ab0972db37863daad0d7dd8e92c83a82f9ec151af07ca5fdafee0d214a7061b5f9f
+DIST python-diamond-4.0.515.20170311.tar.gz 671963 BLAKE2B 9449f2d27b48c0e24727eb2c415a5095b20199d9315ef69df92a4aa6f8f3397743f3dc6cf2d8d91f79eca309926731b6b42da170a02987a20aeccd1e0980f4ac SHA512 d18a80540018975455b839a78fd55d13d167726b92914e3dc2de1c6f27f47319962361e05961c55047ba185e11ebf57831f3ab5cff9158a50d30a2ca635d53bd
 DIST python-diamond-4.0.515.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5
 DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b

diff --git a/app-admin/diamond/diamond-4.0.515.20180315.ebuild b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
similarity index 83%
rename from app-admin/diamond/diamond-4.0.515.20180315.ebuild
rename to app-admin/diamond/diamond-4.0.515.20170311.ebuild
index 8882dd7f46c..a05de260f80 100644
--- a/app-admin/diamond/diamond-4.0.515.20180315.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
 	S=${WORKDIR}/diamond-${PV}
 else
-	GHASH=0f3eb04327d6d3ed5e53a9967d6c9d2c09714a47
+	GHASH=73207d04e0739a4ce92bc201b36681c42d9fa7e7  # python3 branch
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${GHASH}
@@ -44,6 +44,7 @@ src_prepare() {
 
 	# fix the version (not set in GitHub archive)
 	sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die
+	echo "${PV}" > version.txt || die
 	# fix psutil usage
 	sed -i -e 's/psutil\.network_io_counters/psutil.net_io_counters/' \
 		src/collectors/network/network.py || die
@@ -55,6 +56,20 @@ src_prepare() {
 	# fix, let me know
 	rm src/diamond/handler/rrdtool.py || die
 
+	# forgotten conversion
+	sed -i \
+		-e 's/import Queue/import queue/' \
+		-e 's/Queue\.Full/queue.Full/' \
+		src/diamond/handler/queue.py || die
+	# fix usage of map as list
+	sed -i \
+		-e '/paths = map(str.strip, paths)/d' \
+		src/diamond/utils/classes.py || die
+	# send data as bytes
+	sed -i \
+		-e '/self.socket.sendall/s/data/str.encode(data)/' \
+		src/diamond/handler/graphite.py || die
+
 	distutils-r1_src_prepare
 }
 

diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild
deleted file mode 100644
index 73f30e45464..00000000000
--- a/app-admin/diamond/diamond-9999.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
-	S=${WORKDIR}/diamond-${PV}
-else
-	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/Diamond-${PV}
-fi
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Python daemon that collects and publishes system metrics"
-HOMEPAGE="https://github.com/python-diamond/Diamond"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test mongo mysql snmp redis"
-
-RDEPEND="dev-python/configobj
-	dev-python/setproctitle
-	mongo? ( dev-python/pymongo )
-	mysql? ( dev-python/mysql-python )
-	snmp? ( dev-python/pysnmp )
-	redis? ( dev-python/redis-py )
-	!kernel_linux? ( >=dev-python/psutil-3 )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock
-		dev-python/pysnmp
-	)"
-
-src_prepare() {
-	# adjust for Prefix
-	hprefixify bin/diamond*
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# don't want to depend on docker for just this
-	mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die
-	# fails on binding ports
-	mv src/collectors/portstat/tests/{test,no}_portstat.py || die
-	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
-}
-
-python_install() {
-	export VIRTUAL_ENV=1
-	distutils-r1_python_install
-	python_optimize
-	mv "${ED}"/usr/etc "${ED}"/ || die
-	rm "${ED}"/etc/diamond/*.windows  # won't need these
-	sed -i \
-		-e '/pid_file =/s:/var/run:/run:' \
-		"${ED}"/etc/diamond/diamond.conf.example || die
-	hprefixify "${ED}"/etc/diamond/diamond.conf.example
-}
-
-src_install() {
-	distutils-r1_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/diamond
-}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2019-12-10 20:15 Aaron Bauman
  0 siblings, 0 replies; 18+ messages in thread
From: Aaron Bauman @ 2019-12-10 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     15fbdb0325483b9cc38b9d2449a43f093e4e5ca3
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 20:13:38 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 20:13:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15fbdb03

app-admin/diamond: fix test restricts

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 app-admin/diamond/diamond-4.0-r1.ebuild           | 1 +
 app-admin/diamond/diamond-4.0.515.20170311.ebuild | 1 +
 app-admin/diamond/diamond-4.0.515.ebuild          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild
index 90c4c2549e9..f45a47bf45b 100644
--- a/app-admin/diamond/diamond-4.0-r1.ebuild
+++ b/app-admin/diamond/diamond-4.0-r1.ebuild
@@ -23,6 +23,7 @@ HOMEPAGE="https://github.com/python-diamond/Diamond"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test mongo mysql snmp redis"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/configobj
 	dev-python/setproctitle

diff --git a/app-admin/diamond/diamond-4.0.515.20170311.ebuild b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
index a05de260f80..347df5bcfc6 100644
--- a/app-admin/diamond/diamond-4.0.515.20170311.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
@@ -24,6 +24,7 @@ HOMEPAGE="https://github.com/python-diamond/Diamond"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test mongo mysql snmp redis"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/configobj
 	dev-python/setproctitle

diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
index 6987c28cecd..e7f3668ea8d 100644
--- a/app-admin/diamond/diamond-4.0.515.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.ebuild
@@ -23,6 +23,7 @@ HOMEPAGE="https://github.com/python-diamond/Diamond"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test mongo mysql snmp redis"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/configobj
 	dev-python/setproctitle


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2020-02-09  8:43 Mikle Kolyada
  0 siblings, 0 replies; 18+ messages in thread
From: Mikle Kolyada @ 2020-02-09  8:43 UTC (permalink / raw
  To: gentoo-commits

commit:     9da2810b80e5491451762f7861dcff3fb6a14ce9
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 08:42:38 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 08:42:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da2810b

app-admin/diamond: amd64 stable wrt bug #708454

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 app-admin/diamond/diamond-4.0.515.20170311.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/diamond/diamond-4.0.515.20170311.ebuild b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
index 347df5bcfc6..9ef9a87b201 100644
--- a/app-admin/diamond/diamond-4.0.515.20170311.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	GHASH=73207d04e0739a4ce92bc201b36681c42d9fa7e7  # python3 branch
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${GHASH}
 fi
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2020-02-10  8:18 Agostino Sarubbo
  0 siblings, 0 replies; 18+ messages in thread
From: Agostino Sarubbo @ 2020-02-10  8:18 UTC (permalink / raw
  To: gentoo-commits

commit:     51992d18950e42c489b7dd7f0c97c6e1968a783c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 08:17:44 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 08:17:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51992d18

app-admin/diamond: x86 stable wrt bug #708454

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-admin/diamond/diamond-4.0.515.20170311.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/diamond/diamond-4.0.515.20170311.ebuild b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
index 9ef9a87b201..6cb19661490 100644
--- a/app-admin/diamond/diamond-4.0.515.20170311.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	GHASH=73207d04e0739a4ce92bc201b36681c42d9fa7e7  # python3 branch
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${GHASH}
 fi
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2020-02-10 10:02 Fabian Groffen
  0 siblings, 0 replies; 18+ messages in thread
From: Fabian Groffen @ 2020-02-10 10:02 UTC (permalink / raw
  To: gentoo-commits

commit:     6d9093cbb6766720e223fa80e84d121c65454e7c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 10:01:17 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 10:02:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d9093cb

app-admin/diamond: remove old Python 2 versions

Closes: https://bugs.gentoo.org/708454
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-admin/diamond/Manifest               |  2 -
 app-admin/diamond/diamond-4.0-r1.ebuild  | 75 -----------------------------
 app-admin/diamond/diamond-4.0.515.ebuild | 81 --------------------------------
 3 files changed, 158 deletions(-)

diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index 19cd08fe4fa..a9335d45de4 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -1,3 +1 @@
 DIST python-diamond-4.0.515.20170311.tar.gz 671963 BLAKE2B 9449f2d27b48c0e24727eb2c415a5095b20199d9315ef69df92a4aa6f8f3397743f3dc6cf2d8d91f79eca309926731b6b42da170a02987a20aeccd1e0980f4ac SHA512 d18a80540018975455b839a78fd55d13d167726b92914e3dc2de1c6f27f47319962361e05961c55047ba185e11ebf57831f3ab5cff9158a50d30a2ca635d53bd
-DIST python-diamond-4.0.515.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5
-DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b

diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild
deleted file mode 100644
index f45a47bf45b..00000000000
--- a/app-admin/diamond/diamond-4.0-r1.ebuild
+++ /dev/null
@@ -1,75 +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
-	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
-	S=${WORKDIR}/diamond-${PV}
-else
-	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/Diamond-${PV}
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils prefix
-
-DESCRIPTION="Python daemon that collects and publishes system metrics"
-HOMEPAGE="https://github.com/python-diamond/Diamond"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test mongo mysql snmp redis"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/configobj
-	dev-python/setproctitle
-	mongo? ( dev-python/pymongo )
-	mysql? ( dev-python/mysql-python )
-	snmp? ( dev-python/pysnmp )
-	redis? ( dev-python/redis-py )
-	!kernel_linux? ( >=dev-python/psutil-3 )"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock )"
-
-src_prepare() {
-	# adjust for Prefix
-	hprefixify bin/diamond*
-
-	# fix necessary to make handlers honour their config, simple sed
-	# doing the same as upstream
-	# https://github.com/python-diamond/Diamond/commit/3cb29eedd117d2e4146823a5c5811d16cc77206a.patch
-	sed -i \
-		-e '/cls_name =/s/\.__class__//' \
-		src/diamond/utils/classes.py \
-		|| die
-
-	epatch "${FILESDIR}"/${P}-psutil.patch
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
-}
-
-python_install() {
-	export VIRTUAL_ENV=1
-	distutils-r1_python_install
-	mv "${ED}"/usr/etc "${ED}"/ || die
-	rm "${ED}"/etc/diamond/*.windows  # won't need these
-	sed -i \
-		-e '/pid_file =/s:/var/run:/run:' \
-		"${ED}"/etc/diamond/diamond.conf.example || die
-	hprefixify "${ED}"/etc/diamond/diamond.conf.example
-}
-
-src_install() {
-	distutils-r1_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/diamond
-}

diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
deleted file mode 100644
index e7f3668ea8d..00000000000
--- a/app-admin/diamond/diamond-4.0.515.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
-	S=${WORKDIR}/diamond-${PV}
-else
-	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/Diamond-${PV}
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Python daemon that collects and publishes system metrics"
-HOMEPAGE="https://github.com/python-diamond/Diamond"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test mongo mysql snmp redis"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/configobj
-	dev-python/setproctitle
-	mongo? ( dev-python/pymongo )
-	mysql? ( dev-python/mysql-python )
-	snmp? ( dev-python/pysnmp )
-	redis? ( dev-python/redis-py )
-	!kernel_linux? ( >=dev-python/psutil-3 )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock
-		dev-python/pysnmp
-	)"
-
-src_prepare() {
-	# adjust for Prefix
-	hprefixify bin/diamond*
-
-	# fix the version (not set in GitHub archive)
-	sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die
-	# fix psutil usage
-	sed -i -e 's/psutil\.network_io_counters/psutil.net_io_counters/' \
-		src/collectors/network/network.py || die
-	# fix symlink out of place
-	rm README.md || die
-	cp docs/index.md README.md || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# don't want to depend on docker for just this
-	mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die
-	# fails on binding ports
-	mv src/collectors/portstat/tests/{test,no}_portstat.py || die
-	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
-}
-
-python_install() {
-	export VIRTUAL_ENV=1
-	distutils-r1_python_install
-	mv "${ED}"/usr/etc "${ED}"/ || die
-	rm "${ED}"/etc/diamond/*.windows  # won't need these
-	sed -i \
-		-e '/pid_file =/s:/var/run:/run:' \
-		"${ED}"/etc/diamond/diamond.conf.example || die
-	hprefixify "${ED}"/etc/diamond/diamond.conf.example
-}
-
-src_install() {
-	distutils-r1_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/diamond
-}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2020-04-25 17:52 Fabian Groffen
  0 siblings, 0 replies; 18+ messages in thread
From: Fabian Groffen @ 2020-04-25 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     5342cc9445fcb7f8de0c5fda1bb636fab315ea1f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 17:52:24 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 17:52:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5342cc94

app-admin/diamond: switch to mysqlclient and support py3.{7,8}

- switch from dev-python/mysql-python to dev-python/mysqlclient (#710026)
- support python 3.7 and 3.8 (#718176)
- drop ~arm because of unkeyworded dev-python/mysqlclient

Closes: https://bugs.gentoo.org/718176
Closes: https://bugs.gentoo.org/710026
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-admin/diamond/diamond-4.0.515.20170311.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-admin/diamond/diamond-4.0.515.20170311.ebuild b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
index 6cb19661490..80dbc4734ec 100644
--- a/app-admin/diamond/diamond-4.0.515.20170311.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
@@ -10,11 +10,11 @@ if [[ ${PV} = 9999* ]]; then
 else
 	GHASH=73207d04e0739a4ce92bc201b36681c42d9fa7e7  # python3 branch
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${GHASH}
 fi
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 prefix
 
@@ -29,7 +29,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="dev-python/configobj
 	dev-python/setproctitle
 	mongo? ( dev-python/pymongo )
-	mysql? ( dev-python/mysql-python )
+	mysql? ( dev-python/mysqlclient )
 	snmp? ( dev-python/pysnmp )
 	redis? ( dev-python/redis-py )
 	!kernel_linux? ( >=dev-python/psutil-3 )"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2020-06-21  6:23 Michał Górny
  0 siblings, 0 replies; 18+ messages in thread
From: Michał Górny @ 2020-06-21  6:23 UTC (permalink / raw
  To: gentoo-commits

commit:     695bf8cffaaea57f1d0dd958f0091deea2edc13d
Author:     Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Sun Jun 21 00:09:43 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 06:22:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=695bf8cf

app-admin/diamond: arm keyworded (bug #719620)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/diamond/diamond-4.0.515.20200620.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/diamond/diamond-4.0.515.20200620.ebuild b/app-admin/diamond/diamond-4.0.515.20200620.ebuild
index 919e6495593..8438dac5e0b 100644
--- a/app-admin/diamond/diamond-4.0.515.20200620.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20200620.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	GHASH=8d8a2e49d80d44968a34d43e36c1d864695a29c1  # from python3 branch
 	SRC_URI="https://github.com/grobian/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${GHASH}
 fi
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2020-06-21 11:04 Fabian Groffen
  0 siblings, 0 replies; 18+ messages in thread
From: Fabian Groffen @ 2020-06-21 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     ae95ced0f5b7b2b6057d20068c2857b9c13e3c81
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 11:04:41 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 11:04:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae95ced0

app-admin/diamond-4.0.515.20200620: fix installation with python3.8

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-admin/diamond/diamond-4.0.515.20200620.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app-admin/diamond/diamond-4.0.515.20200620.ebuild b/app-admin/diamond/diamond-4.0.515.20200620.ebuild
index 8438dac5e0b..938b0d14ce9 100644
--- a/app-admin/diamond/diamond-4.0.515.20200620.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20200620.ebuild
@@ -64,7 +64,11 @@ python_install() {
 	export VIRTUAL_ENV=1
 	distutils-r1_python_install
 	python_optimize
-	mv "${ED}"/usr/etc "${ED}"/ || die
+	# since python3.8 installation goes straight into /etc
+	[[ -d ${ED}/etc ]] && [[ -d ${ED}/usr/etc ]] && rm -Rf "${ED}"/usr/etc
+	if [[ -d ${ED}/usr/etc ]] ; then
+		mv "${ED}"/usr/etc "${ED}"/ || die
+	fi
 	rm "${ED}"/etc/diamond/*.windows  # won't need these
 	sed -i \
 		-e '/pid_file =/s:/var/run:/run:' \


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/
@ 2021-01-06 12:46 Fabian Groffen
  0 siblings, 0 replies; 18+ messages in thread
From: Fabian Groffen @ 2021-01-06 12:46 UTC (permalink / raw
  To: gentoo-commits

commit:     257a7ddcea792c4f092e7da47c8491c278d6bd4a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 12:44:34 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 12:44:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=257a7ddc

app-admin/diamond: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild | 4 ++--
 app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild b/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild
index 80dbc4734ec..7a55b7eb2c8 100644
--- a/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	GHASH=73207d04e0739a4ce92bc201b36681c42d9fa7e7  # python3 branch
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${GHASH}
 fi
 

diff --git a/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild b/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild
index 938b0d14ce9..41dd6a756b9 100644
--- a/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	GHASH=8d8a2e49d80d44968a34d43e36c1d864695a29c1  # from python3 branch
 	SRC_URI="https://github.com/grobian/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${GHASH}
 fi
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2021-01-06 12:46 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-08 10:31 [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/ Fabian Groffen
  -- strict thread matches above, loose matches on Subject: below --
2021-01-06 12:46 Fabian Groffen
2020-06-21 11:04 Fabian Groffen
2020-06-21  6:23 Michał Górny
2020-04-25 17:52 Fabian Groffen
2020-02-10 10:02 Fabian Groffen
2020-02-10  8:18 Agostino Sarubbo
2020-02-09  8:43 Mikle Kolyada
2019-12-10 20:15 Aaron Bauman
2019-12-07 14:38 Fabian Groffen
2019-06-21 11:07 Agostino Sarubbo
2019-06-20 18:06 Mikle Kolyada
2019-02-21 18:37 Fabian Groffen
2017-12-03 11:27 Fabian Groffen
2017-09-17  9:59 Fabian Groffen
2017-07-11  9:22 Fabian Groffen
2017-05-09  9:42 Mikle Kolyada
2016-08-02 18:47 Fabian Groffen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox