commit: d03dfda4410139a0a2a82d1d844e2e612ccf77c3 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Wed Apr 4 01:30:29 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Wed Apr 4 01:50:30 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d03dfda4
app-metrics/collectd: Move package from app-admin/collectd Package-Manager: Portage-2.3.26, Repoman-2.3.7 RepoMan-Options: --force {app-admin => app-metrics}/collectd/Manifest | 0 .../collectd/collectd-5.7.2-r3.ebuild | 0 .../collectd/files/collectd-5.6.0-gentoo.patch | 0 .../files/collectd-5.7.2-CVE-2017-16820.patch | 0 .../collectd/files/collectd-5.7.2-issue-2443.patch | 0 .../files/collectd-5.7.2-varnish-5.2+.patch | 0 .../collectd/files/collectd.confd-r2 | 0 .../collectd/files/collectd.initd-r2 | 0 .../collectd/files/collectd.logrotate | 0 .../collectd/files/collectd.tmpfile | 0 {app-admin => app-metrics}/collectd/metadata.xml | 0 profiles/arch/alpha/package.use.mask | 34 +++++++++++----------- profiles/arch/amd64/package.use.mask | 4 +-- profiles/arch/arm/package.use.mask | 20 ++++++------- profiles/arch/arm/package.use.stable.mask | 4 +-- profiles/arch/base/package.use.mask | 4 +-- profiles/arch/x86/package.use.mask | 4 +-- profiles/default/linux/uclibc/arm/package.use.mask | 20 ++++++------- profiles/updates/2Q-2018 | 1 + 19 files changed, 46 insertions(+), 45 deletions(-) diff --git a/app-admin/collectd/Manifest b/app-metrics/collectd/Manifest similarity index 100% rename from app-admin/collectd/Manifest rename to 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 similarity index 100% rename from app-admin/collectd/collectd-5.7.2-r3.ebuild rename to 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 similarity index 100% rename from app-admin/collectd/files/collectd-5.6.0-gentoo.patch rename to 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 similarity index 100% rename from app-admin/collectd/files/collectd-5.7.2-CVE-2017-16820.patch rename to 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 similarity index 100% rename from app-admin/collectd/files/collectd-5.7.2-issue-2443.patch rename to 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 similarity index 100% rename from app-admin/collectd/files/collectd-5.7.2-varnish-5.2+.patch rename to 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 similarity index 100% rename from app-admin/collectd/files/collectd.confd-r2 rename to 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 similarity index 100% rename from app-admin/collectd/files/collectd.initd-r2 rename to app-metrics/collectd/files/collectd.initd-r2 diff --git a/app-admin/collectd/files/collectd.logrotate b/app-metrics/collectd/files/collectd.logrotate similarity index 100% rename from app-admin/collectd/files/collectd.logrotate rename to app-metrics/collectd/files/collectd.logrotate diff --git a/app-admin/collectd/files/collectd.tmpfile b/app-metrics/collectd/files/collectd.tmpfile similarity index 100% rename from app-admin/collectd/files/collectd.tmpfile rename to app-metrics/collectd/files/collectd.tmpfile diff --git a/app-admin/collectd/metadata.xml b/app-metrics/collectd/metadata.xml similarity index 100% rename from app-admin/collectd/metadata.xml rename to 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 <klaus...@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 <u...@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 <whi...@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 <whi...@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 <monsie...@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 <x...@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 <idel...@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 <mae...@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 <ast...@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 <ast...@gentoo.org> (25 Jan 2018) @@ -50,7 +50,7 @@ media-libs/libbluray java # Thomas Deutschmann <whi...@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 <kensing...@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 <mgo...@gentoo.org> (30 Dec 2017) @@ -42,7 +42,7 @@ dev-libs/libsecp256k1 asm # Thomas Deutschmann <whi...@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 <whi...@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 <whi...@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 <whi...@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 <whi...@gentoo.org> (28 Nov 2017) @@ -29,15 +29,15 @@ app-admin/rsyslog grok # Ian Delaney <idel...@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 <tam...@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