summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-04-04 03:30:29 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-04-04 03:50:30 +0200
commitd03dfda4410139a0a2a82d1d844e2e612ccf77c3 (patch)
tree6ce22441313ae6f49e92a4318e941f2160b39d0b
parentapp-admin/collectd: Move from virtual/mysql to virtual/libmysqlclient (diff)
downloadgentoo-d03dfda4410139a0a2a82d1d844e2e612ccf77c3.tar.gz
gentoo-d03dfda4410139a0a2a82d1d844e2e612ccf77c3.tar.bz2
gentoo-d03dfda4410139a0a2a82d1d844e2e612ccf77c3.zip
app-metrics/collectd: Move package from app-admin/collectd
Package-Manager: Portage-2.3.26, Repoman-2.3.7 RepoMan-Options: --force
-rw-r--r--app-metrics/collectd/Manifest (renamed from app-admin/collectd/Manifest)0
-rw-r--r--app-metrics/collectd/collectd-5.7.2-r3.ebuild (renamed from app-admin/collectd/collectd-5.7.2-r3.ebuild)0
-rw-r--r--app-metrics/collectd/files/collectd-5.6.0-gentoo.patch (renamed from app-admin/collectd/files/collectd-5.6.0-gentoo.patch)0
-rw-r--r--app-metrics/collectd/files/collectd-5.7.2-CVE-2017-16820.patch (renamed from app-admin/collectd/files/collectd-5.7.2-CVE-2017-16820.patch)0
-rw-r--r--app-metrics/collectd/files/collectd-5.7.2-issue-2443.patch (renamed from app-admin/collectd/files/collectd-5.7.2-issue-2443.patch)0
-rw-r--r--app-metrics/collectd/files/collectd-5.7.2-varnish-5.2+.patch (renamed from app-admin/collectd/files/collectd-5.7.2-varnish-5.2+.patch)0
-rw-r--r--app-metrics/collectd/files/collectd.confd-r2 (renamed from app-admin/collectd/files/collectd.confd-r2)0
-rw-r--r--app-metrics/collectd/files/collectd.initd-r2 (renamed from app-admin/collectd/files/collectd.initd-r2)0
-rw-r--r--app-metrics/collectd/files/collectd.logrotate (renamed from app-admin/collectd/files/collectd.logrotate)0
-rw-r--r--app-metrics/collectd/files/collectd.tmpfile (renamed from app-admin/collectd/files/collectd.tmpfile)0
-rw-r--r--app-metrics/collectd/metadata.xml (renamed from app-admin/collectd/metadata.xml)0
-rw-r--r--profiles/arch/alpha/package.use.mask34
-rw-r--r--profiles/arch/amd64/package.use.mask4
-rw-r--r--profiles/arch/arm/package.use.mask20
-rw-r--r--profiles/arch/arm/package.use.stable.mask4
-rw-r--r--profiles/arch/base/package.use.mask4
-rw-r--r--profiles/arch/x86/package.use.mask4
-rw-r--r--profiles/default/linux/uclibc/arm/package.use.mask20
-rw-r--r--profiles/updates/2Q-20181
19 files changed, 46 insertions, 45 deletions
diff --git a/app-admin/collectd/Manifest b/app-metrics/collectd/Manifest
index bac7ff56a18..bac7ff56a18 100644
--- a/app-admin/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
diff --git a/app-admin/collectd/collectd-5.7.2-r3.ebuild b/app-metrics/collectd/collectd-5.7.2-r3.ebuild
index 090a6bb64c9..090a6bb64c9 100644
--- a/app-admin/collectd/collectd-5.7.2-r3.ebuild
+++ b/app-metrics/collectd/collectd-5.7.2-r3.ebuild
diff --git a/app-admin/collectd/files/collectd-5.6.0-gentoo.patch b/app-metrics/collectd/files/collectd-5.6.0-gentoo.patch
index dd8c1576354..dd8c1576354 100644
--- a/app-admin/collectd/files/collectd-5.6.0-gentoo.patch
+++ b/app-metrics/collectd/files/collectd-5.6.0-gentoo.patch
diff --git a/app-admin/collectd/files/collectd-5.7.2-CVE-2017-16820.patch b/app-metrics/collectd/files/collectd-5.7.2-CVE-2017-16820.patch
index 0090f2940bf..0090f2940bf 100644
--- a/app-admin/collectd/files/collectd-5.7.2-CVE-2017-16820.patch
+++ b/app-metrics/collectd/files/collectd-5.7.2-CVE-2017-16820.patch
diff --git a/app-admin/collectd/files/collectd-5.7.2-issue-2443.patch b/app-metrics/collectd/files/collectd-5.7.2-issue-2443.patch
index 19410c139b0..19410c139b0 100644
--- a/app-admin/collectd/files/collectd-5.7.2-issue-2443.patch
+++ b/app-metrics/collectd/files/collectd-5.7.2-issue-2443.patch
diff --git a/app-admin/collectd/files/collectd-5.7.2-varnish-5.2+.patch b/app-metrics/collectd/files/collectd-5.7.2-varnish-5.2+.patch
index 60830042fa6..60830042fa6 100644
--- a/app-admin/collectd/files/collectd-5.7.2-varnish-5.2+.patch
+++ b/app-metrics/collectd/files/collectd-5.7.2-varnish-5.2+.patch
diff --git a/app-admin/collectd/files/collectd.confd-r2 b/app-metrics/collectd/files/collectd.confd-r2
index 835936d5bce..835936d5bce 100644
--- a/app-admin/collectd/files/collectd.confd-r2
+++ b/app-metrics/collectd/files/collectd.confd-r2
diff --git a/app-admin/collectd/files/collectd.initd-r2 b/app-metrics/collectd/files/collectd.initd-r2
index 0a4ca71494f..0a4ca71494f 100644
--- a/app-admin/collectd/files/collectd.initd-r2
+++ b/app-metrics/collectd/files/collectd.initd-r2
diff --git a/app-admin/collectd/files/collectd.logrotate b/app-metrics/collectd/files/collectd.logrotate
index 5d344f6208f..5d344f6208f 100644
--- a/app-admin/collectd/files/collectd.logrotate
+++ b/app-metrics/collectd/files/collectd.logrotate
diff --git a/app-admin/collectd/files/collectd.tmpfile b/app-metrics/collectd/files/collectd.tmpfile
index 4524a56ec18..4524a56ec18 100644
--- a/app-admin/collectd/files/collectd.tmpfile
+++ b/app-metrics/collectd/files/collectd.tmpfile
diff --git a/app-admin/collectd/metadata.xml b/app-metrics/collectd/metadata.xml
index 5f027424cee..5f027424cee 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-metrics/collectd/metadata.xml
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index da950d359c4..febe6c08f51 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,25 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# Tobias Klausmann <klausman@gentoo.org> (22 Mar 2018)
# Masked due to missing deps. Some *could* have their deps keyworded,
# but we're trying to keep the maintenance load low.
-app-admin/collectd collectd_plugins_amqp
-app-admin/collectd collectd_plugins_gmond
-app-admin/collectd collectd_plugins_gps
-app-admin/collectd collectd_plugins_ipmi
-app-admin/collectd collectd_plugins_modbus
-app-admin/collectd collectd_plugins_nut
-app-admin/collectd collectd_plugins_onewire
-app-admin/collectd collectd_plugins_oracle
-app-admin/collectd collectd_plugins_routeros
-app-admin/collectd collectd_plugins_sigrok
-app-admin/collectd collectd_plugins_tokyotyrant
-app-admin/collectd collectd_plugins_varnish
-app-admin/collectd collectd_plugins_virt
-app-admin/collectd collectd_plugins_write_kafka
-app-admin/collectd collectd_plugins_xencpu
-app-admin/collectd collectd_plugins_java
+app-metrics/collectd collectd_plugins_amqp
+app-metrics/collectd collectd_plugins_gmond
+app-metrics/collectd collectd_plugins_gps
+app-metrics/collectd collectd_plugins_ipmi
+app-metrics/collectd collectd_plugins_modbus
+app-metrics/collectd collectd_plugins_nut
+app-metrics/collectd collectd_plugins_onewire
+app-metrics/collectd collectd_plugins_oracle
+app-metrics/collectd collectd_plugins_routeros
+app-metrics/collectd collectd_plugins_sigrok
+app-metrics/collectd collectd_plugins_tokyotyrant
+app-metrics/collectd collectd_plugins_varnish
+app-metrics/collectd collectd_plugins_virt
+app-metrics/collectd collectd_plugins_write_kafka
+app-metrics/collectd collectd_plugins_xencpu
+app-metrics/collectd collectd_plugins_java
# Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
# Needs net-mail/mailutils which is not keyworded, bug #635216.
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index ad5f53f1e2a..1b915704d01 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -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
# When you add an entry to the top of this file, add your name, the date, and
@@ -62,7 +62,7 @@ media-libs/mlt vdpau
# Thomas Deutschmann <whissi@gentoo.org> (22 Sep 2016)
# Enable MQTT support on supported architectures
-app-admin/collectd -collectd_plugins_mqtt
+app-metrics/collectd -collectd_plugins_mqtt
# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
# Enable numa support on supported architectures
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 86e0f72ac66..2cbfc4b5dc4 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -92,7 +92,7 @@ dev-java/oracle-jdk-bin visualvm
# Patrice Clement <monsieurp@gentoo.org> (09 Apr 2017)
# Enable MQTT support on supported architectures
-app-admin/collectd -collectd_plugins_mqtt
+app-metrics/collectd -collectd_plugins_mqtt
# Michael Weber <xmw@gentoo.org> (15 Mar 2017)
# Cannot test non-free dependency dev-libs/device-atlas-api-c
@@ -160,15 +160,15 @@ sys-cluster/ceph test
# Ian Delaney <idella4@gentoo.org> (19 Mar 2016)
# for the proxy-maintainers project
# Unkeyworded deps, bug #564274
-app-admin/collectd collectd_plugins_gmond
-app-admin/collectd collectd_plugins_ipmi
-app-admin/collectd collectd_plugins_modbus
-app-admin/collectd collectd_plugins_oracle
-app-admin/collectd collectd_plugins_routeros
-app-admin/collectd collectd_plugins_sigrok
-app-admin/collectd collectd_plugins_tokyotyrant
-app-admin/collectd collectd_plugins_varnish
-app-admin/collectd collectd_plugins_virt
+app-metrics/collectd collectd_plugins_gmond
+app-metrics/collectd collectd_plugins_ipmi
+app-metrics/collectd collectd_plugins_modbus
+app-metrics/collectd collectd_plugins_oracle
+app-metrics/collectd collectd_plugins_routeros
+app-metrics/collectd collectd_plugins_sigrok
+app-metrics/collectd collectd_plugins_tokyotyrant
+app-metrics/collectd collectd_plugins_varnish
+app-metrics/collectd collectd_plugins_virt
# Markus Meier <maekke@gentoo.org> (02 Mar 2016)
# unkeyworded deps for bug #573324
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 4b1c0c22880..73268526617 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -3,7 +3,7 @@
# Andreas Sturmlechner <asturm@gentoo.org> (06 Feb 2018)
# Requires sci-geosciences/gpsd which is not stable, bug #632372
-app-admin/collectd collectd_plugins_gps
+app-metrics/collectd collectd_plugins_gps
app-misc/geoclue gps
# Andreas Sturmlechner <asturm@gentoo.org> (25 Jan 2018)
@@ -50,7 +50,7 @@ media-libs/libbluray java
# Thomas Deutschmann <whissi@gentoo.org> (20 Mar 2017)
# Requires dev-java/java-config and deps which is not stable on arm
# Requires app-emulation/xen-tools which is not stable on arm
-app-admin/collectd collectd_plugins_java collectd_plugins_xencpu
+app-metrics/collectd collectd_plugins_java collectd_plugins_xencpu
# Michael Palimaka <kensington@gentoo.org> (19 Mar 2017)
# Required media-plugins/gst-plugins-x264 is not stable
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index f0f2056ea81..fbe2ee1e7b6 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -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
# Michał Górny <mgorny@gentoo.org> (30 Dec 2017)
@@ -42,7 +42,7 @@ dev-libs/libsecp256k1 asm
# Thomas Deutschmann <whissi@gentoo.org> (22 Sep 2016)
# Dependency is only keyworded on amd64 and x86
-app-admin/collectd collectd_plugins_mqtt
+app-metrics/collectd collectd_plugins_mqtt
# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
# It's only supported on amd64, ia64, powerpc and x86
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 09bd237a49c..8901da25432 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -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
# This file requires >=portage-2.1.1
@@ -76,7 +76,7 @@ app-emulation/libvirt zfs
# Thomas Deutschmann <whissi@gentoo.org> (22 Sep 2016)
# Enable MQTT support on supported architectures
-app-admin/collectd -collectd_plugins_mqtt
+app-metrics/collectd -collectd_plugins_mqtt
# Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
# Enable numa support on supported architectures
diff --git a/profiles/default/linux/uclibc/arm/package.use.mask b/profiles/default/linux/uclibc/arm/package.use.mask
index b0883005075..361fbecb5d1 100644
--- a/profiles/default/linux/uclibc/arm/package.use.mask
+++ b/profiles/default/linux/uclibc/arm/package.use.mask
@@ -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
# Thomas Deutschmann <whissi@gentoo.org> (28 Nov 2017)
@@ -29,15 +29,15 @@ app-admin/rsyslog grok
# Ian Delaney <idella4@gentoo.org> (19 Mar 2016)
# for the proxy-maintainers project
# Unkeyworded deps, bug #564274
-app-admin/collectd collectd_plugins_gmond
-app-admin/collectd collectd_plugins_ipmi
-app-admin/collectd collectd_plugins_modbus
-app-admin/collectd collectd_plugins_oracle
-app-admin/collectd collectd_plugins_routeros
-app-admin/collectd collectd_plugins_sigrok
-app-admin/collectd collectd_plugins_tokyotyrant
-app-admin/collectd collectd_plugins_varnish
-app-admin/collectd collectd_plugins_virt
+app-metrics/collectd collectd_plugins_gmond
+app-metrics/collectd collectd_plugins_ipmi
+app-metrics/collectd collectd_plugins_modbus
+app-metrics/collectd collectd_plugins_oracle
+app-metrics/collectd collectd_plugins_routeros
+app-metrics/collectd collectd_plugins_sigrok
+app-metrics/collectd collectd_plugins_tokyotyrant
+app-metrics/collectd collectd_plugins_varnish
+app-metrics/collectd collectd_plugins_virt
# Matthias Maier <tamiko@gentoo.org> (16 Aug 2015)
# missing keywords
diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
new file mode 100644
index 00000000000..0e790510498
--- /dev/null
+++ b/profiles/updates/2Q-2018
@@ -0,0 +1 @@
+move app-admin/collectd app-metrics/collectd