summaryrefslogtreecommitdiff
path: root/app-admin
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/Manifest.gzbin35135 -> 35126 bytes
-rw-r--r--app-admin/ansible/Manifest8
-rw-r--r--app-admin/ansible/ansible-2.5.7.ebuild66
-rw-r--r--app-admin/ansible/ansible-2.5.8.ebuild2
-rw-r--r--app-admin/ansible/ansible-2.6.2.ebuild66
-rw-r--r--app-admin/ansible/ansible-2.6.3.ebuild2
-rw-r--r--app-admin/apache-tools/Manifest2
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.34.ebuild2
-rw-r--r--app-admin/consul/Manifest2
-rw-r--r--app-admin/consul/consul-1.2.3.ebuild69
-rw-r--r--app-admin/eselect/Manifest2
-rw-r--r--app-admin/eselect/eselect-1.4.13.ebuild2
-rw-r--r--app-admin/haskell-updater/Manifest8
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.10.ebuild5
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild3
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.9.ebuild5
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.3.1.ebuild5
-rw-r--r--app-admin/keepass/Manifest2
-rw-r--r--app-admin/keepass/keepass-2.40.ebuild111
-rw-r--r--app-admin/logstalgia/Manifest4
-rw-r--r--app-admin/logstalgia/logstalgia-1.1.2.ebuild (renamed from app-admin/logstalgia/logstalgia-1.0.7.ebuild)6
-rw-r--r--app-admin/perl-cleaner/Manifest12
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.20.ebuild1
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.23.ebuild1
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.24.ebuild1
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.25.ebuild1
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.26-r1.ebuild1
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-9999.ebuild1
-rw-r--r--app-admin/ps_mem/Manifest6
-rw-r--r--app-admin/ps_mem/ps_mem-3.12-r1.ebuild2
-rw-r--r--app-admin/ps_mem/ps_mem-3.12.ebuild2
-rw-r--r--app-admin/ps_mem/ps_mem-3.13.ebuild30
-rw-r--r--app-admin/puppet-agent/Manifest3
-rw-r--r--app-admin/puppet-agent/puppet-agent-6.0.0.ebuild79
-rw-r--r--app-admin/puppet/Manifest3
-rw-r--r--app-admin/puppet/files/puppet-fix-tests-6.0.0.patch18
-rw-r--r--app-admin/puppet/puppet-6.0.0.ebuild145
-rw-r--r--app-admin/puppetdb/Manifest2
-rw-r--r--app-admin/puppetdb/puppetdb-6.0.0.ebuild92
-rw-r--r--app-admin/puppetserver/Manifest2
-rw-r--r--app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild133
-rw-r--r--app-admin/pwman3/Manifest2
-rw-r--r--app-admin/pwman3/pwman3-0.9.11.ebuild2
-rw-r--r--app-admin/rsyslog/Manifest6
-rw-r--r--app-admin/rsyslog/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch66
-rw-r--r--app-admin/rsyslog/metadata.xml1
-rw-r--r--app-admin/rsyslog/rsyslog-8.38.0.ebuild455
-rw-r--r--app-admin/systemrescuecd-x86/Manifest2
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild61
49 files changed, 1319 insertions, 183 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index df5787a91225..91b828dab9d8 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
Binary files differ
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 3cab9e590899..649e114b54f9 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,18 +1,14 @@
DIST ansible-2.5.6.tar.gz 10157989 BLAKE2B 07341ab7a087e3139442d5420b461ca332f3a9e550874a746f43904763660ef12c9a2041bb991eeb315abdc7f6e31e3615d9283f407003eddddf2b661331c59a SHA512 169badaa6a94d1ea2d16cb97c7e5eb0b8c225a455edfa95f3ad9e4ec968d5b9525dec4732b60e5ba5f92412f87d8aacc0b2299f2595f3bb820ad8604be8e76d6
-DIST ansible-2.5.7.tar.gz 10162406 BLAKE2B 1374b0fba39f0cb263a24425d9ebcd9087c0dbad869ddaa1491465db60a80a1a3b82858c80d2d4fc1d03db05d94840f2eeddd4c5a13632426fac178663b7baca SHA512 1be274b080dcc4aba40c884ba45b1403788aadb1f14bd00fd52283bc6e691ec7863f061cb4b7d70965d48cdb49c6b849e9b2e49dd7dd6dd5d8788f2d637960b1
DIST ansible-2.5.8.tar.gz 10169397 BLAKE2B 7cb0abb168af25a3cd7b94880309cf19f018a68277472afb24811bb4ccc329c129f754d2b97626f71052712690e372856bfb62345cdae74165eca38066e86779 SHA512 8de8ddf1925ef1465654f4bc1d54fd9f5f9d700ef2c5a4982684f3a4560ac933b05ff0661c34e61235006abc64fd6acf299d0c45f7b5796c3a89dda5382099ed
DIST ansible-2.5.9.tar.gz 10165368 BLAKE2B 10d30d3200702958e15695d8fb0aa84ee89b65f966b2879f3d9e89c1bae9d38bffa5936f88dbd7e3b0329f07e523677898230fff424d0d61f03cbe2dab8f3020 SHA512 0962d2f30030889b07e72346452f21cdc99305920bb8e246fc19d37ca4c837dbfba3230634db398b74959a6a67f4ed9dd097eb7783a2854f0969aeeab7e00341
DIST ansible-2.6.1.tar.gz 10724749 BLAKE2B af4523ab904660fa3369bdae2839ab4b2f386235be5a004e1f9a9a5f7c555a2e6fe82319abe20ecbf7e74152f8e2ad5060fda2c2af0f5d62fdd9416901c9072c SHA512 1235e12a510317665956bfae9e0d03814083a24ba6e5c98072437e50b4a596437a173b32d9d5af37b4b9e168e35045fdb65e65276fdc830f473ab1f42dcba2d2
-DIST ansible-2.6.2.tar.gz 10738149 BLAKE2B ac46fe99da9aba55702c578c6d177b7cb1bcd17fb73f08f160afbbcb6a868de721202492e8198e8cb8c68a1ce771572ce0bb598cd310f2ce35d08b0aeeee3f8d SHA512 2283d69be267474e839af44e0e7a14a5532cadef7d65baa2af4045cb93d88b76890b735a78cce348916c04f5dc3c2ed78deb22bb8d94d0c0c0306180d79b1a9b
DIST ansible-2.6.3.tar.gz 10748570 BLAKE2B ff27e46771ab5c574202a195bdddb2affc256ba67de98627ef07d3899a1b6bbdb742a71deff63ad6a22aa53298eb22a22a44a885f53098e2404823565fbc513c SHA512 f34052379b892d5dff5e170e4237d4595ecf9d951226cc928fc092e253f5fa9f492a6e953ff09ed63b19ddb0f2b8df66ac738c2f48923e6d5b1dcc96fc2799c9
DIST ansible-2.6.4.tar.gz 10751810 BLAKE2B 16a01b76387b6fb0c6554861fd02a57858cf2623ea89e55c0940589b69a6589d4db00bdf87f1e51ab64e638c187657f66ebb5af33a6fa008b7f1dba1e853b3f3 SHA512 b3dc3469dd7e34e3b39b3382df65c3684a44be0515f68861997a4d0e5fce44d64000bc0da0b38fd3d27b45aa1ec3973da581482e0de54c5cc41eb761b230b116
EBUILD ansible-2.5.6.ebuild 1636 BLAKE2B 8c6498794147e6fc8c2cf50429a44f481f1244d532cb0205f6c0828bfceda1690264e78621fc74d75a03f3521600cc81f9f78afcba60a9e089b3472d9f4fa687 SHA512 5b90735e77ea2e0f47b6744f179ad555da406a6efa1a0137e590fe6e22cba1406aa925dd175a421fe7499ba2cdf9a8666673118700c046f9512d0572c6ec6fb6
-EBUILD ansible-2.5.7.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
-EBUILD ansible-2.5.8.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
+EBUILD ansible-2.5.8.ebuild 1624 BLAKE2B 406259cdee18b3b47e523252906b28e2480e51d0522fd14bcf7905938a737de5895b972ea51f0309105555b6475f966473f223f0ee7112f6a3ec910a0afd8697 SHA512 1f964bda9e7b54c0810d338c2fd474cff966a79285762d6bce3dfb1210cffa0a4a1d015f46bf59ff9c6463a63319386fb6e4d2bdc3ad9ebf2b9ba53bcff57669
EBUILD ansible-2.5.9.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
EBUILD ansible-2.6.1.ebuild 1636 BLAKE2B 8c6498794147e6fc8c2cf50429a44f481f1244d532cb0205f6c0828bfceda1690264e78621fc74d75a03f3521600cc81f9f78afcba60a9e089b3472d9f4fa687 SHA512 5b90735e77ea2e0f47b6744f179ad555da406a6efa1a0137e590fe6e22cba1406aa925dd175a421fe7499ba2cdf9a8666673118700c046f9512d0572c6ec6fb6
-EBUILD ansible-2.6.2.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
-EBUILD ansible-2.6.3.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
+EBUILD ansible-2.6.3.ebuild 1624 BLAKE2B 406259cdee18b3b47e523252906b28e2480e51d0522fd14bcf7905938a737de5895b972ea51f0309105555b6475f966473f223f0ee7112f6a3ec910a0afd8697 SHA512 1f964bda9e7b54c0810d338c2fd474cff966a79285762d6bce3dfb1210cffa0a4a1d015f46bf59ff9c6463a63319386fb6e4d2bdc3ad9ebf2b9ba53bcff57669
EBUILD ansible-2.6.4.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
EBUILD ansible-9999.ebuild 1639 BLAKE2B 363a22df345822cd047685b7cdf7114e5e1a1276bf90463799712ee90f751deea4c487f9c96a807558428d3e5993f4fded0017fb5d37b75ff6e550a6ccc32b2b SHA512 10d18db06a345555299b342eb01c7f3355f9f71d70f0ac6b3f2fc3837859161821c8c5771bec3d943647cb1c5ba8abae8c4febdccbbc4f2d747aa0f848682b46
MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.5.7.ebuild b/app-admin/ansible/ansible-2.5.7.ebuild
deleted file mode 100644
index 6ca07021a91a..000000000000
--- a/app-admin/ansible/ansible-2.5.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/netaddr[${PYTHON_USEDEP}]
- net-misc/sshpass
- virtual/ssh
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${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-python/unittest2[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
- if use doc; then
- cd docs/docsite || die
- export CPUS=4
- emake -f Makefile.sphinx html
- fi
-}
-
-python_test() {
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-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/ansible/ansible-2.5.8.ebuild b/app-admin/ansible/ansible-2.5.8.ebuild
index 6ca07021a91a..5b980c42cc10 100644
--- a/app-admin/ansible/ansible-2.5.8.ebuild
+++ b/app-admin/ansible/ansible-2.5.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
IUSE="doc test"
RDEPEND="
diff --git a/app-admin/ansible/ansible-2.6.2.ebuild b/app-admin/ansible/ansible-2.6.2.ebuild
deleted file mode 100644
index 6ca07021a91a..000000000000
--- a/app-admin/ansible/ansible-2.6.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/netaddr[${PYTHON_USEDEP}]
- net-misc/sshpass
- virtual/ssh
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${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-python/unittest2[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
- if use doc; then
- cd docs/docsite || die
- export CPUS=4
- emake -f Makefile.sphinx html
- fi
-}
-
-python_test() {
- nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-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/ansible/ansible-2.6.3.ebuild b/app-admin/ansible/ansible-2.6.3.ebuild
index 6ca07021a91a..5b980c42cc10 100644
--- a/app-admin/ansible/ansible-2.6.3.ebuild
+++ b/app-admin/ansible/ansible-2.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
IUSE="doc test"
RDEPEND="
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index c26148bfe9ca..9db619823b43 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -7,5 +7,5 @@ DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682
EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
EBUILD apache-tools-2.4.33.ebuild 2577 BLAKE2B cb22dea646e2136f767d99f36d0f6fcd341f09ba8a38a278b33980e251b99dc8186d78287c47a698d3d5462089afdb1517191ab2bde3f8d93e1578a8bf7a798d SHA512 2e468db54aeb16e14b6bd65e13cf63ffb43b7428feaa83a6f13f66d6d2da710f40e30613a1a19102ea45ca7d270252196ae6cf98b20bee49ee78e5e55e0b3484
-EBUILD apache-tools-2.4.34.ebuild 2577 BLAKE2B f0fdcd492a7664ffb13db13ac6a2f8c63f6e191309db55c6f981fa1d48a544c7e38de5f8ce2e0e96743e51a4a38d82215764a2c79b830f82efc6adf570dac11f SHA512 1a7e33375e0355ad4df9ff742ccb55754d07134fd85c13ca0a753560554d7b775b79e7a1a1b1c575079e62b39d3aed2275ccd58b5d92450f06d21252edf42d48
+EBUILD apache-tools-2.4.34.ebuild 2576 BLAKE2B b1b1333404e015984c46451a024c53eb0e0b33e02391fa31f7fe04d925cf1093c5283e991cfc309cdef3eed5a1054d20a713f66b6c917149e9151698a91361eb SHA512 c46a40ccb2188261c45940d184329a08b5308a2a79f4fd78f1501ed87ea887edbcef1e2f38b5b620aed2f8d411f5b03cd903c786a53270bc1e4aaf8e0d2602d0
MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
diff --git a/app-admin/apache-tools/apache-tools-2.4.34.ebuild b/app-admin/apache-tools/apache-tools-2.4.34.ebuild
index 93e1ddd7082d..72d5d5582135 100644
--- a/app-admin/apache-tools/apache-tools-2.4.34.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.34.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/consul/Manifest b/app-admin/consul/Manifest
index 742ddf8687b6..a3a4fc77cf60 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -6,5 +6,7 @@ AUX consul.service 354 BLAKE2B 9996b9d6a1aab360a3b46518e2091e8f30794f3bd3d113a3e
AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
DIST consul-1.2.2.tar.gz 15789375 BLAKE2B 8a0af370568f6fcb90334b147bd84e479efb682ed6c58d63dd56f3554f9e6538d37963ac825bb8598eef8948492feec688b8266733223d1557dbce9704daef35 SHA512 715f69e7b36d0070ea4e602dc50f51aa2547dbbbbb07cce985da79d1e201c6e84dade8a7c810e3602f88cfbd30e063669076954d2541810a18a0c9e7c9ff8458
+DIST consul-1.2.3.tar.gz 18428593 BLAKE2B 14582bf9668e4f2a1c8c443cb01d7b9780c9bc414ff226907335f3873c135b77566898649d16b352ef21ee9300c290338f59672c5fb2b187694aea97b8735dec SHA512 71a7dbfc031df4a96faf2ddd829f289e96adefd0e0087208bbdd26e742a24e3da05fceea4181eb915703ad3323ed5b02bf74eb3fdfbed1e9a1afa2f74acb2a34
EBUILD consul-1.2.2.ebuild 1550 BLAKE2B 83bbc84358ac1cd5854fd6325b62a517e6da51a0cb8d4cce6b5b94278ca4ffafaa74f3232d4d6556ebc6611b4d71608e028f931a72a10536698cec17a7322203 SHA512 bb60a8d056fe2dfbaff0eb0de014af536f9bdf8e5e8a76b17174acb19ca005530eb8811b8357097fb4a469acb0c6751337c8e81eb99fbbd156111aa1040fe4ee
+EBUILD consul-1.2.3.ebuild 1550 BLAKE2B 21eaf66415397eb834e6208082c58bca34e5e02d180503fcdb02d7727ca1d46e2fdbad86fd5c3b7d24961c2f16479c602b2e4ad42b5b6f98c4b48632d98558de SHA512 4ebefcbbd2d253d39c413b083feb0918e430ed27dbc38a728077ca16097729593f70576af0bd434109b3f2ec8ca17bc70cd74d09348c9e7dcc79a8dc1d0ed56e
MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.2.3.ebuild b/app-admin/consul/consul-1.2.3.ebuild
new file mode 100644
index 000000000000..5c900d4ab45d
--- /dev/null
+++ b/app-admin/consul/consul-1.2.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="48d287e"
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+ >=dev-lang/go-1.9:=
+ >=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+ enewgroup consul
+ enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+ default
+
+ sed -e 's:go get -u -v $(GOTOOLS)::' \
+ -e 's:vendorfmt dev-build:dev-build:' \
+ -i "src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ GOPATH="${S}" \
+ GOBIN="${S}/bin" \
+ GIT_DESCRIBE="v${PV}" \
+ GIT_DIRTY="" \
+ GIT_COMMIT="${GIT_COMMIT}" \
+ emake -C "src/${EGO_PN}" dev-build
+}
+
+src_install() {
+ local x
+
+ dobin bin/consul
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners consul:consul "${x}"
+ done
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 31365501331d..a34c904d9540 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,6 @@
DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
DIST eselect-1.4.13.tar.xz 177848 BLAKE2B 70e5a793759e16119f5233b2c974e0fcc8d213b2033e2b3b76e0a047797b1a0f2feb21ad3beda72f644b498725b4d8ff5c221dcd0870adf5197eaf81c6f3c895 SHA512 5ce10bd288268bc5b52031703f8ac8f3cf07bb22039339bb00c92583ed226162ea8865788f5c1ff4e058d38f0bf25e3557273fb1e839e0391c1fafb9f702bc11
EBUILD eselect-1.4.12.ebuild 1623 BLAKE2B 6d8d236b4b11ec808ab1f95c0a1c295fc4ffff17f85151dd176354a1a1bb7459eb9d64f59411b7a7e3905a563884865c5dc23973f5d6674f13ebafde00ef3d0b SHA512 398ca70365af9bb0aef6807b8d797fe55c10afabe25b2e7a4657aba39b70748f04a5f94b24569701042399e9c4ffea1c48b824f7b179608d080981ff1159f2da
-EBUILD eselect-1.4.13.ebuild 1627 BLAKE2B 769d35007e7151d71ed91b649d1e631af8f90bf00d9eb38f23415fa00629793bcb5151d5dd23f5b63c866c5b39c878703db8bdc789436ebe61190a7e3002a83b SHA512 16c5c1e1288b1b00eba2be8414f5ea5f7c2475ed122b2571aac044968d6bf21cf17e022f469a6123f1cc1e0d8d88db021231e7de9f697525145e1792bcf4ee3b
+EBUILD eselect-1.4.13.ebuild 1623 BLAKE2B f20b2426f4d508aeed32fa92d5c4b6e09024e867f830eb011a0e473d647ec9976d35881d6b39bd6f3c53aa97b03985cfe40ed95f4567afb6de4caf57f13141c7 SHA512 60ba4140a218a85f126790780e5810adf4aba9b7f5a2b58952fffe194dde0e41047f5ff4b481c4e9d491acdfda1b761041506c893a4f06d7dc121e3157a53de9
EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.13.ebuild b/app-admin/eselect/eselect-1.4.13.ebuild
index bcd025bed27f..e04296846522 100644
--- a/app-admin/eselect/eselect-1.4.13.ebuild
+++ b/app-admin/eselect/eselect-1.4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
RDEPEND="sys-apps/sed
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index d27ea366eb96..f51d3270f561 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -2,8 +2,8 @@ DIST haskell-updater-1.2.10.tar.gz 26586 BLAKE2B adc46f85118fa55e530aa079ef2df06
DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbccbf9cb15d246b21609a21aac746a8a034e284fe0b99891b5035980252a7aa8b376ad943f32882dc29e16226d95583cb053 SHA512 f3a993cb556919bf2e57fdaca7eea9146abc59096e779cbffb69a5c29fc5f6ef889c8ccf4d8331dbd9279919ea91bb05a16d83ad70085d5ef5a44d61120fe7e7
DIST haskell-updater-1.2.9.tar.gz 26675 BLAKE2B a3d11cdcee886a07d87cd2888a9deea1d963b7234b4a10a6b78e9467fae4e9382c92f14a6ba0593f86bf9422ab2cb4bec823de96f34b463590ae18429c118edb SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da
DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df
-EBUILD haskell-updater-1.2.10.ebuild 1095 BLAKE2B 3e75b0bcb4953fe1725eb240165ccb8d4189d4b8c958143b60c26f97166d2ad512d8eeb5d52e06458ecfd32715338be1a7aa3ceadd75041e6a75a97353cb1e07 SHA512 7c634de327d5c3e5254e84ca936e09d9f7063b5aec64e6d62c2b97c19caed1f2f389bcecbb5997cb95e59bd76eea3d7ae461ee55a08842eb59bf4c56f67a62aa
-EBUILD haskell-updater-1.2.12-r1.ebuild 1138 BLAKE2B 2b2369ec6480adac5fa663d0b7276a6ab9b038d92d9d94ccd057331e06025cb48de92653d8d836fb1dd7d5f4d8dbf2ba75fd035659d6a4b8c815538d3c08bed7 SHA512 0fd46c083d40b83d4dfc7370d1ef3777520c778b66f38a6a887eaa3477b94368fab92ed86066bc98285da45fc46ec342498d8242be94061b2a814ceab46e661e
-EBUILD haskell-updater-1.2.9.ebuild 1095 BLAKE2B c6980be308f42bacc8c0613d13182a03c03bd2b99d32e6a3d92fa31aaa25e9990ec10be8c3a4ac531aa242b4f02e41158bcb74217805b94435bcb0e97e021b9e SHA512 8f4e469c4f971a678fe35df8223beff476fa5ef5d02f471fec2a751a6fa553d484206d4b9507473d7d613080789271d1f0c3e2fb479b769fe3aa14dc2e15da34
-EBUILD haskell-updater-1.3.1.ebuild 1112 BLAKE2B 65817cb50717ba9ebdf564e06edb34bcadfba21d0bedab33c1bc7d7b8ed8a39c8432ac3cbfefcbb4d0c066a2b1f1dead4b98fa1fab98dffe2cf73985d6db7b08 SHA512 e5fe27f19e242c6ed60adad1f0892ca004f4cfa9f409d287090a3824c776cea4a3cae7937c05507e69495a465ef9dcc3433b31960c5eef90cd9f29b13a644c60
+EBUILD haskell-updater-1.2.10.ebuild 1076 BLAKE2B a21ed61a21f62a06fb3ef9702b7bd82f696646c71a84e49f19a94250cd16701cc1aa18a3e0151a09df973c442957ae8f025294585916f66f82c88a6fa3045ef2 SHA512 877d611303b52feade51b60fcaca3513a20e5173235d78a65fd78988655ff6d76f0a2b51267549473e84374ef331c7231b25486af28951c3f46a616332f78b2f
+EBUILD haskell-updater-1.2.12-r1.ebuild 1119 BLAKE2B c113e890a1375d3bd70a4cc94afebac0f9217206b8bbeb41811d9880cf03d156db293639c4d86423ca3ed6be0147a787a9ed67d101f6b0b9b87664057b16df99 SHA512 bf33e4b6f45689d4763a3ac88bc6d35f28f8cc5d4ccf6dd2e509c8ac05912905f21735f690d83ca833cf1ed85859c1acffec4a35cd7459e0cdb7303b5c5a2d4b
+EBUILD haskell-updater-1.2.9.ebuild 1076 BLAKE2B a21ed61a21f62a06fb3ef9702b7bd82f696646c71a84e49f19a94250cd16701cc1aa18a3e0151a09df973c442957ae8f025294585916f66f82c88a6fa3045ef2 SHA512 877d611303b52feade51b60fcaca3513a20e5173235d78a65fd78988655ff6d76f0a2b51267549473e84374ef331c7231b25486af28951c3f46a616332f78b2f
+EBUILD haskell-updater-1.3.1.ebuild 1093 BLAKE2B 9eaf109b857302eb065310c67e0f93b583a9a4d1d18683f78489a0f1dfe96bf29a2fb87fd10e14cab9abe5ded2277d7e4638e7c3c25186182b337dd748a45bd9 SHA512 274d02b8d3e2430b677c8b942f6028e6bcc6b407856d86a0a924d94c1ebc8af54cde249d77493346aee90000c2a3796cbcf447d9dc222748e43b00192983bf4e
MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
index 5b32badf0183..6a1b5a5f118f 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,8 +19,7 @@ DEPEND=">=dev-lang/ghc-6.12.1"
# Need a lower version for portage to get --keep-going
RDEPEND="|| ( >=sys-apps/portage-2.1.6
- sys-apps/pkgcore
- sys-apps/paludis )"
+ sys-apps/pkgcore )"
src_prepare() {
if use prefix; then
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
index 42a7b7d3e1ca..9391ee6188a7 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
@@ -20,8 +20,7 @@ DEPEND=">=dev-lang/ghc-6.12.1"
# Need a lower version for portage to get --keep-going
RDEPEND="|| ( >=sys-apps/portage-2.1.6
sys-apps/portage-mgorny
- sys-apps/pkgcore
- sys-apps/paludis )"
+ sys-apps/pkgcore )"
src_prepare() {
default
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
index b9e1932fd81a..6a1b5a5f118f 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,8 +19,7 @@ DEPEND=">=dev-lang/ghc-6.12.1"
# Need a lower version for portage to get --keep-going
RDEPEND="|| ( >=sys-apps/portage-2.1.6
- sys-apps/pkgcore
- sys-apps/paludis )"
+ sys-apps/pkgcore )"
src_prepare() {
if use prefix; then
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
index 5d51680239c9..7861b7114a80 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,8 +19,7 @@ DEPEND=">=dev-lang/ghc-6.12.1"
# Need a lower version for portage to get --keep-going
RDEPEND="|| ( >=sys-apps/portage-2.1.6
- sys-apps/pkgcore
- sys-apps/paludis )"
+ sys-apps/pkgcore )"
src_prepare() {
default
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 8bde63ecefd3..03ee3189ae80 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -2,6 +2,8 @@ AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45d
AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
DIST KeePass-2.38-Source.zip 5091900 BLAKE2B 22e3f7046984204a3e0c4a1c6d8303661048bc0fee4bcdb7999b521d0ed6e5463d89044d2897cfec0c932349cc80a7b43d4c8dfbceb4f2e88041c642e0c0d231 SHA512 42fa7274874d4858da360a6772eb25adbf3a6dafe375093459d9a25903d8c159360ea722e969fe8b330bccf62ee5d381e131bd0ba075445932d8019eee19bf20
DIST KeePass-2.39.1-Source.zip 5109228 BLAKE2B 0b1214ac70d3d615e029c89abe63176f31e29a3fb800d84b6102220d2d39ebba848e3100e85e6f3d5cd4965461c68798ba880d5b229e8f8e6a20b0d65c2c632c SHA512 9f2b5f6c86b00932f132f8eea24fc35f08c217ed3feb047afe585592761f5297b76140c3154fb519dc5c9137718227a0bc4b6a45d22d1eb0ac95d08c73a70314
+DIST KeePass-2.40-Source.zip 5136918 BLAKE2B 7b5071cbe3bc5f20450a094a4b8969e2e25f6bba27d88ee5c2c25f2706ed3cf18e721ba53ff54c78db6ea1e167cef1108611fc8253a9d6e19eb3f9d1f3317c73 SHA512 222f7e7ef65be8b0d75baa0a6e871d5edad1b570b64f261405b843d7387ec1faeb4138afb8b31934d70eebe0add297681028cb4f3acfcbe4f518c763fe6c0145
EBUILD keepass-2.38.ebuild 3037 BLAKE2B 3fe5b971d8336ffdc3f9b520ac3c4530cdee3555c3e20cf7658ddb6fc874b28d1ee5710d76de2282128e83c84f05b5b2435db657e9be278ce4ed7ea107b6829a SHA512 f2f473c7fcde5e11711c3519c72ad78f2853ac6e7c242da2be9aa34e74e8d7962e2416e48a827b5a6d6e9b6f91314b426e662cbdc2e01e9c2d8e9331120f10a7
EBUILD keepass-2.39.1.ebuild 3044 BLAKE2B 9585f72e1556fd9d033ee8dafb3a6baeca0e1aad2c318367f6dcadb102a0557890e422679529b3f3d61ebdf5120a49eda13553326f5b5a919d6245edeb927e77 SHA512 143239c46dc87d69859beaf7b3ef621d4793c6341871e7c325058529b00c4a1a5da297b42d1e4dc0788eb7e80a2b27d47f02bbdd9758050aab1615f02de8245d
+EBUILD keepass-2.40.ebuild 3044 BLAKE2B 9585f72e1556fd9d033ee8dafb3a6baeca0e1aad2c318367f6dcadb102a0557890e422679529b3f3d61ebdf5120a49eda13553326f5b5a919d6245edeb927e77 SHA512 143239c46dc87d69859beaf7b3ef621d4793c6341871e7c325058529b00c4a1a5da297b42d1e4dc0788eb7e80a2b27d47f02bbdd9758050aab1615f02de8245d
MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
diff --git a/app-admin/keepass/keepass-2.40.ebuild b/app-admin/keepass/keepass-2.40.ebuild
new file mode 100644
index 000000000000..e1e03bb233e9
--- /dev/null
+++ b/app-admin/keepass/keepass-2.40.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="https://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+ dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+src_prepare() {
+ # KeePass looks for some XSL files in the same folder as the executable,
+ # we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+ # This XSL file will not be upstreamed since the KeePass creator said that
+ # including this patch would break the Portable USB version of KeePass
+ # (which keeps/looks for xsl files in its own folder)
+ default
+
+ # Switch into build dir so the mono prepration script works correctly
+ pushd Build || die
+ source PrepMonoDev.sh || die
+ popd || die
+}
+
+src_compile() {
+ # Build with Release target
+ xbuild /target:KeePass /property:Configuration=Release || die
+
+ # Run Ahead Of Time compiler on the binary
+ if use aot; then
+ cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+ mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+ fi
+}
+
+src_install() {
+ # Wrapper script to launch mono
+ make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+ # Some XSL files
+ insinto "/usr/share/${PN}/XSL"
+ doins Ext/XSL/*
+
+ insinto "/usr/$(get_libdir)/${PN}"
+ exeinto "/usr/$(get_libdir)/${PN}"
+
+ doins Ext/KeePass.exe.config
+
+ # Default configuration, simply says to use user-specific configuration
+ doins Ext/KeePass.config.xml
+
+ # The actual executable
+ doexe Build/KeePass/Release/KeePass.exe
+
+ # Copy the AOT compilation result
+ if use aot; then
+ doexe Build/KeePass/Release/KeePass.exe.so
+ fi
+
+ # Prepare the icons
+ newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+ newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+ # Create a desktop entry and associate it with the KeePass mime type
+ make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
+
+ # MIME descriptor for .kdbx files
+ insinto /usr/share/mime/packages
+ doins "${FILESDIR}/${PN}.xml"
+
+ # sed, because patching this really sucks
+ sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+
+ if ! has_version x11-misc/xdotool ; then
+ elog "Optional dependencies:"
+ elog " x11-misc/xdotool (enables autotype/autofill)"
+ fi
+
+ elog "Some systems may experience issues with copy and paste operations."
+ elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/app-admin/logstalgia/Manifest b/app-admin/logstalgia/Manifest
index c5c96baf293f..8a2d9e756b6b 100644
--- a/app-admin/logstalgia/Manifest
+++ b/app-admin/logstalgia/Manifest
@@ -1,3 +1,3 @@
-DIST logstalgia-1.0.7.tar.gz 902050 BLAKE2B 1ba368134c6335949e19a64b4b9167337a7475eac423fc14a3b906c89fa5a84e0062e1e123ef4c2b998c7596710df1844c5e7a46792d0f075b001ccaaa9c6c8d SHA512 862950ec387e27d72fe127fcccd37d1e6a0ed8b77fb243c119ef8b48b5bc45092d1b6881b9afbc016969e80a427fa4e210aa5d35524baf191d0c4fad5f91e3a9
-EBUILD logstalgia-1.0.7.ebuild 673 BLAKE2B 8e33b2c46c87b28b3b2bcb7beda36e76774bb110f894b8617093f032ebb578e9a70064d3823ebad7e48467668e87aee392202fc39dd798464c9a6ff9150517e8 SHA512 96f12f71f73dcc569712d9a9c888078786c28c3892cef7a370c88709696bfaec69c7a7a4614e22018079f62430178c9489974b53beee609b64c8af4ff1624e59
+DIST logstalgia-1.1.2.tar.gz 2330691 BLAKE2B 20fb549282dde860ef1db272c75360219ce4614838264a2ad7dbaa25cd3c8509f215d61ec88679165eda9619d8a3d83d9201796fa7691517ca822fa110f37d14 SHA512 e2bd41cbc6edabc1ff82d0da4ad6f749e0e6d44e5a23ea976c31d19339f56e5f693ba86b81ceee3c7590842df61d61fe69f1378711b8e7d1c30deff330cacb1e
+EBUILD logstalgia-1.1.2.ebuild 674 BLAKE2B cc9e01eeb3a80d0b7e8a60896e4341410cd99221e86f5d9bc72869c57c4eb5813b258c6ad7dc9bd8f9e9a589c3f0df943b34aab34c1c8b0e3c1e547a17071381 SHA512 aad07f7d2ccb0a5885103c866680d45c3a2aea7496581ffb8f1618fc710fda0214868b22c4addf562922987055218dca174e1df9c38a492e8a0cb0e1364b2682
MISC metadata.xml 399 BLAKE2B f6f66afb0eb1ddbca766a65035c4af929cf91714c18f4e0cb022ae04fda33bab7dd00739cfd4c1ac3413422dd6ab65d7ee3e5e8d05f0ddf360257212cdefa102 SHA512 0af3dd67c742ed83c332389f6ca3709d3382fe4bca940b6ce05b0271a08b2a5a7ee3d49789db4b8fb66831d17cc01acdff60d5064cb9ab4540e5b2f965ff2b41
diff --git a/app-admin/logstalgia/logstalgia-1.0.7.ebuild b/app-admin/logstalgia/logstalgia-1.1.2.ebuild
index 91fcf17890cc..be16497f71ac 100644
--- a/app-admin/logstalgia/logstalgia-1.0.7.ebuild
+++ b/app-admin/logstalgia/logstalgia-1.1.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="Replays or streams an access_log as a retro arcade game-like simulation"
-HOMEPAGE="http://logstalgia.io/"
+HOMEPAGE="https://logstalgia.io/"
SRC_URI="https://github.com/acaudwell/Logstalgia/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index fdad5334b772..a803d9bae618 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -4,10 +4,10 @@ DIST perl-cleaner-2.23.tar.bz2 6495 BLAKE2B 4e0b4dcbe22c0642e753dc999ba3fec4daa4
DIST perl-cleaner-2.24.tar.bz2 7161 BLAKE2B 41f7b02a7de3f0b5dd1e6c28e9db51df6f4d5e3a36ecb924ffc93d8a3883a2133ece40eb3133faef6e5adf5b26f4cf3638741b586d874a193995e55704f78ed5 SHA512 c6e32aa3123064e9e2fb02823a8b228e3c77720f5c471e9be51f2a4b2765a6c83dcc2ac24fbffae077f4882c70054eb0a3ca0243677a5ac970cb7a64e8b9c265
DIST perl-cleaner-2.25.tar.bz2 7435 BLAKE2B 348f5429874bf7b1db5c9ba5b1479c3d5fbce68fc9ef91aa44dad3325ab2287d4bfda9221063dd643ec3b6df465443bb9a024705ec46f15c50ccd618ef193ce6 SHA512 5ef5682872ce840c0df98de82a6cf622120435f542206a00bb8fe0f9d5e46fb9898a89ab576b08a74b0d69d57a90a930d9f8d7d0b527fa3a928a6e4ddbad6ee9
DIST perl-cleaner-2.26.tar.bz2 7462 BLAKE2B 3e651503da847275b452d7eedcecc820b9572890d7ef1b3c421ac170a1daf8ae712a9b62f6c9fd4705d973566b59190638f980962f145741f5ae47eefed836f9 SHA512 5c3fa164a2b5e84e5520276e4f3ff4872298cf53aa973afd6c8755e71884f1591c7cd5cc99d399d343ca01cb9ece8ee3e8e3aaf1908d22afc31ae08fab1e5821
-EBUILD perl-cleaner-2.20.ebuild 1205 BLAKE2B d327574484b14e3576dade1325862c5b757796b6b06540801523b83ea754f6658788feb4822af64934b8584e4565e2a2bad3611ef81cccf5dbf8fcc45a1c46bb SHA512 66c007b244ee7bb36f888330c88cb29efb99892e013a3f34a3e68642b3802cef3c49fb23642cf8976af84e2916678844b99715565aad466b44c4f73f6105c15e
-EBUILD perl-cleaner-2.23.ebuild 1065 BLAKE2B f30cc85033cedcee4f02bf062e7331864fa10f74988950b1cfa4324dc867f3c0cd84f529c6b62d00153beb16fc8466c8cb9b8633b2b0aab0eb9d9e63c58beb7b SHA512 ee6b24eaed7a26e8a9247d75bab9e3e24f761d6c48a04b2afa7a4a259f1204b7747b4894a76b61808f4ab6430a5a16039ab2ea4f870e5162f45b6248bbe33179
-EBUILD perl-cleaner-2.24.ebuild 1065 BLAKE2B f30cc85033cedcee4f02bf062e7331864fa10f74988950b1cfa4324dc867f3c0cd84f529c6b62d00153beb16fc8466c8cb9b8633b2b0aab0eb9d9e63c58beb7b SHA512 ee6b24eaed7a26e8a9247d75bab9e3e24f761d6c48a04b2afa7a4a259f1204b7747b4894a76b61808f4ab6430a5a16039ab2ea4f870e5162f45b6248bbe33179
-EBUILD perl-cleaner-2.25.ebuild 1052 BLAKE2B 9ec3cfc3c17e3ea15805c9587d4120eee87cafbe8664300f7bf1ccf871ceecee63cd5c83fc6c3fd63e4f1750dc0bbc3aa0f786c3b33731f4e8211edd989c40db SHA512 5cf28cf372371dfc165d64ea4fdfc989ea153357ff678b6f97716d7870df4d2a8e0140e33ba02762c62befb0bb647b1b0655e3cdcc0ea9c7f231f9be4b00e04c
-EBUILD perl-cleaner-2.26-r1.ebuild 1121 BLAKE2B d7a35aad10f2da2ac07c49824d5a64c4a4ed4ad490d57e6a3187757feaff228f726f9563f926b23fa895ed25ce2544e6a17db10e06bbf4ab51c3d2075e31d365 SHA512 43484532b8b93ebc67c5003ed94d4d3a524cd38dfbf78cc889b52e260fc55e45d2bfff2bccb8917b34d6080dcc7b1fc4bb79a41ac578481199f95c425485c2ac
-EBUILD perl-cleaner-9999.ebuild 1121 BLAKE2B d7a35aad10f2da2ac07c49824d5a64c4a4ed4ad490d57e6a3187757feaff228f726f9563f926b23fa895ed25ce2544e6a17db10e06bbf4ab51c3d2075e31d365 SHA512 43484532b8b93ebc67c5003ed94d4d3a524cd38dfbf78cc889b52e260fc55e45d2bfff2bccb8917b34d6080dcc7b1fc4bb79a41ac578481199f95c425485c2ac
+EBUILD perl-cleaner-2.20.ebuild 1186 BLAKE2B 1a7b893bd93e0e277d1ae43e2a011a5cfdd9432e6e8061849d46eef445203071a4ff7f5f2f6bbf46f6d1b372f108c90cb03a9b343f570d66446e977401f56c87 SHA512 5d2577f74a842cfcba8a3edb60050f5a6ee9098c3e21a695457422967afda04d599c5b7c0b2bdf26408c49e618e5bc046cb161face449f12215cae2b66c31501
+EBUILD perl-cleaner-2.23.ebuild 1046 BLAKE2B 864a808ab097bcbec0ea38a55de0bfb39766fc4167d4129235769ed1a965fea84268b3f0d719cc762453dcfccae2784b50edf689b19231b8c001b4eeb22f104d SHA512 27f6a4098fbbfe3e0474cbf7f88562d9601d1cdc32cf619c9a8bcf6296932c3b48da43641902e22ab702d1648393f4e5d207ba782b76dcb5da38c0e8962187d3
+EBUILD perl-cleaner-2.24.ebuild 1046 BLAKE2B 864a808ab097bcbec0ea38a55de0bfb39766fc4167d4129235769ed1a965fea84268b3f0d719cc762453dcfccae2784b50edf689b19231b8c001b4eeb22f104d SHA512 27f6a4098fbbfe3e0474cbf7f88562d9601d1cdc32cf619c9a8bcf6296932c3b48da43641902e22ab702d1648393f4e5d207ba782b76dcb5da38c0e8962187d3
+EBUILD perl-cleaner-2.25.ebuild 1033 BLAKE2B cb2b0768286815689d8516f06b8fb78436b0fc3746768e25458af4d8843e65c20298496cb808c0b19c55f96d9c2eaeb121afc6aed52704b48ddc18bb6467175c SHA512 5d13694ae65fc83e1429c85a92b30dbc033a30ac31e93809eb63e54c7d22e1ec24479ddffdf01d3fb6fe2164b3373a96a0e0383ba5d2e4afa6d80036eac61e41
+EBUILD perl-cleaner-2.26-r1.ebuild 1102 BLAKE2B 901777e1ab63c96a03df5ed3e2fa8e8466040079353ad8030df316454c55b47c9bdf5b9a03831d393eae61d3273763dc9a8119f1f1c7a0762545598b715296b4 SHA512 5ca9ef465fd36420df8f61fe7381c8e6ca7f81b020420054bf6e94367caf6ba987da27fc3af3bae09ce4cc4b671da314937aeaeae6961bc69e8d9a964705653b
+EBUILD perl-cleaner-9999.ebuild 1102 BLAKE2B 901777e1ab63c96a03df5ed3e2fa8e8466040079353ad8030df316454c55b47c9bdf5b9a03831d393eae61d3273763dc9a8119f1f1c7a0762545598b715296b4 SHA512 5ca9ef465fd36420df8f61fe7381c8e6ca7f81b020420054bf6e94367caf6ba987da27fc3af3bae09ce4cc4b671da314937aeaeae6961bc69e8d9a964705653b
MISC metadata.xml 248 BLAKE2B 7e969e31666e369b4b1826230eb9c103e51962ac23701a7d5e49d211d6da6ee2f6a8372d72b3ba454140d2c1fb7ab6d122f011e9c8144e95a9cc11f01d2e6481 SHA512 53fd9b61e8fd7f18f9493861896a34938e5f6ee4efb3d2c71703dfa81587d0943f0d439fac0e0c106966dabba08d6aeb4b0a2ff85addf30d992c9b7c78ab6314
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
index 7ec93d91073c..6c9de1d4f035 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
@@ -27,7 +27,6 @@ RDEPEND="app-shells/bash
|| (
( sys-apps/portage app-portage/portage-utils )
sys-apps/pkgcore
- sys-apps/paludis
)
"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
index c0b5fb735ad6..9d0429d247d4 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
@@ -27,7 +27,6 @@ RDEPEND="app-shells/bash
|| (
( sys-apps/portage app-portage/portage-utils )
sys-apps/pkgcore
- sys-apps/paludis
)
"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild
index c0b5fb735ad6..9d0429d247d4 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild
@@ -27,7 +27,6 @@ RDEPEND="app-shells/bash
|| (
( sys-apps/portage app-portage/portage-utils )
sys-apps/pkgcore
- sys-apps/paludis
)
"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
index 07906d19f3bc..a824c7030168 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.25.ebuild
@@ -27,7 +27,6 @@ RDEPEND="app-shells/bash
|| (
( sys-apps/portage app-portage/portage-utils )
sys-apps/pkgcore
- sys-apps/paludis
)
"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.26-r1.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.26-r1.ebuild
index 13029ade666c..d2a96ef087a2 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.26-r1.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.26-r1.ebuild
@@ -28,7 +28,6 @@ RDEPEND="app-shells/bash
( sys-apps/portage app-portage/portage-utils )
( sys-apps/portage-mgorny app-portage/portage-utils )
sys-apps/pkgcore
- sys-apps/paludis
)
"
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
index 13029ade666c..d2a96ef087a2 100644
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -28,7 +28,6 @@ RDEPEND="app-shells/bash
( sys-apps/portage app-portage/portage-utils )
( sys-apps/portage-mgorny app-portage/portage-utils )
sys-apps/pkgcore
- sys-apps/paludis
)
"
diff --git a/app-admin/ps_mem/Manifest b/app-admin/ps_mem/Manifest
index b878da859c8e..bd9f4d107015 100644
--- a/app-admin/ps_mem/Manifest
+++ b/app-admin/ps_mem/Manifest
@@ -1,4 +1,6 @@
DIST ps_mem-3.12.tar.gz 18074 BLAKE2B 98861120b09b3a25b29b5b461d50d8e6a8a684fe76685a7b032f769896dba4b8fa6cd1b1de2644488bf8b4568b960f2949eac2a72a6225cd19682a9c08803baa SHA512 aeba7573b651ffbe6bb263ecc257716cc91219aac232694a628b0e5b1e45235149d7dcf68f6b9ee669bd005adf68693cd09f32e378934690270b0b72c38abea4
-EBUILD ps_mem-3.12-r1.ebuild 665 BLAKE2B b63af8599f99ab56b3cfdb89e97d49bb12369ba4fd5178df3ba89ab7060748333c13da80c7657833fec7808aa2e8d78aeffc60ea81d3bf98a706437bd2f4354a SHA512 1b404e315f03428488a01489dec513e20bc5458eee9b05ac07716ff2137bf0292ee473a8af51af263bbdebfea5a9933361e1d601849154bcfda159c2b568718e
-EBUILD ps_mem-3.12.ebuild 658 BLAKE2B b21e5495cc82e6b2ff1033c3013e94a08b05e662dd0e9942a07ab4987b73655e4f68d375e873986f0376fce51a001cc8e1388775a6188ab4667be888e6096dd3 SHA512 8b7f19f11032a6152fcdd57fca9b1a46c4fa320364a2cfacbc9c3e08068cb7a1995ecc720c1e4e3863c464ec093a6385fdb7f93117e2b93a00ba0fbcef9be14f
+DIST ps_mem-3.13.tar.gz 18331 BLAKE2B a0689a98597e02a63cc83188e717421bf873b9202c0f524165ffc838fd438c539209c2f4e6561226bda8c6f85364707d29d13519d6d3e53a6d34cb39378d2de1 SHA512 bf5affaede5f052cc878d46ef81186511a1e8f5939cd7e8560ab2df9faf4dc31566cb4172d956cdcf1e6fc5586ba3458ba1011aee3720f6b7eeb3cf40b4f90dc
+EBUILD ps_mem-3.12-r1.ebuild 668 BLAKE2B f38a2dc6eec91a08bcbb6b7f662658c07518c766c43f6e77a129f5e2bbb3e689c44d7d025380335f9b74d0bd92d88e8c3396f2fe26dbada8b8a9d16f56b44727 SHA512 7d26aa36507731657c3bc3412e4710688e807da5cb8908f3b1d9f715effb24d9e9bc03462ab7f493afcc3c6dc318618aee2792ad59d088a3bfdb204271588a40
+EBUILD ps_mem-3.12.ebuild 661 BLAKE2B 7fbdba869bb25c68c0d6c02784a0d50a1ba18ed005a6ca5539d3d2444aaad0dc024af2f3a8167929c9420a4baaf2f479a6552c149761062fb9c22c0536f701d4 SHA512 09757dda1899056fe5ad0d8ec8919e6ea57b1b0ace6aa970d4f177a03ef5f738004bc368c0417101b579bf9a94f8e67935b6d8cb9c9dbde9b3f27786e70f0baa
+EBUILD ps_mem-3.13.ebuild 732 BLAKE2B 7d3ec283726fa6c744d8dc86af3acd13dd71f59b1aa7fbd36f874454025d5c34e968474c68bb008932f8e465f216f2daa315508f347bf1abcacf212c56849760 SHA512 da9335d34e6a99c1d0bdb69876e9a7de59d4ab5bcc18ee284fb52af66a0236e4f4d2a2ba5a9779c65d8c03bffa2b43f942217538c303545b8ed22b58af82cf03
MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-admin/ps_mem/ps_mem-3.12-r1.ebuild b/app-admin/ps_mem/ps_mem-3.12-r1.ebuild
index 82174961a3b7..1a46a4d9b583 100644
--- a/app-admin/ps_mem/ps_mem-3.12-r1.ebuild
+++ b/app-admin/ps_mem/ps_mem-3.12-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A utility to report core memory usage per program"
HOMEPAGE="https://github.com/pixelb/${PN}"
SRC_URI="https://github.com/pixelb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
IUSE=""
diff --git a/app-admin/ps_mem/ps_mem-3.12.ebuild b/app-admin/ps_mem/ps_mem-3.12.ebuild
index a60e22bad8fc..56d2145f42b6 100644
--- a/app-admin/ps_mem/ps_mem-3.12.ebuild
+++ b/app-admin/ps_mem/ps_mem-3.12.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A utility to report core memory usage per program"
HOMEPAGE="https://github.com/pixelb/${PN}"
SRC_URI="https://github.com/pixelb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
IUSE=""
diff --git a/app-admin/ps_mem/ps_mem-3.13.ebuild b/app-admin/ps_mem/ps_mem-3.13.ebuild
new file mode 100644
index 000000000000..cedefddc1a27
--- /dev/null
+++ b/app-admin/ps_mem/ps_mem-3.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 vcs-snapshot
+
+COMMIT="9f54e1aa3a87ec176ce8b71f02673e0d8293b344"
+
+DESCRIPTION="A utility to report core memory usage per program"
+HOMEPAGE="https://github.com/pixelb/${PN}"
+SRC_URI="https://github.com/pixelb/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install() {
+ distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ doman ${PN}.1
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index c132b3745ae4..e41be97762ab 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -12,8 +12,11 @@ DIST puppet-agent_5.5.4-1stretch_amd64.deb 17273314 BLAKE2B e296cda8219deafe9b36
DIST puppet-agent_5.5.4-1stretch_i386.deb 18195740 BLAKE2B aa1e5b7030de4ec58a389a552c0d2c870875244f6a722c9b87d4aca28261f073b347476aaa313edd4f66fa07621a333c777a3a6b04228aa7d2f35391f4f84df8 SHA512 3e7346ccde7d3bc9e99bb38a2958c9ddda3dd4a5124ced21dc048df41566a0d9e6d9e5250f7c93433c02585fd83031292f8197a7c6537a1563dd6ebec464b979
DIST puppet-agent_5.5.6-1stretch_amd64.deb 17279588 BLAKE2B d9614ee1cbec786303ac72fc9b704c90056771c9e3c23a93d6b7cff11f27394fbd277d5ae0d8eca20d9801d31019e7ca381af0cb60b72fc109ce6b2a99ee1124 SHA512 1172d72a1054cf04ab8033ab319313b7da6fd76684738bdb4aa1bc6bd9fa9dc0f2b00d765382023e0e854efbee6adba5b66bd62e2e04a9f153da79bccad427f7
DIST puppet-agent_5.5.6-1stretch_i386.deb 18195950 BLAKE2B 602a8409a6f0b5695f389604f82b8d6401db5d8abdd7148418bab6f09d64b285ff1c43870b144e863f148993b2e02c1abe11827e3e29ad5cf1314d7030cd5988 SHA512 f96bd2f4cbb2cec2405fdf87bb61711f8a750462d15e65507d37cc6cf6fa8f3a5e3a3d66abc74cfc02a109cc17c413e7f32c8d5f179468c84f6a86452ae38c40
+DIST puppet-agent_6.0.0-1stretch_amd64.deb 17853440 BLAKE2B 8d361b7e9412a3410fb0863364db174639d1664c83eae67c188bb0f522c2944f048b9d41e9a5e5e3db281669ebca152fe49f174dda4be29d42b964a7955ccfe4 SHA512 8e6d50b6d3eff9179fcf915cbc483ea679b1edb236aed148aff92ccae4f915caf79459f346e2823fb03372997f10a6585206ea97260577704ede28f82a3761b1
+DIST puppet-agent_6.0.0-1stretch_i386.deb 18591732 BLAKE2B 89cad6275d1ef3cafa4e3794c3104d66dcb9ce450c31694e648aecc8d31d839b96ccc9f83fae4f2ee188387d058996b14961a2c6d9244fb71cfafc3cf1aa841c SHA512 85f9a313a9a1320e5a08d20ffc8e1de0e60336534ad5ffcc34581f34b9a2e68636a8c326001bc25209c2c530feb3ce08a86a1e7cbde143882a97103f09591af4
EBUILD puppet-agent-1.10.12.ebuild 3479 BLAKE2B 6db65113a8203216068167672257270fefdcad43a897c6b25400be1949beb573b335feca32c268223ab288e340ae2edf53e4fc39a445d1c9bfc5ad37f9c7340a SHA512 1be819f7fb14d2d3aa47d23919feba678445cd605fe31f43b090bfbe3ab9a3ee4db7868553f7cf3a5c85b49d5cca0caa2580e1347ec278df91fe8495df42873c
EBUILD puppet-agent-5.5.3.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
EBUILD puppet-agent-5.5.4.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
EBUILD puppet-agent-5.5.6.ebuild 2483 BLAKE2B 4953d549f412de42e77074bff4e7cd33f2df77f30a70ac84987a4ef5a1c39ff0ca45355ec8c3dc90e203b65ac4c71714c7e5cff5caea96dc7766673ae1426c3f SHA512 23dae168a44f11d9aed9c5be09d08660803510979479f656464de4856dc76f50626298d9fcec8186d8413f21592d161bd8854cde0b8668612fb9300936aecc15
+EBUILD puppet-agent-6.0.0.ebuild 2180 BLAKE2B 2d854d4c7f26ea7c5dfb467207b9d740f571f0a9df789918b7ed195f283d697cd1d0bee7c02fccabe672f9a25984f023fc20192c2ad2a4fe8442f36527c67afd SHA512 ea66604600e2b5802bba6c3f7d57cd5a2c2dddf4d0885d69147563d45a722195321b5cab2fee523279e5c5dfbcec43e7303e3706172b0982e43a2c5f39ebd057
MISC metadata.xml 502 BLAKE2B 9eaaec32ba54988999831d4d873dff6c525b42ede2da3cc9a5b67359299233f2ffdafa04a949df6aa58d764e36beaf8ce64c053a306f6e055a245b207e8f2aaa SHA512 aedf4322173910c202b105d904e4528c6b6bb949fc05ed95c4a8d9a74133f5c7391ae30d7675bfa36a3f85880c971aff6e4a57ffdcde57b3b63c02dbed083a95
diff --git a/app-admin/puppet-agent/puppet-agent-6.0.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.0.0.ebuild
new file mode 100644
index 000000000000..1756e5e64ce7
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-6.0.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+ amd64? ( ${SRC_BASE}_amd64.deb )
+ x86? ( ${SRC_BASE}_i386.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+ !app-admin/puppet
+ !dev-ruby/hiera
+ !dev-ruby/facter
+ !app-emulation/virt-what"
+
+DEPEND="
+ ${CDEPEND}"
+RDEPEND="${CDEPEND}
+ app-portage/eix
+ sys-apps/dmidecode
+ sys-libs/glibc
+ sys-libs/readline:0/7
+ sys-libs/ncurses:0[tinfo]
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+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
+ dodir var/log/puppetlabs/puppet/
+ fperms 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.initd" puppet
+ systemd_dounit lib/systemd/system/puppet.service
+ systemd_dounit lib/systemd/system/pxp-agent.service
+ systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+ # symlinks
+ chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+ chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+ 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 ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+ dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+ dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index b5b0e2053cea..2a33b4040899 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,6 +1,7 @@
AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 BLAKE2B 91727c30b968b41dc8f6bb2ca217d5b9ccc2b5d08872be5a65a45b7f8bc37130255df139a17b7ca09b39b5b1a0b9ddcd6c54d2448148495cf493e7a085d2f0f5 SHA512 65b303c957a29bb5782a2b849944fba029dea3a533c25d4c17830391b5e4963fef304c0be876f5e7892b1a0eb4da16390d4ab1e39f459c05ecbb7100c9c0a9ca
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-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
@@ -13,9 +14,11 @@ DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c78
DIST puppet-5.5.2.tar.gz 3036714 BLAKE2B 8be2c2fa7b66a2fd8d413f01afad22f7e0724c31a0a92b777f1b61e2139f14f3284a11cfb52fea8833556208d8bb3e99f20b1ed4fa2816809eaa4b92fa730cd5 SHA512 4995b6b6d1b75d68dd4c8eba37585c0afa88f9c6b78857e837886ea72b373c884182adf8791e0c9f2a5079f22681a40073e512e6b727ecfcaff463c8024cf5db
DIST puppet-5.5.3.tar.gz 3040000 BLAKE2B d2534da5956806e5280c59e82332f1ffca79e72f73b1abb460f155aac936a5ba1719f18dc5742c85fca365ff6b03a602ca0ceaa04714091045ab2afac1b57823 SHA512 14a711002c64f0598930f64e9e2b81c03daddda750860acb349271c1cc9d04c0d149b14817b200dda26f0ca75c3f79593990ecf28a5cca83220a3f5a16eac34d
DIST puppet-5.5.6.tar.gz 3026301 BLAKE2B eb05a0c4eed99ce1ce7a77be76da069be1e4b4f8917206b3811a3a7378c2e39b9c84b560bbcce0bee180ddb502251efb48362dd1c2494c79e6f441cde41a2707 SHA512 53bccc4cf3d4dde3079d96cd28b4cf380d004fdf67da8eaeaf70706ca5e1fe611910042f1aa03453fb29419bb9888a0eeef9a9d64e8f0cfe5d8d7a73e5bf5850
+DIST puppet-6.0.0.tar.gz 2790790 BLAKE2B 1f31839ca21a525ecfbfec2531e8a7570a7c9da5b0e2a8bf3b8641eba9637c61509fb00b3445d0b6ad6b9ef814b9a27850704c897b62ab660eb864f80d990bc8 SHA512 4443f76ec2c8cc23adf112573e5f4e5cef26973c058a70cdf00471b8bd5ac4bc01fb9aa5ba62cb20585266de917c809a439c88a430f051b127d99ef02547c677
EBUILD puppet-4.10.11.ebuild 5633 BLAKE2B f75ee3a7cb27288448f341a560e20b3b1246c37a690846bfda63d0ee9ea41600606a986160bb1967ad7c279a4d2204b54af1e45204e43725b4c1438ceb81e7a4 SHA512 90e2636f668b3227ece18ff03a16c28e7791c6ec192a87ca89395a03bc9182abdabb43ac6fc5261da7c4afd68caefaabe81549d39e7fd018cc0b5f307baded2f
EBUILD puppet-4.10.12.ebuild 5628 BLAKE2B bfca2da4591b9589a1b3e42e8a06d91d75a77ca05a57910544caad33b540fd1c8c0b7fa6be4b11ab67ee693daf7486fee9f63115679a513c09ef1e15b3727152 SHA512 e5fd6431a729d205ba1f6360cb2f46f877de7f27a7bc1cf299f1ec2a487a2d2a374d0c059294b1bf08d31b7187b420297b368d474fc0dcc243787b8cea19a431
EBUILD puppet-5.5.2.ebuild 3833 BLAKE2B 8a69323f2c1edf94a9dd384a695e3c2d2ba20fff0956cdda51ed853ca9e730c2c051324d0867baea4f71672337e41ec6c42b504edcdaf3f459d120080b3bea5e SHA512 b66520e6d78a3fe5bc8ae5151074133340db60eb402ac4d6f92f4add28b28b3d8280befc0aa74bb4935c9347e35ec240a6afa1bd67db23b1f15a46ad81b2d8ad
EBUILD puppet-5.5.3.ebuild 3833 BLAKE2B 8a69323f2c1edf94a9dd384a695e3c2d2ba20fff0956cdda51ed853ca9e730c2c051324d0867baea4f71672337e41ec6c42b504edcdaf3f459d120080b3bea5e SHA512 b66520e6d78a3fe5bc8ae5151074133340db60eb402ac4d6f92f4add28b28b3d8280befc0aa74bb4935c9347e35ec240a6afa1bd67db23b1f15a46ad81b2d8ad
EBUILD puppet-5.5.6.ebuild 3835 BLAKE2B 98dd8fb348747d1f47439359997cd37d715f3d8eea2e888e6ffa032a3c91c151f140d41827fc2963514d0a485ca3673787a379c7921092614014c9ceb5db6743 SHA512 a52d1c5b5fa1e3be0874495c69fd0b1897b5e6c2ece46410dbaad1c58b59b809db046698bb0e8b973dbe0f57610ce55698346cd29e079ed3ac1ecaab4312ebfe
+EBUILD puppet-6.0.0.ebuild 3861 BLAKE2B 92a472ea908a5e6e391c3d9cd8f84b9b02b5c20f89d86b9b2c39b878caed8dc2ba61f0d11e0ff42e792c6bb61fa7fe924cbcb98acaf19c51ec01a5c07a4f69ae SHA512 333881b76e8736d3256447e0adba72de23d26fab13dbf77d63d658d4feced638815f7f360344e8cd5bcb3d96e685c7d270c821f7f2e9a17cbd7eaa6b8a350d00
MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch b/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch
new file mode 100644
index 000000000000..3e51218034cc
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-6.0.0.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
+@@ -143,15 +143,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
+- handler.expects(:check_authorization).with(anything,
+- anything,
+- Not(has_key(: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
+ handler.expects(:check_authorization).with(anything,
+ anything,
diff --git a/app-admin/puppet/puppet-6.0.0.ebuild b/app-admin/puppet/puppet-6.0.0.ebuild
new file mode 100644
index 000000000000..81e7876eed5a
--- /dev/null
+++ b/app-admin/puppet/puppet-6.0.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 versionator
+
+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
+ 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 [ "$(get_major_version $v)" = "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/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index f736dc336f8e..2cd0dddcb93c 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,6 +1,8 @@
AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
DIST puppetdb-5.2.2.tar.gz 25436396 BLAKE2B e30d80b7da29c8cf3b00c9cda3d6e0a4c5635b3bb3a4e6d3e2bf284531509828df6d845a0d30b2a7a454ec35ab4879019fc4c68fc3aa8b6a72c3d0896b9e75f7 SHA512 cc598539801bedd4ef0052f50013320be5dc1eaf8098db8898a0759609d6d4e26aa094550bc1a45c041f9fe65ee99b0c00c00586d3cc93003836f1415bd92456
DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059
+DIST puppetdb-6.0.0.tar.gz 23168375 BLAKE2B 05b7738d1f1dfefac50ea54682b2c2f888d9227117fc676ef5d4754b8fddce449ee75a2ae9eac977426707654737c86499efa3692f4195547f997297c1b08f5a SHA512 f2be7049cf1615f7f235be16f32c599ad9679b9da59d43b30c63ca4fd9c9f24fbdb488def01372c516ac510105292ddb163bad403d1b06429bfc10310505501f
EBUILD puppetdb-5.2.2.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
EBUILD puppetdb-5.2.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
+EBUILD puppetdb-6.0.0.ebuild 2765 BLAKE2B 901c7cc97d00e0d8509ecee0964f59a49ef26db55d96865557239b7de67c78b95330fde7d3c13dd8b665e2f917c93cd401a6ab5be0a5ddf2930029217b879fe0 SHA512 7f5b58b55811ee346e6aa366d7be0f49e9b3103407aa10abfde785d3370d8113c9d2fe4ebcb9a0c69ff4884c3e6ba818ee199ffa72fa7ec05f71123a1f538252
MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.0.0.ebuild b/app-admin/puppetdb/puppetdb-6.0.0.ebuild
new file mode 100644
index 000000000000..11bf34de0e67
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-6.0.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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" 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 159433168a5d..3a58a337b271 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,7 +2,9 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
DIST puppetserver-5.3.3.tar.gz 67238194 BLAKE2B 0a0b235f26ab15c8f461f6663c26531d3ae469c4467ae33caa98f70d94a02fb89eb0399405be6b1f65f65b2fe4add7a24129f367ae1ab028189d250b087d0915 SHA512 dced3a7b7b3acb8966e4eb6f35aa82c84d0bba81487fa0cffc60fa0751b5d5c633be925471145a3e21b8f74bcffaa74f02310644ecc8bf8ebef0222d967fa86a
DIST puppetserver-5.3.4.tar.gz 67238476 BLAKE2B a92bdf77ffefc7c65c5cfd39431aa6b485bd92c617c4e32a281bfa431fbb428209b8834ef464a521e00d07f3ce0a443fe8a187f3a235c3200531533a1efa242d SHA512 edfa121d64fdbca9a8eef201fe6744e2694141deb318bec64c942bb1ebe6ea61ba1aaa15aee4f4e59913f79247b1c833c6633d3ff121eee836a83ccbaaece900
DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c
+DIST puppetserver-6.0.0.tar.gz 62345355 BLAKE2B 086337ef25b89699df07779676727a28f580f992b04ca8fb0d26c38121fef625798ebb064a8a19c87341fbf2c54362158b60b772b94ff6f2f77efe3acac266f9 SHA512 2ab477e381fcb853bb862065465a4a29388e94d01cda49d78d2149dd25636cf98b9f0501733028fe3c5e61c36fc8093bf0423e5df01401e1e8888c2c48f79a2d
EBUILD puppetserver-5.3.3.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
EBUILD puppetserver-5.3.4.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
EBUILD puppetserver-5.3.5-r1.ebuild 4896 BLAKE2B 8646999569c34c7c1f84213d2560dc35d8a6e9f13f0c4033956f3a87eafb91c42f5431781c63e0c834fe2103db37d6418b0e052559bb688511300037f557ae46 SHA512 819060705b184e6335a450c6b2b4bea59b74f35776eda9c59a5ec6f5afcefeff5e0c630b809720035106c9ca7a4f4554f769bcceb51f527556aeb957ce689619
+EBUILD puppetserver-6.0.0-r1.ebuild 5327 BLAKE2B 2675238bcba4867791082dce66f80ae30c03576ee1caf3b84914a3a8cd6e9c33ce40faeb660212f7528d77e4b0fdf189b65bf64f69e33b1f849d3fe1eac96de8 SHA512 b9256334671a0ac889406994a4f43cca4d2ba0539144869b90d140b412119ae61b3088b17994b4cc63b7e71d347e46105557241f7c24cdcd0461950eb0bfde8d
MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild b/app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild
new file mode 100644
index 000000000000..b4f7bc872f47
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-6.0.0-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd tmpfiles user
+
+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 ~x86"
+
+RDEPEND+="
+ >=virtual/jdk-1.8.0
+ app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+ enewgroup puppet
+ enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "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
+ dodir /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" 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.txt
+ newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+ 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-ri --no-rdoc \$(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-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+ elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt"
+}
diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index 13c538797e85..f4161c669e8b 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1,3 +1,3 @@
DIST pwman3-0.9.11.tar.gz 74364 BLAKE2B 9544b692e8853b7fb8e1b4d51093e72e04f8d82888a9278c94aaa27716026b348bb16f0fa9c52af2144395a4ffb242c8a48fc34252890e68477d2e3a70ea4a88 SHA512 2aa5a7b4d810d1bbc6aea34b728f89190570cbfbedc33f45cc1aa4d737ebbb9e993d2d372b44f956d5cdbc07f911f289fd77d7df167100e820455650f5b3e46a
-EBUILD pwman3-0.9.11.ebuild 874 BLAKE2B 0c277bf3e7dd26b5994aacc3f1cf35f8094742e413e0a690575d48e92d58e192470e5df6ab0a6a16440a1c0eedd96d5e658d0dfd4e46e5b5b483bc6f254d8ee3 SHA512 42fe1f9c023db25bba45da5903d327ab9cd11fe8df9b15d12929e27a98a8333492386d0b2fc5485c167350f1058d7e768f5a0208d4362494bbbaa3fb3cbcf603
+EBUILD pwman3-0.9.11.ebuild 882 BLAKE2B d9dbd1a6de8f54d54ac52d5af787b2c98251a113b957148ba2e25311a6764be5ad3a511749b7a8dec8ac5cb8c8f28b48d592ac421fbc775540acc983b4310941 SHA512 510655ff7534ef91deacd980c652ede817f695f5e4f7e8f0ecccd2970c700dbf073169561de6e8c44eaee74e4ddceeee545a71e97d0536b83707421ca44fad51
MISC metadata.xml 966 BLAKE2B a024e2324e8a57f790d36a0091050510babb8241de2112546f9d760e3d5495a910d6baf91caf447acdacb4d464934248db3dc3e4ac1188e56ab82635a3246679 SHA512 f82ac9dd866b16f6583266bb2b748f713389e517eb51229481e902d2a232e4715146c5d8aeb7d572fea10f13f15cf700910f7c04231cf662859f1aa258c7bdcc
diff --git a/app-admin/pwman3/pwman3-0.9.11.ebuild b/app-admin/pwman3/pwman3-0.9.11.ebuild
index 6fb41c3843e8..5c508edb053c 100644
--- a/app-admin/pwman3/pwman3-0.9.11.ebuild
+++ b/app-admin/pwman3/pwman3-0.9.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite?"
inherit distutils-r1
DESCRIPTION="A lightweight password-manager with multiple database backends"
-HOMEPAGE="https://pwman3.github.io"
+HOMEPAGE="https://pwman3.github.io/pwman3/"
SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 3e8b8c258206..d0cf64a45662 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -2,6 +2,7 @@ AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46
AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
AUX rsyslog-8.35.0-fix-issue2719.patch 7561 BLAKE2B 4adc0643dcb42bcc33ba3f8fc878ea4996d22e06865680fad6c9f0bff9da27d55293732e17678a36ce33d4ff1d76049d8b9b55bd0eb6b4987c893b48bf5daddc SHA512 54ad784c328a4def4c46777ba3b4ebe3d451d9a5a6883e3e6bd912070c52aaf2e85fefd938d64cbbd87ef9ae4ac0b4685ad1c0e74ad2bdf02bfa247ddcca939d
AUX rsyslog-8.35.0-fix-issue2726.patch 1726 BLAKE2B 3b406319098637b81f85127494fb921529eb2704ae9ac6a90e89e4655412220748bba6584f010de1ca17c0a19fbd01b5c56314f43c7eec329b71884d24f3df93 SHA512 421a6b67372b1b4cac459f6fae7a6e839d96c363f8cb5fa4d38b7c64b53752a9a6ae2c050dd8cc18464475a0601d5451ac51719bd85df9ac40eaebb498a4c23c
+AUX rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch 3181 BLAKE2B 13b155367c6b7fed4f82505a884ed23e32223567e5086cb91f733d20c43aa101bbeb169f36f34ed0dff8815687cc5dfe942ec248024aa29a0a07c1eb3ca3e0f4 SHA512 dfc980492bdd3fb7fafedbbde4e79e61d7fb78665f8f0654a877de4f2f4fa93ce2d23051617f90d9712ef795d8164e1d610321b0dd27164d0cb425c8f1a77720
AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
@@ -9,10 +10,13 @@ AUX rsyslog.initd-r1 1758 BLAKE2B ff5fb6f9d2d6a5702f5fdacfae8037bbc4015f29a1ce94
DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929 SHA512 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc
DIST rsyslog-8.36.0.tar.gz 2639477 BLAKE2B 9c7343d853f79e2955a8999e2871a2a9b008cb3ef75b94e2381a3a0ff3e49445593d852d7de3819851dc0d4c17a91d966ca2fbfd52e8215ebdbaf6b7ccd68bdf SHA512 b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50
DIST rsyslog-8.37.0.tar.gz 2697435 BLAKE2B d88a06e8a5da15ed88d0d6c92032f71be10c2b77970e26b8fe5258e116f8f635c2e359408260b8e486401b8d9ea0e234e22070f520d42bb7884923df4f216ee3 SHA512 2989eb7ed3333151e979a720fa0e95e330bda9b40f65009f7969069bcbbeee8f493c6a3189f67bbbc2529d3a2ac14a022d7e8c4f2d0dae42b67d7508d7611fa0
+DIST rsyslog-8.38.0.tar.gz 2721798 BLAKE2B 578bc9eefce4893a9c1eb54ee7360cd9fa51b3c87ffe07a0fd5b122987f991835f603417243084de0b59286e993ad1c84237e61c44bc18457b3660668421101b SHA512 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254
DIST rsyslog-doc-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
DIST rsyslog-doc-8.36.0.tar.gz 7570338 BLAKE2B 031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb SHA512 a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa
DIST rsyslog-doc-8.37.0.tar.gz 7587722 BLAKE2B 266e5be77e4ca91e3777ee4f2c999986ee7318287546c1fb84ee21f1f4995907fa8caac84ef47cec2665ef29f34151b4b22ed6c35ea1ffe0c4ddff8d05e23136 SHA512 827ac6762ad9257d9499201d5dc3d110c65f11891ab58d36dce568ffa5f8b57fe10505bc2c7b0743dcca319f294ba6418a880b7ca787eb19dcc1f262ba0f3b59
+DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b543389107d146ddb148ecd2702bb208d21a7f4d77f2fd958f2a56e092341fc6a24ed1cc80a910cb1adb54c65b5b2da04 SHA512 e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5
EBUILD rsyslog-8.35.0-r1.ebuild 11938 BLAKE2B 9275bcf376d28607c381b049e2b152c9f7ed14b32834a9b90cd0c45dc5edfa584bc3f18f754140c30471dac1207dd85f01612ab47ee82dcc09dafb69ba3eab53 SHA512 1d9eb2ad4dd408a69a108dc47d805d677a0151f77dc5485bfdf35202340341188e9449f76112c910f29483542e506cc0871c1e5527ba31e6daf3cf021f830258
EBUILD rsyslog-8.36.0-r1.ebuild 12113 BLAKE2B bc15f57f63da43c5b3a2d3121bcb8e2ce00c14d8173c53d0912b424c2b2ee3ce936fc4fe75885da4a520615a220625a543f7c3a2e6807fcdf2d118a6a3728a38 SHA512 6fe8a096cbbf06f0748d8545577f9752a92466a33a2785332ba057686ce9b489f78263de65b670e21b163dfb52928b1fdbe0e9a46d29622bf9f05012c154b31d
EBUILD rsyslog-8.37.0.ebuild 12209 BLAKE2B 7b49e66fb2e432d6542ddfa493b7025440cc4c0d6634439fb92ea3ea48c0e91b1d8e81ea096ba757315bc36773b220133e2a512b4432451d405b966755651c90 SHA512 28185c7dfb8a55a21047c294338a64fade8f49ceab3df592070eacb1940307b466b78597f732d21a33fd3b9fddb9653a772c88b0f35ea92c3827867ef0a91e90
-MISC metadata.xml 3850 BLAKE2B 1de60aef00ce700d8d2c05d93d3237170399c65ddfbd37f86e95dd0ef89c7910335b6fdbfc0e806345bb3dbd52212f0bdab45b57acf31b2241ed7d3bf52a64d4 SHA512 c66217bd3a1dd613d49fca4d42267e276bb4f085b14a452da0484ec508cfd45eb36049006cdb6ad58c7c74d88dd6512e922c8bdf07ac01602fbbaf7606215b82
+EBUILD rsyslog-8.38.0.ebuild 12299 BLAKE2B 408c2878cfc186ffca506fd7c97d799e424862e3e85695f8a3881ff9216ecab80fc01838788f1c98a2699d46a66adb9d315d0d49e360f1df2fab790ea180adec SHA512 274ee332f1d7389622c47bbd688de8c3fecb1bcbad3610ffe606d256cfaf60955cfee53f972f15bdeb468ade9189de3a955a3b7a5c1c98089f40e1a1e3cce0b9
+MISC metadata.xml 3944 BLAKE2B 576087c54675c912537690dca0d039a217c8afec6fa4c32a8f52f2350393b30763a4d9f0718a9fa47651afb434186ba3e25d4dd9253cf20f3315d3b06bebb3eb SHA512 536dc844883178b310d7d104d0f3a002be4ae14aef6409bd1fb44fec9b30b40165ac51914de020c5e63bea61a88d8467da279f353ed841c9c50f84db079fc9fa
diff --git a/app-admin/rsyslog/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch b/app-admin/rsyslog/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch
new file mode 100644
index 000000000000..c78e0e502d46
--- /dev/null
+++ b/app-admin/rsyslog/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch
@@ -0,0 +1,66 @@
+From 0b0a1262f2b401ea16b7d0b36d8254c500cb9d8e Mon Sep 17 00:00:00 2001
+From: Joan Sala <jsiwrk@gmail.com>
+Date: Thu, 20 Sep 2018 22:37:58 +0200
+Subject: [PATCH] testbench: fix incompatibility of one omprog test with
+ Python3
+
+Python3 writes to stderr immediately, and this caused the
+captured output to differ with respect to Python2. Simplified
+the test to do a single write to stderr. Also a cast to int
+was needed when calculating 'numRepeats'.
+
+closes #3030
+---
+ tests/omprog-output-capture-mt.sh | 2 +-
+ .../testsuites/omprog-output-capture-mt-bin.py | 17 +++++++----------
+ 2 files changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/tests/omprog-output-capture-mt.sh b/tests/omprog-output-capture-mt.sh
+index 50f5c6354..080fabd2a 100755
+--- a/tests/omprog-output-capture-mt.sh
++++ b/tests/omprog-output-capture-mt.sh
+@@ -24,7 +24,7 @@ else
+ LINE_LENGTH=511 # 512 minus 1 byte (for the newline char)
+ fi
+
+-export command_line="/usr/bin/stdbuf -oL -eL $srcdir/testsuites/omprog-output-capture-mt-bin.py $LINE_LENGTH"
++export command_line="/usr/bin/stdbuf -oL $srcdir/testsuites/omprog-output-capture-mt-bin.py $LINE_LENGTH"
+
+ check_command_available stdbuf
+ generate_conf
+diff --git a/tests/testsuites/omprog-output-capture-mt-bin.py b/tests/testsuites/omprog-output-capture-mt-bin.py
+index 6c81da24b..03097f37b 100755
+--- a/tests/testsuites/omprog-output-capture-mt-bin.py
++++ b/tests/testsuites/omprog-output-capture-mt-bin.py
+@@ -10,7 +10,7 @@
+ logLine = sys.stdin.readline()
+ while logLine:
+ logLine = logLine.strip()
+- numRepeats = lineLength / len(logLine)
++ numRepeats = int(lineLength / len(logLine))
+ lineToStdout = (linePrefix + "[stdout] " + logLine*numRepeats)[:lineLength]
+ lineToStderr = (linePrefix + "[stderr] " + logLine*numRepeats)[:lineLength]
+
+@@ -22,16 +22,13 @@
+ # size of the block buffer is generally greater than PIPE_BUF).
+ sys.stdout.write(lineToStdout + "\n")
+
+- # Write to stderr using two writes. Since stderr is unbuffered, each write will be written
+- # immediately to the pipe, and this will cause intermingled lines in the output file.
+- # However, we avoid this by executing this script with 'stdbuf -eL', which forces line
+- # buffering for stderr. We could alternatively do a single write.
+- sys.stderr.write(lineToStderr)
+- sys.stderr.write("\n")
++ # Write to stderr using a single write. Since stderr is unbuffered, each write will be
++ # written immediately (and atomically) to the pipe.
++ sys.stderr.write(lineToStderr + "\n")
+
+- # Note: In future versions of Python3, stderr will possibly be line buffered (see
+- # https://bugs.python.org/issue13601).
+- # Note: When writing to stderr using the Python logging module, it seems that line
++ # Note (FTR): In future versions of Python3, stderr will possibly be line buffered (see
++ # https://bugs.python.org/issue13601). The previous write will also be atomic in this case.
++ # Note (FTR): When writing to stderr using the Python logging module, it seems that line
+ # buffering is also used (although this could depend on the Python version).
+
+ logLine = sys.stdin.readline()
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 5075171a3708..6abc65f4fb4f 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -21,6 +21,7 @@
<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>
<flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag>
<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
+ <flag name="omhttp">Build the http output module (requires <pkg>net-misc/curl</pkg>)</flag>
<flag name="omhttpfs">Build the httpfs output module (requires <pkg>net-misc/curl</pkg>)</flag>
<flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag>
<flag name="openssl">Build the OpenSSL network stream driver (requires <pkg>dev-libs/openssl</pkg>)</flag>
diff --git a/app-admin/rsyslog/rsyslog-8.38.0.ebuild b/app-admin/rsyslog/rsyslog-8.38.0.ebuild
new file mode 100644
index 000000000000..c8801a0aef2b
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.38.0.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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} )
+
+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 )
+ "
+
+ PATCHES=( "${FILESDIR}"/${P}-fix-omprog-output-capture-mt-test.patch )
+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 omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
+IUSE+=" 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:=
+ )
+ 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
+ test? (
+ 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
+
+ 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
+ --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 memcheck)
+ $(use_enable debug valgrind)
+ # Misc
+ $(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/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
index aa9659e6e346..ceeab2266c1b 100644
--- a/app-admin/systemrescuecd-x86/Manifest
+++ b/app-admin/systemrescuecd-x86/Manifest
@@ -33,6 +33,7 @@ DIST systemrescuecd-x86-5.2.0.iso 569669632 BLAKE2B fe31a68df650b46bd875b91c643c
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.0.iso 607547392 BLAKE2B 92aa82e54794adc1705111776b4df21bd39f96bdbed1c6e05bb24b01fd1a12d92fb1209241289f89adca7885fd441ddd61639d5168978b95dd0784faec65f32a SHA512 082a82a2882b62012944184107b2655de6c89f5a6c26145a3edb2b5a54ff6aad6a4ef43edc0468e62895daf4d5365d2722ffa8bf4f2f8e60f1ee7d9a727b013d
+DIST systemrescuecd-x86-5.3.1.iso 573913088 BLAKE2B 3c4da5777d05999e0b3e30b01dc821a4e840bb22d513fa4bfb9fdf601b9811676be8cee7ed9aae0aa7b971916add500b39172964384a2a07b3ed1cf5b946ba04 SHA512 1038622e148995450e61cd27f65af2ecb929ec8d0367fec3dbde01410a33596ec8f183d79ab931595c21deb597d60dae45ad516d8e1f00f32013729bdcd53ec8
EBUILD systemrescuecd-x86-4.4.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
EBUILD systemrescuecd-x86-4.5.0.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
EBUILD systemrescuecd-x86-4.5.1.ebuild 1590 BLAKE2B 70a1114c8833e2df3fe54905b8dfd91abedc3873c59cc585617330e89295de77652af349c5d1ce113ee60c0b0d3249b6415c5c70fe8bf65ff790db85241b440c SHA512 0e2debd506ab3d084bc463f84b8db6a0cd6c8e3d9d162b27b30eb3f4a04513702fa4d343fc3eeb248f69e7ef1539854c6e8c0d88c81d75663b86c8e824180860
@@ -68,4 +69,5 @@ EBUILD systemrescuecd-x86-5.2.0.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf
EBUILD systemrescuecd-x86-5.2.1.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
EBUILD systemrescuecd-x86-5.2.2.ebuild 1588 BLAKE2B 88c93971c0fd71928de91c7d2d37079ef46537e92abdf7f8aeba30b272325ab3cd889a64f16aef63226bc59dd690ec9b545c0c78cba361a1c156a45560aaab5d SHA512 0a36c0954f88b29305844d133ee8d3171a8be0bbc66e22595daca50568a9ba50d715829d0deec34babeba5791819d89a767c1a197c7efd64b776b3c2f5f1fa5d
EBUILD systemrescuecd-x86-5.3.0.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
+EBUILD systemrescuecd-x86-5.3.1.ebuild 1590 BLAKE2B 5d509c43812e1012ecd4ae154caf450b27713e03a0005926aff8995d098bf49ce487c4f090b5032b5e2bf25fe03174199e7af1ad4608de955e8aadc464b86ed4 SHA512 087629ec3bee8ab3326df039262db4a07ebf9bbb98ebc9cfa00056f4fdc08f069c49a8cfecc5b2e6bb0c355037b1d34a754294339a8df9a3f0db9619117761f6
MISC metadata.xml 610 BLAKE2B 400c26cbce80747fe88b60d34ea0f018b7119ad6ef333e8de931424aaa929db90ba0836a4520fbe62baa0c7aa9992745c4c082e495f318066acf5285e56dcd10 SHA512 5092c69f83df351b3697ab0c83e165eba5c7ceffd197707047bdd4d2e809ff7267e436e91e3035223beb088c48835ae28fd4032a8122687af116fa1405b30b15
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild
new file mode 100644
index 000000000000..7bfc35a7dd27
--- /dev/null
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+isohybrid"
+
+DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
+
+S=${WORKDIR}
+
+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
+}