summaryrefslogtreecommitdiff
path: root/app-admin
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/Manifest.gzbin34804 -> 34817 bytes
-rw-r--r--app-admin/ansible/Manifest4
-rw-r--r--app-admin/ansible/ansible-2.5.8.ebuild66
-rw-r--r--app-admin/ansible/ansible-2.6.3.ebuild66
-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/apg/Manifest2
-rw-r--r--app-admin/apg/apg-2.3.0b-r7.ebuild (renamed from app-admin/apg/apg-2.3.0b-r6.ebuild)1
-rw-r--r--app-admin/augeas/Manifest2
-rw-r--r--app-admin/augeas/augeas-1.11.0.ebuild46
-rw-r--r--app-admin/conky/Manifest2
-rw-r--r--app-admin/conky/conky-1.10.8-r2.ebuild208
-rw-r--r--app-admin/conky/files/conky-1.10.8-libical-3.patch32
-rw-r--r--app-admin/dxf/Manifest2
-rw-r--r--app-admin/dxf/dxf-7.4.1.ebuild29
-rw-r--r--app-admin/helm/Manifest4
-rw-r--r--app-admin/helm/helm-2.10.0.ebuild (renamed from app-admin/helm/helm-2.10.0_rc2.ebuild)2
-rw-r--r--app-admin/mcollective/Manifest2
-rw-r--r--app-admin/mcollective/mcollective-2.12.3.ebuild60
-rw-r--r--app-admin/packagekit-base/Manifest2
-rw-r--r--app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild (renamed from app-admin/packagekit-base/packagekit-base-1.1.7-r1.ebuild)2
-rw-r--r--app-admin/pass/Manifest2
-rw-r--r--app-admin/pass/pass-1.7.3.ebuild2
-rw-r--r--app-admin/passwordsafe/Manifest7
-rw-r--r--app-admin/passwordsafe/files/passwordsafe-1.06_beta-system-gtest.patch69
-rw-r--r--app-admin/passwordsafe/passwordsafe-1.02.1_beta.ebuild90
-rw-r--r--app-admin/passwordsafe/passwordsafe-1.06_beta.ebuild (renamed from app-admin/passwordsafe/passwordsafe-1.04_beta.ebuild)5
-rw-r--r--app-admin/puppet-agent/Manifest8
-rw-r--r--app-admin/puppet-agent/puppet-agent-5.5.4.ebuild2
-rw-r--r--app-admin/puppet-agent/puppet-agent-5.5.6.ebuild (renamed from app-admin/puppet-agent/puppet-agent-5.5.1.ebuild)2
-rw-r--r--app-admin/puppet/Manifest6
-rw-r--r--app-admin/puppet/puppet-5.5.3.ebuild2
-rw-r--r--app-admin/puppet/puppet-5.5.6.ebuild (renamed from app-admin/puppet/puppet-5.5.1.ebuild)4
-rw-r--r--app-admin/puppetdb/Manifest4
-rw-r--r--app-admin/puppetdb/puppetdb-5.2.1.ebuild92
-rw-r--r--app-admin/puppetdb/puppetdb-5.2.4.ebuild2
-rw-r--r--app-admin/puppetserver/Manifest8
-rw-r--r--app-admin/puppetserver/puppetserver-5.3.1.ebuild130
-rw-r--r--app-admin/puppetserver/puppetserver-5.3.4.ebuild2
-rw-r--r--app-admin/puppetserver/puppetserver-5.3.5.ebuild (renamed from app-admin/puppetserver/puppetserver-5.3.0.ebuild)2
-rw-r--r--app-admin/setools/Manifest3
-rw-r--r--app-admin/setools/setools-4.1.1-r1.ebuild55
-rw-r--r--app-admin/setools/setools-9999.ebuild3
-rw-r--r--app-admin/spectre-meltdown-checker/Manifest6
-rw-r--r--app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.37.ebuild23
-rw-r--r--app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.39.ebuild (renamed from app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.38.ebuild)0
-rw-r--r--app-admin/sudo/Manifest8
-rw-r--r--app-admin/sudo/sudo-1.8.23-r2.ebuild (renamed from app-admin/sudo/sudo-1.8.24_beta4.ebuild)45
-rw-r--r--app-admin/sudo/sudo-1.8.24.ebuild (renamed from app-admin/sudo/sudo-1.8.23.ebuild)78
-rw-r--r--app-admin/sudo/sudo-9999.ebuild17
-rw-r--r--app-admin/tenshi/Manifest4
-rw-r--r--app-admin/tenshi/metadata.xml13
-rw-r--r--app-admin/tenshi/tenshi-0.17.ebuild2
53 files changed, 778 insertions, 454 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c4f804d6268c..16b96929627b 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 b25d597f1402..96c3129219eb 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,10 +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.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
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.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-9999.ebuild 1639 BLAKE2B 363a22df345822cd047685b7cdf7114e5e1a1276bf90463799712ee90f751deea4c487f9c96a807558428d3e5993f4fded0017fb5d37b75ff6e550a6ccc32b2b SHA512 10d18db06a345555299b342eb01c7f3355f9f71d70f0ac6b3f2fc3837859161821c8c5771bec3d943647cb1c5ba8abae8c4febdccbbc4f2d747aa0f848682b46
MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.5.8.ebuild b/app-admin/ansible/ansible-2.5.8.ebuild
new file mode 100644
index 000000000000..6ca07021a91a
--- /dev/null
+++ b/app-admin/ansible/ansible-2.5.8.ebuild
@@ -0,0 +1,66 @@
+# 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
new file mode 100644
index 000000000000..6ca07021a91a
--- /dev/null
+++ b/app-admin/ansible/ansible-2.6.3.ebuild
@@ -0,0 +1,66 @@
+# 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/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 382ef014f92f..d6f248e572fe 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 2579 BLAKE2B 3f9b7a9ab5f07197926e58fea8615fc11f8f080afee6bdb7ad889b2af16b23f83ae5d0cedb4344281679e7b7948af4e4b4f7dbb82faadec75373fff771e8ad6d SHA512 8854677b6824076934efd1de916359fa1f312bb2537824f2333acd24732718a0e847064e5fa30147e52210d3791b0fd4df648ced18152e4790c1f9e51827eec1
+EBUILD apache-tools-2.4.34.ebuild 2578 BLAKE2B 143b17d87a0f34d1c2ac131517762e92fa5847c33f762fe0367b07bfd1e2ff3a56233c1f38c1435b39af7f2f482dfbdac59d8c1b53d5adbb96f4c22bbc5c35eb SHA512 be6cd1fbb8fccc4fd9a21fcf0589f064cbe35e5602195f59cf20fa45e26af9b14f032765bd26589eb3dda5971db77d1c96120e6d1b76d8fd196d72eac43a4a0b
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 790e6fa13813..eb02388d014f 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/apg/Manifest b/app-admin/apg/Manifest
index bda67fbb1809..8e521c327667 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -2,5 +2,5 @@ AUX apg-2.3.0b-cracklib.patch 920 BLAKE2B d1b0decd8a35db02ee8132350a04f61ada715e
AUX apg-2.3.0b-crypt_password.patch 844 BLAKE2B c87ccb6002eac2c363a5b35dc033badf3968562956a4f49697c98368293aa98f2420ff56ac742a7308a2373183c3883c5bce30cd1d8cb72f6f788df2891f8275 SHA512 bde5b1bbc4084cd4d2630ea92ed73c970cd217554638d17980c4d56b0da2f55cd7cafbc76b5073bd0415a7698b70df9d357f0c1731353dae46990e9407d7bb94
AUX apg-glibc-2.4.patch 260 BLAKE2B b30c414ed89f22eb7dc2d0e3b115dbbc0845aba06f2a9dc0dea61fb36d9ccfa231d56959e7f02b3f1fb337654eec5cf2bd60c53ce24e112470c9fc9b9c225680 SHA512 27463b291aee051a4a149664cfd3dea524a34cd88d5cb90c5b4891fe0722aad9993cfd10df555455890ea631d8844d566d23cbb3812f8cb2859e131ea4c42114
DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
-EBUILD apg-2.3.0b-r6.ebuild 1217 BLAKE2B fd7b8b954a015f099f267a76166548894426c5a9c501a3b227c57cd3947d3f802cc02e1102335b7e2dac39c612b7f5460b6efc53eda09a4623a63e25840b6d24 SHA512 dc577d0c2e01ff658c0ad97f8d67219099b69eb83ed58b796f18d0fb2e1a1121d4bbfd35b753fff2c74cf74e1a963516cff49b1991b94c6e38ed00f126409d0a
+EBUILD apg-2.3.0b-r7.ebuild 1237 BLAKE2B a66f321740778cd329def859753a723612c83764753164499865a1e2f2beb46fd8733a20e483a1d659444a6a2be2fc77dc1a24fe926a81fd0eb7d64a79877f03 SHA512 5eae8f6686faf21f319e3ffa9e30086d12a80e8efc434570af8e43bb03e5e6688af684cabcc18412c9ce2e3c0b338313dcee51dfdb64ec1bcca682c4e3738d26
MISC metadata.xml 490 BLAKE2B 6daed6930e317bb6b39f21dccd9cc4f08ddc549528076d6948212c7f62fe5d1e981f57c52278ea0fbcfd3fa36b3ce79192d52bc6e91c64940c1285933166735c SHA512 b1c2173415979d73b36b5e1650f27eebb89698f65a75af8351f8f77e762b9e54798a7b2398d6146ec54e975e4dd8ce59efc3b3c803eec863784107b1ce588e9c
diff --git a/app-admin/apg/apg-2.3.0b-r6.ebuild b/app-admin/apg/apg-2.3.0b-r7.ebuild
index 00d3fa923a8d..a525c799fd57 100644
--- a/app-admin/apg/apg-2.3.0b-r6.ebuild
+++ b/app-admin/apg/apg-2.3.0b-r7.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="~alpha amd64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="cracklib"
DEPEND="cracklib? ( sys-libs/cracklib )"
+RDEPEND="${DEPEND}"
src_prepare() {
default
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index d65f3e2722a2..43243f274e34 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,5 +1,7 @@
DIST augeas-1.10.1.tar.gz 2289207 BLAKE2B 6e3cf750c4d3faf7dc472ec7bfe3c46f5babca294d2bd5169cca419c2f93e21bdd656bbc44b30ab66c00fb793df1aa045f60c1260963901773c334b9019eff0b SHA512 382e8ef6a5bd3d12d7d2e0d2987f39c04ff7df3f07cd68aa732bf266b89d5d59a85be63921a7ff70f9219dbc6bb8547f80528242caa9417e08a008d1721cb1d2
+DIST augeas-1.11.0.tar.gz 2393675 BLAKE2B e7c50715fee892b47843f9be4ec9e88937c0ce10544b3e212d9c32a6151bbc36550d711ebec9db2a691e91cc6a2cd93696d807b440ab57a678ca6680426a4b03 SHA512 1b67bb7fcd9b560d3fe4a5c753d5e778db73caaab6e50367afd123eec107b65b73096913ac7d5170e85f5b63ff3522b2a6932b130e207ab22560dfc6e267b8a1
DIST augeas-1.8.1.tar.gz 2165325 BLAKE2B aa309984b5b11441fd2b10f3dc0b4a5f79a39038c1a71af6f7ef68b4fc24074db0bbcfd97341828211cc63d60d4b814515b119d0305367e9594cd5aa5159b822 SHA512 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b
EBUILD augeas-1.10.1.ebuild 1000 BLAKE2B c6d0e200c970a67013c4495d5018f622a947c96de0f3f6435b9b8ae193335a5c7181e33debab36db20fe96fcdd87ce1e4e4b00ea2a22c3ebb37aa6e46e906608 SHA512 85322cb00d04bf5b8c9b7534126ed6c966b73f094b63afc211345d80ee83a836d90bec866168107d390072c2f0d90ea113b4fa1b525c54d4c3d820bafa704b9a
+EBUILD augeas-1.11.0.ebuild 1007 BLAKE2B 28cbb683fd12dd15ac1047e207d745d902600665c2fa67f828effd7b54dbfa5e7a02cb397bf13be2234ad088ac1223dd5f743e302c85bbe5e9175bca00514357 SHA512 db2d5a5d287994e5135ae9234e430c9c970fb4107f9ba6c6cfe261cfe282f268f6e9042032e8608820b0e4b587b07803d3db18768bab6dad905ea54b7c375c89
EBUILD augeas-1.8.1.ebuild 1000 BLAKE2B 601f1da391549d104db635310c3fbc7ce590c0b14428b4059e6f32c4f5265a3821eb28f7581766cc773572646e67434d3114ba8d2959cf15a4418884f18e482b SHA512 47871941fbcb08efce33560c5e8d857fef6e2dff1cdde7c31af6b205517af837840b83664fde9b6943b5ee3c3a367a7709c603b9409397cb79d7f879fedde1a0
MISC metadata.xml 693 BLAKE2B c47bd36818c81a0fcb3d8f2e18e7a48797038c8a4a93302d592140faaed41d093523b6ad407b58dc7ae8c5f81c999c04e8514511b685e2a9b7d556dea177bde8 SHA512 1fcdcea259ed6cb652d08e763ccc67bee7bd5da9a7d3600dd492beaec7300868a47a7afdd71950ca8631886042428fce36cc17602a0776a9fa489f0fa2d27436
diff --git a/app-admin/augeas/augeas-1.11.0.ebuild b/app-admin/augeas/augeas-1.11.0.ebuild
new file mode 100644
index 000000000000..3ea24d340802
--- /dev/null
+++ b/app-admin/augeas/augeas-1.11.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+ dev-libs/libxml2
+ sys-libs/readline:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=app-doc/NaturalDocs-1.40
+ test? ( dev-lang/ruby )"
+
+PATCHES=(
+)
+
+src_prepare() {
+ if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Languages.txt
+ fi
+ if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
+ addwrite /usr/share/NaturalDocs/Config/Topics.txt
+ fi
+ default
+}
+
+src_configure() {
+ # Needs to implemented
+ local myeconfargs="--without-selinux
+ $(use_enable !static-libs shared)
+ $(use_enable static-libs static)"
+ eautoreconf
+ econf ${myeconfargs}
+ default
+}
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 59eb76c6f56b..5d474f6af22d 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,7 +1,9 @@
AUX conky-1.10.4-x11-build.patch 944 BLAKE2B eafeab1078e1c1c96190dce1207f49272a86fb964b153cd971d3e773ddfb8094a55b0c8e77f0d152c5cc4ec77f0863b694fca8d776208f2aae26d6366cc898ef SHA512 4ef0fb7467101befd1adbc0ae43268d69ceaa35af0185ade1f3b8ce4ebe8d8083cc6c71ddabae73bae1c5f92f5f95b0a4595dd92dd55bd9ffc4a34d10af26afa
+AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e32cd176d4efee3aa3816f36b782d823502a4a1cb79646995e90c9ac25d9a4bcd6f1879abe365173c3e29fc8583f213 SHA512 40cdd81f975c5198149ac62066af1a7b8eaa2c722d896d71a88663bef5bfdda17521d841a4fa8e08b5c4cc9106929385d626afcbe65709360b669b10a118f397
AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
DIST conky-1.10.4.tar.gz 365145 BLAKE2B 60f6f53ef67a9958d4dd4c3f1ab53886235927ed457ad3e98d2f6f61568a14baa7cd2afa0d3ddde9ed5e16aae17891213d906f49c308269f678adf37ea627329 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c
DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
EBUILD conky-1.10.4.ebuild 4850 BLAKE2B 4d7e00ca639cfc5eed0b80f2ddb473e2979014e2564c684a07e0d4647612ee53c0cee16e6d2806e25a70c0725521678a04d5e43cc3544d4612fee749bbf50510 SHA512 612694ed4db70e8198f6a5b4110f972ab09dff8e3f8619367db3e2697dce97d22fae09b971b3c7800b150f744e86a3268c0999f4e1f3ed3f3041bb32dbbb7663
EBUILD conky-1.10.8-r1.ebuild 5184 BLAKE2B e42508f1ed4d950e287b9e8b5f5d0e7b88dbdbd8b7fb319ee2f4a05c13af28957c88994ffa626d41fdbc12ff895643344ab2f8b8e9272c71d3622c1646474ab5 SHA512 faf1d6431e6516d83a9ad7cae2f62255110fccfc19379bd13f4a41c6bc594a21298d0d5af48bfecd4cb6bc4e16f79cf650834c51d5c287a908f75a3c881022a8
+EBUILD conky-1.10.8-r2.ebuild 5226 BLAKE2B 141b71885b2fde6ba9c1c613527c0e94b4ace5d3fd341f34daace3735e3fc45ba6302f09592cc5bb4a692f60fcfe570f909c3f0e6faa84d2cec68ba4918b758a SHA512 fd863912a5b712cf8ab668ce91a53847c2c3caf4b6fd52fde903b9401d78d5cb6d5b8ae454a71023b126801af37a442b230bec338fcd2a80cbc7d57f0f3efa7f
MISC metadata.xml 2525 BLAKE2B 805fd872d69f00911fa599d87f2c638b1126c438fd0c8ccdda84ff5cbddecbca882b74fa1828e703c32a4035a4223606a1da75bb27cc63ac19b8dd61f5f90b42 SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb
diff --git a/app-admin/conky/conky-1.10.8-r2.ebuild b/app-admin/conky/conky-1.10.8-r2.ebuild
new file mode 100644
index 000000000000..7b5070f6df14
--- /dev/null
+++ b/app-admin/conky/conky-1.10.8-r2.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils linux-info readme.gentoo-r1
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+ lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+ nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+ weather-metar weather-xoap webserver wifi X xmms2"
+
+DEPEND_COMMON="
+ X? (
+ imlib? ( media-libs/imlib2[X] )
+ lua-cairo? (
+ >=dev-lua/toluapp-1.0.93
+ x11-libs/cairo[X] )
+ lua-imlib? (
+ >=dev-lua/toluapp-1.0.93
+ media-libs/imlib2[X] )
+ lua-rsvg? (
+ >=dev-lua/toluapp-1.0.93
+ gnome-base/librsvg )
+ nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ x11-libs/libXfixes
+ x11-libs/libXext
+ audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
+ xmms2? ( media-sound/xmms2 )
+ )
+ cmus? ( media-sound/cmus )
+ curl? ( net-misc/curl )
+ eve? ( net-misc/curl dev-libs/libxml2 )
+ ical? ( dev-libs/libical )
+ iconv? ( virtual/libiconv )
+ irc? ( net-libs/libircclient )
+ mysql? ( >=virtual/mysql-5.0 )
+ ncurses? ( sys-libs/ncurses:= )
+ pulseaudio? ( media-sound/pulseaudio )
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+ systemd? ( sys-apps/systemd )
+ wifi? ( net-wireless/wireless-tools )
+ weather-metar? ( net-misc/curl )
+ weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+ webserver? ( net-libs/libmicrohttpd )
+ >=dev-lang/lua-5.1.4-r8:0
+ "
+RDEPEND="
+ ${DEPEND_COMMON}
+ apcupsd? ( sys-power/apcupsd )
+ hddtemp? ( app-admin/hddtemp )
+ moc? ( media-sound/moc )
+ nano-syntax? ( app-editors/nano )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+ "
+DEPEND="
+ ${DEPEND_COMMON}
+ app-text/docbook2X
+ "
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-use-pkgconfig.patch
+ "${FILESDIR}"/${P}-libical-3.patch
+)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT%/}/usr/share/doc/${PF}/html.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+ use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+ cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs
+
+ if use X; then
+ mycmakeargs=(
+ -DBUILD_X11=ON
+ -DOWN_WINDOW=ON
+ -DBUILD_XDAMAGE=ON
+ -DBUILD_XINERAMA=ON
+ -DBUILD_XDBE=ON
+ -DBUILD_XFT=$(usex truetype)
+ -DBUILD_IMLIB2=$(usex imlib)
+ -DBUILD_XSHAPE=ON
+ -DBUILD_ARGB=ON
+ -DBUILD_LUA_CAIRO=$(usex lua-cairo)
+ -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+ -DBUILD_LUA_RSVG=$(usex lua-rsvg)
+ -DBUILD_NVIDIA=$(usex nvidia)
+ -DBUILD_AUDACIOUS=$(usex audacious)
+ -DBUILD_XMMS2=$(usex xmms2)
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=OFF
+ -DBUILD_NVIDIA=OFF
+ -DBUILD_LUA_CAIRO=OFF
+ -DBUILD_LUA_IMLIB2=OFF
+ -DBUILD_LUA_RSVG=OFF
+ -DBUILD_AUDACIOUS=OFF
+ -DBUILD_XMMS2=OFF
+ )
+ fi
+
+ if use weather-xoap; then
+ mycmakeargs+=(
+ -DBUILD_WEATHER_XOAP=ON
+ -DBUILD_WEATHER_METAR=ON
+ )
+ elif use weather-metar; then
+ mycmakeargs+=(
+ -DBUILD_WEATHER_METAR=ON
+ -DBUILD_WEATHER_XOAP=$(usex weather-xoap)
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_WEATHER_XOAP=OFF
+ -DBUILD_WEATHER_METAR=OFF
+ )
+ fi
+
+ mycmakeargs+=(
+ -DBUILD_APCUPSD=$(usex apcupsd)
+ -DBUILD_CMUS=$(usex cmus)
+ -DBUILD_CURL=$(usex curl)
+ -DBUILD_EVE=$(usex eve)
+ -DBUILD_HDDTEMP=$(usex hddtemp)
+ -DBUILD_IOSTATS=$(usex iostats)
+ -DBUILD_ICAL=$(usex ical)
+ -DBUILD_ICONV=$(usex iconv)
+ -DBUILD_IPV6=$(usex ipv6)
+ -DBUILD_IRC=$(usex irc)
+ -DBUILD_MATH=$(usex math)
+ -DBUILD_MOC=$(usex moc)
+ -DBUILD_MPD=$(usex mpd)
+ -DBUILD_MYSQL=$(usex mysql)
+ -DBUILD_NCURSES=$(usex ncurses)
+ -DBUILD_PORT_MONITORS=$(usex portmon)
+ -DBUILD_PULSEAUDIO=$(usex pulseaudio)
+ -DBUILD_RSS=$(usex rss)
+ -DBUILD_JOURNAL=$(usex systemd)
+ -DBUILD_IBM=$(usex thinkpad)
+ -DBUILD_HTTP=$(usex webserver)
+ -DBUILD_WLAN=$(usex wifi)
+ -DBUILD_BUILTIN_CONFIG=ON
+ -DBUILD_OLD_CONFIG=OFF
+ -DBUILD_I18N=ON
+ -DMAINTAINER_MODE=ON
+ -DRELEASE=ON
+ -DBUILD_BMPX=OFF
+ -DDOC_PATH=/usr/share/doc/${PF}
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins "${S}"/extras/vim/syntax/conkyrc.vim
+ fi
+
+ if use nano-syntax; then
+ insinto /usr/share/nano/
+ doins "${S}"/extras/nano/conky.nanorc
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-admin/conky/files/conky-1.10.8-libical-3.patch b/app-admin/conky/files/conky-1.10.8-libical-3.patch
new file mode 100644
index 000000000000..032a6d2ef263
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-libical-3.patch
@@ -0,0 +1,32 @@
+From 128c8cce3415839a3d19a5cb877fd77af2538d35 Mon Sep 17 00:00:00 2001
+From: Adam Majer <amajer@suse.de>
+Date: Tue, 6 Mar 2018 13:46:31 +0100
+Subject: [PATCH] Add support for libical 3.x (#465)
+
+In libical3, deprecated icaltime_from_timet is removed
+Use icaltime_from_timet_with_zone instead. This function
+exists in libical 2.x so no need to change requirements
+---
+ src/ical.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ical.cc b/src/ical.cc
+index e4b48511..ef069124 100644
+--- a/src/ical.cc
++++ b/src/ical.cc
+@@ -49,13 +49,13 @@ struct ical_event *add_event(struct ical_event *listend, icalcomponent *new_ev)
+ icaltimetype start;
+
+ start = icalcomponent_get_dtstart(new_ev);
+- if(icaltime_compare(start, icaltime_from_timet(time(NULL), 0)) <= 0) {
++ if(icaltime_compare(start, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) <= 0) {
+ icalproperty *rrule = icalcomponent_get_first_property(new_ev, ICAL_RRULE_PROPERTY);
+ if(rrule) {
+ icalrecur_iterator* ritr = icalrecur_iterator_new(icalproperty_get_rrule(rrule), start);
+ icaltimetype nexttime = icalrecur_iterator_next(ritr);
+ while (!icaltime_is_null_time(nexttime)) {
+- if(icaltime_compare(nexttime, icaltime_from_timet(time(NULL), 0)) > 0) {
++ if(icaltime_compare(nexttime, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) > 0) {
+ start = nexttime;
+ break;
+ }
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index 171dfeb7d834..75b7db32ec49 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,5 +1,7 @@
DIST dxf-7.3.0.tar.gz 298408 BLAKE2B a8ba078d1bea8fed58df35562af678f902513f4da18123a3eabb52a707b7973358a7690d309b3b7d86fadc4086856580792177525b4e7e217da4542249e83663 SHA512 2bb16a41990f572c3352f708438e67550cc089c078296c765fcffec4ada60f40f097bfcdf4def3c57a0e6c1db31d2ab9020407b2c165509f132e51cc93af8205
DIST dxf-7.4.0.tar.gz 300099 BLAKE2B a3d17709efed3af5be82b1bf4ebd4201101e92867f714355467d72b84d560cddcf13a9ad2b4b71553decfc664f29c7ee13f74d551092d8a3a25dc48eea9a4214 SHA512 7aaa5827c6f02bb22b4d2dae9e24aa921ecebe72fe8278d3fc84f48448c1f903c0b70c22873d2772f3da5367ecc45770b8719c4d1aa95cac146a392bd9a923d2
+DIST dxf-7.4.1.tar.gz 300216 BLAKE2B 53452e73a10912a09e912fc0710fcdd1b0a6be4f78e95c704526852deacf5a7bfd2d3b73bc165f178f732249a64547e13bf9f58f77159c31908e954d6d3a4161 SHA512 a7a2ba4da675f1dea73f2e3d7db63804eb2b68cbb859e43235997b3bc5b8e7ef209705935182ae33d4b28cec5857d2ede738375e19df72134a5695190fd609a1
EBUILD dxf-7.3.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
EBUILD dxf-7.4.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
+EBUILD dxf-7.4.1.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
MISC metadata.xml 373 BLAKE2B e00f8cf7bc138cba4b3a9db1da273f85a90612578a89a8943bad5fd2bfe5f36d233b6b26764a2fff0c261890cafe34243845d12f6e9ed952daeab86c2e3aa70a SHA512 85d9b0ab4896713d2e796fede5635fc4bb80e402b2a6a7404fa1b7ba52e139a0ef27876dae39081c58a5ea8a5a78749b7fcc13c038b85c90c4286721931cb63c
diff --git a/app-admin/dxf/dxf-7.4.1.ebuild b/app-admin/dxf/dxf-7.4.1.ebuild
new file mode 100644
index 000000000000..f6e0099fdfe3
--- /dev/null
+++ b/app-admin/dxf/dxf-7.4.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
+ >=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+ emake test
+}
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index e965d1ab626a..f9652a7f3ae0 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -95,8 +95,8 @@ DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 3892
DIST github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz 278276 BLAKE2B dfb467b318f0a6661c5ae910f32bc5337d9677ff60b55dea4706193b4acb815f7e087debc92cf9347ae54db13f512c4a2dc1cc05ea031201bf119caaffa6c6e7 SHA512 4230ba34fe8f45ed7e4a0f7ffc60781b1b4fbaa6877212a8d5ab5a8b088d0d3151f76868929e270c5ca71769ae366976a25de65716e8c0e6289a4f720055f02f
DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4
-DIST helm-2.10.0_rc2.tar.gz 1158443 BLAKE2B 012d38a7f565a43ba852fbd5b4958d154e818f2acdbcf269894dfad6f097bff89bb847df5fa6624b2a93771058c543c958a8aa46c65f91468d803e48f774eca1 SHA512 ff51c29b048f7a0360f498724153e58406b1accbd01f1dc92d23ea706fe24757990b59e23e2988e7b1d8ce67f31672559a1f2ef1d0e002fedd0b831d9fe77831
+DIST helm-2.10.0.tar.gz 1158857 BLAKE2B 942474eacea109559baaa9d83d023b746ba0ec8943c3dd0a6ce6a338b2859bd585431ce5521c47f39b43dda7d8edefa84d8365abbc2463a6b69290881fb5f20a SHA512 a1fe5db8f7de634a06de6410227bc1387709e0401997afeba0d36f003dcc26df24020e420cb766fe81be40bddeda8ef4ba103345ddfc191f5e43a40016055cfb
DIST helm-2.9.1.tar.gz 1136941 BLAKE2B 57e319df56d60b1285df99ee6c0213e9700b80aa4117f11ab3e37493d552481875a42acd200d2183c2e587dc13130b9c47cbacee7dd7bfeaaf4dc9bb0a17dcc5 SHA512 c9830ae3de76e219dc4effad749fa6f80d24f47f034bd7150afc5817700947b678db64a0889fe1e3c3c69ed0932933ebf9bb893c065d7d77c2953190ab15b033
-EBUILD helm-2.10.0_rc2.ebuild 8581 BLAKE2B 93b4f2decf133729f3068d9addfaeec2c361986ad630d702de6798dfd26bae0bb4c57a28e469a4bdd12acd11ab1244d7dbf77c2162cb8b4afeda5500f46602f7 SHA512 8d2e053ed91e35abb2864ab775061c4c5c2e43ad6ab06cdd83be5ba4c36b768a2ddca6f02439fa96624942a606e99489f0514661ce55174080b36c5d73bc39be
+EBUILD helm-2.10.0.ebuild 8581 BLAKE2B c105833befb257b27c705a686dde12efddf42124029483f55e12ae9834c73b62a5e5cf349f97a784eb386afba8a7626e506b5528f84654a7939e50165c838a9c SHA512 94f49188dc838f1daff6bab1df8671403d63776e8d593d973494dbd48acd7bbd2be36b39425cc3f50b0e4c43316fa5f52dca19e67c0723824c52834c367844a9
EBUILD helm-2.9.1.ebuild 8410 BLAKE2B 266d13ec9488fbc344e29c577238d5980d10a8c6094cb6f41c6127065ff7b899bc609b530bc0cd87816d71424492c87634848ce26002954a09fe60aa99578e42 SHA512 b21df5a0c6f9a1d13404a128c1466301848216386c74e143a04f1567bac648efaf727d22ac7cdb1a943c8edcdaa3ed3b5cc440c8cd664ddaab803514b4ba44c8
MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/helm-2.10.0_rc2.ebuild b/app-admin/helm/helm-2.10.0.ebuild
index 0950240700fe..876c49808695 100644
--- a/app-admin/helm/helm-2.10.0_rc2.ebuild
+++ b/app-admin/helm/helm-2.10.0.ebuild
@@ -101,7 +101,7 @@ EGO_VENDOR=(
inherit golang-build golang-vcs-snapshot bash-completion-r1
-GIT_COMMIT="56154102a2f25ebf679c791907fd355bb0377f05"
+GIT_COMMIT="9ad53aac42165a5fadc6c87be0dea6b115f93090"
ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
${EGO_VENDOR_URI}"
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index 0a91ee75d8dd..343ae02dac38 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,6 +1,8 @@
AUX mcollectived.initd 497 BLAKE2B 1fe966f49117f9ea1b8c8ca4f5c92d5ddd7f8fb28658e4c3b016c193b69d1c42d35da85ace176279d09778c12fcc664748ea743c9b88219cb0fec2292ca867d4 SHA512 dc77a522e3ab6af3e23c559bfcb385033f2200b58b50db59000e7f56b2a789e8fbd83340f8ee494a1a9fdbdd1bd737a2b17ae4743823794264723fdc931ea6b0
DIST mcollective-2.12.1.tar.gz 1517946 BLAKE2B 785acc53a4854f47caebe1d6a5f9cc850c3c33fd21e1b6e57d0d9761b2a7a3bbab2f2df398aa5344d90bc11397a545c8663d60ff3b2f6ff835fdc619d874928e SHA512 2398fb0202d8d5669a6efa81d96a87ee7e9221c1bc1b2e5be1917f2fec2527879b34be8df8c3052acf0ed58074b2da185f0837889d9300bde190bc95e8237d9a
DIST mcollective-2.12.2.tar.gz 1517725 BLAKE2B e5f2b94843b95fa0749ed7e3e1ae52aeb485bf6644b64d971efd7d7a0e7bc806de0d2b00997c7e36d004fd78c479b9cf19b927e717ad0f3e4c13e820e5481637 SHA512 83be835499adf836797a67adda9be6d1bbf32524560ae51533875a1e2507599c7a0a1d2a76513669b919cf1eeceabdf13162eedb8972c74ecdeba5427b1701e4
+DIST mcollective-2.12.3.tar.gz 1516461 BLAKE2B f8fa65ffadb98ae3511416aaf8b0875486b75f20e4da4007ad70820f453a6ecd81b57d7aa30ae38b014b984330f6c4d525002a54edb2c00d629b6fd4b2250049 SHA512 55798d4579a6be8a7790b046f8b4e72607935c83ec874b6147258d827e0bf279f08dfa121d7cc4a8ed922986aa6bad9ebd62b7e3cbc1e7ef526cf58edce1bcdc
EBUILD mcollective-2.12.1.ebuild 1649 BLAKE2B b9fafb43c324d42bce01b95452bace880809ed327170098fb81c36fcc7c0505464624166ebcee596a9068742e1a6958e727052f553693db5e0275764180ca4aa SHA512 9ae9e1b5f0e5b31cd1dc44edc844253bfca1c80e8b626ec06a2e0a66eb08c0d935747a097f2f516d8e85f0ce79f28a675d1866b866789af47706048c92ad6c2f
EBUILD mcollective-2.12.2.ebuild 1649 BLAKE2B b9fafb43c324d42bce01b95452bace880809ed327170098fb81c36fcc7c0505464624166ebcee596a9068742e1a6958e727052f553693db5e0275764180ca4aa SHA512 9ae9e1b5f0e5b31cd1dc44edc844253bfca1c80e8b626ec06a2e0a66eb08c0d935747a097f2f516d8e85f0ce79f28a675d1866b866789af47706048c92ad6c2f
+EBUILD mcollective-2.12.3.ebuild 1651 BLAKE2B 6cdf29afb3863a7db4eb246231f30d16a65e0acbfd36c3857db2bc30fc58e08405292a541e0b3bfd24d7368526f622de1ae1bf18fba21df8d25619faec5a12e5 SHA512 cc041a29db2039700769ac558b28206ed04c3f045b03dd2f4d037350c7d198207082c6ccef54e2f7733b8fd52a42b35a8562cfa673851da2d12bb2ef9f368dd6
MISC metadata.xml 534 BLAKE2B e8866ac769b65ccc61dfe79fe5883bee78ea4066187b7136b899a1a16fa74952f88fd2b81376033d36418dc670d5669d9b65fc3195720ad95adf30bfe49729b1 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199
diff --git a/app-admin/mcollective/mcollective-2.12.3.ebuild b/app-admin/mcollective/mcollective-2.12.3.ebuild
new file mode 100644
index 000000000000..6682ac763bea
--- /dev/null
+++ b/app-admin/mcollective/mcollective-2.12.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="https://docs.puppet.com/mcollective/"
+SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/all/marionette-collective-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND=">=dev-ruby/stomp-1.4.4"
+
+src_compile() {
+ einfo "nothing to compile"
+}
+
+each_ruby_install() {
+ cd "marionette-collective-${PV}"
+ doruby -r lib/*
+ insinto /usr/share/mcollective
+ use client && dosbin bin/mco
+ dosbin bin/mcollectived
+ if use doc ; then
+ dohtml -r doc/*
+ insinto /usr/share/doc/${P}/ext
+ doins -r ext/*
+ fi
+ newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+ insinto /etc/mcollective
+ cd etc
+ for cfg in *.dist ; do
+ newins "${cfg}" "${cfg%%.dist}"
+ sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+ "${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
+ done
+ insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+ einfo "Mcollective requires a stomp server installed and functioning before"
+ einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+ einfo "any other stomp compatible server should work."
+ einfo
+ einfo "It is recommended you read the \'getting started\' guide [2] if this"
+ einfo "is a new installation"
+ einfo
+ einfo "[1] https://activemq.apache.org/"
+ einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
+}
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index 68f5e5c125d7..13e1825ee2dd 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -1,5 +1,5 @@
AUX packagekit-base-1.1.1-cache-qafix.patch 469 BLAKE2B fb0666e27d2908236a0adf31adcc9dbcaab94bdb1d4b253369b2bf92e18279e289ea8b486285ce9b19abfc79c81e308675019777f49b98ce6aca1e341695cfb6 SHA512 7efb79f5b25f4b1b3db22247c695e13d748908c6802667bd8dc322c247881bd133aa8787192598b384ce8080ac986031e5fee64201f17e4e8af7e15fc7d18424
AUX packagekit-base-1.1.7-elogind-support.patch 5872 BLAKE2B a18f2e6016781b043d34cc82e76970a8fd18a4e08fb5516b2f332f6a3213e4fbb90311d6bd54a11b82b98e84d90598648562473aa497c8c4c69ad99a4cbd474e SHA512 26b6f163e44a1a837e8c9ac43b8f6ec9733962d746d0081e05d1691099c953e16055d530e7de5558aacd985b1690dcbea9c6087755d037d8029f34b158d74a45
DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83
-EBUILD packagekit-base-1.1.7-r1.ebuild 3676 BLAKE2B 33081996cac6656b7aa0cc729ff60de69263a710d35c37e01b2eb37e8ffc72e5b39ce14ba105e08c52105cc6716546dd6380bea8d96c3d40899eeccb41158d5a SHA512 3d104fe8464249496c2bc001b907d3f36533abc50643d6b002e03ce9e2b4c08c9b13b9a3eb68923d655c5933b5b6a04f82be870882ade4c2a2b2a5dd29dcb7fa
+EBUILD packagekit-base-1.1.7-r2.ebuild 3658 BLAKE2B 1c762371380374854d5f5745c990dee34114952be04c1837cebf17f6db147f6aac80e6935c1984d765469cb70d23ed4e47e34a4728df334706ad42f8fca6aa5e SHA512 05be68bff165af27a2354e72f8a9102992530473dea1bdeb68507af493fce811bd338ff0d6b5ab7b2a17d4e91d1d258d151719a8742fa5e932126fd206292e6f
MISC metadata.xml 664 BLAKE2B 4dcdb79a089d9ec0734d9af4c2b6206ad1add7b17f8c8984b2e7763672fc334000749b4332e92224d11b0382fe22a2ca0f83ced4da218fbd1e85d8b101fd3e1f SHA512 9b80a98e97af44ab81b497b2c71c73db41da7f250734d6b032e80151719a0a82e2c1e295b068a5e3657a509dbd74d1f65f6e49fc211f77d0623eb7bdcd32b323
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.7-r1.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild
index 4281826ad53c..cf2c12a7ae0e 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.7-r1.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
>=app-shells/bash-completion-2
dev-db/sqlite:3
>=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.46.0:2[${PYTHON_USEDEP}]
+ >=dev-libs/glib-2.46.0:2
>=sys-auth/polkit-0.98
>=sys-apps/dbus-1.3.0
${PYTHON_DEPS}
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index c8439e9ce2cd..9cfcc0f64178 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,5 +1,5 @@
AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
DIST password-store-1.7.3.tar.xz 63416 BLAKE2B 5931608e0208dfe6965b79f586c153a4930d1c3d3b74433d026ee0bc5889fcc29334c637ca4fb68308d0169bad7c8235b6632e9f80eda1e24f0f5721353f88e3 SHA512 89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7
-EBUILD pass-1.7.3.ebuild 2179 BLAKE2B 7073c414ca7f9f03f50ab2c120660e61ba32162cc843ee8c3bafe374923f9aa921ad2986632cae5c02c23980da36222e540e1818d54c05206cd5ff80154f6122 SHA512 1037c2940f5359e2545a8b68374a934abf1af6e488a13b736ab83a89f24e1106af0cf414808f3c56c09999f580fe574f2c333c5fd0ba1548ca44b32f2167e807
+EBUILD pass-1.7.3.ebuild 2177 BLAKE2B d460c9fff62a5a72f9ebe0a4d6350a58f9a7f826f751399c729c6ee88e999b13396a399035098d9cec2125cb492bcdc276410edcd27c4c0219273af15553450f SHA512 b972435fa8c8993df2f53bc3541478e9c84777957b48ca2752bc7d16604ceb6c0f9e6fac375fec6bedd9ad8044aa79bc5f9943c9ea6f0d4c28881fd4f2f0f1a3
EBUILD pass-9999.ebuild 1960 BLAKE2B e06b86833158fb55e9656a1bbc2168bbdfb0cc1fa48924437e2a05b81dc79c0f110cc2edf664610b43b29cb67c4563db568bbbf3cb6edd7f135b5db0d027751f SHA512 b170aaa7a41a628684735cd24994f40a95abd8e7c1ffa9bd52d381f4d94be246c7465cb617404eb61bc6221fede56f43dc76f18517329b83d00c0ebff02e4580
MISC metadata.xml 881 BLAKE2B 59fee6aeadb16d050eeaedc6d5081963e3ffa8316ddd00afb67661d721fa60b80483c16348e0c3d6c20fdb6513fd5840552c3a95724b619e07122d8755c4e7c1 SHA512 49df1e24751818d46a0c23fcdc9e41d965dca29f9964f7d142e4dba9b076b472c860d9b3eafc15b04a983f49d2cd78eb6b529742469549209c7e4160a15f1323
diff --git a/app-admin/pass/pass-1.7.3.ebuild b/app-admin/pass/pass-1.7.3.ebuild
index 38bc49676117..005bd49f0b7d 100644
--- a/app-admin/pass/pass-1.7.3.ebuild
+++ b/app-admin/pass/pass-1.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-macos"
+KEYWORDS="amd64 ~arm x86 ~x86-macos"
IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
RDEPEND="
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 4db6022f3fcc..baa5f2986aff 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,5 +1,4 @@
-DIST passwordsafe-1.02.1_beta.tar.gz 14068085 BLAKE2B 7a1bff0f2db798e08377436020473a8c6c46f9e64fa85629b6545f70954a3ad05735ee101bea021308589d523724f70fce24447837ee25cf1b897a7703873757 SHA512 c83a0c757f9f74906ffaebf650fd3f422a29f838c7f5430b3d3e32852b35dd92dc413a1c920320af9812d7960f0648e8df8a9d145828f8669e824e9972038067
-DIST passwordsafe-1.04_beta.tar.gz 14329263 BLAKE2B 17f4b0cd0b34f8907530a7da43dfbceab56c9aefd65f2d0ba0356b5a1820e8b4273c68655229a07947693fd6d320bc654065f790c86daff31679b565a57145fe SHA512 5f2d0634be3d3932991f77e96b7b40fee3984407ec8620d82caea089bba49df69444cdf8d2cf431aace43636c5034892a672c338ee98df06473d2569953bdab3
-EBUILD passwordsafe-1.02.1_beta.ebuild 2276 BLAKE2B 51d55af680ca670d0747b809b5db84aafc85eab319e6f902dcad0a30962b9289639037739df54154818d91a242e9093752b478e5fa802c97d576430e1c489d0c SHA512 6ac4ec9137b7e246237d12714d1700a0e0d877c8f4d1ff0556349ef8d2fb384a72d270715e80e32ac82e077adc3e520b3e8edabf4bfd9a512970118cf8f38039
-EBUILD passwordsafe-1.04_beta.ebuild 2238 BLAKE2B 8488518028d38ecfabbf6a67c420bbe9454e6214a11743fb0e0739980b457ef7c87f963bf50875f11d8d1871a62efa924efef303f58d3331b90e01a3e7ba63cb SHA512 4c0e09150fe4f24dc49e2955c3bb790f7ab61a4143c3cff9ddc7b9266f48d6b1f0b574bf83ccef84c7c2b9b62d0dd1d582bea82e67965135bb8b0035e80d7ab1
+AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da568c2686c1988916da9eadc312c37d01016df3449535b88b503dfd3aeac2bf3c8e613141552bb1d97f5f5a733becc33f3c565a610940 SHA512 2fc6745b84ad810a550c2b221aca4cd10f87d4bc77282cb31b3d3070b61a3958c126ce0d3da4eaf550d80be470ca4c5aefaeb863caaf2f9fb285bf844f5705bb
+DIST passwordsafe-1.06_beta.tar.gz 14295034 BLAKE2B 83f480eee16938e396fa01797f67f5bc61984414b7f38b91404caea3dd6b3d31ba0e2ce4d198da048dff9cf1b5c8ba04e8bb9c93351fc21552bbc05a3b9ba486 SHA512 2a5be46e0e90f98c519bf9137f32298672359d1bfeb081a71d67251b35da6c1157e18c35a2c84321ed3fa077cb15ebf9cee763ba13b201ce02965d6642bb246c
+EBUILD passwordsafe-1.06_beta.ebuild 2321 BLAKE2B 6d17e734072738021ea5638420fc9aba8854d37df6aa660ee328ab6b8f0e7907418ba3add4b2feeba598121a707a4e139edd9a6a9b312b23d7ac317f2da6ea9a SHA512 b6b2db66516dc48f3ac1beb4634697d8c033da524b0a378dc6753758a8f1ca03ea5b383c509088340215b2ea1aafd958ed75d50472569ad29ef2c52f323b0269
MISC metadata.xml 778 BLAKE2B 5387ae1a60b8de35a2a845146c8016d8677e2b7381d9f1f2f7eb8c18b794969f2d1448b591885b978c7641a7b9ebf751c660fffe8780fbcd5089111c88918674 SHA512 29e765d326b3c165c0a649da8ba5e6be57a0dfdaa12a5b25ba8bac44c868638a24a6a9c8bbb27638d7f215841548577658e139d9abee0f3c61d1e96c3dffdacf
diff --git a/app-admin/passwordsafe/files/passwordsafe-1.06_beta-system-gtest.patch b/app-admin/passwordsafe/files/passwordsafe-1.06_beta-system-gtest.patch
new file mode 100644
index 000000000000..b17385bdcd83
--- /dev/null
+++ b/app-admin/passwordsafe/files/passwordsafe-1.06_beta-system-gtest.patch
@@ -0,0 +1,69 @@
+--- a/CMakeLists.txt 2018-08-11 09:54:05.000000000 +0200
++++ b/CMakeLists.txt 2018-08-22 10:48:06.422755215 +0200
+@@ -91,6 +91,7 @@
+ # Configurable options:
+ option (NO_YUBI "Set ON to disable YubiKey support" OFF)
+ option (NO_GTEST "Set ON to disable gtest unit testing" OFF)
++option (SYSTEM_GTEST "Set ON to use gtest provided by the system" OFF)
+
+ if (WIN32)
+ option (WX_WINDOWS "Build wxWidget under Windows" OFF)
+@@ -256,31 +257,36 @@
+ endif (MSVC)
+
+ if (NOT NO_GTEST)
+- # Download and unpack googletest at configure time
+- # See https://crascit.com/2015/07/25/cmake-gtest/
+- configure_file(Misc/CMakeLists.gtest.txt.in googletest-download/CMakeLists.txt)
+- execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
++ if (NOT SYSTEM_GTEST)
++ # Download and unpack googletest at configure time
++ # See https://crascit.com/2015/07/25/cmake-gtest/
++ configure_file(Misc/CMakeLists.gtest.txt.in googletest-download/CMakeLists.txt)
++ execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
+- execute_process(COMMAND "${CMAKE_COMMAND}" --build .
++ execute_process(COMMAND "${CMAKE_COMMAND}" --build .
+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
++ # Prevent GoogleTest from overriding our compiler/linker options
++ # when building with Visual Studio
++ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
++ # Set some other gtest configurations:
++ set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
++ set(BUILD_GTEST ON CACHE BOOL "" FORCE)
++ set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
++
++ # Add googletest directly to our build. This adds
++ # the following targets: gtest, gtest_main, gmock
++ # and gmock_main
++ add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
++ "${CMAKE_BINARY_DIR}/googletest-build")
++
++ include_directories("${gtest_SOURCE_DIR}/include"
++# "${gmock_SOURCE_DIR}/include"
++ )
++ else (NOT SYSTEM_GTEST)
++ find_package(GTest REQUIRED)
++ set(GTEST_LIBRARIES ${GTEST_BOTH_LIBRARIES})
++ endif(NOT SYSTEM_GTEST)
+
+- # Prevent GoogleTest from overriding our compiler/linker options
+- # when building with Visual Studio
+- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+- # Set some other gtest configurations:
+- set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
+- set(BUILD_GTEST ON CACHE BOOL "" FORCE)
+- set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
+-
+- # Add googletest directly to our build. This adds
+- # the following targets: gtest, gtest_main, gmock
+- # and gmock_main
+- add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
+- "${CMAKE_BINARY_DIR}/googletest-build")
+-
+- include_directories("${gtest_SOURCE_DIR}/include"
+-# "${gmock_SOURCE_DIR}/include"
+- )
+ endif(NOT NO_GTEST)
+
+ if (WIN32 AND NOT WX_WINDOWS)
diff --git a/app-admin/passwordsafe/passwordsafe-1.02.1_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.02.1_beta.ebuild
deleted file mode 100644
index a31827651c2f..000000000000
--- a/app-admin/passwordsafe/passwordsafe-1.02.1_beta.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit eutils flag-o-matic wxwidgets cmake-utils
-
-MY_PV="${PV/_beta/BETA}"
-DESCRIPTION="Password manager with wxGTK based frontend"
-HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"
-SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="minimal test yubikey +xml"
-
-RDEPEND="xml? ( dev-libs/xerces-c )
- sys-apps/util-linux
- x11-libs/libXt
- x11-libs/libXtst
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- !minimal? ( !!app-misc/pwsafe )
- yubikey? ( sys-auth/ykpers )"
-DEPEND="${RDEPEND}
- app-arch/zip
- sys-devel/gettext
- test? ( dev-cpp/gtest )"
-
-S=${WORKDIR}/pwsafe-${MY_PV}
-
-pkg_pretend() {
- einfo "Checking for -std=c++11 support in compiler"
- test-flags-CXX -std=c++11 > /dev/null || die
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # binary name pwsafe is in use by app-misc/pwsafe, we use passwordsafe
- # instead. Perform required changes in linking files
- sed -i install/desktop/pwsafe.desktop -e "s/pwsafe/${PN}/g" || die
- sed -i docs/pwsafe.1 \
- -e 's/PWSAFE/PASSWORDSAFE/' \
- -e "s/^.B pwsafe/.B ${PN}/" || die
- use test || sed -i -e '/find_package(GTest REQUIRED)/s/^/#/' \
- -e '/add_subdirectory (src\/test)/s/^/#/' CMakeLists.txt || die
-}
-
-src_configure() {
- need-wxwidgets unicode
-
- local mycmakeargs=( $(usex yubikey '' '-DNO_YUBI=ON')
- $(usex xml '' '-DNO_XML=ON') )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- pushd "${BUILD_DIR}" || die
- if use minimal; then
- newbin pwsafe ${PN}
- else
- dobin pwsafe
- dosym pwsafe /usr/bin/${PN}
- fi
- insinto /usr/share/locale
- doins -r src/ui/wxWidgets/I18N/mos/*
-
- # The upstream Makefile builds this .zip file from html source material for
- # use by the package's internal help system. Must prevent
- # Portage from applying additional compression.
- docompress -x /usr/share/doc/${PN}/help
- insinto /usr/share/doc/${PN}/help
- doins help/*.zip
-
- popd || die
-
- newman docs/pwsafe.1 ${PN}.1
-
- dodoc README.txt docs/{ReleaseNotes.txt,ChangeLog.txt}
-
- insinto /usr/share/pwsafe/xml
- doins xml/*
-
- newicon install/graphics/pwsafe.png ${PN}.png
- newmenu install/desktop/pwsafe.desktop ${PN}.desktop
-}
diff --git a/app-admin/passwordsafe/passwordsafe-1.04_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.06_beta.ebuild
index 14da0d36f2c9..2a8d7c884957 100644
--- a/app-admin/passwordsafe/passwordsafe-1.04_beta.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.06_beta.ebuild
@@ -32,6 +32,10 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/pwsafe-${MY_PV}
+PATCHES=(
+ "${FILESDIR}/${PN}-1.06_beta-system-gtest.patch"
+)
+
pkg_pretend() {
einfo "Checking for -std=c++11 support in compiler"
test-flags-CXX -std=c++11 > /dev/null || die
@@ -54,6 +58,7 @@ src_configure() {
local mycmakeargs=(
-DNO_QR=$(usex !qr)
-DNO_GTEST=$(usex !test)
+ -DSYSTEM_GTEST=ON
-DXML_XERCESC=$(usex xml)
-DNO_YUBI=$(usex !yubikey)
)
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 941439876fdc..c132b3745ae4 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -6,14 +6,14 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
DIST puppet-agent_1.10.12-1stretch_amd64.deb 15443166 BLAKE2B 74c8465fd8cc98ca114acdc600c3f259072d64765cdd8308092b7177233d44656f429407520ead2e02494951f57f1c79b5dfe8c76b2dd7bba7c1316426746df8 SHA512 1391530be340ad0439260f7bd3df8ad251ffaa02fc2f358e4ff2189b8c64a0b2d0caab9f84b84b26ebe2176decef2a39d3114f6433ba6eacd962ff45e1e04c43
DIST puppet-agent_1.10.12-1stretch_i386.deb 16308082 BLAKE2B 6606c15aac51b28e9e8011168563dff9069b6b065f861c01f4fc768064fe266f83211fbc8fefebfe4bdf81c6220b5daa19f66a9214bd1f2ff53a3b1a2e87128a SHA512 fce0a3ac12afcc293fbdf3cc990407b82592228ed8ed609f4b98c17cea35c8e5ff5f47287880601fa80ac2f7fa608dfe00b3594a906d52bc2bd2e04117ccb856
-DIST puppet-agent_5.5.1-1stretch_amd64.deb 17325604 BLAKE2B 1fab815d5d238cb6a05da91a4a9645644915493b2117ff29b8ba258edab18084394c8054f37c5bcbee9bf903dabce5741d7ef4be0a94a0ec8c13ac4b825b8bca SHA512 c4c7ce50cf576a6b12ecee8b9a6c7969512b3625e7ea0f16cc4cd367cebee5271cdaf7cc084fe4d344b42ab6e200664fe7b167acd9cd0da23d2ff3cd9028d6f7
-DIST puppet-agent_5.5.1-1stretch_i386.deb 18063690 BLAKE2B ea7c7068e57da1249c1b1c7232e1af673840b0c8c7e5795574ffcb1861c68683ac9f21f8f4216272130b12a61bb8b324e49d6bf7f0c3d314857fd2591a7ad6ff SHA512 1a64616191a5143b150fe1d145ea786233ab763e87d5fe86bd1b3306fa73bab60d2f3d5c0bb7fcb6fe7c700a47a4c94c72eef1509732b18a5caf0fcd7f060602
DIST puppet-agent_5.5.3-1stretch_amd64.deb 17272112 BLAKE2B 5e052f837184b1d1dd5965ccb18e3a52dc88ea6ba85c0c3c5222ffe50e32e0a72a6f14274f5dd6c1bd63b3a160affa8a6b3399ac75e27d9cc2c267a1e1c0e89d SHA512 1629b3535b900081676647f64c17e3c0d23df38525d90d5f3993877d0749d18cf55f72fb20c47e20a63d18c2c7ad95cc0f179449c386ce3b8ec8a6d0f40243e7
DIST puppet-agent_5.5.3-1stretch_i386.deb 18189670 BLAKE2B a8791926a5ce08edad363670ab5269fcef208c3137db4126f33295fd7fdd447620578445eb0a9396e263fed8612981581cef0c5f6d3e51634722c01c79e2c9dc SHA512 83a1f472c4af97a48703ca61a00740fc7806155732bd488d3f9d757f969dca0a19cec014dad0bb5e6d8b5384d32c2d906ad0e8438efeeae5fdd39524cc11f6f8
DIST puppet-agent_5.5.4-1stretch_amd64.deb 17273314 BLAKE2B e296cda8219deafe9b36039298823edb6007f42047e90e120fc16e941bb91c8d660e1a7f1341aa9463c67d4a5e05fbd8bf9c072a7768b0e885536efe5956115c SHA512 599aef07bb39b8d209e806ea1539157419de96376113ba88de6160525e96d6fa28f9865d7a89aff96698a0ff4e85ec474dd43ff4ea512b06a64c491c252cd973
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
EBUILD puppet-agent-1.10.12.ebuild 3479 BLAKE2B 6db65113a8203216068167672257270fefdcad43a897c6b25400be1949beb573b335feca32c268223ab288e340ae2edf53e4fc39a445d1c9bfc5ad37f9c7340a SHA512 1be819f7fb14d2d3aa47d23919feba678445cd605fe31f43b090bfbe3ab9a3ee4db7868553f7cf3a5c85b49d5cca0caa2580e1347ec278df91fe8495df42873c
-EBUILD puppet-agent-5.5.1.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
EBUILD puppet-agent-5.5.3.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
-EBUILD puppet-agent-5.5.4.ebuild 2483 BLAKE2B 4953d549f412de42e77074bff4e7cd33f2df77f30a70ac84987a4ef5a1c39ff0ca45355ec8c3dc90e203b65ac4c71714c7e5cff5caea96dc7766673ae1426c3f SHA512 23dae168a44f11d9aed9c5be09d08660803510979479f656464de4856dc76f50626298d9fcec8186d8413f21592d161bd8854cde0b8668612fb9300936aecc15
+EBUILD puppet-agent-5.5.4.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
+EBUILD puppet-agent-5.5.6.ebuild 2483 BLAKE2B 4953d549f412de42e77074bff4e7cd33f2df77f30a70ac84987a4ef5a1c39ff0ca45355ec8c3dc90e203b65ac4c71714c7e5cff5caea96dc7766673ae1426c3f SHA512 23dae168a44f11d9aed9c5be09d08660803510979479f656464de4856dc76f50626298d9fcec8186d8413f21592d161bd8854cde0b8668612fb9300936aecc15
MISC metadata.xml 502 BLAKE2B 9eaaec32ba54988999831d4d873dff6c525b42ede2da3cc9a5b67359299233f2ffdafa04a949df6aa58d764e36beaf8ce64c053a306f6e055a245b207e8f2aaa SHA512 aedf4322173910c202b105d904e4528c6b6bb949fc05ed95c4a8d9a74133f5c7391ae30d7675bfa36a3f85880c971aff6e4a57ffdcde57b3b63c02dbed083a95
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.4.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.4.ebuild
index 5570060df99a..784b06891e1d 100644
--- a/app-admin/puppet-agent/puppet-agent-5.5.4.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="puppetdb selinux"
RESTRICT="strip"
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.6.ebuild
index 784b06891e1d..5570060df99a 100644
--- a/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="puppetdb selinux"
RESTRICT="strip"
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index b29c4aa72f58..b5b0e2053cea 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -10,12 +10,12 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
DIST puppet-4.10.11.tar.gz 3022878 BLAKE2B d3eec840bb1c46e0dfbbc9dad598b362049a76c7ee60b4ff314e7ba2ce19613f834baced94afbbf499b513391107c4229be5f40c275d0724b200358722db0e96 SHA512 5eaac8bd973d0013e7774c9bda81524332f2b3b0177c04e78554bfb0815697b4b296d5dd11a04f7fad782ad975b350b149b1cd97fc5f06974952314f163f1b40
DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
-DIST puppet-5.5.1.tar.gz 3035639 BLAKE2B 2930ca9eb928d7c6a69ea76673fc4d002e230bf6dbcd28764e8d5bd504ae11326dc856ed64480e13c9eb1d683ad5e8ef64fc9e217942b59d90c6a0bc98e0197c SHA512 20bf7094193f30cfc7a91244275fc79eef0296036ffbc6bbe405e9ca75123b722be6855c746ef8cd35f80bd7a7308408a9205d064f0f910e11877e4db0ebdabc
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
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.1.ebuild 3833 BLAKE2B 1fe39216139f93fc68ae0965596931a4d1ad1114d78353001a710d790a9fbdbe041f14ca3a04e7393c4355da33d3b2501e3e168d306aa0232bdc4fcd2547e134 SHA512 553ed1eea1b8acd1da19be01a7ff7f9d420c9c8b03b38bcdab125f1f02dde6b164caea44019fc3557f8d61ae3f22da925e30dd858402841714d6c17462cff98e
EBUILD puppet-5.5.2.ebuild 3833 BLAKE2B 8a69323f2c1edf94a9dd384a695e3c2d2ba20fff0956cdda51ed853ca9e730c2c051324d0867baea4f71672337e41ec6c42b504edcdaf3f459d120080b3bea5e SHA512 b66520e6d78a3fe5bc8ae5151074133340db60eb402ac4d6f92f4add28b28b3d8280befc0aa74bb4935c9347e35ec240a6afa1bd67db23b1f15a46ad81b2d8ad
-EBUILD puppet-5.5.3.ebuild 3835 BLAKE2B 98dd8fb348747d1f47439359997cd37d715f3d8eea2e888e6ffa032a3c91c151f140d41827fc2963514d0a485ca3673787a379c7921092614014c9ceb5db6743 SHA512 a52d1c5b5fa1e3be0874495c69fd0b1897b5e6c2ece46410dbaad1c58b59b809db046698bb0e8b973dbe0f57610ce55698346cd29e079ed3ac1ecaab4312ebfe
+EBUILD puppet-5.5.3.ebuild 3833 BLAKE2B 8a69323f2c1edf94a9dd384a695e3c2d2ba20fff0956cdda51ed853ca9e730c2c051324d0867baea4f71672337e41ec6c42b504edcdaf3f459d120080b3bea5e SHA512 b66520e6d78a3fe5bc8ae5151074133340db60eb402ac4d6f92f4add28b28b3d8280befc0aa74bb4935c9347e35ec240a6afa1bd67db23b1f15a46ad81b2d8ad
+EBUILD puppet-5.5.6.ebuild 3835 BLAKE2B 98dd8fb348747d1f47439359997cd37d715f3d8eea2e888e6ffa032a3c91c151f140d41827fc2963514d0a485ca3673787a379c7921092614014c9ceb5db6743 SHA512 a52d1c5b5fa1e3be0874495c69fd0b1897b5e6c2ece46410dbaad1c58b59b809db046698bb0e8b973dbe0f57610ce55698346cd29e079ed3ac1ecaab4312ebfe
MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-5.5.3.ebuild b/app-admin/puppet/puppet-5.5.3.ebuild
index a5bdb1492503..8aa23c0b2c8c 100644
--- a/app-admin/puppet/puppet-5.5.3.ebuild
+++ b/app-admin/puppet/puppet-5.5.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
diff --git a/app-admin/puppet/puppet-5.5.1.ebuild b/app-admin/puppet/puppet-5.5.6.ebuild
index 646ad4fb5351..a5bdb1492503 100644
--- a/app-admin/puppet/puppet-5.5.1.ebuild
+++ b/app-admin/puppet/puppet-5.5.6.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 032378481f8b..f736dc336f8e 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,8 +1,6 @@
AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
-DIST puppetdb-5.2.1.tar.gz 25435195 BLAKE2B aed0e6175df0a603ea0aaf792c31b4933d408a4f7a037b557a8acb4b237e4c639a06f954232e049efe4b486d780a3af129c8a6a48833019168cd70f38e5bf403 SHA512 6d0b06f083093394f74e952112c6b388fd6c94452cf2954172dafc5dc42c7a0b45f6a9a7afcb6196f12316e15653943c3faed8a06ba7a7bd75a31db8515e0103
DIST puppetdb-5.2.2.tar.gz 25436396 BLAKE2B e30d80b7da29c8cf3b00c9cda3d6e0a4c5635b3bb3a4e6d3e2bf284531509828df6d845a0d30b2a7a454ec35ab4879019fc4c68fc3aa8b6a72c3d0896b9e75f7 SHA512 cc598539801bedd4ef0052f50013320be5dc1eaf8098db8898a0759609d6d4e26aa094550bc1a45c041f9fe65ee99b0c00c00586d3cc93003836f1415bd92456
DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059
-EBUILD puppetdb-5.2.1.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
EBUILD puppetdb-5.2.2.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
-EBUILD puppetdb-5.2.4.ebuild 2765 BLAKE2B 9a316933c8e8d0e28eb674c4b5aaa6830a7f1db5aad515d6fd7ac1c649c067d482b367a9fff7e6de0c31bd06b35e915a165a50f9af192ae5440a5cd9cf3207f7 SHA512 19a3c9de354f5c9a88cfe8d6b350878a63b9c0bdc262cf66c9ca2655df3f88a269c78afef7cd89d6f28689989e593ada7221c842e6be1e041a329e37192b57cf
+EBUILD puppetdb-5.2.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-5.2.1.ebuild b/app-admin/puppetdb/puppetdb-5.2.1.ebuild
deleted file mode 100644
index e2e9e4db500f..000000000000
--- a/app-admin/puppetdb/puppetdb-5.2.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.7.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/puppetdb/puppetdb-5.2.4.ebuild b/app-admin/puppetdb/puppetdb-5.2.4.ebuild
index 5c45e1c342fd..e2e9e4db500f 100644
--- a/app-admin/puppetdb/puppetdb-5.2.4.ebuild
+++ b/app-admin/puppetdb/puppetdb-5.2.4.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND+=">=virtual/jdk-1.7.0"
DEPEND+=""
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 5f08f1b6f5b4..3401a893bd96 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,10 +1,8 @@
AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
-DIST puppetserver-5.3.0.tar.gz 66913938 BLAKE2B ed24e0c5a8ad14c2c63f7a88deca6a020121fa53890a68b83f3608081c6480540056d483a00df5c1b0d5a008216f27b5d72efa54d885c55f09b1f40441469b39 SHA512 5f08f0adba257947ec61eae91b7a417e9055510e278e444ce7c88358163b9bb00f2bf02580ace6064e508c43f8b60ca21d12aa3d1525814754e6259791b34bc5
-DIST puppetserver-5.3.1.tar.gz 67239406 BLAKE2B 0aca973ad039d51877926459f935e48cb9ee6ed60792ca67af3a65800fc8fd9de8e6cadd3edc83ac83385f8dfba4f0cd83c9a6db665578f3d1d235ccc00e6547 SHA512 3d618c351299f4cc038682ab43eb4686bd1baf8f88390c8ac41eb3be9fdf8a7a3a501f0ab8713e45bee0ed02d7a9fd1ed1b7252ebb640ee52aa5da638f0b2ce2
DIST puppetserver-5.3.3.tar.gz 67238194 BLAKE2B 0a0b235f26ab15c8f461f6663c26531d3ae469c4467ae33caa98f70d94a02fb89eb0399405be6b1f65f65b2fe4add7a24129f367ae1ab028189d250b087d0915 SHA512 dced3a7b7b3acb8966e4eb6f35aa82c84d0bba81487fa0cffc60fa0751b5d5c633be925471145a3e21b8f74bcffaa74f02310644ecc8bf8ebef0222d967fa86a
DIST puppetserver-5.3.4.tar.gz 67238476 BLAKE2B a92bdf77ffefc7c65c5cfd39431aa6b485bd92c617c4e32a281bfa431fbb428209b8834ef464a521e00d07f3ce0a443fe8a187f3a235c3200531533a1efa242d SHA512 edfa121d64fdbca9a8eef201fe6744e2694141deb318bec64c942bb1ebe6ea61ba1aaa15aee4f4e59913f79247b1c833c6633d3ff121eee836a83ccbaaece900
-EBUILD puppetserver-5.3.0.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
-EBUILD puppetserver-5.3.1.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
+DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c
EBUILD puppetserver-5.3.3.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
-EBUILD puppetserver-5.3.4.ebuild 4890 BLAKE2B 53593fd7c160edd1ec9d8802cdd93dcb00b050721071ab09e41c385f791a3f5a59652e6336d41ef58b0a2a63dada18cd7fa85389a3b7a662f87a7e8c7e3635c3 SHA512 8f6e778ab9e799dc7b1211b4639e32d95e1d693938446a203e1824132e3132788a5d60e884f7a3851cdeb062e3bd0de84f7e8c9ba1fb377bec682e214bffac2e
+EBUILD puppetserver-5.3.4.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
+EBUILD puppetserver-5.3.5.ebuild 4890 BLAKE2B 53593fd7c160edd1ec9d8802cdd93dcb00b050721071ab09e41c385f791a3f5a59652e6336d41ef58b0a2a63dada18cd7fa85389a3b7a662f87a7e8c7e3635c3 SHA512 8f6e778ab9e799dc7b1211b4639e32d95e1d693938446a203e1824132e3132788a5d60e884f7a3851cdeb062e3bd0de84f7e8c9ba1fb377bec682e214bffac2e
MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-5.3.1.ebuild b/app-admin/puppetserver/puppetserver-5.3.1.ebuild
deleted file mode 100644
index 20133466d29d..000000000000
--- a/app-admin/puppetserver/puppetserver-5.3.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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
- doins jruby-9k.jar
- doins jruby-1_7.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/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
- newins ext/build-scripts/gem-list.txt puppetserver-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"
- elog "do"
- elog " java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
- elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-5.3.4.ebuild b/app-admin/puppetserver/puppetserver-5.3.4.ebuild
index 2b6f7873b99e..20133466d29d 100644
--- a/app-admin/puppetserver/puppetserver-5.3.4.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.4.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND+="
>=virtual/jdk-1.8.0
diff --git a/app-admin/puppetserver/puppetserver-5.3.0.ebuild b/app-admin/puppetserver/puppetserver-5.3.5.ebuild
index 20133466d29d..2b6f7873b99e 100644
--- a/app-admin/puppetserver/puppetserver-5.3.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.5.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
RDEPEND+="
>=virtual/jdk-1.8.0
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 5020d88fa5b1..15cc7097321a 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,5 +1,6 @@
AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff848000c3181e590e557413011ebd5db650f79dfad270f6506128ef9971975ec2b26323b18f793bb914759449679bc34f388c SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6
DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
+EBUILD setools-4.1.1-r1.ebuild 1460 BLAKE2B 3f1b952af9d7151a1729106e23f22f1e5c5a863afe6c84124429989ccba5d2e46abbaffac809dfee51b0876332dc70242d971016bd7af4b90ae9b3d903c1a0af SHA512 ea755596d4924c9e959cd37c6815f981af107fdac766285c36148b4dca32a6ec24f1e0688a4589e732b70374ce2f6ab0ff637da11979d13526717b585b89c0d5
EBUILD setools-4.1.1.ebuild 1488 BLAKE2B 462d30b33838dc2c548baff9bb32ca2f978df8a62d5a6e936dfc3bab4dd2522513a90635d64244c6750587cb061380a92a4158bc8e38bddcd2065987463ce9ca SHA512 074263f51282f81cd723ad261c286d46a93a8e13be2fec152adf61a8618685ad43460751d152077d22f395ed854d3362d49c47476ff1fc8b92fe1b62d7351fe5
-EBUILD setools-9999.ebuild 1490 BLAKE2B 1ee40697229d0164b92c75242a8659dd6abef5e0462b9d8154c98f75271a42062bf04cc525a14a4a2a243623f5b5c962c31527928e134f3ba5d2ce7f9bee593c SHA512 d3dd0829d41ed81f927409c0fb1c86077004f58b5853c419b887febe562c36d6dbdc7f9c10d17c286aa6bad71c9a49043050ebb981115242cdad6be3a6200d36
+EBUILD setools-9999.ebuild 1460 BLAKE2B 3f1b952af9d7151a1729106e23f22f1e5c5a863afe6c84124429989ccba5d2e46abbaffac809dfee51b0876332dc70242d971016bd7af4b90ae9b3d903c1a0af SHA512 ea755596d4924c9e959cd37c6815f981af107fdac766285c36148b4dca32a6ec24f1e0688a4589e732b70374ce2f6ab0ff637da11979d13526717b585b89c0d5
MISC metadata.xml 403 BLAKE2B 954bfb344e48933f43c746ed626da3851b9e887b9d1c68541fa97356992c2e80f0626198d2170b431d32489347bb6e5ee46d2577a5d672940892ec5d5fd87e4e SHA512 be645abfaf1149e2f2a9b7f0613b61f015df81a16bc6dde593513aa2ba7b4a9a8fba65520b53a2511ba65c022258f48bcd2aed3f85c273a35c94359e358a8fa6
diff --git a/app-admin/setools/setools-4.1.1-r1.ebuild b/app-admin/setools/setools-4.1.1-r1.ebuild
new file mode 100644
index 000000000000..13b8cb7389c8
--- /dev/null
+++ b/app-admin/setools/setools-4.1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
+else
+ SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="X debug test"
+
+RDEPEND="${PYTHON_DEPS}
+ >=sys-libs/libsepol-2.7:=
+ >=sys-libs/libselinux-2.7:=[${PYTHON_USEDEP}]
+ >=dev-python/networkx-1.8[${PYTHON_USEDEP}]
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ dev-libs/libpcre:=
+ X? (
+ dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+ )"
+
+DEPEND="${RDEPEND}
+ >=dev-lang/swig-2.0.12:0
+ sys-devel/bison
+ sys-devel/flex
+ >=sys-libs/libsepol-2.5
+ test? (
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+ sys-apps/checkpolicy
+ )"
+
+python_prepare_all() {
+ sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+ sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \
+ die "failed to set base_lib_dirs"
+
+ use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ esetup.py test
+}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index d0836619d13f..13b8cb7389c8 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -37,8 +37,7 @@ DEPEND="${RDEPEND}
sys-devel/flex
>=sys-libs/libsepol-2.5
test? (
- python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] )
- dev-python/tox[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
sys-apps/checkpolicy
)"
diff --git a/app-admin/spectre-meltdown-checker/Manifest b/app-admin/spectre-meltdown-checker/Manifest
index 6ab073b6296b..23588a757198 100644
--- a/app-admin/spectre-meltdown-checker/Manifest
+++ b/app-admin/spectre-meltdown-checker/Manifest
@@ -1,6 +1,4 @@
-DIST spectre-meltdown-checker-0.37.tar.gz 40472 BLAKE2B 93d83605c2d410a176d944cbf7c83549cc70075dbd7ef1f90d4a9710d8fdafd0393c0ad6a9a46eba12f753a3b14d486ba093f9b7fb1dd6c08d17042a94f97b44 SHA512 f621e81a783e8e01caae25d76fae6ab7bd091990cd0a0f93de2e29e1964b6f0952c221c64e4e045f26231f800b0ba1b8152aac71a7348e8577ac6b9bd7e31cf2
-DIST spectre-meltdown-checker-0.38.tar.gz 43243 BLAKE2B 84ec661106415fad3a596fb4ff22ef1083837c0903ad3fef13a5516fe606b5b943c3805bd00a75ad8dd069a9d40da9b969f8d19d03e5d4e9274c2bce10da500c SHA512 d71aafdb8507fc035a728b3179943cb63250cb7527a0bbc2d21d3c8c6a70460b980a9549ba1c9c36705eedd65db943a361eeaafa0acdee5c6d4785b2652dfecb
-EBUILD spectre-meltdown-checker-0.37.ebuild 604 BLAKE2B ba0beb4835deaa3f5fcfb7bc077f0f56763e28b64276e85cb74620c6458c7210b5ad028079d922366afae4e481e931137c5634ca2598efba80a01c03a6ef8b25 SHA512 ec885585c8c9d4867b27448db21b121a01c2c0c8eec887a2911a1bfdb560404230e269dcad15d2873470d41ee8943142cb07bde132eebd94df054dd197051903
-EBUILD spectre-meltdown-checker-0.38.ebuild 609 BLAKE2B 36d1843107f84dd5e36b3f3548f64a6d34675ff83709430b7209ce817c362c7608a538439cec26d20c6507b556e822ea6e57ca9cc1260641092c55ed4b1c8005 SHA512 f1464c0b9ea01606833459688a90621b573c40ec598c39ec1bc4e41e48f8a5264345b82212d9332f09792a6cba1314f8bff2e519f982dbaf0a7b59e3b355dbef
+DIST spectre-meltdown-checker-0.39.tar.gz 43785 BLAKE2B c8688b28eac8951b3cf813cd591adc9cb01756a1da149129d2045274bf3d01c56a9145c4dd9154f6229d53a993dd8803e6c0cca866710ba09973f13421be4e6f SHA512 175bc147356e9730fb13f71c66e8826e85e3ad4e0d7f1fbb075f8310e1763f442b3da85fae70f107dcd77172d498fb24857c9e8343cb6813857039d55e9eab6f
+EBUILD spectre-meltdown-checker-0.39.ebuild 609 BLAKE2B 36d1843107f84dd5e36b3f3548f64a6d34675ff83709430b7209ce817c362c7608a538439cec26d20c6507b556e822ea6e57ca9cc1260641092c55ed4b1c8005 SHA512 f1464c0b9ea01606833459688a90621b573c40ec598c39ec1bc4e41e48f8a5264345b82212d9332f09792a6cba1314f8bff2e519f982dbaf0a7b59e3b355dbef
EBUILD spectre-meltdown-checker-9999.ebuild 609 BLAKE2B 36d1843107f84dd5e36b3f3548f64a6d34675ff83709430b7209ce817c362c7608a538439cec26d20c6507b556e822ea6e57ca9cc1260641092c55ed4b1c8005 SHA512 f1464c0b9ea01606833459688a90621b573c40ec598c39ec1bc4e41e48f8a5264345b82212d9332f09792a6cba1314f8bff2e519f982dbaf0a7b59e3b355dbef
MISC metadata.xml 461 BLAKE2B ffd3a0e87b161c95e73d98acfb9ce11068ff5698ad095703e48ff7a95bd9c65379bdfa87ed19f6a1c5e10458cb10042f33e986d58741f8667b49409c1d7083ad SHA512 9e59c70f06c412ef1a742d2edbf62ef5e69e3997e8ba713e61a91dfcdb4a399035e60d9ce6fad43a1568cec658f05d33bc3aaa5fd2efc1cf70eb0f5fd98e1dbc
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.37.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.37.ebuild
deleted file mode 100644
index 5deeeceb4a17..000000000000
--- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.37.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
-else
- SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
-HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-src_install() {
- default
- newbin spectre-meltdown-checker.sh spectre-meltdown-checker
-}
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.38.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.39.ebuild
index efd53926560f..efd53926560f 100644
--- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.38.ebuild
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.39.ebuild
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index d81016729e0a..3daf620dccd9 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,9 +1,9 @@
DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94ca77f7705b23ca6573424796d5c1f8e47e2874c4b54017141d01a632885ac60c92346d932537048373cad0ede SHA512 a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342
-DIST sudo-1.8.24b4.tar.gz 3167803 BLAKE2B 03e4ca426ee000d9a4ae8eb020fa081e0580634f036923cf3107c44dc18be7c5fa82169430c82f2b4d2d6dbe5041a63ecd4f91d6e0cb28cce9a94b1ed48fbc4a SHA512 743adfcc7fd5bfe838dfcd362ffe8daca54964d74318732cfe068e0331aa07feb8b3b9e6a98f4616b49b19f076a43dd62c068b6bde2cb24fa4f2b8657ddc215d
+DIST sudo-1.8.24.tar.gz 3175719 BLAKE2B 61fc469e2d8146b8bb59709192dc33828f0065d4dcf9625e72ae1da9a2c1d6925a0201e5999e146e2e15f5a103ad5690a88fcabb75f57e76b779fe07de53b459 SHA512 ec6295a456a300e81ea2356080d51a57e3eb5d8070d8aab228cece0100ef54954f6c3dd458316b0c2da6839c0d8dab7cdc1a360aceb2594641e064465ecb1ee8
EBUILD sudo-1.8.22-r2.ebuild 5990 BLAKE2B 3e9d5827271f71362f4e3a9664e6f22437764a49fd2c20c79d2e8c211058627bf288b885b65a8a3ca4768460074871d0269c13cddd186605f063bbffa7d39f50 SHA512 a165bdbca3ce48e969bfa9fc2d8d1768343fd3570735ab874237c0a0378fd0b3ec64820586d9040fe4ad19ae91ddad0a62e04626e3c4b38c336a44bce47b7690
EBUILD sudo-1.8.23-r1.ebuild 6154 BLAKE2B ca5c41cb76ca84b961cd1397bcf7914285347a32cc3a0bfe8385b0441e61e1995dc10c80b237cd55690f3f4e030f0c9ce0697b35bd79a37dc040a0de8f7e51d1 SHA512 08c9ca2d25a364a24325af96536996ce297c099e3632a4316467ec8abe5c27578e376607eee94a57c7a4c4ca444db4ca33879af9b745472ffb8766c48aeafa4e
-EBUILD sudo-1.8.23.ebuild 5962 BLAKE2B e65fc8e35531d64bd7ad8bc3954018164359513b54b2868f2215006a4dcc907d1355fec8c1b3327fae57f2642e72e99ed11709281a88579d68c53629bcf5841f SHA512 a83a23a13b892f661bfd467078e2b390d455d2e3228d60e1045a58091724c6939daa063549a66b669b8240d90cf69bb28812d5b9db91ffd34acf17bb005afa4c
-EBUILD sudo-1.8.24_beta4.ebuild 6154 BLAKE2B ca5c41cb76ca84b961cd1397bcf7914285347a32cc3a0bfe8385b0441e61e1995dc10c80b237cd55690f3f4e030f0c9ce0697b35bd79a37dc040a0de8f7e51d1 SHA512 08c9ca2d25a364a24325af96536996ce297c099e3632a4316467ec8abe5c27578e376607eee94a57c7a4c4ca444db4ca33879af9b745472ffb8766c48aeafa4e
-EBUILD sudo-9999.ebuild 6295 BLAKE2B e89dc623a7ada1424bedc74284b9acfa1f377ff4265a88dce4025c82f4cfe8b46a95b2c8c6d81e35b24f3b5f9386debfd1a1999a43c61a569bce7f30055f3138 SHA512 42fdb1275318ed17354ecf4765c5ce1cc4dbcdd2149f007bb48cccb01306f1b779f10ad62be60b4bd680b045d3e59bebe8f4a9cacdc99614f8f60be7a232b7b3
+EBUILD sudo-1.8.23-r2.ebuild 6366 BLAKE2B 54ac988d6be3e7e93dc13a45ada40a627e3ffeff4515d181a18ea9b2ad411d4c2a9e107fe718217668033bedec23e57216d4295d0df12c40ff5871c3ae9f9ec0 SHA512 3e7b3f21c550724a6ed048b0639d2630015c401dbe8c51d31310a26394b1a371ab18e438dc13357ff82b05715443f24f6cb42b1daac7ec5cc9d3776d6cbc96d7
+EBUILD sudo-1.8.24.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
+EBUILD sudo-9999.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/sudo-1.8.24_beta4.ebuild b/app-admin/sudo/sudo-1.8.23-r2.ebuild
index 8e7d28d69bd5..797af1bfd337 100644
--- a/app-admin/sudo/sudo-1.8.24_beta4.ebuild
+++ b/app-admin/sudo/sudo-1.8.23-r2.ebuild
@@ -3,7 +3,11 @@
EAPI=6
-inherit eutils pam multilib libtool
+inherit eutils pam multilib libtool tmpfiles
+if [[ ${PV} == "9999" ]] ; then
+ EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+ inherit mercurial
+fi
MY_P=${P/_/}
MY_P=${MY_P/beta/b}
@@ -15,37 +19,39 @@ esac
DESCRIPTION="Allows users or groups to run commands as other users"
HOMEPAGE="https://www.sudo.ws/"
-SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+if [[ ${PV} != "9999" ]] ; then
+ SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+ if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+ fi
+fi
# Basic license is ISC-style as-is, some files are released under
# 3-clause BSD license
LICENSE="ISC BSD"
SLOT="0"
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
-fi
-IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
+IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey"
CDEPEND="
+ sys-libs/zlib:=
gcrypt? ( dev-libs/libgcrypt:= )
- openssl? ( dev-libs/openssl:0= )
- pam? ( virtual/pam )
- sasl? ( dev-libs/cyrus-sasl )
- skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? (
>=net-nds/openldap-2.1.30-r1
dev-libs/cyrus-sasl
)
- sys-libs/zlib
+ openssl? ( dev-libs/openssl:0= )
+ pam? ( virtual/pam )
+ sasl? ( dev-libs/cyrus-sasl )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
"
RDEPEND="
${CDEPEND}
- selinux? ( sec-policy/selinux-sudo )
- ldap? ( dev-lang/perl )
- pam? ( sys-auth/pambase )
>=app-misc/editor-wrapper-3
virtual/editor
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ selinux? ( sec-policy/selinux-sudo )
sendmail? ( virtual/mta )
"
DEPEND="
@@ -126,10 +132,11 @@ src_configure() {
# basing off other values.
myeconfargs=(
--enable-zlib=system
+ --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
--with-editor="${EPREFIX}"/usr/libexec/editor
--with-env-editor
--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
- --with-rundir="${EPREFIX}"/var/run/sudo
+ --with-rundir="${EPREFIX}"/run/sudo
--with-secure-path="${SECURE_PATH}"
--with-vardir="${EPREFIX}"/var/db/sudo
--without-linux-audit
@@ -179,12 +186,14 @@ src_install() {
fperms 0700 /var/db/sudo/lectured
fperms 0711 /var/db/sudo #652958
- # Don't install into /var/run as that is a tmpfs most of the time
+ # Don't install into /run as that is a tmpfs most of the time
# (bug #504854)
- rm -rf "${ED}"/var/run
+ rm -rf "${ED%/}"/run
}
pkg_postinst() {
+ tmpfiles_process sudo.conf
+
#652958
local sudo_db="${EROOT}/var/db/sudo"
if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
diff --git a/app-admin/sudo/sudo-1.8.23.ebuild b/app-admin/sudo/sudo-1.8.24.ebuild
index b67fefb0afb3..f4ab4527b4fc 100644
--- a/app-admin/sudo/sudo-1.8.23.ebuild
+++ b/app-admin/sudo/sudo-1.8.24.ebuild
@@ -3,7 +3,11 @@
EAPI=6
-inherit eutils pam multilib libtool
+inherit eutils pam multilib libtool tmpfiles
+if [[ ${PV} == "9999" ]] ; then
+ EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+ inherit mercurial
+fi
MY_P=${P/_/}
MY_P=${MY_P/beta/b}
@@ -15,37 +19,39 @@ esac
DESCRIPTION="Allows users or groups to run commands as other users"
HOMEPAGE="https://www.sudo.ws/"
-SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+if [[ ${PV} != "9999" ]] ; then
+ SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+ if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+ fi
+fi
# Basic license is ISC-style as-is, some files are released under
# 3-clause BSD license
LICENSE="ISC BSD"
SLOT="0"
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
-fi
-IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
+IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey"
CDEPEND="
+ sys-libs/zlib:=
gcrypt? ( dev-libs/libgcrypt:= )
- openssl? ( dev-libs/openssl:0= )
- pam? ( virtual/pam )
- sasl? ( dev-libs/cyrus-sasl )
- skey? ( >=sys-auth/skey-1.1.5-r1 )
ldap? (
>=net-nds/openldap-2.1.30-r1
dev-libs/cyrus-sasl
)
- sys-libs/zlib
+ openssl? ( dev-libs/openssl:0= )
+ pam? ( virtual/pam )
+ sasl? ( dev-libs/cyrus-sasl )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
"
RDEPEND="
${CDEPEND}
- selinux? ( sec-policy/selinux-sudo )
- ldap? ( dev-lang/perl )
- pam? ( sys-auth/pambase )
>=app-misc/editor-wrapper-3
virtual/editor
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ selinux? ( sec-policy/selinux-sudo )
sendmail? ( virtual/mta )
"
DEPEND="
@@ -68,16 +74,23 @@ src_prepare() {
elibtoolize
}
-set_rootpath() {
- # FIXME: secure_path is a compile time setting. using ROOTPATH
- # is not perfect, env-update may invalidate this, but until it
+set_secure_path() {
+ # FIXME: secure_path is a compile time setting. using PATH or
+ # ROOTPATH is not perfect, env-update may invalidate this, but until it
# is available as a sudoers setting this will have to do.
einfo "Setting secure_path ..."
# first extract the default ROOTPATH from build env
- ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
- if [[ -z ${ROOTPATH} ]] ; then
- ewarn " Failed to find ROOTPATH, please report this"
+ SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+ echo "${ROOTPATH}")
+ case "${SECURE_PATH}" in
+ */usr/sbin*) ;;
+ *) SECURE_PATH=$(unset PATH;
+ . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+ ;;
+ esac
+ if [[ -z ${SECURE_PATH} ]] ; then
+ ewarn " Failed to detect SECURE_PATH, please report this"
fi
# then remove duplicate path entries
@@ -90,18 +103,18 @@ set_rootpath() {
einfo " Duplicate entry ${thisp} removed..."
fi
done
- ROOTPATH=${newpath#:}
+ SECURE_PATH=${newpath#:}
}
- cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+ cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
# finally, strip gcc paths #136027
rmpath() {
local e newpath thisp IFS=:
- for thisp in ${ROOTPATH} ; do
+ for thisp in ${SECURE_PATH} ; do
for e ; do [[ $thisp == $e ]] && continue 2 ; done
newpath+=:$thisp
done
- ROOTPATH=${newpath#:}
+ SECURE_PATH=${newpath#:}
}
rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
@@ -109,8 +122,8 @@ set_rootpath() {
}
src_configure() {
- local ROOTPATH
- set_rootpath
+ local SECURE_PATH
+ set_secure_path
# audit: somebody got to explain me how I can test this before I
# enable it.. - Diego
@@ -119,11 +132,12 @@ src_configure() {
# basing off other values.
myeconfargs=(
--enable-zlib=system
+ --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
--with-editor="${EPREFIX}"/usr/libexec/editor
--with-env-editor
--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
- --with-rundir="${EPREFIX}"/var/run/sudo
- --with-secure-path="${ROOTPATH}"
+ --with-rundir="${EPREFIX}"/run/sudo
+ --with-secure-path="${SECURE_PATH}"
--with-vardir="${EPREFIX}"/var/db/sudo
--without-linux-audit
--without-opie
@@ -172,12 +186,14 @@ src_install() {
fperms 0700 /var/db/sudo/lectured
fperms 0711 /var/db/sudo #652958
- # Don't install into /var/run as that is a tmpfs most of the time
+ # Don't install into /run as that is a tmpfs most of the time
# (bug #504854)
- rm -rf "${ED}"/var/run
+ rm -rf "${ED%/}"/run
}
pkg_postinst() {
+ tmpfiles_process sudo.conf
+
#652958
local sudo_db="${EROOT}/var/db/sudo"
if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index bfac67e52acd..f4ab4527b4fc 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit eutils pam multilib libtool
+inherit eutils pam multilib libtool tmpfiles
if [[ ${PV} == "9999" ]] ; then
EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
inherit mercurial
@@ -31,15 +31,15 @@ fi
# 3-clause BSD license
LICENSE="ISC BSD"
SLOT="0"
-IUSE="gcrypt ldap nls openssl offensive pam sasl selinux +sendmail skey"
+IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey"
CDEPEND="
- sys-libs/zlib
+ sys-libs/zlib:=
+ gcrypt? ( dev-libs/libgcrypt:= )
ldap? (
>=net-nds/openldap-2.1.30-r1
dev-libs/cyrus-sasl
)
- gcrypt? ( dev-libs/libgcrypt:= )
openssl? ( dev-libs/openssl:0= )
pam? ( virtual/pam )
sasl? ( dev-libs/cyrus-sasl )
@@ -132,10 +132,11 @@ src_configure() {
# basing off other values.
myeconfargs=(
--enable-zlib=system
+ --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
--with-editor="${EPREFIX}"/usr/libexec/editor
--with-env-editor
--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
- --with-rundir="${EPREFIX}"/var/run/sudo
+ --with-rundir="${EPREFIX}"/run/sudo
--with-secure-path="${SECURE_PATH}"
--with-vardir="${EPREFIX}"/var/db/sudo
--without-linux-audit
@@ -185,12 +186,14 @@ src_install() {
fperms 0700 /var/db/sudo/lectured
fperms 0711 /var/db/sudo #652958
- # Don't install into /var/run as that is a tmpfs most of the time
+ # Don't install into /run as that is a tmpfs most of the time
# (bug #504854)
- rm -rf "${ED}"/var/run
+ rm -rf "${ED%/}"/run
}
pkg_postinst() {
+ tmpfiles_process sudo.conf
+
#652958
local sudo_db="${EROOT}/var/db/sudo"
if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
diff --git a/app-admin/tenshi/Manifest b/app-admin/tenshi/Manifest
index 34e0194e9d12..d7a0499d4727 100644
--- a/app-admin/tenshi/Manifest
+++ b/app-admin/tenshi/Manifest
@@ -1,3 +1,3 @@
DIST tenshi-0.17.tar.gz 24597 BLAKE2B 846128e65b1a2d2a3bc5edecc9356069f44d9c13757771ec7fc5c31063d8aeb9403d447dbb088d2aa7d05d3b086ac6c569cd24a05c336225540b3baa10e79bb7 SHA512 2ca93ceaab0843c321fa69d8ba1c7b31eaf809cac4348c98327ddd9ab72df4d5ff00d6b4edeb19a9f02e154161988e0c2284248fd0e84d2b42dd82fdbaac1a78
-EBUILD tenshi-0.17.ebuild 1199 BLAKE2B e7e0499c5659c35fbd2b8662bd543350e06fbf98c4ddbfa6681fe3926949a9ccf4e2a4376ec5390704c95afc95f452481f431516d21ce060cb3d8c59bd7de136 SHA512 c8ebcb56ef759ad01bfe4f9be27b5cdff560e1184b93eac61b6e35f6dbad26dfc942923969a30d00e5b44022955b5eaa74d93aa0ce47b2465d7dbe5b5af972f7
-MISC metadata.xml 464 BLAKE2B 7a6641b592d206396a955c7aef2ce071335c3b937700f8fc5d9aacb1be093b84570afa4702ecb9d9eaec328d2aebf37f260b176d6b8e75921cdf52eff5980dd9 SHA512 db98f1636bb66ec2f345b93d9c52894032f408ae893135bb776394a5e7a1173629f58d8fce1d3b6a77962517067ca5e3859ecf4efb56bdfb950d2450d100c954
+EBUILD tenshi-0.17.ebuild 1234 BLAKE2B ab5758e25d205694a426227b1f48af53365c2e311ffb024dec529f9ba62c9c5cbade36cbaa618234b96e209fa447040a41e1476628123a7c2d9f93ac80a1fa23 SHA512 1e71cddc001b8ba53497a5d69c262e9435f90dc392cd31e3c121795f3b74b77ecd6da909c77d8a50ede7c7beb57ecd4a50558802bce510576dda5c0371b40f97
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/tenshi/metadata.xml b/app-admin/tenshi/metadata.xml
index 1cd4d2b19887..6f49eba8f496 100644
--- a/app-admin/tenshi/metadata.xml
+++ b/app-admin/tenshi/metadata.xml
@@ -1,16 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>bldewolf@cpp.edu</email>
- <name>Brian De Wolf</name>
-</maintainer>
-<maintainer type="person">
- <email>atj@pulsewidth.org.uk</email>
- <name>Adam James</name>
-</maintainer>
-<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-admin/tenshi/tenshi-0.17.ebuild b/app-admin/tenshi/tenshi-0.17.ebuild
index aa5c431f8c84..8ef916bfe1ee 100644
--- a/app-admin/tenshi/tenshi-0.17.ebuild
+++ b/app-admin/tenshi/tenshi-0.17.ebuild
@@ -5,7 +5,7 @@ EAPI=6
inherit user
DESCRIPTION="Log parsing and notification program"
-HOMEPAGE="http://dev.inversepath.com/trac/tenshi"
+HOMEPAGE="https://inversepath.com/tenshi.html https://github.com/inversepath/tenshi"
SRC_URI="https://github.com/inversepath/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"