summaryrefslogtreecommitdiff
path: root/app-admin
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/Manifest.gzbin32870 -> 33029 bytes
-rw-r--r--app-admin/ansible-base/Manifest2
-rw-r--r--app-admin/ansible-base/ansible-base-2.11.4.ebuild63
-rw-r--r--app-admin/awscli/Manifest12
-rw-r--r--app-admin/awscli/awscli-1.20.24.ebuild (renamed from app-admin/awscli/awscli-1.20.22.ebuild)0
-rw-r--r--app-admin/awscli/awscli-1.20.25.ebuild (renamed from app-admin/awscli/awscli-1.19.112.ebuild)2
-rw-r--r--app-admin/awscli/awscli-1.20.26.ebuild58
-rw-r--r--app-admin/awscli/awscli-1.20.7.ebuild2
-rw-r--r--app-admin/conky/Manifest4
-rw-r--r--app-admin/conky/conky-1.11.6-r2.ebuild194
-rw-r--r--app-admin/conky/conky-1.12.1.ebuild193
-rw-r--r--app-admin/conky/files/conky-1.11.6-fpermissive.patch29
-rw-r--r--app-admin/conserver/Manifest2
-rw-r--r--app-admin/conserver/conserver-8.2.6-r3.ebuild (renamed from app-admin/conserver/conserver-8.2.6-r2.ebuild)2
-rw-r--r--app-admin/doas/Manifest2
-rw-r--r--app-admin/doas/doas-6.8.1-r1.ebuild2
-rw-r--r--app-admin/exo/Manifest4
-rw-r--r--app-admin/exo/exo-1.40.3.ebuild (renamed from app-admin/exo/exo-1.40.2.ebuild)0
-rw-r--r--app-admin/gnome-abrt/Manifest2
-rw-r--r--app-admin/gnome-abrt/gnome-abrt-1.4.0.ebuild57
-rw-r--r--app-admin/hcloud/Manifest4
-rw-r--r--app-admin/hcloud/hcloud-1.28.0.ebuild (renamed from app-admin/hcloud/hcloud-1.26.1.ebuild)0
-rw-r--r--app-admin/mongo-tools/Manifest4
-rw-r--r--app-admin/mongo-tools/mongo-tools-100.4.1.ebuild61
-rw-r--r--app-admin/mongo-tools/mongo-tools-4.2.15.ebuild64
-rw-r--r--app-admin/mongosh-bin/Manifest4
-rw-r--r--app-admin/mongosh-bin/metadata.xml19
-rw-r--r--app-admin/mongosh-bin/mongosh-bin-1.0.4.ebuild37
-rw-r--r--app-admin/puppet-agent/Manifest2
-rw-r--r--app-admin/puppet-agent/puppet-agent-7.10.0.ebuild78
-rw-r--r--app-admin/puppet/Manifest2
-rw-r--r--app-admin/puppet/puppet-7.10.0.ebuild132
-rw-r--r--app-admin/puppetserver/Manifest2
-rw-r--r--app-admin/puppetserver/puppetserver-7.3.0.ebuild131
-rw-r--r--app-admin/tmpwatch/Manifest6
-rw-r--r--app-admin/tmpwatch/files/tmpwatch.cron40
-rw-r--r--app-admin/tmpwatch/metadata.xml2
-rw-r--r--app-admin/tmpwatch/tmpwatch-2.11-r3.ebuild (renamed from app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild)0
38 files changed, 758 insertions, 460 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index af7f5f7691ef..81582df52bd6 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
Binary files differ
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index 2f04958b2aa3..339727761166 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -2,9 +2,11 @@ DIST ansible-base-2.10.10.tar.gz 5986488 BLAKE2B 5c793d25ac5a216d05e15f49cd447cb
DIST ansible-base-2.10.9.tar.gz 6039597 BLAKE2B de455cc402ae4c5c4acd6b1c3d3f2e16572d4a4e79c5f3e4151ec8b913a3be0cfbcb42e5743fe627b7aba9b0e6b004189960cd5a17ff46166cd033a952d3c560 SHA512 093514230a3f6680ddeda07c24e77c2e793475895f44da6e5dd68335341d6fefe10091a124cf84e18475257a099b39fd2c16e6fc0dae0bbaf2d26e70b09c277a
DIST ansible-core-2.11.2.tar.gz 7081783 BLAKE2B 64a2e02c4e44e72383bfb291efcde07a85ae553418e27687fbc12acdc45608e9b89e9f64943ad7f98a6de094f61765ac3e89fa84e66ed634e764a5f9581c6bd5 SHA512 8b4a8e329be9375d3226f8b992223198913226527278c14ccec01d8e7c546cca847cf7d2415440be995d236bdd88640c0dd6f740e91ca748de2d1c5b7b52c921
DIST ansible-core-2.11.3.tar.gz 6841255 BLAKE2B fde1143515d04121de79ddb2c14bf326f9efa596c39418b9def1679539dd144551b64dff83c66795e44f48e776dbc60bc456125904bbb64970f8c44e072b5abf SHA512 93a28200dd0ab289cc05add5fbe46a1cfbbd4ba91fc7d7e95ee4060dc4f126bf4bd4affce5e44dac9cf2c12792b2a2a10b97d96b795f5bed579959391b7c4a65
+DIST ansible-core-2.11.4.tar.gz 6843603 BLAKE2B fa8e72a9e77633b1b43a9a290d92db009e95ed87357f666059ed7898031f584c993ebeb6acec8cad29376666f3a714a742f4e52ac8f2baaf5d01c02796b64acd SHA512 9385a3877e6e9a25d244c855cf50c0c6b62a91cc9cebc5e7b5b5ec23424b3e3dcddd71e7367482a03996fcd5d591ad29771edd19d62758ae61473f97a5c9351d
EBUILD ansible-base-2.10.10.ebuild 1633 BLAKE2B 425db4ea1e64c960b86d56cccddeb59edd838f389bb685c145babd0e885677de76b364383b801f7ffbdc61fd6a46f8baa24c26e45f00e984aa162bbcac4ae24b SHA512 2b67326ac2653e03b37829db0952232183b2f79d7e66c3d5a78847f17b2f5f93f27bccf39e164af56f80c1ee8acb69c3379bb6107c0e987aeeabb6caf3547c52
EBUILD ansible-base-2.10.9.ebuild 1630 BLAKE2B 1893c43eb9482e3899c4695a6378f85f945fb71ae968845672a6f806be576d5746ef505b0ef63c87b49e4e7a406d772353846ae923c363844d2fe2dc66b5a33b SHA512 66db0cdc15878cc5378a8b63644b7e143fad646342d763c83b8a58de3cc117093495f8a5945daffb93b3219beaa47a0c1564c8fba14611c5a1054789ac8dc99b
EBUILD ansible-base-2.11.2.ebuild 1603 BLAKE2B 8ca4f3d4c4a1e494e0efe5bba55de5e71ca5e229c86c5046181d8d89e890115b823ad99d133c3ec22b06dd653cd23b65b159bc83cdbe990c2c527c0bb8bca9f5 SHA512 2513a5654edbce7a6161044f6983f3b8f041f1b158598c64d14e242afc642309be559b89899472ceec5b253a1792909ccc1bd20d3bf82175eeac360ef6568d4a
EBUILD ansible-base-2.11.3.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
+EBUILD ansible-base-2.11.4.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
EBUILD ansible-base-9999.ebuild 1606 BLAKE2B f5d805b706337149762eab7784e4c5bfff8496942c28393cf3828b4b54295eefc3e54a1c2e39a4587f67efb2364e60dcda2db9def915c7f384b938ed8cc004e9 SHA512 e4078679b5219f77b3fb3bea15625ab34082a4b09cf4a83555e52b88a682d6ad42f8a345933c8143609c0492b4d6a70ee7093aa8a96503ab68188f9b258b149f
MISC metadata.xml 1039 BLAKE2B f5dae1c1a1b61e63b24a07d2de97caa4e50b7ef0d5d19b094e917d31e24fe7eb187505fd2841cd6e5a3ad20461a0f645b30732d7ac909503f35cdfb1f2bd3316 SHA512 6431f60bcde845ad153894cb4149418918a2250f7011ca73794635334ca12a1e550c40d002eaf45ae725d0ff510b8fb3b0815e94df69b744f027ffa797534a32
diff --git a/app-admin/ansible-base/ansible-base-2.11.4.ebuild b/app-admin/ansible-base/ansible-base-2.11.4.ebuild
new file mode 100644
index 000000000000..459607c5a037
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.11.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+ EGIT_BRANCH="devel"
+else
+ MY_PN="${PN/-base/-core}"
+ MY_P="${MY_PN}-${PV}"
+ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+ S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ >=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+ <dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+"
+DEPEND="
+ >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+python_compile() {
+ export ANSIBLE_SKIP_CONFLICT_CHECK=1
+ distutils-r1_python_compile
+}
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 5cffd98e7004..b153a6148d67 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,12 +1,14 @@
AUX awscli-1.19.47-py39.patch 2498 BLAKE2B 39f698d756422eecbb6a37bec572f00e184775b816f467d1b0275740b59678518db7ae44240476048c0f11d8d01403e8f9a03ad0f64414206fe77c15c4d695d0 SHA512 6a80d35495b63572e5e8ee6550a1c693d71adceaad79fba9d097668049a5c9d425b7eaaba008458cde8eb3e406e6e2850b6d43e6a610e9f28cb44278b231312a
-DIST awscli-1.19.112.tar.gz 2028010 BLAKE2B c5f973a2a0cf002038cdc46d0760f5e5fad942b1383f21819459d51fd3e3a17617e23d45d284345fac1760a812ffc81842068e8517bb500559a330ea8183968e SHA512 4ad9e960826baa057a2e72ddc2afce1012b766b5f691236435347c3e4ce210ee0b14003c16615262ec707d0c65b7f7f71a15fcf80a0fdfefb21ab6a28cfb1d55
DIST awscli-1.20.15.tar.gz 2048948 BLAKE2B e7d378c9cb1752f4b7e014578d07fdc5f7bd9c14dc5fa33328a29c8fb9c9fab27f404dbfeea5952c243aeb35b0800c7840303d5f1339512d74cee2e4a5d590a1 SHA512 34c482067c3534737956520e5f6f0b3d30296f6de06969fe3ab43146a3190e36b432ea3642917c91e82659d5e79337add973f3f79216214f6b03b5cd15b363f2
DIST awscli-1.20.21.tar.gz 2055227 BLAKE2B 6448527363ca25f039fa9e461bf5f6451e2ecb308a29b3b62c2303d756476c45f60b5356bf32894d780deb8d9e459d83e2520ce09f5ea5f3b1e9435f8180d4ce SHA512 58b9323b8bdb07bd48814cf11fc03f9c4ffda01d1d0c85d4a77425ca37848a2cb3a6222b12c31e5897b348ef265cc94d842d9fd6b4a66bb3cfc8b37b038361cf
-DIST awscli-1.20.22.tar.gz 2056520 BLAKE2B 67f5dfb31592d84684956feb1007e69efb05550da5049733835a53cbc1c6b37ee8efd0e2f684740e525688e8832f11e7f2ed68312ae2fcc7013af9d8bc2bec3c SHA512 ceb1cad7920216636c57221ffe7cea204d8d6d26de0a53ead617a6a807d7565e81bb730736dcdfdbb41e3ea9a294c8e211f3cab77e69a0a8684229cc12e13207
+DIST awscli-1.20.24.tar.gz 2056924 BLAKE2B d76475f3ac63ebf5c8e46154cc884b52c59b897cdddd709ed9c143dbb4f0a7169ecdf4eb01b423e352a32e740649c7a609a7dadc950a61eb20b553d4acdcdc2e SHA512 143d932707c42dffe1089671ec527f2c4e72410692122bbb22633bfb46a2b277b6aa9e43b2a532ab62aa95b9ebc460885ba1a8f987b0aa37f0f40f7850af102e
+DIST awscli-1.20.25.tar.gz 2057639 BLAKE2B 83a899405c1b6837f79041a66ed060e6a9a6bc140e8ec0fbe40a2aa7423dd5911102245cf2236703199e380e25ccc421220d18c03c145295eb3f95830b4b48c0 SHA512 b2eb5d448153b5017806355d2c8a5f60fd847fb757b34b48482713fcbb30713733ce83c22fdb84f71a1d50506a2478cd62d7f6b259912c580930cc058fe9f20c
+DIST awscli-1.20.26.tar.gz 2057909 BLAKE2B 92ed26ae13b4c6626dcf7cacda761cd8ab93ac3de18de133b33bfe9120f23cd65a08da4e5beaabd498ce6e93f05b439420595145cb692c3ebf32848c8a9c31c6 SHA512 512201626fc2abfaced61e5e8bd2ba649e6c3895f5e6de7f1bdfe1f6ca7676306fa14ef0e58a50865a083cfb8e4199a90afd09f004bfdda8706982f4ee1e0e1f
DIST awscli-1.20.7.tar.gz 2045304 BLAKE2B d8f086d8d2eb36645e77fa3d9ae7c196ed3a3fddcc2a0218696f92bd69e10b453be1340b965a8d8e6697bbd3c45013d72de3ed0d31b5823515a5a0092a812858 SHA512 a41bd3ebc34a65add66ef95d5194ba07907a08f7368b0fcd6551af2070c46c4a509af47d30aeadabddce19d1a61200a58faf40a7e2f759e64915cfb2826666ab
-EBUILD awscli-1.19.112.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
EBUILD awscli-1.20.15.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
EBUILD awscli-1.20.21.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.20.22.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.20.7.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.24.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.25.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.26.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.20.7.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635
diff --git a/app-admin/awscli/awscli-1.20.22.ebuild b/app-admin/awscli/awscli-1.20.24.ebuild
index ff429f8d3a3e..ff429f8d3a3e 100644
--- a/app-admin/awscli/awscli-1.20.22.ebuild
+++ b/app-admin/awscli/awscli-1.20.24.ebuild
diff --git a/app-admin/awscli/awscli-1.19.112.ebuild b/app-admin/awscli/awscli-1.20.25.ebuild
index 4221a0155f55..ff429f8d3a3e 100644
--- a/app-admin/awscli/awscli-1.19.112.ebuild
+++ b/app-admin/awscli/awscli-1.20.25.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/aws-cli-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
# botocore is x.(y+1).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.20.26.ebuild b/app-admin/awscli/awscli-1.20.26.ebuild
new file mode 100644
index 000000000000..ff429f8d3a3e
--- /dev/null
+++ b/app-admin/awscli/awscli-1.20.26.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/rsa[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests --install nose
+
+PATCHES=(
+ "${FILESDIR}"/awscli-1.19.47-py39.patch
+)
+
+python_test() {
+ distutils_install_for_testing
+ # integration tests require AWS credentials and Internet access
+ nosetests -v tests/{functional,unit} ||
+ die "Tests failed for ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp bin/aws_bash_completer aws
+
+ insinto /usr/share/zsh/site-functions
+ newins bin/aws_zsh_completer.sh _aws
+
+ distutils-r1_python_install_all
+
+ rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.20.7.ebuild b/app-admin/awscli/awscli-1.20.7.ebuild
index ff429f8d3a3e..4221a0155f55 100644
--- a/app-admin/awscli/awscli-1.20.7.ebuild
+++ b/app-admin/awscli/awscli-1.20.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/aws-cli-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
# botocore is x.(y+1).z
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 1694a19b26d5..f7d2c6d318cb 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,11 +1,7 @@
-AUX conky-1.11.6-fpermissive.patch 1397 BLAKE2B 8200932639a6e0366d2c1426747d7de3939f21791c3a252cbe67f336555a9dc98e050114c5298e4d8b62e5b40f4a7a4bec82e1d38746f5a8bba5dba5295bd8c4 SHA512 e8063b7c567aa3aeae8ceab26895b124b865fe2815101d46593359d52f8ca9e830b6caaf2506e86550620df58230c507fb51f643bd0f61d92c232904f483b605
AUX conky-1.11.6-ipv6.patch 503 BLAKE2B 896cfc76a858981438cecf83db5b2b4fe32d7d6a0749524ac4c4d8dba3fd124a0b7de5d89329280b5c50e9de6cc4e182c23c2813575be6fceb97615e2acda4ca SHA512 3ea5247723676812a07d9ecc129d63cc75e51626a23c202da50bd3172403a24b93f6cbcc5c5e743a9acfe87b6d087ba510381c6157e1995b54d28a6dadbcf08a
AUX conky-1.12.1-network-speed.patch 1439 BLAKE2B f736c986528f9a205d325170b7f1c83653304249be7a2742dbb9d50ca4b58a02fe59796c4c3a39001716ce0c44ed107f51c2db8933bc644472b2f45d607c88af SHA512 f1768dbda3698699bfd7473fed7dbe7ab57e53dc7b3599edcbad0105d140673b1111752eaeb7e83b3e42c7684316a788ac3b1f27c6c71b8f7560a02f1ecec8bc
-DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
DIST conky-1.12.1.tar.gz 2404597 BLAKE2B 9e751844db9d1c90990b1e7dd5d9731330244f6ee772a7403e3520636f2ac930ccf3219e65da970d63396512cf843d4f8137854781fdf3c797fe910a8edb872d SHA512 897c6b83528809aa2e33e15b9ad6644d8cf36f4cff93f014811754f982c13180001b972b2b145b607de8d865c2af9a425ab50246065f537e14be75da5631593a
DIST conky-1.12.2.tar.gz 2407428 BLAKE2B b8d1b40dc4b547679b5ab4bf0328aabaac868025433729f48baf572c536da4a527a073a6d47f36c179851aecef58535dccb956e3a695700f06bf8e6ab170ae1f SHA512 55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a
-EBUILD conky-1.11.6-r2.ebuild 4790 BLAKE2B c72c8455185a0125cf63262d97b7fcbf95fb7469eda6bd64a6a436d3b99128ed77987d6e9be6c456c07ea31f2f4b959e545e5a4e501947912ce4e63cf0109f65 SHA512 70dabc73ad704df62433683df9ae7b8ec38abf4dca63a76f7f32a580b1cbff3d02c1dbbb14486dbcd60b9780226a9625948843c0eadefda3581e429fcc54adf4
EBUILD conky-1.12.1-r1.ebuild 4800 BLAKE2B 100e5f8a6d5e2ce15360c8f5526c136af7e649606fd2b08c7383b510669a8a6905342912d6ea2494017db0201b750f5871d96da7bfa60e52fee007f253dd6056 SHA512 61bf185ef13305035e097521f580339435370dce1df90339ded24a3caf642f82808cee1625af31e9191db3e0f82111fac59b546c6fb1b3df4ee49b6359b78bb2
-EBUILD conky-1.12.1.ebuild 4765 BLAKE2B 43356e0443e15efa136e42c7851ba1cbd658515669992ac8552f285a9e727edd4a7b26c74749fb9e33b5c9f874676ed14a9bfdeac573f20601ee206faeb61043 SHA512 128ec3bab07555b6552c288d28ab2f02b84dafb24c568b7e3bdc7d8e176d1417831be7d25cbf64239dd71034ee13e4a38839af4779ef890d81f523856233b6f4
EBUILD conky-1.12.2.ebuild 4776 BLAKE2B 21d68d9a37c68f81767bb078446efb0a28c003b5c0f6fcf16a5ff9fd13a4684dfe194cbfffb8f6e1721ff02eb8b1c6eb8fccc7619a81e612f56e4df725d3533c SHA512 6aca21c11de07de8878e5e65c67b7fe87b2343569291746327c68b5982da1a6f6674238e8cf294e5b6df3333885cddb74883c164bb2d00265779abbdf24dbfa2
MISC metadata.xml 2468 BLAKE2B d768a7d6cdd62ef5b008e3b62f42347e0e6f25c324f930815697ea73ec0bcfd59ac80bc53d0fe81300ee09af5d3c1602694796f1358434729ac034710441fd48 SHA512 48e4f757be562fbaa51da578f1ee609d0a978387235ca3c56fd984d83bd654774d016315ec6afd5ffd3b8c5941e81e128f699c084f7c40acd026ee2deb1be527
diff --git a/app-admin/conky/conky-1.11.6-r2.ebuild b/app-admin/conky/conky-1.11.6-r2.ebuild
deleted file mode 100644
index 02b12b482a5c..000000000000
--- a/app-admin/conky/conky-1.11.6-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake linux-info lua-single readme.gentoo-r1 xdg
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
-IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
- ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
- ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
- vim-syntax weather-metar webserver wifi X xinerama xmms2"
-
-COMMON_DEPEND="
- cmus? ( media-sound/cmus )
- curl? ( net-misc/curl )
- ical? ( dev-libs/libical:= )
- iconv? ( virtual/libiconv )
- imlib? ( media-libs/imlib2[X] )
- irc? ( net-libs/libircclient )
- lua-cairo? ( x11-libs/cairo[X] )
- lua-imlib? ( media-libs/imlib2[X] )
- lua-rsvg? ( gnome-base/librsvg )
- mysql? ( dev-db/mysql-connector-c )
- ncurses? ( sys-libs/ncurses:= )
- nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
- pulseaudio? ( media-sound/pulseaudio )
- rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
- systemd? ( sys-apps/systemd )
- truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
- wifi? ( net-wireless/wireless-tools )
- weather-metar? ( net-misc/curl )
- webserver? ( net-libs/libmicrohttpd )
- X? (
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXext
- )
- xinerama? ( x11-libs/libXinerama )
- xmms2? ( media-sound/xmms2 )
- ${LUA_DEPS}
-"
-RDEPEND="
- ${COMMON_DEPEND}
- apcupsd? ( sys-power/apcupsd )
- hddtemp? ( app-admin/hddtemp )
- moc? ( media-sound/moc )
- nano-syntax? ( app-editors/nano )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-DEPEND="
- ${COMMON_DEPEND}
- doc? ( app-text/docbook2X dev-libs/libxslt )
-"
-
-REQUIRED_USE="
- imlib? ( X )
- lua-cairo? ( X bundled-toluapp )
- lua-imlib? ( X bundled-toluapp )
- lua-rsvg? ( X bundled-toluapp )
- nvidia? ( X )
- truetype? ( X )
- xinerama? ( X )
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md AUTHORS )
-
-PATCHES=(
- "${FILESDIR}"/${P}-fpermissive.patch
- "${FILESDIR}"/${P}-ipv6.patch
-)
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf
-and edit it to your liking.
-
-There are pretty html docs available at the conky homepage
-or in ${ROOT}/usr/share/doc/${PF}/html when built with USE=doc.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
- use ipv6 && linux-info_pkg_setup
-
- lua-single_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- xdg_environment_reset
-
- sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
- cmake/ConkyPlatformChecks.cmake || die
-}
-
-src_configure() {
- local mycmakeargs
-
- if use X; then
- mycmakeargs=(
- -DBUILD_ARGB=yes
- -DBUILD_X11=yes
- -DBUILD_XDAMAGE=yes
- -DBUILD_XDBE=yes
- -DBUILD_XSHAPE=yes
- -DOWN_WINDOW=yes
- )
- else
- mycmakeargs=(
- -DBUILD_X11=no
- )
- fi
-
- mycmakeargs+=(
- -DBUILD_APCUPSD=$(usex apcupsd)
- -DBUILD_AUDACIOUS=no
- -DBUILD_BUILTIN_CONFIG=yes
- -DBUILD_CMUS=$(usex cmus)
- -DBUILD_CURL=$(usex curl)
- -DBUILD_DOCS=$(usex doc)
- -DBUILD_HDDTEMP=$(usex hddtemp)
- -DBUILD_HTTP=$(usex webserver)
- -DBUILD_I18N=yes
- -DBUILD_IBM=$(usex thinkpad)
- -DBUILD_ICAL=$(usex ical)
- -DBUILD_ICONV=$(usex iconv)
- -DBUILD_IMLIB2=$(usex imlib)
- -DBUILD_IOSTATS=$(usex iostats)
- -DBUILD_IPV6=$(usex ipv6)
- -DBUILD_IRC=$(usex irc)
- -DBUILD_JOURNAL=$(usex systemd)
- -DBUILD_LUA_CAIRO=$(usex lua-cairo)
- -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
- -DBUILD_LUA_RSVG=$(usex lua-rsvg)
- -DBUILD_MATH=$(usex math)
- -DBUILD_MOC=$(usex moc)
- -DBUILD_MPD=$(usex mpd)
- -DBUILD_MYSQL=$(usex mysql)
- -DBUILD_NCURSES=$(usex ncurses)
- -DBUILD_NVIDIA=$(usex nvidia)
- -DBUILD_OLD_CONFIG=yes
- -DBUILD_PORT_MONITORS=$(usex portmon)
- -DBUILD_PULSEAUDIO=$(usex pulseaudio)
- -DBUILD_RSS=$(usex rss)
- -DBUILD_WEATHER_METAR=$(usex weather-metar)
- -DBUILD_WLAN=$(usex wifi)
- -DBUILD_XFT=$(usex truetype)
- -DBUILD_XINERAMA=$(usex xinerama)
- -DBUILD_XMMS2=$(usex xmms2)
- -DDOC_PATH=/usr/share/doc/${PF}
- -DMAINTAINER_MODE=no
- -DRELEASE=yes
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
- insinto /usr/share/vim/vimfiles/syntax
- doins "${S}"/extras/vim/syntax/conkyrc.vim
- fi
-
- if use nano-syntax; then
- insinto /usr/share/nano/
- doins "${S}"/extras/nano/conky.nanorc
- fi
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- xdg_pkg_postinst
-}
diff --git a/app-admin/conky/conky-1.12.1.ebuild b/app-admin/conky/conky-1.12.1.ebuild
deleted file mode 100644
index 9b3c67b51034..000000000000
--- a/app-admin/conky/conky-1.12.1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake linux-info lua-single readme.gentoo-r1 xdg
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
- ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
- ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
- vim-syntax weather-metar webserver wifi X xinerama xmms2"
-
-COMMON_DEPEND="
- cmus? ( media-sound/cmus )
- curl? ( net-misc/curl )
- ical? ( dev-libs/libical:= )
- iconv? ( virtual/libiconv )
- imlib? ( media-libs/imlib2[X] )
- irc? ( net-libs/libircclient )
- lua-cairo? ( x11-libs/cairo[X] )
- lua-imlib? ( media-libs/imlib2[X] )
- lua-rsvg? ( gnome-base/librsvg )
- mysql? ( dev-db/mysql-connector-c )
- ncurses? ( sys-libs/ncurses:= )
- nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
- pulseaudio? ( media-sound/pulseaudio )
- rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
- systemd? ( sys-apps/systemd )
- truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
- wifi? ( net-wireless/wireless-tools )
- weather-metar? ( net-misc/curl )
- webserver? ( net-libs/libmicrohttpd )
- X? (
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXext
- )
- xinerama? ( x11-libs/libXinerama )
- xmms2? ( media-sound/xmms2 )
- ${LUA_DEPS}
-"
-RDEPEND="
- ${COMMON_DEPEND}
- apcupsd? ( sys-power/apcupsd )
- hddtemp? ( app-admin/hddtemp )
- moc? ( media-sound/moc )
- nano-syntax? ( app-editors/nano )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-DEPEND="
- ${COMMON_DEPEND}
- doc? ( app-text/docbook2X dev-libs/libxslt )
-"
-
-REQUIRED_USE="
- imlib? ( X )
- lua-cairo? ( X bundled-toluapp )
- lua-imlib? ( X bundled-toluapp )
- lua-rsvg? ( X bundled-toluapp )
- nvidia? ( X )
- truetype? ( X )
- xinerama? ( X )
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md AUTHORS )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.11.6-ipv6.patch
-)
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf
-and edit it to your liking.
-
-There are pretty html docs available at the conky homepage
-or in ${ROOT}/usr/share/doc/${PF}/html when built with USE=doc.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
- use ipv6 && linux-info_pkg_setup
-
- lua-single_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- xdg_environment_reset
-
- sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
- cmake/ConkyPlatformChecks.cmake || die
-}
-
-src_configure() {
- local mycmakeargs
-
- if use X; then
- mycmakeargs=(
- -DBUILD_ARGB=yes
- -DBUILD_X11=yes
- -DBUILD_XDAMAGE=yes
- -DBUILD_XDBE=yes
- -DBUILD_XSHAPE=yes
- -DOWN_WINDOW=yes
- )
- else
- mycmakeargs=(
- -DBUILD_X11=no
- )
- fi
-
- mycmakeargs+=(
- -DBUILD_APCUPSD=$(usex apcupsd)
- -DBUILD_AUDACIOUS=no
- -DBUILD_BUILTIN_CONFIG=yes
- -DBUILD_CMUS=$(usex cmus)
- -DBUILD_CURL=$(usex curl)
- -DBUILD_DOCS=$(usex doc)
- -DBUILD_HDDTEMP=$(usex hddtemp)
- -DBUILD_HTTP=$(usex webserver)
- -DBUILD_I18N=yes
- -DBUILD_IBM=$(usex thinkpad)
- -DBUILD_ICAL=$(usex ical)
- -DBUILD_ICONV=$(usex iconv)
- -DBUILD_IMLIB2=$(usex imlib)
- -DBUILD_IOSTATS=$(usex iostats)
- -DBUILD_IPV6=$(usex ipv6)
- -DBUILD_IRC=$(usex irc)
- -DBUILD_JOURNAL=$(usex systemd)
- -DBUILD_LUA_CAIRO=$(usex lua-cairo)
- -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
- -DBUILD_LUA_RSVG=$(usex lua-rsvg)
- -DBUILD_MATH=$(usex math)
- -DBUILD_MOC=$(usex moc)
- -DBUILD_MPD=$(usex mpd)
- -DBUILD_MYSQL=$(usex mysql)
- -DBUILD_NCURSES=$(usex ncurses)
- -DBUILD_NVIDIA=$(usex nvidia)
- -DBUILD_OLD_CONFIG=yes
- -DBUILD_PORT_MONITORS=$(usex portmon)
- -DBUILD_PULSEAUDIO=$(usex pulseaudio)
- -DBUILD_RSS=$(usex rss)
- -DBUILD_WEATHER_METAR=$(usex weather-metar)
- -DBUILD_WLAN=$(usex wifi)
- -DBUILD_XFT=$(usex truetype)
- -DBUILD_XINERAMA=$(usex xinerama)
- -DBUILD_XMMS2=$(usex xmms2)
- -DDOC_PATH=/usr/share/doc/${PF}
- -DMAINTAINER_MODE=no
- -DRELEASE=yes
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
- insinto /usr/share/vim/vimfiles/syntax
- doins "${S}"/extras/vim/syntax/conkyrc.vim
- fi
-
- if use nano-syntax; then
- insinto /usr/share/nano/
- doins "${S}"/extras/nano/conky.nanorc
- fi
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- xdg_pkg_postinst
-}
diff --git a/app-admin/conky/files/conky-1.11.6-fpermissive.patch b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
deleted file mode 100644
index f608769b6433..000000000000
--- a/app-admin/conky/files/conky-1.11.6-fpermissive.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- old/src/conky.cc 2021-01-24 17:05:43.361378726 +0100
-+++ new/src/conky.cc 2021-01-24 17:05:49.055378611 +0100
-@@ -317,17 +321,22 @@
- static FILE *append_fpointer = nullptr;
-
- #ifdef BUILD_HTTP
-+#ifdef MHD_YES
-+/* older API */
-+#define MHD_Result int
-+#endif /* MHD_YES */
- std::string webpage;
- struct MHD_Daemon *httpd;
- static conky::simple_config_setting<bool> http_refresh("http_refresh", false,
- true);
-
--int sendanswer(void *cls, struct MHD_Connection *connection, const char *url,
-- const char *method, const char *version, const char *upload_data,
-- size_t *upload_data_size, void **con_cls) {
-+MHD_Result sendanswer(void *cls, struct MHD_Connection *connection,
-+ const char *url, const char *method, const char *version,
-+ const char *upload_data, size_t *upload_data_size,
-+ void **con_cls) {
- struct MHD_Response *response = MHD_create_response_from_buffer(
- webpage.length(), (void *)webpage.c_str(), MHD_RESPMEM_PERSISTENT);
-- int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
-+ MHD_Result ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
- MHD_destroy_response(response);
- if (cls || url || method || version || upload_data || upload_data_size ||
- con_cls) {} // make compiler happy
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 036e2b6696f9..c11023871b25 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -3,5 +3,5 @@ AUX conserver.confd-r1 133 BLAKE2B 6f3029a06b34458f70ef8370c35c09ea69a4d005aad17
AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8babeeb9635f9652d01f06de1fa4309a213b6b2bca77099a17910aa5d6790bccc4e4e8f7f8fc0ba42458 SHA512 f0dcea7fddec5165fb00c452aa0b56c3eaa0919e96e5bf1ff4e80000b01fe80134bc4ee8a584114fcad56c6d5caa467d229b8b54bc8b4145dd2fa76871336c7d
AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434 SHA512 3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283
-EBUILD conserver-8.2.6-r2.ebuild 2351 BLAKE2B f3702aac647c402eda148a64767b7d352815370b92de0be697b68b28400eabb62d625dd21e8ff842d8785a79bf1f4e03cda75b7ceb82ead2d04c8902338229cc SHA512 70160664e5abc664b04356b1cd40a844106f5aea678cbe512fa9cd5aed4a9eecbc23bdd378936b2887254d72eb756d4629fd2cde09c65b6ba49f3e333bf865a1
+EBUILD conserver-8.2.6-r3.ebuild 2353 BLAKE2B ceeace6bc0038621cf5b004b41891fd3bbe70093ac6f79c987122435ebbff3787e86b2c2f480ec8e10a96749bac853c5673a09d948fda97e059524ac8afe38a0 SHA512 ad1114e9fe078d0016b7cd34634deab36282f7f549a0431696bb5f8cb02e1f9355f4453c748cd2c27d8868cf17efc867ecd823faf7d89842c67cc55da69bf255
MISC metadata.xml 1408 BLAKE2B 01acca9d16d6bf1f182d0c582f7c69f1c89a697a3b2fe44a589368faa4aa5117c6e7382214464497bc305cc38bab8f860a86460ebfe57d6b4af74bc4f0781b12 SHA512 604c18ac8e93c5d37a465e61f541a29ea6a5143518a153e5a39da820af53d8859e2ef4fe212ddeaad5e2cebed83735e55f61afda12c5cc0bcbf828d1a8238b3d
diff --git a/app-admin/conserver/conserver-8.2.6-r2.ebuild b/app-admin/conserver/conserver-8.2.6-r3.ebuild
index 6385d383e52a..844eb0e88ff3 100644
--- a/app-admin/conserver/conserver-8.2.6-r2.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r3.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
RESTRICT="!test? ( test )"
-DEPEND="net-libs/libnsl
+DEPEND="net-libs/libnsl:=
virtual/libcrypt:=
debug? ( dev-libs/dmalloc:= )
freeipmi? ( sys-libs/freeipmi:= )
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index 69e890f0d91d..d272194ccbd3 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1,3 +1,3 @@
DIST OpenDoas-6.8.1.tar.gz 32398 BLAKE2B cdaa01efaf3d164bcf6993693c86039fa4866dc1ce619731b455985ca1ebb5ebec889b540f4720c590318202de8a4b2fdf5d715f2170346818e706857b5adfa3 SHA512 d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7
-EBUILD doas-6.8.1-r1.ebuild 1355 BLAKE2B 0283d5a6535c46ed3dbcb3bbdf3aefd6beac4ffdba0bfb68d3e840dcc9c71a59f84647042e060f7f9a49634124b130d08a441f01b567734f5161dec2ba863812 SHA512 4ab87324a68230c9ab418c0e97b8a24ef12fb53536bed890461dd7e8ddf0bfdc8e34f0bca9b8c41bd32ea07bb7b9059d2302d2740d0730457c9d8f39fe166c38
+EBUILD doas-6.8.1-r1.ebuild 1362 BLAKE2B 4896ec32b6b00850d7452a765b0ac1644ac42995dd7b60857a57e1d2d73388b49c4b70330bdff918f521dbd4cc3ef64249861765a5f6baf0b4f073466b838b11 SHA512 8bd3e23ebb8f24c1ac71a7d4d624d32be42fd92bd4c0a617e6e0761bb3f9a0a48d5f088eac03d4caa4cecfd42a098412a3bd06fd2800624fe51d95e6bf6b8ea7
MISC metadata.xml 557 BLAKE2B 69a4a6528247efce28e3da9d035f1c4cdc83854a2ca78b83a75be542e8aad9874ed74fb6e07f5b7811d8fa23d1cf1adb11d9a86a687e4b6649709aef2bbaea56 SHA512 b89cfe499bf3fa4630a29ad3966f538e2c111710e4cfd035c945490394c8577ce1150cdecaff1f1548774d8b219b66b6f7faebc95861e1093edc9445fb5b7ffc
diff --git a/app-admin/doas/doas-6.8.1-r1.ebuild b/app-admin/doas/doas-6.8.1-r1.ebuild
index 87b3c2c97b6d..af9ca1d18c7b 100644
--- a/app-admin/doas/doas-6.8.1-r1.ebuild
+++ b/app-admin/doas/doas-6.8.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="ISC"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="pam persist"
BDEPEND="virtual/yacc"
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index ffc106691909..8a44af2ca3b8 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.40.2.tar.gz 5487765 BLAKE2B 2421ee5baf5fe4e4926b71bbb31e375a8a82548f9a91118b0c2633cbadc604c4bf375f2025565f550dc2fff2a9a4610a4db2b669a474faa44662fb320ae6ddbf SHA512 090da6e6dde3112bb866865dd23af51209b48fafbca2b30e7535624da711141fe25d8e7348d03674ebe7c450b5cbc1b824747527c05041c8ed464b0579e30e6c
-EBUILD exo-1.40.2.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
+DIST exo-1.40.3.tar.gz 5487663 BLAKE2B c56a4377785f268ee50e222086a8b152ca2f60a9aee95331240764a1e769d044fb2e8a10e1c49fd473b51ed4635584f55f3d93752ace28d8d5363260f643cfd2 SHA512 7010be6c9acf3da9b8abe85c9a2f23696f4fdf81a8148e87d07077b6b65f364a9b0e2923985adbf4081565e7d7e855054c1386844e51848a9d79bbea3823fd29
+EBUILD exo-1.40.3.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.40.2.ebuild b/app-admin/exo/exo-1.40.3.ebuild
index 49b1772f318b..49b1772f318b 100644
--- a/app-admin/exo/exo-1.40.2.ebuild
+++ b/app-admin/exo/exo-1.40.3.ebuild
diff --git a/app-admin/gnome-abrt/Manifest b/app-admin/gnome-abrt/Manifest
index 9903946cae89..0909b00d8441 100644
--- a/app-admin/gnome-abrt/Manifest
+++ b/app-admin/gnome-abrt/Manifest
@@ -1,3 +1,5 @@
DIST gnome-abrt-1.3.6.tar.gz 112255 BLAKE2B d0e87ef5543e84c246f9e98aac8f92984af9e8220357359ffa76f91e00bb35ccb9b60a00c8e0b00d3464ecfc9ddffaeb61fb15b57480066d957a2af44b49c3be SHA512 7bd15c9956d2e4bafce7d1ef73e930f679119fe8ccebda8a27171a5b3b1dfa90255c572e3a0c70606fe389d50079870399b89f61f683896d4ca6380a7d3f7cc2
+DIST gnome-abrt-1.4.0.tar.gz 112129 BLAKE2B f3f45c1793c59f4453ef17fd7e24877143cc5d87bdf8cfd6d778d9178005ff6083ce1564f06bb98d9027628bcdd4feb9d98edcbdcc76432c813065d518d0f91a SHA512 eb66040f23a8cba4e015f4f72dee56d782aa3d8bdd90644dce2e7fa1776edc4dc14d69c3722503825db5ff75fa80bde09bbc5bcd9eb6f20209e7e579d8c33a21
EBUILD gnome-abrt-1.3.6.ebuild 1161 BLAKE2B 2a8a3a444f592bed4ed15a2f2503814f4017d36de6dc9be0f16a9eb15f02507e86fc3727f654e1c7062321ee5b0695e6cd6b431ca9abfc47f608f902e24568b7 SHA512 ebf07063571c949d8ab39bd16dc742424e2239f856f9141ce29bc7ac94ee7552ecba8c7b7f467d6426be608091ef7a8fd0647ea243eeeb825d3aa76eb7fd42ea
+EBUILD gnome-abrt-1.4.0.ebuild 1157 BLAKE2B a3a831484d71ffb342211b0af4fe843efef0e333ec2ba46b86f578922836f53ded16f9777f71bb870e179815297d81b545e09c976a436fd156f9f3f14701a761 SHA512 d0e99a173d7b3e5fd0d905d2980f5e1435e66b2b83da47aea2b072ec19716b8bb01969efa7d8496b6aef4854d5188a7568fe7a865cb17b5f26886a3d76bf783b
MISC metadata.xml 323 BLAKE2B 18831083620a31c6f17add32c35efeb6f958c8860a49e89895447cb59607022d65055f1682425780ce7d5ede12fd535f5cfc3804a0596ba621535fcaf6557e33 SHA512 2c2481d173f1c723d8d0825f9806c21e7677b1af7e9548f26566aa7eed7721ba7d06b1a7670519f5ac3adfe5c044c3c9f00ed67940f767238297d53863c8182c
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.4.0.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.4.0.ebuild
new file mode 100644
index 000000000000..f0302b220f12
--- /dev/null
+++ b/app-admin/gnome-abrt/gnome-abrt-1.4.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson python-r1
+
+DESCRIPTION="A utility for viewing problems that have occurred with the system"
+HOMEPAGE="https://github.com/abrt/gnome-abrt"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=x11-libs/gtk+-3.10.0:3
+ >=dev-libs/libreport-2.14.0:0=[python,${PYTHON_USEDEP}]
+ >=app-admin/abrt-2.14.0
+ >=dev-python/pygobject-3.29.1:3[${PYTHON_USEDEP}]
+ >=dev-python/pyxdg-0.19[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? (
+ app-text/asciidoc
+ app-text/xmlto
+ )
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17
+"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use doc docs)
+ -Dlint=false
+ )
+
+ python_foreach_impl meson_src_configure
+}
+
+src_compile() {
+ python_foreach_impl meson_src_compile
+}
+
+src_install() {
+ python_foreach_impl meson_src_install
+ python_foreach_impl python_optimize
+}
+
+src_test() {
+ python_foreach_impl meson_src_test
+}
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index ff844e1fb890..6ac0086d9081 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,5 @@
DIST hcloud-1.25.1.tar.xz 1164932 BLAKE2B 21d3a0def3684a25c0cb629320f5617c93090d33cc95e66c42355c01afaf3189f8da858028220350bc1f1f53992b289ea75b56196d94ae41323602c4e8fee1a8 SHA512 aba79869553b19f6a117dc4d9f31935582e9ad89d12d9fd8f70087064383b76324483c78890ddb5965f98f2ca783ca46a17dee97b21716a1ff916647c1267a67
-DIST hcloud-1.26.1.tar.xz 1165416 BLAKE2B 256ff20e071a907fe314f1139673315f79239828d07797a482d5f34e328ae0ad16c627d481fb120e7eda880b6bf24b2e79cead3de8f41eca7b7c684c4cc62a16 SHA512 c875e1040c59ae82053d37f565e033098fc45eb356367e21de2359b4d569595fef87bceac14698a8afcaf87e38f335d0ac6f79950478f545e31101dbe756a203
+DIST hcloud-1.28.0.tar.xz 1169076 BLAKE2B 3748dba34586e70ccc0faee1920250152a29fd842816ea80658886f846d24471e37351b00e6ba8579de066777d9deefccd9edabfccd0ce341f270cd65dc76eae SHA512 7b441c0dd074ed7c9014283322c743759cc677c891aeb3be5d034829be8ed48de54b797c8664b23db3395a0c8ff74e9cc00e6c7a443fcacdc0c6bdb50de12b8f
EBUILD hcloud-1.25.1.ebuild 712 BLAKE2B 720832d21c95224d42bc4511184428280c532f7edd91acfa6ead5b71fe0f3d0243285bf07b196b8cf86d1cbd9e5bbcc3d5bae99d71fa3ac739d5306584ae61b1 SHA512 879162a964a3bf1b13a74a5ef4e916153aed3ef7096d481e2c2428e27b812f6f1c4e181fa42c591140949a57b538150dedfac3e9452676c9446114c2cb861a27
-EBUILD hcloud-1.26.1.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
+EBUILD hcloud-1.28.0.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
diff --git a/app-admin/hcloud/hcloud-1.26.1.ebuild b/app-admin/hcloud/hcloud-1.28.0.ebuild
index 77d54006fe99..77d54006fe99 100644
--- a/app-admin/hcloud/hcloud-1.26.1.ebuild
+++ b/app-admin/hcloud/hcloud-1.28.0.ebuild
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 2d16a0ecfb6a..b2ed89cc72cc 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,11 +1,15 @@
DIST mongo-tools-100.2.0.tar.gz 27401773 BLAKE2B 359747ffe9e53e9ac62fa70517bd5e64c6b082076b9d54e325200cabbd9e3f7ab3aa9f96f7a84c60b044082e505e2ca4d6bdeac6f0b1ca0bfaa03583603a7962 SHA512 1b093482d3abfbd354ff6010f270836a13842fc6ff33126effb4e843beefeabc233bb610b423cac8ce8718366e7aa7411679e4cd5125d44a235f244f5ea49da5
DIST mongo-tools-100.2.1.tar.gz 27447213 BLAKE2B 9db242b632cf9d15960e216c238ad13d2680b1aa6c0731bf0dc163055fd8488f36b6b9cc56d597f5b7d98a6798ed1cb9f8815aa2b4dce6b5977a591376177409 SHA512 ed913c42935e240b8b13b292a7dc12c12b6f6ee7538c6dd589a5e0998c333ebbf3822337c9d8368964fcdb7c8b1b5b1b86fbe654695e3bbb09463a5cddf42e38
DIST mongo-tools-100.3.0.tar.gz 27514743 BLAKE2B 4b64c1d42679f5297ca0065b4e5e094a7c5f5bf7082a727b7c49e1b3b3af563e8f4055e041a696ea3e94ad62a3f280ec3f02d8b102df6f68a561b99d8a80b565 SHA512 415cf1b3a1015bab7c507cd7af969d7b8de249b8692fb93593793e9881290aaab827649fc59850bc905a50ee003d23116b6595979e3ca48dfcf1e6c5c864b5a0
+DIST mongo-tools-100.4.1.tar.gz 3793073 BLAKE2B 0a5dbd7a638035e7e54922c46be4473f154f79cb6370ca72f87dfee49ea1353ebf60ccf4d324b0bc6f5388b8c095f68f423aafdf83358ac41ad59d1215dce69c SHA512 a6560f8ce2a86c1ae4400f3ef182f448991a238ef657bcd5eb6f98de0adb2cbd660a81ce00f3ca051f2db6d22a492158da9254b264424506669bf771d7a40fe6
DIST mongo-tools-4.2.11.tar.gz 15028877 BLAKE2B 8397ddfa553880680dabb3ca41801117431c75e9cf19c6145373b73c6da15b2be61e8673cec851872a0c481b221ac40e222754f9155c45f8a3e681e59272de6c SHA512 b1e9812890447f2ad1ed96ea5a70e8bb16efdaea37224249c531a3adda559b789a392b9818711147d28df412d7a2e2a992bc13fdcd595e50e66eb7fbd8c32bd5
DIST mongo-tools-4.2.12.tar.gz 15029039 BLAKE2B c2c87f6b329c4d094739fe215221fe507d2c685c4c56757b692e8f2de7a904f47fd92affcc9bbe227472efc09bdc97da78881b6ec2dbb03f79a34c42a3068ab3 SHA512 05cfef279c78ff1e929ccf47bee99a87cad70ede05bdac3f9226dc1e0c2688845233e51da69a2bb018d20b6f3ca4ae5301fb4f609e19f17636b4e5ac04fedb0f
+DIST mongo-tools-4.2.15.tar.gz 15028734 BLAKE2B 7479c5d0d9b6051f51e563f53a5c704a69dc3719d9417b216bcc1a65220d0ab2c9441fd24d8ac8e5b1600766797ef102df07ebfd946ee60949d3287673dfbaaf SHA512 f613ab61a4cf029548aa0e5623fef3798642ced791bf52f229e7d14d31de9472bfc3c8bfb3fa7b4542555a17c79ff9a514480c674cb3e45fb99c4f1745fdb9f0
EBUILD mongo-tools-100.2.0.ebuild 1382 BLAKE2B ed2961f956d4dfb2da06270908ac3a5e36d2550e999a88266f30d12c13c6093bd642a4a0d334fe837e6c7b29fce5d54b74d374d3d30c5b8070d047ca04f7b1b4 SHA512 029a86ebf9d7deeddc74270c6ab86ec87e7a539cdae2d07c0a6e8ed0c55261380a7ab78488ce3d10b744bf720f11564df01b403c08701500c2a968169b5797fe
EBUILD mongo-tools-100.2.1.ebuild 1383 BLAKE2B 8ecf9efa840b8e6242a36f34aff6f0ebb3cba25905fd488f34477c26133b7a33ef1d4bb0e10734d4faaa856980226533c5c4d0a58a56908b603ee18a4986048d SHA512 17960c5882da9cee65ba4338d9466e94fac20b61b01be65b5cb8bc2318f23a1f9e758ebf300e68809e7095ff12eedc185677ceded5173bd46a726d2e29440e28
EBUILD mongo-tools-100.3.0.ebuild 1407 BLAKE2B e7aad248c57dff60208b7a4605ea260c9a4fe4990916e4bc6e0aecd33b60fe133758fda8367ed116942675c15d842206d653a50297df10505507a72c40129522 SHA512 8c5e3ee1d1ec458fd5724fa80a68c07094350930965966b744571eb8a83bcd3a913aac760305350a29113c81be1fe60627da5f82c2f75a22422d25bce9888eaf
+EBUILD mongo-tools-100.4.1.ebuild 1408 BLAKE2B b94672b43276df376e5b25a8f9bd7cba1b716de048ae88d10946d4280ea96af4607cc944cb2190f8dd84882066e9991e202d4a66a93aa45242e96be6c17a3b6e SHA512 a6ed9804709b1b334891f16ad34bdec642a2121da8772aeccd2f1ec724b058db79ff33335202f27154997d1f650c4f4a57ad829a2b5cc2696b0495cfd801e8f9
EBUILD mongo-tools-4.2.11.ebuild 1619 BLAKE2B d5d812ce6d791dfccf36b3bd6a9819a72c6193b352aab311c52d6b9b7a97a9dd5178ddaea668fc2ea7e5d3f94ebd22ae7571cd0737036548d497d42efb4fdd24 SHA512 ea5be95fb8da2e394614bf968fe2c8a76698b8913bd3a753348b4410ea5f195abfec8a903d28a98ef81e130a4fd8ac5a7391c24088b3e6c37946c4a7532ca45b
EBUILD mongo-tools-4.2.12.ebuild 1477 BLAKE2B 4385aa86cb9efe9919c8aa37ebffce773e868924ac25f47307319f79ceb0589bf2791e72a7bbedf79eba6e86728501703cae94e1f65fb47ea9243a391cd96884 SHA512 5517f05cd1b9948f428228557f1a4cb985706851fe53008983f97ae7298b7c96a20dcb7c4891723126d6fc444f4647016bfcf37fd9773ab489846b33bce2ada3
+EBUILD mongo-tools-4.2.15.ebuild 1478 BLAKE2B 454ea6a224b5cd9f7784c43be557bbde9f302dfe7de8d3dc3bc17a5d43d7043bcea2dc69fff9ca7d1bdb45db2ea541bd1effe2084649f16bed5df0fcc0772b93 SHA512 1927a99a1cc49df164dd5629a093415ac3a9f2305b2f5c86ca77954568bd400868e528ed6987fc58bfd1a19beca9b41c91240fc4017c36165da0e651a1e7a505
MISC metadata.xml 331 BLAKE2B 62e95d5bc17f92830615f6a251ac64e2824c9fb7bf5025f0d3898fa2d0cfd0a033fef7e04d6536b4122241462674148ee0516f0ac54ee30587f375404ff86c6e SHA512 00442ab0d006a7e4fb525dcd9df46d45eafa25f85afe5964bc98efd0996898a1b27334d939ea2d5cc843b5249632613585e0a40d9fa0f227334040c8c3d7b741
diff --git a/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild b/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild
new file mode 100644
index 000000000000..5431dc042cab
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-100.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+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 ${P} "${S}" || 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; do
+ echo "Building $i"
+ GO111MODULE='off' 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/mongo-tools/mongo-tools-4.2.15.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.15.ebuild
new file mode 100644
index 000000000000..1c622b0ee6a7
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.2.15.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 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 ~arm64"
+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_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"
+ GO111MODULE='off' 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/mongosh-bin/Manifest b/app-admin/mongosh-bin/Manifest
new file mode 100644
index 000000000000..af9b05cc7097
--- /dev/null
+++ b/app-admin/mongosh-bin/Manifest
@@ -0,0 +1,4 @@
+DIST mongosh-1.0.4_arm64.tgz 58296826 BLAKE2B 87304d259e731ac63b52f63e8277746042df90eeaa67771265d45fd9450950d878a20996a34285db4f8dbac9c4877c37391b54b6b9e57ff0409e0d72bec1c5a1 SHA512 ad9e9cf733915cfd6e9e2140b90cfbbc77f63160331683dee740e906c69b5993ac9704ac0bfbe8b5227eb474a0db75cddd8df310150f737de28fef00184d1280
+DIST mongosh-1.0.4_x64.tgz 62341440 BLAKE2B af4394c1312825ca0718f1ec836cde64c212533ae2210dcb64363042d066304e558c5822e46362323aeedb5cbc402fae1999689b338102d8ba8de5c74379cf21 SHA512 07091f85b14b80fcfe334ced3a1773d206e9dd09faa3ac0ec6045503f222ccba0735a861bb4088d4c7687783de37e2134c8beeaa160cd838f197233e68aae796
+EBUILD mongosh-bin-1.0.4.ebuild 864 BLAKE2B 4aad7079d89ee34b2f60687710e7a7934a6f2e53985139ab6b3bf9a50c7574bf1f7918eb509e79c3ea497a2bd6e588716bfa461c3e636fafd89dfdb333f13954 SHA512 76268daa6d7fa44bfbe56266ce862ab50875e7a1b2c5654515f9435c5ba45f16afeddd59eb8962c486caeff4c08ac90dbb4af3928b995bc185d8f578553183d2
+MISC metadata.xml 588 BLAKE2B 5ddd57802887d11c435888078bf4fd32010623116954b981d58ed5e83843d7b6830339bbc116acc2e0003976dbb8c8b091ef5953caea1f7b38c9a0bb14520db4 SHA512 5fb39f5f92e6a329186c218f0cef2a9f4d298fa03c0eef5f0162ea997c3d6ef67f731efcca71d2986ac9114fdf6be4cbfe23cdf2bf333cf600379aa7060b386e
diff --git a/app-admin/mongosh-bin/metadata.xml b/app-admin/mongosh-bin/metadata.xml
new file mode 100644
index 000000000000..2e57b644abfb
--- /dev/null
+++ b/app-admin/mongosh-bin/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>ultrabug@gentoo.org</email>
+ <name>Alexys Jacob</name>
+ </maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>hydrapolic@gmail.com</email>
+ <name>Tomáš Mózes</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mongodb-js/mongosh</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/mongosh-bin/mongosh-bin-1.0.4.ebuild b/app-admin/mongosh-bin/mongosh-bin-1.0.4.ebuild
new file mode 100644
index 000000000000..efad4f587482
--- /dev/null
+++ b/app-admin/mongosh-bin/mongosh-bin-1.0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="The MongoDB Shell"
+HOMEPAGE="https://github.com/mongodb-js/mongosh https://www.mongodb.com/products/shell"
+
+SRC_URI_BASE="https://downloads.mongodb.com/compass/${MY_P}-linux"
+SRC_URI="amd64? ( ${SRC_URI_BASE}-x64.tgz -> ${MY_P}_x64.tgz )
+ arm64? ( ${SRC_URI_BASE}-arm64.tgz -> ${MY_P}_arm64.tgz )"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 ISC MIT WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="dev-libs/cyrus-sasl[kerberos]"
+
+# Do not complain about CFLAGS etc since we don't use them
+QA_FLAGS_IGNORED='.*'
+
+src_unpack() {
+ if use amd64; then
+ S="${WORKDIR}/${MY_P}-linux-x64"
+ elif use arm64; then
+ S="${WORKDIR}/${MY_P}-linux-arm64"
+ fi
+
+ default
+}
+
+src_install() {
+ dobin bin/mongosh
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 9da67b91678f..82efc99e1f19 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,8 +1,10 @@
AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03
DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
+DIST puppet-agent_7.10.0-1focal_amd64.deb 20964600 BLAKE2B 160a5abf3dccb57b325283f9ec6f908be73aaa065787bc6cefe2db0fbfd67145a42cab1a763e2e14c64b7902c50814b09a4b4763aaa504536f289b485cd41a6b SHA512 88c2907e47ad3009c9ce9089d3fb91da68c6c80d9d50fbf714332f2f637ad69adc122a88042cac020ae9c637b07e6569ffab7998ca08aa57a67254748cce5d30
DIST puppet-agent_7.8.0-1focal_amd64.deb 20931500 BLAKE2B 3c521631fb96440e51ad82c3665f07a5ee9cba1d978fccbe9388684ad0c211138f022017ff49b92818cfc8f50ebed0a996c9321918413e4a1c7ca0f5a2f68f8a SHA512 f0cd9951b54bc9aacce987ea10e9257db9432620f50657ca220ea8b7b4aad1c5ddebd6f5e89c5bdee837b0f928bbebe375afdb72652eb33ee22e3778498aafa1
DIST puppet-agent_7.9.0-1focal_amd64.deb 20934808 BLAKE2B 4b5c529e1a5cb5877a753b09a477fc08e7ca7a93c3b1dae5062864d2887adea584075f4ca6b963e01cb5121ce06008182cfc39124b9e22559899beb03855240f SHA512 b6c94b65febd6b76f1ab7af5f4f5238fb314b2abb226dd5828f09ca46fdf4cd22641f765ea338b3aeb7ccf6e0fe37d5682586fbef7dc27b51a654ded6f774495
EBUILD puppet-agent-6.19.1-r1.ebuild 2112 BLAKE2B cb5c39b4053e2e7f9476d36571ef2d7ffb232dc61c01517d1cd1fd0dee6d093b9b07e95962d8bd3c7c8db47bd9fe70fadf49446dc0f0702271b01d7c40e59d80 SHA512 552fa439fcdac6b76218401a2a60c042261e27fafa2cda93e5b2bb52b7708488292f167e5102e1dcff42913abe779f5202d69fc241e38ecb140a11d8f2ba9901
+EBUILD puppet-agent-7.10.0.ebuild 1965 BLAKE2B bc57deeb3288dbc8fb4d33037ef62b12a0cf2369046b82f8479c6b221feeef52e892e31ffbd5a1c54aa25325952eeb186c6976e3dc73e8cf79f2ae3b4c28c0d4 SHA512 e33f11ad7c5db62c045e754bba406e4409b149527f9b1de4d1247cb6675fcb2059362aef912be490657aede0c270f466b6a3d3ebe7ada328d993bd9a3e988520
EBUILD puppet-agent-7.8.0.ebuild 1965 BLAKE2B 9524398bc6ddab603236762a151940c3a0c0ea55cdc686516904c0a1282248f6f9d1546ac1b792b22a4d3ad2d0998056c3c2485c6801fe5bf0e2be93b62c5967 SHA512 1f77777cee4cb41c8f53ba79784631f4549c1233aeb4896d870787fc4b3c7f5d98702d3bf5186b18f8b58b1c9c4f13dfc2f00826b3d57e2e11876f3c6aed8b02
EBUILD puppet-agent-7.9.0-r3.ebuild 1965 BLAKE2B bc57deeb3288dbc8fb4d33037ef62b12a0cf2369046b82f8479c6b221feeef52e892e31ffbd5a1c54aa25325952eeb186c6976e3dc73e8cf79f2ae3b4c28c0d4 SHA512 e33f11ad7c5db62c045e754bba406e4409b149527f9b1de4d1247cb6675fcb2059362aef912be490657aede0c270f466b6a3d3ebe7ada328d993bd9a3e988520
MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild
new file mode 100644
index 000000000000..c24ff0f353a2
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd unpacker tmpfiles
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/puppet
+ !dev-ruby/hiera
+ !dev-ruby/facter
+ app-emulation/virt-what
+ acct-user/puppet
+ acct-group/puppet"
+
+DEPEND="
+ ${CDEPEND}
+ app-admin/augeas"
+RDEPEND="${CDEPEND}
+ app-portage/eix
+ sys-apps/dmidecode
+ sys-libs/libselinux
+ sys-libs/glibc
+ sys-libs/readline:0/8
+ sys-libs/libxcrypt[compat]
+ sys-libs/ncurses:0[tinfo]
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+ # conf.d
+ doconfd etc/default/puppet
+ doconfd etc/default/pxp-agent
+ # logrotate.d
+ insinto /etc/logrotate.d
+ doins etc/logrotate.d/pxp-agent
+ # puppet itself
+ insinto /etc/puppetlabs
+ doins -r etc/puppetlabs/*
+ # logdir for systemd
+ keepdir var/log/puppetlabs/puppet/
+ chmod 0750 var/log/puppetlabs/puppet/
+ # the rest
+ insinto /opt
+ dodir opt/puppetlabs/puppet/cache
+ doins -r opt/*
+ fperms 0750 /opt/puppetlabs/puppet/cache
+ # init
+ newinitd "${FILESDIR}/puppet.initd2" puppet
+ systemd_dounit lib/systemd/system/puppet.service
+ systemd_dounit lib/systemd/system/pxp-agent.service
+ newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
+ # symlinks
+ chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+ dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+ dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+ dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+ dosym ../../../../usr/lib/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
+
+pkg_postinst() {
+ tmpfiles_process puppet-agent.conf
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index bd1612749002..f43624fc3a13 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -4,9 +4,11 @@ AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76
AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
+DIST puppet-7.10.0.tar.gz 2856888 BLAKE2B 9322d59f0a8af26343f474e7b4295dfa3bfc105137498d7333776abf366c35fe66af137595ca26ea0d8cf0474151e290825240b4ee87679f25a817fa0ffdeb9d SHA512 686a9023549fb137d49c381f9c21402451503531d3edc4381a0c80dda584eac1621b1a33013e63c07158c8cec08c6e864ba70d0be4cd0c2cfeaf4f9fce9ed36a
DIST puppet-7.8.0.tar.gz 2893281 BLAKE2B cef1d56048a72ffa18c9fe2917e4f616dd4d778eddc91c88becf06a418471af1e2cf1688aa05ad3e71f24d5bb1923eaf35b8a1419ed05a72b299af970d1427e6 SHA512 189fabe199afefc77951ee3f2bf20c749f6efe290cc3a76f5ba58892c80cc76082b1ce77c23bca87f57f62816410bc5536e4206806fe31517915c72046ace08d
DIST puppet-7.9.0.tar.gz 2899891 BLAKE2B 06f675fc9eaac4ddfa7957847abe33928f0779f3c18dbf339067525ec69b6b87d274294a1133ec8332fbbed6111b568c63478493f3de467c63e2948bcf446b71 SHA512 6329d89530d2cb008e28116de655024e9bf944b3f41d086e0e47c41c74af3da51c283a912ac966cf7bac52f86e54304df6cf31477a5663cae09fb4d18f958cf2
EBUILD puppet-5.5.22-r1.ebuild 3751 BLAKE2B f651b0c7d9196a83b00533a2cf6cb3b28e8b5de366cd792ed7194e84b93d971042c3e17a50abefe56e18f67bb0cd3d694604f19dc02c3ed7d72e11f1e0b71d22 SHA512 5d50d74214db6abac3fa66a5249b8b5dbfbc6340c6815e99611e2c62ff6347f2e9c96c53ad79221865e78eeed3e2796941cc50b5a979bdc8a589f57e6681ce06
+EBUILD puppet-7.10.0.ebuild 3540 BLAKE2B 74d2e019ac3823979cb19d845d1acc1556003bd7c9fa4eb6083a34d3352d93f9e94315d50708c585acd72aa9756a416245b14d3f4e71e29e8c948fa0e6708cae SHA512 9e98044702d8b596c3acb31adbab0738977fdf1accedcd7e74a962f74d606d6d5453c322a5389434f494fa46403f362c089e88389b6eec2fd59e1a8d1ba6af6c
EBUILD puppet-7.8.0-r1.ebuild 3538 BLAKE2B ffa6662cfe92ab50890fdcdffdf397c709c93f1a37e0cc12c6029fa718f78367b2ff4548757d5c1a798f46ad7243a3483d8066bdf29e1a9d78866dca16a64b34 SHA512 80f2fe881dbfee31b3e7fb81d0f9e2d029c696fb3c54d63489da74845c296bba7eb821124170c58dc992887817d2725f1a2bbcdb4e1efbadd1bea69c87ee107e
EBUILD puppet-7.9.0-r1.ebuild 3540 BLAKE2B 74d2e019ac3823979cb19d845d1acc1556003bd7c9fa4eb6083a34d3352d93f9e94315d50708c585acd72aa9756a416245b14d3f4e71e29e8c948fa0e6708cae SHA512 9e98044702d8b596c3acb31adbab0738977fdf1accedcd7e74a962f74d606d6d5453c322a5389434f494fa46403f362c089e88389b6eec2fd59e1a8d1ba6af6c
MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-7.10.0.ebuild b/app-admin/puppet/puppet-7.10.0.ebuild
new file mode 100644
index 000000000000..c1c0ce4f6d0c
--- /dev/null
+++ b/app-admin/puppet/puppet-7.10.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.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
+ dev-ruby/concurrent-ruby
+ 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
+ acct-user/puppet
+ acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # fix systemd path
+ eapply -p0 "${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
+ systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ newtmpfiles "${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() {
+ tmpfiles_process puppet.conf
+
+ 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/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index f604f10d4dbc..ae4ae055f0cb 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,6 +2,8 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
DIST puppetserver-7.2.0.tar.gz 62897576 BLAKE2B 63a8a7ea001757e15224ec819d9a23e23d3e568832421009118c1c4c3880564f614afcfa593e7c0c580cd2890ab653f5692cfc7fb23992ca7674cd5a56fa3f50 SHA512 ec90220abf4901ad98e1e07f65cdc25f09b62fda22f915260519d6fc599d36ea3a5ec2bfd5787cc9459d3c25753ff5eded2c09a67a614da1d6dda0881262b3b9
DIST puppetserver-7.2.1.tar.gz 62917686 BLAKE2B 2a77423a932d7c75a164818d011feee1b789759046551be0d0275436295c47af6398222a223409a28b83c8186caf0d9f6e2d9ab4fc606214119bf0b56dc4d4d0 SHA512 ac960b756e6cbf32e70d1d209c6202973ffec17b553a68eaf9c0580ff4925656ae1a7616e45bee11f2a06544157d61e58b94bf700d39affd5d0116840c3fc10f
+DIST puppetserver-7.3.0.tar.gz 63289430 BLAKE2B d434c63dd189bfcb0ddcb9e286f0e46e5ac3d0f3612bcbeb52b582b57035d9edad2bc38856c9936cb35fccee34f93d7a22f4ea2b088b1e3bef619e69f014bbe2 SHA512 db38fb040e559eff8e219ab56c01bbb0ac1092c193095b79c5edb4206cd11f4ce211b5a4217f4027f31f46060937ca31a99bd77f3352813d1a5b56af35a36927
EBUILD puppetserver-7.2.0-r1.ebuild 5330 BLAKE2B dfa1d0d6d15ca5e965ac2bd7dd8cbc89044db60ec4eb1bc71d17bbb8243b29ad6c5a75a623846f576e06edbd997a5b525ce2cbe1c044c7a4493083bc13e5e376 SHA512 f42646b2e12797783a3c1b67c06adf1eafacb734108c7b42d6a68595f51ae751b00cf74657107983a65ca7192aee7929d96f971dfc408176cceb421d19839376
EBUILD puppetserver-7.2.1-r1.ebuild 5331 BLAKE2B 999b5de0b2165e1e198abec668f9dd8d5efeee7f8282a9bed8df074e8a1d8e0b73cc6fae5eaae0c6916b9931f92480ad90516b625e435c214c525d83348e4014 SHA512 1ff8e175a7b11f5398f49bfc4e3fa426ef7c5eb1fe229d50d12427955e322a51cd19b7c888d568ebd63ee11a199eb03e0af71eee42b69bcaff3e93741ba1ff09
+EBUILD puppetserver-7.3.0.ebuild 5331 BLAKE2B 999b5de0b2165e1e198abec668f9dd8d5efeee7f8282a9bed8df074e8a1d8e0b73cc6fae5eaae0c6916b9931f92480ad90516b625e435c214c525d83348e4014 SHA512 1ff8e175a7b11f5398f49bfc4e3fa426ef7c5eb1fe229d50d12427955e322a51cd19b7c888d568ebd63ee11a199eb03e0af71eee42b69bcaff3e93741ba1ff09
MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-7.3.0.ebuild b/app-admin/puppetserver/puppetserver-7.3.0.ebuild
new file mode 100644
index 000000000000..15e9859ee758
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-7.3.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd tmpfiles
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64"
+
+RDEPEND+="
+ >=virtual/jdk-1.8.0
+ app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+ acct-group/puppet"
+
+src_prepare() {
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+ sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+ sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+ sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+ sed -i 's/var\/run/run/g' install.sh || die
+ default
+}
+
+src_compile() {
+ einfo "not compiling"
+}
+
+src_install() {
+ insinto /opt/puppetlabs/server/apps/puppetserver
+ insopts -m0774
+ doins ext/ezbake-functions.sh
+ insopts -m0644
+ doins ext/ezbake.manifest
+ doins puppet-server-release.jar
+ insinto /etc/puppetlabs/puppetserver
+ doins ext/config/logback.xml
+ doins ext/config/request-logging.xml
+ insinto /etc/puppetlabs/puppetserver/services.d
+ doins ext/system-config/services.d/bootstrap.cfg
+ doins ext/config/services.d/ca.cfg
+ insinto /etc/puppetlabs/puppetserver/conf.d
+ doins ext/config/conf.d/puppetserver.conf
+ doins ext/config/conf.d/auth.conf
+ doins ext/config/conf.d/global.conf
+ doins ext/config/conf.d/web-routes.conf
+ doins ext/config/conf.d/metrics.conf
+ doins ext/config/conf.d/webserver.conf
+ insopts -m0755
+ insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+ doins install.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+ doins ext/cli/ca
+ doins ext/cli/irb
+ doins ext/cli/foreground
+ doins ext/cli/gem
+ doins ext/cli/ruby
+ doins ext/cli/reload
+ doins ext/cli/start
+ doins ext/cli/stop
+ insinto /opt/puppetlabs/server/apps/puppetserver/cli
+ doins ext/cli_defaults/cli-defaults.sh
+ insinto /opt/puppetlabs/server/apps/puppetserver/bin
+ doins ext/bin/puppetserver
+ insopts -m0644
+ dodir /opt/puppetlabs/server/bin
+ dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+ dodir /opt/puppetlabs/bin
+ dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+ dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+ dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+ # other sys stuff
+ dodir /etc/puppetlabs/code
+ # needed for systemd
+ keepdir /var/log/puppetlabs/puppetserver
+ dodir /etc/puppetlabs/puppet/ssl
+ fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+ fperms -R 771 /etc/puppetlabs/puppet/ssl
+ # systemd type things
+ insinto /etc/systemd/system/puppetserver.service.d/
+ systemd_dounit ext/redhat/puppetserver.service
+ insinto /etc/default
+ newins ext/default puppetserver
+ # normal init type tasks
+ dosym ../default/puppetserver /etc/conf.d/puppetserver
+ newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+ # misc
+ insinto /etc/logrotate.d
+ newins ext/puppetserver.logrotate.conf puppetserver
+ # cleanup
+ dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+ fowners -R puppet:puppet /opt/puppetlabs/server/data
+ fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+ fperms -R 700 /var/log/puppetlabs/puppetserver
+ insinto /opt/puppetlabs/server/data
+ doins ext/build-scripts/jruby-gem-list.txt
+ doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+ newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+ tmpfiles_process puppetserver.conf
+
+ elog "to install you may want to run the following:"
+ elog
+ elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
+ elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
+ elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
+ elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+ elog "puppet config set --section master codedir /etc/puppetlabs/code"
+ elog
+ elog "# install puppetserver gems"
+ elog "cd /opt/puppetlabs/server/apps/puppetserver"
+ elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+ elog "while read LINE; do"
+ elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+ elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+ elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+ elog "while read LINE; do"
+ elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+ elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/tmpwatch/Manifest b/app-admin/tmpwatch/Manifest
index 8fc285761aa7..239dd4f833ab 100644
--- a/app-admin/tmpwatch/Manifest
+++ b/app-admin/tmpwatch/Manifest
@@ -1,5 +1,5 @@
AUX tmpwatch-2.11-boottime.patch 1034 BLAKE2B 37d257d39c8b7734e08f2498d07ac1d30e029a22c6ba70f2127f5a6a2d443555794022590e31445479ff145b9440695682aeb5be0102929ee9630c8a6527ce44 SHA512 6ad3cfe0dcd1a14d071ac64ca09279aae853c3b5a47604d99c2ff24319145d5c599ed6e780ac7eb9a2e2d185495e9d7e2133c905490b647f6b639a4bcd0def92
-AUX tmpwatch.cron 1533 BLAKE2B fd6e4ed53bb72e881a0dc92301ec04cf376dba40c2294973daaf8a353972664fb56da6e0f17b3ac161e189f9b7e5b9e883a7d2b5f64e4f909206432fb1163a90 SHA512 9c96eaccc70d6eadac1233b6cd6772c61dbe8fed348fbe45d729bba8d8434f32bb4ba800cf92f151d7576763f7fde7c5c25b55293ecdac5f5254ce387da8b016
+AUX tmpwatch.cron 1462 BLAKE2B 02dd8a5bf13816a7bb23cea219b6852fe73ed906da5a9b961c86c61068caa7bcf4e59a6b126a56d3226be0f1a4f4ef390e5dec979d2a3e4e89c2c468b6e299ed SHA512 12f1da682bc8e0961a3d83f099b8cd0184795276cd22d8e4f792f02f7043476b30b20e2b8647b123f3084aa1be20c28db2ca58014a0eba9343cba1e6b093c323
DIST tmpwatch-2.11.tar.bz2 145609 BLAKE2B ee66c77138e6f35030de817528ece1b3fa19622804e179fbc5c70c27281a52b8e8f7c7f631c9de73eb05085363852e91ee5a619de7db9a597a9f88afd95e164b SHA512 9242c5e1812c2ffc756cfc4cdc3023d0c0515e7c180e58ca3a838aa075d09fe4dc08dbc9afbc87ce3382e8aa8cb80a70e406deeab4ce10b39b6845d667989d97
-EBUILD tmpwatch-2.11-r2.ebuild 770 BLAKE2B 5b0e1e29f43f5accf3e4069ab6eb5f17503119fbe2d0dc886f4070ebec9b52d5e5949cf7cd19d9a62ee5e80def76835457156e764a4afec44d40c27e5f48cf25 SHA512 00bac9457bc1235eec06f68e35d3dddd91a083a911e80653f3237a9de19f96f5268d769b7f355675d10c96daf474cd78ad9f69b54d9977abe455f1b9a5c95b01
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD tmpwatch-2.11-r3.ebuild 770 BLAKE2B 5b0e1e29f43f5accf3e4069ab6eb5f17503119fbe2d0dc886f4070ebec9b52d5e5949cf7cd19d9a62ee5e80def76835457156e764a4afec44d40c27e5f48cf25 SHA512 00bac9457bc1235eec06f68e35d3dddd91a083a911e80653f3237a9de19f96f5268d769b7f355675d10c96daf474cd78ad9f69b54d9977abe455f1b9a5c95b01
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/tmpwatch/files/tmpwatch.cron b/app-admin/tmpwatch/files/tmpwatch.cron
index 806b1453e552..d35a590379d7 100644
--- a/app-admin/tmpwatch/files/tmpwatch.cron
+++ b/app-admin/tmpwatch/files/tmpwatch.cron
@@ -1,47 +1,45 @@
#!/bin/sh
-# vim: ft=sh
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
# This cron script contains several (commented out) examples. You may use
# them as is, by uncommenting them, or modify them to suit your needs. Read
# tmpwatch(8) for more information on tmpwatch parameters.
-### Variables ###
-
-TMPWATCH="/usr/sbin/tmpwatch"
-#PORTAGE_TMPDIR="$(portageq envvar PORTAGE_TMPDIR)/portage"
-#PORTAGE_LOGDIR="$(portageq envvar PORT_LOGDIR)"
-#DISTDIR="$(portageq distdir)"
-
### EXAMPLES ###
# NOTE: if you have noatime in /etc/fstab for any partitions you plan on
# running tmpwatch on, you should obviously change any of the examples that
# use atime (-u|--atime). Those that don't specify anything, default to
-# atime.
-
-# NOTE2: the time value is in HOURS!
+# atime. Be aware that the time value is in HOURS!
# Delete everything in /tmp that haven't been accessed in a week (>=168 hrs).
#
-# if [[ -d /tmp ]]; then
-# ${TMPWATCH} --atime 168 /tmp
+# if [ -d /tmp ]; then
+# tmpwatch --atime 168 /tmp
# fi
# Delete everything in PORTAGE_TMPDIR that hasn't been modified in 2 weeks.
#
-# if [[ -d ${PORTAGE_TMPDIR:-/var/tmp/portage} && -z $(/usr/bin/pgrep emerge) ]]; then
-# ${TMPWATCH} --mtime --all 336 ${PORTAGE_TMPDIR:-/var/tmp/portage}
+# if PORTAGE_TMPDIR=$(portageq envvar PORTAGE_TMPDIR) &&
+# [ -d "${PORTAGE_TMPDIR}/portage" ] &&
+# ! pgrep -x emerge >/dev/null
+# then
+# tmpwatch --mtime --all 336 "${PORTAGE_TMPDIR}/portage"
# fi
# Delete everything in DISTDIR that hasn't been accessed in 6 months (going
-# by 30 day months)
+# by 30 day months).
#
-# if [[ -d ${DISTDIR:-/usr/portage/distfiles} ]]; then
-# ${TMPWATCH} --atime --fuser 4320 ${DISTDIR:-/usr/portage/distfiles}
+# if DISTDIR=$(portageq distdir) && [ -d "${DISTDIR}" ]; then
+# tmpwatch --atime --fuser 4320 "${DISTDIR}"
# fi
-# Delete everything in PORTAGE_LOGDIR that hasn't been accessed in 4 weeks
+# Delete everything in PORTAGE_LOGDIR that hasn't been accessed in 4 weeks.
#
-# if [[ -d ${PORTAGE_LOGDIR:-/var/log/portage} ]]; then
-# ${TMPWATCH} --atime 772 ${PORTAGE_LOGDIR:-/var/log/portage}
+# if { PORTAGE_LOGDIR=$(portageq envvar PORTAGE_LOGDIR) ||
+# PORTAGE_LOGDIR=$(portageq envvar PORT_LOGDIR); } &&
+# [ -d "${PORTAGE_LOGDIR}" ]
+# then
+# tmpwatch --atime 772 "${PORTAGE_LOGDIR}"
# fi
diff --git a/app-admin/tmpwatch/metadata.xml b/app-admin/tmpwatch/metadata.xml
index 6f49eba8f496..7a38bb900964 100644
--- a/app-admin/tmpwatch/metadata.xml
+++ b/app-admin/tmpwatch/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild b/app-admin/tmpwatch/tmpwatch-2.11-r3.ebuild
index cdc308efa9f9..cdc308efa9f9 100644
--- a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.11-r3.ebuild