summaryrefslogtreecommitdiff
path: root/app-admin
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-04-28 09:54:45 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-04-28 09:54:45 +0100
commitb7ebc951da8800f711142f69d9d958bde67a112d (patch)
treee318514216845acb8f2e49fff7a5cba4027e9d91 /app-admin
parentdc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
gentoo resync : 28.04.2019
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/Manifest.gzbin35281 -> 35251 bytes
-rw-r--r--app-admin/abrt/Manifest4
-rw-r--r--app-admin/abrt/abrt-2.10.10-r2.ebuild4
-rw-r--r--app-admin/abrt/abrt-2.12.0-r1.ebuild4
-rw-r--r--app-admin/ansible/Manifest8
-rw-r--r--app-admin/ansible/ansible-2.7.10.ebuild2
-rw-r--r--app-admin/ansible/ansible-2.7.9.ebuild2
-rw-r--r--app-admin/ansible/ansible-2.8.0_rc1.ebuild (renamed from app-admin/ansible/ansible-2.7.8.ebuild)14
-rw-r--r--app-admin/apache-tools/Manifest6
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.34.ebuild105
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.38.ebuild105
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.39.ebuild2
-rw-r--r--app-admin/augeas/Manifest2
-rw-r--r--app-admin/augeas/augeas-1.12.0.ebuild49
-rw-r--r--app-admin/calamares/Manifest2
-rw-r--r--app-admin/calamares/calamares-3.1.13.ebuild4
-rw-r--r--app-admin/cdist/Manifest2
-rw-r--r--app-admin/cdist/cdist-4.10.6.ebuild2
-rw-r--r--app-admin/cgmanager/Manifest2
-rw-r--r--app-admin/cgmanager/cgmanager-0.41.ebuild2
-rw-r--r--app-admin/denyhosts/Manifest2
-rw-r--r--app-admin/denyhosts/denyhosts-3.0-r1.ebuild4
-rw-r--r--app-admin/dio/Manifest2
-rw-r--r--app-admin/dio/dio-1.5.2-r1.ebuild4
-rw-r--r--app-admin/dxf/Manifest10
-rw-r--r--app-admin/dxf/dxf-7.3.0.ebuild4
-rw-r--r--app-admin/dxf/dxf-7.4.0.ebuild4
-rw-r--r--app-admin/dxf/dxf-7.4.1.ebuild4
-rw-r--r--app-admin/dxf/dxf-7.5.0.ebuild2
-rw-r--r--app-admin/dxf/metadata.xml5
-rw-r--r--app-admin/eclean-kernel/Manifest2
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild2
-rw-r--r--app-admin/entr/Manifest6
-rw-r--r--app-admin/entr/entr-4.0.ebuild30
-rw-r--r--app-admin/entr/entr-4.2.ebuild (renamed from app-admin/entr/entr-4.1.ebuild)2
-rw-r--r--app-admin/fleet/Manifest6
-rw-r--r--app-admin/fleet/files/fleet.service14
-rw-r--r--app-admin/fleet/files/fleet.socket2
-rw-r--r--app-admin/fleet/fleet-1.0.0.ebuild46
-rw-r--r--app-admin/fleet/fleet-9999.ebuild44
-rw-r--r--app-admin/fluentd/Manifest2
-rw-r--r--app-admin/fluentd/fluentd-1.4.2.ebuild58
-rw-r--r--app-admin/genromfs/Manifest4
-rw-r--r--app-admin/genromfs/files/genromfs-0.5.2-build.patch4
-rw-r--r--app-admin/genromfs/genromfs-0.5.2.ebuild15
-rw-r--r--app-admin/github-backup-utils/Manifest2
-rw-r--r--app-admin/github-backup-utils/metadata.xml4
-rw-r--r--app-admin/glance/Manifest7
-rw-r--r--app-admin/glance/glance-17.0.0.ebuild4
-rw-r--r--app-admin/glance/glance-18.0.0.ebuild146
-rw-r--r--app-admin/glance/glance-2018.2.9999.ebuild4
-rw-r--r--app-admin/glance/glance-2019.1.9999.ebuild146
-rw-r--r--app-admin/gnome-abrt/Manifest4
-rw-r--r--app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild4
-rw-r--r--app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild2
-rw-r--r--app-admin/hcloud/Manifest3
-rw-r--r--app-admin/hcloud/hcloud-1.12.0.ebuild24
-rw-r--r--app-admin/hcloud/metadata.xml (renamed from app-admin/fleet/metadata.xml)8
-rw-r--r--app-admin/installer/Manifest2
-rw-r--r--app-admin/installer/installer-0.1.1_beta.ebuild4
-rw-r--r--app-admin/keepassxc/Manifest9
-rw-r--r--app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch445
-rw-r--r--app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild (renamed from app-admin/keepassxc/keepassxc-2.4.0.ebuild)2
-rw-r--r--app-admin/keepassxc/keepassxc-2.4.1.ebuild96
-rw-r--r--app-admin/keepassxc/keepassxc-9999.ebuild7
-rw-r--r--app-admin/keepassxc/metadata.xml1
-rw-r--r--app-admin/ksonnet/Manifest2
-rw-r--r--app-admin/ksonnet/metadata.xml5
-rw-r--r--app-admin/kube-bench/Manifest16
-rw-r--r--app-admin/kube-bench/kube-bench-0.0.16.ebuild59
-rw-r--r--app-admin/kube-bench/kube-bench-0.0.17.ebuild59
-rw-r--r--app-admin/kube-bench/kube-bench-0.0.19.ebuild59
-rw-r--r--app-admin/kube-bench/kube-bench-0.0.20.ebuild59
-rw-r--r--app-admin/kube-bench/kube-bench-0.0.27.ebuild (renamed from app-admin/kube-bench/kube-bench-0.0.22.ebuild)4
-rw-r--r--app-admin/kube-bench/kube-bench-0.0.28.ebuild (renamed from app-admin/kube-bench/kube-bench-0.0.23.ebuild)0
-rw-r--r--app-admin/lib_users/Manifest4
-rw-r--r--app-admin/lib_users/lib_users-0.11-r1.ebuild4
-rw-r--r--app-admin/lib_users/lib_users-0.13.ebuild6
-rw-r--r--app-admin/metalog/Manifest2
-rw-r--r--app-admin/metalog/metalog-20181125.ebuild2
-rw-r--r--app-admin/mktwpol/Manifest2
-rw-r--r--app-admin/mktwpol/mktwpol-0.2.6.ebuild42
-rw-r--r--app-admin/mongo-tools/Manifest6
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.6.12.ebuild (renamed from app-admin/mongo-tools/mongo-tools-3.6.10.ebuild)0
-rw-r--r--app-admin/mongo-tools/mongo-tools-4.0.9.ebuild71
-rw-r--r--app-admin/monit/Manifest4
-rw-r--r--app-admin/monit/monit-5.25.1.ebuild51
-rw-r--r--app-admin/monit/monit-5.25.2-r1.ebuild58
-rw-r--r--app-admin/ngxtop/Manifest4
-rw-r--r--app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild4
-rw-r--r--app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild4
-rw-r--r--app-admin/packagekit-base/Manifest4
-rw-r--r--app-admin/packagekit-base/metadata.xml3
-rw-r--r--app-admin/packagekit-base/packagekit-base-1.1.12.ebuild8
-rw-r--r--app-admin/pass/Manifest2
-rw-r--r--app-admin/pass/pass-1.7.3.ebuild4
-rw-r--r--app-admin/puppet-agent/Manifest6
-rw-r--r--app-admin/puppet-agent/puppet-agent-6.4.1.ebuild (renamed from app-admin/puppet-agent/puppet-agent-6.2.0.ebuild)2
-rw-r--r--app-admin/puppet/Manifest11
-rw-r--r--app-admin/puppet/files/puppet-fix-tests-6.4.1.patch18
-rw-r--r--app-admin/puppet/puppet-5.5.10.ebuild144
-rw-r--r--app-admin/puppet/puppet-5.5.12.ebuild2
-rw-r--r--app-admin/puppet/puppet-6.4.0.ebuild138
-rw-r--r--app-admin/puppet/puppet-6.4.1.ebuild (renamed from app-admin/puppet/puppet-6.2.0.ebuild)2
-rw-r--r--app-admin/puppetdb/Manifest2
-rw-r--r--app-admin/puppetdb/puppetdb-6.3.1.ebuild92
-rw-r--r--app-admin/puppetserver/Manifest4
-rw-r--r--app-admin/puppetserver/puppetserver-6.3.0.ebuild (renamed from app-admin/puppetserver/puppetserver-6.2.0.ebuild)2
-rw-r--r--app-admin/pwman3/Manifest4
-rw-r--r--app-admin/pwman3/pwman3-0.10.0.ebuild38
-rw-r--r--app-admin/pwman3/pwman3-0.9.11.ebuild2
-rw-r--r--app-admin/pydf/Manifest2
-rw-r--r--app-admin/pydf/pydf-12-r1.ebuild4
-rw-r--r--app-admin/rsyslog/Manifest17
-rw-r--r--app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch736
-rw-r--r--app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch83
-rw-r--r--app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch22
-rw-r--r--app-admin/rsyslog/rsyslog-8.1901.0.ebuild2
-rw-r--r--app-admin/rsyslog/rsyslog-8.1903.0.ebuild465
-rw-r--r--app-admin/rsyslog/rsyslog-8.1904.0.ebuild465
-rw-r--r--app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild2
-rw-r--r--app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild2
-rw-r--r--app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild2
-rw-r--r--app-admin/setools/Manifest4
-rw-r--r--app-admin/setools/setools-4.1.1-r1.ebuild4
-rw-r--r--app-admin/setools/setools-4.1.1.ebuild4
-rw-r--r--app-admin/sshguard/Manifest3
-rw-r--r--app-admin/sshguard/sshguard-2.1.0-r2.ebuild40
-rw-r--r--app-admin/sshguard/sshguard-2.2.0.ebuild40
-rw-r--r--app-admin/su-exec/Manifest2
-rw-r--r--app-admin/su-exec/metadata.xml5
-rw-r--r--app-admin/supervisor/Manifest6
-rw-r--r--app-admin/supervisor/supervisor-4.0.1.ebuild (renamed from app-admin/supervisor/supervisor-3.3.4.ebuild)18
-rw-r--r--app-admin/supervisor/supervisor-4.0.2.ebuild75
-rw-r--r--app-admin/syslog-ng/Manifest8
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.17.2.ebuild2
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.18.1.ebuild2
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.19.1.ebuild2
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.20.1.ebuild2
-rw-r--r--app-admin/sysstat/Manifest10
-rw-r--r--app-admin/sysstat/sysstat-11.4.0.ebuild4
-rw-r--r--app-admin/sysstat/sysstat-12.0.3.ebuild4
-rw-r--r--app-admin/sysstat/sysstat-12.0.4.ebuild (renamed from app-admin/sysstat/sysstat-12.1.2.ebuild)6
-rw-r--r--app-admin/sysstat/sysstat-12.1.4.ebuild85
-rw-r--r--app-admin/systemrescuecd-x86/Manifest10
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild63
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild63
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild63
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild63
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.3.ebuild70
-rw-r--r--app-admin/terraform/Manifest4
-rw-r--r--app-admin/terraform/terraform-0.11.12.ebuild7
-rw-r--r--app-admin/terraform/terraform-0.11.13.ebuild39
-rw-r--r--app-admin/webapp-config/Manifest8
-rw-r--r--app-admin/webapp-config/webapp-config-1.53-r2.ebuild4
-rw-r--r--app-admin/webapp-config/webapp-config-1.54-r2.ebuild4
-rw-r--r--app-admin/webapp-config/webapp-config-1.55-r1.ebuild4
-rw-r--r--app-admin/webapp-config/webapp-config-9999.ebuild4
158 files changed, 3467 insertions, 1605 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d873ba4b5dbe..bee06fc2a537 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
Binary files differ
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 1d390b4b2eec..4999c9c2adea 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -2,6 +2,6 @@ AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f
AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81
DIST abrt-2.10.10.tar.gz 6830586 BLAKE2B 5cd45144678e6355cb1362c3ebe5531104bb150ff95c42d10e3056f7619cdc7dc3da57e4025cab05234866a4634f29bc07fd78f574800d6b303385c6befa25bd SHA512 6daeea898c9328d31b952ef12202162e002f91b4115301e5d66a0e6991251f9a8322b87201128f7efd54b42b76cb94abc4cf01e5d5b563f254f6757ec7e2127d
DIST abrt-2.12.0.tar.gz 6799338 BLAKE2B 57a9b3fac4a4a5f55630be0573b26d4ae2d921d4f09d6566339a77f314c413c1a9e242f882fe20befabf30a58e7df21395edcf1b0d560bfeadf8e854bff6a705 SHA512 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded
-EBUILD abrt-2.10.10-r2.ebuild 2722 BLAKE2B 1d23ed3fb43dc4a9b99d1c7e7aee8a7205455c7e419d70ec8b37d3229c5ce5ea6d6d421243183017ecd4620dc4678731832c5fa80d2e18ed6792124be4e935cd SHA512 e6ba43c2a16c9bcd09c54552b81ca73196335b1a818c50db621726b8d340ef5bcdfaa567e7fcf22de514bd1a80345346a13cfa0c6c193455c08e97c3ee9a83c1
-EBUILD abrt-2.12.0-r1.ebuild 3080 BLAKE2B fe501bcd09a6ce9aaf5fa609588568ad7e9f32a07894241915695369988580b193f0050d91fd83a9fb915b8646d19fcce12714ed5e196216179ec321fb3989be SHA512 4d1094659dd1b93e6e9bccbe51430a6a2091b03d3318d2f600147cc14df6f208c3ffb81cc75c2ef5e6073f7241011133ecb075659411a989840f046f993f723e
+EBUILD abrt-2.10.10-r2.ebuild 2720 BLAKE2B 06afaa133b4810bfad8a1f26f814621dcee25a4ca9c83ced3d602d63937f41dbba9e98f95291116b5352ff2cb4da87c187cabe304c10bb9695ac64db0f27997f SHA512 a90f5824935948bbb65981709d7cf40341863732837b6c8cb95d0bec2bea6b8ea2f919bdfdb77abb6823d7be320f466e47016c863a7f23bfc98cf4c4e178a9cd
+EBUILD abrt-2.12.0-r1.ebuild 3076 BLAKE2B 97cffb60ab9ad723bdf5c0ce1915598f0d2f2e801f972eeed95bd2d656f3629f805d2d293028f22a76add32441522a8bef92ec050d2325efab7f0efff30c97d2 SHA512 8fb08af66db7592c5c5f6ca133cbd8a0da861dc5df5543d6706197223915cd30fcd03436ec36390fa2fee33752beb57f79b3dcd322f5bf16593d11311b6f28dd
MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
diff --git a/app-admin/abrt/abrt-2.10.10-r2.ebuild b/app-admin/abrt/abrt-2.10.10-r2.ebuild
index 9eea3e3a6ebd..b3f15b79f008 100644
--- a/app-admin/abrt/abrt-2.10.10-r2.ebuild
+++ b/app-admin/abrt/abrt-2.10.10-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
inherit autotools gnome2-utils python-single-r1 systemd user
diff --git a/app-admin/abrt/abrt-2.12.0-r1.ebuild b/app-admin/abrt/abrt-2.12.0-r1.ebuild
index 77b7808c7061..4c27e37dc5ff 100644
--- a/app-admin/abrt/abrt-2.12.0-r1.ebuild
+++ b/app-admin/abrt/abrt-2.12.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
inherit autotools gnome2-utils python-single-r1 systemd user
@@ -18,7 +18,7 @@ IUSE="debug selinux"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
COMMON_DEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.43.4:2
+ >=dev-libs/glib-2.56:2
>=dev-libs/libreport-2.10.0[python]
dev-libs/libxml2:2
>=gnome-base/gsettings-desktop-schemas-3.15.1
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 11f572b12e43..fbd3b99ebbaf 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -3,14 +3,14 @@ DIST ansible-2.6.14.tar.gz 10732165 BLAKE2B c753860a521c37357c7a5042391957680865
DIST ansible-2.6.15.tar.gz 10734433 BLAKE2B 9c48d9de348a11a57b364921af26154b5a2106d0bfa2d7d341c06e2408b3f71d30b3cc2f5e4df1bb21eb6eebd39a4d297ce8d697d68826378d4e786a4acb4e25 SHA512 14951db33ed2124b3379adf1114a9c980f63668c18a79d436658d8ddc1bbbd38f26682520319bd0e399d6ced518ece0f01da5a6991003e8b30adf78f20c6d1e8
DIST ansible-2.6.16.tar.gz 10738431 BLAKE2B b801eb524f631950c385f7a949bdeae288e95d1590ea96f98e955f6ebc4ccfc5970e3926727850e7ef13fbcd7118ad6388e516a8fe62b53f1bf8b4d5b484dbab SHA512 ff67803cf6afd512ab779b7c862d4427591c90bb0ed9391e32fc8ea30c24c70cc31c910c9af51b4dd423885f858f65c1c8d6274565c90296ecd7a00df3374977
DIST ansible-2.7.10.tar.gz 11844278 BLAKE2B c847b642ebe4cbc2194538a0b194cd5c0bb82e0ba2a6da2e272670c75596b9793e028d067ddb37000c07f2c2427b5b99248b16c544daed4976c0210b601d3c97 SHA512 4d58ef080c8ee02ef36eb3116ec89e4542b5b4042262953b2001081601fe1066237191cce5e647f354efa9e1933cf5010519d049e678a90e8ca08620cd1788a5
-DIST ansible-2.7.8.tar.gz 11812884 BLAKE2B 867ed7072efc4effafd637ac0353bd722269046cae8ddb794eea8c6cf9d739bc567f2a5323a589c21a74bbb57565ef153fb8c52798c17809a42400abe72ce65c SHA512 f3501ce8b642f83fe3d5e21cdfa26bce8611e92bc6e68e40b3a7ff2443c7d8ee0b2175981c92a5e83f9ce8c5d7d75aac95106a237bb9325c66319d96a790009a
DIST ansible-2.7.9.tar.gz 11830476 BLAKE2B 7688ce9f74b0ab1fafd0e31dce90d995a9d8ca90bbe436f2d4ee9d005069b6e1b2c4dd679c2430a6873233da54ae06d3ebf08736681ec2e59e5b3ddafa6bb1e2 SHA512 4d39c7d4eb97264ce8f92812fb986b24af0c663efa6d8cd1d9a4cb25731d55e7518e503c04764e62d0458916b601baaa7acc623f9f83ce8b93e7f22900e29a53
+DIST ansible-2.8.0rc1.tar.gz 14280595 BLAKE2B 7de03e7c85d20c45724b501e04389c58b8a82db3c0600d41a6b751701c9ba6aaaaca5e135858283a55ad7b2edb4ccfe22377437ff3e58ee3c6c0f28693805f8c SHA512 00e51b5098d1e0b41bf05c200a285cac3ffb80ece72c66440c05af6ed36df104faebbbcc484995753b8a521d3f5f18ae773b0d568cdfe4bd87b2fd8aabb8a512
EBUILD ansible-2.5.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
EBUILD ansible-2.6.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
EBUILD ansible-2.6.15.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
EBUILD ansible-2.6.16.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
-EBUILD ansible-2.7.10.ebuild 1630 BLAKE2B 5ebaf32d9389e349ec01a1436cf55db7826d013ef03ebc2b51e76a01a9eaabeae7044203f1ab6a12db4b307f87e9b8cff36f7b557042f93e5700fce6f931b2d9 SHA512 66fcbedd85309b41c2d00dcd329699438941fafbefd06c3fb167c465ba5cc88f0d0964ae2e18a9a3245cd766d1197a87af4b9a1c00035ee74d26dec66cbbe17a
-EBUILD ansible-2.7.8.ebuild 1628 BLAKE2B b64016e802f967ca82cd90cbbf01a78b27ad44491bfaff47c8268fd959d072131f12771caf7a2fd386ea87ac46ecf3161acd0aaaedd2067322309b822128d6bc SHA512 90f07c63159f015e507340951b8a1de5d959b99654c5380b63b71dcd819e79e24713fd8a2b61ca4b6eb59bb3f8146ae0df5acf78ffaec39bf4786097110e8f72
-EBUILD ansible-2.7.9.ebuild 1630 BLAKE2B 5ebaf32d9389e349ec01a1436cf55db7826d013ef03ebc2b51e76a01a9eaabeae7044203f1ab6a12db4b307f87e9b8cff36f7b557042f93e5700fce6f931b2d9 SHA512 66fcbedd85309b41c2d00dcd329699438941fafbefd06c3fb167c465ba5cc88f0d0964ae2e18a9a3245cd766d1197a87af4b9a1c00035ee74d26dec66cbbe17a
+EBUILD ansible-2.7.10.ebuild 1637 BLAKE2B cafff348e72d7970fe6851e36c2cab55e18583dbd4ec2cf018a04ed2f7093e91c341c32458d334996f7779477409d47fce82477ab812e607ba1d9d624e6efc73 SHA512 b3760d5cefead4d7965b1d1dbbcf7fd41f2bbd2b8a4941fb02791832fd60c4b0c289ba34fbf945b8889a4b15b286e051634adb90296ff81e43a15f71cad66f47
+EBUILD ansible-2.7.9.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
+EBUILD ansible-2.8.0_rc1.ebuild 1739 BLAKE2B 71b19a0ac7350ee1afd8d6317d1abdc572258830a0c9a5b87cfb1847b367c5ce2caad6994c80306d80bdf1adf61c36d0b14bed1971538c9eb232924fd73d1883 SHA512 2062b6597cbab0071cebca1d85811359e8b60adf87e75f40d4238e1f16f5c78a5e030771d7cd335aed86cc8d8a8b63aaca0e6f66bb191099223d5315a5656501
EBUILD ansible-9999.ebuild 1638 BLAKE2B 40aecbf314bb9e743fb7543c696a271842955853fe981bc4dc69293dcc9905e950a743a56398b0815e09107db801ba554b68ad9511ccb9e25dd3dec0f0b156d2 SHA512 814b1430d499d2e6f50879c41b1a51e07b5e5a79355deab730e26b9e9a28f9ac94e2a46b884a5e0e8ed4a12d7a74bbbdffc0a55b8e120b438c91aeb9e7ae718a
MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.7.10.ebuild b/app-admin/ansible/ansible-2.7.10.ebuild
index 1363dee05e63..63e11740ae9c 100644
--- a/app-admin/ansible/ansible-2.7.10.ebuild
+++ b/app-admin/ansible/ansible-2.7.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
IUSE="doc test"
RDEPEND="
diff --git a/app-admin/ansible/ansible-2.7.9.ebuild b/app-admin/ansible/ansible-2.7.9.ebuild
index 1363dee05e63..028f77e10f7a 100644
--- a/app-admin/ansible/ansible-2.7.9.ebuild
+++ b/app-admin/ansible/ansible-2.7.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
IUSE="doc test"
RDEPEND="
diff --git a/app-admin/ansible/ansible-2.7.8.ebuild b/app-admin/ansible/ansible-2.8.0_rc1.ebuild
index be1e38fe59f9..43fb54200196 100644
--- a/app-admin/ansible/ansible-2.7.8.ebuild
+++ b/app-admin/ansible/ansible-2.8.0_rc1.ebuild
@@ -9,11 +9,12 @@ inherit distutils-r1 eutils
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+# don't forget to fix also ${S} in the next bump
+SRC_URI="https://releases.ansible.com/${PN}/${PN}-2.8.0rc1.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
IUSE="doc test"
RDEPEND="
@@ -42,8 +43,7 @@ DEPEND="
dev-vcs/git
)"
-# not included in release tarball
-RESTRICT="test"
+S="${WORKDIR}/ansible-2.8.0rc1"
python_compile_all() {
if use doc; then
@@ -53,6 +53,11 @@ python_compile_all() {
fi
}
+python_prepare_all() {
+ rm -fv MANIFEST.in || die
+ distutils-r1_python_prepare_all
+}
+
python_test() {
nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
}
@@ -61,6 +66,5 @@ python_install_all() {
use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
distutils-r1_python_install_all
- doman docs/man/man1/*.1
dodoc -r examples
}
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 31892a66de5b..348e0823d9d6 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,11 +1,7 @@
AUX apache-tools-2.2.20-Makefile.patch 1573 BLAKE2B 56de28f38934b73740d68f6429f3361bfd37f079f1f6de4e169741e7c97bceed86330744c1b69045f8ffee0baf927e35e0eca10036d2da461f14e45cd218e5cd SHA512 85120f1b57cd14baf3482dc21d4175447e135700a1f8e6455970c14e576cb0c510815681a9906de4c7eb68743de7e41bbb2d86e83dcb62cd57eb0c9f638f6892
AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
-DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8
-DIST httpd-2.4.38.tar.bz2 7035030 BLAKE2B 52d965b0eae3402c268f1c5f5fb669ad84408699871d0518ba254c6e7c00f2198cba8cb6106114a62f0f6de67e0a8b921b5783af9530d165ed4d435312ce5164 SHA512 8bdc36fa2bd13fd83feee17fdce4a5316ed8f96c1ac32b636ba106572ba257815438c72068d2d0e900783a3fa25c90a5da34c3f83fc2c04a1dbdbf234f7ad448
DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d064524489f9ad747cf85350fbb6ad65f57b30c81d57273cd6693d8a2c4e988f5a2c42bd5c9c538b305b9b7719e8 SHA512 9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7
EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
-EBUILD apache-tools-2.4.34.ebuild 2580 BLAKE2B bc79e4ee3d1a2107b2472ec2cbe3e7400f6ccc62ae73b762aba6cef2903c2bbc8f9905c63aeaa9a15be997abe65ebd9e7e2ecb0dbf258fcb683c7e71e10339c9 SHA512 96ca29cb4b065f1f78219e09502c70073865317df51514ff35a6a4b82e837d9c2336cf7dae1468566051792b5330867fb7fdfefdb245f07932a8ce6f7e2f6928
-EBUILD apache-tools-2.4.38.ebuild 2580 BLAKE2B 4aebcb68878039b094fc5d7a4d2af4fe1f85934a8e2c060e537646da93369eb705f0fa1139fe9b438f9c4f90ba09610bcf0086a7845e6456cb3f4438366adb9d SHA512 7998df6ff9755646ca1d1067423a432e7653fc9bd520d7d4526835d9f91f600deb1b531c419ed4e18d8e2761cd20362c270a89fd71d4e8fb084b2461746c3b39
-EBUILD apache-tools-2.4.39.ebuild 2587 BLAKE2B a7c36baaa3e6d06b5a5f3d41c383b7ea9cc4c2583c589e991f21004567e37219e7e8498f1b9da57a53fd9d7ccbce478fc7f4631fcc189f5921a96996b69d2b5d SHA512 ad7c508d9f4f160356c38fa18a0d307772721888b847ca60bd3f7f779fa60cafb16244a1a32345fd8ee14d9f1f4bfc1482226d5db7d6496775998cb824ae1c5f
+EBUILD apache-tools-2.4.39.ebuild 2579 BLAKE2B 999d4b6367146198056cdcc4fc1de9fb733812db81c738d2d47aa420ac70ad677645b81c06f54e215b8bbf90e7fdabd1eccc9d0ad4c10b237d76bd18e28c577f SHA512 b9d8e3c80b143da54071fb3d8b92d7a1996a325b3151021462dd566e4d24656bec7393e0234a6a16c605dd5446b927140ca54824b6b5674c76e7f648bc642601
MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.4.34.ebuild b/app-admin/apache-tools/apache-tools-2.4.34.ebuild
deleted file mode 100644
index ff23c968addb..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.34.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic eutils multilib toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
-IUSE="libressl ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
- dev-libs/apr-util:1=
- dev-libs/expat
- dev-libs/libpcre
- kernel_linux? ( sys-apps/util-linux )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
- default
-
- # This package really should upgrade to using pcre's .pc file.
- cat <<-\EOF >"${T}"/pcre-config
- #!/bin/bash
- flags=()
- for flag; do
- if [[ ${flag} == "--version" ]]; then
- flags+=( --modversion )
- else
- flags+=( "${flag}" )
- fi
- done
- exec ${PKG_CONFIG} libpcre "${flags[@]}"
- EOF
- chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
- # Brain dead check.
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
- tc-export PKG_CONFIG
-
- local myeconfargs=(
- --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
- --sbindir="${EPREFIX}"/usr/sbin
- --with-perl="${EPREFIX}"/usr/bin/perl
- --with-expat="${EPREFIX}"/usr
- --with-z="${EPREFIX}"/usr
- --with-apr="${SYSROOT}${EPREFIX}"/usr
- --with-apr-util="${SYSROOT}${EPREFIX}"/usr
- --with-pcre="${T}"/pcre-config
- $(use_enable ssl)
- $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
- )
- # econf overwrites the stuff from config.layout.
- ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
- econf "${myeconfargs[@]}"
- sed -i \
- -e '/^LTFLAGS/s:--silent::' \
- build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
- emake -C support
-}
-
-src_install() {
- emake -C support DESTDIR="${D}" install
- dodoc CHANGES
- doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
- docs/man/{htcacheclean,rotatelogs}.8
-
- # Providing compatiblity symlinks for #177697 (which we'll stop to install
- # at some point).
- pushd "${ED%/}"/usr/sbin >/dev/null || die
- local i
- for i in *; do
- dosym ${i} /usr/sbin/${i}2
- done
- popd >/dev/null || die
-
- # Provide a symlink for ab-ssl
- if use ssl ; then
- dosym ab /usr/bin/ab-ssl
- dosym ab /usr/bin/ab2-ssl
- fi
-}
diff --git a/app-admin/apache-tools/apache-tools-2.4.38.ebuild b/app-admin/apache-tools/apache-tools-2.4.38.ebuild
deleted file mode 100644
index 3cea8747c345..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.38.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic eutils multilib toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
-IUSE="libressl ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
- dev-libs/apr-util:1=
- dev-libs/expat
- dev-libs/libpcre
- kernel_linux? ( sys-apps/util-linux )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
- default
-
- # This package really should upgrade to using pcre's .pc file.
- cat <<-\EOF >"${T}"/pcre-config
- #!/bin/bash
- flags=()
- for flag; do
- if [[ ${flag} == "--version" ]]; then
- flags+=( --modversion )
- else
- flags+=( "${flag}" )
- fi
- done
- exec ${PKG_CONFIG} libpcre "${flags[@]}"
- EOF
- chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
- # Brain dead check.
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
- tc-export PKG_CONFIG
-
- local myeconfargs=(
- --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
- --sbindir="${EPREFIX}"/usr/sbin
- --with-perl="${EPREFIX}"/usr/bin/perl
- --with-expat="${EPREFIX}"/usr
- --with-z="${EPREFIX}"/usr
- --with-apr="${SYSROOT}${EPREFIX}"/usr
- --with-apr-util="${SYSROOT}${EPREFIX}"/usr
- --with-pcre="${T}"/pcre-config
- $(use_enable ssl)
- $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
- )
- # econf overwrites the stuff from config.layout.
- ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
- econf "${myeconfargs[@]}"
- sed -i \
- -e '/^LTFLAGS/s:--silent::' \
- build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
- emake -C support
-}
-
-src_install() {
- emake -C support DESTDIR="${D}" install
- dodoc CHANGES
- doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
- docs/man/{htcacheclean,rotatelogs}.8
-
- # Providing compatiblity symlinks for #177697 (which we'll stop to install
- # at some point).
- pushd "${ED%/}"/usr/sbin >/dev/null || die
- local i
- for i in *; do
- dosym ${i} /usr/sbin/${i}2
- done
- popd >/dev/null || die
-
- # Provide a symlink for ab-ssl
- if use ssl ; then
- dosym ab /usr/bin/ab-ssl
- dosym ab /usr/bin/ab2-ssl
- fi
-}
diff --git a/app-admin/apache-tools/apache-tools-2.4.39.ebuild b/app-admin/apache-tools/apache-tools-2.4.39.ebuild
index d05e8d28bc8e..69417dd72479 100644
--- a/app-admin/apache-tools/apache-tools-2.4.39.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.39.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
IUSE="libressl ssl"
RESTRICT="test"
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index 09375f17ed2c..a96a3b36ebae 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,6 +1,8 @@
DIST augeas-1.10.1.tar.gz 2289207 BLAKE2B 6e3cf750c4d3faf7dc472ec7bfe3c46f5babca294d2bd5169cca419c2f93e21bdd656bbc44b30ab66c00fb793df1aa045f60c1260963901773c334b9019eff0b SHA512 382e8ef6a5bd3d12d7d2e0d2987f39c04ff7df3f07cd68aa732bf266b89d5d59a85be63921a7ff70f9219dbc6bb8547f80528242caa9417e08a008d1721cb1d2
DIST augeas-1.11.0.tar.gz 2393675 BLAKE2B e7c50715fee892b47843f9be4ec9e88937c0ce10544b3e212d9c32a6151bbc36550d711ebec9db2a691e91cc6a2cd93696d807b440ab57a678ca6680426a4b03 SHA512 1b67bb7fcd9b560d3fe4a5c753d5e778db73caaab6e50367afd123eec107b65b73096913ac7d5170e85f5b63ff3522b2a6932b130e207ab22560dfc6e267b8a1
+DIST augeas-1.12.0.tar.gz 2429279 BLAKE2B cd90203fec1a81b114d95bb50e168b852923136f34c83974d3427cbedd4eb0d335d3952057507b38ded5c7011be2b56725565ea106cb32a0ca43b7c81250b29e SHA512 4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40
EBUILD augeas-1.10.1.ebuild 1000 BLAKE2B c6d0e200c970a67013c4495d5018f622a947c96de0f3f6435b9b8ae193335a5c7181e33debab36db20fe96fcdd87ce1e4e4b00ea2a22c3ebb37aa6e46e906608 SHA512 85322cb00d04bf5b8c9b7534126ed6c966b73f094b63afc211345d80ee83a836d90bec866168107d390072c2f0d90ea113b4fa1b525c54d4c3d820bafa704b9a
EBUILD augeas-1.11.0-r1.ebuild 928 BLAKE2B cff1daa25a49d177469f957656b892b9ec511b6a249f9106902b8339e632edc501fd9873be22d4f61f835e43ff0042f8935037e5c092dd4133d1bb242ff6ba14 SHA512 6368c5f1913ebf99e6191d819b89a1d953aef0e3704e3e00fc6e86e52b9bd06cd784bb5b5021924191bdad1e6fecd42e59b5393671e1246358b961114084e1d9
EBUILD augeas-1.11.0.ebuild 997 BLAKE2B f3d422e9dd5c0fa1bc0046e956c9646a43b0acd495f3264f56088183ccd363b6db427341e54cbb2e08785046d17543c622c555ef35f7af3f0e70c916a0cc4254 SHA512 15a1f7475f967d6953e023dc5797096f69108eac0740eecffc63dac3af0f11786dd1f5279f08333ff9f5e570c1d900855dec1d197d0e99a4110474ed94c4de80
+EBUILD augeas-1.12.0.ebuild 935 BLAKE2B 824593378888817e6bae67bcf64310f15a484e0d274689a9063191a4278da0e4387bce414f1271098db9e44b1f9f6b765b3df2bc96ee710f9c6a688482ee1d14 SHA512 6b98fcd3fb51a7a48e6e6f36fac6e142a2493e2c9118b45edb531f479cac410634d5fdcf638913d6e14db00b560aa7d8d5934b18dcf73d13b684783862302d8f
MISC metadata.xml 693 BLAKE2B c47bd36818c81a0fcb3d8f2e18e7a48797038c8a4a93302d592140faaed41d093523b6ad407b58dc7ae8c5f81c999c04e8514511b685e2a9b7d556dea177bde8 SHA512 1fcdcea259ed6cb652d08e763ccc67bee7bd5da9a7d3600dd492beaec7300868a47a7afdd71950ca8631886042428fce36cc17602a0776a9fa489f0fa2d27436
diff --git a/app-admin/augeas/augeas-1.12.0.ebuild b/app-admin/augeas/augeas-1.12.0.ebuild
new file mode 100644
index 000000000000..b40ea12be532
--- /dev/null
+++ b/app-admin/augeas/augeas-1.12.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+ dev-libs/libxml2
+ sys-libs/readline:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=app-doc/NaturalDocs-1.40
+ test? ( dev-lang/ruby )"
+
+PATCHES=(
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # selinux needs to implemented
+ econf \
+ --without-selinux \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ addpredict /usr/share/NaturalDocs/Config/Languages.txt
+ addpredict /usr/share/NaturalDocs/Config/Topics.txt
+ default
+}
+
+src_install() {
+ default
+ use static-libs || find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 675a8a175dd8..cb9ca5c6ae34 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,6 +1,6 @@
AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df SHA512 451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
DIST calamares-3.2.2.tar.gz 2579462 BLAKE2B f477493451e084a287f43abfdd66d4a77ce839cad61f921801462bef73df74d42e616d63682d09d59309d6f98ffe560e6c8f9176c9fb290701dfb4e5aa263b29 SHA512 f060534941e0191defa65f024ec8dbbd275d16d40e491015997f12d3eb404a3117d1f113d4dcef3421ed0d15c1e24bdd8b31fc4554d313ebbd3959058c202e63
-EBUILD calamares-3.1.13.ebuild 1983 BLAKE2B ee4739b47d4224b681e5909fcc872eb59f8d414ecfd316338ae948b45fdcca51bcf7a82608b74b25e79db6a77fbe538f1ba4850edbc848a07bb4bf10aa9e471a SHA512 6c1630a7e30912297bc8238b46f40eb2935bd36ec862a421d46281881f167bd31b116c9bb19f082f9f584c01bc4102a241b8a668eae1cbcd6803e4b7404a969b
+EBUILD calamares-3.1.13.ebuild 1976 BLAKE2B ae7f3e5dad7c55e1cf9a1e558245614c48021d43a354d7cfbde9d7555eefdb66d617d4643f373315961c9451dcc6bfa4c04ac5e042300d6fe54827ab4616ce7d SHA512 34f996df1e4f2f7479eecca39cfbf3ee784f7e681bc8aaa6da904bb70d36eac088ec739eec6ba96570803d4f7d5d5587a556680fa964aadda6eaa776de02e480
EBUILD calamares-3.2.2.ebuild 2188 BLAKE2B faf22c0f1f77779345778b693eea01edb5dfb28a3466b3393dda099e97c4e076924225c98bfa77a055cfeba312395f08b35eb21808161bf828c5bf658d378956 SHA512 9465e1540456e74042313b88a314757d7e6a0496ff6012818e601be11ad2f0c149c48870278c5ef8c06ac5218584e38798156061089189b20dfd1177becc1289
MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
diff --git a/app-admin/calamares/calamares-3.1.13.ebuild b/app-admin/calamares/calamares-3.1.13.ebuild
index 261aa9e0169b..9294153d0cc5 100644
--- a/app-admin/calamares/calamares-3.1.13.ebuild
+++ b/app-admin/calamares/calamares-3.1.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
inherit kde5 python-r1
DESCRIPTION="Distribution-independent installer framework"
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index f596dcdf73ad..1a68ce62a265 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,3 +1,3 @@
DIST cdist-4.10.6.tar.gz 676651 BLAKE2B 107b60c8890ede0bfa9f741375cc1705946b2d6be9caa4ae41c2ba155097b64e451474218ae9d5a8e2aa2511908869e8a5aa24fe15f0d41a50c8775d037a7eb3 SHA512 558fbe242a24fcd204a0b2519c9ad73405fe20466600af3635c6a5029641c4aec4315be99af0d5d9c1920aaadfe96942ffab94133c48675655ea8107fc8af90c
-EBUILD cdist-4.10.6.ebuild 597 BLAKE2B 9a8e20a5fbd3d7132a62ae3e168420ce97ac0232f9c473e69ce721564b11a3a5c5ceff42cd71d9c100def9a570789a4461e6917184957a5cab933f505f29c424 SHA512 824e1f853062f2c736652c2b08400d8747ff1839f3c9a5752dc1c528ebf9b697762a4cfadad721b0f1077f9bcaefe0728b6bb1191c42d204c1afbb2d74b8cd66
+EBUILD cdist-4.10.6.ebuild 593 BLAKE2B ce5fa56d967e7026a56a0eaffcd601bfdb40775cb7fa4a2078523d625be09aff694cb8b574330066bac1a5bcb2bf69d18028f768043a557dc23e8d3027129d55 SHA512 e1c557b71f4d1ee046117411edcc932c886b3e72f64adfc331a621ab4e279c91f954f6c68fdfa25d788ebf889085ad5122143068cb45584af34bfd5caef5f498
MISC metadata.xml 443 BLAKE2B 2742628c4f58fc21f1fca78752bce1e6275ec34ca7aa547a39d8a11cf3c7d9c149030078a55383f706053fa3cd70f071d5d5c571f3b009e941cbbc2c29b6c21a SHA512 5d1dbb6742101c7b89662f3edba9d3eb7da595611fbb613a1da1482e76cbf563fdf5fbf227471ca4c90e5a96d62c65433beaf9b90bbc716c7614ea5fe6b5063a
diff --git a/app-admin/cdist/cdist-4.10.6.ebuild b/app-admin/cdist/cdist-4.10.6.ebuild
index 44334c2bdb79..d9e2be9d9d92 100644
--- a/app-admin/cdist/cdist-4.10.6.ebuild
+++ b/app-admin/cdist/cdist-4.10.6.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
inherit distutils-r1
diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
index ef1bf98ee268..49f2d8223bce 100644
--- a/app-admin/cgmanager/Manifest
+++ b/app-admin/cgmanager/Manifest
@@ -2,6 +2,6 @@ AUX cgmanager.initd-r1 331 BLAKE2B 725b5044fa567e7f7146bd62cc63a0674873d6fcb022e
AUX cgproxy.initd-r1 661 BLAKE2B f84189b5fe16b6327cd1a6a2cd1805f1bbd75791d0f6f75a601ea58fa51d5a490d655371355205c499a51628b4e9cdf21f98431adcb3000397508cdacef2928b SHA512 7f43ea6369428d71d122a191c6a1718987ed09eafe2217ae326606ddf2a50f0500d0de0520fe21e5d2edefb8ddd4c3a85623d2aac1212e821ea922cb8256fffc
DIST cgmanager-0.41.tar.gz 461805 BLAKE2B 22c779953d637012694c19490da9d3707b9e2a935f910d192fd1e6a44c27e933e93b6ae516399991924175a9e8e05fd650cf3117d3e7bde034a20bc083ebaa09 SHA512 e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd
DIST cgmanager-0.42.tar.gz 467980 BLAKE2B 70df5ebda230773f3a2a4ed6f784e591126769122533182821b0fe2c157f9bd7b9fd58a3bb104b0ef089320b167d3136c379d760ea6c65dab0c88f46d41596cb SHA512 d92113a6748084f1c0708f75c8bdf5de484d534bf00f664a5288902be887c2a1c7cf3d91afaab3331f0d573a86fbc6edb2fa1d37c070250cf53e0621213d7d74
-EBUILD cgmanager-0.41.ebuild 1236 BLAKE2B e28b1efcfa1d57fe5702891906e34f5720e71a3a8eba5af4ca5f0a5fb1139e466b2f298d76cf845a39e9b9f82d3220e54ba4880bb6757f51d5052ebdca2d14fd SHA512 84c8030e5f7f08a94e4786be92b9b5d89c8a2d21faeaa964d8009ec85b676c2ce4b06dbcf63e3dc9fb2962962cda3dff2f03fd34bfaeff2790ac6bc9d4e74311
+EBUILD cgmanager-0.41.ebuild 1235 BLAKE2B 890cba523c041df44c3b49a121f29e0176644861542f284bc43ef5d63b52526549c8eb561ba780642f609dee42cd584c59dd310c2da64a126b61a5f383d2303a SHA512 e6cd199326dd29df6a7d8683169840ec154cb625e78536cb1e5144532f856a9d2cf9d1b73f9f8cc679c0bcf6e487b54cd6c4fb2074104006a897163fed949447
EBUILD cgmanager-0.42.ebuild 1246 BLAKE2B e19151bb91d70f7b3c37d0093a5865d634b8c3075782cd470a7d03c3ee7ec20e64dbe746bf1b9f1f53f2838bfabadf1e082162291cf2034c2b577b81dbb91363 SHA512 1815e5d14be783fddc7c3bed7b52c64e48334f39a2fe57a4ae8ade298493cccbd8a8aad25fec6a08a48c8578d07193c61b7585c64a35d91d39c79f6a8a264ff4
MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/app-admin/cgmanager/cgmanager-0.41.ebuild b/app-admin/cgmanager/cgmanager-0.41.ebuild
index 0c71191244f1..87ae5aee337f 100644
--- a/app-admin/cgmanager/cgmanager-0.41.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE="pam selinux"
RDEPEND="sys-libs/libnih[dbus]
diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest
index be8728e24df4..9dd173d3d656 100644
--- a/app-admin/denyhosts/Manifest
+++ b/app-admin/denyhosts/Manifest
@@ -6,6 +6,6 @@ AUX denyhosts.service 265 BLAKE2B 4ecccdf6f605936ffb7339c2ec2510f14b0817cf3ed3cf
DIST denyhosts-2.9.tar.gz 49472 BLAKE2B 94f18da3db9dd7e0d979d4fb536160114fe1dc95ac43ad1f7bf3f235702698210e62b3872bf7f3360945228b187d97a274797d535a9b12b552bddf649b5d1fdf SHA512 f41e2985e84f0eeaa493def6b8609de934889d02b124962b0bfd02ebe5e41d0670822124eb50ed84eb1c3b8a2a96775fbe09386cef48a3c3e04949fd6b1452c1
DIST denyhosts-3.0.tar.gz 56283 BLAKE2B 1ecb8a13ec9511cb4ac65579aa8f88117264f231b586c30a61ad9c78abd17aeebc5642e70f162fa7e73fe81a99821d494efca213b1bf864fd0e2043fa4374e6a SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d
EBUILD denyhosts-2.9.ebuild 1860 BLAKE2B d1a3b4b0414fce7fd1eabf226e5fc46abfeae98cf313b2c32bc36a6447625bc3f31f0d0300c5d7b17a328a22aef934f914adf9265ffb15bdcec88fe87fefaf78 SHA512 170d31711fc00f51e6b177cfebcdbeff660a9d2b6cc3eb953d4082e7d3d265cf371da59890ee92b29fea8a2aa740cb25373c0ad6585e9e31db515fd87f512ff4
-EBUILD denyhosts-3.0-r1.ebuild 1780 BLAKE2B 6d4f599a686bc016f48f00aa7c8a666ab849b14043ee2a930e3ae9075bcba4feea50fc26edd1791d0a8f1ce5eb4ddeb069258c70886cd111998a07cb0f5938e8 SHA512 3c49e6abd5722035baa8d5545014f9d954749a6d75e7a7ad54299ad6df06cf294e405cc473d317e370d7215a6ae867ec1de79db7b2d6c1a3d58c326af7842661
+EBUILD denyhosts-3.0-r1.ebuild 1775 BLAKE2B 5a9df3434e7aeab917dc264753e53933e1aed159f86c0f88212fd68984be5cdb0b17ab264ee3a4f0ee07d2563430e89a732a44dcda8f8881418bf225753243c1 SHA512 ed61ce1d32e7cac1673b9a45bbd0d8c8fcc8f44ff51c9feeb67c55338ef85a9f1c13475c0749d1f53fc5e8815bc37c2ba407d538f152dddc71d81cb25ca30877
EBUILD denyhosts-3.0.ebuild 1672 BLAKE2B ffce8305ca9db71a456c8163a7bb1fdfcf7187b4433988c93e01f94407dcc0edf577b8d187ad017ff4e357e56d907aa4d34cd4f4d8b292365d46ea2a079be6aa SHA512 660bca4d0ca9fd4eea074cdfde7629d06cb4c6c48f3b0cf9674d6ad62ac931cf51624b67e52862b6b284157643f634495bbce7c6b927bc1b80274ed497a9aad0
MISC metadata.xml 402 BLAKE2B df1bce989ad8c249f83b5ef00681d455ca645b9160456b615c5a18c1d564d3dff8f6021ed95b9c7ff0d5e6939fe2a99735b4ed16ea8360f021000377f981503b SHA512 0a232a4ee999ce021244cc19ad62e68c962fcfb1cbfda1aef306e6b3376e3944f233cff133c746aedc3f68c60a61511b0a749b434515b705f63d68a034951ed7
diff --git a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
index 87800807c36d..dd343435a062 100644
--- a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
+++ b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit distutils-r1 eutils readme.gentoo-r1 systemd
diff --git a/app-admin/dio/Manifest b/app-admin/dio/Manifest
index 8c31e697af42..9457d647e07e 100644
--- a/app-admin/dio/Manifest
+++ b/app-admin/dio/Manifest
@@ -1,3 +1,3 @@
DIST dio-1.5.2.tar.gz 44344 BLAKE2B 8e573cbf2ad1b717ffec09f20f8c7474841bc3e1635af35116d02b37af56ef3b4742e12725134d485f788e7abb595605640e19bd6f84bfd8f14289abf1695089 SHA512 366d2f2d25b8d16439c4a9aaa7cd775ddffb1022980675cdda8e2e4d4de3d3e5dcfa8d0c581b73fcfe4eff66ee8ef682f082c8788f514b7abdf1a2cb2159b9ba
-EBUILD dio-1.5.2-r1.ebuild 871 BLAKE2B 05332002c8ed739e28b4b902f7404e00a248eca9ed747603e2fff5842a3f773e1076bd31b11b75c6a7cdcc73dba284407695e5d3295d5f7ef0b1faa9f820cec4 SHA512 c65e8d195a6dd8fde56ebb3f9146233b7f06bb987884e311c49d90a572e1c1d49ee62ab6b8de9ef40f241b4ad49bd07ca18381bab404d8c53caaf6cc8fc18067
+EBUILD dio-1.5.2-r1.ebuild 867 BLAKE2B e94a664a8e0957f5b0e7159f4a1310c9013be1db20020ed60f99fab0552106cee34aca61897a0482f0cabd5fb13186fa89fae682208a8ee6963b557c460d129f SHA512 3aa8452f4268029058e5c6b0e5646ef9ca097475df55268912e920a34c00ca343dcb93d591d17e911777442c70416b7213ef6b474e01dfa5ab9792e2e6ef8ee8
MISC metadata.xml 912 BLAKE2B 5fe57b665757cb19dbe7e6efe2202d5cb4e8311fd21c3974a0c42017841330ce03242e5ac656818781cd39cb3ff62c05ed69ee008b8aa0c1809311819e23c588 SHA512 80995a42eba255a8e79ae0ae2596114b2703a433151b3f33d438a002c220194b14905221b9ab2e59185776c331ba22342c04d3ebf5aa8297b1ef988c45621f62
diff --git a/app-admin/dio/dio-1.5.2-r1.ebuild b/app-admin/dio/dio-1.5.2-r1.ebuild
index 2a0d993e8a0e..c8e8f458e928 100644
--- a/app-admin/dio/dio-1.5.2-r1.ebuild
+++ b/app-admin/dio/dio-1.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -9,7 +9,7 @@ DESCRIPTION="A device I/O monitoring tool"
HOMEPAGE="https://github.com/donaldmcintosh/dio"
SRC_URI="https://github.com/donaldmcintosh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
LICENSE="MIT"
SLOT="0"
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index f33054db33de..94eb38978a3e 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -2,8 +2,8 @@ DIST dxf-7.3.0.tar.gz 298408 BLAKE2B a8ba078d1bea8fed58df35562af678f902513f4da18
DIST dxf-7.4.0.tar.gz 300099 BLAKE2B a3d17709efed3af5be82b1bf4ebd4201101e92867f714355467d72b84d560cddcf13a9ad2b4b71553decfc664f29c7ee13f74d551092d8a3a25dc48eea9a4214 SHA512 7aaa5827c6f02bb22b4d2dae9e24aa921ecebe72fe8278d3fc84f48448c1f903c0b70c22873d2772f3da5367ecc45770b8719c4d1aa95cac146a392bd9a923d2
DIST dxf-7.4.1.tar.gz 300216 BLAKE2B 53452e73a10912a09e912fc0710fcdd1b0a6be4f78e95c704526852deacf5a7bfd2d3b73bc165f178f732249a64547e13bf9f58f77159c31908e954d6d3a4161 SHA512 a7a2ba4da675f1dea73f2e3d7db63804eb2b68cbb859e43235997b3bc5b8e7ef209705935182ae33d4b28cec5857d2ede738375e19df72134a5695190fd609a1
DIST dxf-7.5.0.tar.gz 301822 BLAKE2B 33f2356cc6e3567b11d48b63ae9951bdbf5e77726e7f6081b3d299b0560646fd775060b3fe2766d3de69b33cedf4c3f21810bbb4429402a1d9c616da2f7c0ba6 SHA512 82a4a4d2b8baaba242f82b2c01ae47adc4856250bf558d28e0582e6a92b081ff9512e33d3b02d022232880003df40dbd62b7a6401aa5bac83cb673ebb9c85435
-EBUILD dxf-7.3.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
-EBUILD dxf-7.4.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
-EBUILD dxf-7.4.1.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
-EBUILD dxf-7.5.0.ebuild 726 BLAKE2B fb23ab46f823bb55d325c1e3a8681608e4fc6413578016aebe40afdef3b8fd9648778872ffc5c9b81d841145bfd10ee22105b7c631f5eea7afdaaa0d8700c4e1 SHA512 5a43d7ef441917193a8e1bf59fe0d3352c9c1ca6ffe4d86569720685513a6f89270c3e243ff37d25ceadd1bfb0c826cbe78fe1ee12590905a641776ba4accd87
-MISC metadata.xml 373 BLAKE2B e00f8cf7bc138cba4b3a9db1da273f85a90612578a89a8943bad5fd2bfe5f36d233b6b26764a2fff0c261890cafe34243845d12f6e9ed952daeab86c2e3aa70a SHA512 85d9b0ab4896713d2e796fede5635fc4bb80e402b2a6a7404fa1b7ba52e139a0ef27876dae39081c58a5ea8a5a78749b7fcc13c038b85c90c4286721931cb63c
+EBUILD dxf-7.3.0.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
+EBUILD dxf-7.4.0.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
+EBUILD dxf-7.4.1.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
+EBUILD dxf-7.5.0.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
+MISC metadata.xml 295 BLAKE2B b3270ada06f2998a84e5484b6b063cb5e1c397be2bb266ba10352e811f35e25576469488cb42eb49ac718c6e788861b706aba3e1cb673cbbf176c576fc5745a5 SHA512 99b0deb01ac0e00d6f958c41a9ad8a68bf606a178924c0f052a656d0bdc2638b711e4fe10ab49e1a943ce7a8c29fc77b94abd4a91f6f65a3debd892d8a099339
diff --git a/app-admin/dxf/dxf-7.3.0.ebuild b/app-admin/dxf/dxf-7.3.0.ebuild
index f6e0099fdfe3..2b55ca80585a 100644
--- a/app-admin/dxf/dxf-7.3.0.ebuild
+++ b/app-admin/dxf/dxf-7.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit distutils-r1
DESCRIPTION="Docker registry v2 client in Python"
diff --git a/app-admin/dxf/dxf-7.4.0.ebuild b/app-admin/dxf/dxf-7.4.0.ebuild
index f6e0099fdfe3..2b55ca80585a 100644
--- a/app-admin/dxf/dxf-7.4.0.ebuild
+++ b/app-admin/dxf/dxf-7.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit distutils-r1
DESCRIPTION="Docker registry v2 client in Python"
diff --git a/app-admin/dxf/dxf-7.4.1.ebuild b/app-admin/dxf/dxf-7.4.1.ebuild
index f6e0099fdfe3..2b55ca80585a 100644
--- a/app-admin/dxf/dxf-7.4.1.ebuild
+++ b/app-admin/dxf/dxf-7.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit distutils-r1
DESCRIPTION="Docker registry v2 client in Python"
diff --git a/app-admin/dxf/dxf-7.5.0.ebuild b/app-admin/dxf/dxf-7.5.0.ebuild
index 97c2ef774d08..2b55ca80585a 100644
--- a/app-admin/dxf/dxf-7.5.0.ebuild
+++ b/app-admin/dxf/dxf-7.5.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit distutils-r1
DESCRIPTION="Docker registry v2 client in Python"
diff --git a/app-admin/dxf/metadata.xml b/app-admin/dxf/metadata.xml
index 3dbf29ff0e73..5fa3dcb6838a 100644
--- a/app-admin/dxf/metadata.xml
+++ b/app-admin/dxf/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="pypi">python-dxf</remote-id>
<remote-id type="github">davedoesdev/dxf</remote-id>
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index 04de4d0e2c4c..3ca4b5a92bdc 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,6 +1,6 @@
DIST eclean-kernel-0.4.3.tar.gz 10650 BLAKE2B 228d17cfc5bed34e892dd6340498b87cbc32f22e83aff70824ef24f88836e3ad2306eda8704e25b7cfbadb33984edee8effd613dad67ada25519c601ec6b6ec7 SHA512 a2ffbfe800672ad0cd105425497dae72c0779ec9da5ba6a6b4efd8846762467acf6b8e70c67744e7c7639d5ba2ba4643ad344aae193e72d12d12f48b1793ff4c
DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
-EBUILD eclean-kernel-0.4.3.ebuild 498 BLAKE2B a2425d0f701327ab32ef5722685730af9f2fd38ac44a2be96ca2861afcbaa24499ddefefb0fb288f35acb4564787b9dd642b2db7a3836c77e8634a023380d599 SHA512 6b72f4a9e85374d8c4659b603153a611c271baade6c83ea59508383c13f3ee4b64f308da88761af0b6e7e60d19eb3657c118f6829b155677c6a51c54279d54e8
+EBUILD eclean-kernel-0.4.3.ebuild 496 BLAKE2B 7b487677ebc6c669527ea384f86e9137dbc1c516107c248b7c15a9f1f8ae2a84433c3b06d426a1143dcf3c59ec691bdd91469b8d6a5ae09126a29c27a68d91cf SHA512 6e2498c23eac95fc82380f13211bd72554bdbfc8c5057a7c0a75b9654737eb6c27af18374bd3667b41b28083563c15f9baa427fd0bd59b6d4c1512147d26243b
EBUILD eclean-kernel-1.99.4.ebuild 362 BLAKE2B 20894519cc3270ab4880c0373894638d18ecfeb34fa49a7f801e4889d22f78702c87201c3cba929092b38149f3b14109b058f95f597eea8c1507011af37b14d8 SHA512 61b64ce5d1f0e842de988f1d62bb41af6e16ef73a05ab35b90d97410292c5409c3873fac6dbd9a09e4be033cd19e70a283cfd6be48183409822c29ef26abdc85
EBUILD eclean-kernel-9999.ebuild 401 BLAKE2B 075d11ebda0764b47d16b0bf36174af6554ea42b1a62450890b7051f33a9fcc2691a6da8a1e73161e38879af2eedefb6b5bd7aceb01c5ed92050f505e805c75c SHA512 efef86fdb8d6d8f65f6be0693967449d6fb36bb45e9346de2ea60ef9ca0178bb61303b2415a0a589482ff0dfdd020812206dc0fdefb6ac97a6c2e6de880a3843
MISC metadata.xml 539 BLAKE2B 23dbdae146e666b8698181642673dc708027ddac7c33a9f53edc9cbf1d1e1ce62e8d4531a6962098bdd6cd2029369b587823b2f9630e285b43c0db340b29e70f SHA512 2a74b715ba28178d042f907014b02fd181e0e481f4eb9230b15ef542be61b2e1fce17efba4819b6d06de09ed7988b39047b59182b6c4de86a2a05ad0350635dd
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
index 790981581118..c4b2a5852ccd 100644
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy )
inherit distutils-r1
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 12844604fc8e..5121cf256677 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,5 +1,3 @@
-DIST entr-4.0.tar.gz 24758 BLAKE2B 6d57cb93d55bb362b8e771745c9333a5a5eaa156f36a7c9e7318d94f0056fc98b2071bcea7fd33b68ac1dc1d5332fc849e0ea89bc2582196acd51e1490fce96e SHA512 d803c27441448374a866636e0e592a8395488e162e2e8c031aafec3457d10041dc52e10d06cc1e209cd86f69ca021171ef105056206b9afe603a89958eef2707
-DIST entr-4.1.tar.gz 25265 BLAKE2B e90a50e7ac0917441db872fcc3b228bd2d16a77a7178810d004cb23510644843dbee1b9b47aedbe7b6b696501f994201f4eab404c6de950013c0b81b042382b0 SHA512 0a80aa9caa97f2603e43957b716bf5b5746cea8bfb2f2cc884aab8c97a34341d6223035fbb5d4bf86234ea1c9314c077cec9d59ba442a2730fcbd7151425a459
-EBUILD entr-4.0.ebuild 579 BLAKE2B caff26e939080b9fc895617b9ca76c3141a9bb2965a1fae7d8fd79e8b8d3075cb82cc635bc503a67c6438414b0f37a67ea9aec2dbd2564890c6069d244890e73 SHA512 806acd46a7f3d3c285d3f063a2e3a9b247a54dcb50020ebcc6a4fc1e3bbf1fb6f46987f0e6d0a6071d44613ab47a953a0ae21bc8cdaf024c05d456e34bbdc9be
-EBUILD entr-4.1.ebuild 579 BLAKE2B caff26e939080b9fc895617b9ca76c3141a9bb2965a1fae7d8fd79e8b8d3075cb82cc635bc503a67c6438414b0f37a67ea9aec2dbd2564890c6069d244890e73 SHA512 806acd46a7f3d3c285d3f063a2e3a9b247a54dcb50020ebcc6a4fc1e3bbf1fb6f46987f0e6d0a6071d44613ab47a953a0ae21bc8cdaf024c05d456e34bbdc9be
+DIST entr-4.2.tar.gz 25599 BLAKE2B e1bf4e54df7077219d213d994a26ea10517dc88db92194d68acaa3a01e80ea3e81334b0b24bb39654da1d220b7175ab4088f583c46f9007e93e5da7fc7fe1c04 SHA512 67fc4eea415a5deffb59b493f17aa577746217c2cda6b5645d22541be6cc10ed949bb6e37bd46bc6e5cfd951f7ff611eb927be6f5d43db381437d3d1eb6f7968
+EBUILD entr-4.2.ebuild 576 BLAKE2B a9d9b2a2a469f49a19d44787f58eca8f6dd1f1792237efd731e6d01c36949fad0563f0024f3f474f2e039bbc9c9fae3d87be71e01405c203af37eb74744e715c SHA512 3c91e40d05ca6e5e44ba18ae4c10bbd2d19891de7e82f61d67d60c8ef198edc27b78346ccf027c41f762721966e809f0ef4a64188a587781b324d8a78a552520
MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-admin/entr/entr-4.0.ebuild b/app-admin/entr/entr-4.0.ebuild
deleted file mode 100644
index 829cf311603a..000000000000
--- a/app-admin/entr/entr-4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs vcs-snapshot
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="http://entrproject.org"
-SRC_URI="http://entrproject.org/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-IUSE="test"
-
-src_configure() {
- sh configure || die
- sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
-}
-
-src_compile() {
- export CC=$(tc-getCC)
- default
-}
-
-src_test() {
- export CC=$(tc-getCC)
- default
-}
diff --git a/app-admin/entr/entr-4.1.ebuild b/app-admin/entr/entr-4.2.ebuild
index 829cf311603a..be89649663dc 100644
--- a/app-admin/entr/entr-4.1.ebuild
+++ b/app-admin/entr/entr-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/app-admin/fleet/Manifest b/app-admin/fleet/Manifest
deleted file mode 100644
index 6a86363d3c4c..000000000000
--- a/app-admin/fleet/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX fleet.service 195 BLAKE2B 4d229f3ea79b9ab6c400703456881e6978c8c5d4976e6e91c02dd2a84ba57b46d5d628c4b17644d6075ca12a195885144b74020852339b8d4499b774dae88117 SHA512 a654cc4f72a5b49c2383713660acfbc127dbc21d363f063a88d0afe02a76c191100b18b6f93bbbce26452458d7afd532a24b44e20bbd321787a63b25178182e5
-AUX fleet.socket 42 BLAKE2B 4b9fc506da1a5910ab2f4ce9eb01f3be4348a9a533870ca884fb1a3e6b8f08803a0f1ca60b300a90750b052768a30bde245a7c20e2e6e6576e61696ef3705bfe SHA512 85a9bd9bd93c61726ee59e2d00fe3cc7abd91d2f20b1ef2fbb8ad7522f682a2a5376070fa360f3e8c1d19011050fe822445bda4015ed2838efd343242b778230
-DIST fleet-1.0.0.tar.gz 4865693 BLAKE2B 33991c25ff2f7bf4307a9a3d2a6274b08a358d8041f641eb33b68946a2e682caae8b20643ac2735f447398cd305b9e3a77370ad6fc2ebe26b12c2f290a03e1e6 SHA512 77f38b605e37499e31effd82c3c4f0efd6adda73e9ded86db68efcd19a34bdc44b9f6f88b7fc94f7ea4f55b2027a1270d3c87897bf12b121614384a91bd9a3cf
-EBUILD fleet-1.0.0.ebuild 892 BLAKE2B fa6dbe21f4b1133f6dec33e68d347207d8d81a704762af7545a302ca2539ce8d45f6e016fb905749052741dd1fefa66c78060db55e4324b2003b17da2f3f6b97 SHA512 770ca8ab09535293f0811072e0982dab8169ad20341ff4d50882fd3fdaf68aef0ed7f3f7c916e51f519da8878833ed641fce3969e4d6ff9f56d5d431c53848df
-EBUILD fleet-9999.ebuild 828 BLAKE2B a07823eb208b09d3a58b1d45d586371b3f58ac23e5031e61e6c7cddd201e8004a40f5f62da1c940372c65ee5327b040d4d29479f10fcf56027c9824096ecbbb1 SHA512 4b61f4138e8eb306f38a9cc1aaa637bb75d4d779e000cbe481313576151bd47a1d5f1bbdbe752b283ead3d0cfa0646db62d4e93f018763d9b5e2007b75a10e5a
-MISC metadata.xml 249 BLAKE2B 007ead1effe6366e0c4a08465f2bfb507cfe181aba96029dcb5ad4e46b7da6d954a6327200e3261d4cce93abc43b3da50040c818b1c16832b812d4c4f941b435 SHA512 a7cb996459f6adb6863fa7d51363ebcc5e4bee2a62b0416b1fc17767aa145442de6d3bceb69aa19cc59e3b5e7b51f06ee87bc4d2a4b1cc5f2b7c9c7caa60cac9
diff --git a/app-admin/fleet/files/fleet.service b/app-admin/fleet/files/fleet.service
deleted file mode 100644
index 1f44fe9df62c..000000000000
--- a/app-admin/fleet/files/fleet.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=fleet daemon
-Wants=etcd.service
-
-Wants=fleet.socket
-After=fleet.socket
-
-[Service]
-ExecStart=/usr/bin/fleetd
-Restart=always
-RestartSec=10s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/fleet/files/fleet.socket b/app-admin/fleet/files/fleet.socket
deleted file mode 100644
index 4fc446e8fe37..000000000000
--- a/app-admin/fleet/files/fleet.socket
+++ /dev/null
@@ -1,2 +0,0 @@
-[Socket]
-ListenStream=/var/run/fleet.sock
diff --git a/app-admin/fleet/fleet-1.0.0.ebuild b/app-admin/fleet/fleet-1.0.0.ebuild
deleted file mode 100644
index 9f43c632f33a..000000000000
--- a/app-admin/fleet/fleet-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGO_PN="github.com/coreos/fleet"
-
-inherit systemd vcs-snapshot
-
-DESCRIPTION="A Distributed init System"
-HOMEPAGE="https://github.com/coreos/fleet"
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples test"
-
-DEPEND="
- >=dev-lang/go-1.5:=
- test? ( dev-go/go-tools )
-"
-RDEPEND=""
-
-src_compile() {
- ./build || die 'Build failed'
-}
-
-src_test() {
- ./test || die 'Tests failed'
-}
-
-src_install() {
- dobin "${S}"/bin/fleetd
- dobin "${S}"/bin/fleetctl
-
- systemd_dounit "${FILESDIR}"/fleet.service
- systemd_dounit "${FILESDIR}"/fleet.socket
-
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
-
- insinto /etc/${PN}
- newins "${PN}".conf.sample "${PN}".conf
-}
diff --git a/app-admin/fleet/fleet-9999.ebuild b/app-admin/fleet/fleet-9999.ebuild
deleted file mode 100644
index 07945ac690b8..000000000000
--- a/app-admin/fleet/fleet-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit git-r3 systemd
-
-EGIT_REPO_URI="https://github.com/coreos/fleet.git"
-
-DESCRIPTION="A Distributed init System"
-HOMEPAGE="https://github.com/coreos/fleet"
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc examples test"
-
-DEPEND=">=dev-lang/go-1.3:=
- test? ( dev-go/go-tools )"
-RDEPEND=""
-
-src_compile() {
- ./build || die 'Build failed'
-}
-
-src_test() {
- ./test || die 'Tests failed'
-}
-
-src_install() {
- dobin "${S}"/bin/fleetd
- dobin "${S}"/bin/fleetctl
-
- systemd_dounit "${FILESDIR}"/fleet.service
- systemd_dounit "${FILESDIR}"/fleet.socket
-
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
-
- insinto /etc/${PN}
- newins "${PN}".conf.sample "${PN}".conf
-}
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index 6bc26ae8e5c0..1ce2533026ac 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -9,10 +9,12 @@ DIST fluentd-1.3.2.gem 438272 BLAKE2B c7a239928e251b84217cba4181e81f58dda42065c0
DIST fluentd-1.3.3.gem 438784 BLAKE2B 186aa4af59707c6a68a6f82b94b233e3f52eb11745ff4ce7f942a4fb1f8516cc966e14f541a23dfdfda72ddea058e19d1b8184d0c40bf92ce4cd48e5735946a9 SHA512 b3348939d72b07d424a8d98f0d817e72d55918be9ac4ef5f456a3c44ac1ca28944b63c943bf2bb230b58793a33c1ca12304cebed15827a3f6e32f2ae3b68f0dd
DIST fluentd-1.4.0.gem 440832 BLAKE2B 8f25cc6ca4ceb164156fe3ff3a14a18109f0943587cc5cad49185ee442e3cf381fa6859e36c8df94241f8a9922102fd479e39b08c394c46d6edc7bcf58abecee SHA512 e817cc128a29e5c30c40e08985f84d3a8e713cdcfd0e05af7d08d3b7dd5cb6810b85c455a3c425bd84775cdc060e74530dd264bf5fe354b5038c3a2d779d42c6
DIST fluentd-1.4.1.gem 442368 BLAKE2B fff0b5677a41637caa6ba3725797df7b1573c13ed9742cd125e89a5a8c1ac380c23d84c3f89e0c11ac109dc757c0bed93b8d79ce4c722a90d04c9a0bbd5d8887 SHA512 64bda77b818f2e35cf941b02119b08c9a52c03c8b94f7c2c5ab9c92e31010e296babe996cf400c41a3b34f92a16d577e81cbd6f204270b0a1d1370c6cfe83bfe
+DIST fluentd-1.4.2.gem 443392 BLAKE2B 0aadec57268c69d45f4cf0e36be59e957b283f33f3dd6ac9bac0294c084b0e7d0e8fc28b1f12c3f5548dbcf6c1e562ff4a2c7f52bf7b0126fdafef102ba9562c SHA512 e67226a1e1fc6debda93b8efef9f19efb8eab7e0951a63ed646f2d01259f08d972c276aff8bf704acb64a10705460c4d68ac527cce1999707611cef79b4ae5cc
EBUILD fluentd-1.2.6-r1.ebuild 1353 BLAKE2B da8e47f5f09abf639374137691b7329767e3bc0febbdb58299811456f168e9d6b3a8ab00758a2a1dd8654d0a60bb97b47842e249728d99ef1c9886a87759d7da SHA512 bc101637c4a80853b7b7403debb7d25069508020e75d1e3ca597f327e615bf60fe0793ebd8a437c3bc3734fe2556756589525959a40625fb979dc698ba3bc320
EBUILD fluentd-1.3.1.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bcca6fd7b5722b39afa1b6218f0e94a79a551495c6355ec18ce600ff362c4741e27427c9608bf8ef4436c162395 SHA512 bdd1ee61c01eda0f9e38ecf3467461f3afb2bba08615680aaf8e7139e94af08e87f8c17bd98499ef55f93da2a6ad2a607bfd590f6e70d21e4b4b4ebb8154b7fb
EBUILD fluentd-1.3.2.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bcca6fd7b5722b39afa1b6218f0e94a79a551495c6355ec18ce600ff362c4741e27427c9608bf8ef4436c162395 SHA512 bdd1ee61c01eda0f9e38ecf3467461f3afb2bba08615680aaf8e7139e94af08e87f8c17bd98499ef55f93da2a6ad2a607bfd590f6e70d21e4b4b4ebb8154b7fb
EBUILD fluentd-1.3.3.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
EBUILD fluentd-1.4.0.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
EBUILD fluentd-1.4.1.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
+EBUILD fluentd-1.4.2.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
MISC metadata.xml 665 BLAKE2B b2487570d210ca695ec87ff2643128d9b7ccd84820efc9de8c3785298c0462ec1eb93abd3a9c481264aa564ceab8371db370b2b5d78975ecbcf8d812c6652ea4 SHA512 8b2888a9b821c0629750471fb3304e399122652a36e605adf3c11b8340ceafae5467035737d9c13a55aeab3b6dda79bb623b524fbb8fa6a1bbe0c576f32b2407
diff --git a/app-admin/fluentd/fluentd-1.4.2.ebuild b/app-admin/fluentd/fluentd-1.4.2.ebuild
new file mode 100644
index 000000000000..9bb8568d1ebc
--- /dev/null
+++ b/app-admin/fluentd/fluentd-1.4.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem user
+
+DESCRIPTION="data collector and unified logging layer (project under CNCF)"
+HOMEPAGE="https://www.fluentd.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+ >=dev-ruby/msgpack-0.7.0
+ >=dev-ruby/yajl-ruby-1.0
+ >=dev-ruby/coolio-1.4.5
+ >=dev-ruby/serverengine-2.0.4
+ >=dev-ruby/http_parser_rb-0.5.1
+ >=dev-ruby/sigdump-0.2.2
+ >=dev-ruby/tzinfo-1.0
+ >=dev-ruby/strptime-0.2.2"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+all_ruby_prepare() {
+ sed -i \
+ -e '/tzinfo-data/d' \
+ -e '/dig_rb/d' \
+ "${PN}".gemspec || die "'sed failed"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+ keepdir /var/log/fluentd
+ fowners fluentd:adm /var/log/fluentd
+ insinto /etc/fluent
+ doins fluent.conf
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "A default configuration file has been installed in"
+ elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
+ elog "this file to match your configuration."
+ fi
+}
diff --git a/app-admin/genromfs/Manifest b/app-admin/genromfs/Manifest
index 6a75dd3241b0..0ae69f90107d 100644
--- a/app-admin/genromfs/Manifest
+++ b/app-admin/genromfs/Manifest
@@ -1,4 +1,4 @@
-AUX genromfs-0.5.2-build.patch 547 BLAKE2B c8963e68e03b0e559ea422ed9d0589f600eca3de18c69af68e11f40606e93f6a0045f440146eaece5e5a30562532e54d719d10fdabaf36a0d4fdabf3ea235aad SHA512 b4d0f162c5605f0dedef2a08c0f6abe0ffc78e66dd74d2b8f2df33bcc190b002384e0f2c1394502564906553412aa8ab688d359ba435f6c43af5abae1d9970e3
+AUX genromfs-0.5.2-build.patch 551 BLAKE2B 9574a6285b2d6335fe32894bf42a51822625498a3f6a3fa3c227195251903baefdd86f3a6106f4a10c45e7618a16b5160c9c4a64f9bc7eb3d8ced587903bd2a6 SHA512 d7cda99be9e675951bcf6c3dc42e9aeccea01fe5fb32c5c072798af5d700ba7126164105c6fb05eefefb63e69e3f6b8404d3d00655541155238465ba1f8e0d23
DIST genromfs-0.5.2.tar.gz 21069 BLAKE2B 350ebf11b8ef068053217b75ac995af1199e4c4c11823df584e8169c260dbd851d4f44ba6d23ac1f5f4cd9c2ca7ae7fd268d02ba19529da90003a697efc3e06a SHA512 7fa2f362e4a61ab38f5262fc5a716119312d3029f93cf0a514313c5a3c956d687d777a826da2f4ad95edaf5eab014464635b0afbaaa11f9b495efb6f03fbec2f
-EBUILD genromfs-0.5.2.ebuild 568 BLAKE2B f990cb38e32ab90ccef01cf558ab5efa73798f63bf548045ce0494c26f8739d746a34b549be03dc09eb8c1d341b50673ae4da8c53fc4540c359086f6a7450d44 SHA512 50b3278bcb738b0a64ed6111299c184e9145f58dd7adccf42ce5b30cf1e1163e1e78d61dce36e6e49859db06ecfb7cf417b62132c41e8b27b251cebe271570d6
+EBUILD genromfs-0.5.2.ebuild 537 BLAKE2B 5dd1d5bfa2871d1cd94d8820f03bba10d9ff5a0ea8f08f4840b673917220665ee7d1ac778665a9a6649b39a266a59029c3d53dd147910b0f1af707a721095a80 SHA512 8d2412a193c14183323979c3b633714314273d5aca09bf4a9f677697a548333c40d5b75a4b463738a7214dc53d9e0eea2d30acddae61e35af4d104e1b2632b03
MISC metadata.xml 349 BLAKE2B cab4bb0ef305ad6a0aa43ebfc701ec8b515f05cd3ff9bfe7ed518b4b8e5fcb239a6ac4b7ef719f3c394412ffb8eed203b7d66cbf89f5af7535fade7222dca7b1 SHA512 b86036d8e4288d5ae248bab2335ae74715950c2a6baf385c23b711a4700232961e504dcded46f39b57a520589e83c79c48111fa8c9635a63298acdcf21381912
diff --git a/app-admin/genromfs/files/genromfs-0.5.2-build.patch b/app-admin/genromfs/files/genromfs-0.5.2-build.patch
index 1fbc29fb7d5c..667448e1a20a 100644
--- a/app-admin/genromfs/files/genromfs-0.5.2-build.patch
+++ b/app-admin/genromfs/files/genromfs-0.5.2-build.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
@@ -5,9 +5,10 @@
PACKAGE = genromfs
diff --git a/app-admin/genromfs/genromfs-0.5.2.ebuild b/app-admin/genromfs/genromfs-0.5.2.ebuild
index 3b3fd2b0b57b..8bdcc8946afe 100644
--- a/app-admin/genromfs/genromfs-0.5.2.ebuild
+++ b/app-admin/genromfs/genromfs-0.5.2.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Create space-efficient, small, read-only romfs filesystems"
HOMEPAGE="http://romfs.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 arm64 ppc ~ppc64 s390 x86"
-IUSE=""
-DOCS=( ChangeLog NEWS genromfs.lsm genrommkdev readme-kernel-patch romfs.txt )
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
-}
+DOCS=( ChangeLog NEWS genromfs.lsm genrommkdev readme-kernel-patch romfs.txt )
src_compile() {
tc-export CC
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index edf24e49137b..3a7db05b008b 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -42,4 +42,4 @@ EBUILD github-backup-utils-2.7.1.ebuild 893 BLAKE2B 7765fe74f2a68cec46e692b45863
EBUILD github-backup-utils-2.8.2.ebuild 893 BLAKE2B 7765fe74f2a68cec46e692b458639e3af4736844dc69e5023ee137ff0e3fec18211948edc96126cfcbf56a7fc8df25ee538b8ba62f0aeb4786c35125a8d7b54e SHA512 7ddc82153106396b2b450d062c735257aa961b4329f5d5337db5391d5ebc57835e56755d600ec9923a4ca66569a3c590e05a8571a9484e2b67692a5769da3cfb
EBUILD github-backup-utils-2.9.0-r1.ebuild 1145 BLAKE2B 0b23e1a2d1505180be708b88f38b97a0c685490427555d68da01c786e44e5eb0772c69279906e4ff6111a68ac25af199f584b5809d62722f5fc7d95b657f7b03 SHA512 8b82f71361d6ad56ed36e733ad563ecbc736021de5cedeff77e5f9c574f3fa7ce2f99a81770372c55378dcf54bd1a542905ea1eee1dce6fc86ed064e262c6d94
EBUILD github-backup-utils-2.9.0.ebuild 893 BLAKE2B 70055ac1dc8372d877d4f0e4361b94d3ba60334b0bea5ce284a537f137641e09a6d14fbce96a62dd9a109d48b3b76b49810cb8a8554b9882d5915b8f159c1a26 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1
-MISC metadata.xml 566 BLAKE2B e34ff45fefc466f7fc17c64ef41d72aa5560df6ce4f2a6b758129c3d2d5ffbe4323e4d64a6d01069195a2236f5288823214f4c8310e252c4699de7e5f0282990 SHA512 35a0eb37cedfcd41573c13655d87be23b68af3d3636fe06397565c06a2b78c767f41702ff1487134a3f52169492a1345be2d42a79520a16046a84428e4bf0677
+MISC metadata.xml 448 BLAKE2B 8f3322a1e551345100a70421c1fcd9d56b8750e425ab6e579ceab918858df09c6aec520898d1897066596df231f983b3384441e7edc9e8350ac19ebd3d69462c SHA512 ae28e31312c3dba5d71fd4bd6c7ed6adc171a250473d09a6646d13de2cdc0d78ff4b1ca389c04717b789d500e7c269d49aef32a785ab4bdbc073c30bffa5eba7
diff --git a/app-admin/github-backup-utils/metadata.xml b/app-admin/github-backup-utils/metadata.xml
index 3bac2658b1ef..3ff8f644e3fb 100644
--- a/app-admin/github-backup-utils/metadata.xml
+++ b/app-admin/github-backup-utils/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>wizardedit@gentoo.org</email>
- <name>Austin English</name>
- </maintainer>
- <maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 6f1b73327c18..40d96f6ae004 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,5 +1,8 @@
AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
DIST glance-17.0.0.tar.gz 1961137 BLAKE2B ff649ce366739320bcc5073cb60cc24ab09e098bd6808374007f89808d6caf020a77f711a714b34f8a1ef5b0754220aab7c35c02fbdc0d3d0f44e24185a8cdc4 SHA512 cd10bd2d3e98ab1a80ec4f09b5954dbc334079a36d3dfc0d27c5a4f40e5920e0a6fb91c0fc5430c9e625a375e44a8d886568f2a712190dc0f80df10b4998e9af
-EBUILD glance-17.0.0.ebuild 4935 BLAKE2B 06082f3229cf0c8f1af11de8481734748fc783130567e14a19f6bce50b5aceeef6baffe378251ba0591cabfb701906de6ebff5524deb67c6767f3849ab28e829 SHA512 75bad0550a099f7b404dc364c5b01c7190d9c64392414b42f7a50de475959c99f9557aec951c435f59870aae1621c5d6b4f529042b18aa3a2ef7936e47454d0e
-EBUILD glance-2018.2.9999.ebuild 4940 BLAKE2B 5fc2e5aee453fb29c78f196870208abbde718bbe2a7e33a513aacc121317430b82370a683d5bcad57b2400aff6cf9e973d4f6a956df67f33784035ff78897e07 SHA512 81178ab2a70ce97fba1e3baa4c63f09f0d5898a4057ad428c536b4b8c20daee16eb4698a44276bc23b71a5d20604415435cacb5e0558a53add156b29894be711
+DIST glance-18.0.0.tar.gz 1987182 BLAKE2B 1e30d1897b360a8691e79e5e4eda290148146dd55103ea44c5f2cc96990dde0d2cf6bdf785913b5712dc0dda4a79ff0a2cf9bac1a58f5195fe5f5cc22116cae6 SHA512 79129c6ee1cce0fec0c5e656a97278ae275aa8ba33690ac62959f317c4e6b2f548ab0c97f0905dcda2500594acb3f5c05644064bdd3cccb443c593513522d274
+EBUILD glance-17.0.0.ebuild 4933 BLAKE2B c13548031d58d2009e6cd38721ce97c966ac4e26ebba60bee1047115de63978d51ffa154d1b7ca6f929b95c0faf988f10387c025bb3e200b7f356407933d1f5f SHA512 e279c6c8a4c225c3c82c6d4d0e42c445016d18ac30ed7b36402462c6b2d7028eedbd117574191ff383a532dcf9db34a261c9e3df9c3f8a590073df4bdecf4c1a
+EBUILD glance-18.0.0.ebuild 5066 BLAKE2B a7cccf57a70e0ab42f4bca3b1a8d9591ecaba618d45be091383c91ad9df36786a0861d83960ee2160894afac3af891c8e74a37ed26e09567696eecd75330f556 SHA512 89da6fc1135e953c9264679b9a1230bae0d7686e1da12d468527a60fe35467f49fc15fd2924898ed015c1ba68bfc1d03eb9792402534a89b6ca792ce482938fb
+EBUILD glance-2018.2.9999.ebuild 4935 BLAKE2B ee851e3b85ac17acfd1c4bd17872ad5d4fc244b5bd674a679893e2d1cff0c6037e1f8503cb8cbdc24c577ca5f31ebac6164908433c4973f755bd8525672432ea SHA512 12ead5e77d22134e34e3b25408e7ddb2914e5cd027b4ede10a25cf5e258e16bee75ce897ce0abf0f4218525b00b8281e8b60e18926dfcd416186f445bf6ba7b5
+EBUILD glance-2019.1.9999.ebuild 5066 BLAKE2B a7cccf57a70e0ab42f4bca3b1a8d9591ecaba618d45be091383c91ad9df36786a0861d83960ee2160894afac3af891c8e74a37ed26e09567696eecd75330f556 SHA512 89da6fc1135e953c9264679b9a1230bae0d7686e1da12d468527a60fe35467f49fc15fd2924898ed015c1ba68bfc1d03eb9792402534a89b6ca792ce482938fb
MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-17.0.0.ebuild b/app-admin/glance/glance-17.0.0.ebuild
index e3f1569b651a..b215502cb4c6 100644
--- a/app-admin/glance/glance-17.0.0.ebuild
+++ b/app-admin/glance/glance-17.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit distutils-r1 user
diff --git a/app-admin/glance/glance-18.0.0.ebuild b/app-admin/glance/glance-18.0.0.ebuild
new file mode 100644
index 000000000000..2647706b8889
--- /dev/null
+++ b/app-admin/glance/glance-18.0.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/openstack/glance.git"
+ EGIT_BRANCH="stable/stein"
+else
+ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+ >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+ >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+ >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/glance_store-0.26.1[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+ >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+ enewgroup glance
+ enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+ sed -i '/xattr/d' test-requirements.txt || die
+ sed -i '/pysendfile/d' test-requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newinitd "${FILESDIR}/glance.initd" glance-api
+
+ diropts -m 0750 -o glance -g glance
+ dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+ keepdir /etc/glance
+ keepdir /var/log/glance
+ keepdir /var/lib/glance/images
+ keepdir /var/lib/glance/scrubber
+
+ insinto /etc/glance
+ insopts -m 0640 -o glance -g glance
+ doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+ rm -r ${ED}/usr/etc
+}
diff --git a/app-admin/glance/glance-2018.2.9999.ebuild b/app-admin/glance/glance-2018.2.9999.ebuild
index 4a3501f76ee6..1f4e7cbf4001 100644
--- a/app-admin/glance/glance-2018.2.9999.ebuild
+++ b/app-admin/glance/glance-2018.2.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit distutils-r1 user
diff --git a/app-admin/glance/glance-2019.1.9999.ebuild b/app-admin/glance/glance-2019.1.9999.ebuild
new file mode 100644
index 000000000000..2647706b8889
--- /dev/null
+++ b/app-admin/glance/glance-2019.1.9999.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/openstack/glance.git"
+ EGIT_BRANCH="stable/stein"
+else
+ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+ >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+ >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+ >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/glance_store-0.26.1[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+ >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+ enewgroup glance
+ enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+ sed -i '/xattr/d' test-requirements.txt || die
+ sed -i '/pysendfile/d' test-requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newinitd "${FILESDIR}/glance.initd" glance-api
+
+ diropts -m 0750 -o glance -g glance
+ dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+ keepdir /etc/glance
+ keepdir /var/log/glance
+ keepdir /var/lib/glance/images
+ keepdir /var/lib/glance/scrubber
+
+ insinto /etc/glance
+ insopts -m 0640 -o glance -g glance
+ doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+ rm -r ${ED}/usr/etc
+}
diff --git a/app-admin/gnome-abrt/Manifest b/app-admin/gnome-abrt/Manifest
index fcc889dfd5ab..e2c34509c130 100644
--- a/app-admin/gnome-abrt/Manifest
+++ b/app-admin/gnome-abrt/Manifest
@@ -1,6 +1,6 @@
AUX 0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch 4329 BLAKE2B 408bd52cd8a7ae8ae60a938da810a2af35556111791f330887d7c6f9af1f27eb50a4efa4f646144fb3e2483398f7e4af21afb4b587f6068a5764004d0efdfca4 SHA512 e7c505da3355a721c38d043fd0dc7397f664d90f1c243203a5055dfeefde7b8aafe02a8bd3acb22ba32941740e4aab38873fa75178ee1d4776a2da182e6b2033
DIST gnome-abrt-1.2.6.tar.gz 340308 BLAKE2B 5221fe43fd72fe8798f2c11275863e6936e616632641448c53dd24118d3b6b808fc373fe98b8775f1f1c58820c06195a665f6d417c95eaa7cc333cd7660b2d0b SHA512 12bcdeefa481b7caa04da046ee11d6adc9fd582b32f709d79a2d94cf61ca02643edd418cd9257c0f732a30aa5714fe83a282a4c794ff4260ddad038f7721ff2c
DIST gnome-abrt-1.2.7.tar.gz 339961 BLAKE2B cdacc079c4661c364f13af3102e2231adbeaf4226ba937436f5ce3ae109f28b87c9424c6dfbc016b912599205386f92c32b036ca31adbea79b9a54d7f3a27c4a SHA512 57446b1c1c312f3a47ea3dd2a40ac1d4ec5392df3181eac73086675b65d45cad9a01fba5252d073970878ef97d7d272508bc5b86a56779543ffdc8d083fb5413
-EBUILD gnome-abrt-1.2.6.ebuild 1306 BLAKE2B 27f2fafdb5fea0dbda5679ec9dcc75826e7a7a54af261f66c66466b85ec3a6bf271f3d16b2e745cf4d2e2b87215bfbb1d11aec7b095cad69d2072e67faca41c4 SHA512 b8efc525446bd3148f7a7059388e6c2ef90005e0b79a5fe282b46b635824f71bcb9e26347a61b366ea594e1ab559cbdd6b003c572b4f93ae474372a87ebfe026
-EBUILD gnome-abrt-1.2.7.ebuild 1305 BLAKE2B 42e9162c76603f51bd26418689ce89560dbe756a0afa86d840d7aaf864141b3470a601726d85c35a8343e4a15504d91f41389256ff3ed002f3d217e6bb143e05 SHA512 c48eedd9c4148232f510d813acbe51679ddb1d637dba3937ed6bacf734ba34a95bb456f7152dedea3e93e63be0f5baa20dfff166db5c079a3d38b0155bf4164d
+EBUILD gnome-abrt-1.2.6.ebuild 1301 BLAKE2B 3ed2d02057e0e800e8e38c87d23b801ee1410b99bd8dc97e909d3ce9f4daac61c31902cd0fd83fded91efbc2e95ff3560027809245f6f1857cd43892a8bf6c82 SHA512 ff1ddaf79e2e0d6b661b7b6f26b53cdf3c15d73a5f316df10f871dafd0970dc834f475208c80a01aa9f90a8c5a23f612924339ca734108bee710a4d09c0602cb
+EBUILD gnome-abrt-1.2.7.ebuild 1303 BLAKE2B e226eee87127aecca4842107ae258eeb7801b8b4dcd42cbb74b6727c8f645227a4c8adf7813f74bea39d7492cd67ea34df8ed549dc138b557742907555af1151 SHA512 026346f0da5a9583216ca3e36ae5f97c72af16ddbded8de57b1fbbb7c65cffa11cf8379a9167dc69522711ae488a09491d9aba52f8b783c1a36454069ecfc532
MISC metadata.xml 333 BLAKE2B 7dfc442159eac1c4501c5bfaeec34615e2e8dd63b982759f30a0835143a1d5b661cce8e85868be70115c93c26f7ed70389b9f7ad6ae88f93b081f126c42beef3 SHA512 8c2e01101d19e3cd8ade5da1921864d2103eaa2f140c0eccb398e2567254d839311ba1384e25e0bea316345943c0649aee92aabb3ec2092d1a9e0728436fadc4
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild
index 5121f602279e..59a8a9135f26 100644
--- a/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild
+++ b/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
inherit autotools gnome2-utils python-single-r1
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild
index a0fb1a7815e3..053502994521 100644
--- a/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild
+++ b/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
inherit autotools python-r1
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
new file mode 100644
index 000000000000..7f380a64c64f
--- /dev/null
+++ b/app-admin/hcloud/Manifest
@@ -0,0 +1,3 @@
+DIST hcloud-1.12.0.tar.xz 436432 BLAKE2B b1263bfa89cb52d197d51c181b1166db84ae10613e448aea16b7b8a5399214a82025f3282d39ac359712b3ddac2decaeda148d9b392fdcb1f5d4d7dc6aa6a598 SHA512 f557ba4515ed158e9c153db4c6de97fba17123c7128b6fcc2bb58472a54f32e342df44f634c42af06a3160b45af4f1f9c28df001a0922bfdca10ade3b1640368
+EBUILD hcloud-1.12.0.ebuild 554 BLAKE2B d6f92f687c94a7785a57e5ed3e882444e291a24fe70bf984981060be3bafa92c0a843787125daba62d5a619ab00569262c2e5ee2a01905f4e0fc8bd3ab08550f SHA512 7fbab9e1651f78fdcffb4524ced748a3ead31af2dad6b28d4f7459d0efb9405070137d0fb22dd3bdd0ac1655f254cbf5eda301b9f06542bad8d83914e4173913
+MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/hcloud/hcloud-1.12.0.ebuild b/app-admin/hcloud/hcloud-1.12.0.ebuild
new file mode 100644
index 000000000000..4367320daaac
--- /dev/null
+++ b/app-admin/hcloud/hcloud-1.12.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A command-line interface for Hetzner Cloud"
+HOMEPAGE="https://github.com/hetznercloud/cli"
+SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+
+src_compile() {
+ go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
+}
+
+src_install() {
+ dobin ${PN}
+}
diff --git a/app-admin/fleet/metadata.xml b/app-admin/hcloud/metadata.xml
index f9232c26e479..4eceb317f22e 100644
--- a/app-admin/fleet/metadata.xml
+++ b/app-admin/hcloud/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">coreos/fleet</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>ago@gentoo.org</email>
+ <name>Agostino Sarubbo</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/installer/Manifest b/app-admin/installer/Manifest
index 706920095904..b80975dad236 100644
--- a/app-admin/installer/Manifest
+++ b/app-admin/installer/Manifest
@@ -1,3 +1,3 @@
DIST installer-0.1.1_beta.tar.gz 49946 BLAKE2B 845df010036446e65479affc3d901fe114248130627ce76583c42adc9ecf9c0e2585600106c1559c8d3dac8c086553fed1d48d00002ede9e9be509fc98632662 SHA512 940272cefed17bd6c370fe26b2941da611cbd0aa8fb1c7f51bfaef483c7f9189f10754fb7e3d84dc099ac687f4644e24ae22e7ec09c41f39efba30d5743c9163
-EBUILD installer-0.1.1_beta.ebuild 512 BLAKE2B b93b2f2fcd04f5a1780586bd031dafa942093605a531020e29531c81541589ce4f584bdd2ad738e78fd09bc356de295cb3b2fded1b4ade719a430b0e4928d02e SHA512 19698b48f8d34be506c2386473f3b552498ebf8283c6e4b09297612aa952c5c758ac0a4524262bde471ed703a2199be1a1b153e97dce1823a443749df596eb7d
+EBUILD installer-0.1.1_beta.ebuild 505 BLAKE2B d11943b1fc6a5f56d58a34e218a95b969984035c47e30a0c0a9c5d690e2ca22c54cae88c112b2d6f3dbadd41d320c70e0d318dd3a39822b2dd38b40b013cd521 SHA512 89df436c45e13240224c149456e58d1aab14cc34e1be850e6c21059b3f4d5481c835171f1a04792f0cd956ad771f87962b67c34f58775cde8a2753d3276a1f3d
MISC metadata.xml 650 BLAKE2B 85405d55a8203f929a0a11864b7df6ddb9763160da824a1a1f037c1ea3e52f3a1fd1540316142f47af0ed575f90deab90fc71a90085ac1ba3f571954d079f541 SHA512 d1c0b0a1fe0b4aa0fb00595d7c46c73254ee22bd801b81a9895e176a0577ae64174dd587bacd3ac5ca17fe6c56f771274d508f9249a990608e6b515bc8aabef2
diff --git a/app-admin/installer/installer-0.1.1_beta.ebuild b/app-admin/installer/installer-0.1.1_beta.ebuild
index 17bc218aa0e4..ba75fd88016a 100644
--- a/app-admin/installer/installer-0.1.1_beta.ebuild
+++ b/app-admin/installer/installer-0.1.1_beta.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
PYTHON_REQ_USE="ncurses(+)"
inherit distutils-r1
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 03bf85d0bf9c..bd335664dcd7 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,9 +1,12 @@
AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9
AUX keepassxc-2.4.0-build_fix.patch 1419 BLAKE2B b5661c75008c9031598ee704b21e0581a6e3859addb9b4e642cca415b06f26cb7e6a984fb942f648f7d4082c17e198644230ddf711696971df6754cf4c6eb119 SHA512 3e659b5048089528c2055f9481119e66f655b2531a4347d4ca6e439bcc82566f2e658bdf4442e6c678d19811ca494533e7ce08e14dab3148c841084f2f5ab898
+AUX keepassxc-2.4.0-update_checker_toggle.patch 18616 BLAKE2B 5b13c5ab493b955dc31e7f928c471ec11095f26a2d2f76a5145318e0e35dc751187eae11f9467a78c0455ae8ab0a6a0045c6b4670a701f13e56910ac1b484808 SHA512 138f0de9bd862423a4764fcc61c133ef98d800ce6ab3cde0fe304352866266bbd8d8acd8dabd131e8189e8cbc551f92464f03c199f9f02861534c17b30a94ea2
AUX keepassxc-dont_call_mandb.patch 792 BLAKE2B 3154b6624a2e5923a3b3ad9edfbaedd5c0bba77f47108913d8eece63cbc4df571f516a41d72db0287a7a4d8741ab309cc7e09c8fcddaec0bf39ed09479607329 SHA512 21bd27e713357f5aa522a2263a1d03b8a595fb0d51ea10c034358169cb2f72c70585b04dde8f0d8e9af30c9ecf055b528b975a9701372d4f726a8f50b347d8f4
DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8
DIST keepassxc-2.4.0-src.tar.xz 3252104 BLAKE2B 7c82822f6fb0eaf6b5d086aebdf4927af215339f92e7f52104e05d5ff301461a1ad816d8a39b377c717e975001c9295ec6d8b2f2003a2215c05931eb9acb5c73 SHA512 b7295f5983237606efd236955dc73d477992d944e547eeb2c3a267d846e70ce6f83e489f58e3bd9b5bb21decabd9052a4ea7b98bd98e8283abbb678ae19e5559
+DIST keepassxc-2.4.1-src.tar.xz 3277856 BLAKE2B 64ed15987f26fd884db8fec9dc8e5d9ecd1ab9c298c2c35ee41f5aacd51bf3cd512c8ca0370ccc294d4f1ac6214678d2a3a4d8c47441c01ae8e858252018ec97 SHA512 4369043700d3de4fece0a1dd0f8aab3f621df379bc9d0214b4c70ab72d081f978104aa09fd39c4b4bf8b8df8f78266835dc206c31e7174bdf872a977c0d79502
EBUILD keepassxc-2.3.4-r1.ebuild 1847 BLAKE2B 4de124b498c9d101b56a9c966170d6bfef024ac8853b166c82e42244a209956f062ebe3f1cfa99d6b62fc2ce3569b884ede3cda338bfd6d92ca5575f18a30f33 SHA512 bbcaea1ebd466a585375cb29688761202bdff37fa4ec18f40134e933d8fa7036d8be422b822b3dbc307ca16fbc8a509f04d6f29c2e7b442143fcedd7b662eb6f
-EBUILD keepassxc-2.4.0.ebuild 2087 BLAKE2B 95aa54e8b74d315affb3300c0384faeea4861b79fdf52037c15b1c2beb3da15a9de9bd58f70debdd21f3bd5417ccadb5b8d001787a253f482c6e0edae58afd68 SHA512 9e97dbc7d7182a3d1ad53de47403baf7b0026271241e936d60039238869faf0b6b48fe1d463f2effb45498d822067352e2bc238efaad4260e1996ec9ac9750fd
-EBUILD keepassxc-9999.ebuild 1995 BLAKE2B 6b883c1cc942e330d437707367e9e6e416432ac5c932360fb561eac3ff4af72e70b50ea58084aad0082255d0f1528168e96ac8e9faff96fcea8814760f4893c8 SHA512 75d6f738836de30ace55d71c8d69b0bb4837542be721fb4663bfaef595f1b0d7c8d15bf1211549c2219f98ec45c49e2ddec772956d0347a470dd3ef55b8b5bd1
-MISC metadata.xml 891 BLAKE2B 0c279d26b8f00d816d92a8fdd428629cf92a0ee7c0789ac60c9b5ea9b491dbd495a09815785fa99427ae8f5701dff0da8a06065059b1a6f05f1cdadbdde88192 SHA512 ec6fe12b1b508784947b55bb562a9e99632481ce06289b4dd7325f0834789fa4df99a15792ab7e91bab169c89a0a5a4c99ccd3372f1a2ff84cece49c4acd1779
+EBUILD keepassxc-2.4.0-r1.ebuild 2163 BLAKE2B 5dd1a135a8c3eb1dbebbf9424f85955449196bd86bfbf9c6fe00a07fc5d166158d9c75c1dab87c611fe4f3420133976d5e5f25517677f74148ac09571906d9c5 SHA512 e77ea5b046d744c59d3d1cb6fa9328697eae8c9a6a0a0acdc13990f6871b74484fe9f69c9b3a62b575d170b0df756c7db631c4804228e29d9445308291817129
+EBUILD keepassxc-2.4.1.ebuild 2024 BLAKE2B f7289b70d43a0ad73f7b63ceed0a9d8317f377ec5a66122150ca8b63dec566d2763454673ed7b76621f18d160096724658b5da55c3296397d51a78cb55d96e97 SHA512 9893aad20535bfd881d0e0fad6b8898edd7f64e0e74ae14388c272a72e27bcfc70c539e4bf0c3938e659c81840e082a3f8dd55efff18a564564e1366af0b5433
+EBUILD keepassxc-9999.ebuild 2113 BLAKE2B 1fab5247efdda6aae6d6e77c27eef8b6ef665c756b57cab71a7ce7d84c0d1cb7df0aa5b68543962b6d3ac965c03724a4be1948702cca255b2718f24c7ebb59ec SHA512 af6da2389520f883fea99ecafa37920371cd461b15e2162c5869d4f726a13713ccebec926faeecae3a0e7d036f1f7b2e3e32559349983935db0cbaee3d2b771e
+MISC metadata.xml 960 BLAKE2B 63a61f81e372efa1d1a4118f8353818eb28f4d9b0e7c87c5cb6e7a4ee8c9856ae3c7ee981e2777d3263725338581834f294022d052397dffbe98db2b5ba36895 SHA512 85ad2302913936ce51a455ae15e2d9ca7a68d26fc16819f46ab494b6aaafecdf32f74596b47c1b5a3cea56bfc49bf7021dbb4b770efb8f362386a67c88ea2404
diff --git a/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch b/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch
new file mode 100644
index 000000000000..64e02066916b
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.4.0-update_checker_toggle.patch
@@ -0,0 +1,445 @@
+From 28994fef0d2c04690490f34b5da87c42e60a6b5e Mon Sep 17 00:00:00 2001
+From: Jonathan White <support@dmapps.us>
+Date: Tue, 9 Apr 2019 21:06:13 -0400
+Subject: [PATCH] Enhance update checker
+
+* Reduce initial update check notification to 500 ms to prevent inappropriately stealing focus from user
+* Add build flag WITH_XC_UPDATECHECK which defaults to ON
+* Update checks are resolved every 7 days instead of every time the application is started
+* Better checks for beta builds; ignore snapshots
+* Increase test cases
+---
+ CMakeLists.txt | 5 ++
+ src/CMakeLists.txt | 1 +
+ src/config-keepassx.h.cmake | 1 +
+ src/core/Clock.cpp | 1 +
+ src/gui/ApplicationSettingsWidget.cpp | 25 ++++++-
+ src/gui/ApplicationSettingsWidget.h | 2 +
+ src/gui/ApplicationSettingsWidgetGeneral.ui | 39 +++++++---
+ src/gui/MainWindow.cpp | 12 ++--
+ src/updatecheck/UpdateChecker.cpp | 79 +++++++++++++--------
+ src/updatecheck/UpdateChecker.h | 2 +-
+ tests/TestUpdateCheck.cpp | 35 ++++++---
+ 11 files changed, 147 insertions(+), 55 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 658548f7..4f8a419c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,6 +49,7 @@ option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
+ option(WITH_XC_SSHAGENT "Include SSH agent support." OFF)
+ option(WITH_XC_KEESHARE "Sharing integration with KeeShare" OFF)
+ option(WITH_XC_KEESHARE_SECURE "Sharing integration with secured KeeShare containers" OFF)
++option(WITH_XC_UPDATECHECK "Include automatic update checks; disable for controlled distributions" ON)
+ if(APPLE)
+ option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
+ endif()
+@@ -76,6 +77,10 @@ else()
+ set(WITH_XC_CRYPTO_SSH OFF)
+ endif()
+
++if(WITH_XC_UPDATECHECK)
++ set(WITH_XC_NETWORKING ON)
++endif()
++
+ set(KEEPASSXC_VERSION_MAJOR "2")
+ set(KEEPASSXC_VERSION_MINOR "4")
+ set(KEEPASSXC_VERSION_PATCH "0")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 110dc606..31f29033 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -195,6 +195,7 @@ add_feature_info(SSHAgent WITH_XC_SSHAGENT "SSH agent integration compatible wit
+ add_feature_info(KeeShare WITH_XC_KEESHARE "Sharing integration with KeeShare")
+ add_feature_info(KeeShare-Secure WITH_XC_KEESHARE_SECURE "Sharing integration with KeeShare with secure sources")
+ add_feature_info(YubiKey WITH_XC_YUBIKEY "YubiKey HMAC-SHA1 challenge-response")
++add_feature_info(UpdateCheck WITH_XC_UPDATECHECK "Automatic update checking")
+ if(APPLE)
+ add_feature_info(TouchID WITH_XC_TOUCHID "TouchID integration")
+ endif()
+diff --git a/src/config-keepassx.h.cmake b/src/config-keepassx.h.cmake
+index 7d701886..2acff446 100644
+--- a/src/config-keepassx.h.cmake
++++ b/src/config-keepassx.h.cmake
+@@ -20,6 +20,7 @@
+ #cmakedefine WITH_XC_KEESHARE
+ #cmakedefine WITH_XC_KEESHARE_INSECURE
+ #cmakedefine WITH_XC_KEESHARE_SECURE
++#cmakedefine WITH_XC_UPDATECHECK
+ #cmakedefine WITH_XC_TOUCHID
+
+ #cmakedefine KEEPASSXC_BUILD_TYPE "@KEEPASSXC_BUILD_TYPE@"
+diff --git a/src/core/Clock.cpp b/src/core/Clock.cpp
+index 88ac4fb7..be9e91dc 100644
+--- a/src/core/Clock.cpp
++++ b/src/core/Clock.cpp
+@@ -30,6 +30,7 @@ QDateTime Clock::currentDateTime()
+
+ uint Clock::currentSecondsSinceEpoch()
+ {
++ // TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
+ return instance().currentDateTimeImpl().toTime_t();
+ }
+
+diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp
+index 90b851bd..e6a7068d 100644
+--- a/src/gui/ApplicationSettingsWidget.cpp
++++ b/src/gui/ApplicationSettingsWidget.cpp
+@@ -91,8 +91,15 @@ ApplicationSettingsWidget::ApplicationSettingsWidget(QWidget* parent)
+ m_secUi->touchIDResetSpinBox, SLOT(setEnabled(bool)));
+ // clang-format on
+
+-#ifndef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
++ connect(m_generalUi->checkForUpdatesOnStartupCheckBox, SIGNAL(toggled(bool)), SLOT(checkUpdatesToggled(bool)));
++#else
+ m_generalUi->checkForUpdatesOnStartupCheckBox->setVisible(false);
++ m_generalUi->checkForUpdatesIncludeBetasCheckBox->setVisible(false);
++ m_generalUi->checkUpdatesSpacer->changeSize(0,0, QSizePolicy::Fixed, QSizePolicy::Fixed);
++#endif
++
++#ifndef WITH_XC_NETWORKING
+ m_secUi->privacy->setVisible(false);
+ #endif
+
+@@ -336,3 +343,19 @@ void ApplicationSettingsWidget::enableToolbarSettings(bool checked)
+ m_generalUi->toolButtonStyleComboBox->setEnabled(!checked);
+ m_generalUi->toolButtonStyleLabel->setEnabled(!checked);
+ }
++
++void ApplicationSettingsWidget::rememberDatabasesToggled(bool checked)
++{
++ if (!checked) {
++ m_generalUi->rememberLastKeyFilesCheckBox->setChecked(false);
++ m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked(false);
++ }
++
++ m_generalUi->rememberLastKeyFilesCheckBox->setEnabled(checked);
++ m_generalUi->openPreviousDatabasesOnStartupCheckBox->setEnabled(checked);
++}
++
++void ApplicationSettingsWidget::checkUpdatesToggled(bool checked)
++{
++ m_generalUi->checkForUpdatesIncludeBetasCheckBox->setEnabled(checked);
++}
+diff --git a/src/gui/ApplicationSettingsWidget.h b/src/gui/ApplicationSettingsWidget.h
+index ffcfea2b..86688b70 100644
+--- a/src/gui/ApplicationSettingsWidget.h
++++ b/src/gui/ApplicationSettingsWidget.h
+@@ -56,6 +56,8 @@ private slots:
+ void autoSaveToggled(bool checked);
+ void systrayToggled(bool checked);
+ void enableToolbarSettings(bool checked);
++ void rememberDatabasesToggled(bool checked);
++ void checkUpdatesToggled(bool checked);
+
+ private:
+ QWidget* const m_secWidget;
+diff --git a/src/gui/ApplicationSettingsWidgetGeneral.ui b/src/gui/ApplicationSettingsWidgetGeneral.ui
+index 798971bf..678b55fa 100644
+--- a/src/gui/ApplicationSettingsWidgetGeneral.ui
++++ b/src/gui/ApplicationSettingsWidgetGeneral.ui
+@@ -86,10 +86,40 @@
+ <item>
+ <widget class="QCheckBox" name="checkForUpdatesOnStartupCheckBox">
+ <property name="text">
+- <string>Check for updates at application startup</string>
++ <string>Check for updates at application startup once per week</string>
+ </property>
+ </widget>
+ </item>
++ <item>
++ <layout class="QHBoxLayout" name="checkUpdatesSubLayout">
++ <property name="spacing">
++ <number>0</number>
++ </property>
++ <item>
++ <spacer name="checkUpdatesSpacer">
++ <property name="orientation">
++ <enum>Qt::Horizontal</enum>
++ </property>
++ <property name="sizeType">
++ <enum>QSizePolicy::Fixed</enum>
++ </property>
++ <property name="sizeHint" stdset="0">
++ <size>
++ <width>20</width>
++ <height>20</height>
++ </size>
++ </property>
++ </spacer>
++ </item>
++ <item>
++ <widget class="QCheckBox" name="checkForUpdatesIncludeBetasCheckBox">
++ <property name="text">
++ <string>Include beta releases when checking for updates</string>
++ </property>
++ </widget>
++ </item>
++ </layout>
++ </item>
+ </layout>
+ </widget>
+ </item>
+@@ -186,13 +216,6 @@
+ <string>General</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_7">
+- <item>
+- <widget class="QCheckBox" name="checkForUpdatesIncludeBetasCheckBox">
+- <property name="text">
+- <string>Include pre-releases when checking for updates</string>
+- </property>
+- </widget>
+- </item>
+ <item>
+ <widget class="QCheckBox" name="toolbarHideCheckBox">
+ <property name="text">
+diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
+index 6e3c96af..6776a59d 100644
+--- a/src/gui/MainWindow.cpp
++++ b/src/gui/MainWindow.cpp
+@@ -41,7 +41,7 @@
+ #include "keys/FileKey.h"
+ #include "keys/PasswordKey.h"
+
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+ #include "gui/MessageBox.h"
+ #include "gui/UpdateCheckDialog.h"
+ #include "updatecheck/UpdateChecker.h"
+@@ -372,12 +372,12 @@ MainWindow::MainWindow()
+ setUnifiedTitleAndToolBarOnMac(true);
+ #endif
+
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+ connect(m_ui->actionCheckForUpdates, SIGNAL(triggered()), SLOT(showUpdateCheckDialog()));
+ connect(UpdateChecker::instance(),
+ SIGNAL(updateCheckFinished(bool, QString, bool)),
+ SLOT(hasUpdateAvailable(bool, QString, bool)));
+- QTimer::singleShot(3000, this, SLOT(showUpdateCheckStartup()));
++ QTimer::singleShot(500, this, SLOT(showUpdateCheckStartup()));
+ #else
+ m_ui->actionCheckForUpdates->setVisible(false);
+ #endif
+@@ -687,7 +687,7 @@ void MainWindow::showAboutDialog()
+
+ void MainWindow::showUpdateCheckStartup()
+ {
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+ if (!config()->get("UpdateCheckMessageShown", false).toBool()) {
+ auto result =
+ MessageBox::question(this,
+@@ -710,7 +710,7 @@ void MainWindow::showUpdateCheckStartup()
+
+ void MainWindow::hasUpdateAvailable(bool hasUpdate, const QString& version, bool isManuallyRequested)
+ {
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+ if (hasUpdate && !isManuallyRequested) {
+ auto* updateCheckDialog = new UpdateCheckDialog(this);
+ updateCheckDialog->showUpdateCheckResponse(hasUpdate, version);
+@@ -725,7 +725,7 @@ void MainWindow::hasUpdateAvailable(bool hasUpdate, const QString& version, bool
+
+ void MainWindow::showUpdateCheckDialog()
+ {
+-#ifdef WITH_XC_NETWORKING
++#ifdef WITH_XC_UPDATECHECK
+ updateCheck()->checkForUpdates(true);
+ auto* updateCheckDialog = new UpdateCheckDialog(this);
+ updateCheckDialog->show();
+diff --git a/src/updatecheck/UpdateChecker.cpp b/src/updatecheck/UpdateChecker.cpp
+index 4272410b..14531290 100644
+--- a/src/updatecheck/UpdateChecker.cpp
++++ b/src/updatecheck/UpdateChecker.cpp
+@@ -17,6 +17,7 @@
+
+ #include "UpdateChecker.h"
+ #include "config-keepassx.h"
++#include "core/Clock.h"
+ #include "core/Config.h"
+ #include <QJsonObject>
+ #include <QNetworkAccessManager>
+@@ -38,24 +39,28 @@ UpdateChecker::~UpdateChecker()
+
+ void UpdateChecker::checkForUpdates(bool manuallyRequested)
+ {
++ auto nextCheck = config()->get("GUI/CheckForUpdatesNextCheck", 0).toULongLong();
+ m_isManuallyRequested = manuallyRequested;
+- m_bytesReceived.clear();
+
+- QString apiUrlStr = QString("https://api.github.com/repos/keepassxreboot/keepassxc/releases");
++ if (m_isManuallyRequested || Clock::currentSecondsSinceEpoch() >= nextCheck) {
++ m_bytesReceived.clear();
+
+- if (!config()->get("GUI/CheckForUpdatesIncludeBetas", false).toBool()) {
+- apiUrlStr += "/latest";
+- }
++ QString apiUrlStr = QString("https://api.github.com/repos/keepassxreboot/keepassxc/releases");
++
++ if (!config()->get("GUI/CheckForUpdatesIncludeBetas", false).toBool()) {
++ apiUrlStr += "/latest";
++ }
+
+- QUrl apiUrl = QUrl(apiUrlStr);
++ QUrl apiUrl = QUrl(apiUrlStr);
+
+- QNetworkRequest request(apiUrl);
+- request.setRawHeader("Accept", "application/json");
++ QNetworkRequest request(apiUrl);
++ request.setRawHeader("Accept", "application/json");
+
+- m_reply = m_netMgr->get(request);
++ m_reply = m_netMgr->get(request);
+
+- connect(m_reply, &QNetworkReply::finished, this, &UpdateChecker::fetchFinished);
+- connect(m_reply, &QIODevice::readyRead, this, &UpdateChecker::fetchReadyRead);
++ connect(m_reply, &QNetworkReply::finished, this, &UpdateChecker::fetchFinished);
++ connect(m_reply, &QIODevice::readyRead, this, &UpdateChecker::fetchReadyRead);
++ }
+ }
+
+ void UpdateChecker::fetchReadyRead()
+@@ -84,8 +89,12 @@ void UpdateChecker::fetchFinished()
+
+ if (!jsonObject.value("tag_name").isUndefined()) {
+ version = jsonObject.value("tag_name").toString();
+- hasNewVersion = compareVersions(version, QString(KEEPASSXC_VERSION));
++ hasNewVersion = compareVersions(QString(KEEPASSXC_VERSION), version);
+ }
++
++ // Check again in 7 days
++ // TODO: change to toSecsSinceEpoch() when min Qt >= 5.8
++ config()->set("GUI/CheckForUpdatesNextCheck", Clock::currentDateTime().addDays(7).toTime_t());
+ } else {
+ version = "error";
+ }
+@@ -93,38 +102,46 @@ void UpdateChecker::fetchFinished()
+ emit updateCheckFinished(hasNewVersion, version, m_isManuallyRequested);
+ }
+
+-bool UpdateChecker::compareVersions(const QString& remoteVersion, const QString& localVersion)
++bool UpdateChecker::compareVersions(const QString& localVersion, const QString& remoteVersion)
+ {
++ // Quick full-string equivalence check
+ if (localVersion == remoteVersion) {
+- return false; // Currently using updated version
++ return false;
+ }
+
+- QRegularExpression verRegex("^(\\d+(\\.\\d+){0,2})(-\\w+)?$", QRegularExpression::CaseInsensitiveOption);
++ QRegularExpression verRegex(R"(^((?:\d+\.){2}\d+)(?:-(\w+?)(\d+)?)?$)");
+
+- QRegularExpressionMatch lmatch = verRegex.match(localVersion);
+- QRegularExpressionMatch rmatch = verRegex.match(remoteVersion);
++ auto lmatch = verRegex.match(localVersion);
++ auto rmatch = verRegex.match(remoteVersion);
+
+- if (!lmatch.captured(1).isNull() && !rmatch.captured(1).isNull()) {
+- if (lmatch.captured(1) == rmatch.captured(1) && !lmatch.captured(3).isNull()) {
+- // Same version, but installed version has snapshot/beta suffix and should be updated to stable
+- return true;
+- }
++ auto lVersion = lmatch.captured(1).split(".");
++ auto lSuffix = lmatch.captured(2);
++ auto lBetaNum = lmatch.captured(3);
+
+- QStringList lparts = lmatch.captured(1).split(".");
+- QStringList rparts = rmatch.captured(1).split(".");
++ auto rVersion = rmatch.captured(1).split(".");
++ auto rSuffix = rmatch.captured(2);
++ auto rBetaNum = rmatch.captured(3);
+
+- if (lparts.length() < 3)
+- lparts << "0";
++ if (!lVersion.isEmpty() && !rVersion.isEmpty()) {
++ if (lSuffix.compare("snapshot", Qt::CaseInsensitive) == 0) {
++ // Snapshots are not checked for version updates
++ return false;
++ }
+
+- if (rparts.length() < 3)
+- rparts << "0";
++ // Check "-beta[X]" versions
++ if (lVersion == rVersion && !lSuffix.isEmpty()) {
++ // Check if stable version has been released or new beta is available
++ // otherwise the version numbers are equal
++ return rSuffix.isEmpty() || lBetaNum.toInt() < rBetaNum.toInt();
++ }
+
+ for (int i = 0; i < 3; i++) {
+- int l = lparts[i].toInt();
+- int r = rparts[i].toInt();
++ int l = lVersion[i].toInt();
++ int r = rVersion[i].toInt();
+
+- if (l == r)
++ if (l == r) {
+ continue;
++ }
+
+ if (l > r) {
+ return false; // Installed version is newer than release
+diff --git a/src/updatecheck/UpdateChecker.h b/src/updatecheck/UpdateChecker.h
+index ac6471d6..64430bda 100644
+--- a/src/updatecheck/UpdateChecker.h
++++ b/src/updatecheck/UpdateChecker.h
+@@ -31,7 +31,7 @@ public:
+ ~UpdateChecker() override;
+
+ void checkForUpdates(bool manuallyRequested);
+- static bool compareVersions(const QString& remoteVersion, const QString& localVersion);
++ static bool compareVersions(const QString& localVersion, const QString& remoteVersion);
+ static UpdateChecker* instance();
+
+ signals:
+diff --git a/tests/TestUpdateCheck.cpp b/tests/TestUpdateCheck.cpp
+index 8cba43b1..ff709cd5 100644
+--- a/tests/TestUpdateCheck.cpp
++++ b/tests/TestUpdateCheck.cpp
+@@ -29,13 +29,32 @@ void TestUpdateCheck::initTestCase()
+
+ void TestUpdateCheck::testCompareVersion()
+ {
+- // Remote Version , Installed Version
+- QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("2.3.4")), true);
+- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.4.0")), false);
++ // No upgrade
+ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0")), false);
+- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0-beta1")), true);
+- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta2"), QString("2.3.0-beta1")), true);
+- QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4"), QString("2.4.0-snapshot")), false);
+- QCOMPARE(UpdateChecker::compareVersions(QString("invalid"), QString("2.4.0")), false);
+- QCOMPARE(UpdateChecker::compareVersions(QString(""), QString("2.4.0")), false);
++
++ // First digit upgrade
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("3.0.0")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("3.0.0"), QString("2.4.0")), false);
++
++ // Second digit upgrade
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4"), QString("2.4.0")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("2.3.4")), false);
++
++ // Third digit upgrade
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.1")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.1"), QString("2.3.0")), false);
++
++ // Beta builds
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.0-beta1")), false);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0"), QString("2.3.1-beta1")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta"), QString("2.3.0-beta1")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0-beta")), false);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta1"), QString("2.3.0-beta2")), true);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.0-beta2"), QString("2.3.0-beta1")), false);
++
++ // Snapshot and invalid data
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.3.4-snapshot"), QString("2.4.0")), false);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("invalid")), false);
++ QCOMPARE(UpdateChecker::compareVersions(QString("2.4.0"), QString("")), false);
+ }
+--
+2.21.0
+
diff --git a/app-admin/keepassxc/keepassxc-2.4.0.ebuild b/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild
index fc5f6889a735..1b2e89238032 100644
--- a/app-admin/keepassxc/keepassxc-2.4.0.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.0-r1.ebuild
@@ -62,6 +62,7 @@ PDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-dont_call_mandb.patch"
"${FILESDIR}/${P}-build_fix.patch"
+ "${FILESDIR}/${P}-update_checker_toggle.patch"
)
src_prepare() {
@@ -79,6 +80,7 @@ src_configure() {
-DWITH_XC_BROWSER="$(usex browser)"
-DWITH_XC_NETWORKING="$(usex network)"
-DWITH_XC_SSHAGENT=ON
+ -DWITH_XC_UPDATECHECK=OFF
-DWITH_XC_YUBIKEY="$(usex yubikey)"
)
if [[ "${PV}" == *_beta* ]] ; then
diff --git a/app-admin/keepassxc/keepassxc-2.4.1.ebuild b/app-admin/keepassxc/keepassxc-2.4.1.ebuild
new file mode 100644
index 000000000000..5b33ef6ebd16
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.4.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+ if [[ "${PV}" == *_beta* ]] ; then
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${P/_/-}"
+ else
+ #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+ fi
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser debug +network test yubikey"
+
+RDEPEND="
+ app-crypt/argon2:=
+ dev-libs/libgcrypt:=
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ media-gfx/qrencode:=
+ sys-libs/zlib
+ autotype? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXtst
+ )
+ browser? ( >=dev-libs/libsodium-1.0.12 )
+ yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-qt/linguist-tools:5
+ dev-qt/qttest:5
+ dev-qt/qtconcurrent:5
+"
+
+# Not a runtime dependency but still needed (see bug #667092)
+PDEPEND="
+ x11-misc/xsel
+"
+
+src_prepare() {
+ use test || \
+ sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_GUI_TESTS=OFF
+ -DWITH_TESTS="$(usex test)"
+ -DWITH_XC_AUTOTYPE="$(usex autotype)"
+ -DWITH_XC_BROWSER="$(usex browser)"
+ -DWITH_XC_NETWORKING="$(usex network)"
+ -DWITH_XC_SSHAGENT=ON
+ -DWITH_XC_UPDATECHECK=OFF
+ -DWITH_XC_YUBIKEY="$(usex yubikey)"
+ )
+ if [[ "${PV}" == *_beta* ]] ; then
+ mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+ fi
+ cmake-utils_src_configure
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 4aa8f179e8b7..933ad9b9a58f 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -24,7 +24,7 @@ fi
LICENSE="LGPL-2.1 GPL-2 GPL-3"
SLOT="0"
-IUSE="autotype browser debug network test yubikey"
+IUSE="autotype browser debug keeshare +network test yubikey"
RDEPEND="
app-crypt/argon2:=
@@ -36,7 +36,7 @@ RDEPEND="
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
media-gfx/qrencode:=
- sys-libs/zlib
+ sys-libs/zlib:=
autotype? (
dev-qt/qtx11extras:5
x11-libs/libX11
@@ -44,6 +44,7 @@ RDEPEND="
x11-libs/libXtst
)
browser? ( >=dev-libs/libsodium-1.0.12 )
+ keeshare? ( dev-libs/quazip )
yubikey? ( sys-auth/ykpers )
"
@@ -72,8 +73,10 @@ src_configure() {
-DWITH_TESTS="$(usex test)"
-DWITH_XC_AUTOTYPE="$(usex autotype)"
-DWITH_XC_BROWSER="$(usex browser)"
+ -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)"
-DWITH_XC_NETWORKING="$(usex network)"
-DWITH_XC_SSHAGENT=ON
+ -DWITH_XC_UPDATECHECK=OFF
-DWITH_XC_YUBIKEY="$(usex yubikey)"
)
if [[ "${PV}" == *_beta* ]] ; then
diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
index 56243a3c8c07..d9b95402e41b 100644
--- a/app-admin/keepassxc/metadata.xml
+++ b/app-admin/keepassxc/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="autotype">Add support to autotype the passwords into other applications</flag>
<flag name="browser">Enables browser plugin support</flag>
+ <flag name="keeshare">Enable KeeShare sharing integration</flag>
<flag name="network">Enable network support</flag>
<flag name="yubikey">Enable database unlocking via YubiKey.</flag>
</use>
diff --git a/app-admin/ksonnet/Manifest b/app-admin/ksonnet/Manifest
index 7f9cbf346b42..93fb3a1c35be 100644
--- a/app-admin/ksonnet/Manifest
+++ b/app-admin/ksonnet/Manifest
@@ -8,4 +8,4 @@ EBUILD ksonnet-0.11.0.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e3
EBUILD ksonnet-0.13.1.ebuild 871 BLAKE2B de4a469dac9e43e91ce6eb9fafa38cac4ba7cb30a7aacedfa8ba57df4ef5aa09686a2677e98c5f03195fbe3ec1c8dc4a32abd087036158db1829408c0e2adee2 SHA512 793660b3a34fd44acdd1c11075bfad84f78f7b016c5280248d6706f5a586fb529bc7503003ad73db1fbe3375dd88b23f293633c8e0e7fe385e574b2a25f5231d
EBUILD ksonnet-0.8.0.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
EBUILD ksonnet-0.9.2.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
-MISC metadata.xml 324 BLAKE2B 89e56104008d1d0adfc928707dc011c96d3169f299d4b8b7dde1bf4fad5221728ed3d2b5a4cda9aed69f3ff16ba202c3bf445946ccaa169ebedb22e001251602 SHA512 9f554c4509d955b3d88f15dab2f0bfbf9862b52bea5aab36fea37c4b863080a5378a76087baa2f3be7e8ade5a7fd519d80deecb394d3ead642d1c943faba8809
+MISC metadata.xml 246 BLAKE2B b7d647c23d2215c6d61312a66a7d3521c8c16f69cf801328c67e9017be2809c2d16e29d61f190837c9fabce655dc69a506311a7781f7aa57c320524ed1bcd463 SHA512 bd98d2c774eb61947df8860a6948cda7148264a3bc86b52d317b3d805e2ab17fe81fe94ffc353ecdda86ad56bbfa17a044c9a789a878e15c5cec13c8e6eeeb70
diff --git a/app-admin/ksonnet/metadata.xml b/app-admin/ksonnet/metadata.xml
index 317ede0369bd..fbe8de267df2 100644
--- a/app-admin/ksonnet/metadata.xml
+++ b/app-admin/ksonnet/metadata.xml
@@ -1,10 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">heptio/ksonnet</remote-id>
</upstream>
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index 5cef4fd110ff..114946dc70d8 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -20,16 +20,8 @@ DIST github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz 1016
DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz 6347 BLAKE2B a1e62d37f3f736086ba5b198ca33e243f4650571d42448c593ba7c0970883aea401e8ddfc90975686bb5c992e5133294662a05b245620ca52c254b2a7e866d29 SHA512 04522be3439a2c3a06f38f764e275d8d093b935d610386bb99364f105d7d805a6a7e7a928796682955549a88d43b21f385404c1401ee66374d324f954bd4769c
DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd
-DIST kube-bench-0.0.16.tar.gz 196341 BLAKE2B c0cf32f99401729c8c064a6d48e41908c75904099a5f3bd500815502c1b9361a58546cb0751e554a0f89cddb9b25d7362b39b3a0b2000b4ab65ed2e52b98e496 SHA512 4cb0a1c5d6bd9991acbfe12d367db3d552e273cef472c11f81065be6fba93631d6c3859c247f6af7defc90e5aa716e1888a7501e5f5b024041ad81072a53c878
-DIST kube-bench-0.0.17.tar.gz 197158 BLAKE2B 458a7ee61cde654359002060ca05ef376c0f0cd43c48b6faa5faee307c367bce1ecbd827ab9634d07f805c706e1ed68968b1b73c3bb3952b52d15074c019acd8 SHA512 c07a7c58551ebe4633fb6a8cf08b8b81c63579a1406ac8b2cb889b2b6e06015fc22c205b873c79b40c228b7bd104fe427766271a1d3bd840386249c84f48e857
-DIST kube-bench-0.0.19.tar.gz 197836 BLAKE2B 86fd5d43d45fb2fa98e542a2a2385fecf2ec2a024bede34d5d9a9e33e04967b7dadab34651734361bb5f273eb8da824ca6d73fe46e8944b14ae0ba4c4e64341a SHA512 dfe82bcce482c88effffad772b17874bc2c80423d47f2dc7c02b5c9425b915ec2405d9f97b88b4aff2a54d33b7bfafd3f89c43ee4c32956d27cef4f11833a178
-DIST kube-bench-0.0.20.tar.gz 197875 BLAKE2B 8bca6040b62226d01d86edd020166538ee6072cf6ec1ec72d0db38b024ade39ba2378e9bd866b8b7e3878e11dd5ca9ce62ad3c3a36d7d99e124c664acf7961a9 SHA512 1a07d1b7b5a073915e8c161fedc901974889791a939fd58daae267dccbf80dc09bafe133f783c2eb02335535d27d143cfd7b657652ea5b517064b3cded31430d
-DIST kube-bench-0.0.22.tar.gz 205683 BLAKE2B d405bc0b7af4f588e363f5a4f240d1b8662118e64e92356f841a86501b76bec8ee51ae5fb832819cee3d99f0aefa232676e6602029ab103f3760c5127fe8a845 SHA512 e64aaae83a9469763ac5a044df8cc5e53c7b0dd1bffc27c5fbc48fa0e3e27c8a3be45ebe6d82483757eb4da290c34b003d0db5c9fee25b95fbe44d0ff3e273ad
-DIST kube-bench-0.0.23.tar.gz 205894 BLAKE2B 7c10f4f8c6b153d7e3e63cdc4cadb1b403c599e55e56f7f47be91e6c49b68215eb9c67898c6d897b7c7f038cbd404d2af158ca9629bc2d3a4e40dddb9fcdc32e SHA512 946bf313e6762ab11a59c02c03e150686254669c0ec32c36c7b9f6d224d6d011f73d7a6f56b771dbf8857b24aaf5138248b506bb180df6c3375e6c0ad68ffee3
-EBUILD kube-bench-0.0.16.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
-EBUILD kube-bench-0.0.17.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
-EBUILD kube-bench-0.0.19.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
-EBUILD kube-bench-0.0.20.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
-EBUILD kube-bench-0.0.22.ebuild 2379 BLAKE2B 58ed3d56338253b0be202240f2d8821d31809a1bf4e94578ff008edae3b63090a99fc7318df63dc27a6ca35be05eece0ac396d2e95040f6483a624b1577c8a89 SHA512 2b6503d413063be3ff0c8ef996a36c5ce2490948667ec7aea2bcd29dd90644845cc523274c148eceaf16610f77dcc3c3460b93a201cd03b284ca15e098817255
-EBUILD kube-bench-0.0.23.ebuild 2379 BLAKE2B 13c334651f415c1b45d77cea83a84bfd2db0b42b39b327d2f949d161e1ccbe5e8c82e2864af7033aeb4d284e7835a3c9507dd1a6749e31e10e35bc46b9347e6e SHA512 b75469ec2e6300fa2b294f2e4fc3887e228607c90511d9639bdc758c1cd76ada09609bc4e1a369e2e1805963c971bb9f6e8f0cdf413b892cf94afbf5cb0f1f26
+DIST kube-bench-0.0.27.tar.gz 6208481 BLAKE2B 5d3efc972d0caee4db8ea80c6ec24008a9a47770cb1befce20795d6d7e8a3ae3a109b94239a0844bcc44b008f13051db72ca19b8395a9079bb424a3ac8660ebe SHA512 5c5bc90e24d805881b9949f86b852814c2e920b61616b91716a2705230a135e8d3475fa8ec2ed0add9fc2346a17e0538527eb8a7d4dce23dbc8d3b4e99b23a74
+DIST kube-bench-0.0.28.tar.gz 6210140 BLAKE2B 239f151918b8ae0646e24bdfa95b08896dfa3702391bc736e2816c78a9309f45203ffa8111f133f6f566919a02845ea2f4f85f61fbdeebde013da834296df771 SHA512 82a8671fe02f44f9b8309ce7eac36e11e4b3ecff5f7a6dbecc65a02425eea142a60db9d494f038b412954085eb10c131e8e4ec1fb2e95bde2f96c2b35e97082a
+EBUILD kube-bench-0.0.27.ebuild 2378 BLAKE2B 7e6940c4b47382211bf747a32f68c03a9f68e1a14f7ad8e7b5073767562d7f22476edc7c2dd1bb2a68e103009e3c294f2d235cea055782fb5b616b5dc71e6a3e SHA512 17f77e0476ca8cdad7986e901810cc6af88b723367295438d6a5632b0f98aa032aa6ecbba9320256b26bd0aea17df1ab8a96e17b9be5f005ae8ec7a62215f88a
+EBUILD kube-bench-0.0.28.ebuild 2379 BLAKE2B 13c334651f415c1b45d77cea83a84bfd2db0b42b39b327d2f949d161e1ccbe5e8c82e2864af7033aeb4d284e7835a3c9507dd1a6749e31e10e35bc46b9347e6e SHA512 b75469ec2e6300fa2b294f2e4fc3887e228607c90511d9639bdc758c1cd76ada09609bc4e1a369e2e1805963c971bb9f6e8f0cdf413b892cf94afbf5cb0f1f26
MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
diff --git a/app-admin/kube-bench/kube-bench-0.0.16.ebuild b/app-admin/kube-bench/kube-bench-0.0.16.ebuild
deleted file mode 100644
index 01b95b2a0ede..000000000000
--- a/app-admin/kube-bench/kube-bench-0.0.16.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/kube-bench"
-
-EGO_VENDOR=(
- "github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
- "github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
- "github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
- "github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
- "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
- "github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
- "github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
- "github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
- "github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
- "github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
- "github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
- "github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
- "github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
- "github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
- "github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
- "github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
- "github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
- "github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
- "github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
- "golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
- "golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
- "gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/kube-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GOPATH="${S}" go build -o ${PN} . || die
- popd || die
-}
-
-src_install() {
- dobin src/${EGO_PN}/${PN}
- insinto /etc/kube-bench
- doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/kube-bench/kube-bench-0.0.17.ebuild b/app-admin/kube-bench/kube-bench-0.0.17.ebuild
deleted file mode 100644
index 01b95b2a0ede..000000000000
--- a/app-admin/kube-bench/kube-bench-0.0.17.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/kube-bench"
-
-EGO_VENDOR=(
- "github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
- "github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
- "github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
- "github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
- "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
- "github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
- "github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
- "github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
- "github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
- "github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
- "github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
- "github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
- "github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
- "github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
- "github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
- "github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
- "github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
- "github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
- "github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
- "golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
- "golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
- "gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/kube-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GOPATH="${S}" go build -o ${PN} . || die
- popd || die
-}
-
-src_install() {
- dobin src/${EGO_PN}/${PN}
- insinto /etc/kube-bench
- doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/kube-bench/kube-bench-0.0.19.ebuild b/app-admin/kube-bench/kube-bench-0.0.19.ebuild
deleted file mode 100644
index 01b95b2a0ede..000000000000
--- a/app-admin/kube-bench/kube-bench-0.0.19.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/kube-bench"
-
-EGO_VENDOR=(
- "github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
- "github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
- "github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
- "github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
- "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
- "github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
- "github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
- "github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
- "github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
- "github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
- "github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
- "github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
- "github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
- "github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
- "github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
- "github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
- "github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
- "github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
- "github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
- "golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
- "golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
- "gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/kube-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GOPATH="${S}" go build -o ${PN} . || die
- popd || die
-}
-
-src_install() {
- dobin src/${EGO_PN}/${PN}
- insinto /etc/kube-bench
- doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/kube-bench/kube-bench-0.0.20.ebuild b/app-admin/kube-bench/kube-bench-0.0.20.ebuild
deleted file mode 100644
index 01b95b2a0ede..000000000000
--- a/app-admin/kube-bench/kube-bench-0.0.20.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/kube-bench"
-
-EGO_VENDOR=(
- "github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
- "github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
- "github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
- "github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
- "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
- "github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
- "github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
- "github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
- "github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
- "github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
- "github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
- "github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
- "github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
- "github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
- "github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
- "github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
- "github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
- "github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
- "github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
- "golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
- "golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
- "gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/kube-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GOPATH="${S}" go build -o ${PN} . || die
- popd || die
-}
-
-src_install() {
- dobin src/${EGO_PN}/${PN}
- insinto /etc/kube-bench
- doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/kube-bench/kube-bench-0.0.22.ebuild b/app-admin/kube-bench/kube-bench-0.0.27.ebuild
index acf4de671da9..f2b116c490a0 100644
--- a/app-admin/kube-bench/kube-bench-0.0.22.ebuild
+++ b/app-admin/kube-bench/kube-bench-0.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,7 +32,7 @@ EGO_VENDOR=(
inherit golang-build golang-vcs-snapshot bash-completion-r1
-ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/${PV}.tar.gz -> ${P}.tar.gz
${EGO_VENDOR_URI}"
KEYWORDS="~amd64"
diff --git a/app-admin/kube-bench/kube-bench-0.0.23.ebuild b/app-admin/kube-bench/kube-bench-0.0.28.ebuild
index 456872daf1dd..456872daf1dd 100644
--- a/app-admin/kube-bench/kube-bench-0.0.23.ebuild
+++ b/app-admin/kube-bench/kube-bench-0.0.28.ebuild
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 5d9961228423..5fa7bd199992 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,5 +1,5 @@
DIST lib_users-0.11.tar.gz 25660 BLAKE2B 8f5a827840d4074a0e8abd77e43f60eb09f199f58a2bde0c2bce7613d6ba1d9b12dd46adffa528ff351f54933c304f274abef9c35550d7af3519101dcec69d0a SHA512 a54fc8f57cffcd08e77e86eaf50ec6e68e45e1e9458e25e035af90e14be13980a400c4d264f70ef67e141e1d54581b0487b2b70dd084dc5840424221b46f644a
DIST lib_users-0.13.tar.gz 25704 BLAKE2B 895f8b721216339fe4306158bf6282353d79584573091cc4e7c63c8096a9f9cfe380a8bce7229f168e44fe5d3641ceb8c91bd751316a6c6a467ace4ec0dce723 SHA512 588af7068728810832bcf4d1526f271e255d07c75d152fb41844c66f3598a71e9a96bee3426b31b58cd26af889bc42c0a7248731fdfe3623fd4567d2b6b7275e
-EBUILD lib_users-0.11-r1.ebuild 1121 BLAKE2B 3033063c5a98e867590ce0d4eac740ede458cb2ec5abb00ae8f55afa405e1d6e811ea1b0e71d9f80cbe91fad32128a0bc3cb6242d510f733e1c176fe1ce7b952 SHA512 6e14ee67829db95b0441ea159368aaba00174d7523fe8bac7f5c023191638325c93059c2b46ec7a866b000d9ab4210366ddad8e3dbed1a1159e83527afa03b08
-EBUILD lib_users-0.13.ebuild 1124 BLAKE2B 42403c90651b0a713e112e5999e36f1ae163204232b163bebb01f9db485125ae5d2a1cea4a423cad44c8da9bd309f577ea4bbb12a48da8737f9b0fc39c09e1bc SHA512 cac7c83c5e6e105566fc6dcced8a7f634a78a616ddf25e0245f68077e02047649f7996549b10d7e717a14effed644b4c1d3522f4898bd21bfbf0848c35e08e8b
+EBUILD lib_users-0.11-r1.ebuild 1114 BLAKE2B ab26338a370609b310c18385e49d9855947268cccbbb48697ff1c7f40cf4a70c262d94bfc604cf6dd6ecb7ebd4bed5b33efb439b3fc9cbc8710e22eee7d62b50 SHA512 c07b09c78a6533fc8a46ccac6faec4f8b0d5d3072e85b43ab4e3699f0f636ece5b8e12b70dcd1e033b7b11df305a68197e1ef9ee3761f304c48b8b932240d40f
+EBUILD lib_users-0.13.ebuild 1116 BLAKE2B 1567476c77eed36876279fb869f6c2ac74b932befa4f515383420d3ad05047fac75a673b8dfad271671daa8a077ad5df1e41ead39a9790b4150e683b8e52d0b3 SHA512 3c2ebbf9c5c6870124b60e1818006f382b6b6a8539936d3196ea8a41ce5ade7f4d3dde76220d6af845b0b6a301c08b6e1187661990b7cb56cd706510fc316fef
MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
diff --git a/app-admin/lib_users/lib_users-0.11-r1.ebuild b/app-admin/lib_users/lib_users-0.11-r1.ebuild
index 55a91485d77e..d4aca2e0ac61 100644
--- a/app-admin/lib_users/lib_users-0.11-r1.ebuild
+++ b/app-admin/lib_users/lib_users-0.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
inherit python-r1
diff --git a/app-admin/lib_users/lib_users-0.13.ebuild b/app-admin/lib_users/lib_users-0.13.ebuild
index 1abf202a755e..26a04f43d6c2 100644
--- a/app-admin/lib_users/lib_users-0.13.ebuild
+++ b/app-admin/lib_users/lib_users-0.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
inherit python-r1
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index a8ed985476f4..69f3d91c56ff 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -6,6 +6,6 @@ AUX metalog.initd-r1 651 BLAKE2B 7b7739ca48acd3ce646478b51639c14f7cf131a698570f7
AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
DIST metalog-20181125.tar.gz 39472 BLAKE2B 64d90835d50c7cb10ab2bf2708d00189b9f8cb56438c29d5c445c5527cce030f918ba74f83cdcd54017f04fe2a8ab30e5631bcdf6681e56c311f8069981a9b5c SHA512 4b187a29b9e25a0f762f929c6993fa6e49ead470916a43a0dfbf16720a1a633121357d2f152bf4cdcd71c016aa4fc8fd6cffb35249abd430fbbf66651986bc4b
DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
-EBUILD metalog-20181125.ebuild 1592 BLAKE2B 6d8e95879ae9a1e57473aee1ba9395a5b4ab1ef8b66a74bab7d99425881f402714f2823b31260a86be7e91076dc7bfa0153c488099402784e6b9782f69d75388 SHA512 069935198f4afe099aa411c6320c2331b1ef97c5b21561aa17daaa887fdee8bef164f2d8a1730a0994145a1cde0dcbc8d1c1b9341feea29b7ce8fb8a747d4398
+EBUILD metalog-20181125.ebuild 1582 BLAKE2B 3737e4c6c1788c24efb16a4b777a676a2543a76b6c2af619991f3ccc8c4601f338588af07507c1d5578e9ba787e70f269c0391b94f7fa2c07b980159b4c0e5c9 SHA512 8608af8f286dc58ecfd7d1c786ee450cd76aefad309a054faa87f8c758af91677fd7393ab0f2e60aafed4845a1ca83fbbd88d29af5363b9da775f47f0c916a8e
EBUILD metalog-3-r2.ebuild 1471 BLAKE2B 5da0f4866c405bd0d7073a1d98a8ad9acef166ff67af57c3330aafd68aacc7bc6ae8c81d28e402554ee637d26f5ce3aa14adfcdcb5a4cad3422a44f849e5bdb9 SHA512 91abf5ae5b73cd63246672d6bffe3ecbef91c271556958f7d1488bece9445109030752d5c932050e0413541aa240b3f09afd881f0a7350b58bfcf8dafe76bf70
MISC metadata.xml 334 BLAKE2B 2d9ae46fcede549cabba6654513afcb6bee8ea22ba48bdc910c7b136e4d27bf6e223db5b13501b275790ecbf4fcbcb4ebf5ac9b6b81c6fa098e2f2c402793b0b SHA512 14ef6878732ffc5d14d1d27cec55ec886e76969e016ce8a009cafffa0b8d4e470c1b0f2480da5aaf0ed885c101b20d5edd7ce333efb9bc6f0bf56462e7260b37
diff --git a/app-admin/metalog/metalog-20181125.ebuild b/app-admin/metalog/metalog-20181125.ebuild
index 04aafaba22f7..4ef8692892f0 100644
--- a/app-admin/metalog/metalog-20181125.ebuild
+++ b/app-admin/metalog/metalog-20181125.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd"
IUSE="unicode"
RDEPEND=">=dev-libs/libpcre-3.4"
diff --git a/app-admin/mktwpol/Manifest b/app-admin/mktwpol/Manifest
index 8e7213379c7f..1370ed71a47b 100644
--- a/app-admin/mktwpol/Manifest
+++ b/app-admin/mktwpol/Manifest
@@ -1,7 +1,5 @@
-DIST mktwpol-0.2.6.tar.gz 55328 BLAKE2B a5998dcdd947288c0761fb4ef53cfca9de5b022a53f07fbfa7cb8023d0086471cd9a1ef822a3ff45931098acaedb2b94df2f882cc3bbadc18942293679d6816d SHA512 58d739bf789f7e25678adb19cc2d05bf98920d4f42a761f2c1fc45c72ac9080def9f2533f63c10dfea50f5d8428f7d4a19760a38dcc34bff9aaeb6fdd7e89434
DIST mktwpol-1.0.0.tar.gz 59748 BLAKE2B 954d86774bf5e88612dc67f0ee29b637da188f64a8203b8aa84511e940db059afce0e993f4a703429688e29e964e5efc53a21b32f1ead3cee70bb7f056fc62a4 SHA512 f7a04bb3acdada6407e3e422e26ba2c0c454f10011a2848d0c8e962996e135a381c893f7fcdea67e1a3a23f503eb2071448beca05b7ca90e179d2a28173a973e
DIST mktwpol-1.0.1.tar.gz 60491 BLAKE2B 66d7db396bbf7e5b2c4dd537ac9bcd387298ae733348b63c6d5cb6df79e9440ea751c27eccec66978371fa81a17929d25fcfbeca6787abf8b49f087b54a6468d SHA512 aa44af97533f130b89b83c6f2a8878d290770b677f6fb9fe654b033f57fcfb3d063a6a6ddf29599aa066452d75911cf8053d65b21c37e322851a10f4381cb33d
-EBUILD mktwpol-0.2.6.ebuild 1327 BLAKE2B e526b80f8c99b1d6f899f71d4284189ed3c6e5b5bd45a80ecc1fd735376c3d7f8b2607917e84bd3e93e87c04850f1db76aee721992fcf40708d9e5802b5ff966 SHA512 5af5b285e3cd9cf4197d7b30c485339dac7dcd0ecb7499e320e1df24514827995d2d951b53b669dee688bad0577aa004d9fed27dce7c0bc6b66a0b57a71179fc
EBUILD mktwpol-1.0.0.ebuild 1327 BLAKE2B e526b80f8c99b1d6f899f71d4284189ed3c6e5b5bd45a80ecc1fd735376c3d7f8b2607917e84bd3e93e87c04850f1db76aee721992fcf40708d9e5802b5ff966 SHA512 5af5b285e3cd9cf4197d7b30c485339dac7dcd0ecb7499e320e1df24514827995d2d951b53b669dee688bad0577aa004d9fed27dce7c0bc6b66a0b57a71179fc
EBUILD mktwpol-1.0.1.ebuild 2247 BLAKE2B f6ea333d2a4c69d9eb5095eed4aa2d0612cad2221c83db9b1aff97d0bddd7e06a9538274e58ec0297049984e8c6cbcfb194102fe8078da5238fbc72456179505 SHA512 83eb862e31aae103eb629789b25fff0df6b5d795621696c0dfd6fd749125458f1157bf26c72a43aae6145201ee28b3b0930a58e54ff23c8de2f9ff0e00074c4a
MISC metadata.xml 1814 BLAKE2B 40c3405ca2533e816785d8fc2549895f42e2748d2826a5bde48cd9d7ec6370d5f306609e2032db287ed74ff7224711cc6a508d9afb4d80a85dffa02e1a3b4d58 SHA512 861a3e0c87dee0750caff734aa96708c72d6cb8a79b33a29b8aff5442b11e3e9855beb3d80428f3d6ab91542b3d1df033f55dc6942150d1eabc02fff46139e50
diff --git a/app-admin/mktwpol/mktwpol-0.2.6.ebuild b/app-admin/mktwpol/mktwpol-0.2.6.ebuild
deleted file mode 100644
index daa6b71b8e59..000000000000
--- a/app-admin/mktwpol/mktwpol-0.2.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files"
-HOMEPAGE="https://sourceforge.net/projects/mktwpol"
-SRC_URI="mirror://sourceforge/mktwpol/${P}.tar.gz"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="app-admin/tripwire"
-
-src_prepare() {
- default
- sed -i -e 's|/usr/local|/usr|' Makefile || die
-}
-
-pkg_postinst() {
- elog
- elog "Installation and setup of tripwire ..."
- elog " - Run: \`twsetup.sh\`"
- elog
- elog "Maintenance of tripwire as packages are added and/or deleted ..."
- elog " - Run: \`mktwpol.sh -u\` to update tripwire policy and database"
- elog
- elog "Mktwpol is packaged with multiple policy-rules-generating files."
- elog "The default \"rules file\" is installed in /etc/tripwire"
- elog "Alternatives are installed in /usr/share/doc/${P}"
- elog "To use an alternative \"rules file\" ..."
- elog "copy it to /etc/tripwire, uncompress it, and \`touch\` it ..."
- elog
- elog "\`cp /usr/share/doc/${P}/mktwpol*.rules.bz2 /etc/tripwire\`"
- elog "\`bunzip2 /etc/tripwire/mktwpol*.rules.bz2\`"
- elog
- elog "mktwpol.sh uses the rules file with the most recent date."
- elog "Use \`touch\` to choose between multiple rules files."
- elog
-}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 3ed6db0cf0e4..be7b61a55285 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,11 +1,13 @@
DIST mongo-tools-3.4.16.tar.gz 4697191 BLAKE2B 2e9a0e7dc8016d3e7d7c7f8d0cf80a97d3d199603c0b8b791df5a0d79d418ffaa232eee694047a7ca11fa7623023b4123becd437cfe3dec11e26cd525720bcad SHA512 b40c6dee75d860de1da73faf79f5f68c098ce7c80681486c66fff04a937474dcede91c7be907a8e36033b3898f7499e8f53271944c0df3360756c27361efb6f5
-DIST mongo-tools-3.6.10.tar.gz 4731097 BLAKE2B dffd18bbcb5a1d869cd3a00b40be7c83d12c2146944044c8d873eba409b9fcb0ce0595c01cd61a6b0405dfce685b8dde7c285380150906d4d38d3de9b42962bf SHA512 3e9808c6b275566215f8c2ce033a6259d373e8b63db5e981cc28235d757404b3209a64dd9aa8a98d9290c5c1da137a1bf9bc48629b278cb27ca28be681e86efc
DIST mongo-tools-3.6.11.tar.gz 4731680 BLAKE2B 88558a26d2552848121d984e4b963acafe9e56b37a3d393bacdcd8c0f71a29e2082845ad6d648c3c4800bd47514d339d1f1e984e339a48572ecb5f6f31d9166d SHA512 2291cb963965a59a89bac35a760ce49b4b835d1447065d558c4b254aae5fe38f7ebe4c9d7a67aa475e06be95c45f8529922c6fb0b78d41bc07d1a83f3a564192
+DIST mongo-tools-3.6.12.tar.gz 4990846 BLAKE2B a2b649df03ba17175d95b0fb7be94e446a0cda8dd45111a41f6f74ee5498b853d9fd361f683d4db558197a1951fc79056b516cff6fcd32cc32877744456b67e3 SHA512 948e49719c958e8b7cd1c27b9d413df6d032189801180540ee86b927d5dd53ab4b8906e5cc7880163ecc6abf11daebfc2fb96fcf8fcfd3e0b1f8c8fedaf54558
DIST mongo-tools-3.6.8.tar.gz 4723878 BLAKE2B a1693024d60f69d25c268eaaa30a478b1e4c0042c5fb7a3fd6252ed00aef2fee3fba94516fe825165a1a57887ed38e4fbce488c48ddd4f45349f0b7a1b244020 SHA512 359e8ce2d847d005d48ff12bc2e8af73213d81cd1521d2b5b5ac94792468218248bebbe808e1bd8fd49234eab8480608f294c1b63f317aed58f456b84ef17dcf
DIST mongo-tools-4.0.6.tar.gz 10879606 BLAKE2B 9a7656ba1486df4b36ceb527735ad46864d7a04f2d0451fb4e04bbbdc09c3bb0ec922aa5daa584b93e123e1c3764c0ebef96a3566dd0d6b646a627d769645619 SHA512 d6185d7442a593d29db78889c55aba53e070bedd522d78d8c0bf52bb27f26c5fee6d010457f65774ea36a2e6d5280f38c95433ff76ed53ed9d74b1c811198cb7
+DIST mongo-tools-4.0.9.tar.gz 11134365 BLAKE2B ad27ad868b33a3c0802a0c79b5570a85c20106c71f38229e25a09a4ab8f0e6edbfe4338ce9862b2ba6b7836e4aa71fe5a3704a81a028a95d74168ac5107364d7 SHA512 55720766da5fdb9ee5a93d90be5ebe61ec4a5f5428097e9d6cb022472a2964c39b184531e1f59fb7780e834c3b03986e9edcc66e3f3933b3457b86260a6bbd8f
EBUILD mongo-tools-3.4.16.ebuild 1195 BLAKE2B 6e650a085da6e60e7f268e074ac45373a3a9948e4b69d88ece630697c48f8e85e856cbc324dc342097c9c5c7cd903c12dbee415c3fd8582b3acf205eb4301ed6 SHA512 fc8709a1d3ab755e61bbd01db2ade678082aca0c97715dd882ebb09a2ad8bfea8ec7f21ec0572863fec70d34346dfcc47ec8ab47725c910d92715ab74cf5cd62
-EBUILD mongo-tools-3.6.10.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
EBUILD mongo-tools-3.6.11.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
+EBUILD mongo-tools-3.6.12.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
EBUILD mongo-tools-3.6.8.ebuild 1345 BLAKE2B 1baf6f2c407b2a4d1e81a6a04444b9c43ef74e6abd7e68c08c4ef1e0540b8dcb6c54c83a58b4687d2aa20f3fbbfd88b793e20058adaecb8e53b13e76a328ee54 SHA512 2286b4f40c01231648535b0f050e1ce36f5fdd654acd83389b35604d41e92bd584dec654b5368a7ee4e6ff7d420b19faeadc1c1c7f252093f365e23efb6604eb
EBUILD mongo-tools-4.0.6.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
+EBUILD mongo-tools-4.0.9.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.10.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.12.ebuild
index 092d770686fb..092d770686fb 100644
--- a/app-admin/mongo-tools/mongo-tools-3.6.10.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.6.12.ebuild
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.9.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.9.ebuild
new file mode 100644
index 000000000000..092d770686fb
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+ mkdir -p "${S%/*}" || die
+ default
+ mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+ default
+
+ # allow building with go 1.12 #678924
+ sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+ local myconf=()
+
+ if use sasl; then
+ myconf+=(sasl)
+ fi
+
+ if use ssl; then
+ myconf+=(ssl)
+ fi
+
+ # build pie to avoid text relocations wrt #582854
+ local buildmode="pie"
+
+ # skip on ppc64 wrt #610984
+ if use ppc64; then
+ buildmode="default"
+ fi
+
+ mkdir -p bin || die
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+ echo "Building $i"
+ GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+ -ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+ done
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 568385ceb166..6ae21d12708e 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,10 +1,6 @@
AUX monit.initd-5.0-r1 798 BLAKE2B 3596494122e9746157e86379f204e54d5ad7c0eb378323f3cd2ef7019e9f7a7fba0d8567afe71da8dc2a8b6e17be5fc4162211d36f227183a1557b9b33021f3c SHA512 5e0e2ae2bd1b7e1153a24a51f10b11b7006c43c5b4d68008b477dd0a4cdf97e2109cdb48b1165b79e6f5ad8e98c24a86ff0688f9aecc9297a46d82dd402e0554
AUX monit.pamd 120 BLAKE2B 76744f79babaa99fa2961f73158ca755f885e9ea8e20b76dcb29f8fd10be6b5804b09b3c90f59ada7ce81eab90713ba43d2b2f28a6abc278fdfc75b356af4e67 SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c
AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e4360520252369951b3f7f87a3dd96440a58c9d2c4973ce9980a00ab7085c92af1e6542ae10d679ba352d170b19 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88
-DIST monit-5.25.1.tar.gz 1353855 BLAKE2B 5abef9c97088b12ab376e67f2524534ad1b0e2e3dfa98d5f5fdd8a6fc2331ead57d77aa1d8229a0825cbb36871b063006b74dc98dd780baef8aaca1da5c6c74c SHA512 b21b18302aed602f9371f7dee29f7306dbccd355df333bc6d868acdb6c054cef877dee72e261383938fe1d10121cd07e820e040ea80ed70260fdda8b451f6ab1
-DIST monit-5.25.2.tar.gz 1354704 BLAKE2B 503660146edba988d0c52d1773dc3d3d6f495b3e3f0ae147be6a4297bf118ad6b5f7289868ad4b61226cf499bd8d6e3aed8f5fec91ff8ff699968f4262f1fd01 SHA512 e9b6ce60bf82c2564a084fc42b65ef432ee35855cad038fe6ae209047abaa1c54cabb4cd75c8a85c1102844a1b90c3c5f8ddbbd56711665b9bea616bcc02ec86
DIST monit-5.25.3.tar.gz 1355925 BLAKE2B f1c4775ad82ccea262fa5d9c3c9396e634cb3742c59ff9d8b3c87552501ee749a829932570b8d2836fe77a14fb42fea2ee42cab1aa355ca09df6dccda9aa5f51 SHA512 9030b8e6a02eeaf497382f14f7cf855a96599ab060130f077208edd5db35fee1b74f9166df4deff87b4a1954c8d4fff83b5465166938a3f8aea8d4d4c0371e90
-EBUILD monit-5.25.1.ebuild 1101 BLAKE2B 8cb885879cb8ad000a9978091df84c2eba145d72b0838c12eed5f7de2891107e0973e8b07bdcc3ff20ddc8188072f65d1f9fc45444e3e124ed2f4adf533c3d83 SHA512 f80d2c48d1bfd011eb4ddd71e65af8d7148104d1607eb741afcca1bd66ff4604cffd32bbc045a1fee24bd64b5637ccaed6e3655275dd2a925d65319069d26753
-EBUILD monit-5.25.2-r1.ebuild 1226 BLAKE2B d1efe3c4501795e124ea3895fa21bfa2264d5bb5d153748b94efcccee38cfeb269cc5d769dcd792cf7167508bc0a23a05c36885cce0f9a99f729303be4b368e8 SHA512 7816aa95fcccdd7d27dd428cdc98f4f6a646aeef875dc02919503cbe1536b8dd2b8b473cd04236317c99f8fece3bb3aab30285424b5d4ea50c40153975584147
EBUILD monit-5.25.3.ebuild 1203 BLAKE2B 424209d91e4e709e0e2e110d4d85d37ed0979f0ff4190c30955192b0454e881f66a54ea6e9a0b6eeaaf31abc7f7378a8ba5b1954d561c5d0ffa0d3ff0eedf802 SHA512 b67bb6c0c16aa686b249aa2da65a1d69c1f3635e03de4a72871fbc55b6f4ac5db7cca9165e27b5a7e5de4eeb51339bd5e1391bd9c7087f38151fabfdec7132de
MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-admin/monit/monit-5.25.1.ebuild b/app-admin/monit/monit-5.25.1.ebuild
deleted file mode 100644
index 0e8c407fcd1d..000000000000
--- a/app-admin/monit/monit-5.25.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit pam systemd
-
-DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
-IUSE="libressl pam ssl"
-
-RDEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison
- pam? ( virtual/pam )"
-
-src_prepare() {
- default
-
- sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_configure() {
- econf $(use_with ssl) $(use_with pam)
-}
-
-src_install() {
- default
-
- dodoc README
-
- insinto /etc; insopts -m600; doins monitrc
- newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
-}
-
-pkg_postinst() {
- elog "Sample configurations are available at:"
- elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.25.2-r1.ebuild b/app-admin/monit/monit-5.25.2-r1.ebuild
deleted file mode 100644
index 8897263d608b..000000000000
--- a/app-admin/monit/monit-5.25.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 pam systemd
-
-DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="ipv6 libressl pam ssl"
-
-RDEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- sys-devel/flex
- sys-devel/bison
- pam? ( virtual/pam )"
-
-src_prepare() {
- default
-
- sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with ipv6)
- $(use_with pam)
- $(use_with ssl)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- dodoc README
-
- insinto /etc; insopts -m600; doins monitrc
- newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
-
- dobashcomp system/bash/monit
-}
-
-pkg_postinst() {
- elog "Sample configurations are available at:"
- elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/ngxtop/Manifest b/app-admin/ngxtop/Manifest
index f4739ebfdd27..c7e81f934470 100644
--- a/app-admin/ngxtop/Manifest
+++ b/app-admin/ngxtop/Manifest
@@ -1,6 +1,6 @@
AUX ngxtop-0.0.2-py3.patch 1816 BLAKE2B 1f19b6143bc5eab4786043d1641f17a370cc07b72c3e61329e9b3255fb6a0c66d00d94b371aae5e0d5747e99964a102d7ea630a235ebad4df0cd3ff015917c95 SHA512 47127c5ba26d0d6319ca74f21370bf01ce3a74676066bf7476f862de8165c2d62d90e5cad1cb2369e5743db4fa51090e8bdf59da04f9dcfafec62edc44122f8f
DIST ngxtop-0.0.2.tar.gz 9668 BLAKE2B becd0ba58490ad26dce2166ddf39d2064e797bc26da64b70e38e137078130f5c21a95fffccf656fcaa35ca595fe769bd4b59036e9e0993afa75d062b49714f10 SHA512 49cd0f43bb7dae79253a13c4011a5bb92a33c137d0ce7a8de7d57ba18624ec1e10bf462a32fe96d1045ed85ba9c273260a846fb1983e189884e65c1621a39d43
DIST ngxtop-0.0.3_pre141201.tar.xz 9012 BLAKE2B 9e8a7d2c3aadb302e0923fc7cb5b0219a56489993fdcf83fb7b38ba67036f2b5cae7e5bba2c9efc81d858c58b0f1e25f17fa8cc600e77f76b45aafd9d5a3354e SHA512 ce0c6d027eacfe553752a4a66b7d5823de45ef847d4db1a50d9677126a1d574c22e17b5a60f073bf74eb93d56d15d88d6201353324b201b77c1dd5bede6d7cde
-EBUILD ngxtop-0.0.2-r1.ebuild 651 BLAKE2B 972956525ec3f24e35bfa4287ff3fa6404330047336269ff647acad3a48a5373514ccb4fc550673218e8993596fded2ae4f9a25b92d9ce01bf1483e9cfa2078b SHA512 77bad90097cb535f8e610a2498ec23e6c665adb943d7df7dfc1a20be8b938aa43fea0e295f97fb3219716c2652c9bddb33059f4df2c4dd6b4b2f50b33c7f2d99
-EBUILD ngxtop-0.0.3_pre141201.ebuild 728 BLAKE2B 1825345d92cf5f119af84477614bd910afaa251efc59318ea1fdfc60a361efdfece77d0d91aadf9cd45c9acbcc1dd7b155edf2c5a9827a1161ce424bac12a150 SHA512 b857066578c5c46f2bcbe0413f11e0996e0e4a9fdd932d3c2ebf9e4e24a9e003f54237b884d8b9588fd8d37ae21485476c4d7053c3c4bfcdb380e3f69809887c
+EBUILD ngxtop-0.0.2-r1.ebuild 642 BLAKE2B d2bbf0125bb2d13ddf424974863a8e2dff45f8d6c4404cbcfe890cd464d9ca86e38c86d36a701bb1beb90a6bb94a77c50f78d96ee805e01a1c8e00a9efd18510 SHA512 a1f667d09672711e14defbb07f26231785dc89baaa0f34be1de9d0aa161a690ecb045558dfe5ae69ed5a230de6238785a02cc140aa2bfa99189a6db37d8e2e27
+EBUILD ngxtop-0.0.3_pre141201.ebuild 721 BLAKE2B 1a192bc543ab4ed158746a9391aefa63082388759302ebd5115106147419942a863f3efdafd89e3c54709c3d5376f1f26561b6f0e31915d355b5640c771aa375 SHA512 b38d20205e937d5133789e3f4ad757e3516da59ec28a149024f35c7e83c1318b112de7be9f0626b1d09702b3c6a9fe89d03c7c83c2242f12e33fc79d6849e23e
MISC metadata.xml 335 BLAKE2B e7a3dadd0a07d8bae375095732fd23ea9f95886f26acdf7fed053a2a75a799d37a6c64eb5ccf584fffc53a102ccf4925e10d95b146c8060275332f82858a1456 SHA512 6d525ce3c5a1efa8da1913ace611f778d2e0b7470521a970e26547ea921529a952576369f8fcfb19d39dea6222c0929ab475e5f7b0375d5ddf794a0303504ead
diff --git a/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
index e187ef559f43..e8ccdd2483aa 100644
--- a/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
+++ b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
inherit distutils-r1
diff --git a/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
index 6bf6aa1b02f1..08101cceff9b 100644
--- a/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
+++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
PYTHON_REQ_USE="sqlite"
inherit distutils-r1
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index 04767fd6b1a8..e9bd289d2307 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -3,5 +3,5 @@ AUX 1.1.12-cache-qafix.patch 1103 BLAKE2B ab5fe2d05729dbd449e14aae25332172073554
AUX 1.1.12-elogind-support.patch 6656 BLAKE2B 0bc942015430479fc1ae7c5cac080a8e68c53e4f5c45cea994bd44232f7dfe22e6623d31f9ed9a46bf31a851e888eea462785bc728db16951cf21c657fe1b575 SHA512 2126d57f2c0221cbad9f9796df0bfd817aaf26818f1287bf99c38a2396a7a0a140ff96c6369a18bfa008a91768d531fc4c0c5acd897fab3bbb35d755f39e946f
AUX 1.1.12-use-autotool-python.patch 1072 BLAKE2B 8f96a404b3a80d13cb10488bf21a5710d9abf40e1725e47480a7451f7adcb9c4a0d834ac65f35d2013425b3c867d0126c23e999ff6077dd9735571fb9916432d SHA512 33e5d4364e32147de550204809fd86407607f102964986402379c8904f44f64db6ef7ac3a1b967fe6e70c8654f8a271b3f2934a370ec9422e58aaf54352d0320
DIST PackageKit-1.1.12.tar.xz 1439024 BLAKE2B 458cb7a9a47941214ec58846fb840f852851555dbd94ed5113745f9e375cd28edaa8475db30fb889b1722ea01bce5200a5ea7a5f52e45b424703228bff59d689 SHA512 a7428416ae85df0c8e7dbe017396921e9214612c8eb7c91020523457d0feaff86ad50d595f702d255e4091364cb10b8d9506b603b9d0e449c39fced07180840b
-EBUILD packagekit-base-1.1.12.ebuild 3975 BLAKE2B b5bcec53f996e1ab5419959ec360e20dd0e3486ecbc205de1be4ba1a9e4e43f20b121a4d770b36dd7b48676ddf98b06c9950ea512954d297636a339c8f9da1eb SHA512 4a9249d43ba58abe4a7311a0bde7ace79c30d21dcb96a4477c0e26b7739dd9509bdc423f0fd565fe5db58bc6a5e1c18746ba31f60a4933997c66a1e1f4e2f6b5
-MISC metadata.xml 664 BLAKE2B 4dcdb79a089d9ec0734d9af4c2b6206ad1add7b17f8c8984b2e7763672fc334000749b4332e92224d11b0382fe22a2ca0f83ced4da218fbd1e85d8b101fd3e1f SHA512 9b80a98e97af44ab81b497b2c71c73db41da7f250734d6b032e80151719a0a82e2c1e295b068a5e3657a509dbd74d1f65f6e49fc211f77d0623eb7bdcd32b323
+EBUILD packagekit-base-1.1.12.ebuild 3985 BLAKE2B 956dce71fcff9167e234bfa12ca447888ca52700a732007eb13d44ac8d63c59db5d9a8b9fc1ad59a178b2ea5b2cc7b5e4abfa368bdc78132e454e032e035fe96 SHA512 f350646c77c4a64b10a788b121a4fdbeaf4926d88c6eda52b633402884f575784866cc873f7ef01de9c949f38e00b199ba4401cb411c7ef55e6079dcf6e4c760
+MISC metadata.xml 772 BLAKE2B 88885c4f2b4c7ea16857f8727affd074dfc13a0a407f23a53e1a7dd7801c98adb4dde13baed734cc9b0f2aff1cc560dc45cd17c4c591acc0d9fcb1a95ce7e72e SHA512 14bf2712da5db44c38ebfab0e994a0a874213ce7265fce7a9f40b6b9e61b93a9935dcff532ade1980465b98d07b305c4ebcc69a344b7624c21b57d1b03bdb69a
diff --git a/app-admin/packagekit-base/metadata.xml b/app-admin/packagekit-base/metadata.xml
index 1036ab84868f..4ca93f3e889e 100644
--- a/app-admin/packagekit-base/metadata.xml
+++ b/app-admin/packagekit-base/metadata.xml
@@ -11,8 +11,9 @@
</maintainer>
<use>
<flag name="command-not-found">Enable packagekit support on shell "command not found"</flag>
+ <flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> to get user session</flag>
<flag name="cron">Install cron script for auto-update</flag>
- <flag name="elogind">Enable elogind support to get user session</flag>
+ <flag name="elogind">Enable <pkg>sys-auth/elogind</pkg> support to get user session</flag>
<flag name="entropy">Enable Entropy backend</flag>
</use>
</pkgmetadata>
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
index e7bddc8c7ca6..af42930c60e7 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -19,10 +19,10 @@ SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0/18"
KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86"
-IUSE="cron command-not-found elogind +introspection entropy systemd test vala"
+IUSE="command-not-found consolekit cron elogind entropy +introspection systemd test vala"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
- ?? ( elogind systemd )
+ ^^ ( consolekit elogind systemd )
vala? ( introspection )
entropy? ( $(python_gen_useflags 'python2*' ) )
"
@@ -62,8 +62,8 @@ RDEPEND="${COMMON_DEPEND}
>=sys-apps/portage-2.2[${PYTHON_USEDEP}]
sys-apps/portage-mgorny[${PYTHON_USEDEP}]
)
+ consolekit? ( sys-auth/consolekit )
entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
- !systemd? ( !elogind? ( sys-auth/consolekit ) )
"
PATCHES=(
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index acfcd511531d..f3ff4dbb4fb5 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,5 +1,5 @@
AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
DIST password-store-1.7.3.tar.xz 63416 BLAKE2B 5931608e0208dfe6965b79f586c153a4930d1c3d3b74433d026ee0bc5889fcc29334c637ca4fb68308d0169bad7c8235b6632e9f80eda1e24f0f5721353f88e3 SHA512 89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7
-EBUILD pass-1.7.3.ebuild 2184 BLAKE2B f1cb3b4dc5dfb87ae1281a0d059c8c456accf1b77e324bec1594900a8af156ac2b67d4481387a2e0fb9d72f98b00025da6cb1bd0cb9b5cdb1a016c33e24c58bf SHA512 31297f5ec00aa2d2fe0188e4905a54282b97b66498bc04299b0016de0c43dac3f2657433ee1c4611205d49cf153bc020d4c940ae059dbdc5d08a3f3b997532ee
+EBUILD pass-1.7.3.ebuild 2187 BLAKE2B 242d9cc7f7111f2586f410a60900a422797c0cff67b7b6289e5246106e6126fa649abeacc0e4324fb4f74ba9ab02c33416592bd00a740cb4978ea9e77dba9edc SHA512 c1e75fad1f7d66121603e0bb04452d598bf8f2de564bdb04f333626c0dd33b9e89471739218a4a6ee87ffc694b430f0e1533e8d419145107dd422de50c92a508
EBUILD pass-9999.ebuild 1960 BLAKE2B e06b86833158fb55e9656a1bbc2168bbdfb0cc1fa48924437e2a05b81dc79c0f110cc2edf664610b43b29cb67c4563db568bbbf3cb6edd7f135b5db0d027751f SHA512 b170aaa7a41a628684735cd24994f40a95abd8e7c1ffa9bd52d381f4d94be246c7465cb617404eb61bc6221fede56f43dc76f18517329b83d00c0ebff02e4580
MISC metadata.xml 881 BLAKE2B 59fee6aeadb16d050eeaedc6d5081963e3ffa8316ddd00afb67661d721fa60b80483c16348e0c3d6c20fdb6513fd5840552c3a95724b619e07122d8755c4e7c1 SHA512 49df1e24751818d46a0c23fcdc9e41d965dca29f9964f7d142e4dba9b076b472c860d9b3eafc15b04a983f49d2cd78eb6b529742469549209c7e4160a15f1323
diff --git a/app-admin/pass/pass-1.7.3.ebuild b/app-admin/pass/pass-1.7.3.ebuild
index 02fd3b80191f..40951a9abdb7 100644
--- a/app-admin/pass/pass-1.7.3.ebuild
+++ b/app-admin/pass/pass-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x86-macos"
IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
RDEPEND="
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index f9b8a8fd9f51..f2471f856306 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -7,12 +7,12 @@ DIST puppet-agent_5.5.7-1stretch_amd64.deb 17300432 BLAKE2B 4c3b13361b9a97734a7b
DIST puppet-agent_5.5.7-1stretch_i386.deb 18222282 BLAKE2B b9ce9269cc59d79450cb66c9c3e545ad4267ad1a43905df4ca57b45ad1213dd11c9ddcffb77719a151f52eb60d6792a486823ea4a29b2f4e83a2d62960c9691a SHA512 b65ecaf27c2bcc6556d7d43a0b78e282a64c72eed3b672af5d2e23c34eefe8134b6d4c60505f9d7c6e5b40ed4a1ad391128933c27710819f5078ec7d8680b6d4
DIST puppet-agent_5.5.8-1stretch_amd64.deb 17302932 BLAKE2B 4ff925477f74e5ecb7737cd41712bcd8b0b54d244784fd874ad160bc7cd33327af615ec117fc28cd45d59f275c51aa71f80de204f1f395ef89c7162d5acc3cef SHA512 f30cf250855c4f5adfe58f8c3c7dcdcf155ba97a9a805449555134fb9fedcf6c4d4ab54483d4c1530ae09583e6ca78d1af446cc7fc62760c4aa839c1e9d42bc8
DIST puppet-agent_5.5.8-1stretch_i386.deb 18221644 BLAKE2B fcacbae34bdb6fa18eff344123908880de2e5025ccddd25ee751c5c2b229ff8b63c66d482d4e8139b0d263edeff78771459cd90beff36136a553b039a7c417a9 SHA512 e00c04eacea360619f9fa4e016b8421fbf44127f979ed772e06cef21a15261a7d201abb9bcde30d8bb4e36a4b37d38d67814b2c1077b33ee6e6404c898c53e32
-DIST puppet-agent_6.2.0-1stretch_amd64.deb 18705508 BLAKE2B dbe52e4babaa47a7ae6532765e8d544b0088374c2d9dc1f9a052a462199560b4a1b36b61e2e0953b54937d0672a66124e640ff44deac5491e28fec5f8c162e51 SHA512 7235c8d2212377768438b0703064ef81ea1fc96473a84b1275ae7ccb63d74ad89a6c5721a61d009276df5a84947484928fa05acea20bc40bf2179f9fe9683cbb
-DIST puppet-agent_6.2.0-1stretch_i386.deb 19232552 BLAKE2B 48000de3a47f6d9513cb33f5a9e4a889dcca5ab089680d0f03d85a6f96a8ec0dbe7610c0cb6e6ca5184d18ac8823602ca1fe56cdd6c48bee46faf19f0d775f55 SHA512 755f078d5e91982f6ab9c8b717e7635f533a40437b04a09ea097d87059d01a00120aaf31e6ca7d1cc32940be9491ba4fffc5f4fb82b0c4a263bf8638d5e1c15d
DIST puppet-agent_6.3.0-1stretch_amd64.deb 18716014 BLAKE2B 914686e0229b40ea2e4f29c31556fdd289e7f556c471ea3e3a8cec887e1e1175ab5e23fc2605e3c156f9f571a8ff47b1a77b4f1173e41b923d7bd59592b575ed SHA512 fd5f39c4cb2fb040e45a0b2316857ad9da311532a9d1659f9df07ad57f85daec2e7674109c63885325c809e839b017b7b3d5ac57f9439e03b569203bf301851d
DIST puppet-agent_6.3.0-1stretch_i386.deb 19243158 BLAKE2B 52c36e54ecb2e1fcc9ef5add8393533f68a21fde0f449b558d1fe58b066519138092e15c851e33580e9c2b943ef7a58b323cdd7bc1997faa273db4f518292465 SHA512 aba93bb2290879f5512f2429af658b137a3b5ae51ce9817fb701086be7abe4043b54d242fdc1310876b42124819885f8ab97c9fb6cc9113a50115bc071d42736
+DIST puppet-agent_6.4.1-1stretch_amd64.deb 18772178 BLAKE2B 6355578e7254965213bb0bc7df43def6faffeafc7f16aba22eafc0a9abed75d30d7e73f78c8641931526f775037ab6b07a1d3f47367a42545b585c48299550ee SHA512 b1d71c44a2d674529b94619b407cd5386bdfbe334fbe68e666361e8e91275487a2d841e9cb90002c768291b045447fb61d010de7cb0e068cabacbba3c601a960
+DIST puppet-agent_6.4.1-1stretch_i386.deb 19258406 BLAKE2B 8c29b8ac9a9afcc3540ac68488242ab6f6d2d1548c8f8b66adcf1874fa2ca0077b76d6de67ceac5091e1118cdcbff410639b8ea4fd022f396dc663a6851407af SHA512 a5c039581c5d3c52de9e960f7e5d314751e18184028ea6bc98e89af9a141c54f29dc4499db3d9fdf6e2db6ea6b4a8ffa691877d458a31c0d8660e49b28209597
EBUILD puppet-agent-5.5.7.ebuild 2478 BLAKE2B bc197abccc5e3ee2bf58c799e56437a818e56994309963561497e8eb70dce277e13d14c441b1cf4da0fc8f688af3163e87fa9044e4a3f48b71953666f65d7e40 SHA512 742a16a57da4578a0d4db4ebcf60487b6278070e3210c775d7c6b3bb0670d7cfae63c7cb661b327d3373f87bb8f348b81baefc872282e3a26717ba18485fee85
EBUILD puppet-agent-5.5.8.ebuild 2480 BLAKE2B 2dc21f5294f4ab42011e2359caadaf207a16e7a2eb235cd33ea4300c41c5ecdd8df771c92eb350d7e5f7334b207b42540271f016c2cf2560f9d38bb41c3e3113 SHA512 b8f39ea59b87fdf1c6b83ec6cda1bdc66650c15287219060f42015928f2739dff8084fb7722462201abe950c8888667796f76bd83cda1bfa48795af8d472f202
-EBUILD puppet-agent-6.2.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
EBUILD puppet-agent-6.3.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
+EBUILD puppet-agent-6.4.1.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-6.2.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.4.1.ebuild
index c648209a4a7e..a72df734d6b1 100644
--- a/app-admin/puppet-agent/puppet-agent-6.2.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="puppetdb selinux"
RESTRICT="strip"
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 738519252700..dfcc0062cb49 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -2,6 +2,7 @@ AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 BLAKE2B 91727c30b968b41
AUX 50puppet-mode-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
AUX puppet-fix-tests-4.7.0.patch 1102 BLAKE2B e5c98627620f9f76f1421a13969dba3b1d279a63cdb65fc28713a9a2849c8e8cd0e42a30c9058e341d5bbabd3d24ae17c050fa551566e6c61301b83396a0b80a SHA512 81485af1a218b5616195ed80b3fc963c42d56265477be9a636c0e915a18771ff93e12cdbded45ce90da17ce72be4ea4881b5ad8e9d5a997be271df3cd2e8a2c8
AUX puppet-fix-tests-6.0.0.patch 1103 BLAKE2B 622364a21ca637a64e5462c800535e9973159e9f988d5c0056c685c9ef587ce3a9158bd5cf6228c2487dbdf8ba4bb9df43200f1e74cfc4c6129bd19fbf173b5b SHA512 d39fdc5b0ae7828268e8f322d38c9aa8d1dc54a09681e957fc263b40e98eade342811573e3a8045ed51ecd5570dc86e0b97b8e3e12980cec238268e9964da38a
+AUX puppet-fix-tests-6.4.1.patch 1178 BLAKE2B 6767555c3f43519238b2e539267a40977cc460800644f2807fd1fe27fa49f805e62d5aa0a74e4c1a58160bad1fe1f1628873195a60b5b2e0a83d484e26b72bce SHA512 88a25ad9bb809f06d4af618b1da2711d84e18a63d2368c7191c6cc3170e0d85930fc235057babc92e26315312636d61d69f54cd8a3a2c8acac13ccebd187c258
AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
AUX puppet.init 917 BLAKE2B 0ebbcdd8c9d4154984130ba3f597969f5f070f65f246770583663df4f192052a0ed666d09d4d417864457814d6a680ac4f327dc2a83b774da3a3c0d4efea1c8d SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf
AUX puppet.init-4.x 764 BLAKE2B 997fef3e95718f3e0f46fa2ab5994ac994a585bcfe728a9dcdfb3ccd5b76e6fd879a4160dce1402803713344fc2082b43e3116b468e9b49fd1b17a043040f860 SHA512 170100981c7e24284a12a208cede1a73afbaeab73315fd15a7337d416825c6d26a29ee272244d39764ad4086bc6a6f99cdc56ed6a600282d6ff9ed74794bfaf8
@@ -10,15 +11,11 @@ AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec
AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
-DIST puppet-5.5.10.tar.gz 3064457 BLAKE2B 04cac9cebc03343b8c6fcf762f681f63bce4ebe27b6e7e727d06b14f0013a6c4b0ed7ff793e01b170931a881a921b4a2f107a5e37d1ac9394046f8611a7adaaf SHA512 70a5684289fc576853bf908adff44c1b1ce4b37d71236e7d7a8d140fa0e3cdd46a4b570cc7e493a3f47641f6be0c3b736ab04a178c30cce4244abe686378bf4b
DIST puppet-5.5.12.tar.gz 3073481 BLAKE2B 8044af48e7d86e754f767b42199814ff9b2dcda04f1e13920cea332ae79b23997cc1a17fe761bb5216d174bc5d77c244a9eba7752c004bf1558a648c334f698a SHA512 33d844d671710adae1dbe184981143883bf4f3ac1516f8aedd1cd8d30157bc947a3a66df30c10a2357a8cb42dafe02a80a24007312b2107c68350ed0871a3249
-DIST puppet-6.2.0.tar.gz 2821615 BLAKE2B 88b8ec856cfc6dacba5dfe44da7abce56a351f514057d3c916ecb5f4188703713cf7981984c2a59cb8073da93eab91a815dc2f52ee4f621c9a412897e9387d5e SHA512 91540169d3c9c1715e78b416961f4f3957a01b0908c3b675fa75226361fb8161730ca47ed98a2e958d8841fd50086c75489c5ee53b41f933392f399d502bad9b
DIST puppet-6.3.0.tar.gz 2831909 BLAKE2B ccf6353c0fc1fcdd4ac06e79bd8d91980162b8f1b2012fc2bfc1cdea3d2d6b22bf55216cea9b94a4024273ca9f76eedcc92a861de9db348408a361596033b51c SHA512 1d30706049fe378facddb923a9ecb521d37faa84740251602ac340ea1299c247252fbdaca17f1ea450ff716ab26ac4e9524f1137080318e6d9237a9e2699f6b8
-DIST puppet-6.4.0.tar.gz 2890722 BLAKE2B 5d377ab8a964b342088af5b204a53273593dd0aa8350485c2f886172947ce977aaead0ddf151548d64446f1091ec859e4eb04b86984d7e21014e8194e3a8c4c1 SHA512 f3a74be2371313f7d20e669a11e4be03cc064343fa7223d93950c3fab43545cd4b1c378b6b8795a74b084dbdb7a67d1eec9ab516565ad0e64dd28864c5327459
+DIST puppet-6.4.1.tar.gz 2893151 BLAKE2B 5c48b30083f93ce3625551020cc3b386cbc4ca8ab249099249099dc7aa8866186c197732ad603366d5fa54c3fc1664d7b457d323a2e6d9266faa754f7d4fa4ca SHA512 260f933dac3a3033e807c5b7c63d5562d9d8d29d11550efd38b0a94eac811f27444156cc11db38da170dc2369981072288df471fd05738a0f0e951bbdffe2a52
EBUILD puppet-4.10.12.ebuild 5623 BLAKE2B 5653e7a7ff00a41e59acc42da38a47f78c25e2befdf034a7697d6cc37b1b0c7236a7f0fe6a8b0f224b08905d2fd74e20e8fb43e67e7dd1c3afc5ebaf3fe357f3 SHA512 4ea6f32bd809bb4e8ac90b2cb6205cc464dc9ea3cb97fbe3e14deb6890a04e9095f3d9896a99663ecd0d57a80df16b283ad8c55f8d0f11d1bc4eecc477a245be
-EBUILD puppet-5.5.10.ebuild 3824 BLAKE2B de47036b3db77506272ada8f0ec8af05a69a98e75e9d8c78ee767ba82b2762d639bc7ef2d7b51b19622766bc6cbcceef43890c2aaa25a91dc6841b3ab7507bc7 SHA512 2b0069346f7b4891d8158a9c1a3a7d6190d2e4854988bbfab4cec1815cb797be0a70a13748cd974097f56a3073c00eec8e6a1f25dfad987e622634077c15565d
-EBUILD puppet-5.5.12.ebuild 3826 BLAKE2B 5c607670362e772e049e9c4789895145076fe3666abb893d4f5a862ce644c0434146f3bba0e4d84264c6796abc3c534f48ca3d3f7d34bdcb489b7b0a0f8981c4 SHA512 30546929c45f9eb178bdac4eca613ede8bf6ebdd677b1046b785ac540081dc98c8bab9f19782c815066e2daf591a882258f7af7dba4d240087eefda62992cdad
-EBUILD puppet-6.2.0.ebuild 3655 BLAKE2B 6589c4e2d07056f8949e942e54edb401842377263462f7c0bbdc66c907dc038bac06296b6479c22919d0a4740f0f61e443623823ff6517759d4188f576ec01e5 SHA512 221ea214e4222aff478bd3777e468d1cb377b23cd0008d9fc25cba7f5a1114e7d3f475e7161d1d0300d49b472e26a1be4686f5c9a90aaed23ec36d42466aa3f3
+EBUILD puppet-5.5.12.ebuild 3824 BLAKE2B de47036b3db77506272ada8f0ec8af05a69a98e75e9d8c78ee767ba82b2762d639bc7ef2d7b51b19622766bc6cbcceef43890c2aaa25a91dc6841b3ab7507bc7 SHA512 2b0069346f7b4891d8158a9c1a3a7d6190d2e4854988bbfab4cec1815cb797be0a70a13748cd974097f56a3073c00eec8e6a1f25dfad987e622634077c15565d
EBUILD puppet-6.3.0.ebuild 3655 BLAKE2B 6589c4e2d07056f8949e942e54edb401842377263462f7c0bbdc66c907dc038bac06296b6479c22919d0a4740f0f61e443623823ff6517759d4188f576ec01e5 SHA512 221ea214e4222aff478bd3777e468d1cb377b23cd0008d9fc25cba7f5a1114e7d3f475e7161d1d0300d49b472e26a1be4686f5c9a90aaed23ec36d42466aa3f3
-EBUILD puppet-6.4.0.ebuild 3657 BLAKE2B 348472cfdac195d18c5fb0f0430c64f9c8a91c5e912cdba02c2e229d66894f9c748fafdca0a5c77a7b8a861ae8ce8dd31fbbf37f1ae6ba3599707baad503034d SHA512 1ca964aa0fd78fdf7459383e5d1bad770c60908757ff0216e240268ad02142a18e91eb57562841819df459716052cf4187f4fae7b2186cc5eeb6f7152f1c0bc4
+EBUILD puppet-6.4.1.ebuild 3655 BLAKE2B bd1581772558cbb64062d3dd4c3850b783746b74cc4a5eca8b7435a5b12748e1481460e9a4ce580844367e43b272f6c982fdcaaa841c3cc7aa5087d04c2511b3 SHA512 0dd5c0dd5d50c881329263d16843e508152617bc0ec089479b39c4d77f87655e3425aeebee2ed7364cd5b024bb9b93e37e54ebd866234d52839e84d3658d4a52
MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch b/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch
new file mode 100644
index 000000000000..6b7b5b484792
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch
@@ -0,0 +1,18 @@
+--- spec/unit/network/http/api/indirected_routes_spec.rb 2018-09-17 19:36:56.000000000 -0500
++++ spec/unit/network/http/api/indirected_routes_spec.rb 2018-09-19 10:52:35.841614932 -0500
+@@ -144,15 +144,6 @@
+ handler.uri2indirection("GET", uri_escaped, params)
+ end
+
+- it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do
+- expect(handler).to receive(:check_authorization).with(anything,
+- anything,
+- excluding(:environment))
+- expect(lambda { handler.uri2indirection("GET",
+- "#{master_url_prefix}/node/bar",
+- {:environment => 'bogus'}) }).to raise_error(not_found_error)
+- end
+-
+ it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
+ expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
+
diff --git a/app-admin/puppet/puppet-5.5.10.ebuild b/app-admin/puppet/puppet-5.5.10.ebuild
deleted file mode 100644
index e4dc9ec05260..000000000000
--- a/app-admin/puppet/puppet-5.5.10.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
- dev-ruby/hiera
- dev-ruby/json:=
- >=dev-ruby/facter-3.0.0
- augeas? ( dev-ruby/ruby-augeas )
- diff? ( dev-ruby/diff-lcs )
- doc? ( dev-ruby/rdoc )
- ldap? ( dev-ruby/ruby-ldap )
- shadow? ( dev-ruby/ruby-shadow )
- sqlite? ( dev-ruby/sqlite3 )
- virtual/ruby-ssl
- dev-ruby/hocon"
-
-ruby_add_bdepend "
- doc? ( dev-ruby/yard )
- test? (
- dev-ruby/mocha
- dev-ruby/rack
- dev-ruby/rspec-its
- )"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-# dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
- >=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
- # Avoid spec that require unpackaged json-schema.
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
- # can't be run within portage.
- epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
- # fix systemd path
- epatch "${FILESDIR}/puppet-systemd.patch"
-
- # Avoid specs that can only run in the puppet.git repository. This
- # should be narrowed down to the specific specs.
- rm spec/integration/parser/compiler_spec.rb || die
-
- # Avoid failing spec that need further investigation.
- rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
- each_fakegem_install
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- # systemd stuffs
- insinto /usr/lib/systemd/system
- doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
- # tmpfiles stuff
- insinto /usr/lib/tmpfiles.d
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
- # openrc init stuff
- newinitd "${FILESDIR}"/puppet.init-4.x puppet
- newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
- newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
- keepdir /etc/puppetlabs/puppet/ssl
-
- keepdir /var/lib/puppet/facts
- keepdir /var/lib/puppet/files
- fowners -R puppet:puppet /var/lib/puppet
-
- fperms 0750 /var/lib/puppet
-
- fperms 0750 /etc/puppetlabs
- fperms 0750 /etc/puppetlabs/puppet
- fperms 0750 /etc/puppetlabs/puppet/ssl
- fowners -R :puppet /etc/puppetlabs
- fowners -R :puppet /var/lib/puppet
-
- if use ldap ; then
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
- fi
-
- # ext and examples files
- for f in $(find ext examples -type f) ; do
- docinto "$(dirname ${f})"; dodoc "${f}"
- done
-}
-
-pkg_postinst() {
- elog
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
- elog "cause puppet to hang while installing packages."
- elog
- elog "Portage Puppet module with Gentoo-specific resources:"
- elog "http://forge.puppetlabs.com/gentoo/portage"
- elog
-
- for v in ${REPLACING_VERSIONS}; do
- if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
- elog
- elog "Please see the following url for the release notes for puppet-5"
- elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
- elog
- fi
- done
-}
diff --git a/app-admin/puppet/puppet-5.5.12.ebuild b/app-admin/puppet/puppet-5.5.12.ebuild
index 7f380bcc3fac..e4dc9ec05260 100644
--- a/app-admin/puppet/puppet-5.5.12.ebuild
+++ b/app-admin/puppet/puppet-5.5.12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
diff --git a/app-admin/puppet/puppet-6.4.0.ebuild b/app-admin/puppet/puppet-6.4.0.ebuild
deleted file mode 100644
index 1d12aee25d2c..000000000000
--- a/app-admin/puppet/puppet-6.4.0.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
- dev-ruby/hiera
- dev-ruby/json:=
- dev-ruby/semantic_puppet
- >=dev-ruby/facter-3.0.0
- augeas? ( dev-ruby/ruby-augeas )
- diff? ( dev-ruby/diff-lcs )
- doc? ( dev-ruby/rdoc )
- ldap? ( dev-ruby/ruby-ldap )
- shadow? ( dev-ruby/ruby-shadow )
- sqlite? ( dev-ruby/sqlite3 )
- virtual/ruby-ssl
- dev-ruby/hocon"
-
-ruby_add_bdepend "
- doc? ( dev-ruby/yard )
- test? (
- dev-ruby/mocha
- dev-ruby/rack
- dev-ruby/rspec-its
- )"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-# dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
- >=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
- enewgroup puppet
- enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
- # Avoid spec that require unpackaged json-schema.
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
- # can't be run within portage.
- epatch "${FILESDIR}/puppet-fix-tests-6.0.0.patch"
-
- # fix systemd path
- epatch "${FILESDIR}/puppet-systemd.patch"
-
- # Avoid specs that can only run in the puppet.git repository. This
- # should be narrowed down to the specific specs.
- rm spec/integration/parser/compiler_spec.rb || die
-
- # Avoid failing spec that need further investigation.
- rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
- each_fakegem_install
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- # systemd stuffs
- insinto /usr/lib/systemd/system
- doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
- # tmpfiles stuff
- insinto /usr/lib/tmpfiles.d
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
- # openrc init stuff
- newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
- keepdir /etc/puppetlabs/puppet/ssl
-
- keepdir /var/lib/puppet/facts
- keepdir /var/lib/puppet/files
- fowners -R puppet:puppet /var/lib/puppet
-
- fperms 0750 /var/lib/puppet
-
- fperms 0750 /etc/puppetlabs
- fperms 0750 /etc/puppetlabs/puppet
- fperms 0750 /etc/puppetlabs/puppet/ssl
- fowners -R :puppet /etc/puppetlabs
- fowners -R :puppet /var/lib/puppet
-
- if use ldap ; then
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
- fi
-
- # ext and examples files
- for f in $(find ext examples -type f) ; do
- docinto "$(dirname ${f})"; dodoc "${f}"
- done
-}
-
-pkg_postinst() {
- elog
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
- elog "cause puppet to hang while installing packages."
- elog
- elog "Portage Puppet module with Gentoo-specific resources:"
- elog "http://forge.puppetlabs.com/gentoo/portage"
- elog
- elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
- elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
- elog "not already done so."
- elog
-}
diff --git a/app-admin/puppet/puppet-6.2.0.ebuild b/app-admin/puppet/puppet-6.4.1.ebuild
index 87692a87fff7..5b0b1f7286f2 100644
--- a/app-admin/puppet/puppet-6.2.0.ebuild
+++ b/app-admin/puppet/puppet-6.4.1.ebuild
@@ -67,7 +67,7 @@ all_ruby_prepare() {
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
# can't be run within portage.
- epatch "${FILESDIR}/puppet-fix-tests-6.0.0.patch"
+ epatch "${FILESDIR}/puppet-fix-tests-6.4.1.patch"
# fix systemd path
epatch "${FILESDIR}/puppet-systemd.patch"
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 898ff18eeb81..36a917c97b60 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -3,7 +3,9 @@ AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0
DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059
DIST puppetdb-5.2.7.tar.gz 24353701 BLAKE2B 196b336a92031a25f7f28ca070a831857f3e0dde3ecc02e12e6884f3628c12dcc27b347c39147636addc975841f340fbf89196e86b3c10efc2ad1f16cf6f882a SHA512 989fa232d0fbd90c975fe110caca9b9c92a90167eb7b8d0384282dd8cf85111a56174c6785d7c73800e19185e879e258b8e6cefb210c1c44a229ce994336ef1d
DIST puppetdb-6.2.0.tar.gz 39922402 BLAKE2B 5d3c36bdeb902c7292d8da728ce225e3378bcb1283dbb2558f7aaa488e53351da41551606723d6c504118f5a653d92831cb55e0570dd7827c1be06f78592e0ef SHA512 33da6a7db688561d01302918cc0e85ff88f5490ac4007e4f20df6b0483aa1a7f65b2226f98966936333c7fa28060adca47f10ba7419a05d70c9c72bd8a40e8e5
+DIST puppetdb-6.3.1.tar.gz 41706703 BLAKE2B 74c1fc8a4702cdd94dab88d3e3bbf9e078d9c6e574454f49f2659bf8a9882ab51fd65392726834c032cb8e14881a349148a43ff05d6b186a1ece868be2fee2d4 SHA512 96ab60f0b0f531b1831ab3707b4c8496cea8fc921cd42fd828a1c86ed0e1d1324f1bec3df5345d0b5a0f737bfa638459941f1f6a9c41f95b745035249ebb01d3
EBUILD puppetdb-5.2.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
EBUILD puppetdb-5.2.7.ebuild 2762 BLAKE2B a0a831a2d5fc57e047d2e02f3b186e07b16b4a2397c91f2d5420ff7664eeb7be1d3ad8dc68bf5577b1c43555c1e52bee45a3ec5179cd41f8475ed2d08856054d SHA512 3b7560b937e8888412fbbc44d891e587af7aaf27e2802534788dd248697aeac422e0be1348ef6896a09c8c60de9d48dc61ef067a61ec561f41ee9f8e6274e3ab
EBUILD puppetdb-6.2.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
+EBUILD puppetdb-6.3.1.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.3.1.ebuild b/app-admin/puppetdb/puppetdb-6.3.1.ebuild
new file mode 100644
index 000000000000..616793cb4123
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-6.3.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+=""
+
+pkg_setup() {
+ enewgroup puppetdb
+ enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+ sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+ sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+ sed -i 's/sysconfig/conf\.d/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+ sed -i 's/var\/run/run/g' install.sh || die
+ default
+}
+
+src_compile() {
+ einfo "not compiling"
+}
+
+src_install() {
+ dodir /opt/puppetlabs/server/data/puppetdb
+ insinto /opt/puppetlabs/server/apps/puppetdb
+ insopts -m0744
+ doins ext/ezbake-functions.sh
+ insopts -m0644
+ doins ext/ezbake.manifest
+ doins puppetdb.jar
+ insinto /etc/puppetlabs/puppetdb
+ doins ext/config/logback.xml
+ doins ext/config/bootstrap.cfg
+ doins ext/config/request-logging.xml
+ insinto /etc/puppetlabs/puppetdb/conf.d
+ doins ext/config/conf.d/jetty.ini
+ doins ext/config/conf.d/repl.ini
+ doins ext/config/conf.d/database.ini
+ doins ext/config/conf.d/config.ini
+ insopts -m0755
+ insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+ doins install.sh
+ insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+ doins ext/cli/foreground
+ doins ext/cli/ssl-setup
+ doins ext/cli/config-migration
+ doins ext/cli/foreground
+ doins ext/cli/anonymize
+ doins ext/cli/reload
+ doins ext/cli/start
+ doins ext/cli/stop
+ insinto /opt/puppetlabs/server/apps/puppetdb/bin
+ doins ext/bin/puppetdb
+ insopts -m0644
+ dodir /opt/puppetlabs/server/bin
+ dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+ dodir /opt/puppetlabs/bin
+ dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+ dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+ # init type tasks
+ newconfd ext/default puppetdb
+ systemd_dounit ext/redhat/puppetdb.service
+ systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+ newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+ # misc
+ insinto /etc/logrotate.d
+ newins ext/puppetdb.logrotate.conf puppetdb
+ fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+ fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+ elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+ elog
+ elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 70c547cca032..0efc668eea5a 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,10 +1,10 @@
AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c
DIST puppetserver-5.3.7.tar.gz 53517572 BLAKE2B e423169b92a1638b0fef1ee5adbd10899917d89eeaa9b3bea689ce9d6f4d3e3b9d5c6cfdddea897014493373429ebba375c1a9d7b77284de46f5a0a5d6555dbd SHA512 8a58d89dc44aa8ebf82f06bdfc4f52c7a25ae3f1a48ca516425a57180c73618a1e850a595aa0e46d6e3a0b360ea38d3f050790304689bfa3b47bb0c1a4fad17b
-DIST puppetserver-6.2.0.tar.gz 75582622 BLAKE2B 09c651c89e7440f3c79db8ddc98fef3844a80424291cb80cd031a7a9e26faf02b5d42d4ac1ccc6c88afa062f2a23ff393c0868f0fd0af19c7061af7a811c8b3c SHA512 865b605deeb5064e51a1414f735a034cf7a0694cf74fa7d657c5da6c3da2a3b6159f251f2a71a2f956a7abfe5bb0fb6a33fe3ff43c7c9b4e743100d2edd63ed3
DIST puppetserver-6.2.1.tar.gz 75683557 BLAKE2B 7320d7abdc9d5c59953f41773c7f52946fe7944c5f0f4a816b599d75a324d0a49a7b59dc990df5875ed849a2e6d1aca9258b65947446f7780f700fe48ec06e74 SHA512 ad8cd8441ac76c0443f0fca14999a014c5511d930b96e9721ff9c236ffb48cb3273e0abb2e615fa3210c539173d472c4080466bc391a863c2c4fadb32d26868c
+DIST puppetserver-6.3.0.tar.gz 75698674 BLAKE2B 4eb88b15c936f8a66c5447e5761cc35772632420ca74de17f06453c9645f6f4d6483ec6a850810401efddf07f40710bd9563e78f5f870faaa85c0c6b2e450fa1 SHA512 a3c3e9c00e3dae274a2139a166c121d1d9b1dde8ad640e70d68433eee53a9bcf7ad8ba53d6e355ee1de93a522f8e0169eb80f52fc438ce6a76ebcd007398108b
EBUILD puppetserver-5.3.5-r1.ebuild 4894 BLAKE2B 23e8e5a9b5d544c5107e8c56b5fffe727a06883dfcd13cf55f519e70a77798424a217970c4c38c1c703466a2ac16fe0032b9ccb7e377db5c40bdebba238caa53 SHA512 f43549918d1bfe8a9ffd444bd9816e91cde25b4939432949f28e4be5bf7081175bf524cbb66e9c9aa177b9da1844cb58155b1340b301c282a721db036cb83443
EBUILD puppetserver-5.3.7.ebuild 4893 BLAKE2B 802069d0b2e2f414ed43eade2f993c708c9769ea25bbfeb7a49ed40e6690039a10f3014f07292b3a95eb42b05597aaea385e386d986fefac2b42eb3de6b7f4c5 SHA512 77a1f8e429a109e1347e47ba13198b7bcea17ec6564e84d1bbd4bafe1652b74507b3086d0ccd47da4fa04dbbaa177c67d2a8a0fc1043938948a4b50598c74339
-EBUILD puppetserver-6.2.0.ebuild 5354 BLAKE2B c75b4c97ebd41fadf589e7ef752291425935af7d1f1528401f7dd1b2b670cc865570b8a610f1901eba1037bdaebb2d8dd2998380e001c046bcf54fe35b02153a SHA512 613533ffbcc1925f2ff040880d82f2a20c231d66697a49d6fc5fbf5a17528d3b3d1285918b83bf8ef4b4ee729656be610bb30f0bbefa827376f57da1fbd34950
EBUILD puppetserver-6.2.1.ebuild 5354 BLAKE2B c75b4c97ebd41fadf589e7ef752291425935af7d1f1528401f7dd1b2b670cc865570b8a610f1901eba1037bdaebb2d8dd2998380e001c046bcf54fe35b02153a SHA512 613533ffbcc1925f2ff040880d82f2a20c231d66697a49d6fc5fbf5a17528d3b3d1285918b83bf8ef4b4ee729656be610bb30f0bbefa827376f57da1fbd34950
+EBUILD puppetserver-6.3.0.ebuild 5356 BLAKE2B 4ef4f776eaebfc8e127a2233321fd5377e103be0454cab7752be03c69f835f4dc80c87c9a51cfb6c2f229ddfbd034ab284bf8b362c0fe5ee4e1cdc7038ca512c SHA512 0c5c622cebbea427f97b8feb82b615c17d730747de09448aae1d083e078e428f3a97723664bda0c1abcc0b83a43f3270903ce028ffa85327042c7949bea31c6f
MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.2.0.ebuild b/app-admin/puppetserver/puppetserver-6.3.0.ebuild
index 39165a39524b..04fc3966a1c0 100644
--- a/app-admin/puppetserver/puppetserver-6.2.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.3.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
RDEPEND+="
>=virtual/jdk-1.8.0
diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index f4161c669e8b..fb55e75bb42c 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1,3 +1,5 @@
+DIST pwman3-0.10.0.tar.gz 75726 BLAKE2B ba7331bd3d36ac23d9151a5ebd4a343e2d8c523ba8b324850139a9ba4af8404ddf23380b3eaef523251e8f4137c5c56b6ab509c3927690fc612962ff872ea820 SHA512 a6dc24b2e1405a91f35a9a9155dde5409e35ce733bacee8858930d82443c09b8017e2701bc8c45688483b6c40554e4d6266f6cd21dc6f205b13f96e7de4f57c2
DIST pwman3-0.9.11.tar.gz 74364 BLAKE2B 9544b692e8853b7fb8e1b4d51093e72e04f8d82888a9278c94aaa27716026b348bb16f0fa9c52af2144395a4ffb242c8a48fc34252890e68477d2e3a70ea4a88 SHA512 2aa5a7b4d810d1bbc6aea34b728f89190570cbfbedc33f45cc1aa4d737ebbb9e993d2d372b44f956d5cdbc07f911f289fd77d7df167100e820455650f5b3e46a
-EBUILD pwman3-0.9.11.ebuild 882 BLAKE2B d9dbd1a6de8f54d54ac52d5af787b2c98251a113b957148ba2e25311a6764be5ad3a511749b7a8dec8ac5cb8c8f28b48d592ac421fbc775540acc983b4310941 SHA512 510655ff7534ef91deacd980c652ede817f695f5e4f7e8f0ecccd2970c700dbf073169561de6e8c44eaee74e4ddceeee545a71e97d0536b83707421ca44fad51
+EBUILD pwman3-0.10.0.ebuild 874 BLAKE2B 80cf90e2f46a226b6653689cec11f7bbc4668e2f6008402f3a249b3668be6e95c39a6de61db5279cc2a58b817909144adcfa22dced0b813bc8a29a5a35d3deba SHA512 6c8b3630c516846c5afff59853648411d9ca803d9764def00d70634a52d96c13ac7660eca4e93db691f6fbbba03a7829fbff534507632c02aec5d1790dac3d0a
+EBUILD pwman3-0.9.11.ebuild 879 BLAKE2B 867ec65bc9f56ca844eb0a21032173d85efc3b071f758f2e1521c4bd1e79fe2e5eed403ce6b1f0eb162dee1c3fcb6a7c38cb018ff441095de64cab7cc234e71b SHA512 77f6003c82a7af472e9bdde200b84af581ceed5eae6d6a666d277c6f4a73b670b19995e4a85f956754b5d8bf62138561685f1a3eb707856a5f671bfed5d37811
MISC metadata.xml 966 BLAKE2B a024e2324e8a57f790d36a0091050510babb8241de2112546f9d760e3d5495a910d6baf91caf447acdacb4d464934248db3dc3e4ac1188e56ab82635a3246679 SHA512 f82ac9dd866b16f6583266bb2b748f713389e517eb51229481e902d2a232e4715146c5d8aeb7d572fea10f13f15cf700910f7c04231cf662859f1aa258c7bdcc
diff --git a/app-admin/pwman3/pwman3-0.10.0.ebuild b/app-admin/pwman3/pwman3-0.10.0.ebuild
new file mode 100644
index 000000000000..c63d60465f40
--- /dev/null
+++ b/app-admin/pwman3/pwman3-0.10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_REQ_USE="sqlite?"
+inherit distutils-r1
+
+DESCRIPTION="A lightweight password-manager with multiple database backends"
+HOMEPAGE="https://pwman3.github.io"
+SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="mongodb mysql postgres +sqlite test"
+
+CDEPEND="
+ >=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+ >=dev-python/colorama-0.3.0[${PYTHON_USEDEP}]
+ "
+
+DEPEND="
+ ${CDEPEND}
+ test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
+ "
+
+RDEPEND="
+ ${CDEPEND}
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/pymysql[${PYTHON_USEDEP}] )
+ postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+ "
+
+python_test() {
+ esetup.py test
+}
diff --git a/app-admin/pwman3/pwman3-0.9.11.ebuild b/app-admin/pwman3/pwman3-0.9.11.ebuild
index 5c508edb053c..ba9a62305684 100644
--- a/app-admin/pwman3/pwman3-0.9.11.ebuild
+++ b/app-admin/pwman3/pwman3-0.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/app-admin/pydf/Manifest b/app-admin/pydf/Manifest
index 232820ea5097..a7f7483b2cfb 100644
--- a/app-admin/pydf/Manifest
+++ b/app-admin/pydf/Manifest
@@ -1,3 +1,3 @@
DIST pydf_12.tar.gz 14207 BLAKE2B 9bd972529c38380b474fbbd82069e880d950cb5b9ef659f82cfb19417447abd16ecb049e0f6df3354e39c404b06dd7546296289633a4d77b61c41a5378a301f5 SHA512 5a5819b83fe2425cb951a139b38b1b639d17e1d17c4e3e4a80fc4eb6d5632c42b03a2767e1864c8bee13dbd72ebb91ec79fefde1ba448e2af9fc4a314821a3d0
-EBUILD pydf-12-r1.ebuild 792 BLAKE2B cd3013d3331d70e5dee739cc02b5dcf96a41bc56acc7dc3f85fc78eadb8073cc13d6961ef521a92984982ae7a8968ce7fd7b68315b7fd6c2ab76ea92520ba2a9 SHA512 313a19860ce36df2d4aeafec6e62b13764656f740ac2f8bd94cc21726a2878349b9e4597ee827888de8fb1f37d1bbdca2bbd38a55fbf732afdac4f3dccc3cd81
+EBUILD pydf-12-r1.ebuild 785 BLAKE2B e459c4cc6fe88144381e310cd38eb5ff3c0441d85b777d00664a46bb4970d105faf58e869c565c1764cc33bc5f388a183741500a3b2f2cb7d74652d3b6b11f83 SHA512 4c67c98a942c15dc76ce85ba678074d51fd67d9f371a9511d5ee8a77dcf1bf8863ec0062eb609396d9a1eea12b0d8e98619e157a39005dc3a482015d380607f0
MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/app-admin/pydf/pydf-12-r1.ebuild b/app-admin/pydf/pydf-12-r1.ebuild
index 8dd3d13d971e..dbb33e79b0c0 100644
--- a/app-admin/pydf/pydf-12-r1.ebuild
+++ b/app-admin/pydf/pydf-12-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
inherit python-r1
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 2d7c189f3963..201a849b4eeb 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,5 +1,8 @@
AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
+AUX rsyslog-8.1903.0-add-missing-tests.patch 17584 BLAKE2B 7c2c67d50d10d228e7378a58e7a2df3fae2447202e11001f20d486aec576ac3b3079003ea8ad12078f90d4af1953ee4082e9e1f26ce8b7381a818bd4d31051ec SHA512 ff195e7447d565f9ef7cf8a8a2c731ab178639f4e15810e638c4a916417639cf054840d760967d91de068f23d9edf25cde38af21f27a0ba08e206f3395720e9f
+AUX rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch 3199 BLAKE2B e415e5fbbe62b8fc8ffd67bffe75402e472207559e9e4a58e4087f2844325cd6ff4ac07f00c7db99a2a1071342b89a936782484cfa4a98109a98d0498cb0a208 SHA512 874531950df2d754535f37f8b1c81fd584ceab9e80483011fd7aa3e04e04110b3f751ff534c425ef1017a78e72f2845bf8cae7da5cec204ad0df61462b272d42
+AUX rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch 677 BLAKE2B b90627a0d9affb8afe18ef9fb4377c791796c4f345fd8d5226544e3488661908d25651339377aaa5ff2c876e9090133ea7109d44772d9d6b0209861f0732a12e SHA512 dbd032c42edc5a1a9c67d806298ad3230dff9c13d209f014b45c78675f62cec613ca1989f3f73da40faf8a1990453a4b32433db14566f6b99048caf4dc2d6499
AUX rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch 3181 BLAKE2B 13b155367c6b7fed4f82505a884ed23e32223567e5086cb91f733d20c43aa101bbeb169f36f34ed0dff8815687cc5dfe942ec248024aa29a0a07c1eb3ca3e0f4 SHA512 dfc980492bdd3fb7fafedbbde4e79e61d7fb78665f8f0654a877de4f2f4fa93ce2d23051617f90d9712ef795d8164e1d610321b0dd27164d0cb425c8f1a77720
AUX rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch 12038 BLAKE2B 4fe26dc0d8e60e2b37272aa0743fadf8d3ceef6937028d8990b84c936efc289948f2c98312c14296c3b5d43966982edfee9bbc53b17df22487fd2711147e2a1a SHA512 580b65c1eb4d551d48203720e9621d7b1371145bdc3c6e8c0d638c686038cb43d436e42ccc5b4223e2b16db040eabcecbd71288f99c90698636d6b6be1517308
AUX rsyslog-8.40.0-fix-omusrmsg.patch 455 BLAKE2B 6933dccfbd3eeed4ed00f08d9bc748428e705c3caad04e783664cc46103f0e4b40d96ac9e82f93e9083484c4bc58a683c52d46f6ce6ec74f0d12a58331f77920 SHA512 7164572c35fe28aab9767291456fb403b0e9d047c64df8c6a5a11c62a06269a4d2450d531dc0dfdc184f0ebda61ba4589c1d719d801633c2903a349bddae21da
@@ -8,15 +11,21 @@ AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d
AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
DIST rsyslog-8.1901.0.tar.gz 2750872 BLAKE2B 8bc07bd0c73cf309b5fb853e3bc66e555dee4284d0c8ede5b73420db7b42758f5fcfbc7ca90b618cc27e7067795f2725f5ed96f59170f3d2690a0653f2b69847 SHA512 2b8b2d40d3df4c47dba765d70fc716dc127ce776b31f217f78a3e1c2bf820e41799a5069d7f41f04ce39baead286ecd42fb353492873e3795aff704d686d67cb
+DIST rsyslog-8.1903.0.tar.gz 2786605 BLAKE2B 2c60450b5f5a54f3d4fe4f9f51c81145cdebb1b0e1dd4b76f2ad23803c8bb417affbdcc9b4a0d8ccb65b0e98f5cb5cf187ce219be3e44e44c5bd253cae5f95dc SHA512 0f698c264a4afba56467b341c094be7357fba08a6ee7a24bb1b053c06da04e83eb1832ee46b68ea21f8f4de841cd97aaadc46e78bb4adfe23604c9fe95103fa9
+DIST rsyslog-8.1904.0.tar.gz 2902708 BLAKE2B 515d5e32c2dc6cdd8dd51fc595ad775503438603f28828e9f1a427b184a5a61de32af2ee90334b7d56a9404106d74da47386a18a370278d5a16422a6bb09f556 SHA512 cccb48f06508d7e7c2dd788903f4d7ddb3020cdf6079aea1d52387c56b920f10b08957a79b5d420ccdb54cae50d1da6e5eb80cde9498bceaeda4f6ce37f694fd
DIST rsyslog-8.38.0.tar.gz 2721798 BLAKE2B 578bc9eefce4893a9c1eb54ee7360cd9fa51b3c87ffe07a0fd5b122987f991835f603417243084de0b59286e993ad1c84237e61c44bc18457b3660668421101b SHA512 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254
DIST rsyslog-8.39.0.tar.gz 2721560 BLAKE2B 0680cb31d0a07e5676a5c5626e46fa174b8df08ceec49b514624ff8ffeb750bbf199f73af1d89b9dfad121a292084d75b0a1218fb33138f1d7a149fd730cb3d9 SHA512 f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479
DIST rsyslog-8.40.0.tar.gz 2726022 BLAKE2B 33f7f2018200a20b01dbfabeeab592aa09d530edd313bb13f16c47cf3f67aebd9c465af3f1e468ca3d352cd83e4f4eee567c6fd54bbaee1723bee56f4631b440 SHA512 3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd
DIST rsyslog-doc-8.1901.0.tar.gz 7768575 BLAKE2B 40bc8b038fd0210d0cac01704624d87c2a73701a7494e5970423adf14948e46d1cff6df5894a82e6664d891d0c2760a5a0154bc42fb410ecf6dd25f3166e17b8 SHA512 afcc592ce4bf0dbe048786627d87b783f1c99e7711c44ffcc41cde67b2b2fef55c944b5c90e7272a84bbec95b78c0174df634b02baad2ac5819b3611efc1cb98
+DIST rsyslog-doc-8.1903.0.tar.gz 7816457 BLAKE2B 0628a5e7f0a2c8229470f6b05c22fa0d01de12eace4f895e17a47e7003bf078be5f3b2df15cd13a4cf53384d285b558b0936308cb58e7c7e71796ca99447da3e SHA512 b42f950499798fd2bbf9e2ac2da074781955cc552628edcd928f25943b6b80d5f2e1a2eab3b8fb0fa2f6278f2b4366f096c3e976a91223e545b4306479ca4f5d
+DIST rsyslog-doc-8.1904.0.tar.gz 8042650 BLAKE2B 585fe5c63eee1fb46f94dcd3d529045b3900e08c291e0e71ed9bf32a6200e6c7283820b262bd56e9aeb74cc227ecd518caafec5a8f87c1d8523d5d7fd95030aa SHA512 da0ff00fbe71756b3c27fd8b94e88611452c3ba611e583862556393faaaa596ca8f32f694ad40a3e1df67385d9f9ca80db6a58f5d2e336fe95639dd7cd0de828
DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b543389107d146ddb148ecd2702bb208d21a7f4d77f2fd958f2a56e092341fc6a24ed1cc80a910cb1adb54c65b5b2da04 SHA512 e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5
DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd17aa517c2fc875c46ac190428db6aa2a0f81f8aaed6e5b0b6991a5c13f45bc818be76c0fe4444c0eb45628ebf48b4956 SHA512 a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de
DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f
-EBUILD rsyslog-8.1901.0.ebuild 12425 BLAKE2B 25fe698ba545032ec0c9c75b0ada6c7008b26e1899aa653cae923a66cd1763736b2e773f2f414f3ec1dd097cc187a8179caaffa0cf171aa7b6faed3f619a5534 SHA512 814e3dbfa4d3422370f7bdac9e6f2bf9cfeefac2f302d27517be6b44b6fdd0d6974deef3f888222d63706bb8982a0633f7e99e2eaba0f5ccf87e94389a8471bc
-EBUILD rsyslog-8.38.0-r2.ebuild 12351 BLAKE2B 61f501e1ee0370308f0bda0ef8dacdf51ddedf38854fbe5ae20824f4880956e0fa953404134f251fba05edce3e13fc235a77f85696d567a5ebeccc133ae4a0e1 SHA512 ca3a5ba39f12a3e65c6b8b37bdebcaf8b816a2da1b4b59a2fe6aa7b4ecfb58b8d286ef371ee220209754a936ecb6fd8c9bc91762ebdb3aac9af2ada7c8edc4af
-EBUILD rsyslog-8.39.0-r1.ebuild 12427 BLAKE2B edb9228220f76b252fac4af418d45942b3bd632d9b70536c1c45ae5c85f9d6b9f93d4af534ed8e1ec9055d4d8d63e4e623e5a075409ffe7e03103c931233547e SHA512 ee07560398ee1c08e5c78910f1f12ada99da30dfa48d0bf4728987ec401dd2f0df6c251bb9e8bc0215471728f569175b180191c97b7d0f604ed1ece36e60d8bf
-EBUILD rsyslog-8.40.0-r1.ebuild 12407 BLAKE2B fb4b459cd731ccdce9ac784cb11a618c19a0bba94711d079e1ec9d846f459949603b2c93d74dd316a72a10e00ffea64dd5ceee216ed29c2f826d30e02909e9dc SHA512 22b89e3194f4bc2419f9aafbdaf1aea548747c80790b33feddcde09f06721538e41aaa3bf7c9b190841ebe780d82b48783dad467b40b05edf56d4d05675492aa
+EBUILD rsyslog-8.1901.0.ebuild 12421 BLAKE2B 6471892b10047479030a9847b12913e1d221dd101a715073ced6e174dd6068802bdd43f9ac8591e2329497fc9b2161f47b73599fd26ed1f2e68bc05ce07051f1 SHA512 d50d564268dfc5da2b6cd2d9470263809fe7a24fcea5c267e1874cd9aec1face83a2ea74e5d3fb2db84b9a9f9dd78b7a9f3f5caf2acc1f34f53b3858139bdfcf
+EBUILD rsyslog-8.1903.0.ebuild 12597 BLAKE2B e6364510c324afbb669d3d18bc66c424df2f76f5130d57dccfe908d89d5964656c9442a80fd8e3e1f478f3e9ffe528e29b7a89a44997757f12d104b652a24217 SHA512 ff16046287166c33452930a187c700f43f3fccdd626d017b14f8abf2da0204b2a3948c8d66b13ddaf47d314ac00aceb58cccde036634d19c4872f5624536fcae
+EBUILD rsyslog-8.1904.0.ebuild 12637 BLAKE2B 1d672fdaf283a4e1075c8f808e66e5de7f1683b75b56b1a69d62c3612432ad70d3f0eabd5b8dfd2eee3ec039c2e9343c16da28cc0d01019398ce05ebc6534637 SHA512 8e178e705cccdfcaad23633c74f4cc096516f12b8c128e4f85a16568b2254b69d38b7fa13ecd110d4d8cb8b83c5c1b27cb6c460592f9315f351a16f2e353156e
+EBUILD rsyslog-8.38.0-r2.ebuild 12347 BLAKE2B 9bc6a630bc12aa5f845b9d670262da7294fc7ac63ec29f4103a8b6fff0381a1d5f6f6dcf5e9c8a507941b11319b237a305698959f0a4f3d9411751352b443d51 SHA512 6f8c55fdb321a645528ca20e4a73fae9c4bb4593c10a45a115a8d2cc4f2e0ab295d5e596b6a4533571d3bca56f82cc278dacfb3e1a491c7a7ff6243dcd869a63
+EBUILD rsyslog-8.39.0-r1.ebuild 12423 BLAKE2B 11ee03f97ee8d3645be49cad381f441e2b57341a8d27e6af59d5c3233acedc1835b9ddfe2d1879e20e0565951ff5aeb60b8f52848a5de422f58e37219c0aa5f2 SHA512 beeb8b579c68c2f2684bc9d0d004998ea056868a280b6921dce969001b8cb48ea4aaa8945e13972605ae30ec7a9051c931441580190a569f83be8e63aec305de
+EBUILD rsyslog-8.40.0-r1.ebuild 12403 BLAKE2B d8e8b83bf59dcd2c6c23fd13cef0487def056c703d84b845eeb17ed2016a474a570c647b4dc4d5295c56228ae2e02279e0c7b062708a3e409d1cf9790f09be57 SHA512 f3d1d9107d5c756034ab70294404dbddb0534b5168471bb9401085c05582cd5d58c933a053c875318a3d54fa9ab8cd9e8a52c42bfbc3ac845c6f29d423b5f4da
MISC metadata.xml 3967 BLAKE2B 1d88f39cd9c9f88b19d2b029afd3b3f80aa40b76661936f8981d2929136d918fc3f89c91d58b5aee4bdb97e648d7b2d24852f899badc576a5f5fa01b4246f79b SHA512 8a4a1e46d5aa71ef24a7dcece46d0902ba69abbd616a1c55d5a8709f64beea1fc1b0a2d12ebe5292f6f0a0b0199925ae64b321fae291c83cec43f346f90a019d
diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch
new file mode 100644
index 000000000000..da9c79c68293
--- /dev/null
+++ b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch
@@ -0,0 +1,736 @@
+--- /dev/null
++++ b/tests/omhttp-auth-vg.sh
+@@ -0,0 +1,3 @@
++#!/bin/bash
++export USE_VALGRIND="YES"
++source ${srcdir:=.}/omhttp-auth.sh
+--- /dev/null
++++ b/tests/omhttp-auth.sh
+@@ -0,0 +1,45 @@
++#!/bin/bash
++# This file is part of the rsyslog project, released under ASL 2.0
++
++# Starting actual testbench
++. ${srcdir:=.}/diag.sh init
++
++export NUMMESSAGES=100
++
++port="$(get_free_port)"
++omhttp_start_server $port --userpwd="bob:bobbackwards"
++
++generate_conf
++add_conf '
++template(name="tpl" type="string"
++ string="{\"msgnum\":\"%msg:F,58:2%\"}")
++
++module(load="../contrib/omhttp/.libs/omhttp")
++
++if $msg contains "msgnum:" then
++ action(
++ # Payload
++ name="my_http_action"
++ type="omhttp"
++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
++ template="tpl"
++
++ server="localhost"
++ serverport="'$port'"
++ restpath="my/endpoint"
++ batch="off"
++
++ # Auth
++ usehttps="off"
++ uid="bob"
++ pwd="bobbackwards"
++ )
++'
++startup
++injectmsg
++shutdown_when_empty
++wait_shutdown
++omhttp_get_data $port my/endpoint
++omhttp_stop_server
++seq_check
++exit_test
+--- /dev/null
++++ b/tests/omhttp-basic-vg.sh
+@@ -0,0 +1,3 @@
++#!/bin/bash
++export USE_VALGRIND="YES"
++source ${srcdir:=.}/omhttp-basic.sh
+--- /dev/null
++++ b/tests/omhttp-basic.sh
+@@ -0,0 +1,43 @@
++#!/bin/bash
++# This file is part of the rsyslog project, released under ASL 2.0
++
++# Starting actual testbench
++. ${srcdir:=.}/diag.sh init
++
++export NUMMESSAGES=10000
++
++port="$(get_free_port)"
++omhttp_start_server $port
++
++generate_conf
++add_conf '
++template(name="tpl" type="string"
++ string="{\"msgnum\":\"%msg:F,58:2%\"}")
++
++module(load="../contrib/omhttp/.libs/omhttp")
++
++if $msg contains "msgnum:" then
++ action(
++ # Payload
++ name="my_http_action"
++ type="omhttp"
++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
++ template="tpl"
++
++ server="localhost"
++ serverport="'$port'"
++ restpath="my/endpoint"
++ batch="off"
++
++ # Auth
++ usehttps="off"
++ )
++'
++startup
++injectmsg
++shutdown_when_empty
++wait_shutdown
++omhttp_get_data $port my/endpoint
++omhttp_stop_server
++seq_check
++exit_test
+--- /dev/null
++++ b/tests/omhttp-batch-fail-with-400.sh
+@@ -0,0 +1,52 @@
++#!/bin/bash
++# This file is part of the rsyslog project, released under ASL 2.0
++
++# Starting actual testbench
++. ${srcdir:=.}/diag.sh init
++
++port="$(get_free_port)"
++omhttp_start_server $port --fail-with-400-after 1000
++
++generate_conf
++add_conf '
++module(load="../contrib/omhttp/.libs/omhttp")
++
++main_queue(queue.dequeueBatchSize="2048")
++
++template(name="tpl" type="string"
++ string="{\"msgnum\":\"%msg:F,58:2%\"}")
++
++# Wrap message as a single batch for retry
++template(name="tpl_retry" type="string" string="[%msg%]")
++
++
++ruleset(name="ruleset_omhttp") {
++ action(
++ name="action_omhttp"
++ type="omhttp"
++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
++ template="tpl"
++
++ server="localhost"
++ serverport="'$port'"
++ restpath="my/endpoint"
++ batch="off"
++
++ retry="on"
++
++ # Auth
++ usehttps="off"
++ ) & stop
++}
++
++if $msg contains "msgnum:" then
++ call ruleset_omhttp
++'
++startup
++injectmsg 0 10000
++shutdown_when_empty
++wait_shutdown
++omhttp_get_data $port my/endpoint
++omhttp_stop_server
++seq_check 0 999
++exit_test
+--- /dev/null
++++ b/tests/omhttp-batch-jsonarray-compress-vg.sh
+@@ -0,0 +1,3 @@
++#!/bin/bash
++export USE_VALGRIND="YES"
++source ${srcdir:=.}/omhttp-batch-jsonarray-compress.sh
+--- /dev/null
++++ b/tests/omhttp-batch-jsonarray-compress.sh
+@@ -0,0 +1,48 @@
++#!/bin/bash
++# This file is part of the rsyslog project, released under ASL 2.0
++
++# Starting actual testbench
++. ${srcdir:=.}/diag.sh init
++
++export NUMMESSAGES=50000
++
++port="$(get_free_port)"
++omhttp_start_server $port --decompress
++
++generate_conf
++add_conf '
++template(name="tpl" type="string"
++ string="{\"msgnum\":\"%msg:F,58:2%\"}")
++
++module(load="../contrib/omhttp/.libs/omhttp")
++
++main_queue(queue.dequeueBatchSize="2048")
++
++if $msg contains "msgnum:" then
++ action(
++ # Payload
++ name="my_http_action"
++ type="omhttp"
++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
++ template="tpl"
++
++ server="localhost"
++ serverport="'$port'"
++ restpath="my/endpoint"
++ batch="on"
++ batch.format="jsonarray"
++ batch.maxsize="1000"
++ compress="on"
++
++ # Auth
++ usehttps="off"
++ )
++'
++startup
++injectmsg
++shutdown_when_empty
++wait_shutdown
++omhttp_get_data $port my/endpoint jsonarray
++omhttp_stop_server
++seq_check
++exit_test
+--- /dev/null
++++ b/tests/omhttp-batch-jsonarray-retry-vg.sh
+@@ -0,0 +1,3 @@
++#!/bin/bash
++export USE_VALGRIND="YES"
++source ${srcdir:=.}/omhttp-batch-jsonarray-retry.sh
+--- /dev/null
++++ b/tests/omhttp-batch-jsonarray-retry.sh
+@@ -0,0 +1,78 @@
++#!/bin/bash
++# This file is part of the rsyslog project, released under ASL 2.0
++
++# Starting actual testbench
++. ${srcdir:=.}/diag.sh init
++
++export NUMMESSAGES=50000
++
++port="$(get_free_port)"
++omhttp_start_server $port --fail-every 100
++
++generate_conf
++add_conf '
++module(load="../contrib/omhttp/.libs/omhttp")
++
++main_queue(queue.dequeueBatchSize="2048")
++
++template(name="tpl" type="string"
++ string="{\"msgnum\":\"%msg:F,58:2%\"}")
++
++# Echo message as-is for retry
++template(name="tpl_echo" type="string" string="%msg%")
++
++ruleset(name="ruleset_omhttp_retry") {
++ action(
++ name="action_omhttp"
++ type="omhttp"
++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
++ template="tpl_echo"
++
++ server="localhost"
++ serverport="'$port'"
++ restpath="my/endpoint"
++ batch="on"
++ batch.maxsize="100"
++ batch.format="jsonarray"
++
++ retry="on"
++ retry.ruleset="ruleset_omhttp_retry"
++
++ # Auth
++ usehttps="off"
++ ) & stop
++}
++
++ruleset(name="ruleset_omhttp") {
++ action(
++ name="action_omhttp"
++ type="omhttp"
++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
++ template="tpl"
++
++ server="localhost"
++ serverport="'$port'"
++ restpath="my/endpoint"
++ batch="on"
++ batch.maxsize="100"
++ batch.format="jsonarray"
++
++ retry="on"
++ retry.ruleset="ruleset_omhttp_retry"
++
++ # Auth
++ usehttps="off"
++ ) & stop
++}
++
++if $msg contains "msgnum:" then
++ call ruleset_omhttp
++'
++startup
++injectmsg
++shutdown_when_empty
++wait_shutdown
++omhttp_get_data $port my/endpoint jsonarray
++omhttp_stop_server
++seq_check
++exit_test
+--- /dev/null
++++ b/tests/omhttp-batch-jsonarray-vg.sh
+@@ -0,0 +1,3 @@
++#!/bin/bash
++export USE_VALGRIND="YES"
++source ${srcdir:=.}/omhttp-batch-jsonarray.sh
+--- /dev/null
++++ b/tests/omhttp-batch-jsonarray.sh
+@@ -0,0 +1,47 @@
++#!/bin/bash
++# This file is part of the rsyslog project, released under ASL 2.0
++
++# Starting actual testbench
++. ${srcdir:=.}/diag.sh init
++
++export NUMMESSAGES=50000
++
++port="$(get_free_port)"
++omhttp_start_server $port
++
++generate_conf
++add_conf '
++template(name="tpl" type="string"
++ string="{\"msgnum\":\"%msg:F,58:2%\"}")
++
++module(load="../contrib/omhttp/.libs/omhttp")
++
++main_queue(queue.dequeueBatchSize="2048")
++
++if $msg contains "msgnum:" then
++ action(
++ # Payload
++ name="my_http_action"
++ type="omhttp"
++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
++ template="tpl"
++
++ server="localhost"
++ serverport="'$port'"
++ restpath="my/endpoint"
++ batch="on"
++ batch.format="jsonarray"
++ batch.maxsize="1000"
++
++ # Auth
++ usehttps="off"
++ )
++'
++startup
++injectmsg
++shutdown_when_empty
++wait_shutdown
++omhttp_get_data $port my/endpoint jsonarray
++omhttp_stop_server
++seq_check
++exit_test
+--- /dev/null
++++ b/tests/omhttp-batch-kafkarest-retry-vg.sh
+@@ -0,0 +1,3 @@
++#!/bin/bash
++export USE_VALGRIND="YES"
++source ${srcdir:=.}/omhttp-batch-kafkarest-retry.sh
+--- /dev/null
++++ b/tests/omhttp-batch-kafkarest-retry.sh
+@@ -0,0 +1,78 @@
++#!/bin/bash
++# This file is part of the rsyslog project, released under ASL 2.0
++
++# Starting actual testbench
++. ${srcdir:=.}/diag.sh init
++
++export NUMMESSAGES=50000
++
++port="$(get_free_port)"
++omhttp_start_server $port --fail-every 100
++
++generate_conf
++add_conf '
++module(load="../contrib/omhttp/.libs/omhttp")
++
++main_queue(queue.dequeueBatchSize="2048")
++
++template(name="tpl" type="string"
++ string="{\"msgnum\":\"%msg:F,58:2%\"}")
++
++# Echo message as-is for retry
++template(name="tpl_echo" type="string" string="%msg%")
++
++ruleset(name="ruleset_omhttp_retry") {
++ action(
++ name="action_omhttp"
++ type="omhttp"
++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
++ template="tpl_echo"
++
++ server="localhost"
++ serverport="'$port'"
++ restpath="my/endpoint"
++ batch="on"
++ batch.maxsize="100"
++ batch.format="kafkarest"
++
++ retry="on"
++ retry.ruleset="ruleset_omhttp_retry"
++
++ # Auth
++ usehttps="off"
++ ) & stop
++}
++
++ruleset(name="ruleset_omhttp") {
++ action(
++ name="action_omhttp"
++ type="omhttp"
++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
++ template="tpl"
++
++ server="localhost"
++ serverport="'$port'"
++ restpath="my/endpoint"
++ batch="on"
++ batch.maxsize="100"
++ batch.format="kafkarest"
++
++ retry="on"
++ retry.ruleset="ruleset_omhttp_retry"
++
++ # Auth
++ usehttps="off"
++ ) & stop
++}
++
++if $msg contains "msgnum:" then
++ call ruleset_omhttp
++'
++startup
++injectmsg
++shutdown_when_empty
++wait_shutdown
++omhttp_get_data $port my/endpoint kafkarest
++omhttp_stop_server
++seq_check
++exit_test
+--- /dev/null
++++ b/tests/omhttp-batch-kafkarest.sh
+@@ -0,0 +1,47 @@
++#!/bin/bash
++# This file is part of the rsyslog project, released under ASL 2.0
++
++# Starting actual testbench
++. ${srcdir:=.}/diag.sh init
++
++export NUMMESSAGES=50000
++
++port="$(get_free_port)"
++omhttp_start_server $port
++
++generate_conf
++add_conf '
++template(name="tpl" type="string"
++ string="{\"msgnum\":\"%msg:F,58:2%\"}")
++
++module(load="../contrib/omhttp/.libs/omhttp")
++
++main_queue(queue.dequeueBatchSize="2048")
++
++if $msg contains "msgnum:" then
++ action(
++ # Payload
++ name="my_http_action"
++ type="omhttp"
++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
++ template="tpl"
++
++ server="localhost"
++ serverport="'$port'"
++ restpath="my/endpoint"
++ batch="on"
++ batch.format="kafkarest"
++ batch.maxsize="100"
++
++ # Auth
++ usehttps="off"
++ )
++'
++startup
++injectmsg
++shutdown_when_empty
++wait_shutdown
++omhttp_get_data $port my/endpoint kafkarest
++omhttp_stop_server
++seq_check
++exit_test
+--- /dev/null
++++ b/tests/omhttp-batch-newline.sh
+@@ -0,0 +1,47 @@
++#!/bin/bash
++# This file is part of the rsyslog project, released under ASL 2.0
++
++# Starting actual testbench
++. ${srcdir:=.}/diag.sh init
++
++export NUMMESSAGES=50000
++
++port="$(get_free_port)"
++omhttp_start_server $port
++
++generate_conf
++add_conf '
++template(name="tpl" type="string"
++ string="{\"msgnum\":\"%msg:F,58:2%\"}")
++
++module(load="../contrib/omhttp/.libs/omhttp")
++
++main_queue(queue.dequeueBatchSize="2048")
++
++if $msg contains "msgnum:" then
++ action(
++ # Payload
++ name="my_http_action"
++ type="omhttp"
++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
++ template="tpl"
++
++ server="localhost"
++ serverport="'$port'"
++ restpath="my/endpoint"
++ batch="on"
++ batch.format="newline"
++ batch.maxsize="100"
++
++ # Auth
++ usehttps="off"
++ )
++'
++startup
++injectmsg
++shutdown_when_empty
++wait_shutdown
++omhttp_get_data $port my/endpoint newline
++omhttp_stop_server
++seq_check
++exit_test
+--- /dev/null
++++ b/tests/omhttp-retry-vg.sh
+@@ -0,0 +1,3 @@
++#!/bin/bash
++export USE_VALGRIND="YES"
++source ${srcdir:=.}/omhttp-retry.sh
+--- /dev/null
++++ b/tests/omhttp-retry.sh
+@@ -0,0 +1,46 @@
++#!/bin/bash
++# This file is part of the rsyslog project, released under ASL 2.0
++
++# Starting actual testbench
++. ${srcdir:=.}/diag.sh init
++
++export NUMMESSAGES=10000
++
++port="$(get_free_port)"
++omhttp_start_server $port --fail-every 1000
++
++generate_conf
++add_conf '
++module(load="../contrib/omhttp/.libs/omhttp")
++
++main_queue(queue.dequeueBatchSize="2048")
++
++template(name="tpl" type="string"
++ string="{\"msgnum\":\"%msg:F,58:2%\"}")
++
++if $msg contains "msgnum:" then
++ action(
++ # Payload
++ action.resumeRetryCount="-1"
++ name="my_http_action"
++ type="omhttp"
++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
++ template="tpl"
++
++ server="localhost"
++ serverport="'$port'"
++ restpath="my/endpoint"
++ batch="off"
++
++ # Auth
++ usehttps="off"
++ )
++'
++startup
++injectmsg
++shutdown_when_empty
++wait_shutdown
++omhttp_get_data $port my/endpoint
++omhttp_stop_server
++seq_check
++exit_test
+--- /dev/null
++++ b/tests/omhttp_server.py
+@@ -0,0 +1,130 @@
++#!/usr/bin/env python
++
++import argparse
++import json
++import os
++import zlib
++import base64
++
++try:
++ from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer # Python 2
++except ImportError:
++ from http.server import BaseHTTPRequestHandler, HTTPServer # Python 3
++
++# Keep track of data received at each path
++data = {}
++
++metadata = {'posts': 0, 'fail_after': 0, 'fail_every': -1, 'decompress': False, 'userpwd': ''}
++
++
++class MyHandler(BaseHTTPRequestHandler):
++ """
++ POST'd data is kept in the data global dict.
++ Keys are the path, values are the raw received data.
++ Two post requests to <host>:<port>/post/endpoint means data looks like...
++ {"/post/endpoint": ["{\"msgnum\":\"00001\"}", "{\"msgnum\":\"00001\"}"]}
++
++ GET requests return all data posted to that endpoint as a json list.
++ Note that rsyslog usually sends escaped json data, so some parsing may be needed.
++ A get request for <host>:<post>/post/endpoint responds with...
++ ["{\"msgnum\":\"00001\"}", "{\"msgnum\":\"00001\"}"]
++ """
++
++ def validate_auth(self):
++ # header format for basic authentication
++ # 'Authorization: Basic <base 64 encoded uid:pwd>'
++ if 'Authorization' not in self.headers:
++ self.send_response(401)
++ self.end_headers()
++ self.wfile.write('missing "Authorization" header')
++ return False
++
++ auth_header = self.headers['Authorization']
++ _, b64userpwd = auth_header.split()
++ userpwd = base64.b64decode(b64userpwd)
++ if userpwd != metadata['userpwd']:
++ self.send_response(401)
++ self.end_headers()
++ self.wfile.write('invalid auth: {0}'.format(userpwd))
++ return False
++
++ return True
++
++ def do_POST(self):
++ metadata['posts'] += 1
++
++ if metadata['userpwd']:
++ if not self.validate_auth():
++ return
++
++ if metadata['fail_with_400_after'] != -1 and metadata['posts'] > metadata['fail_with_400_after']:
++ self.send_response(400)
++ self.end_headers()
++ self.wfile.write('BAD REQUEST')
++ return
++
++ if metadata['posts'] > 1 and metadata['fail_every'] != -1 and metadata['posts'] % metadata['fail_every'] == 0:
++ self.send_response(500)
++ self.end_headers()
++ self.wfile.write('INTERNAL ERROR')
++ return
++
++ content_length = int(self.headers['Content-Length'])
++ raw_data = self.rfile.read(content_length)
++
++ if metadata['decompress']:
++ post_data = zlib.decompress(raw_data, 31)
++ else:
++ post_data = raw_data
++
++ if self.path not in data:
++ data[self.path] = []
++ data[self.path].append(post_data)
++
++ res = json.dumps({'msg': 'ok'})
++
++ self.send_response(200)
++ self.send_header('Content-Type', 'application/json')
++ self.send_header('Content-Length', len(res))
++ self.end_headers()
++
++ self.wfile.write(res)
++ return
++
++ def do_GET(self):
++ if self.path in data:
++ result = data[self.path]
++ else:
++ result = []
++
++ res = json.dumps(result)
++
++ self.send_response(200)
++ self.send_header('Content-Type', 'application/json')
++ self.send_header('Content-Length', len(res))
++ self.end_headers()
++
++ self.wfile.write(res)
++ return
++
++
++if __name__ == '__main__':
++ parser = argparse.ArgumentParser(description='Archive and delete core app log files')
++ parser.add_argument('-p', '--port', action='store', type=int, default=8080, help='port')
++ parser.add_argument('-i', '--interface', action='store', type=str, default='localhost', help='port')
++ parser.add_argument('--fail-after', action='store', type=int, default=0, help='start failing after n posts')
++ parser.add_argument('--fail-every', action='store', type=int, default=-1, help='fail every n posts')
++ parser.add_argument('--fail-with-400-after', action='store', type=int, default=-1, help='fail with 400 after n posts')
++ parser.add_argument('--decompress', action='store_true', default=False, help='decompress posted data')
++ parser.add_argument('--userpwd', action='store', default='', help='only accept this user:password combination')
++ args = parser.parse_args()
++ metadata['fail_after'] = args.fail_after
++ metadata['fail_every'] = args.fail_every
++ metadata['fail_with_400_after'] = args.fail_with_400_after
++ metadata['decompress'] = args.decompress
++ metadata['userpwd'] = args.userpwd
++ server = HTTPServer((args.interface, args.port), MyHandler)
++ pid = os.getpid()
++ print('starting omhttp test server at {interface}:{port} with pid {pid}'
++ .format(interface=args.interface, port=args.port, pid=pid))
++ server.serve_forever()
diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch
new file mode 100644
index 000000000000..6600c61666e9
--- /dev/null
+++ b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch
@@ -0,0 +1,83 @@
+From c82b747eaf96cc77efa530ca5844ba01b91bfc88 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@whissi.de>
+Date: Sat, 6 Apr 2019 00:28:54 +0200
+Subject: [PATCH] tests: omhttp: add Python 3 compatibility
+
+Fixes: https://github.com/rsyslog/rsyslog/issues/3599
+---
+ tests/omhttp_server.py | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/tests/omhttp_server.py b/tests/omhttp_server.py
+index 6962138fa..d3fdb3a9a 100644
+--- a/tests/omhttp_server.py
++++ b/tests/omhttp_server.py
+@@ -36,16 +36,16 @@ def validate_auth(self):
+ if 'Authorization' not in self.headers:
+ self.send_response(401)
+ self.end_headers()
+- self.wfile.write('missing "Authorization" header')
++ self.wfile.write(b'missing "Authorization" header')
+ return False
+
+ auth_header = self.headers['Authorization']
+ _, b64userpwd = auth_header.split()
+- userpwd = base64.b64decode(b64userpwd)
++ userpwd = base64.b64decode(b64userpwd).decode('utf-8')
+ if userpwd != metadata['userpwd']:
+ self.send_response(401)
+ self.end_headers()
+- self.wfile.write('invalid auth: {0}'.format(userpwd))
++ self.wfile.write(b'invalid auth: {0}'.format(userpwd))
+ return False
+
+ return True
+@@ -60,16 +60,16 @@ def do_POST(self):
+ if metadata['fail_with_400_after'] != -1 and metadata['posts'] > metadata['fail_with_400_after']:
+ self.send_response(400)
+ self.end_headers()
+- self.wfile.write('BAD REQUEST')
++ self.wfile.write(b'BAD REQUEST')
+ return
+
+ if metadata['posts'] > 1 and metadata['fail_every'] != -1 and metadata['posts'] % metadata['fail_every'] == 0:
+ self.send_response(500)
+ self.end_headers()
+- self.wfile.write('INTERNAL ERROR')
++ self.wfile.write(b'INTERNAL ERROR')
+ return
+
+- content_length = int(self.headers['Content-Length'])
++ content_length = int(self.headers['Content-Length'] or 0)
+ raw_data = self.rfile.read(content_length)
+
+ if metadata['decompress']:
+@@ -79,12 +79,12 @@ def do_POST(self):
+
+ if self.path not in data:
+ data[self.path] = []
+- data[self.path].append(post_data)
++ data[self.path].append(post_data.decode('utf-8'))
+
+- res = json.dumps({'msg': 'ok'})
++ res = json.dumps({'msg': 'ok'}).encode('utf8')
+
+ self.send_response(200)
+- self.send_header('Content-Type', 'application/json')
++ self.send_header('Content-Type', 'application/json; charset=utf-8')
+ self.send_header('Content-Length', len(res))
+ self.end_headers()
+
+@@ -97,10 +97,10 @@ def do_GET(self):
+ else:
+ result = []
+
+- res = json.dumps(result)
++ res = json.dumps(result).encode('utf8')
+
+ self.send_response(200)
+- self.send_header('Content-Type', 'application/json')
++ self.send_header('Content-Type', 'application/json; charset=utf-8')
+ self.send_header('Content-Length', len(res))
+ self.end_headers()
+
diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch
new file mode 100644
index 000000000000..615bb50bdb92
--- /dev/null
+++ b/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch
@@ -0,0 +1,22 @@
+From f0847e46c148233b6ab5d6088ca4e1dc664e82a4 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@whissi.de>
+Date: Sat, 6 Apr 2019 02:07:51 +0200
+Subject: [PATCH] testbench: fix Python 3 compatibility
+
+---
+ tests/diag.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/diag.sh b/tests/diag.sh
+index 5b4b3df46..2926e6ac2 100755
+--- a/tests/diag.sh
++++ b/tests/diag.sh
+@@ -1334,7 +1334,7 @@ get_inode() {
+ printf 'FAIL: file "%s" does not exist in get_inode\n' "$1"
+ error_exit 100
+ fi
+- python -c 'import os; import stat; print os.lstat("'$1'")[stat.ST_INO]'
++ python -c 'import os; import stat; print(os.lstat("'$1'")[stat.ST_INO])'
+ }
+
+
diff --git a/app-admin/rsyslog/rsyslog-8.1901.0.ebuild b/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
index 7a95b8997577..9a3428ea917a 100644
--- a/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
inherit autotools eutils linux-info python-any-r1 systemd
diff --git a/app-admin/rsyslog/rsyslog-8.1903.0.ebuild b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild
new file mode 100644
index 000000000000..c2d6e8145cbf
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild
@@ -0,0 +1,465 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+ SRC_URI="
+ https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+ doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+ "
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
+IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/libfastjson-0.99.8:=
+ >=dev-libs/libestr-0.1.9
+ >=sys-libs/zlib-1.2.5
+ curl? ( >=net-misc/curl-7.35.0 )
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ elasticsearch? ( >=net-misc/curl-7.35.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+ grok? ( >=dev-libs/grok-0.9.2 )
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+ kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+ kerberos? ( virtual/krb5 )
+ kubernetes? ( >=net-misc/curl-7.35.0 )
+ mdblookup? ( dev-libs/libmaxminddb:= )
+ mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+ mysql? ( virtual/libmysqlclient:= )
+ normalize? (
+ >=dev-libs/libee-0.4.0
+ >=dev-libs/liblognorm-2.0.3:=
+ )
+ clickhouse? ( >=net-misc/curl-7.35.0 )
+ omhttpfs? ( >=net-misc/curl-7.35.0 )
+ omudpspoof? ( >=net-libs/libnet-1.1.6 )
+ postgres? ( >=dev-db/postgresql-8.4.20:= )
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ relp? ( >=dev-libs/librelp-1.2.17:= )
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+ rfc5424hmac? (
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+ openssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
+ systemd? ( >=sys-apps/systemd-234 )
+ uuid? ( sys-apps/util-linux:0= )
+ xxhash? ( dev-libs/xxhash:= )
+ zeromq? (
+ >=net-libs/czmq-3.0.2
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-archive-2015.02.24
+ virtual/pkgconfig
+ elibc_musl? ( sys-libs/queue-standalone )
+ test? (
+ >=dev-libs/liblogging-1.0.1[stdlog]
+ jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+ !jemalloc? ( sys-libs/libfaketime )
+ ${PYTHON_DEPS}
+ )"
+
+REQUIRED_USE="
+ kubernetes? ( normalize )
+ ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+ DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+ DEPEND+=" >=sys-devel/bison-2.4.3"
+ DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+PATCHES=(
+ "${FILESDIR}"/${P}-add-missing-tests.patch
+ "${FILESDIR}"/${P}-add-py3-support-to-omhttp-test.patch
+ "${FILESDIR}"/${P}-fix-py3-compatibility-in-diag.sh.patch
+)
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_fetch
+ git-r3_checkout
+ else
+ unpack ${P}.tar.gz
+ fi
+
+ if use doc; then
+ if [[ ${PV} == "9999" ]]; then
+ local _EGIT_BRANCH=
+ if [[ -n "${EGIT_BRANCH}" ]]; then
+ # Cannot use rsyslog commits/branches for documentation repository
+ _EGIT_BRANCH=${EGIT_BRANCH}
+ unset EGIT_BRANCH
+ fi
+
+ git-r3_fetch "${DOC_REPO_URI}"
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+ if [[ -n "${_EGIT_BRANCH}" ]]; then
+ # Restore previous EGIT_BRANCH information
+ EGIT_BRANCH=${_EGIT_BRANCH}
+ fi
+ else
+ cd "${S}" || die "Cannot change dir into '${S}'"
+ mkdir docs || die "Failed to create docs directory"
+ cd docs || die "Failed to change dir into '${S}/docs'"
+ unpack ${PN}-doc-${PV}.tar.gz
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Maintainer notes:
+ # * Guardtime support is missing because libgt isn't yet available
+ # in portage.
+ # * Hadoop's HDFS file system output module is currently not
+ # supported in Gentoo because nobody is able to test it
+ # (JAVA dependency).
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+ # upstream PR 129 and 136) so we need to export HIREDIS_*
+ # variables because rsyslog's build system depends on pkg-config.
+
+ if use redis; then
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+ fi
+
+ local myeconfargs=(
+ --disable-debug-symbols
+ --disable-generate-man-pages
+ --without-valgrind-testbench
+ --disable-liblogging-stdlog
+ $(use_enable test testbench)
+ $(use_enable test libfaketime)
+ $(use_enable test extended-tests)
+ # Input Plugins without depedencies
+ --enable-imdiag
+ --enable-imfile
+ --enable-impstats
+ --enable-imptcp
+ # Message Modificiation Plugins without depedencies
+ --enable-mmanon
+ --enable-mmaudit
+ --enable-mmcount
+ --enable-mmfields
+ --enable-mmjsonparse
+ --enable-mmpstrucdata
+ --enable-mmrm1stspace
+ --enable-mmsequence
+ --enable-mmutf8fix
+ # Output Modification Plugins without dependencies
+ --enable-mail
+ --enable-omprog
+ --enable-omruleset
+ --enable-omstdout
+ --enable-omuxsock
+ # Misc
+ --enable-fmhash
+ $(use_enable xxhash fmhash-xxhash)
+ --enable-pmaixforwardedfrom
+ --enable-pmciscoios
+ --enable-pmcisconames
+ --enable-pmlastmsg
+ $(use_enable normalize pmnormalize)
+ --enable-pmnull
+ --enable-pmpanngfw
+ --enable-pmsnare
+ # DB
+ $(use_enable dbi libdbi)
+ $(use_enable mongodb ommongodb)
+ $(use_enable mysql)
+ $(use_enable postgres pgsql)
+ $(use_enable redis omhiredis)
+ # Debug
+ $(use_enable debug)
+ $(use_enable debug diagtools)
+ $(use_enable debug valgrind)
+ # Misc
+ $(use_enable clickhouse)
+ $(use_enable curl fmhttp)
+ $(use_enable elasticsearch)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable jemalloc)
+ $(use_enable kafka imkafka)
+ $(use_enable kafka omkafka)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable kubernetes mmkubernetes)
+ $(use_enable normalize mmnormalize)
+ $(use_enable mdblookup mmdblookup)
+ $(use_enable grok mmgrok)
+ $(use_enable omhttp)
+ $(use_enable omhttpfs)
+ $(use_enable omudpspoof)
+ $(use_enable rabbitmq omrabbitmq)
+ $(use_enable relp)
+ $(use_enable rfc3195)
+ $(use_enable rfc5424hmac mmrfc5424addhmac)
+ $(use_enable snmp)
+ $(use_enable snmp mmsnmptrapd)
+ $(use_enable gnutls)
+ $(use_enable openssl)
+ $(use_enable systemd imjournal)
+ $(use_enable systemd omjournal)
+ $(use_enable usertools)
+ $(use_enable uuid)
+ $(use_enable zeromq imczmq)
+ $(use_enable zeromq omczmq)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc && [[ "${PV}" == "9999" ]]; then
+ einfo "Building documentation ..."
+ local doc_dir="${S}/docs"
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+ sphinx-build -b html source build || die "Building documentation failed!"
+ fi
+}
+
+src_test() {
+ local _has_increased_ulimit=
+
+ # Sometimes tests aren't executable (i.e. when added via patch)
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ if ulimit -n 3072; then
+ _has_increased_ulimit="true"
+ fi
+
+ if ! emake --jobs 1 check; then
+ eerror "Test suite failed! :("
+
+ if [[ -z "${_has_increased_ulimit}" ]]; then
+ eerror "Probably because open file limit couldn't be set to 3072."
+ fi
+
+ if has userpriv ${FEATURES}; then
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+ "before you submit a bug report."
+ fi
+
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ ChangeLog
+ "${FILESDIR}"/README.gentoo
+ )
+
+ use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+ default
+
+ newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+ keepdir /var/empty/dev
+ keepdir /var/spool/${PN}
+ keepdir /etc/ssl/${PN}
+ keepdir /etc/${PN}.d
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+ insinto /etc/rsyslog.d/
+ newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+ if use mysql; then
+ insinto /usr/share/doc/${PF}/scripts/mysql
+ doins plugins/ommysql/createDB.sql
+ fi
+
+ if use postgres; then
+ insinto /usr/share/doc/${PF}/scripts/pgsql
+ doins plugins/ompgsql/createDB.sql
+ fi
+
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ local advertise_readme=0
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ advertise_readme=1
+
+ if use mysql || use postgres; then
+ echo
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+ elog " /usr/share/doc/${PF}/scripts"
+ fi
+
+ if use ssl; then
+ echo
+ elog "To create a default CA and certificates for your server and clients, run:"
+ elog " emerge --config =${PF}"
+ elog "on your logging server. You can run it several times,"
+ elog "once for each logging client. The client certificates will be signed"
+ elog "using the CA certificate generated during the first run."
+ fi
+ fi
+
+ if [[ ${advertise_readme} -gt 0 ]]; then
+ # We need to show the README file location
+
+ echo ""
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more details."
+ fi
+}
+
+pkg_config() {
+ if ! use ssl ; then
+ einfo "There is nothing to configure for rsyslog unless you"
+ einfo "used USE=ssl to build it."
+ return 0
+ fi
+
+ # Make sure the certificates directory exists
+ local CERTDIR="${EROOT}/etc/ssl/${PN}"
+ if [[ ! -d "${CERTDIR}" ]]; then
+ mkdir "${CERTDIR}" || die
+ fi
+ einfo "Your certificates will be stored in ${CERTDIR}"
+
+ # Create a default CA if needed
+ if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = Portage automated CA
+ ca
+ cert_signing_key
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-self-signed \
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ # Create the server certificate
+ echo
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for server ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_server
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ else
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+ fi
+
+ # Create a client certificate
+ echo
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for client ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_client
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ rm -f "${T}/${PF}.$$"
+
+ echo
+ einfo "Here is the documentation on how to encrypt your log traffic:"
+ einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild b/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
new file mode 100644
index 000000000000..c745aa8c5169
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
@@ -0,0 +1,465 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+ SRC_URI="
+ https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+ doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+ "
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
+IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/libfastjson-0.99.8:=
+ >=dev-libs/libestr-0.1.9
+ >=sys-libs/zlib-1.2.5
+ curl? ( >=net-misc/curl-7.35.0 )
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ elasticsearch? ( >=net-misc/curl-7.35.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+ grok? ( >=dev-libs/grok-0.9.2 )
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+ kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+ kerberos? ( virtual/krb5 )
+ kubernetes? ( >=net-misc/curl-7.35.0 )
+ mdblookup? ( dev-libs/libmaxminddb:= )
+ mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+ mysql? ( virtual/libmysqlclient:= )
+ normalize? (
+ >=dev-libs/libee-0.4.0
+ >=dev-libs/liblognorm-2.0.3:=
+ )
+ clickhouse? ( >=net-misc/curl-7.35.0 )
+ omhttpfs? ( >=net-misc/curl-7.35.0 )
+ omudpspoof? ( >=net-libs/libnet-1.1.6 )
+ postgres? ( >=dev-db/postgresql-8.4.20:= )
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ relp? ( >=dev-libs/librelp-1.2.17:= )
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+ rfc5424hmac? (
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+ openssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
+ systemd? ( >=sys-apps/systemd-234 )
+ uuid? ( sys-apps/util-linux:0= )
+ xxhash? ( dev-libs/xxhash:= )
+ zeromq? (
+ >=net-libs/czmq-3.0.2
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-archive-2015.02.24
+ virtual/pkgconfig
+ elibc_musl? ( sys-libs/queue-standalone )
+ test? (
+ >=dev-libs/liblogging-1.0.1[stdlog]
+ jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+ !jemalloc? ( sys-libs/libfaketime )
+ ${PYTHON_DEPS}
+ )"
+
+REQUIRED_USE="
+ kubernetes? ( normalize )
+ ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+ DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+ DEPEND+=" >=sys-devel/bison-2.4.3"
+ DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_fetch
+ git-r3_checkout
+ else
+ unpack ${P}.tar.gz
+ fi
+
+ if use doc; then
+ if [[ ${PV} == "9999" ]]; then
+ local _EGIT_BRANCH=
+ if [[ -n "${EGIT_BRANCH}" ]]; then
+ # Cannot use rsyslog commits/branches for documentation repository
+ _EGIT_BRANCH=${EGIT_BRANCH}
+ unset EGIT_BRANCH
+ fi
+
+ git-r3_fetch "${DOC_REPO_URI}"
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+ if [[ -n "${_EGIT_BRANCH}" ]]; then
+ # Restore previous EGIT_BRANCH information
+ EGIT_BRANCH=${_EGIT_BRANCH}
+ fi
+ else
+ cd "${S}" || die "Cannot change dir into '${S}'"
+ mkdir docs || die "Failed to create docs directory"
+ cd docs || die "Failed to change dir into '${S}/docs'"
+ unpack ${PN}-doc-${PV}.tar.gz
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # https://github.com/rsyslog/rsyslog/issues/3626
+ sed -i \
+ -e '\|^#!/bin/bash$|a exit 77' \
+ tests/mmkubernetes-cache-expir*.sh \
+ || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+ eautoreconf
+}
+
+src_configure() {
+ # Maintainer notes:
+ # * Guardtime support is missing because libgt isn't yet available
+ # in portage.
+ # * Hadoop's HDFS file system output module is currently not
+ # supported in Gentoo because nobody is able to test it
+ # (JAVA dependency).
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+ # upstream PR 129 and 136) so we need to export HIREDIS_*
+ # variables because rsyslog's build system depends on pkg-config.
+
+ if use redis; then
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+ fi
+
+ local myeconfargs=(
+ --disable-debug-symbols
+ --disable-generate-man-pages
+ --without-valgrind-testbench
+ --disable-liblogging-stdlog
+ $(use_enable test testbench)
+ $(use_enable test libfaketime)
+ $(use_enable test extended-tests)
+ # Input Plugins without depedencies
+ --enable-imdiag
+ --enable-imfile
+ --enable-impstats
+ --enable-imptcp
+ # Message Modificiation Plugins without depedencies
+ --enable-mmanon
+ --enable-mmaudit
+ --enable-mmcount
+ --enable-mmfields
+ --enable-mmjsonparse
+ --enable-mmpstrucdata
+ --enable-mmrm1stspace
+ --enable-mmsequence
+ --enable-mmutf8fix
+ # Output Modification Plugins without dependencies
+ --enable-mail
+ --enable-omprog
+ --enable-omruleset
+ --enable-omstdout
+ --enable-omuxsock
+ # Misc
+ --enable-fmhash
+ $(use_enable xxhash fmhash-xxhash)
+ --enable-pmaixforwardedfrom
+ --enable-pmciscoios
+ --enable-pmcisconames
+ --enable-pmlastmsg
+ $(use_enable normalize pmnormalize)
+ --enable-pmnull
+ --enable-pmpanngfw
+ --enable-pmsnare
+ # DB
+ $(use_enable dbi libdbi)
+ $(use_enable mongodb ommongodb)
+ $(use_enable mysql)
+ $(use_enable postgres pgsql)
+ $(use_enable redis omhiredis)
+ # Debug
+ $(use_enable debug)
+ $(use_enable debug diagtools)
+ $(use_enable debug valgrind)
+ # Misc
+ $(use_enable clickhouse)
+ $(use_enable curl fmhttp)
+ $(use_enable elasticsearch)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable jemalloc)
+ $(use_enable kafka imkafka)
+ $(use_enable kafka omkafka)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable kubernetes mmkubernetes)
+ $(use_enable normalize mmnormalize)
+ $(use_enable mdblookup mmdblookup)
+ $(use_enable grok mmgrok)
+ $(use_enable omhttp)
+ $(use_enable omhttpfs)
+ $(use_enable omudpspoof)
+ $(use_enable rabbitmq omrabbitmq)
+ $(use_enable relp)
+ $(use_enable rfc3195)
+ $(use_enable rfc5424hmac mmrfc5424addhmac)
+ $(use_enable snmp)
+ $(use_enable snmp mmsnmptrapd)
+ $(use_enable gnutls)
+ $(use_enable openssl)
+ $(use_enable systemd imjournal)
+ $(use_enable systemd omjournal)
+ $(use_enable usertools)
+ $(use_enable uuid)
+ $(use_enable zeromq imczmq)
+ $(use_enable zeromq omczmq)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc && [[ "${PV}" == "9999" ]]; then
+ einfo "Building documentation ..."
+ local doc_dir="${S}/docs"
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+ sphinx-build -b html source build || die "Building documentation failed!"
+ fi
+}
+
+src_test() {
+ local _has_increased_ulimit=
+
+ # Sometimes tests aren't executable (i.e. when added via patch)
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ if ulimit -n 3072; then
+ _has_increased_ulimit="true"
+ fi
+
+ if ! emake --jobs 1 check; then
+ eerror "Test suite failed! :("
+
+ if [[ -z "${_has_increased_ulimit}" ]]; then
+ eerror "Probably because open file limit couldn't be set to 3072."
+ fi
+
+ if has userpriv ${FEATURES}; then
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+ "before you submit a bug report."
+ fi
+
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ ChangeLog
+ "${FILESDIR}"/README.gentoo
+ )
+
+ use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+ default
+
+ newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+ keepdir /var/empty/dev
+ keepdir /var/spool/${PN}
+ keepdir /etc/ssl/${PN}
+ keepdir /etc/${PN}.d
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+ insinto /etc/rsyslog.d/
+ newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+ if use mysql; then
+ insinto /usr/share/doc/${PF}/scripts/mysql
+ doins plugins/ommysql/createDB.sql
+ fi
+
+ if use postgres; then
+ insinto /usr/share/doc/${PF}/scripts/pgsql
+ doins plugins/ompgsql/createDB.sql
+ fi
+
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ local advertise_readme=0
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ advertise_readme=1
+
+ if use mysql || use postgres; then
+ echo
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+ elog " /usr/share/doc/${PF}/scripts"
+ fi
+
+ if use ssl; then
+ echo
+ elog "To create a default CA and certificates for your server and clients, run:"
+ elog " emerge --config =${PF}"
+ elog "on your logging server. You can run it several times,"
+ elog "once for each logging client. The client certificates will be signed"
+ elog "using the CA certificate generated during the first run."
+ fi
+ fi
+
+ if [[ ${advertise_readme} -gt 0 ]]; then
+ # We need to show the README file location
+
+ echo ""
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more details."
+ fi
+}
+
+pkg_config() {
+ if ! use ssl ; then
+ einfo "There is nothing to configure for rsyslog unless you"
+ einfo "used USE=ssl to build it."
+ return 0
+ fi
+
+ # Make sure the certificates directory exists
+ local CERTDIR="${EROOT}/etc/ssl/${PN}"
+ if [[ ! -d "${CERTDIR}" ]]; then
+ mkdir "${CERTDIR}" || die
+ fi
+ einfo "Your certificates will be stored in ${CERTDIR}"
+
+ # Create a default CA if needed
+ if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = Portage automated CA
+ ca
+ cert_signing_key
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-self-signed \
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ # Create the server certificate
+ echo
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for server ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_server
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ else
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+ fi
+
+ # Create a client certificate
+ echo
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for client ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_client
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ rm -f "${T}/${PF}.$$"
+
+ echo
+ einfo "Here is the documentation on how to encrypt your log traffic:"
+ einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild
index 0433b628342d..a14e94d609f6 100644
--- a/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
inherit autotools eutils linux-info python-any-r1 systemd
diff --git a/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild
index 1f68aea21c3b..50df01153629 100644
--- a/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
inherit autotools eutils linux-info python-any-r1 systemd
diff --git a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
index 93fad0de32f8..80b404d34555 100644
--- a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
inherit autotools eutils linux-info python-any-r1 systemd
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 6a53c273d175..6838e28e5930 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -3,8 +3,8 @@ AUX setools-4.2.0-remove-gui.patch 988 BLAKE2B 8ba64a764292e2309fc27bdd8595bbe10
DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
DIST setools-4.2.0.tar.gz 363802 BLAKE2B a57a7d565bb6e91f67cba0516434d8a0d3635d0717e878d8ac43b6cf7de0884ea74152ec50e93554f7d1a75a4098db2241668e1765e7b069d23b6cc13d4b712e SHA512 b51f458f7f2d1b569f63478f53709268615f711104915cc2d5031b2049435e4f43a103ebe50c9797ebe4b2645bf1974c73c2f53e7f602ae03c47221edb89d680
DIST setools-4.2.1.tar.gz 365096 BLAKE2B f415ec15ce7caade2a511896c6027720ecd8b4fae938d9dee1e0b677388966557b9615503df58dd6057f5c0ef81690f753f3e1af773ef5fd8095b29aca0ab249 SHA512 7d00295fe7ff16e96e15266807f8e0a67cc2978f9051cd85afb9ee71ca7fad16ccf7421a4a163bb793950bc20a44f3cbb8409b4e0642d0f96cf7a3df7bc59c31
-EBUILD setools-4.1.1-r1.ebuild 1460 BLAKE2B 3f1b952af9d7151a1729106e23f22f1e5c5a863afe6c84124429989ccba5d2e46abbaffac809dfee51b0876332dc70242d971016bd7af4b90ae9b3d903c1a0af SHA512 ea755596d4924c9e959cd37c6815f981af107fdac766285c36148b4dca32a6ec24f1e0688a4589e732b70374ce2f6ab0ff637da11979d13526717b585b89c0d5
-EBUILD setools-4.1.1.ebuild 1488 BLAKE2B 462d30b33838dc2c548baff9bb32ca2f978df8a62d5a6e936dfc3bab4dd2522513a90635d64244c6750587cb061380a92a4158bc8e38bddcd2065987463ce9ca SHA512 074263f51282f81cd723ad261c286d46a93a8e13be2fec152adf61a8618685ad43460751d152077d22f395ed854d3362d49c47476ff1fc8b92fe1b62d7351fe5
+EBUILD setools-4.1.1-r1.ebuild 1447 BLAKE2B 4afdbfbf8493bed414e7c6837b613acdee5ff55e77eb72d126f1812e713afa2b13105e8028363f8b28309a2cf9aa9b5035cfb4be0b5c73edfa5fac2e005938fc SHA512 580e594974e00ef868bb9bc7d04411091e0868e06f2adb06f567c0fdd5dcfe759b4af79ed0da7490e7c02bb0064f9b9093ef014a45ea1e2cd9f64b2617f97a61
+EBUILD setools-4.1.1.ebuild 1475 BLAKE2B 119319b92fc985e8c45e54f47df650b62841fca3388da8d5317bafbee4b0b2ac5190ef075935ffde53ed16c9e90ea1a101d7ba2a797664628eb1ce120fc094be SHA512 1243b8706287fe83cc2f043e78d8554a9b22a543950a01de1d7e8cdd93be4fec69396a1b705afaa669c48f34a6941883adb921fc9869ccc4effd3db13cf39e6c
EBUILD setools-4.2.0.ebuild 1201 BLAKE2B 36b9bab96ee7db94c4627a4d0579dc7b8ece8979515d15f83e002c8048d9da5577a0574777b9ecd13df62f112486c901d2312464437d64e42ce16ccc1c82c513 SHA512 fb723880d5473e437636774909cb5c98910aa3a3764f87c4ee8a4049377dad98f38163e314d5b08851ac75332d967c529329b291aba1e375806c39af4607739c
EBUILD setools-4.2.1.ebuild 1201 BLAKE2B 2244435edf3e51f5727b6fe188462aedb64b68624a6d02ce32e48bd7c01e4a79db17d4f627d91a886c75803a92d005278ba8eda9bab777846718b3bd2a4c9049 SHA512 c5330e616e4d211754650994c65350137fc6cfd5f0be16e2f3cb295127c081f37946feb283713a7726462d0b367023b63f3051a807e2b24c78758009630613bb
EBUILD setools-9999.ebuild 1201 BLAKE2B 2244435edf3e51f5727b6fe188462aedb64b68624a6d02ce32e48bd7c01e4a79db17d4f627d91a886c75803a92d005278ba8eda9bab777846718b3bd2a4c9049 SHA512 c5330e616e4d211754650994c65350137fc6cfd5f0be16e2f3cb295127c081f37946feb283713a7726462d0b367023b63f3051a807e2b24c78758009630613bb
diff --git a/app-admin/setools/setools-4.1.1-r1.ebuild b/app-admin/setools/setools-4.1.1-r1.ebuild
index 13b8cb7389c8..3d68806cff77 100644
--- a/app-admin/setools/setools-4.1.1-r1.ebuild
+++ b/app-admin/setools/setools-4.1.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
inherit distutils-r1
diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild
index 560eee70d249..adcc2f5f92db 100644
--- a/app-admin/setools/setools-4.1.1.ebuild
+++ b/app-admin/setools/setools-4.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
inherit distutils-r1
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 40bef42ce410..ab977cf4b460 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -3,12 +3,9 @@ AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee6
AUX sshguard.initd 572 BLAKE2B d92f03b4da940a47ae27281c1075914e7e4157d459096a19615a05815f3507a11a41ec5290830f299e96fee8c7203831f6e91b11faa6a6f07eaec68f98e9bf0f SHA512 0a38cdc6121c6f981bccfd75648843f16b724d412648773f1838e8c67a6c7231df756da8ac1c3651a18b5a271337c07ab97a3314d3a81904bf3c2c68dd00f9f7
AUX sshguard.initd-r1 400 BLAKE2B 4d97e26fdacc5477936c899b69a8ac5d6507b8336228f425823bfaab1119d5862654babdce2e33ab530d41943f4e62f983e0d48ff38d319a85382e3c680e5e22 SHA512 1d73ee8e244f8318a4488aa9cf404d619da893828201215de741cea20cbb99dbce44caaefae6ab407146ca05d1ced61a03228fe60b9fa0beb152bcd8098ea86b
DIST sshguard-2.1.0.tar.gz 1117466 BLAKE2B 1a105f346aa9b774fb0314161d779eadaab299d3b74181a449ab86534e11375e4c017c142bc621733593369bcebada9511dd40c64cb4a49cd124eb7537ae0717 SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119
-DIST sshguard-2.2.0.tar.gz 737612 BLAKE2B 8c51a265d5bddc6d4da75e2c6aa84de4c84fd85466f1cb06000c01cf8552d3d3e291532e2a1bce5c6367a93044a63839b9aa584f65dd02838c4959d86220b386 SHA512 4f7bfcd0fe7237609cd393bd6ca235882de252eced03014d9fe713c7cf66a2ecb365c35c24ab62d034abad970fb3e9a07bc854e7e5d194f6c374fac74cdc7e2f
DIST sshguard-2.3.0.tar.gz 755702 BLAKE2B 3b2e9bea3cf65c4e9a3ab82b6f5013c167033310d6f9ffe27d1d7dc9380be2214fdfdab4892ab9f6dfaa51b1131698d729257695ddef9debbc0ad06a9f49acfd SHA512 b3df479a752e0263fc444c582dd6c89dfdd4154ab011d23d0973f16f3b3e60f21f01b53e6ed0c4b138f134cd7e3dea5e67b44901f812f3da0d1aac760eeee279
DIST sshguard-2.3.1.tar.gz 765330 BLAKE2B d86fe596c788209cb35c699601ccb698365e0c6b497ef8184c64d879ebb821a57e5f366c3b518e6f0c6bf65952b2c675f87f029b7b8184466c7f90d6dfebaca3 SHA512 b24f5dba34bed9246665c432b379afa4f1edacb56fd41e0b254a698ded1280c33fd51fb36466ae70d44ef4a31a0a75b59fa4df97d0e8ed8d194bf8046a3ac84d
EBUILD sshguard-2.1.0-r1.ebuild 763 BLAKE2B 2af47f5332bb6ab2cc39e8da7b4b61d91f663f93958c56474d4f813d0e32a9e6ff895bd15b3f740153b0643d2bbde8f2d1588d2636cdf89daff5826d63d395ba SHA512 281964bf882b40da1d5de715d93c12df1910c550304871c4ba5cf7570ac86821547299fd831025290182f8207027de8c053aa814a615b25656b982027fa457bd
-EBUILD sshguard-2.1.0-r2.ebuild 768 BLAKE2B 2ca5bfe103a6aee4cd013540cc9292eb3e9631f6863ac83a26496d5de083605e8515c5797173fedaf3590702e379584aa84031f960a70daaadb35ee019be5134 SHA512 a6324574621132921a9f9c7c9cfe3abc503e3b0d508ff6ef7bf9ad82db3476c169d7e88aa68e3d4c6dd268b51f38f06a1210e7489f5cbeb270345057efc34582
-EBUILD sshguard-2.2.0.ebuild 768 BLAKE2B 2ca5bfe103a6aee4cd013540cc9292eb3e9631f6863ac83a26496d5de083605e8515c5797173fedaf3590702e379584aa84031f960a70daaadb35ee019be5134 SHA512 a6324574621132921a9f9c7c9cfe3abc503e3b0d508ff6ef7bf9ad82db3476c169d7e88aa68e3d4c6dd268b51f38f06a1210e7489f5cbeb270345057efc34582
EBUILD sshguard-2.3.0.ebuild 758 BLAKE2B dfd1fa524cd39050914e515e324540a78b90e2cd430af7df36c272b0a600410cabb763572d766857b3271f7812697f8f16b1f16b00cb5af4ce5ecff7b164e1d3 SHA512 6009a78a97a2252ed3ba06f276e10b70c9fe99e3acf343081aef63bbd021a9406c2dba6961178f05889f8dc72767bc09eb9c499b59959b15a0f40239bca3fbf4
EBUILD sshguard-2.3.1.ebuild 758 BLAKE2B 9b5da614fa2e81cf10ed8a4d079c1283db3504262e42734f41fe990fdb633b84ea475d51adff2a4e0191387abc5708e92a88e57d8ac3f035a651123f443a1196 SHA512 0046cf0eef08cd0b75bfadc2608116c07291e20068419e3cb25832927405148f14c989bb3bb85ac6e9cf77edaef3df3206955e989ef9132a4f7a645f40ebf566
EBUILD sshguard-99999.ebuild 799 BLAKE2B c163d68663958a738d828b1c0da1c931036673dd2da7884312fa9152005e4349ef4004f2b272503ce9e27abdbd6de09b251e9fc4ea130d341ebc0db252af41ad SHA512 272c3c1cffa45a8b0ac24f303ccd69629f26c42de3ac3c064174ae5307bd33d72c775d0f8512a8de47eff59d1f4c0cdb46c60634f2a40ea2fb5875787bc9d114
diff --git a/app-admin/sshguard/sshguard-2.1.0-r2.ebuild b/app-admin/sshguard/sshguard-2.1.0-r2.ebuild
deleted file mode 100644
index 7faed8b68c9c..000000000000
--- a/app-admin/sshguard/sshguard-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="http://sshguard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-
-DEPEND="
- sys-devel/flex
-"
-RDEPEND="
- virtual/logger
-"
-DOCS=(
- CHANGELOG.rst
- CONTRIBUTING.rst
- README.rst
- examples/net.sshguard.plist
- examples/sshguard.service
- examples/whitelistfile.example
-)
-PATCHES=(
- "${FILESDIR}"/${PN}-2.1.0-conf.patch
-)
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- insinto /etc
- newins examples/sshguard.conf.sample sshguard.conf
-}
diff --git a/app-admin/sshguard/sshguard-2.2.0.ebuild b/app-admin/sshguard/sshguard-2.2.0.ebuild
deleted file mode 100644
index 7faed8b68c9c..000000000000
--- a/app-admin/sshguard/sshguard-2.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="http://sshguard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-
-DEPEND="
- sys-devel/flex
-"
-RDEPEND="
- virtual/logger
-"
-DOCS=(
- CHANGELOG.rst
- CONTRIBUTING.rst
- README.rst
- examples/net.sshguard.plist
- examples/sshguard.service
- examples/whitelistfile.example
-)
-PATCHES=(
- "${FILESDIR}"/${PN}-2.1.0-conf.patch
-)
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
- insinto /etc
- newins examples/sshguard.conf.sample sshguard.conf
-}
diff --git a/app-admin/su-exec/Manifest b/app-admin/su-exec/Manifest
index 7e5ba2aa118b..4f576cc1496f 100644
--- a/app-admin/su-exec/Manifest
+++ b/app-admin/su-exec/Manifest
@@ -1,3 +1,3 @@
DIST su-exec-0.2.tar.gz 2426 BLAKE2B 79eda06463a238371e35dcc7acf2df9e8a7696a531a5dc9d0e9650219a5c72d71cf0e368f2178f83e949cf0f05fbc01e7023085fa2cffebcd8b78e82ab9756e2 SHA512 68155a06c716b362aee1214f22cd325b3e934c05b653d3b084a720458fb04207c0681d218b72adfd5ae8fab0262f7ab90e49eb2e218d1b0d7d7af7911715d4e1
EBUILD su-exec-0.2.ebuild 595 BLAKE2B 44e9e1e201b74506b2d1bdd0d25f8e957ba5b7dd4db859de6708bd33d2c122d046a51122f7096936621c7e60dd0e5d44e565295cba4de4b055b3d2e7f8244f9d SHA512 2a008451f0277ac2bf5e97cca68078e4f333f0b488ca8750b22e75dc6424d45ce34c214e5b6513835b8faba6c40caab1506ec8e208ea231f2144ea2fb0d6a4cf
-MISC metadata.xml 323 BLAKE2B 56dfb262d3d2714721cbd8436aaaa6628ca11013bc801a7d9a18fa5a87d4e20e41d98584f344a98b8f697ad6427f6641bba7090b562594b08995e8b31d4d2292 SHA512 3eadc250f3acadea3d3b3f29ef78380ed153b12b34b5e752dd088470949dec3590889b8daa6db37472ed043a10f14f5bf2e8c280fae7efd3ee398fa5d88b0caf
+MISC metadata.xml 245 BLAKE2B 7ec08f969d0cd84a8313e515dd84440cd6417c661672f00be444ebd11b79f3ef4ead9f7318088ecc6717147a9428d9de024441825264f545e71e1fbd2aea5210 SHA512 5378ab531062e61d8cbb78d685c8c343bf5339e8f3c5462bc5447adfaf7015d1c1e2eee787b258ef90203f42a0ff94180ca57579316774dd9e5f5ec2f07b6669
diff --git a/app-admin/su-exec/metadata.xml b/app-admin/su-exec/metadata.xml
index 662615bdd73c..994ac4d0e54f 100644
--- a/app-admin/su-exec/metadata.xml
+++ b/app-admin/su-exec/metadata.xml
@@ -1,10 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">ncopa/su-exec</remote-id>
</upstream>
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index e48501d1b8ba..cb65ab498d78 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -6,9 +6,11 @@ AUX init.d-r2 553 BLAKE2B 270ff81ca5bac99f22b49bf47ec64d73b4328804ea264e99301de3
AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288d9364f02331da5e693bce3862869248f7c0b81285576ca633e679a26acf75f03b2e620e16eea963909 SHA512 1ce55ef1f9a4cd7592645007af5e0f18147e8dca1c324ac2e48bf58aa2191ec657cfa68d7e6bdc9ba8e0747b32f4e6a44009e8c55a7bd77b265ac8593f51eeb7
AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c45da2bb7017631bf4af4b858bc4d7964f1d64937e331728884bc21e62e9d01b11cca46aaea389372c6bad SHA512 0fe777d1f0bf70dc9b49132102ac90083261321850f80e9e323459c894c55f722ab8470eba3ba7bb35a9d69ad411a3247546066d6cba5801c9b289350ea4bed5
DIST supervisor-3.1.4.tar.gz 392321 BLAKE2B 316789fae200f02242a90d3a22a3c6486576f74dbab81b95efc72768a89c54999a370625f9589afe1edff08351840fbe27a7ef8674e6f1e3bbdd4237f3227df6 SHA512 7182db4169d37aa8f7a2a4e1d57ce40f6dea21759ed73fb49286dd5ffb2bdede0fccdc71344e93c8f8c067a2cbc4e3cb0a9a50b22bacdb1b8bc1378581ed5f07
-DIST supervisor-3.3.4.tar.gz 419794 BLAKE2B b916c22f3ec1cc180d495f08dac1a66cfd5a93c060906c015a85b2bf64733b4ed298b67050db1332639902a1c6601118a5c05e01c54ed4fc32910d1c24431131 SHA512 fab141b52a548a3efd26f175798b1b8fbb46ce465aa48c3281cb80584b829ecef90ae1355e4106632d13c84363ae03f081d69fb4148303ff387ab7d4e778d21a
DIST supervisor-3.3.5.tar.gz 421220 BLAKE2B 63e9db005596921c4a4426de361fc20992a27b67b67ee1256cd64fe6d385909682a5055e4797512410f36f6855592f53c9c5720c54a2dae967578691d05ff3fc SHA512 66c43d40c216e5c3120e083407c848295fa1e59d6d9da916a4bae5c37d4d13208c3bf7c0c8b8a5d570270eb44fac0b1bbcceddb2e84e4f3fc1b6241b43116af7
+DIST supervisor-4.0.1.tar.gz 433742 BLAKE2B dc0683566c9b052c6a832e09eb6eba76890f07f5b67a1c129343ed3de31e5dc88777cfcb1b3c06a6a687160c172c3d83227765678c9c54239fbe57eb9b5ebd0a SHA512 e2e0e92ef1dba74ea4e3e70c2bd56b8a497d22db8123411f4f2019b45626606e90030577ae79aa8b81103c2f337c76d7516f94bb01e97172e2e541ec44d0f1b9
+DIST supervisor-4.0.2.tar.gz 434408 BLAKE2B 567e680c4b350e94c10be28ab25a16392a10f904fbc453c4d59132bb9e284b47e723834d5a34d803f4e54d5d17ce84b3e7e275d7f884c4d0e3ee05d50470008a SHA512 662bc1052276c2f54e0eeae820f9ae53e7f37150db21f0547be74b90455e213c9ca2b21e07079f1bd1740fae6e3d664edd3d27d57a0128828fc1a9c3627b3189
EBUILD supervisor-3.1.4.ebuild 1190 BLAKE2B 914c69c7e7d8146273fa3b2dc9445a5fee5f7d52692884a208d1b4cd3b3ac11d902823ebf1f33e2d82aaa0bdf316de85b12d04917cd115d800516733b20fc445 SHA512 be9e9ece37f97cc515679f06ca358e3af4b06039ee9009be02e28c6acecbd157fde107622201e6cea2a5c00221a6ffb078a98611662ab002edc08e3ade26c983
-EBUILD supervisor-3.3.4.ebuild 1962 BLAKE2B b9d1166a42facd65d57fe1eb72e261d394d51de3a1df394a877197165357959282f4094ea21255729f15d8438aeca4123e126e76ca0aa3bd75c0ab7e1068165f SHA512 1a808d9979563f2ea818ab577c43a7ed39489cc33403d6ad2650299b78224269c03245e7ebf05d9b0cd54b32efa56edc39a4af017b2798a4cae362abb796023f
EBUILD supervisor-3.3.5.ebuild 1959 BLAKE2B 168867deedc11199bff5b9d25d44056219809f35c3627a720469d755b3312f704d6568ef9331d46b4b177154707b10721c7058ead18af690b57c98f5ce912262 SHA512 9a35ea4c5381762644e00c2de4ae3272537e12357fdf17f2daa7b8c9a9187075f4625c38c555a3d6f32c4690fd8940deebaf3a27d4de9ca08fc8aa1797ebc30e
+EBUILD supervisor-4.0.1.ebuild 1798 BLAKE2B 0101fb3f69ba6750541015c4fad57bc9d195ba46d9ae0c09d4de30ef6d9acf950023fdb2ca8f201cd010391163a076ce436a0b2cf5a7ed8c62ba3417bb3ccc7f SHA512 ac93e1a1845809f3e9cb03c413bd42025e1f5c2105c7f4c4e9d07a1d371e373d0e93c006029aa7ba60a06c23f9ae10bf9da2c247623c6ddbeb8b97ec7b68ce80
+EBUILD supervisor-4.0.2.ebuild 1798 BLAKE2B 0101fb3f69ba6750541015c4fad57bc9d195ba46d9ae0c09d4de30ef6d9acf950023fdb2ca8f201cd010391163a076ce436a0b2cf5a7ed8c62ba3417bb3ccc7f SHA512 ac93e1a1845809f3e9cb03c413bd42025e1f5c2105c7f4c4e9d07a1d371e373d0e93c006029aa7ba60a06c23f9ae10bf9da2c247623c6ddbeb8b97ec7b68ce80
MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-3.3.4.ebuild b/app-admin/supervisor/supervisor-4.0.1.ebuild
index 1b78252cdb4d..2741d256322a 100644
--- a/app-admin/supervisor/supervisor-3.3.4.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python2_7 ) # py2 only
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
inherit distutils-r1 systemd user
@@ -21,10 +21,10 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc test"
RDEPEND="
- dev-python/meld3[${PYTHON_USEDEP}]
+ >=dev-python/meld3-1.0.0[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
"
-DEPEND="
+BDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? (
@@ -35,12 +35,6 @@ DEPEND="
S="${WORKDIR}/${PN}-${MY_PV}"
-python_prepare_all() {
- # https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
- sed -i '/namespace_packages=/d' setup.py || die
- distutils-r1_python_prepare_all
-}
-
python_compile_all() {
if use doc; then
emake -C docs html
diff --git a/app-admin/supervisor/supervisor-4.0.2.ebuild b/app-admin/supervisor/supervisor-4.0.2.ebuild
new file mode 100644
index 000000000000..2741d256322a
--- /dev/null
+++ b/app-admin/supervisor/supervisor-4.0.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 systemd user
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+ >=dev-python/meld3-1.0.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ ${RDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_compile_all() {
+ if use doc; then
+ emake -C docs html
+ HTML_DOCS=( docs/.build/html/. )
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ newinitd "${FILESDIR}/init.d-r2" supervisord
+ newconfd "${FILESDIR}/conf.d-r1" supervisord
+ dodoc supervisor/skel/sample.conf
+ keepdir /etc/supervisord.d
+ insinto /etc
+ doins "${FILESDIR}/supervisord.conf"
+ keepdir /var/log/supervisor
+ systemd_dounit "${FILESDIR}/supervisord.service"
+}
+
+pkg_preinst() {
+ enewgroup supervisor
+ fowners :supervisor /var/log/supervisor
+ fperms 750 /var/log/supervisor
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ elog "You may install your configuration files in ${EROOT%/}/etc/supervisord.d"
+ elog "For config examples, see ${EROOT%/}/usr/share/doc/${PF}/sample.conf.bz2"
+ elog ""
+ elog "By default, only members of the supervisor group can run supervisorctl."
+ fi
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 8e76eb19eaea..20aad6233b8d 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -33,9 +33,9 @@ DIST syslog-ng-3.19.1.tar.gz 4224779 BLAKE2B e938c91101c18951a5c921bea51631400bf
DIST syslog-ng-3.20.1.tar.gz 4312715 BLAKE2B df37ea15937d67823ddf25fb935be90fed2cb9b1a653d90bb447a3d674c250f6a7963a9bf4623685c5a19e11b928d02aec508d5f061135d67cd4b6d922795ed0 SHA512 19e3896a750ef68923950ca037846808f5d8bd24e64b41a024776a19654def83fce5d48b6e0805b1389494ad1435c5c7af9d79c1188454492f7228f5644ddc5c
DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee067396636e2292261db4f4c98c330e58b1d20e796f7214fd856d885f99fdc9f3db59ab59d3e1e0febda23ff97fdf9fedfc9c SHA512 f9ff35932c0e1af04ed237e9ded764ec1dc38d0cf952aeb1335d67b73f73262f8975cdb2f3908ee77252eef9d4ad3f6228025219bba9df263cd2b380c1c5df81
-EBUILD syslog-ng-3.17.2.ebuild 4922 BLAKE2B 560007f972492182a16701b89558923842ed5c1fa6c7e306abcc4dcc2b839b3b7404dd52214efdc5a1ac7fee0b280548e62b37b0d6a17ee0393f80aa5b0c7717 SHA512 bd08b6fff0e9022e846c7af360df41c2fbaf7d4342b0b7c099053e298b6588c535340c6b613bbc4dec0e9f7b8806b7dded125165cf0ca230733cd9e95b262599
-EBUILD syslog-ng-3.18.1.ebuild 4899 BLAKE2B d8820a1750256a9f5ee34ad3e7249a74cea84000ade2d3e1169106f336ffd3e3e1263db402350acc8693e88bf936aa13e5743ff1e1548cf744f40e2556625aa2 SHA512 3b5f475f9b596acecf905912c0d29b942d51a7d1ee3412adc1f46d658c5902bd7cb6504c6563c217e203fc9876e7253dbeefc8e5c8159c852c9a2fbad25c7d6d
-EBUILD syslog-ng-3.19.1.ebuild 4922 BLAKE2B e4f28cf97b9d63d341c632332e31020cd9bf035d05201defd12fb69b3b24a0fd14eb8db057a3d604e88dbb4b9105c78a9b99daa6d2ea80b2ab547bd909f7c1de SHA512 cf78ed7dd29b8b2a329b3146955690ba05f5b4f30f1747068f843485c9a937ddaf960132c5895ce2102c85bd5fbc46a25d8b181fc6116621aef5c03cfe3775c2
-EBUILD syslog-ng-3.20.1.ebuild 4940 BLAKE2B 2deab6224bca282b5f9f3c1380508c3eaad71600d3e55532aa12f25d23e14728019d1338a65a5d212262f4481703c61ac2ebab9db36b49c37d972b53b0a49510 SHA512 2962a7ee647136645d67b12253e23e257d547542daa8cbc86ed1c550e3eb7b4b913acf9f580ce4dc4cb4761cd7cd8ba6b11ff66e846bd048cee139f614771381
+EBUILD syslog-ng-3.17.2.ebuild 4920 BLAKE2B 2ee995d29e470961d08a0ed8dfeba52eb3a091b2fe17be737e504ec114566db57ac2b933fb1c3b851421e729990ab55c62d56dde80d923f2af67797ec1f53eeb SHA512 ba6e29ea457743897c950ba44785975134aeec9780b064bd1a935d398593a96618688f6b8a13cfabfc61bd5b38cc9640e0422bbc299dc7e190a2348877bdbc07
+EBUILD syslog-ng-3.18.1.ebuild 4897 BLAKE2B e6159007fb47bbe44110bfdda23250761901deb7a071430bd7a37df197375d5f079f8d038b064961eb07cfb6e6bbd044e5bc96c94809af2078652418b07f6da7 SHA512 c1b00c4cc864f145097533d0a6708e1daf3d840c1aea660c149e970fff099b0d3fc83eb5cc4b480c37e5a0325c97a3cca14d1a869f3a14a3eb2055f9127b9421
+EBUILD syslog-ng-3.19.1.ebuild 4920 BLAKE2B ad9cb81bc112bdbb4ae9cf36e53cd11eaa7380e180d2f44f025f46291a8c41c11071ad275d77a063e03ce0472c88c2341d3400a312988ebecbbfa173ad6b76bd SHA512 c937db23ab18b175b5f622a95701531ee43d42b9ca480778608e05fa57bf91635a8517b4f1b86a967d93815b7d77e7f45bb800a6cdb04db9e734a1cf3b0700c2
+EBUILD syslog-ng-3.20.1.ebuild 4944 BLAKE2B 96fd2ab3a27c120aee858ff2d1513023b579b33904735a7cfc109fc20bdd8bf8219a13d753c9ffed50c741b56ee7485d54bf0aebaca1400277cf4b46b10f7e65 SHA512 a89f273c0365cb27bf21de0cc42edc001a4cbdf401d26e524c03c938303d4f4c27452179cee754fe3988713169f5a1fd9654e21412f5d4ffd69b23a9398098a6
EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
MISC metadata.xml 1186 BLAKE2B 8fc7edd7e310b01dc6080332a62ed4ffc5d690d4082f800d8306232c138fac46f07ab7cebcbd40e91c2c41467880bbf61b4bbec0907e84f26cde51d24277f47c SHA512 5d8a62c83706e3bcb01b67e6873f7052c941518d566667e5b50aacdc8fcaf07a02c76ca3705369181795c2c62b5ea990cdb93501e1719d0693d597b5e6f8bee2
diff --git a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
index 465855dfb2c8..681e65a6b85d 100644
--- a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit autotools eapi7-ver python-single-r1 systemd
MY_PV_MM=$(ver_cut 1-2)
diff --git a/app-admin/syslog-ng/syslog-ng-3.18.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.18.1.ebuild
index b694906c3194..be02fccb0921 100644
--- a/app-admin/syslog-ng/syslog-ng-3.18.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.18.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit autotools eapi7-ver python-single-r1 systemd
MY_PV_MM=$(ver_cut 1-2)
diff --git a/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
index 417cb4bf7dde..fd48426d446f 100644
--- a/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit autotools python-single-r1 systemd
MY_PV_MM=$(ver_cut 1-2)
diff --git a/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild
index be35011a8896..d3f2e2cea1b8 100644
--- a/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
# unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index a425c900591f..f9a29defabdc 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -4,11 +4,13 @@ AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f497
AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
DIST sysstat-12.0.3.tar.xz 603064 BLAKE2B 79666c16d7a18aa058f2b8c5e81a16e11a01ba94c809a924d4be6a37cdd67f8755a0112e7f227ceb35b1a4847348de0e6ec34ef3da62c2ea81fceb1590e292ea SHA512 b6f7d27981898faabf4349eb889a767e655ed797aa3f7fac3bdc99968bdb15ed2a7aa04acda610a014022bdc2aa7e603b1c413e0eb8d734db04675fcaa4561ca
-DIST sysstat-12.1.2.tar.xz 608304 BLAKE2B 18c259f4aa43cfd30e9ba62ad39712fef1b3c80ce79ddd8a5afc939d3cc99d94b994f78cea68fd751f3c12311442256f439a2483a817cc7cd0dcf03c952feba9 SHA512 622f1ed1949a156e4cc2451d246dc449afcf3ffc2414363ef14f8da8e1a307e3a28e5b4fd50813c3f6d810bcf112ed13ecc91edbcd0a8c3c626303f333785b83
+DIST sysstat-12.0.4.tar.gz 711554 BLAKE2B b671e185d70787f5773d6824a9838ddd5d5f537c66ac37895f88b6bbddbb78b4d81efa6f962e3b812d025b361ce388583811d4f199e1ffcfe1ba0f2119b6eb88 SHA512 0a47e2b692ac3317cfd72784f21cc03970d7673727c579d403895df0377d09836a1dc76ee5d99076f2c9347f033059d000d982f33ef915130c3a89afdd6dad96
DIST sysstat-12.1.3.tar.xz 553880 BLAKE2B cc520d294fbd38385b2f248721a33b0dd7d7beca422dcd3cc00a2a010b98850d65ceb03e8949b12426c5dc3726cb06f0d63ae30d2792808814b5c5e6912d1a14 SHA512 f264efe377b61d5f62b1ad2c14115bd22ada3a25f726bb362c3cb1a6d45f370642783d547339dc118bf34c6f3d015bba19e88043b0753f8ec6c314778456b726
-EBUILD sysstat-11.4.0.ebuild 1944 BLAKE2B df7ad02ffc15d7a5e8861434a64f9ecb327f88f563a19e572655b88674c8971aeab7797c04382e6fe8e4e288aeea1bac50fc125415dc40fd953bffa76dbed42e SHA512 caaad246ebbee2a9f6bf9259034f3ccfcdadf7b201b2355645b626b1b2335a0d8d756a7b582d297bc32574c5be58111d59f9c3a9657fe519f093145764edf2c3
-EBUILD sysstat-12.0.3.ebuild 1786 BLAKE2B 155d89a10b9c4e4870c62f8229ca2e530413e688c61c5d9e0d1dfa68633040a7a01c6c7713d34c93d52c6f8e01c82cb98dd1511f8cd2815cfd1d06935f12d0ee SHA512 5b480ae929e82e454d69126e51f0d45f9103288a90568e34413c39aa591c8e823c6d9acee55a26e86f7e4dd8f165e11af321b0b5053354cb92bdd876e5b0b7d7
-EBUILD sysstat-12.1.2.ebuild 1786 BLAKE2B 155d89a10b9c4e4870c62f8229ca2e530413e688c61c5d9e0d1dfa68633040a7a01c6c7713d34c93d52c6f8e01c82cb98dd1511f8cd2815cfd1d06935f12d0ee SHA512 5b480ae929e82e454d69126e51f0d45f9103288a90568e34413c39aa591c8e823c6d9acee55a26e86f7e4dd8f165e11af321b0b5053354cb92bdd876e5b0b7d7
+DIST sysstat-12.1.4.tar.gz 738031 BLAKE2B 6803a727bb67e5027400f684d9d93efa6ca22526a1363e04f8bce06a6cd300d4ebf7e02c8f9048fc25794974efa38117dacdf12831bee4bfd43fe40d0b34dbb6 SHA512 e60721408861045bcb1a52b170682df54631926bf4eef5a2709e25b1469c13377026bac3e51f5eeed11c7149b916c00bf5c06a2ff65d9c28063de1ae108b61c2
+EBUILD sysstat-11.4.0.ebuild 1943 BLAKE2B 18bfa393fccb957e8ff519b5e6182f5a3b9155997e9d8acf256d0ab3ead8bf92e0b12a7fb1aa64fea9be7712c8432e049c20d49f41abdb4f233bfa57db20217b SHA512 5186353168b53a613ee0e8d5eeae38e315056b00a71140e3f347c4c8af5e963dada702618e8f3c84f2c25ef483d3270cc50135b28294d32fa5c14ad1cb00a5c9
+EBUILD sysstat-12.0.3.ebuild 1793 BLAKE2B 330c74093228846f82d0ea709f649508b01a1618d7493b60c6be5f34b0583fc7eb7798fc5b386c14bd21a2ee7698ce8b8c098bf00761eda8e55ca6df7d2c0b9d SHA512 7a2a46ecd3be1db6de32abdfcd0e13330b8c7e8a69a986246b0382197d847d36234d084fbbf6b00cec591bebf0741578c8c7b1385a76ef6322b4ee4272702803
+EBUILD sysstat-12.0.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
EBUILD sysstat-12.1.3.ebuild 1793 BLAKE2B 330c74093228846f82d0ea709f649508b01a1618d7493b60c6be5f34b0583fc7eb7798fc5b386c14bd21a2ee7698ce8b8c098bf00761eda8e55ca6df7d2c0b9d SHA512 7a2a46ecd3be1db6de32abdfcd0e13330b8c7e8a69a986246b0382197d847d36234d084fbbf6b00cec591bebf0741578c8c7b1385a76ef6322b4ee4272702803
+EBUILD sysstat-12.1.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
EBUILD sysstat-999999.ebuild 1741 BLAKE2B 17d47e7c1a6f90d9930b1291d54f684889e7f617cd29030cdfecd4909c50c4008e5a35a860a2b1b165c432d7b444debf2fbd2f8aecafe51532ee3b35740f126e SHA512 450f00d7fdd18fff61eac06f2c4cb02aff1a540593812965aa8f29f3338da6c0950e89314eab5fe870a8d024e58126b7015f1b1c920b5a9012099c54a3394260
MISC metadata.xml 336 BLAKE2B ba4225003301f291de8d348fcec269a2f7dc8f729a93e3c974a3eb9712f7fe08f59d799e4bf2e936a1224bfa5fa59d4b4b333aeacde9864313c20e1d3a7f4580 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6
diff --git a/app-admin/sysstat/sysstat-11.4.0.ebuild b/app-admin/sysstat/sysstat-11.4.0.ebuild
index 424766014840..ed42ea423d35 100644
--- a/app-admin/sysstat/sysstat-11.4.0.ebuild
+++ b/app-admin/sysstat/sysstat-11.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="debug isag nls lm_sensors selinux static"
CDEPEND="
diff --git a/app-admin/sysstat/sysstat-12.0.3.ebuild b/app-admin/sysstat/sysstat-12.0.3.ebuild
index d5b74497593a..45e90330a0f9 100644
--- a/app-admin/sysstat/sysstat-12.0.3.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
+inherit eutils flag-o-matic multilib systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
diff --git a/app-admin/sysstat/sysstat-12.1.2.ebuild b/app-admin/sysstat/sysstat-12.0.4.ebuild
index d5b74497593a..b9ca3b9892bd 100644
--- a/app-admin/sysstat/sysstat-12.1.2.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
+inherit eutils flag-o-matic multilib systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-admin/sysstat/sysstat-12.1.4.ebuild b/app-admin/sysstat/sysstat-12.1.4.ebuild
new file mode 100644
index 000000000000..b9ca3b9892bd
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.1.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+ nls? ( virtual/libintl )
+ lm_sensors? ( sys-apps/lm_sensors:= )
+"
+DEPEND="
+ ${CDEPEND}
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-11.0.4-cron.patch
+ "${FILESDIR}"/${PN}-11.7.3-flags.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+ if use nls; then
+ strip-linguas -i nls/
+ local lingua pofile
+ for pofile in nls/*.po; do
+ lingua=${pofile/nls\/}
+ lingua=${lingua/.po}
+ if ! has ${lingua} ${LINGUAS}; then
+ rm "nls/${lingua}.po" || die
+ fi
+ done
+ fi
+
+ default
+}
+
+src_configure() {
+ tc-export AR
+ use static && append-ldflags -static
+
+ sa_lib_dir=/usr/$(get_libdir)/sa \
+ conf_dir=/etc \
+ rcdir=${SYSSTAT_FAKE_RC_DIR} \
+ econf \
+ $(use_enable debug debuginfo) \
+ $(use_enable lm_sensors sensors) \
+ $(use_enable nls) \
+ --enable-copy-only \
+ --enable-documentation \
+ --enable-install-cron \
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+ keepdir /var/log/sa
+
+ emake \
+ CHOWN=true \
+ DESTDIR="${D}" \
+ DOC_DIR=/usr/share/doc/${PF} \
+ MANGRPARG='' \
+ install
+
+ dodoc -r contrib/
+
+ rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+ newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+ systemd_dounit ${PN}.service
+
+ rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index ac40fa428dd7..2de1fe46bc9c 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -1,13 +1,7 @@
DIST systemrescuecd-6.0.0.iso 931135488 BLAKE2B 82879883780ff11a35f2fe635a5ee1a268de590bac79326ac2c49c960cd18755b3c10548d65eb5fb7ce5749c00f5040bb10c5ad5b196e48033fb70e3ff466026 SHA512 9bd8c06338357882fd8e3f17ddfb918e1f69e25fff6460957f9c50d496ccc3d4501e39b4596e3f387e4f7a481c9b33d18ba18fb49d74f6d916a7c5997b24c03a
-DIST systemrescuecd-x86-5.1.2.iso 523479040 BLAKE2B abf6f1e3e05e382b48dcfd4ecde9f70896462418cf36057e3a42dc2366e0b56133deeb6f00363d15d94238c22fb8ac5c88b57ca6c213c9dcc299fa04def5e2cd SHA512 516e60632459dd5408f83035aa265ed4169b13f978a23960a85837c9c8b5bbab70776e22a6e6727184bd9df81cbbeff4a5819d5927ff0ff3a79036bc4c54cfdc
-DIST systemrescuecd-x86-5.2.1.iso 570523648 BLAKE2B 9bb6b2ff7b9930f658baddbf60ef89e86171febcfb48eb0a6ce1bfea8fd3348773a9da948370f9f310dd0e992c40aa64a4ef1442f5cd7f408f847d147074cf1f SHA512 6820f079c9e97ac0d383ed9096a120e7e31771e1d41465f4cf7f5db36a7cb83ccfaae5c5e561181c3b3cb169d4cc4a9a6904a707ecde06a6de4f2456d2a658e4
-DIST systemrescuecd-x86-5.2.2.iso 572006400 BLAKE2B 2cc95acc529ae8e0525664ffbdfefaf6e4513e8135fa6af120121b0b7930b0203bd17d5d70ccafacfe0064bb8615f45aa22b6e6e3fcee8a005a0315fd9b5cf62 SHA512 7dd1ccd63775e35f6589808416468c4a9314f4a7a5d0cb1f2bc34ffb9eef3a450b0da244dfc9e325d828c39404c0cdcce27cc990eade33762c17a1e32f8db9b5
-DIST systemrescuecd-x86-5.3.1.iso 573913088 BLAKE2B 3c4da5777d05999e0b3e30b01dc821a4e840bb22d513fa4bfb9fdf601b9811676be8cee7ed9aae0aa7b971916add500b39172964384a2a07b3ed1cf5b946ba04 SHA512 1038622e148995450e61cd27f65af2ecb929ec8d0367fec3dbde01410a33596ec8f183d79ab931595c21deb597d60dae45ad516d8e1f00f32013729bdcd53ec8
+DIST systemrescuecd-6.0.3.iso 881852416 BLAKE2B ab1064237902542845e11869f7076a829e9593d29b8d106f0309c61a1371173cd5b3ef3fa3b84910cc81bcec485d27c8e297f269820aa96b0043df7c441121a2 SHA512 21b77e38999f56457a4c0a096eb58b2e74a8b376af33290b2e75995762e12a977435e8a9ed2ad9448799c3246d85f3bddfcafea020a1336b14f4f81644e06bb9
DIST systemrescuecd-x86-5.3.2.iso 585920512 BLAKE2B e68bb4e765359ac0e8124c9cb6090ed2ec9340a09e3ebafbcaa4acc175f8afe3985a57f193cd4be4192dfb23a6042a68328a29bbfb962f73fbe010c32d66e020 SHA512 c9da6a63556836bd38f7072b49a5408f2f9e5fa310dbae3f229c9b7af4fe6e073cdfc95b942bc1a6d9c42d41527fc54e8c6c15379082bc3ee0f025da80b01e5a
-EBUILD systemrescuecd-x86-5.1.2.ebuild 2505 BLAKE2B 8bd1804dee5763684cd75635903cb1902021734e1c84e99428e648c21f6ab6e65c74802f9bde24f47a54d97102b4cd29e8234960e47fe62beb6c7c33dfa1cee8 SHA512 8e5151b9bbdb0cf9225e095e9d46efa05fef724cb4b3dc46a2f67338e1f7feea041f1db178ddb9040ebb0d9be56ef8d5ca3a2303d6af335f7851fce1a350366b
-EBUILD systemrescuecd-x86-5.2.1.ebuild 2514 BLAKE2B 152b7f56a650bb47b7de3f27d6360aec78d9447ae71d242373a4f9ee908704db7ebf7db58916ec09d6b5b6cf3e568e91afe2f753845c789639fbd7b377674137 SHA512 1ae0f92d4575f800338d28a97f95394fe73c22449b62c4a4a8472f33f266e9129cab2ef48d882980099b4d0e5fa42ee3187a72dc6a665796835b1a68073db953
-EBUILD systemrescuecd-x86-5.2.2.ebuild 2514 BLAKE2B 152b7f56a650bb47b7de3f27d6360aec78d9447ae71d242373a4f9ee908704db7ebf7db58916ec09d6b5b6cf3e568e91afe2f753845c789639fbd7b377674137 SHA512 1ae0f92d4575f800338d28a97f95394fe73c22449b62c4a4a8472f33f266e9129cab2ef48d882980099b4d0e5fa42ee3187a72dc6a665796835b1a68073db953
-EBUILD systemrescuecd-x86-5.3.1.ebuild 2490 BLAKE2B 4d5df8fc9d9e553b8c9e8968fcd204bbac85cd2c6af8019aa393074ec44a4a2d8191264123d22903e5ad7bb3b2d42b9ac54e17b07305bbc9b0be16a87f7b3008 SHA512 db71a4c728c0fdadc21c141a6d1f217156d4be9d028d1608ca1efa366ec65c6bbc225279290bdfd925f89fe347b0c94df256880eff7fbbe28daa45f6ed31fa8e
EBUILD systemrescuecd-x86-5.3.2.ebuild 2491 BLAKE2B dcfda1a902812b84d00d5386caafdc522a84c75b03852b786441f029f2fb23766bbcf0622f005755c62e192cd2eab2fa782d6db774b55bef9f7b4d6525952b0e SHA512 0286a3c2edc3a7d4a2fa3a96476e2179936e9e024464bcd155c9fe759fb346d3df6b1c371c2b4d422f745bc6af3f307f95cbea3e607b9d76c6e08a17a474754e
EBUILD systemrescuecd-x86-6.0.0.ebuild 2147 BLAKE2B ed068ad0a612eb7ff49b93e0a9653c888e66ea7938a70e7475b973aeffad42127d0077a8850ab0c0f8b4a76f8da5f6394dc715b3decc6d4411d978bfd82c8e7d SHA512 15a2db37a09a2082dda70cc9e7b785f6dc0838e77f15b58f87820fe0c42d9856ca1f69d7f1bd8abac22f954f30dfc52978e4b0c50c6535474d8b1a33f24851d9
+EBUILD systemrescuecd-x86-6.0.3.ebuild 2105 BLAKE2B 805cd8fb4d2b896220c3ca624c1b7d647e5a0636b50fac93b6a1defc3e4b4cb02ce5df6608d41c24efae5cca7605f602690c27c5d9cb678b446f7dc9845655ae SHA512 338edfaa329f3df1fbc5c6aa6ee1d1ca17113065ed6fb5432b999b63085417b96d52ad722edfada05e036cdf28cd209b6af1e7d9d3e3958332c593615283f4e5
MISC metadata.xml 610 BLAKE2B 400c26cbce80747fe88b60d34ea0f018b7119ad6ef333e8de931424aaa929db90ba0836a4520fbe62baa0c7aa9992745c4c082e495f318066acf5285e56dcd10 SHA512 5092c69f83df351b3697ab0c83e165eba5c7ceffd197707047bdd4d2e809ff7267e436e91e3035223beb088c48835ae28fd4032a8122687af116fa1405b30b15
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild
deleted file mode 100644
index 8fa41fc9f79e..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.1.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="AGPL-3 Apache-2.0 APSL-2 Artistic Artistic-2 Atmel bh-luxi BitstreamVera boehm-gc BSD BSD-1 BSD-2 BSD-4 BZIP2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 CC-PD CDDL-Schily Clarified-Artistic CPL-1.0 EPL-1.0 FDL-1.1 FDL-1.2+ FDL-1.3 FDL-1.3+ FLTK freedist FTL GPL-1+ GPL-2 GPL-2+ GPL-2-with-font-exception GPL-3 GPL-3+ HPND icu IJG Info-ZIP inner-net ipw2100-fw ipw2200-fw ISC Kermit LGPL-2 LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ libpng linux-firmware lsof man-pages man-pages-posix-2013 MIT MPL-1.1 MPL-2.0 netcat ngrep no-source-code NPL-1.1 OFL-1.1 Old-MIT openafs-krb5-a OPENLDAP openssl PCRE PSF-2 PSF-2.4 public-domain rc rdisc RSA Sleepycat SMAIL SSLeay symlinks tcltk tcp_wrappers_license unRAR vim wxWinLL-3 ZLIB ZSH || ( AFL-2.1 GPL-2 ) || ( BSD GPL-3 HIDAPI ) || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) || ( Ruby BSD-2 ) || ( Ruby GPL-2 ) || ( Ruby MIT ) || ( Ruby-BSD BSD-2 )"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-RESTRICT="bindist mirror"
-
-src_install() {
- insinto "/usr/share/${PN%-*}"
- doins "${DISTDIR}/${P}.iso"
-
- if use isohybrid; then
- set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
- echo "${@}"
- "${@}" || die "${*} failed"
- fi
-}
-
-pkg_postinst() {
- local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
- # no version newer than ours? we're the newest!
- if ! has_version ">${CATEGORY}/${PF}"; then
- ln -f -s -v "${P}.iso" "${f}" || die
- fi
-}
-
-pkg_postrm() {
- local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
- # if there is no version newer than ours installed
- if ! has_version ">${CATEGORY}/${PF}"; then
- # and we are truly and completely uninstalled...
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- # then find an older version to set the symlink to
- local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
- if [[ ${newest_version} ]]; then
- # update the symlink
- ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
- else
- # last version removed? clean up the symlink
- rm -v "${f}" || die
- # and the parent directory
- rmdir "${f%/*}" || die
- fi
- fi
- fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild
deleted file mode 100644
index 3e37971f63a7..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="AGPL-3 Apache-2.0 APSL-2 Artistic Artistic-2 Atmel bh-luxi BitstreamVera boehm-gc BSD BSD-1 BSD-2 BSD-4 BZIP2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 CC-PD CDDL-Schily Clarified-Artistic CPL-1.0 EPL-1.0 FDL-1.1 FDL-1.2+ FDL-1.3 FDL-1.3+ FLTK freedist FTL GPL-1+ GPL-2 GPL-2+ GPL-2-with-font-exception GPL-3 GPL-3+ HPND icu IJG Info-ZIP inner-net ipw2100-fw ipw2200-fw ISC Kermit LGPL-2 LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ libpng linux-firmware lsof man-pages man-pages-posix-2013 MIT MPL-1.1 MPL-2.0 netcat ngrep no-source-code NPL-1.1 OFL-1.1 Old-MIT openafs-krb5-a OPENLDAP openssl PCRE PSF-2 PSF-2.4 public-domain rc rdisc RSA Sleepycat SMAIL SSLeay symlinks tcltk tcp_wrappers_license unRAR UoI-NCSA vim wxWinLL-3 ZLIB ZSH || ( AFL-2.1 GPL-2 ) || ( BSD GPL-3 HIDAPI ) || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) || ( Ruby BSD-2 ) || ( Ruby GPL-2 ) || ( Ruby MIT ) || ( Ruby-BSD BSD-2 )"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-RESTRICT="bindist mirror"
-
-src_install() {
- insinto "/usr/share/${PN%-*}"
- doins "${DISTDIR}/${P}.iso"
-
- if use isohybrid; then
- set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
- echo "${@}"
- "${@}" || die "${*} failed"
- fi
-}
-
-pkg_postinst() {
- local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
- # no version newer than ours? we're the newest!
- if ! has_version ">${CATEGORY}/${PF}"; then
- ln -f -s -v "${P}.iso" "${f}" || die
- fi
-}
-
-pkg_postrm() {
- local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
- # if there is no version newer than ours installed
- if ! has_version ">${CATEGORY}/${PF}"; then
- # and we are truly and completely uninstalled...
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- # then find an older version to set the symlink to
- local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
- if [[ ${newest_version} ]]; then
- # update the symlink
- ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
- else
- # last version removed? clean up the symlink
- rm -v "${f}" || die
- # and the parent directory
- rmdir "${f%/*}" || die
- fi
- fi
- fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild
deleted file mode 100644
index 3e37971f63a7..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.2.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="AGPL-3 Apache-2.0 APSL-2 Artistic Artistic-2 Atmel bh-luxi BitstreamVera boehm-gc BSD BSD-1 BSD-2 BSD-4 BZIP2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 CC-PD CDDL-Schily Clarified-Artistic CPL-1.0 EPL-1.0 FDL-1.1 FDL-1.2+ FDL-1.3 FDL-1.3+ FLTK freedist FTL GPL-1+ GPL-2 GPL-2+ GPL-2-with-font-exception GPL-3 GPL-3+ HPND icu IJG Info-ZIP inner-net ipw2100-fw ipw2200-fw ISC Kermit LGPL-2 LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ libpng linux-firmware lsof man-pages man-pages-posix-2013 MIT MPL-1.1 MPL-2.0 netcat ngrep no-source-code NPL-1.1 OFL-1.1 Old-MIT openafs-krb5-a OPENLDAP openssl PCRE PSF-2 PSF-2.4 public-domain rc rdisc RSA Sleepycat SMAIL SSLeay symlinks tcltk tcp_wrappers_license unRAR UoI-NCSA vim wxWinLL-3 ZLIB ZSH || ( AFL-2.1 GPL-2 ) || ( BSD GPL-3 HIDAPI ) || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) || ( Ruby BSD-2 ) || ( Ruby GPL-2 ) || ( Ruby MIT ) || ( Ruby-BSD BSD-2 )"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-RESTRICT="bindist mirror"
-
-src_install() {
- insinto "/usr/share/${PN%-*}"
- doins "${DISTDIR}/${P}.iso"
-
- if use isohybrid; then
- set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
- echo "${@}"
- "${@}" || die "${*} failed"
- fi
-}
-
-pkg_postinst() {
- local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
- # no version newer than ours? we're the newest!
- if ! has_version ">${CATEGORY}/${PF}"; then
- ln -f -s -v "${P}.iso" "${f}" || die
- fi
-}
-
-pkg_postrm() {
- local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
- # if there is no version newer than ours installed
- if ! has_version ">${CATEGORY}/${PF}"; then
- # and we are truly and completely uninstalled...
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- # then find an older version to set the symlink to
- local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
- if [[ ${newest_version} ]]; then
- # update the symlink
- ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
- else
- # last version removed? clean up the symlink
- rm -v "${f}" || die
- # and the parent directory
- rmdir "${f%/*}" || die
- fi
- fi
- fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild
deleted file mode 100644
index 2c8814981ce0..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="AGPL-3 Apache-2.0 APSL-2 Artistic Artistic-2 Atmel bh-luxi BitstreamVera boehm-gc BSD BSD-1 BSD-2 BSD-4 BZIP2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 CC-PD CDDL-Schily Clarified-Artistic CPL-1.0 EPL-1.0 FDL-1.1 FDL-1.2+ FDL-1.3 FDL-1.3+ FLTK freedist FTL GPL-1+ GPL-2 GPL-2+ GPL-2-with-font-exception GPL-3 GPL-3+ HPND icu IJG Info-ZIP inner-net ipw2100-fw ipw2200-fw ISC Kermit LGPL-2 LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ libpng linux-firmware lsof man-pages man-pages-posix-2013 MIT MPL-1.1 MPL-2.0 netcat ngrep no-source-code NPL-1.1 OFL-1.1 Old-MIT openafs-krb5-a OPENLDAP openssl PCRE PSF-2 PSF-2.4 public-domain rc rdisc RSA Sleepycat SMAIL SSLeay symlinks tcltk tcp_wrappers_license unRAR UoI-NCSA vim wxWinLL-3 ZLIB ZSH || ( AFL-2.1 GPL-2 ) || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) || ( Ruby BSD-2 ) || ( Ruby GPL-2 ) || ( Ruby MIT ) || ( Ruby-BSD BSD-2 )"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-RESTRICT="bindist mirror"
-
-src_install() {
- insinto "/usr/share/${PN%-*}"
- doins "${DISTDIR}/${P}.iso"
-
- if use isohybrid; then
- set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
- echo "${@}"
- "${@}" || die "${*} failed"
- fi
-}
-
-pkg_postinst() {
- local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
- # no version newer than ours? we're the newest!
- if ! has_version ">${CATEGORY}/${PF}"; then
- ln -f -s -v "${P}.iso" "${f}" || die
- fi
-}
-
-pkg_postrm() {
- local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
- # if there is no version newer than ours installed
- if ! has_version ">${CATEGORY}/${PF}"; then
- # and we are truly and completely uninstalled...
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- # then find an older version to set the symlink to
- local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
- if [[ ${newest_version} ]]; then
- # update the symlink
- ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
- else
- # last version removed? clean up the symlink
- rm -v "${f}" || die
- # and the parent directory
- rmdir "${f%/*}" || die
- fi
- fi
- fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.3.ebuild
new file mode 100644
index 000000000000..7cfd100cadf5
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${P/-x86/}
+DESCRIPTION="The .iso image of SystemRescueCD rescue disk, amd64 variant"
+HOMEPAGE="http://www.sysresccd.org/"
+SRC_URI="https://osdn.net/projects/systemrescuecd/storage/releases/${PV}/${MY_P}.iso"
+
+LICENSE="Apache-1.0 Apache-2.0 Artistic Artistic-2 BEER-WARE BSD BSD-2 BSD-4 CC0-1.0 CC-BY-SA-3.0 FDL-1.3+ GPL-2 GPL-2+ GPL-3+ icu ISC JasPer2.0 LGPL-2+ LGPL-2.1+ LGPL-3+ linux-firmware MaxMind2 MIT MPL-1.1 MPL-2.0 no-source-code OFL Old-MIT OPENLDAP openssl PSF-2 public-domain Sleepycat unRAR UoI-NCSA vim ZLIB"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+RESTRICT="bindist mirror"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+pkg_pretend() {
+ ewarn "Please note that starting with version 6.0.0, upstream has switched"
+ ewarn "to Arch Linux as base of their distribution, and running on 32-bit"
+ ewarn "systems is no longer supported."
+}
+
+src_unpack() { :; }
+
+src_install() {
+ insinto "/usr/share/${PN%-*}"
+ doins "${DISTDIR}/${MY_P}.iso"
+
+ if use isohybrid; then
+ set -- isohybrid -u "${ED%/}/usr/share/${PN%-*}/${MY_P}.iso"
+ echo "${@}"
+ "${@}" || die "${*} failed"
+ fi
+}
+
+pkg_postinst() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # no version newer than ours? we're the newest!
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ ln -f -s -v "${MY_P}.iso" "${f}" || die
+ fi
+}
+
+pkg_postrm() {
+ local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+ # if there is no version newer than ours installed
+ if ! has_version ">${CATEGORY}/${PF}"; then
+ # and we are truly and completely uninstalled...
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ # then find an older version to set the symlink to
+ local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+ if [[ ${newest_version} ]]; then
+ # update the symlink
+ ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+ else
+ # last version removed? clean up the symlink
+ rm -v "${f}" || die
+ # and the parent directory
+ rmdir "${f%/*}" || die
+ fi
+ fi
+ fi
+}
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 93424490787a..33830f7902a9 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1,3 +1,5 @@
DIST terraform-0.11.12.tar.gz 10907800 BLAKE2B d6d3c0a25b994be9b61e250a35adae55ed6cea0cc2166ea62774940292d9e881f16b66b88b19d5fd2c64d19bdefb82b58c79c54d8c641e1ad2970ef9a463c4c8 SHA512 2163cbc13a2bd37b7dace0a4ee2b3da4ee212038f9d6e11b83e509a794cf8d854040c366a099c9560a149157c6951b1f9d1698b4c47bd11a4fa96c4521e93414
-EBUILD terraform-0.11.12.ebuild 852 BLAKE2B 14c3a52a8112435c7151853b3c00b9e698e99461ab14f8f56b1118773d5c3a9eb43e1ce2256c8af03d414a7844ee41d151412f5be9904e592981285d984716f9 SHA512 90359cc4f9ea782b3829b94ebd6620f3faa859160733b325789d1faf75b55ad40ed34c7c3ffe4c0670911b23fb2a0603a7d5591fff720e98229b5ab77d4aafc8
+DIST terraform-0.11.13.tar.gz 10906645 BLAKE2B dafdc1acddd4ea97b41cc5899a541701731fce7b13b914c0859fe148b10b5c8ac877d71b665e8d80a65f376bb09fb8ae6fd0e0263ff711a156ca48119522f89d SHA512 1c16f20d1a65c763f1091ff2d20e0752e62903e07a12d41dd722e5c4c989f477da7d64901336d7536ed1693d5c82f4548ae5a643edae85b4e83325fc8c81b245
+EBUILD terraform-0.11.12.ebuild 877 BLAKE2B 323146e7839983be9a5d6cade8082cf0ddaffe4bcdc664ca25828598f15ccc30ca2a433bbbc832f424592db33e57af0b5347557b2cadd85eb7f7c406310bf944 SHA512 b875aac0c3e202b07c19e6ed93ea5e1f0ca85fa14e7df1bb32c1621a024e345d668e89f6f4d4bec24d7c7a4fc81de49924f7b53be84f261619ec8b7c1280d27f
+EBUILD terraform-0.11.13.ebuild 876 BLAKE2B 5b62cb3e2ffffc599f1da2c7fe0a083f944b95a86e617bf7fefda8fecb0f7a92936990c3fff78f219c0e2b31a9264067e7b6c2ee6e4e38f0e5700af392e5e415 SHA512 f94d55f7c68710d082c8afadfe5a75a7daff664588becfeddeb3055b6e5e316ce35bb46dfe278e342922e95fb5d1ce89a13c286c4b03f2511db9ea49e1d4e253
MISC metadata.xml 1185 BLAKE2B 4e3e36b75d012f5a48886bc4cbce9f2f597b15060cf5298036690e3832e909ac6e08a729b477de9b893a38ea8cb634c8abefeb5776a14a790f5b4d8a7b86bc38 SHA512 8f52d688db4c37ddbdbca03c5a2f8fc49fa9a0765902e34559408f5f14230c12bc2b160768d3c9cbc978a0ee01e5f3c8a50aef00786a96f42725db54cb845d03
diff --git a/app-admin/terraform/terraform-0.11.12.ebuild b/app-admin/terraform/terraform-0.11.12.ebuild
index 7fbea19820fc..a70144a8d83f 100644
--- a/app-admin/terraform/terraform-0.11.12.ebuild
+++ b/app-admin/terraform/terraform-0.11.12.ebuild
@@ -15,9 +15,10 @@ LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
+
DEPEND=">=dev-lang/go-1.11.0"
-DOCS="README.md CHANGELOG.md"
+DOCS=( README.md CHANGELOG.md )
src_compile() {
cd "src/${EGO_PN}" || die
@@ -28,9 +29,9 @@ src_compile() {
src_install() {
dobin terraform
- pushd "src/${EGO_PN}" || die
+ pushd "src/${EGO_PN}" >/dev/null || die
einstalldocs
- popd || die
+ popd >/dev/null || die
}
pkg_postinst() {
diff --git a/app-admin/terraform/terraform-0.11.13.ebuild b/app-admin/terraform/terraform-0.11.13.ebuild
new file mode 100644
index 000000000000..ae68474b0f4d
--- /dev/null
+++ b/app-admin/terraform/terraform-0.11.13.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_PN="github.com/hashicorp/${PN}"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND=">=dev-lang/go-1.11.0"
+
+DOCS=( README.md CHANGELOG.md )
+
+src_compile() {
+ cd "src/${EGO_PN}" || die
+ GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
+ -v -work -o "${S}/${PN}" ./ || die
+}
+
+src_install() {
+ dobin terraform
+
+ pushd "src/${EGO_PN}" >/dev/null || die
+ einstalldocs
+ popd >/dev/null || die
+}
+
+pkg_postinst() {
+ elog "If you would like to install shell completions please run:"
+ elog " terraform -install-autocomplete"
+}
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 741bbd24b843..597f66949e4f 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -7,8 +7,8 @@ DIST webapp-config-1.53.tar.bz2 63429 BLAKE2B bb13d52a4c19859ff4730df2f7db75452e
DIST webapp-config-1.54.tar.bz2 58954 BLAKE2B 42a4305c51ccb8bb9db455c6ae2663b5d17c9d477eee3e504569c802e5f0d10183f3e6cd1e747462dcc0559d6ed7ba53a8b5607ed422f34813a33e0e8148bb90 SHA512 fa61e88696eaed130575e5ae9a17ec827aa14aece359e5ba43fa723ad00083def22e44fb02d99fc5ba6000a5949c5ce7aecea9307d2bfae333e202ef111dcd31
DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3f23d52971f6013165ce59a8f4b32ac6262c9719956d1bcdbe60797f07d77910b44a749ae545c4dc15f765525144709 SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438
EBUILD webapp-config-1.52-r1.ebuild 1606 BLAKE2B 9f9f8643009e63730bc35ef404784d4883dfc396cf901d1cd13099c49bd8ccd5fea30603d2f8a2951dabcc5f4c9755a1cebde4457e4a26aed54bcce26530d4d8 SHA512 bff85d0cd35afc3fc99525ea34db8a6a49c0aa56b91ba4e8a6ad5dab9f5a34880b7f193166c0cdc40d37e51741306e091a080dfb363cc5d5401a315fce0d4d79
-EBUILD webapp-config-1.53-r2.ebuild 1690 BLAKE2B 07202fd26910ab49aeaeb12ccbacde118d19bbb99e748fa454add902b38fcbfe7b4444c668ffe3c0c7727f2915fb7fd687893d67c178d3f988d89f8deafee7b4 SHA512 3d4ba6d9bfae336fab02b3fcd5b5d11b7c28dbdaf2d32594e98ad79c321914af33cc9c761d7fb7b6b4f734e35f8d47734712d2866ca7981e4c4b296135638b46
-EBUILD webapp-config-1.54-r2.ebuild 1743 BLAKE2B 4fd352e2f29ba7289935662e424a9cbdc1e484b2021f027cb60c102aa790621535a8861e0a0f9dae07556ee303d1ffc109735c7e0db1beb2c7f0d0434ec04a55 SHA512 be5330d0ecd6d05d8a5a539baaffd1919079bbbf22eb508789ef306a0e9cdc513268a3ca19fde73ebc7182adff30b34813fe47d1226b8d66758fd6f2da8525d3
-EBUILD webapp-config-1.55-r1.ebuild 1753 BLAKE2B 267a9bfe7a893fb84139f23c1b4596b6b8c7b1ba93ff805c21c4c00943542f810245de041cade300b75e6058aaa45bbf5fb70082d3a80ffb8d740a891eb4fa80 SHA512 ef991e949a2e1aa214ddad92d3806adc8eebbcc592e3bcc7444877478985822e36e91da26349431dd63e14d3ab8dadedef5960e41d594dca67c4898e63821d0b
-EBUILD webapp-config-9999.ebuild 1879 BLAKE2B 3661e255a7b8b3eec9990c37099e27418f98bc0b314a0379fe1dd90a28bfd1750c6f2f196a3b742e22477cbf48c18b1cc794ad9018819480afb61e76973ef488 SHA512 a83ad8c1c696fd6794b98463d3c45fb255c2c09111873618f976f704eb09b8bb546bcb22c26ed40a153f563801afb9c0c241287a3880f2e99d453891a4ee501b
+EBUILD webapp-config-1.53-r2.ebuild 1681 BLAKE2B fcd34092a599031d937b6493db7623d92e2744c313c93abd2ec81ef732f06f9f08e3f16c23f1ecdeabea6c69754ce16cb97d6fdf3242d4bc0ae66456044b9f81 SHA512 cd626595ae8c4ac134088870d409311cabcc787a08766a945210e7f2c0ba464b985f899812cf0d291e8cb602c3116026fd1b10d66ad05d8753b7d721ed9641e6
+EBUILD webapp-config-1.54-r2.ebuild 1736 BLAKE2B b4d7b8e5996f95ffc3f334d00ae9e78f13f839e09c844034071060a63ca56527adf51c20424aa26c0649dd59deccd4be9278a00f3a4b3b5c50a97d7d978e8edc SHA512 87093f86927d996abaeb289a3f629783142c1f58a669d0d1643af2b686e76c232d6acf2f7319d6461b837f0a81b44f9b9200b4abce84deead4b472d7033ed32b
+EBUILD webapp-config-1.55-r1.ebuild 1746 BLAKE2B 3c96f1f78711fdb87d4155206a4214792a3579d4f3652d2667eb4f52986a2f117a3bb94cc49502068c234c9041f002be79f6448dc9c8c2dae071013bd0cae0b3 SHA512 99e4ab94f3fb0bb0fd738035bb37bafc0127fd3618b648c9ee462e875adbd0cab05d446bad62fb5982f2c01ebccaaad168d4d4525fa9d17c15923ebe337a0e84
+EBUILD webapp-config-9999.ebuild 1872 BLAKE2B ab366fb1d26ac3a7833e96bf7bc6ac81b33406a4e1ae08d12d37784ec95ff139887df7df28cbec0eb30edbd5481772618398c581c568fc64d0aad2ab458a7229 SHA512 c29ddecb501ba60f8820770748f9f5e33b33cbcbcea802b7b4edb15398b8cd7e533f35f7ea966ccc27fe29344008603783b62c38a6932f264980dfd63631fcf9
MISC metadata.xml 549 BLAKE2B 44f2ec07f40387bd51440d500cacc4ff24cbb3d1ec2e1c9bec29119a589e4c4bb005723d861be2ab9c1929d74d209c10771de5500eedb56e44265969129201be SHA512 1c99c9b52ab10378a3716d3f6dd1d6f70f61ac6bcf0c8a934254b71376a429f601358ad1108292e03ab780bc6c53810fd8a484e42a4ad6f959fb1903ed591b7b
diff --git a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
index e7084845cb46..15de132f0265 100644
--- a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
RESTRICT="test"
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
diff --git a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
index d364cbb45113..ef021cd91a8d 100644
--- a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
inherit distutils-r1
diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
index c70dc1eac209..3025b6d1a795 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
inherit distutils-r1 prefix
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 6ce237b3e82c..2dbfe48a89db 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
inherit distutils-r1 prefix