diff --git a/Manifest.files.gz b/Manifest.files.gz index 4d0d0367e665..99bd62e966aa 100644 Binary files a/Manifest.files.gz and b/Manifest.files.gz differ diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz index a3cab87a65bc..fb81090c2d5d 100644 Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ diff --git a/acct-group/vlock/Manifest b/acct-group/vlock/Manifest new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/acct-group/vlock/metadata.xml b/acct-group/vlock/metadata.xml new file mode 100644 index 000000000000..3cf14bf74636 --- /dev/null +++ b/acct-group/vlock/metadata.xml @@ -0,0 +1,8 @@ + + + + + shell-tools@gentoo.org + Gentoo Shell Tools Project + + diff --git a/acct-group/vlock/vlock-0.ebuild b/acct-group/vlock/vlock-0.ebuild new file mode 100644 index 000000000000..5f73550404af --- /dev/null +++ b/acct-group/vlock/vlock-0.ebuild @@ -0,0 +1,10 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-group + +DESCRIPTION="A group for app-misc/vlock" + +ACCT_GROUP_ID="178" diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz index 5647a92d7e23..323e41fdd2d3 100644 Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ diff --git a/app-accessibility/brltty/brltty-6.1.ebuild b/app-accessibility/brltty/brltty-6.1.ebuild index 4cad408d5772..cff7d7f3322c 100644 --- a/app-accessibility/brltty/brltty-6.1.ebuild +++ b/app-accessibility/brltty/brltty-6.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) FINDLIB_USE="ocaml" JAVA_PKG_WANT_SOURCE="1.8" JAVA_PKG_WANT_TARGET="1.8" diff --git a/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild b/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild index 730368dddfd7..f02fbb87b8fd 100644 --- a/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild +++ b/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,7 +40,7 @@ SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" RESTRICT="strip" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" QA_PREBUILT="/usr/bin/mbrola" diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest index 8a74c31ae4ec..62785f28e3ef 100644 --- a/app-accessibility/orca/Manifest +++ b/app-accessibility/orca/Manifest @@ -1 +1,2 @@ DIST orca-3.36.6.tar.xz 3465112 BLAKE2B 227610b5a01027c292cf9a99ecc54f76ad6053d6923325825ed5f81183b39e1e38e70e7a7d88561f0b0c4d212f16465542d57bf4aeed2fa893b8893fa1d3dd49 SHA512 be2752267d46077310eccc4d76dc5e87ce8e1715cc33ff6f8f15b83c9891a2ba98a2d681f893c88df5b0c5ffd8a1ebadc3a4286debf0ff14ba17803d20f902db +DIST orca-40.0.tar.xz 3603368 BLAKE2B 3ac99f32ee496004e568ce61d5862591556bedfd8dc7ef1b707b62b120f1349ae38bbd427b0d3cc67c7be7334bcc46b067ee44a45c51bcdbdf15ee78c0243f64 SHA512 16e15b1cb4b5a2a3d14ddf9e9277e6b0c65e2ab0a7370fd8bfb830bee9d208ef6b5b3d0c19cc2ff6107f3b0cd41e8ae00881033645f7a309ca3ce65aebd73a1b diff --git a/app-accessibility/orca/orca-40.0.ebuild b/app-accessibility/orca/orca-40.0.ebuild new file mode 100644 index 000000000000..f866c6fab92a --- /dev/null +++ b/app-accessibility/orca/orca-40.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="threads(+)" + +inherit gnome2 python-single-r1 + +DESCRIPTION="Extensible screen reader that provides access to the desktop" +HOMEPAGE="https://wiki.gnome.org/Projects/Orca" + +LICENSE="LGPL-2.1+ CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="+braille" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + >=app-accessibility/at-spi2-atk-2.34:2 + >=app-accessibility/at-spi2-core-2.36:2[introspection] + >=dev-libs/atk-2.36 + >=dev-libs/glib-2.28:2 + media-libs/gstreamer:1.0[introspection] + >=x11-libs/gtk+-3.6.2:3[introspection] + $(python_gen_cond_dep ' + dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/pygobject-3.18:3[${PYTHON_MULTI_USEDEP}] + ') + braille? ( + $(python_gen_cond_dep ' + >=app-accessibility/brltty-5.0-r3[python,${PYTHON_MULTI_USEDEP}] + dev-libs/liblouis[python,${PYTHON_MULTI_USEDEP}] + ') + ) +" +RDEPEND="${DEPEND} + dev-libs/atk[introspection] + $(python_gen_cond_dep ' + >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}] + >=dev-python/pyatspi-2.36[${PYTHON_MULTI_USEDEP}] + dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] + ') + x11-libs/libwnck:3[introspection] + x11-libs/pango[introspection] +" +BDEPEND=" + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" +# app-text/yelp-tools + +src_configure() { + gnome2_src_configure \ + $(use_with braille liblouis) +} + +src_install() { + gnome2_src_install + python_optimize +} diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild index 374ad96d24ce..d12f3352aa29 100644 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild +++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit python-r1 systemd DESCRIPTION="Speech synthesis interface" diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index 1a3bf4754357..793a80bb2971 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index ae8da8a127d7..67022ca9598a 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -1,2 +1 @@ -DIST ansible-2.10.6.tar.gz 29620960 BLAKE2B 4a894eb100b7351e5b9c24e163333fde37fd2f5a0ab34e248e59a0196d81393165796b1b76993c883a08fe378ce12dbbeb289c6146a9b135b42afa831d4d83f7 SHA512 d5d2af728f3f6ff281e078fd4791c7278819d79d6c734f8e9d01fa549f0db25241045456d6aa6e8ccbceab4905039e7431c9db3aaaa89acb01ca599186963e24 DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191 diff --git a/app-admin/ansible/ansible-2.10.6.ebuild b/app-admin/ansible/ansible-2.10.6.ebuild deleted file mode 100644 index 1415a7a67101..000000000000 --- a/app-admin/ansible/ansible-2.10.6.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=bdepend - -inherit distutils-r1 - -DESCRIPTION="Model-driven deployment, config management, and command execution framework" -HOMEPAGE="https://ansible.com/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ansible/ansible.git" - EGIT_BRANCH="devel" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="test" -RESTRICT="test" - -RDEPEND=" - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/httplib2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - net-misc/sshpass - virtual/ssh - app-admin/ansible-base -" -DEPEND=" - >=dev-python/packaging-16.6[${PYTHON_USEDEP}] - app-admin/ansible-base - 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 - )" - -python_compile() { - export ANSIBLE_SKIP_CONFLICT_CHECK=1 - distutils-r1_python_compile -} - -python_test() { - nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die -} diff --git a/app-admin/ansible/ansible-2.10.7.ebuild b/app-admin/ansible/ansible-2.10.7.ebuild index a59b685c5211..c5e15d422cab 100644 --- a/app-admin/ansible/ansible-2.10.7.ebuild +++ b/app-admin/ansible/ansible-2.10.7.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_BRANCH="devel" else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos" fi LICENSE="GPL-3" diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest index 3b60ba0861de..b680770b91b9 100644 --- a/app-admin/consul/Manifest +++ b/app-admin/consul/Manifest @@ -5,8 +5,11 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f02 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip 2721920 BLAKE2B f3fde8f5cc53496dc314bcae822a415cf00950da0a03b968de00685371e7a2e84ffa304fb176e791c85c930728859687e768ff785829f0751ae919546bd3326d SHA512 8981a08b1ba0226854567b0977d8a349abe2b58420421ab1dccdaf9c98e7657cb2140ad1a38767d25cb54249b61f162ecd51d401374a29f7368a550b19196595 DIST consul-1.7.11.tar.gz 22803471 BLAKE2B 05f839d4ca025600d56833534872dc2207b561c0b44643d788baa791b02137cbd7146223145d53697fa20e5ff707a3cfcc01fed993b7d6558b82579919667e6b SHA512 82dab9baef3ff48dd83dd0fd3e7d5d989af8bdd142cf4e169e6de7610bd51d00cce5e76b60e6e6827ec606c2d6d2c1d46ac0502d493b13dd7fc4d42441fc1c79 DIST consul-1.7.12.tar.gz 22804943 BLAKE2B 22e2189e51bbbf5190a22d5cfc0bff899a67cfd6985a0164c6e47f801d1aca6eb548d612f584ba500bfd4d09dfdd406ca4ada79eec8e3602ab450218832da083 SHA512 fca8d80cf8100025652c73bdaa93cd0dcd2af5a3231bcd664b79f8b30c93fdf4b0688cb004764ee0579ca86708585e8f913916df7ef0c5055d9c19d29cedf77a +DIST consul-1.7.14.tar.gz 22795760 BLAKE2B dc99fc3597b4d48d3328097bf79df5e0783459278c443a1c557caec89287b16fd09769a943c5b0364b094c42e646aa66284d2ea6d833501268e926eead46cdb1 SHA512 641f0df322ee337614cf9cf3e6cf6a038923e068651ed1073b6097e5c4650378382fe2deac157e2f1e2762fbe30f0a8f6fc198504676ac2c06ad3bc5aadf156b +DIST consul-1.8.10.tar.gz 28495166 BLAKE2B c5925d794493232095ff0b99a84110070a17e7f04c105b7bb73ba669a5617c64278641b61b87f3f782d045f599c4a8c52620efe0f4ccd5c21613d4cc07cb849b SHA512 941fe63c36c0f6692ddad85992dc11151bb2595d6bdd78230d0c107488aab0493a1562b95f83ff18f728ab05fc57902b1e5835a7f3e784ef0e604731b1e73595 DIST consul-1.8.8.tar.gz 28520274 BLAKE2B 9acb6dd6e33db960f039cf655a5791d439eede2ab09c980de1c2f43a26d0fa19c1ebd9ef30db71644460e5df45d90dc61bfea41a5858b03fa9bb0e3baa0b49eb SHA512 2a9b9537f101821351865dcd295c142db0f02792f5ae722d5013cb35649f9d10b910ddc802a5deae9a9ef4e9ca84e92ce51c372988c1a6b786983d60c4c5050c DIST consul-1.9.3.tar.gz 30367669 BLAKE2B a353499d25a7375bf8c36f80369b8759e5569a1b4ad3e6094827006a8cb7ed35144c2f154c475fbde48be1304e162161fd29fd435196a0497653b8667d953c22 SHA512 449bbff2a66b0e3a45b577d6a79a27af538c1087797eab2014fde7f59bf505e08dfe81841c36509c75d2ca4a0418ddd3b50c64f0371778ac43e69bedb1a2faab +DIST consul-1.9.5.tar.gz 31056039 BLAKE2B 591f8bc8403bd7a71dfb4bfaba4f2e6d112dff90c31c8bf4fe048259bd996216fe02331c1879cff081326f7e283dc9484ac1f6062b8fdf6cb6d743e5193d1ad7 SHA512 1d6c36e773287bbf52df733cf452026a4632c46036665701c82161c851ab1c800659deaacafc708bf9205a2bb26a83ad6ada22cf1ea99cf82db86b5673f08292 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip 16060635 BLAKE2B 6c358031305d8c8245b52bc58ed08cea5cb07c3e80cb3043f369ac6faf893a95d66c31fec38f07fe9029f53239c509bc060cfdebda8ac8d5ae556dfa0d6851e3 SHA512 bfd8f9859e519d6e45f2324e3907f88a1e661ca597f8bb3b7ae772246ba9972e09d0883abc887346fed55928f5d8422cf4212e32377e9900137cd63f0f9a93b8 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e @@ -353,6 +356,8 @@ DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip 14557 BLAKE2B 7b306a1151cda04a778b2606fbd7e5257a80da359ee6f02374bcf7199f16e3513be56c706d8af2fe2e683c46b80f9680e6831f0e022f3c8dbc5e0c16020d7a72 SHA512 96125081b3fe8233d3c2885c52cbd46c7091f4dbe7ff3e542f934c21c75f498b6bbb89200f9ed27dcc572b16dcb31bd400bb4d74b4e75e171c565ce7c1ecb3cd DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.3.mod 138 BLAKE2B 2a2a4f66f7beaeebc4fd09c010c1070dffaa86c881b1341259841a883b95b10616af9495a6c53fe7a726fd6e62ef6cafa2ed15c24a5a1d9491bffc76938c69b5 SHA512 eed5b88b29d831010236dde8569d3eb79d0c21cddc92ba6db576eac4100eff994f65df9e0a55cd4c71b30150e88db90a8b4be4d243aef67b0fdf0abc84557336 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.3.zip 14927 BLAKE2B 4fbeb6d31ee733b7c3cff2a48af43b4799b3f210c8f69a7318c1f5bb0df9ae1b4118d246ebc2f0615e786ac67dff22f33317e77232e2256282c2f19eb538076e SHA512 537bc4fb3b398efed9878a4155d988a896c298cd08b74e6c9bc6418d01abb8163b98b6868feb2adb2d481b86e2dacbdd7c23ca0e6a08dd8a76ca62f7c8586f39 +DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.mod 138 BLAKE2B d85f4eef3c91522fbdc57eb29bb343cbe7b478c1b7980160daa93c9171bacd92be319ea0bf49981d0ee77868ed4be6a78020768fd61aa5e24332d8eadff15c1f SHA512 501d255124e6f43485d797cabcd3943993165d31e7fa2058667bac5c2a3c6492d9bc5881573b68d6da0dad4329eeea02141430a6c24e81045c7636bedc1d161f +DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.4.zip 14742 BLAKE2B e124179ca8fd3e17b471858642cb22b841d2c370cd17758bb8725b2a54641a916190f98a2e355b7233317efe1bfec474c7ccf23d853e44fbf683fc2cebc6608d SHA512 6cf9bc0a7851e19ef082b25c377e9b20791bb6a7f2091bc49eff12fd2fff5a698a1cdcda8a9f5b02bf536a372f00119bf6aa3c42f07370927a41b6fc4a42c401 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541b55472ef94a8d2606e9cccc82fc52d189e48bd94aef69871455088915595bcc21224ef7728750ac1ba8e3caef7c303446671416f71b74d03de647a3f23 SHA512 13275b8246248b1c3001acba9ea6178a10263fb8ff3cc205d2cccb86682eccad96695bac455a32f2407f7fbd9a4bc3b68cacab722bcc242c606248753efba3d1 DIST github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod 47 BLAKE2B 67dc6ab625743aeecd408ea7bf04f70243ffb0a997cfc49206db31f0de98b3a30ef06afcc69726d771512585ea9f855bd42306de4a15ae99c07f49138cb79c20 SHA512 d1ab435b05bfa15b854c2ad3ead3678f0671f79fe9ec7d1352122438e62e40fcae32501a0f539f10747cc8762e8d94c0535d176f89c626c650beacb9c4f82f49 @@ -463,6 +468,8 @@ DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip 214127 BLAKE2B 305af1bdb26a0109 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.zip 224434 BLAKE2B 7719d75840f11f1c547a91228ea7472b1774560966f9b456aaa3c19095e9bfc51c4e8655aa0a0a02590a52f0b06c2ad6ce3c0994d23d64f5a324539d7a98eb0d SHA512 d60802ce85252ea35f932efa2c04e10ab19bb94d56e6e7c84b1c41b9a43124b9b9e082f0eaa1ac7c903f31d70da9b8bb1f537edc71c0dfb19626226860d52a4f +DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.mod 210 BLAKE2B 1f8fa2bba38f34095585872959f404b3a82f4ccf4d7665f86fa573ad62634420ac4efc8e5eb99f3a44bd6cb7aafaef7b6f4e4202fc956e36eda54d1500493702 SHA512 b4eb091abe317866a323b709143ab9c8c806ec52d14a05f6765e6be4ab33bf1bf8c5977530e017a72d668cffc8878f93f7ad89bf9241817fbf8789452e66e544 +DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.41.zip 235845 BLAKE2B 6e927f0d5a67ef81c17db697f4b0e2a804c7699aec395229899d4f7b8a7dac9dd2e062cffa7bb0e457e9be1276e709e79bcbd9165d762211e8d2a11a63a6d446 SHA512 536fbe2a387bb4f771762a6575d2dcdd970568fb7f2f3b8495abd4f0cfc5edb3efc3f058aa162948a6f33d91066257832749a72c212513b1f7cf13a704072ca7 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def5f031ec58ce255227d2d17c80e0ebe028218e3022bb7c5b2cb831981a3247279a5405f36a061e7f0ec717f7d71ae96f33b56d20d0dbea520 SHA512 743b2f950677b8d24423a2491cfd67edcfb45d032e6995a743ebb1f3d6ec6f407f2e4d1d56b2bd14cbe4c519523ee83470f3e594f2da6e0b3fe7c2dfbad9c961 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip 30608 BLAKE2B 68db36e6420be62aa1594d415cc95da064c3f80e220891bc747ab61d1bada168fa8c33875bb8f5a1b3cbfcae6b9f48cc28fd792b884f7378b797f5f7445c268a SHA512 41d05b304a7325dbb01dc2704407f5a7c7f7c1255c58cfde66b1d9668b15e1b5e83b5159b25a6ad7d6fed90e64446b32c1633135a018bbb4357c495e3efc8a83 @@ -720,6 +727,9 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod 181 BLAK DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip 1505530 BLAKE2B b26f3f943953ecb17996f44c0e8278b56c7d01648227cc0b73cbb17e9fc44b40bbbac34ac4996fb88115a6451178d3c94f4c17a43cedd30f9c147312fd7e04ce SHA512 7b36db6f767f03d0a14ee599c6d1bcc7cf5cb8df69b9dd46d7544aac59ff6aa1bdf38af0f3f31328f02b7643f7655b375f8116f829b22993ae49951ab28cbef9 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200930145003-4acb6c075d10.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200930145003-4acb6c075d10.zip 1504583 BLAKE2B 053f287d785b3bf1bb908bd2e43c1891e2947c28a705f441b50657d40ee2889d121c81704aa14a73a9af36b616b2b22a3e59f3ceb8ea3a1e73979d61cafd81cb SHA512 c20133e196db03e0cdd5d7f770cc011b8cf29d8ddcd39a27d44586f7fd080bb17224d1d0736792c51d9dc6f8f11b13cd8bc07cf95fbe1c8f11095653b9633585 +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146 +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.mod 179 BLAKE2B 1d41797e9cd238f294cd4d01f3115a496d72952d4aa92116e99de7fef6d5881b8e532e4c419c36dbd58a04e4cfd27c814936e5b51ca99f47c9bee8578eb9d71e SHA512 ea5604f4e47cf196e4ab474016327b04c27aab3ef394d19f15a0a34d763f659c1764dea0554de8afbc9ec28168681f1ea1e03a6ef64fc1355f0e0d7c4ef709a1 +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210410081132-afb366fc7cd1.zip 1565732 BLAKE2B b9900aab23b1d046cbe8cfd1743c7759b3f3f9f4b949c31aa21c372200ecb9b1203e6b5a87190b78946e9f7679692d2fb2dae629ce364e7f39d3ebec8472960f SHA512 c91659717675053c6ba6cd022cd62ddc905cdfc61e271396c93fccad8063605399539c4b7695713a45a6e2e42c74a2e36e1bf7c992e84140da6835fc2209f4fc DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip 81780 BLAKE2B 48e9b7ec89ad3f9cec88fe6c62ce64348a9217a134aab7306a07fd8cb28eeff91b15cf6f59ffec36df23a086195322f28e76fc16c026f33d2f419dcd3f84de04 SHA512 c7656f3c10140a5cb08620ce0647d0b2026272ec41bcd9df346dd2b5de5bd2236835ea117091646151a991f8f3aeeebd0cdfc1f784015d140162db5dc49f7325 @@ -736,6 +746,8 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAK DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip 27020 BLAKE2B 0ba91b5129426896f009357980019a5e1c4cd5568108e615346a2d65421a6a595035069e6366d98af40260a020f90f6b55214e273a7dc92a80d3faee540bc0d0 SHA512 a9408e27c31248e5e6b24c0f255512c97e73e0a972a94e0bf0b0181eae42c1213e02e6988a71178abb05c2624da2e6b7beb12f2a494b630753a083dc3133b58d +DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 +DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip 28693 BLAKE2B 3d6a34fa6da642f5ca71c930bd69a41439013f20ee60dde5d4dfab4bf688f1edb150a0477cb006670424c6c59e90d4bac9e5eb34f9fb4c518d903dfd26fb6cb7 SHA512 48b983589bd682ff9275c47733ec73637ebb5e58e1bca0c7744101229237d5cb34170efab63db0061aec857052cce9ef03c3497702b90a86287e6be88e1b33aa DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c @@ -773,6 +785,11 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.mod 33 BLAKE DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201007082116-8445cc04cbdf.zip 1490646 BLAKE2B 5114099217e143e032f735ca97dec7aa76515d49d08fdc2058612f1d8aaa0d4500c077c9df6521e94b84edf50983fc146ff5363a0811d4b60aba5145ed8f036e SHA512 0e1627eaa50ccfada08460b02929f5c2c91945a4082b2f2a9c70060d40dfca25d87bc2b056380960158226ea892f5f885bb012e686ff9177d57426486df34def DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.zip 1496293 BLAKE2B 5e4cd198d7a461db0dff9b387afd229472214ab6d204c4d55c6bf36ee851a07cd73b61a249603d7f1e7d917097bd9e118ff78b94f45f9d15834ba5b6df897c58 SHA512 167e2b6faac57e06c420b9c7bb7d16db9c30811337176488893807e5ff88aa0b24e90e1ec10ab6e282f1b4fa2e91f2e3d72d12b276da8a85bcf29b7e2df4e25d +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210303074136-134d130e1a04.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.zip 1668274 BLAKE2B 645747d7f0335ab88c1619a25ce393c5b2b41f5f44385be6b5b46fcaafd6ddce02a43d09d9895b72f33200a97fc2fbf4ba9e1278efa4d479d676d1b968ba4b94 SHA512 ae86b110902a7b6aca121458220b84077d1ee17666b5e89ecd3e7e5bfb6a1cc1ec5d062078426b108aaeb3eb5fed6b9cdcf5cf25c333aecbcc2288dff9d23a74 +DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d @@ -781,6 +798,8 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ec DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f +DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b +DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 diff --git a/app-admin/consul/consul-1.7.14.ebuild b/app-admin/consul/consul-1.7.14.ebuild new file mode 100644 index 000000000000..a61c40aeee1e --- /dev/null +++ b/app-admin/consul/consul-1.7.14.ebuild @@ -0,0 +1,586 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module systemd + +DESCRIPTION="A tool for service discovery, monitoring and configuration" +HOMEPAGE="https://www.consul.io" + +# Upstream doesn't use "-mod=vendor" in their build system, and the +# vendor directory is incomplete. +# On the next bump, remove this if they have added "-mod=vendor" +EGO_SUM=( +"cloud.google.com/go v0.26.0" +"cloud.google.com/go v0.26.0/go.mod" +"github.com/Azure/azure-sdk-for-go v16.0.0+incompatible" +"github.com/Azure/azure-sdk-for-go v16.0.0+incompatible/go.mod" +"github.com/Azure/go-autorest v10.7.0+incompatible/go.mod" +"github.com/Azure/go-autorest v10.15.3+incompatible" +"github.com/Azure/go-autorest v10.15.3+incompatible/go.mod" +"github.com/BurntSushi/toml v0.3.1/go.mod" +"github.com/DataDog/datadog-go v2.2.0+incompatible" +"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod" +"github.com/DataDog/datadog-go v3.2.0+incompatible" +"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod" +"github.com/Microsoft/go-winio v0.4.3" +"github.com/Microsoft/go-winio v0.4.3/go.mod" +"github.com/NYTimes/gziphandler v1.0.1" +"github.com/NYTimes/gziphandler v1.0.1/go.mod" +"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6" +"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod" +"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af" +"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod" +"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" +"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod" +"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" +"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod" +"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e" +"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod" +"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da" +"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod" +"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878" +"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod" +"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310" +"github.com/armon/go-metrics v0.3.4" +"github.com/armon/go-metrics v0.3.4/go.mod" +"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod" +"github.com/armon/go-radix v1.0.0" +"github.com/armon/go-radix v1.0.0/go.mod" +"github.com/aws/aws-sdk-go v1.25.41" +"github.com/aws/aws-sdk-go v1.25.41/go.mod" +"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973" +"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" +"github.com/beorn7/perks v1.0.0/go.mod" +"github.com/beorn7/perks v1.0.1" +"github.com/beorn7/perks v1.0.1/go.mod" +"github.com/bgentry/speakeasy v0.1.0" +"github.com/bgentry/speakeasy v0.1.0/go.mod" +"github.com/boltdb/bolt v1.3.1" +"github.com/boltdb/bolt v1.3.1/go.mod" +"github.com/census-instrumentation/opencensus-proto v0.2.1" +"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod" +"github.com/cespare/xxhash/v2 v2.1.1" +"github.com/cespare/xxhash/v2 v2.1.1/go.mod" +"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible" +"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod" +"github.com/circonus-labs/circonusllhist v0.1.3" +"github.com/circonus-labs/circonusllhist v0.1.3/go.mod" +"github.com/client9/misspell v0.3.4/go.mod" +"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533" +"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod" +"github.com/coredns/coredns v1.1.2" +"github.com/coredns/coredns v1.1.2/go.mod" +"github.com/davecgh/go-spew v1.1.0/go.mod" +"github.com/davecgh/go-spew v1.1.1" +"github.com/davecgh/go-spew v1.1.1/go.mod" +"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661" +"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod" +"github.com/dgrijalva/jwt-go v3.2.0+incompatible" +"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" +"github.com/digitalocean/godo v1.1.1" +"github.com/digitalocean/godo v1.1.1/go.mod" +"github.com/digitalocean/godo v1.10.0" +"github.com/digitalocean/godo v1.10.0/go.mod" +"github.com/dimchansky/utfbom v1.1.0" +"github.com/dimchansky/utfbom v1.1.0/go.mod" +"github.com/dnaeon/go-vcr v1.0.1" +"github.com/dnaeon/go-vcr v1.0.1/go.mod" +"github.com/docker/go-connections v0.3.0" +"github.com/docker/go-connections v0.3.0/go.mod" +"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0" +"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod" +"github.com/envoyproxy/go-control-plane v0.9.0/go.mod" +"github.com/envoyproxy/go-control-plane v0.9.5" +"github.com/envoyproxy/go-control-plane v0.9.5/go.mod" +"github.com/envoyproxy/protoc-gen-validate v0.1.0" +"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod" +"github.com/fatih/color v1.7.0" +"github.com/fatih/color v1.7.0/go.mod" +"github.com/fatih/color v1.9.0" +"github.com/fatih/color v1.9.0/go.mod" +"github.com/fatih/structs v1.1.0/go.mod" +"github.com/fsnotify/fsnotify v1.4.7" +"github.com/fsnotify/fsnotify v1.4.7/go.mod" +"github.com/ghodss/yaml v1.0.0" +"github.com/ghodss/yaml v1.0.0/go.mod" +"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod" +"github.com/go-kit/kit v0.8.0/go.mod" +"github.com/go-kit/kit v0.9.0/go.mod" +"github.com/go-ldap/ldap v3.0.2+incompatible" +"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod" +"github.com/go-logfmt/logfmt v0.3.0/go.mod" +"github.com/go-logfmt/logfmt v0.4.0/go.mod" +"github.com/go-ole/go-ole v1.2.1" +"github.com/go-ole/go-ole v1.2.1/go.mod" +"github.com/go-stack/stack v1.8.0/go.mod" +"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod" +"github.com/go-test/deep v1.0.2" +"github.com/go-test/deep v1.0.2/go.mod" +"github.com/gogo/protobuf v1.1.1" +"github.com/gogo/protobuf v1.1.1/go.mod" +"github.com/gogo/protobuf v1.2.1" +"github.com/gogo/protobuf v1.2.1/go.mod" +"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b" +"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" +"github.com/golang/mock v1.1.1" +"github.com/golang/mock v1.1.1/go.mod" +"github.com/golang/protobuf v1.2.0" +"github.com/golang/protobuf v1.2.0/go.mod" +"github.com/golang/protobuf v1.3.1" +"github.com/golang/protobuf v1.3.1/go.mod" +"github.com/golang/protobuf v1.3.2" +"github.com/golang/protobuf v1.3.2/go.mod" +"github.com/golang/snappy v0.0.1" +"github.com/golang/snappy v0.0.1/go.mod" +"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c" +"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" +"github.com/google/go-cmp v0.2.0" +"github.com/google/go-cmp v0.2.0/go.mod" +"github.com/google/go-cmp v0.3.1/go.mod" +"github.com/google/go-cmp v0.4.0" +"github.com/google/go-cmp v0.4.0/go.mod" +"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135" +"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod" +"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf" +"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod" +"github.com/google/gofuzz v1.0.0" +"github.com/google/gofuzz v1.0.0/go.mod" +"github.com/googleapis/gnostic v0.2.0" +"github.com/googleapis/gnostic v0.2.0/go.mod" +"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca" +"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca/go.mod" +"github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c" +"github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod" +"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7" +"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod" +"github.com/hashicorp/errwrap v1.0.0" +"github.com/hashicorp/errwrap v1.0.0/go.mod" +"github.com/hashicorp/go-bexpr v0.1.2" +"github.com/hashicorp/go-bexpr v0.1.2/go.mod" +"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de" +"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod" +"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod" +"github.com/hashicorp/go-cleanhttp v0.5.1" +"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod" +"github.com/hashicorp/go-connlimit v0.2.0" +"github.com/hashicorp/go-connlimit v0.2.0/go.mod" +"github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2" +"github.com/hashicorp/go-discover v0.0.0-20191202160150-7ec2cfbda7a2/go.mod" +"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod" +"github.com/hashicorp/go-hclog v0.8.0/go.mod" +"github.com/hashicorp/go-hclog v0.9.1" +"github.com/hashicorp/go-hclog v0.9.1/go.mod" +"github.com/hashicorp/go-hclog v0.12.0" +"github.com/hashicorp/go-hclog v0.12.0/go.mod" +"github.com/hashicorp/go-immutable-radix v1.0.0" +"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod" +"github.com/hashicorp/go-immutable-radix v1.1.0" +"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod" +"github.com/hashicorp/go-immutable-radix v1.2.0" +"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod" +"github.com/hashicorp/go-memdb v1.0.3" +"github.com/hashicorp/go-memdb v1.0.3/go.mod" +"github.com/hashicorp/go-msgpack v0.5.3/go.mod" +"github.com/hashicorp/go-msgpack v0.5.5" +"github.com/hashicorp/go-msgpack v0.5.5/go.mod" +"github.com/hashicorp/go-multierror v1.0.0" +"github.com/hashicorp/go-multierror v1.0.0/go.mod" +"github.com/hashicorp/go-multierror v1.1.0" +"github.com/hashicorp/go-multierror v1.1.0/go.mod" +"github.com/hashicorp/go-plugin v1.0.1/go.mod" +"github.com/hashicorp/go-raftchunking v0.6.1" +"github.com/hashicorp/go-raftchunking v0.6.1/go.mod" +"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod" +"github.com/hashicorp/go-retryablehttp v0.5.4" +"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod" +"github.com/hashicorp/go-rootcerts v1.0.1/go.mod" +"github.com/hashicorp/go-rootcerts v1.0.2" +"github.com/hashicorp/go-rootcerts v1.0.2/go.mod" +"github.com/hashicorp/go-sockaddr v1.0.0/go.mod" +"github.com/hashicorp/go-sockaddr v1.0.2" +"github.com/hashicorp/go-sockaddr v1.0.2/go.mod" +"github.com/hashicorp/go-syslog v1.0.0" +"github.com/hashicorp/go-syslog v1.0.0/go.mod" +"github.com/hashicorp/go-uuid v1.0.0/go.mod" +"github.com/hashicorp/go-uuid v1.0.1" +"github.com/hashicorp/go-uuid v1.0.1/go.mod" +"github.com/hashicorp/go-version v1.1.0" +"github.com/hashicorp/go-version v1.1.0/go.mod" +"github.com/hashicorp/go.net v0.0.1/go.mod" +"github.com/hashicorp/golang-lru v0.5.0/go.mod" +"github.com/hashicorp/golang-lru v0.5.1" +"github.com/hashicorp/golang-lru v0.5.1/go.mod" +"github.com/hashicorp/golang-lru v0.5.4" +"github.com/hashicorp/golang-lru v0.5.4/go.mod" +"github.com/hashicorp/hcl v1.0.0" +"github.com/hashicorp/hcl v1.0.0/go.mod" +"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5" +"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod" +"github.com/hashicorp/logutils v1.0.0/go.mod" +"github.com/hashicorp/mdns v1.0.0/go.mod" +"github.com/hashicorp/mdns v1.0.1" +"github.com/hashicorp/mdns v1.0.1/go.mod" +"github.com/hashicorp/memberlist v0.2.2" +"github.com/hashicorp/memberlist v0.2.2/go.mod" +"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69" +"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod" +"github.com/hashicorp/raft v1.1.1/go.mod" +"github.com/hashicorp/raft v1.1.2" +"github.com/hashicorp/raft v1.1.2/go.mod" +"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea" +"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod" +"github.com/hashicorp/serf v0.9.3" +"github.com/hashicorp/serf v0.9.3/go.mod" +"github.com/hashicorp/vault/api v1.0.4" +"github.com/hashicorp/vault/api v1.0.4/go.mod" +"github.com/hashicorp/vault/sdk v0.1.13" +"github.com/hashicorp/vault/sdk v0.1.13/go.mod" +"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443" +"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod" +"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod" +"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d" +"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod" +"github.com/hpcloud/tail v1.0.0" +"github.com/hpcloud/tail v1.0.0/go.mod" +"github.com/imdario/mergo v0.3.6" +"github.com/imdario/mergo v0.3.6/go.mod" +"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da" +"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod" +"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af" +"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod" +"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62" +"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod" +"github.com/json-iterator/go v1.1.5" +"github.com/json-iterator/go v1.1.5/go.mod" +"github.com/json-iterator/go v1.1.6/go.mod" +"github.com/json-iterator/go v1.1.9" +"github.com/json-iterator/go v1.1.9/go.mod" +"github.com/jtolds/gls v4.2.1+incompatible/go.mod" +"github.com/julienschmidt/httprouter v1.2.0/go.mod" +"github.com/kisielk/errcheck v1.1.0/go.mod" +"github.com/kisielk/gotool v1.0.0/go.mod" +"github.com/konsorten/go-windows-terminal-sequences v1.0.1" +"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" +"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod" +"github.com/kr/pretty v0.1.0/go.mod" +"github.com/kr/pretty v0.2.0" +"github.com/kr/pretty v0.2.0/go.mod" +"github.com/kr/pty v1.1.1/go.mod" +"github.com/kr/text v0.1.0" +"github.com/kr/text v0.1.0/go.mod" +"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod" +"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod" +"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod" +"github.com/likexian/gokit v0.20.16/go.mod" +"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod" +"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod" +"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod" +"github.com/linode/linodego v0.7.1" +"github.com/linode/linodego v0.7.1/go.mod" +"github.com/mattn/go-colorable v0.0.9/go.mod" +"github.com/mattn/go-colorable v0.1.4/go.mod" +"github.com/mattn/go-colorable v0.1.6" +"github.com/mattn/go-colorable v0.1.6/go.mod" +"github.com/mattn/go-isatty v0.0.3/go.mod" +"github.com/mattn/go-isatty v0.0.8/go.mod" +"github.com/mattn/go-isatty v0.0.10/go.mod" +"github.com/mattn/go-isatty v0.0.11/go.mod" +"github.com/mattn/go-isatty v0.0.12" +"github.com/mattn/go-isatty v0.0.12/go.mod" +"github.com/matttproud/golang_protobuf_extensions v1.0.1" +"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" +"github.com/miekg/dns v1.0.14/go.mod" +"github.com/miekg/dns v1.1.26" +"github.com/miekg/dns v1.1.26/go.mod" +"github.com/mitchellh/cli v1.0.0/go.mod" +"github.com/mitchellh/cli v1.1.0" +"github.com/mitchellh/cli v1.1.0/go.mod" +"github.com/mitchellh/copystructure v1.0.0" +"github.com/mitchellh/copystructure v1.0.0/go.mod" +"github.com/mitchellh/go-homedir v1.0.0/go.mod" +"github.com/mitchellh/go-homedir v1.1.0" +"github.com/mitchellh/go-homedir v1.1.0/go.mod" +"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod" +"github.com/mitchellh/go-testing-interface v1.0.0" +"github.com/mitchellh/go-testing-interface v1.0.0/go.mod" +"github.com/mitchellh/go-testing-interface v1.0.3" +"github.com/mitchellh/go-testing-interface v1.0.3/go.mod" +"github.com/mitchellh/go-wordwrap v1.0.0/go.mod" +"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452" +"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod" +"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod" +"github.com/mitchellh/mapstructure v1.1.2/go.mod" +"github.com/mitchellh/mapstructure v1.2.3" +"github.com/mitchellh/mapstructure v1.2.3/go.mod" +"github.com/mitchellh/reflectwalk v1.0.0/go.mod" +"github.com/mitchellh/reflectwalk v1.0.1" +"github.com/mitchellh/reflectwalk v1.0.1/go.mod" +"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" +"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd" +"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" +"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" +"github.com/modern-go/reflect2 v1.0.1" +"github.com/modern-go/reflect2 v1.0.1/go.mod" +"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod" +"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2" +"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod" +"github.com/oklog/run v1.0.0/go.mod" +"github.com/onsi/ginkgo v1.6.0" +"github.com/onsi/ginkgo v1.6.0/go.mod" +"github.com/onsi/gomega v1.4.1/go.mod" +"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c" +"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod" +"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod" +"github.com/pascaldekloe/goe v0.1.0" +"github.com/pascaldekloe/goe v0.1.0/go.mod" +"github.com/peterbourgon/diskv v2.0.1+incompatible" +"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod" +"github.com/pierrec/lz4 v2.0.5+incompatible" +"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod" +"github.com/pkg/errors v0.8.0/go.mod" +"github.com/pkg/errors v0.8.1" +"github.com/pkg/errors v0.8.1/go.mod" +"github.com/pmezard/go-difflib v1.0.0" +"github.com/pmezard/go-difflib v1.0.0/go.mod" +"github.com/posener/complete v1.1.1/go.mod" +"github.com/posener/complete v1.2.3" +"github.com/posener/complete v1.2.3/go.mod" +"github.com/prometheus/client_golang v0.9.1/go.mod" +"github.com/prometheus/client_golang v0.9.2" +"github.com/prometheus/client_golang v0.9.2/go.mod" +"github.com/prometheus/client_golang v1.0.0/go.mod" +"github.com/prometheus/client_golang v1.4.0" +"github.com/prometheus/client_golang v1.4.0/go.mod" +"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910" +"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" +"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod" +"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4" +"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod" +"github.com/prometheus/client_model v0.2.0" +"github.com/prometheus/client_model v0.2.0/go.mod" +"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275" +"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod" +"github.com/prometheus/common v0.4.1/go.mod" +"github.com/prometheus/common v0.9.1" +"github.com/prometheus/common v0.9.1/go.mod" +"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod" +"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a" +"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod" +"github.com/prometheus/procfs v0.0.2/go.mod" +"github.com/prometheus/procfs v0.0.8" +"github.com/prometheus/procfs v0.0.8/go.mod" +"github.com/rboyer/safeio v0.2.1" +"github.com/rboyer/safeio v0.2.1/go.mod" +"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03" +"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod" +"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod" +"github.com/ryanuber/columnize v2.1.0+incompatible" +"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod" +"github.com/ryanuber/go-glob v1.0.0" +"github.com/ryanuber/go-glob v1.0.0/go.mod" +"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529" +"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod" +"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880" +"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod" +"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4" +"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod" +"github.com/sirupsen/logrus v1.0.6" +"github.com/sirupsen/logrus v1.0.6/go.mod" +"github.com/sirupsen/logrus v1.2.0/go.mod" +"github.com/sirupsen/logrus v1.4.2" +"github.com/sirupsen/logrus v1.4.2/go.mod" +"github.com/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf/go.mod" +"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod" +"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d" +"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod" +"github.com/spf13/pflag v1.0.2/go.mod" +"github.com/spf13/pflag v1.0.3" +"github.com/spf13/pflag v1.0.3/go.mod" +"github.com/stretchr/objx v0.1.0/go.mod" +"github.com/stretchr/objx v0.1.1" +"github.com/stretchr/objx v0.1.1/go.mod" +"github.com/stretchr/testify v1.2.2/go.mod" +"github.com/stretchr/testify v1.3.0/go.mod" +"github.com/stretchr/testify v1.4.0" +"github.com/stretchr/testify v1.4.0/go.mod" +"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible" +"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod" +"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod" +"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926" +"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod" +"github.com/vmware/govmomi v0.18.0" +"github.com/vmware/govmomi v0.18.0/go.mod" +"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod" +"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod" +"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" +"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod" +"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4" +"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4/go.mod" +"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" +"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" +"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" +"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" +"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" +"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" +"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod" +"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod" +"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod" +"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod" +"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod" +"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" +"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" +"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod" +"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" +"golang.org/x/net v0.0.0-20190923162816-aa69164e4478" +"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod" +"golang.org/x/oauth2 v0.0.0-20170807180024-9a379c6b3e95/go.mod" +"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be" +"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" +"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" +"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" +"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" +"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" +"golang.org/x/sync v0.0.0-20190423024810-112230192c58" +"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" +"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e" +"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" +"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod" +"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" +"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" +"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod" +"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod" +"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod" +"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" +"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod" +"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod" +"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" +"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" +"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod" +"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod" +"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod" +"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod" +"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" +"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" +"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod" +"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod" +"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae" +"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod" +"golang.org/x/text v0.3.0/go.mod" +"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod" +"golang.org/x/text v0.3.2" +"golang.org/x/text v0.3.2/go.mod" +"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod" +"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4" +"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" +"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod" +"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" +"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" +"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" +"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" +"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" +"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod" +"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" +"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543" +"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" +"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9" +"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod" +"google.golang.org/appengine v1.1.0/go.mod" +"google.golang.org/appengine v1.4.0" +"google.golang.org/appengine v1.4.0/go.mod" +"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" +"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107" +"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod" +"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55" +"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" +"google.golang.org/grpc v1.14.0/go.mod" +"google.golang.org/grpc v1.19.0/go.mod" +"google.golang.org/grpc v1.22.0/go.mod" +"google.golang.org/grpc v1.23.0" +"google.golang.org/grpc v1.23.0/go.mod" +"google.golang.org/grpc v1.25.1" +"google.golang.org/grpc v1.25.1/go.mod" +"gopkg.in/airbrake/gobrake.v2 v2.0.9" +"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod" +"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" +"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod" +"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" +"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" +"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" +"gopkg.in/fsnotify.v1 v1.4.7" +"gopkg.in/fsnotify.v1 v1.4.7/go.mod" +"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2" +"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod" +"gopkg.in/inf.v0 v0.9.1" +"gopkg.in/inf.v0 v0.9.1/go.mod" +"gopkg.in/resty.v1 v1.12.0" +"gopkg.in/resty.v1 v1.12.0/go.mod" +"gopkg.in/square/go-jose.v2 v2.3.1" +"gopkg.in/square/go-jose.v2 v2.3.1/go.mod" +"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7" +"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" +"gopkg.in/yaml.v2 v2.2.1/go.mod" +"gopkg.in/yaml.v2 v2.2.2/go.mod" +"gopkg.in/yaml.v2 v2.2.4/go.mod" +"gopkg.in/yaml.v2 v2.2.5/go.mod" +"gopkg.in/yaml.v2 v2.2.8" +"gopkg.in/yaml.v2 v2.2.8/go.mod" +"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" +"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" +"k8s.io/api v0.0.0-20180806132203-61b11ee65332/go.mod" +"k8s.io/api v0.0.0-20190325185214-7544f9db76f6" +"k8s.io/api v0.0.0-20190325185214-7544f9db76f6/go.mod" +"k8s.io/apimachinery v0.0.0-20180821005732-488889b0007f/go.mod" +"k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841" +"k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod" +"k8s.io/client-go v8.0.0+incompatible" +"k8s.io/client-go v8.0.0+incompatible/go.mod" +) +go-module_set_globals +SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" +RESTRICT+=" test" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="dev-go/gox" +COMMON_DEPEND=" + acct-group/consul + acct-user/consul" + DEPEND="${COMMON_DEPEND}" + RDEPEND="${COMMON_DEPEND}" + +src_compile() { + local git_commit + git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go) + git_commit=${git_commit#*\"} + git_commit=${git_commit%\"*} + [[ ${git_commit} ]] || die "failed to determine gitCommit" + + # The dev target sets causes build.sh to set appropriate XC_OS + # and XC_ARCH, and skips generation of an unused zip file, + # avoiding a dependency on app-arch/zip. + GIT_DESCRIBE="v${PV}" \ + GIT_DIRTY="" \ + GIT_COMMIT="${git_commit}" \ + emake dev-build +} + +src_install() { + dobin bin/consul + + keepdir /etc/consul.d + insinto /etc/consul.d + doins "${FILESDIR}/"*.json.example + + keepdir /var/log/consul + fowners consul:consul /var/log/consul + + newinitd "${FILESDIR}/consul.initd" "${PN}" + newconfd "${FILESDIR}/consul.confd" "${PN}" + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" + systemd_dounit "${FILESDIR}/consul.service" +} diff --git a/app-admin/consul/consul-1.8.10.ebuild b/app-admin/consul/consul-1.8.10.ebuild new file mode 100644 index 000000000000..56da23c9b4e0 --- /dev/null +++ b/app-admin/consul/consul-1.8.10.ebuild @@ -0,0 +1,801 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module systemd + +DESCRIPTION="A tool for service discovery, monitoring and configuration" +HOMEPAGE="https://www.consul.io" + +# Upstream doesn't use "-mod=vendor" in their build system, and the +# vendor directory is incomplete. +# On the next bump, remove this if they have added "-mod=vendor" +EGO_SUM=( +"cloud.google.com/go v0.26.0/go.mod" +"cloud.google.com/go v0.34.0/go.mod" +"cloud.google.com/go v0.38.0" +"cloud.google.com/go v0.38.0/go.mod" +"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible" +"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod" +"github.com/Azure/go-autorest/autorest v0.9.0/go.mod" +"github.com/Azure/go-autorest/autorest v0.9.3/go.mod" +"github.com/Azure/go-autorest/autorest v0.10.0" +"github.com/Azure/go-autorest/autorest v0.10.0/go.mod" +"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod" +"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod" +"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod" +"github.com/Azure/go-autorest/autorest/adal v0.8.2" +"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod" +"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2" +"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod" +"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1" +"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod" +"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod" +"github.com/Azure/go-autorest/autorest/date v0.2.0" +"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod" +"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod" +"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod" +"github.com/Azure/go-autorest/autorest/mocks v0.3.0" +"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod" +"github.com/Azure/go-autorest/autorest/to v0.3.0" +"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod" +"github.com/Azure/go-autorest/autorest/validation v0.2.0" +"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod" +"github.com/Azure/go-autorest/logger v0.1.0" +"github.com/Azure/go-autorest/logger v0.1.0/go.mod" +"github.com/Azure/go-autorest/tracing v0.5.0" +"github.com/Azure/go-autorest/tracing v0.5.0/go.mod" +"github.com/BurntSushi/toml v0.3.1" +"github.com/BurntSushi/toml v0.3.1/go.mod" +"github.com/DataDog/datadog-go v2.2.0+incompatible" +"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod" +"github.com/DataDog/datadog-go v3.2.0+incompatible" +"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod" +"github.com/Microsoft/go-winio v0.4.3" +"github.com/Microsoft/go-winio v0.4.3/go.mod" +"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod" +"github.com/NYTimes/gziphandler v1.0.1" +"github.com/NYTimes/gziphandler v1.0.1/go.mod" +"github.com/OneOfOne/xxhash v1.2.2/go.mod" +"github.com/PuerkitoBio/purell v1.0.0/go.mod" +"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod" +"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6" +"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod" +"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af" +"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod" +"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" +"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod" +"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" +"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod" +"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e" +"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod" +"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod" +"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod" +"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878" +"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod" +"github.com/armon/go-metrics v0.3.0/go.mod" +"github.com/armon/go-metrics v0.3.4" +"github.com/armon/go-metrics v0.3.4/go.mod" +"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod" +"github.com/armon/go-radix v1.0.0" +"github.com/armon/go-radix v1.0.0/go.mod" +"github.com/aws/aws-sdk-go v1.25.37/go.mod" +"github.com/aws/aws-sdk-go v1.25.41" +"github.com/aws/aws-sdk-go v1.25.41/go.mod" +"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" +"github.com/beorn7/perks v1.0.0" +"github.com/beorn7/perks v1.0.0/go.mod" +"github.com/beorn7/perks v1.0.1" +"github.com/beorn7/perks v1.0.1/go.mod" +"github.com/bgentry/speakeasy v0.1.0" +"github.com/bgentry/speakeasy v0.1.0/go.mod" +"github.com/boltdb/bolt v1.3.1" +"github.com/boltdb/bolt v1.3.1/go.mod" +"github.com/census-instrumentation/opencensus-proto v0.2.1" +"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod" +"github.com/cespare/xxhash v1.1.0" +"github.com/cespare/xxhash v1.1.0/go.mod" +"github.com/cespare/xxhash/v2 v2.1.1" +"github.com/cespare/xxhash/v2 v2.1.1/go.mod" +"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible" +"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod" +"github.com/circonus-labs/circonusllhist v0.1.3" +"github.com/circonus-labs/circonusllhist v0.1.3/go.mod" +"github.com/client9/misspell v0.3.4/go.mod" +"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533" +"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod" +"github.com/cockroachdb/apd v1.1.0/go.mod" +"github.com/coredns/coredns v1.1.2" +"github.com/coredns/coredns v1.1.2/go.mod" +"github.com/coreos/bbolt v1.3.2/go.mod" +"github.com/coreos/etcd v3.3.10+incompatible/go.mod" +"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod" +"github.com/coreos/go-oidc v2.1.0+incompatible" +"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod" +"github.com/coreos/go-semver v0.2.0/go.mod" +"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod" +"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod" +"github.com/cpuguy83/go-md2man v1.0.10/go.mod" +"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod" +"github.com/davecgh/go-spew v1.1.0/go.mod" +"github.com/davecgh/go-spew v1.1.1" +"github.com/davecgh/go-spew v1.1.1/go.mod" +"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661" +"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod" +"github.com/dgrijalva/jwt-go v3.2.0+incompatible" +"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" +"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod" +"github.com/digitalocean/godo v1.1.1/go.mod" +"github.com/digitalocean/godo v1.10.0" +"github.com/digitalocean/godo v1.10.0/go.mod" +"github.com/dimchansky/utfbom v1.1.0" +"github.com/dimchansky/utfbom v1.1.0/go.mod" +"github.com/dnaeon/go-vcr v1.0.1" +"github.com/dnaeon/go-vcr v1.0.1/go.mod" +"github.com/docker/go-connections v0.3.0" +"github.com/docker/go-connections v0.3.0/go.mod" +"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod" +"github.com/dustin/go-humanize v1.0.0/go.mod" +"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0" +"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod" +"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod" +"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod" +"github.com/envoyproxy/go-control-plane v0.9.0/go.mod" +"github.com/envoyproxy/go-control-plane v0.9.5" +"github.com/envoyproxy/go-control-plane v0.9.5/go.mod" +"github.com/envoyproxy/protoc-gen-validate v0.1.0" +"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod" +"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod" +"github.com/fatih/color v1.7.0/go.mod" +"github.com/fatih/color v1.9.0" +"github.com/fatih/color v1.9.0/go.mod" +"github.com/fatih/structs v1.1.0/go.mod" +"github.com/frankban/quicktest v1.11.1" +"github.com/frankban/quicktest v1.11.1/go.mod" +"github.com/fsnotify/fsnotify v1.4.7/go.mod" +"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod" +"github.com/ghodss/yaml v1.0.0" +"github.com/ghodss/yaml v1.0.0/go.mod" +"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod" +"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod" +"github.com/go-kit/kit v0.8.0/go.mod" +"github.com/go-kit/kit v0.9.0/go.mod" +"github.com/go-ldap/ldap/v3 v3.1.3/go.mod" +"github.com/go-logfmt/logfmt v0.3.0/go.mod" +"github.com/go-logfmt/logfmt v0.4.0/go.mod" +"github.com/go-logr/logr v0.1.0/go.mod" +"github.com/go-ole/go-ole v1.2.1" +"github.com/go-ole/go-ole v1.2.1/go.mod" +"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod" +"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod" +"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod" +"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod" +"github.com/go-stack/stack v1.8.0/go.mod" +"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod" +"github.com/go-test/deep v1.0.2" +"github.com/go-test/deep v1.0.2/go.mod" +"github.com/gogo/protobuf v1.1.1/go.mod" +"github.com/gogo/protobuf v1.2.1/go.mod" +"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d" +"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod" +"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b" +"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" +"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod" +"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod" +"github.com/golang/mock v1.1.1/go.mod" +"github.com/golang/mock v1.2.0/go.mod" +"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod" +"github.com/golang/protobuf v1.2.0/go.mod" +"github.com/golang/protobuf v1.3.1" +"github.com/golang/protobuf v1.3.1/go.mod" +"github.com/golang/protobuf v1.3.2" +"github.com/golang/protobuf v1.3.2/go.mod" +"github.com/golang/snappy v0.0.1" +"github.com/golang/snappy v0.0.1/go.mod" +"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" +"github.com/google/btree v1.0.0" +"github.com/google/btree v1.0.0/go.mod" +"github.com/google/go-cmp v0.2.0/go.mod" +"github.com/google/go-cmp v0.3.0" +"github.com/google/go-cmp v0.3.0/go.mod" +"github.com/google/go-cmp v0.3.1/go.mod" +"github.com/google/go-cmp v0.4.0" +"github.com/google/go-cmp v0.4.0/go.mod" +"github.com/google/go-cmp v0.5.2" +"github.com/google/go-cmp v0.5.2/go.mod" +"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod" +"github.com/google/go-querystring v1.0.0" +"github.com/google/go-querystring v1.0.0/go.mod" +"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod" +"github.com/google/gofuzz v1.0.0" +"github.com/google/gofuzz v1.0.0/go.mod" +"github.com/google/martian v2.1.0+incompatible/go.mod" +"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod" +"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2" +"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod" +"github.com/google/uuid v1.1.1/go.mod" +"github.com/googleapis/gax-go/v2 v2.0.4/go.mod" +"github.com/googleapis/gax-go/v2 v2.0.5" +"github.com/googleapis/gax-go/v2 v2.0.5/go.mod" +"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod" +"github.com/googleapis/gnostic v0.2.0" +"github.com/googleapis/gnostic v0.2.0/go.mod" +"github.com/gophercloud/gophercloud v0.1.0" +"github.com/gophercloud/gophercloud v0.1.0/go.mod" +"github.com/gorilla/websocket v1.4.0/go.mod" +"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7" +"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod" +"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod" +"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod" +"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod" +"github.com/hashicorp/errwrap v1.0.0" +"github.com/hashicorp/errwrap v1.0.0/go.mod" +"github.com/hashicorp/go-bexpr v0.1.2" +"github.com/hashicorp/go-bexpr v0.1.2/go.mod" +"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de" +"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod" +"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod" +"github.com/hashicorp/go-cleanhttp v0.5.1" +"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod" +"github.com/hashicorp/go-connlimit v0.2.0" +"github.com/hashicorp/go-connlimit v0.2.0/go.mod" +"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088" +"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod" +"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod" +"github.com/hashicorp/go-hclog v0.9.1/go.mod" +"github.com/hashicorp/go-hclog v0.9.2/go.mod" +"github.com/hashicorp/go-hclog v0.12.0" +"github.com/hashicorp/go-hclog v0.12.0/go.mod" +"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod" +"github.com/hashicorp/go-immutable-radix v1.1.0" +"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod" +"github.com/hashicorp/go-immutable-radix v1.2.0" +"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod" +"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod" +"github.com/hashicorp/go-memdb v1.0.3" +"github.com/hashicorp/go-memdb v1.0.3/go.mod" +"github.com/hashicorp/go-msgpack v0.5.3/go.mod" +"github.com/hashicorp/go-msgpack v0.5.5" +"github.com/hashicorp/go-msgpack v0.5.5/go.mod" +"github.com/hashicorp/go-multierror v1.0.0" +"github.com/hashicorp/go-multierror v1.0.0/go.mod" +"github.com/hashicorp/go-multierror v1.1.0" +"github.com/hashicorp/go-multierror v1.1.0/go.mod" +"github.com/hashicorp/go-plugin v1.0.1/go.mod" +"github.com/hashicorp/go-raftchunking v0.6.1" +"github.com/hashicorp/go-raftchunking v0.6.1/go.mod" +"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod" +"github.com/hashicorp/go-retryablehttp v0.6.6" +"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod" +"github.com/hashicorp/go-retryablehttp v0.6.7" +"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod" +"github.com/hashicorp/go-rootcerts v1.0.2" +"github.com/hashicorp/go-rootcerts v1.0.2/go.mod" +"github.com/hashicorp/go-sockaddr v1.0.0/go.mod" +"github.com/hashicorp/go-sockaddr v1.0.2" +"github.com/hashicorp/go-sockaddr v1.0.2/go.mod" +"github.com/hashicorp/go-syslog v1.0.0" +"github.com/hashicorp/go-syslog v1.0.0/go.mod" +"github.com/hashicorp/go-uuid v1.0.0/go.mod" +"github.com/hashicorp/go-uuid v1.0.1" +"github.com/hashicorp/go-uuid v1.0.1/go.mod" +"github.com/hashicorp/go-uuid v1.0.2" +"github.com/hashicorp/go-uuid v1.0.2/go.mod" +"github.com/hashicorp/go-version v1.1.0/go.mod" +"github.com/hashicorp/go-version v1.2.0" +"github.com/hashicorp/go-version v1.2.0/go.mod" +"github.com/hashicorp/golang-lru v0.5.0/go.mod" +"github.com/hashicorp/golang-lru v0.5.1" +"github.com/hashicorp/golang-lru v0.5.1/go.mod" +"github.com/hashicorp/golang-lru v0.5.4" +"github.com/hashicorp/golang-lru v0.5.4/go.mod" +"github.com/hashicorp/hcl v1.0.0" +"github.com/hashicorp/hcl v1.0.0/go.mod" +"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5" +"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod" +"github.com/hashicorp/logutils v1.0.0/go.mod" +"github.com/hashicorp/mdns v1.0.1" +"github.com/hashicorp/mdns v1.0.1/go.mod" +"github.com/hashicorp/memberlist v0.2.2" +"github.com/hashicorp/memberlist v0.2.2/go.mod" +"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69" +"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod" +"github.com/hashicorp/raft v1.1.1/go.mod" +"github.com/hashicorp/raft v1.1.2" +"github.com/hashicorp/raft v1.1.2/go.mod" +"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea" +"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod" +"github.com/hashicorp/serf v0.9.3" +"github.com/hashicorp/serf v0.9.3/go.mod" +"github.com/hashicorp/serf v0.9.4" +"github.com/hashicorp/serf v0.9.4/go.mod" +"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086" +"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod" +"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267" +"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod" +"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443" +"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod" +"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod" +"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d" +"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod" +"github.com/hpcloud/tail v1.0.0/go.mod" +"github.com/imdario/mergo v0.3.5/go.mod" +"github.com/imdario/mergo v0.3.6" +"github.com/imdario/mergo v0.3.6/go.mod" +"github.com/inconshreveable/mousetrap v1.0.0/go.mod" +"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod" +"github.com/jackc/pgx v3.3.0+incompatible/go.mod" +"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da" +"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod" +"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af" +"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod" +"github.com/jonboulle/clockwork v0.1.0/go.mod" +"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod" +"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f" +"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod" +"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod" +"github.com/json-iterator/go v1.1.6/go.mod" +"github.com/json-iterator/go v1.1.7" +"github.com/json-iterator/go v1.1.7/go.mod" +"github.com/json-iterator/go v1.1.9" +"github.com/json-iterator/go v1.1.9/go.mod" +"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod" +"github.com/julienschmidt/httprouter v1.2.0/go.mod" +"github.com/kisielk/errcheck v1.1.0/go.mod" +"github.com/kisielk/errcheck v1.2.0/go.mod" +"github.com/kisielk/gotool v1.0.0/go.mod" +"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" +"github.com/konsorten/go-windows-terminal-sequences v1.0.2" +"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod" +"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod" +"github.com/kr/pretty v0.1.0/go.mod" +"github.com/kr/pretty v0.2.0" +"github.com/kr/pretty v0.2.0/go.mod" +"github.com/kr/pretty v0.2.1" +"github.com/kr/pretty v0.2.1/go.mod" +"github.com/kr/pty v1.1.1/go.mod" +"github.com/kr/text v0.1.0" +"github.com/kr/text v0.1.0/go.mod" +"github.com/lib/pq v1.1.1/go.mod" +"github.com/linode/linodego v0.7.1" +"github.com/linode/linodego v0.7.1/go.mod" +"github.com/magiconair/properties v1.8.0/go.mod" +"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod" +"github.com/mattn/go-colorable v0.0.9/go.mod" +"github.com/mattn/go-colorable v0.1.4" +"github.com/mattn/go-colorable v0.1.4/go.mod" +"github.com/mattn/go-colorable v0.1.6" +"github.com/mattn/go-colorable v0.1.6/go.mod" +"github.com/mattn/go-isatty v0.0.3/go.mod" +"github.com/mattn/go-isatty v0.0.8/go.mod" +"github.com/mattn/go-isatty v0.0.10/go.mod" +"github.com/mattn/go-isatty v0.0.11/go.mod" +"github.com/mattn/go-isatty v0.0.12" +"github.com/mattn/go-isatty v0.0.12/go.mod" +"github.com/mattn/go-runewidth v0.0.3/go.mod" +"github.com/matttproud/golang_protobuf_extensions v1.0.1" +"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" +"github.com/miekg/dns v1.0.14/go.mod" +"github.com/miekg/dns v1.1.26" +"github.com/miekg/dns v1.1.26/go.mod" +"github.com/mitchellh/cli v1.0.0/go.mod" +"github.com/mitchellh/cli v1.1.0" +"github.com/mitchellh/cli v1.1.0/go.mod" +"github.com/mitchellh/copystructure v1.0.0" +"github.com/mitchellh/copystructure v1.0.0/go.mod" +"github.com/mitchellh/go-homedir v1.1.0" +"github.com/mitchellh/go-homedir v1.1.0/go.mod" +"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod" +"github.com/mitchellh/go-testing-interface v1.0.0/go.mod" +"github.com/mitchellh/go-testing-interface v1.14.0" +"github.com/mitchellh/go-testing-interface v1.14.0/go.mod" +"github.com/mitchellh/go-wordwrap v1.0.0/go.mod" +"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452" +"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod" +"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod" +"github.com/mitchellh/mapstructure v1.1.2" +"github.com/mitchellh/mapstructure v1.1.2/go.mod" +"github.com/mitchellh/mapstructure v1.3.2/go.mod" +"github.com/mitchellh/mapstructure v1.3.3" +"github.com/mitchellh/mapstructure v1.3.3/go.mod" +"github.com/mitchellh/pointerstructure v1.0.0" +"github.com/mitchellh/pointerstructure v1.0.0/go.mod" +"github.com/mitchellh/reflectwalk v1.0.0/go.mod" +"github.com/mitchellh/reflectwalk v1.0.1" +"github.com/mitchellh/reflectwalk v1.0.1/go.mod" +"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" +"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd" +"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" +"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod" +"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" +"github.com/modern-go/reflect2 v1.0.1" +"github.com/modern-go/reflect2 v1.0.1/go.mod" +"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod" +"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod" +"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod" +"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2" +"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod" +"github.com/oklog/run v1.0.0/go.mod" +"github.com/oklog/ulid v1.3.1/go.mod" +"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod" +"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod" +"github.com/onsi/ginkgo v1.6.0/go.mod" +"github.com/onsi/ginkgo v1.8.0/go.mod" +"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod" +"github.com/onsi/gomega v1.5.0/go.mod" +"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c" +"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod" +"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod" +"github.com/pascaldekloe/goe v0.1.0" +"github.com/pascaldekloe/goe v0.1.0/go.mod" +"github.com/patrickmn/go-cache v2.1.0+incompatible" +"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod" +"github.com/pelletier/go-toml v1.2.0/go.mod" +"github.com/peterbourgon/diskv v2.0.1+incompatible" +"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod" +"github.com/pierrec/lz4 v2.0.5+incompatible" +"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod" +"github.com/pierrec/lz4 v2.5.2+incompatible" +"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod" +"github.com/pkg/errors v0.8.0/go.mod" +"github.com/pkg/errors v0.8.1" +"github.com/pkg/errors v0.8.1/go.mod" +"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod" +"github.com/pmezard/go-difflib v1.0.0" +"github.com/pmezard/go-difflib v1.0.0/go.mod" +"github.com/posener/complete v1.1.1" +"github.com/posener/complete v1.1.1/go.mod" +"github.com/posener/complete v1.2.3" +"github.com/posener/complete v1.2.3/go.mod" +"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35" +"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod" +"github.com/prometheus/client_golang v0.9.1/go.mod" +"github.com/prometheus/client_golang v0.9.2/go.mod" +"github.com/prometheus/client_golang v0.9.3/go.mod" +"github.com/prometheus/client_golang v1.0.0" +"github.com/prometheus/client_golang v1.0.0/go.mod" +"github.com/prometheus/client_golang v1.4.0" +"github.com/prometheus/client_golang v1.4.0/go.mod" +"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" +"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90" +"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod" +"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4" +"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod" +"github.com/prometheus/client_model v0.2.0" +"github.com/prometheus/client_model v0.2.0/go.mod" +"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod" +"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod" +"github.com/prometheus/common v0.4.0/go.mod" +"github.com/prometheus/common v0.4.1" +"github.com/prometheus/common v0.4.1/go.mod" +"github.com/prometheus/common v0.9.1" +"github.com/prometheus/common v0.9.1/go.mod" +"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod" +"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod" +"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod" +"github.com/prometheus/procfs v0.0.2" +"github.com/prometheus/procfs v0.0.2/go.mod" +"github.com/prometheus/procfs v0.0.8" +"github.com/prometheus/procfs v0.0.8/go.mod" +"github.com/prometheus/tsdb v0.7.1/go.mod" +"github.com/rboyer/safeio v0.2.1" +"github.com/rboyer/safeio v0.2.1/go.mod" +"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03" +"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod" +"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod" +"github.com/rs/zerolog v1.4.0/go.mod" +"github.com/russross/blackfriday v1.5.2/go.mod" +"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod" +"github.com/ryanuber/columnize v2.1.0+incompatible" +"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod" +"github.com/ryanuber/go-glob v1.0.0" +"github.com/ryanuber/go-glob v1.0.0/go.mod" +"github.com/satori/go.uuid v1.2.0/go.mod" +"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod" +"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod" +"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529" +"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod" +"github.com/shirou/gopsutil v2.20.9+incompatible" +"github.com/shirou/gopsutil v2.20.9+incompatible/go.mod" +"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod" +"github.com/sirupsen/logrus v1.0.6/go.mod" +"github.com/sirupsen/logrus v1.2.0/go.mod" +"github.com/sirupsen/logrus v1.4.2" +"github.com/sirupsen/logrus v1.4.2/go.mod" +"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d" +"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod" +"github.com/soheilhy/cmux v0.1.4/go.mod" +"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" +"github.com/spf13/afero v1.1.2/go.mod" +"github.com/spf13/afero v1.2.1/go.mod" +"github.com/spf13/afero v1.2.2/go.mod" +"github.com/spf13/cast v1.3.0/go.mod" +"github.com/spf13/cobra v0.0.5/go.mod" +"github.com/spf13/jwalterweatherman v1.0.0/go.mod" +"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod" +"github.com/spf13/pflag v1.0.3/go.mod" +"github.com/spf13/pflag v1.0.5" +"github.com/spf13/pflag v1.0.5/go.mod" +"github.com/spf13/viper v1.3.2/go.mod" +"github.com/spf13/viper v1.4.0/go.mod" +"github.com/stretchr/objx v0.1.0/go.mod" +"github.com/stretchr/objx v0.1.1" +"github.com/stretchr/objx v0.1.1/go.mod" +"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod" +"github.com/stretchr/testify v1.2.2/go.mod" +"github.com/stretchr/testify v1.3.0/go.mod" +"github.com/stretchr/testify v1.4.0" +"github.com/stretchr/testify v1.4.0/go.mod" +"github.com/stretchr/testify v1.5.1" +"github.com/stretchr/testify v1.5.1/go.mod" +"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible" +"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod" +"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod" +"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod" +"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926" +"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod" +"github.com/ugorji/go v1.1.4/go.mod" +"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod" +"github.com/vmware/govmomi v0.18.0" +"github.com/vmware/govmomi v0.18.0/go.mod" +"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod" +"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod" +"github.com/yuin/goldmark v1.1.27/go.mod" +"go.etcd.io/bbolt v1.3.2/go.mod" +"go.opencensus.io v0.21.0/go.mod" +"go.opencensus.io v0.22.0" +"go.opencensus.io v0.22.0/go.mod" +"go.uber.org/atomic v1.4.0/go.mod" +"go.uber.org/goleak v1.0.0" +"go.uber.org/goleak v1.0.0/go.mod" +"go.uber.org/multierr v1.1.0/go.mod" +"go.uber.org/zap v1.10.0/go.mod" +"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod" +"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod" +"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod" +"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod" +"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" +"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod" +"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod" +"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod" +"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod" +"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod" +"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975" +"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod" +"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod" +"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a" +"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod" +"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" +"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" +"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" +"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod" +"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" +"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod" +"golang.org/x/lint v0.0.0-20190930215403-16217165b5de" +"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod" +"golang.org/x/mod v0.2.0" +"golang.org/x/mod v0.2.0/go.mod" +"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod" +"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" +"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" +"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" +"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod" +"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod" +"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod" +"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod" +"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod" +"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod" +"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" +"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" +"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod" +"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" +"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod" +"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod" +"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" +"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod" +"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9" +"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod" +"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod" +"golang.org/x/net v0.0.0-20200602114024-627f9648deb9" +"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod" +"golang.org/x/net v0.0.0-20200904194848-62affa334b73" +"golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod" +"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" +"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod" +"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45" +"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod" +"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" +"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" +"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" +"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" +"golang.org/x/sync v0.0.0-20190423024810-112230192c58" +"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" +"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e" +"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" +"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a" +"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod" +"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod" +"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod" +"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" +"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" +"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" +"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod" +"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod" +"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod" +"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod" +"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod" +"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod" +"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" +"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod" +"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod" +"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" +"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" +"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" +"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod" +"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod" +"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod" +"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod" +"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod" +"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod" +"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod" +"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" +"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" +"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod" +"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9" +"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod" +"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae" +"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod" +"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd" +"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" +"golang.org/x/sys v0.0.0-20201007082116-8445cc04cbdf" +"golang.org/x/sys v0.0.0-20201007082116-8445cc04cbdf/go.mod" +"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod" +"golang.org/x/text v0.3.0/go.mod" +"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod" +"golang.org/x/text v0.3.2" +"golang.org/x/text v0.3.2/go.mod" +"golang.org/x/text v0.3.3" +"golang.org/x/text v0.3.3/go.mod" +"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod" +"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4" +"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" +"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1" +"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod" +"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e" +"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod" +"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod" +"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" +"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod" +"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod" +"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" +"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" +"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" +"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod" +"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod" +"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" +"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod" +"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11" +"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod" +"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod" +"golang.org/x/tools v0.0.0-20200513154647-78b527d18275" +"golang.org/x/tools v0.0.0-20200513154647-78b527d18275/go.mod" +"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" +"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" +"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543" +"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" +"google.golang.org/api v0.4.0/go.mod" +"google.golang.org/api v0.9.0" +"google.golang.org/api v0.9.0/go.mod" +"google.golang.org/appengine v1.1.0/go.mod" +"google.golang.org/appengine v1.4.0/go.mod" +"google.golang.org/appengine v1.5.0/go.mod" +"google.golang.org/appengine v1.6.0" +"google.golang.org/appengine v1.6.0/go.mod" +"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" +"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod" +"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod" +"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" +"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod" +"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55" +"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" +"google.golang.org/grpc v1.14.0/go.mod" +"google.golang.org/grpc v1.19.0/go.mod" +"google.golang.org/grpc v1.20.1/go.mod" +"google.golang.org/grpc v1.21.0/go.mod" +"google.golang.org/grpc v1.22.0/go.mod" +"google.golang.org/grpc v1.23.0" +"google.golang.org/grpc v1.23.0/go.mod" +"google.golang.org/grpc v1.25.1" +"google.golang.org/grpc v1.25.1/go.mod" +"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod" +"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" +"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" +"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" +"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" +"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" +"gopkg.in/fsnotify.v1 v1.4.7/go.mod" +"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod" +"gopkg.in/inf.v0 v0.9.1" +"gopkg.in/inf.v0 v0.9.1/go.mod" +"gopkg.in/resty.v1 v1.12.0" +"gopkg.in/resty.v1 v1.12.0/go.mod" +"gopkg.in/square/go-jose.v2 v2.5.1" +"gopkg.in/square/go-jose.v2 v2.5.1/go.mod" +"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" +"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod" +"gopkg.in/yaml.v2 v2.2.1/go.mod" +"gopkg.in/yaml.v2 v2.2.2/go.mod" +"gopkg.in/yaml.v2 v2.2.4/go.mod" +"gopkg.in/yaml.v2 v2.2.5/go.mod" +"gopkg.in/yaml.v2 v2.2.8" +"gopkg.in/yaml.v2 v2.2.8/go.mod" +"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" +"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod" +"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod" +"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" +"k8s.io/api v0.16.9" +"k8s.io/api v0.16.9/go.mod" +"k8s.io/apimachinery v0.16.9" +"k8s.io/apimachinery v0.16.9/go.mod" +"k8s.io/client-go v0.16.9" +"k8s.io/client-go v0.16.9/go.mod" +"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod" +"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod" +"k8s.io/klog v0.3.0/go.mod" +"k8s.io/klog v1.0.0" +"k8s.io/klog v1.0.0/go.mod" +"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod" +"k8s.io/utils v0.0.0-20190801114015-581e00157fb1" +"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod" +"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod" +"sigs.k8s.io/yaml v1.1.0" +"sigs.k8s.io/yaml v1.1.0/go.mod" +) +go-module_set_globals +SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" +RESTRICT+=" test" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="dev-go/gox" +COMMON_DEPEND=" + acct-group/consul + acct-user/consul" + DEPEND="${COMMON_DEPEND}" + RDEPEND="${COMMON_DEPEND}" + +src_compile() { + local git_commit + git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go) + git_commit=${git_commit#*\"} + git_commit=${git_commit%\"*} + [[ ${git_commit} ]] || die "failed to determine gitCommit" + + # The dev target sets causes build.sh to set appropriate XC_OS + # and XC_ARCH, and skips generation of an unused zip file, + # avoiding a dependency on app-arch/zip. + GIT_DESCRIBE="v${PV}" \ + GIT_DIRTY="" \ + GIT_COMMIT="${git_commit}" \ + emake dev-build +} + +src_install() { + dobin bin/consul + + keepdir /etc/consul.d + insinto /etc/consul.d + doins "${FILESDIR}/"*.json.example + + keepdir /var/log/consul + fowners consul:consul /var/log/consul + + newinitd "${FILESDIR}/consul.initd" "${PN}" + newconfd "${FILESDIR}/consul.confd" "${PN}" + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" + systemd_dounit "${FILESDIR}/consul.service" +} diff --git a/app-admin/consul/consul-1.9.5.ebuild b/app-admin/consul/consul-1.9.5.ebuild new file mode 100644 index 000000000000..3327f535c6b1 --- /dev/null +++ b/app-admin/consul/consul-1.9.5.ebuild @@ -0,0 +1,782 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module systemd + +DESCRIPTION="A tool for service discovery, monitoring and configuration" +HOMEPAGE="https://www.consul.io" + +# Upstream doesn't use "-mod=vendor" in their build system, and the +# vendor directory is incomplete. +# On the next bump, remove this if they have added "-mod=vendor" +EGO_SUM=( +"cloud.google.com/go v0.26.0/go.mod" +"cloud.google.com/go v0.34.0/go.mod" +"cloud.google.com/go v0.38.0" +"cloud.google.com/go v0.38.0/go.mod" +"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible" +"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod" +"github.com/Azure/go-autorest/autorest v0.9.0/go.mod" +"github.com/Azure/go-autorest/autorest v0.9.3/go.mod" +"github.com/Azure/go-autorest/autorest v0.10.0" +"github.com/Azure/go-autorest/autorest v0.10.0/go.mod" +"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod" +"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod" +"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod" +"github.com/Azure/go-autorest/autorest/adal v0.8.2" +"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod" +"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2" +"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod" +"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1" +"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod" +"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod" +"github.com/Azure/go-autorest/autorest/date v0.2.0" +"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod" +"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod" +"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod" +"github.com/Azure/go-autorest/autorest/mocks v0.3.0" +"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod" +"github.com/Azure/go-autorest/autorest/to v0.3.0" +"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod" +"github.com/Azure/go-autorest/autorest/validation v0.2.0" +"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod" +"github.com/Azure/go-autorest/logger v0.1.0" +"github.com/Azure/go-autorest/logger v0.1.0/go.mod" +"github.com/Azure/go-autorest/tracing v0.5.0" +"github.com/Azure/go-autorest/tracing v0.5.0/go.mod" +"github.com/BurntSushi/toml v0.3.1" +"github.com/BurntSushi/toml v0.3.1/go.mod" +"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod" +"github.com/DataDog/datadog-go v3.2.0+incompatible" +"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod" +"github.com/Microsoft/go-winio v0.4.3" +"github.com/Microsoft/go-winio v0.4.3/go.mod" +"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod" +"github.com/NYTimes/gziphandler v1.0.1" +"github.com/NYTimes/gziphandler v1.0.1/go.mod" +"github.com/OneOfOne/xxhash v1.2.2/go.mod" +"github.com/PuerkitoBio/purell v1.0.0/go.mod" +"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod" +"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d" +"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod" +"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af" +"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod" +"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" +"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod" +"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" +"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod" +"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e" +"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod" +"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod" +"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod" +"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod" +"github.com/armon/go-metrics v0.3.0/go.mod" +"github.com/armon/go-metrics v0.3.6" +"github.com/armon/go-metrics v0.3.6/go.mod" +"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod" +"github.com/armon/go-radix v1.0.0" +"github.com/armon/go-radix v1.0.0/go.mod" +"github.com/aws/aws-sdk-go v1.25.37/go.mod" +"github.com/aws/aws-sdk-go v1.25.41" +"github.com/aws/aws-sdk-go v1.25.41/go.mod" +"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" +"github.com/beorn7/perks v1.0.0" +"github.com/beorn7/perks v1.0.0/go.mod" +"github.com/beorn7/perks v1.0.1" +"github.com/beorn7/perks v1.0.1/go.mod" +"github.com/bgentry/speakeasy v0.1.0" +"github.com/bgentry/speakeasy v0.1.0/go.mod" +"github.com/boltdb/bolt v1.3.1" +"github.com/boltdb/bolt v1.3.1/go.mod" +"github.com/census-instrumentation/opencensus-proto v0.2.1" +"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod" +"github.com/cespare/xxhash v1.1.0" +"github.com/cespare/xxhash v1.1.0/go.mod" +"github.com/cespare/xxhash/v2 v2.1.1" +"github.com/cespare/xxhash/v2 v2.1.1/go.mod" +"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible" +"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod" +"github.com/circonus-labs/circonusllhist v0.1.3" +"github.com/circonus-labs/circonusllhist v0.1.3/go.mod" +"github.com/client9/misspell v0.3.4/go.mod" +"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533" +"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod" +"github.com/cockroachdb/apd v1.1.0/go.mod" +"github.com/coredns/coredns v1.1.2" +"github.com/coredns/coredns v1.1.2/go.mod" +"github.com/coreos/bbolt v1.3.2/go.mod" +"github.com/coreos/etcd v3.3.10+incompatible/go.mod" +"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod" +"github.com/coreos/go-oidc v2.1.0+incompatible" +"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod" +"github.com/coreos/go-semver v0.2.0/go.mod" +"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod" +"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod" +"github.com/cpuguy83/go-md2man v1.0.10/go.mod" +"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod" +"github.com/davecgh/go-spew v1.1.0/go.mod" +"github.com/davecgh/go-spew v1.1.1" +"github.com/davecgh/go-spew v1.1.1/go.mod" +"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661" +"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod" +"github.com/dgrijalva/jwt-go v3.2.0+incompatible" +"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" +"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod" +"github.com/digitalocean/godo v1.1.1/go.mod" +"github.com/digitalocean/godo v1.10.0" +"github.com/digitalocean/godo v1.10.0/go.mod" +"github.com/dimchansky/utfbom v1.1.0" +"github.com/dimchansky/utfbom v1.1.0/go.mod" +"github.com/dnaeon/go-vcr v1.0.1" +"github.com/dnaeon/go-vcr v1.0.1/go.mod" +"github.com/docker/go-connections v0.3.0" +"github.com/docker/go-connections v0.3.0/go.mod" +"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod" +"github.com/dustin/go-humanize v1.0.0/go.mod" +"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0" +"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod" +"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod" +"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod" +"github.com/envoyproxy/go-control-plane v0.9.0/go.mod" +"github.com/envoyproxy/go-control-plane v0.9.5" +"github.com/envoyproxy/go-control-plane v0.9.5/go.mod" +"github.com/envoyproxy/protoc-gen-validate v0.1.0" +"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod" +"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod" +"github.com/fatih/color v1.7.0/go.mod" +"github.com/fatih/color v1.9.0" +"github.com/fatih/color v1.9.0/go.mod" +"github.com/fatih/structs v1.1.0/go.mod" +"github.com/frankban/quicktest v1.11.0" +"github.com/frankban/quicktest v1.11.0/go.mod" +"github.com/fsnotify/fsnotify v1.4.7/go.mod" +"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod" +"github.com/ghodss/yaml v1.0.0" +"github.com/ghodss/yaml v1.0.0/go.mod" +"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod" +"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod" +"github.com/go-kit/kit v0.8.0/go.mod" +"github.com/go-kit/kit v0.9.0/go.mod" +"github.com/go-ldap/ldap/v3 v3.1.3/go.mod" +"github.com/go-logfmt/logfmt v0.3.0/go.mod" +"github.com/go-logfmt/logfmt v0.4.0/go.mod" +"github.com/go-logr/logr v0.1.0/go.mod" +"github.com/go-ole/go-ole v1.2.4" +"github.com/go-ole/go-ole v1.2.4/go.mod" +"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod" +"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod" +"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod" +"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod" +"github.com/go-stack/stack v1.8.0/go.mod" +"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod" +"github.com/go-test/deep v1.0.2" +"github.com/go-test/deep v1.0.2/go.mod" +"github.com/gogo/protobuf v1.1.1/go.mod" +"github.com/gogo/protobuf v1.2.1/go.mod" +"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d" +"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod" +"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b" +"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" +"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod" +"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod" +"github.com/golang/mock v1.1.1/go.mod" +"github.com/golang/mock v1.2.0/go.mod" +"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod" +"github.com/golang/protobuf v1.2.0/go.mod" +"github.com/golang/protobuf v1.3.1" +"github.com/golang/protobuf v1.3.1/go.mod" +"github.com/golang/protobuf v1.3.2/go.mod" +"github.com/golang/protobuf v1.3.5" +"github.com/golang/protobuf v1.3.5/go.mod" +"github.com/golang/snappy v0.0.1" +"github.com/golang/snappy v0.0.1/go.mod" +"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" +"github.com/google/btree v1.0.0" +"github.com/google/btree v1.0.0/go.mod" +"github.com/google/go-cmp v0.2.0/go.mod" +"github.com/google/go-cmp v0.3.0" +"github.com/google/go-cmp v0.3.0/go.mod" +"github.com/google/go-cmp v0.3.1/go.mod" +"github.com/google/go-cmp v0.4.0" +"github.com/google/go-cmp v0.4.0/go.mod" +"github.com/google/go-cmp v0.5.2" +"github.com/google/go-cmp v0.5.2/go.mod" +"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod" +"github.com/google/go-querystring v1.0.0" +"github.com/google/go-querystring v1.0.0/go.mod" +"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod" +"github.com/google/gofuzz v1.0.0" +"github.com/google/gofuzz v1.0.0/go.mod" +"github.com/google/gofuzz v1.0.0/go.mod" +"github.com/google/gofuzz v1.2.0" +"github.com/google/gofuzz v1.2.0/go.mod" +"github.com/google/martian v2.1.0+incompatible/go.mod" +"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod" +"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2" +"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod" +"github.com/google/uuid v1.1.1/go.mod" +"github.com/googleapis/gax-go/v2 v2.0.4/go.mod" +"github.com/googleapis/gax-go/v2 v2.0.5" +"github.com/googleapis/gax-go/v2 v2.0.5/go.mod" +"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod" +"github.com/googleapis/gnostic v0.2.0" +"github.com/googleapis/gnostic v0.2.0/go.mod" +"github.com/gophercloud/gophercloud v0.1.0" +"github.com/gophercloud/gophercloud v0.1.0/go.mod" +"github.com/gorilla/websocket v1.4.0/go.mod" +"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod" +"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod" +"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod" +"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod" +"github.com/hashicorp/errwrap v1.0.0" +"github.com/hashicorp/errwrap v1.0.0/go.mod" +"github.com/hashicorp/go-bexpr v0.1.2" +"github.com/hashicorp/go-bexpr v0.1.2/go.mod" +"github.com/hashicorp/go-checkpoint v0.5.0" +"github.com/hashicorp/go-checkpoint v0.5.0/go.mod" +"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod" +"github.com/hashicorp/go-cleanhttp v0.5.1" +"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod" +"github.com/hashicorp/go-connlimit v0.3.0" +"github.com/hashicorp/go-connlimit v0.3.0/go.mod" +"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088" +"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod" +"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod" +"github.com/hashicorp/go-hclog v0.9.1/go.mod" +"github.com/hashicorp/go-hclog v0.9.2/go.mod" +"github.com/hashicorp/go-hclog v0.12.0" +"github.com/hashicorp/go-hclog v0.12.0/go.mod" +"github.com/hashicorp/go-hclog v0.14.1" +"github.com/hashicorp/go-hclog v0.14.1/go.mod" +"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod" +"github.com/hashicorp/go-immutable-radix v1.3.0" +"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod" +"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod" +"github.com/hashicorp/go-memdb v1.3.0" +"github.com/hashicorp/go-memdb v1.3.0/go.mod" +"github.com/hashicorp/go-msgpack v0.5.3/go.mod" +"github.com/hashicorp/go-msgpack v0.5.5" +"github.com/hashicorp/go-msgpack v0.5.5/go.mod" +"github.com/hashicorp/go-multierror v1.0.0/go.mod" +"github.com/hashicorp/go-multierror v1.1.0" +"github.com/hashicorp/go-multierror v1.1.0/go.mod" +"github.com/hashicorp/go-plugin v1.0.1/go.mod" +"github.com/hashicorp/go-raftchunking v0.6.1" +"github.com/hashicorp/go-raftchunking v0.6.1/go.mod" +"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod" +"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod" +"github.com/hashicorp/go-retryablehttp v0.6.7" +"github.com/hashicorp/go-retryablehttp v0.6.7/go.mod" +"github.com/hashicorp/go-rootcerts v1.0.2" +"github.com/hashicorp/go-rootcerts v1.0.2/go.mod" +"github.com/hashicorp/go-sockaddr v1.0.0/go.mod" +"github.com/hashicorp/go-sockaddr v1.0.2" +"github.com/hashicorp/go-sockaddr v1.0.2/go.mod" +"github.com/hashicorp/go-syslog v1.0.0" +"github.com/hashicorp/go-syslog v1.0.0/go.mod" +"github.com/hashicorp/go-uuid v1.0.0/go.mod" +"github.com/hashicorp/go-uuid v1.0.1/go.mod" +"github.com/hashicorp/go-uuid v1.0.2" +"github.com/hashicorp/go-uuid v1.0.2/go.mod" +"github.com/hashicorp/go-version v1.1.0/go.mod" +"github.com/hashicorp/go-version v1.2.1" +"github.com/hashicorp/go-version v1.2.1/go.mod" +"github.com/hashicorp/golang-lru v0.5.0/go.mod" +"github.com/hashicorp/golang-lru v0.5.1/go.mod" +"github.com/hashicorp/golang-lru v0.5.4" +"github.com/hashicorp/golang-lru v0.5.4/go.mod" +"github.com/hashicorp/hcl v1.0.0" +"github.com/hashicorp/hcl v1.0.0/go.mod" +"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038" +"github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038/go.mod" +"github.com/hashicorp/logutils v1.0.0/go.mod" +"github.com/hashicorp/mdns v1.0.1" +"github.com/hashicorp/mdns v1.0.1/go.mod" +"github.com/hashicorp/mdns v1.0.4" +"github.com/hashicorp/mdns v1.0.4/go.mod" +"github.com/hashicorp/memberlist v0.2.2" +"github.com/hashicorp/memberlist v0.2.2/go.mod" +"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69" +"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod" +"github.com/hashicorp/raft v1.1.1/go.mod" +"github.com/hashicorp/raft v1.2.0" +"github.com/hashicorp/raft v1.2.0/go.mod" +"github.com/hashicorp/raft-autopilot v0.1.2" +"github.com/hashicorp/raft-autopilot v0.1.2/go.mod" +"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea" +"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod" +"github.com/hashicorp/serf v0.9.5" +"github.com/hashicorp/serf v0.9.5/go.mod" +"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086" +"github.com/hashicorp/vault/api v1.0.5-0.20200717191844-f687267c8086/go.mod" +"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267" +"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod" +"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443" +"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod" +"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod" +"github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce" +"github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce/go.mod" +"github.com/hpcloud/tail v1.0.0/go.mod" +"github.com/imdario/mergo v0.3.5/go.mod" +"github.com/imdario/mergo v0.3.6" +"github.com/imdario/mergo v0.3.6/go.mod" +"github.com/inconshreveable/mousetrap v1.0.0/go.mod" +"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod" +"github.com/jackc/pgx v3.3.0+incompatible/go.mod" +"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da" +"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod" +"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af" +"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod" +"github.com/jonboulle/clockwork v0.1.0/go.mod" +"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod" +"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f" +"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod" +"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod" +"github.com/json-iterator/go v1.1.6/go.mod" +"github.com/json-iterator/go v1.1.7/go.mod" +"github.com/json-iterator/go v1.1.9" +"github.com/json-iterator/go v1.1.9/go.mod" +"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod" +"github.com/julienschmidt/httprouter v1.2.0/go.mod" +"github.com/kisielk/errcheck v1.1.0/go.mod" +"github.com/kisielk/errcheck v1.2.0/go.mod" +"github.com/kisielk/gotool v1.0.0/go.mod" +"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" +"github.com/konsorten/go-windows-terminal-sequences v1.0.2" +"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod" +"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod" +"github.com/kr/pretty v0.1.0/go.mod" +"github.com/kr/pretty v0.2.0/go.mod" +"github.com/kr/pretty v0.2.1" +"github.com/kr/pretty v0.2.1/go.mod" +"github.com/kr/pty v1.1.1/go.mod" +"github.com/kr/text v0.1.0" +"github.com/kr/text v0.1.0/go.mod" +"github.com/lib/pq v1.1.1/go.mod" +"github.com/linode/linodego v0.7.1" +"github.com/linode/linodego v0.7.1/go.mod" +"github.com/magiconair/properties v1.8.0/go.mod" +"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod" +"github.com/mattn/go-colorable v0.0.9/go.mod" +"github.com/mattn/go-colorable v0.1.4/go.mod" +"github.com/mattn/go-colorable v0.1.6" +"github.com/mattn/go-colorable v0.1.6/go.mod" +"github.com/mattn/go-isatty v0.0.3/go.mod" +"github.com/mattn/go-isatty v0.0.8/go.mod" +"github.com/mattn/go-isatty v0.0.10/go.mod" +"github.com/mattn/go-isatty v0.0.11/go.mod" +"github.com/mattn/go-isatty v0.0.12" +"github.com/mattn/go-isatty v0.0.12/go.mod" +"github.com/mattn/go-runewidth v0.0.3/go.mod" +"github.com/matttproud/golang_protobuf_extensions v1.0.1" +"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" +"github.com/miekg/dns v1.0.14/go.mod" +"github.com/miekg/dns v1.1.26/go.mod" +"github.com/miekg/dns v1.1.41" +"github.com/miekg/dns v1.1.41/go.mod" +"github.com/mitchellh/cli v1.0.0/go.mod" +"github.com/mitchellh/cli v1.1.0" +"github.com/mitchellh/cli v1.1.0/go.mod" +"github.com/mitchellh/copystructure v1.0.0" +"github.com/mitchellh/copystructure v1.0.0/go.mod" +"github.com/mitchellh/go-homedir v1.1.0" +"github.com/mitchellh/go-homedir v1.1.0/go.mod" +"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod" +"github.com/mitchellh/go-testing-interface v1.0.0/go.mod" +"github.com/mitchellh/go-testing-interface v1.14.0" +"github.com/mitchellh/go-testing-interface v1.14.0/go.mod" +"github.com/mitchellh/go-wordwrap v1.0.0/go.mod" +"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452" +"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod" +"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod" +"github.com/mitchellh/mapstructure v1.1.2/go.mod" +"github.com/mitchellh/mapstructure v1.3.2/go.mod" +"github.com/mitchellh/mapstructure v1.3.3" +"github.com/mitchellh/mapstructure v1.3.3/go.mod" +"github.com/mitchellh/pointerstructure v1.0.0" +"github.com/mitchellh/pointerstructure v1.0.0/go.mod" +"github.com/mitchellh/reflectwalk v1.0.0/go.mod" +"github.com/mitchellh/reflectwalk v1.0.1" +"github.com/mitchellh/reflectwalk v1.0.1/go.mod" +"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" +"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd" +"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" +"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod" +"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" +"github.com/modern-go/reflect2 v1.0.1" +"github.com/modern-go/reflect2 v1.0.1/go.mod" +"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod" +"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod" +"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod" +"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2" +"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod" +"github.com/oklog/run v1.0.0/go.mod" +"github.com/oklog/ulid v1.3.1/go.mod" +"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod" +"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod" +"github.com/onsi/ginkgo v1.6.0/go.mod" +"github.com/onsi/ginkgo v1.8.0/go.mod" +"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod" +"github.com/onsi/gomega v1.5.0/go.mod" +"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c" +"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod" +"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod" +"github.com/pascaldekloe/goe v0.1.0" +"github.com/pascaldekloe/goe v0.1.0/go.mod" +"github.com/patrickmn/go-cache v2.1.0+incompatible" +"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod" +"github.com/pelletier/go-toml v1.2.0/go.mod" +"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod" +"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod" +"github.com/pierrec/lz4 v2.5.2+incompatible" +"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod" +"github.com/pkg/errors v0.8.0/go.mod" +"github.com/pkg/errors v0.8.1" +"github.com/pkg/errors v0.8.1/go.mod" +"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod" +"github.com/pmezard/go-difflib v1.0.0" +"github.com/pmezard/go-difflib v1.0.0/go.mod" +"github.com/posener/complete v1.1.1/go.mod" +"github.com/posener/complete v1.2.3" +"github.com/posener/complete v1.2.3/go.mod" +"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35" +"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod" +"github.com/prometheus/client_golang v0.9.1/go.mod" +"github.com/prometheus/client_golang v0.9.2/go.mod" +"github.com/prometheus/client_golang v0.9.3/go.mod" +"github.com/prometheus/client_golang v1.0.0/go.mod" +"github.com/prometheus/client_golang v1.4.0" +"github.com/prometheus/client_golang v1.4.0/go.mod" +"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" +"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod" +"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod" +"github.com/prometheus/client_model v0.2.0" +"github.com/prometheus/client_model v0.2.0/go.mod" +"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod" +"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod" +"github.com/prometheus/common v0.4.0/go.mod" +"github.com/prometheus/common v0.4.1/go.mod" +"github.com/prometheus/common v0.9.1" +"github.com/prometheus/common v0.9.1/go.mod" +"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod" +"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod" +"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod" +"github.com/prometheus/procfs v0.0.2/go.mod" +"github.com/prometheus/procfs v0.0.8" +"github.com/prometheus/procfs v0.0.8/go.mod" +"github.com/prometheus/tsdb v0.7.1/go.mod" +"github.com/rboyer/safeio v0.2.1" +"github.com/rboyer/safeio v0.2.1/go.mod" +"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03" +"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod" +"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod" +"github.com/rs/zerolog v1.4.0/go.mod" +"github.com/russross/blackfriday v1.5.2/go.mod" +"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod" +"github.com/ryanuber/columnize v2.1.0+incompatible" +"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod" +"github.com/ryanuber/go-glob v1.0.0" +"github.com/ryanuber/go-glob v1.0.0/go.mod" +"github.com/satori/go.uuid v1.2.0/go.mod" +"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod" +"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod" +"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529" +"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod" +"github.com/shirou/gopsutil/v3 v3.20.10" +"github.com/shirou/gopsutil/v3 v3.20.10/go.mod" +"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod" +"github.com/sirupsen/logrus v1.0.6/go.mod" +"github.com/sirupsen/logrus v1.2.0/go.mod" +"github.com/sirupsen/logrus v1.4.2" +"github.com/sirupsen/logrus v1.4.2/go.mod" +"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d" +"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod" +"github.com/soheilhy/cmux v0.1.4/go.mod" +"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" +"github.com/spf13/afero v1.1.2/go.mod" +"github.com/spf13/afero v1.2.1/go.mod" +"github.com/spf13/afero v1.2.2/go.mod" +"github.com/spf13/cast v1.3.0/go.mod" +"github.com/spf13/cobra v0.0.5/go.mod" +"github.com/spf13/jwalterweatherman v1.0.0/go.mod" +"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod" +"github.com/spf13/pflag v1.0.3/go.mod" +"github.com/spf13/pflag v1.0.5" +"github.com/spf13/pflag v1.0.5/go.mod" +"github.com/spf13/viper v1.3.2/go.mod" +"github.com/spf13/viper v1.4.0/go.mod" +"github.com/stretchr/objx v0.1.0/go.mod" +"github.com/stretchr/objx v0.1.1" +"github.com/stretchr/objx v0.1.1/go.mod" +"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod" +"github.com/stretchr/testify v1.2.2/go.mod" +"github.com/stretchr/testify v1.3.0/go.mod" +"github.com/stretchr/testify v1.4.0/go.mod" +"github.com/stretchr/testify v1.6.1" +"github.com/stretchr/testify v1.6.1/go.mod" +"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible" +"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod" +"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod" +"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod" +"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926" +"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod" +"github.com/ugorji/go v1.1.4/go.mod" +"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod" +"github.com/vmware/govmomi v0.18.0" +"github.com/vmware/govmomi v0.18.0/go.mod" +"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod" +"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod" +"github.com/yuin/goldmark v1.1.27/go.mod" +"go.etcd.io/bbolt v1.3.2/go.mod" +"go.opencensus.io v0.21.0/go.mod" +"go.opencensus.io v0.22.0" +"go.opencensus.io v0.22.0/go.mod" +"go.uber.org/atomic v1.4.0/go.mod" +"go.uber.org/goleak v1.1.10" +"go.uber.org/goleak v1.1.10/go.mod" +"go.uber.org/multierr v1.1.0/go.mod" +"go.uber.org/zap v1.10.0/go.mod" +"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod" +"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod" +"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod" +"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod" +"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" +"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod" +"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod" +"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod" +"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod" +"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod" +"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod" +"golang.org/x/crypto v0.0.0-20200930160638-afb6bcd081ae" +"golang.org/x/crypto v0.0.0-20200930160638-afb6bcd081ae/go.mod" +"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" +"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" +"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" +"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod" +"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" +"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod" +"golang.org/x/lint v0.0.0-20190930215403-16217165b5de" +"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod" +"golang.org/x/mod v0.2.0" +"golang.org/x/mod v0.2.0/go.mod" +"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod" +"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" +"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" +"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" +"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod" +"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod" +"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod" +"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod" +"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod" +"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod" +"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" +"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" +"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod" +"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" +"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod" +"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod" +"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" +"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod" +"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod" +"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod" +"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod" +"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod" +"golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1" +"golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod" +"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" +"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod" +"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45" +"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod" +"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" +"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" +"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" +"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" +"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" +"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" +"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c" +"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod" +"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod" +"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod" +"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" +"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" +"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" +"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod" +"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod" +"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod" +"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod" +"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod" +"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod" +"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" +"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod" +"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod" +"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" +"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" +"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" +"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod" +"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod" +"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod" +"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod" +"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod" +"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod" +"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod" +"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" +"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod" +"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod" +"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod" +"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod" +"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" +"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod" +"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" +"golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod" +"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44" +"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod" +"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod" +"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod" +"golang.org/x/text v0.3.0/go.mod" +"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod" +"golang.org/x/text v0.3.2/go.mod" +"golang.org/x/text v0.3.3/go.mod" +"golang.org/x/text v0.3.6" +"golang.org/x/text v0.3.6/go.mod" +"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod" +"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" +"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod" +"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e" +"golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod" +"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod" +"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" +"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod" +"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod" +"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" +"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" +"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" +"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod" +"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod" +"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" +"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod" +"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod" +"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod" +"golang.org/x/tools v0.0.0-20200513154647-78b527d18275" +"golang.org/x/tools v0.0.0-20200513154647-78b527d18275/go.mod" +"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" +"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" +"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543" +"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" +"google.golang.org/api v0.4.0/go.mod" +"google.golang.org/api v0.9.0" +"google.golang.org/api v0.9.0/go.mod" +"google.golang.org/appengine v1.1.0/go.mod" +"google.golang.org/appengine v1.4.0/go.mod" +"google.golang.org/appengine v1.5.0/go.mod" +"google.golang.org/appengine v1.6.0" +"google.golang.org/appengine v1.6.0/go.mod" +"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" +"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod" +"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod" +"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" +"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod" +"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55" +"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" +"google.golang.org/grpc v1.14.0/go.mod" +"google.golang.org/grpc v1.19.0/go.mod" +"google.golang.org/grpc v1.20.1/go.mod" +"google.golang.org/grpc v1.21.0/go.mod" +"google.golang.org/grpc v1.22.0/go.mod" +"google.golang.org/grpc v1.23.0/go.mod" +"google.golang.org/grpc v1.25.1" +"google.golang.org/grpc v1.25.1/go.mod" +"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod" +"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" +"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" +"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" +"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" +"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" +"gopkg.in/fsnotify.v1 v1.4.7/go.mod" +"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod" +"gopkg.in/inf.v0 v0.9.1" +"gopkg.in/inf.v0 v0.9.1/go.mod" +"gopkg.in/resty.v1 v1.12.0" +"gopkg.in/resty.v1 v1.12.0/go.mod" +"gopkg.in/square/go-jose.v2 v2.5.1" +"gopkg.in/square/go-jose.v2 v2.5.1/go.mod" +"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" +"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod" +"gopkg.in/yaml.v2 v2.2.1/go.mod" +"gopkg.in/yaml.v2 v2.2.2/go.mod" +"gopkg.in/yaml.v2 v2.2.4/go.mod" +"gopkg.in/yaml.v2 v2.2.5/go.mod" +"gopkg.in/yaml.v2 v2.2.8" +"gopkg.in/yaml.v2 v2.2.8/go.mod" +"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" +"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" +"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" +"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod" +"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod" +"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" +"k8s.io/api v0.16.9" +"k8s.io/api v0.16.9/go.mod" +"k8s.io/apimachinery v0.16.9" +"k8s.io/apimachinery v0.16.9/go.mod" +"k8s.io/client-go v0.16.9" +"k8s.io/client-go v0.16.9/go.mod" +"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod" +"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod" +"k8s.io/klog v0.3.0/go.mod" +"k8s.io/klog v1.0.0" +"k8s.io/klog v1.0.0/go.mod" +"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod" +"k8s.io/utils v0.0.0-20190801114015-581e00157fb1" +"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod" +"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod" +"sigs.k8s.io/yaml v1.1.0" +"sigs.k8s.io/yaml v1.1.0/go.mod" +) +go-module_set_globals +SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" +RESTRICT+=" test" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="dev-go/gox" +COMMON_DEPEND=" + acct-group/consul + acct-user/consul" + DEPEND="${COMMON_DEPEND}" + RDEPEND="${COMMON_DEPEND}" + +src_compile() { + local git_commit + git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go) + git_commit=${git_commit#*\"} + git_commit=${git_commit%\"*} + [[ ${git_commit} ]] || die "failed to determine gitCommit" + + # The dev target sets causes build.sh to set appropriate XC_OS + # and XC_ARCH, and skips generation of an unused zip file, + # avoiding a dependency on app-arch/zip. + GIT_DESCRIBE="v${PV}" \ + GIT_DIRTY="" \ + GIT_COMMIT="${git_commit}" \ + emake dev-build +} + +src_install() { + dobin bin/consul + + keepdir /etc/consul.d + insinto /etc/consul.d + doins "${FILESDIR}/"*.json.example + + keepdir /var/log/consul + fowners consul:consul /var/log/consul + + newinitd "${FILESDIR}/consul.initd" "${PN}" + newconfd "${FILESDIR}/consul.confd" "${PN}" + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" + systemd_dounit "${FILESDIR}/consul.service" +} diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild index 26b313cc330b..52b06456cbec 100644 --- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild +++ b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild @@ -10,12 +10,11 @@ DESCRIPTION="Command-line tools that serve as client interface to the Amazon EC2 HOMEPAGE="https://aws.amazon.com/en/tools/" SRC_URI="http://s3.amazonaws.com/ec2-downloads/${P}.zip" -LICENSE="Amazon -|| ( Ruby GPL-2 )" +LICENSE="Amazon || ( Ruby GPL-2 )" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" RDEPEND=" ${RUBY_DEPS} virtual/ruby-ssl diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild index bbe9dc8b3b9c..9e0e8c5ef8f2 100644 --- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild +++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" + GNOME_ORG_MODULE="gamin" GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools eutils flag-o-matic libtool multilib gnome.org +inherit autotools epatch flag-o-matic multilib gnome.org DESCRIPTION="Library providing the FAM File Alteration Monitor API" HOMEPAGE="https://www.gnome.org/~veillard/gamin/" diff --git a/app-admin/puppet/puppet-6.19.1.ebuild b/app-admin/puppet/puppet-6.19.1.ebuild index 11fd2d3c5085..bf3ca9d2e34f 100644 --- a/app-admin/puppet/puppet-6.19.1.ebuild +++ b/app-admin/puppet/puppet-6.19.1.ebuild @@ -1,17 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" USE_RUBY="ruby24 ruby25 ruby26 ruby27" - RUBY_FAKEGEM_RECIPE_TEST="rspec3" - RUBY_FAKEGEM_TASK_DOC="doc:all" - RUBY_FAKEGEM_EXTRAINSTALL="locales" -inherit eutils ruby-fakegem eapi7-ver +inherit epatch ruby-fakegem DESCRIPTION="A system automation and configuration management software." HOMEPAGE="https://puppet.com/" diff --git a/app-admin/puppet/puppet-7.4.0.ebuild b/app-admin/puppet/puppet-7.4.0.ebuild index e5c11f9a8e24..4feaa50a1748 100644 --- a/app-admin/puppet/puppet-7.4.0.ebuild +++ b/app-admin/puppet/puppet-7.4.0.ebuild @@ -4,14 +4,11 @@ EAPI="6" USE_RUBY="ruby24 ruby25 ruby26 ruby27" - RUBY_FAKEGEM_RECIPE_TEST="rspec3" - RUBY_FAKEGEM_TASK_DOC="doc:all" - RUBY_FAKEGEM_EXTRAINSTALL="locales" -inherit eutils ruby-fakegem eapi7-ver +inherit epatch ruby-fakegem DESCRIPTION="A system automation and configuration management software." HOMEPAGE="https://puppet.com/" diff --git a/app-admin/puppet/puppet-7.5.0.ebuild b/app-admin/puppet/puppet-7.5.0.ebuild index 5b564665270e..d241ec554c38 100644 --- a/app-admin/puppet/puppet-7.5.0.ebuild +++ b/app-admin/puppet/puppet-7.5.0.ebuild @@ -4,14 +4,11 @@ EAPI="6" USE_RUBY="ruby24 ruby25 ruby26 ruby27" - RUBY_FAKEGEM_RECIPE_TEST="rspec3" - RUBY_FAKEGEM_TASK_DOC="doc:all" - RUBY_FAKEGEM_EXTRAINSTALL="locales" -inherit eutils ruby-fakegem eapi7-ver +inherit epatch ruby-fakegem DESCRIPTION="A system automation and configuration management software." HOMEPAGE="https://puppet.com/" @@ -109,12 +106,14 @@ all_ruby_install() { fowners -R :puppet /var/lib/puppet if use ldap ; then - insinto /etc/openldap/schema; doins ext/ldap/puppet.schema + insinto /etc/openldap/schema + doins ext/ldap/puppet.schema fi # ext and examples files for f in $(find ext examples -type f) ; do - docinto "$(dirname ${f})"; dodoc "${f}" + docinto "$(dirname ${f})" + dodoc "${f}" done } diff --git a/app-admin/system-tools-backends/system-tools-backends-2.10.2-r1.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.10.2-r1.ebuild index f68f7be387b3..35cc26093e19 100644 --- a/app-admin/system-tools-backends/system-tools-backends-2.10.2-r1.ebuild +++ b/app-admin/system-tools-backends/system-tools-backends-2.10.2-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" GCONF_DEBUG="no" GNOME_TARBALL_SUFFIX="bz2" -inherit eutils gnome2 readme.gentoo user +inherit epatch gnome2 readme.gentoo user DESCRIPTION="Tools aimed to make easy the administration of UNIX systems" HOMEPAGE="https://projects.gnome.org/gst/" diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest index c5a55723f6f4..a7fee8c3969b 100644 --- a/app-admin/vault/Manifest +++ b/app-admin/vault/Manifest @@ -6,3 +6,5 @@ DIST vault-1.6.1-webui.tar.xz 1277456 BLAKE2B 7a63f676e4138c9ac0a9e550f5c195a681 DIST vault-1.6.1.tar.gz 39080880 BLAKE2B a66f48c0e7a4edbe9765f7f3e9349ee318415d42ebac9763d48fed4060a3a81613246528339e5cce091dc3ba3ad70062dc5e3b13fce29611a37729a81cf31bc7 SHA512 3dd272b5ca6b2858ab9c65a1abcf25bfd01d554c8f8c380ab1384c216bf14f9719ae0947f764cd7a08688899b7e5805e3ce2a96086772035abe54012b5f4ea72 DIST vault-1.6.3-webui.tar.xz 1273812 BLAKE2B e86d36c98919c5a33b3a9a58bd6a5c042c62c1e12a62762e22928b516b200b7e2e3f4a394cf80d65b1c6a847f70b5b80ff042d6a55a3753df9e0471183a80e3a SHA512 f113bbab76799791b0c64bf8cf169a9da4841377ea38589044ad022e564c2e2a3b5a0233b9ab14c06b8a92747ac36d1f91f77b484e49b953519760d743ab6482 DIST vault-1.6.3.tar.gz 39092957 BLAKE2B 8b421f5d8f81d00ed7bf3380ec6192984ad7a3cd8f3f98bfcd76729874b2a2121785cfd2b27497e54414ebe1481cef35f1cf2be8472bc50aa0a3278a2f7747ff SHA512 ff8e1aa43ea0703327ab0a175460304c95a172512763cf63d8f1fe584d31e90650ff254e572a6a6b8e230ff181d85a2f042f4f7e1881ba9e1d5897c6de8e8dee +DIST vault-1.7.0-webui.tar.xz 1331492 BLAKE2B 97c5255b9c8a3ee5814224f236bb7a1ea45200cbbe57996d56bb700c256edcc83d738e2814a02e205a6317d6adbb373565fb4cbe5d01c0592291ac0484b55389 SHA512 82b095a40b0fedb7c59ff45fe589f9ec1dbffc0536a3a1bf56b35e1223f9bedb0fdcb75777d27aabcc3bd01e458889b045f766693114d8c989f2ac7dd732aa8b +DIST vault-1.7.0.tar.gz 39285782 BLAKE2B 539c138625a2a8861e32f65f4da6b566427884ef1ef5d1850efcb9d8176d34c1b2e51a7fe68c70737e451a2bef9cd493c695c1b200c1ebc83826ecd566d34550 SHA512 08a0cc7762b83218a38dc741121771a3c58c9914bef3fee70a76cd773aea352402aa9f8eaad39a8b1695bdd900ea53d00c1535d27d3d8f39036293751fe48521 diff --git a/app-admin/vault/vault-1.7.0.ebuild b/app-admin/vault/vault-1.7.0.ebuild new file mode 100644 index 000000000000..64280d983e90 --- /dev/null +++ b/app-admin/vault/vault-1.7.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit fcaps go-module systemd + +DESCRIPTION="A tool for managing secrets" +HOMEPAGE="https://vaultproject.io/" +VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz" +SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz + webui? ( + https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE} + )" + +LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+webui" + +BDEPEND="dev-go/gox + >=dev-lang/go-1.15.3" +COMMON_DEPEND="acct-group/vault + acct-user/vault" + DEPEND="${COMMON_DEPEND}" + RDEPEND="${COMMON_DEPEND}" + +FILECAPS=( + -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} +) + +RESTRICT+=" test" + +src_prepare() { + default + # Avoid the need to have a git checkout + sed -e 's:^\(GIT_COMMIT=\).*:\1:' \ + -e 's:^\(GIT_DIRTY=\).*:\1:' \ + -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \ + -i scripts/build.sh || die + sed -e "/hooks/d" \ + -e 's|^\([[:space:]]*\)goimports .*)|\1true|' \ + -i Makefile || die + if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then + mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" || + die "mv failed" + fi +} + +src_compile() { + mkdir "${T}"/bin || die + BUILD_TAGS="$(usex webui ui '')" \ + GOFLAGS="-mod=vendor" \ + GOPATH="${T}" \ + XC_ARCH=$(go env GOARCH) \ + XC_OS=$(go env GOOS) \ + XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \ + emake +} + +src_install() { + dobin bin/${PN} + dodoc CHANGELOG.md CONTRIBUTING.md README.md + insinto /etc/${PN}.d + doins "${FILESDIR}/"*.json.example + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + systemd_dounit "${FILESDIR}/${PN}.service" + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} +} + +pkg_postinst() { + fcaps_pkg_postinst + go-module_pkg_postinst +} diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08.ebuild index 488850e73bc0..dfa19a5d9eeb 100644 --- a/app-admin/webalizer/webalizer-2.23.08.ebuild +++ b/app-admin/webalizer/webalizer-2.23.08.ebuild @@ -6,7 +6,7 @@ EAPI="5" -inherit versionator eutils webapp db-use +inherit versionator epatch webapp db-use WEBAPP_MANUAL_SLOT="yes" XTENDED_VER="RB30" diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index 884fe5a116bf..9fbb8ea61f15 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/cksfv/Manifest b/app-arch/cksfv/Manifest index 516489a30ace..d3a6b50f4253 100644 --- a/app-arch/cksfv/Manifest +++ b/app-arch/cksfv/Manifest @@ -1 +1,2 @@ DIST cksfv-1.3.14.tar.bz2 26114 BLAKE2B 696ae3499bc2b1c566a40da202b70d30777ee07a7923ac567345872098626c82820a9bb75b711915e2274a3e0f1d7804ba58f8ce41dcca375391d778ba135a02 SHA512 016c2f61632980678957fe4b5bc9ecb30360efd548ff09bfbb7a31cc6fc36f6fe7936d3d819fe468a6208c71f8b625662aa3ae0abd668435d7273e149d7e4519 +DIST cksfv-1.3.15.tar.bz2 27282 BLAKE2B c1df7bac982815915327753d8f6b888cc53395a0066bc5b34fb310d540c50c3006be2b9f31ebfac269d961126b0046a5b63fbbbe9c05c265953b2d2a94602a7a SHA512 a0b5286e0dce610e8b482a55cf8af38f8f8256e175435b6f2518c6566ea844c3cf2981f96c7600c7eb9b23b35cf19f1b55f540ba0f73f1267e4593e744858d43 diff --git a/app-arch/cksfv/cksfv-1.3.15.ebuild b/app-arch/cksfv/cksfv-1.3.15.ebuild new file mode 100644 index 000000000000..82027ff3bdc6 --- /dev/null +++ b/app-arch/cksfv/cksfv-1.3.15.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="SFV checksum utility (simple file verification)" +HOMEPAGE="http://zakalwe.fi/~shd/foss/cksfv/" +SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.15-destdir.patch +) + +src_configure() { + # note: not an autoconf configure script + ./configure \ + --compiler="$(tc-getCC)" \ + --prefix="${EPREFIX}"/usr \ + --bindir="${EPREFIX}"/usr/bin \ + --mandir="${EPREFIX}"/usr/share/man || die +} diff --git a/app-arch/cksfv/files/cksfv-1.3.15-destdir.patch b/app-arch/cksfv/files/cksfv-1.3.15-destdir.patch new file mode 100644 index 000000000000..c9ae19b442d3 --- /dev/null +++ b/app-arch/cksfv/files/cksfv-1.3.15-destdir.patch @@ -0,0 +1,18 @@ +The build system doesn't know about DESTDIR which is a problem for us +when we want to have isolation in our phases (src_configure shouldn't +need to know ${ED}). +--- a/Makefile.in ++++ b/Makefile.in +@@ -23,9 +23,9 @@ all: + cd src && $(MAKE) + + install: all +- mkdir -p "$(BINDIR)" "$(MANDIR)/man1/" +- install src/cksfv "$(BINDIR)" +- install -m 644 cksfv.1 "$(MANDIR)/man1/" ++ mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(MANDIR)/man1/" ++ install src/cksfv "$(DESTDIR)$(BINDIR)" ++ install -m 644 cksfv.1 "$(DESTDIR)$(MANDIR)/man1/" + + clean: + rm -f *.o *~ *.core core diff --git a/app-arch/cksfv/metadata.xml b/app-arch/cksfv/metadata.xml index 6f49eba8f496..c3a8ab4db220 100644 --- a/app-arch/cksfv/metadata.xml +++ b/app-arch/cksfv/metadata.xml @@ -1,5 +1,8 @@ - + + + heikkiorsila/cksfv + diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest index bc4fe034a070..a1dd5e4959a0 100644 --- a/app-arch/lxqt-archiver/Manifest +++ b/app-arch/lxqt-archiver/Manifest @@ -1 +1,2 @@ DIST lxqt-archiver-0.3.0.tar.xz 157492 BLAKE2B 05d9862c75cacf3b73670333a5b2dafb6abfcfd7433a1ebc3d27948122db875f892eb58a05221c880d1ac23530362ae4d9e7c6ebe0f06552b10bb903d51a6868 SHA512 840fae890611b081a1355ceb58ca65276784e6825822859ff2d6506190212268f1c67733dc94c65c9c5758f8d6a25c286c2b339356a50f29474b0c7ce2569d2c +DIST lxqt-archiver-0.4.0.tar.xz 167124 BLAKE2B 2d9295200c284e2dc0c2b538a92952dd0a11882211e5d1d5838141583b4a595b65c26a057e5c9733190182a5f78958e15d0e086356d75dd4e0c72d3510a34cfc SHA512 e1b323cd118af3726009e153c4f9766ec53b29fa0280530da16e2101d36ec45b55de0fe3d87c1386a4e5b3d88712fd209659b4ebb9344af689812600ae136ed6 diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild new file mode 100644 index 000000000000..4bf9466ba805 --- /dev/null +++ b/app-arch/lxqt-archiver/lxqt-archiver-0.4.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg-utils + +DESCRIPTION="Qt GUI File Archiver" +HOMEPAGE="https://lxqt.github.io/" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2 GPL-2+" +SLOT="0" + +BDEPEND=" + dev-qt/linguist-tools:5 + >=dev-util/lxqt-build-tools-0.9.0 +" +DEPEND=" + dev-libs/json-glib + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + >=x11-libs/libfm-qt-0.17.0 +" +RDEPEND="${DEPEND}" + +pkg_postinst() { + xdg_desktop_database_update + + elog "Please note that this is only a graphical front-end, and additional" + elog "packages are needed to have support for specific file formats." + elog "For example, to be able to work with the 7-Zip format, the" + elog "'app-arch/p7zip' package may be used." + elog "For the full list of supported formats, see the 'README.md' file:" + elog "https://github.com/lxqt/lxqt-archiver/blob/master/README.md" +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch b/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch new file mode 100644 index 000000000000..3396b59a309c --- /dev/null +++ b/app-arch/xdms/files/xdms-1.3.2-dont-compress-man-pages.patch @@ -0,0 +1,13 @@ +From: Sam James +Subject: [PATCH 2/2] Don't compress man pages +--- a/Makefile.in ++++ b/Makefile.in +@@ -11,5 +11,4 @@ install: xdms + install xdms.txt COPYING ChangeLog.txt ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}/ + chmod og+rx ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/bin/xdms + chmod -R og+rX ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION} +- gzip < xdms.1 > xdms.1.gz +- install xdms.1.gz ${DESTDIR}{PREFIX}/share/man/man1/ ++ install xdms.1 ${DESTDIR}{PREFIX}/share/man/man1/ +-- + diff --git a/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch b/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch new file mode 100644 index 000000000000..3db969932084 --- /dev/null +++ b/app-arch/xdms/files/xdms-1.3.2-respect-DESTDIR.patch @@ -0,0 +1,22 @@ +From: Sam James +Subject: [PATCH 1/2] Respect DESTDIR +--- a/Makefile.in ++++ b/Makefile.in +@@ -6,10 +6,10 @@ clean: + $(MAKE) -C src clean + + install: xdms +- mkdir -p {PREFIX}/bin {PREFIX}/share/doc/xdms-{VERSION} {PREFIX}/share/man/man1 +- install src/xdms {PREFIX}/bin/ +- install xdms.txt COPYING ChangeLog.txt {PREFIX}/share/doc/xdms-{VERSION}/ +- chmod og+rx {PREFIX}/bin {PREFIX}/bin/xdms +- chmod -R og+rX {PREFIX}/share/doc/xdms-{VERSION} ++ mkdir -p ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION} ${DESTDIR}{PREFIX}/share/man/man1 ++ install src/xdms ${DESTDIR}{PREFIX}/bin/ ++ install xdms.txt COPYING ChangeLog.txt ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION}/ ++ chmod og+rx ${DESTDIR}{PREFIX}/bin ${DESTDIR}{PREFIX}/bin/xdms ++ chmod -R og+rX ${DESTDIR}{PREFIX}/share/doc/xdms-{VERSION} + gzip < xdms.1 > xdms.1.gz +- install xdms.1.gz {PREFIX}/share/man/man1/ ++ install xdms.1.gz ${DESTDIR}{PREFIX}/share/man/man1/ +-- diff --git a/app-arch/xdms/metadata.xml b/app-arch/xdms/metadata.xml index ec5a204b1712..3a9a20905857 100644 --- a/app-arch/xdms/metadata.xml +++ b/app-arch/xdms/metadata.xml @@ -9,4 +9,7 @@ Can extract the files contained inside the DMS archives, if the compressed disk is an AmigaDOS disk, using readdisk made by Bernd Schmidt. Can process multiple files in batch with a single command, and also use stdin and stdout for input and output of data. + + heikkiorsila/xdms + diff --git a/app-arch/xdms/xdms-1.3.2-r1.ebuild b/app-arch/xdms/xdms-1.3.2-r1.ebuild deleted file mode 100644 index 14f419cd4b8c..000000000000 --- a/app-arch/xdms/xdms-1.3.2-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="xDMS - Amiga DMS disk image decompressor" -HOMEPAGE="https://zakalwe.fi/~shd/foss/xdms" -SRC_URI="https://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="amd64 ~hppa ppc x86" -IUSE="" - -pkg_setup() { - tc-export CC -} - -src_prepare() { - default - sed -i Makefile.in \ - -e "s:COPYING::" \ - -e "s:share/doc/xdms-{VERSION}:share/doc/xdms-${PF}:" || die - sed -i -e "s:-O2::" src/Makefile.in || die -} - -src_configure() { - ./configure --prefix=/usr --package-prefix="${D}" || die -} diff --git a/app-arch/xdms/xdms-1.3.2-r2.ebuild b/app-arch/xdms/xdms-1.3.2-r2.ebuild new file mode 100644 index 000000000000..a1bc96f7f59f --- /dev/null +++ b/app-arch/xdms/xdms-1.3.2-r2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="xDMS - Amiga DMS disk image decompressor" +HOMEPAGE="https://zakalwe.fi/~shd/foss/xdms" +SRC_URI="https://zakalwe.fi/~shd/foss/xdms/${P}.tar.bz2" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="amd64 ~hppa ppc x86" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.2-respect-DESTDIR.patch + "${FILESDIR}"/${PN}-1.3.2-dont-compress-man-pages.patch +) + +src_prepare() { + default + + sed -i Makefile.in \ + -e "s:COPYING::" \ + -e "s:share/doc/xdms-{VERSION}:share/doc/${PF}:" || die + + sed -i -e "s:-O2::" src/Makefile.in || die +} + +src_configure() { + tc-export CC + + if [[ ${CHOST} == *-darwin* ]] ; then + # Needed to avoid typical "Undefined symbols for architecture x86_64" + append-ldflags -undefined dynamic_lookup + fi + + ./configure --prefix="${EPREFIX}"/usr || die +} diff --git a/app-arch/zpaq-extras/zpaq-extras-3.ebuild b/app-arch/zpaq-extras/zpaq-extras-3.ebuild index cb8fc5815ebf..f4bca00bfc94 100644 --- a/app-arch/zpaq-extras/zpaq-extras-3.ebuild +++ b/app-arch/zpaq-extras/zpaq-extras-3.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="A set of additional compression profiles for app-arch/zpaq" @@ -18,17 +19,15 @@ SRC_URI="http://mattmahoney.net/dc/bwt_j3.zip http://mattmahoney.net/dc/lz1.zip http://mattmahoney.net/dc/lazy100.zip http://mattmahoney.net/dc/lazy210.zip" +S="${WORKDIR}" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" RDEPEND=">=app-arch/zpaq-6.19" -S=${WORKDIR} - src_unpack() { local x for x in ${A}; do diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz index 841b7911f12a..caa47a1a7f14 100644 Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild index 932f8a9640d5..dd944952eb56 100644 --- a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild +++ b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit depend.apache eutils user systemd +inherit depend.apache epatch user systemd MY_P="BackupPC-${PV}" diff --git a/app-backup/reoback/reoback-1.0_p3-r1.ebuild b/app-backup/reoback/reoback-1.0_p3-r1.ebuild index 27b4e4caed43..fbd1b4e23e8b 100644 --- a/app-backup/reoback/reoback-1.0_p3-r1.ebuild +++ b/app-backup/reoback/reoback-1.0_p3-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils vcs-clean +inherit vcs-clean DESCRIPTION="Reoback Backup Solution" HOMEPAGE="http://reoback.sourceforge.net/" diff --git a/app-backup/tsm/tsm-8.1.6.0-r1.ebuild b/app-backup/tsm/tsm-8.1.6.0-r1.ebuild index cab9db6b1d19..8e4c399042d6 100644 --- a/app-backup/tsm/tsm-8.1.6.0-r1.ebuild +++ b/app-backup/tsm/tsm-8.1.6.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit versionator multilib eutils readme.gentoo-r1 rpm systemd pax-utils +inherit versionator readme.gentoo-r1 rpm systemd pax-utils DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API" HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery" @@ -126,7 +126,7 @@ src_install() { # We don't deal with SELinux compliance (yet), though. local RPM_INSTALL_PREFIX CLIENTDIR i RPM_INSTALL_PREFIX=/opt - CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client + CLIENTDIR=${RPM_INSTALL_PREFIX}/tivoli/tsm/client # Create links for messages; this is spread over several postin scripts. #for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do @@ -136,7 +136,7 @@ src_install() { # Mimic TIVsm-API64 postinstall script for i in libgpfs.so libdmapi.so; do - dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i} + dosym ../..${CLIENTDIR}/api/bin64/${i} /usr/lib64/${i} done # The TIVsm-BA postinstall script only does messages and ancient upgrades @@ -217,10 +217,10 @@ src_install() { pkg_postinst() { local i dirs for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do - if [[ ! -e $i ]]; then - touch $i || die - chown :tsm $i || die - chmod 0660 $i || die + if [[ ! -e ${i} ]]; then + touch ${i} || die + chown :tsm ${i} || die + chmod 0660 ${i} || die fi done diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz index f1b612bfe7cb..40df858592da 100644 Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ diff --git a/app-benchmarks/dbench/dbench-4.0.ebuild b/app-benchmarks/dbench/dbench-4.0.ebuild index 56219066741f..ca159a52f2a7 100644 --- a/app-benchmarks/dbench/dbench-4.0.ebuild +++ b/app-benchmarks/dbench/dbench-4.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils autotools toolchain-funcs +inherit autotools toolchain-funcs DESCRIPTION="Popular filesystem benchmark" SRC_URI="https://www.samba.org/ftp/pub/tridge/dbench/${P}.tar.gz" diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz index bc7f72c6994e..2b7938d4ede7 100644 Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r1.ebuild index 317cc629ee9f..a059a13f7d59 100644 --- a/app-cdr/cdw/cdw-0.8.1-r1.ebuild +++ b/app-cdr/cdw/cdw-0.8.1-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools toolchain-funcs DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools" @@ -10,7 +11,7 @@ SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" RDEPEND=" app-cdr/cdrtools diff --git a/app-cdr/cdw/cdw-0.8.1.ebuild b/app-cdr/cdw/cdw-0.8.1.ebuild deleted file mode 100644 index b4597335f09b..000000000000 --- a/app-cdr/cdw/cdw-0.8.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools" -HOMEPAGE="http://cdw.sourceforge.net" -SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -RDEPEND=" - app-cdr/cdrtools - app-cdr/dvd+rw-tools - dev-libs/libburn - dev-libs/libcdio[-minimal] - sys-libs/ncurses:*[unicode] -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_configure() { - econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" -} - -src_install() { - DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \ - default -} diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild index 1e52c861c848..0c9539fc86eb 100644 --- a/app-cdr/cdw/cdw-9999.ebuild +++ b/app-cdr/cdw/cdw-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw" ECVS_MODULE="cdw" ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}" - inherit autotools cvs toolchain-funcs DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools" diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index 2a63654cf620..1818a58f2d93 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/minisign/minisign-0.9.ebuild b/app-crypt/minisign/minisign-0.9.ebuild index 6b1c1c8ca147..315fa2a378d0 100644 --- a/app-crypt/minisign/minisign-0.9.ebuild +++ b/app-crypt/minisign/minisign-0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git" else SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc64" + KEYWORDS="~amd64 ~hppa ~ia64 ~ppc64 ~sparc" fi LICENSE="ISC" diff --git a/app-crypt/openpgp-keys-openzfs/Manifest b/app-crypt/openpgp-keys-openzfs/Manifest new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/app-crypt/openpgp-keys-openzfs/files/29D5610EAE2941E355A2FE8AB97467AAC77B9667-nedbass.asc b/app-crypt/openpgp-keys-openzfs/files/29D5610EAE2941E355A2FE8AB97467AAC77B9667-nedbass.asc new file mode 100644 index 000000000000..215a05fb184a --- /dev/null +++ b/app-crypt/openpgp-keys-openzfs/files/29D5610EAE2941E355A2FE8AB97467AAC77B9667-nedbass.asc @@ -0,0 +1,51 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFY9SoEBEACjL6PIUuTmkMOhXaVo/Pe+/pCyBLoYzD2m1Yfj0MOVFbjf/74o +LCwc2im1IYoCTwgwd8HkBb50xoRiPyAdN6gpCfiKHxgFnvIwHr1r/Es9SbJm3aJr +X1effY76ZSwKOmGZr5CxIWCbYGxJLSZGNRaMrDuBUP3jSR9AlMKJS1vwGvr5MJYt +6rVWpwDQ6IRwZ5eeJL+CcXG+bCBIDydK+pb2Rr4b6R4pea72L4u7bYNDGRwWHcbg +4NE9JeFD/6hlpSrKMfibEeg93rh8AXAI+0OHYk4a1/ExljxGQS9V/oyjrJbjW4lZ ++z2VoAP4yViVO+bTJ1r3f3v7SopEPy4lSHJ830ydegk/42K8nm4zcCQfB3glUosK +3DW00SU1H8aj/GmekllKlH10ldRey4tUG6SkUYWJGpeQOZ9n7bRrTMRNYbfYJn0e +IS5oocOEcdgto2iIn6wSln3FtdBLFYRJ1tKa5D6GTKJFQB3Omqdklp+zBF6Xj6xn +z+TFe0QYZPOxL8ml57hfmD8KtKFo5kRA1/ekLvyLFtXswUsR+mIOLHzKDfOf95IP +wSVNAknmWvY+6xjtg6attHi2UI24XRCziM2SBd7dpv4ZwRiu/68ZFxvj/SD63xwI +G3i6DU29SVcQEocDfTEudHa0ltoT8byNZO0COv41/zsPEPTxUv1dYB7vVQARAQAB +tDJOZWQgQWFyb24gQmFzcyAoQ09ERSBTSUdOSU5HIEtFWSkgPGJhc3M2QGxsbmwu +Z292PokCNwQTAQIAIQIbAwIeAQIXgAUCVj1LFAULCQgHAwUVCgkICwUWAgMBAAAK +CRC5dGeqx3uWZ1KSD/9iJztApSFtrBFN0+iXnb20nFGMs0T01aWA+F9el2DBzeIp +EJd/OMhHaZPD+bgNP/FthoEdmejyy0T1vFcawiFuqn06jrl7o6D31MH+0q1iajvB +R6jEL6zIczp26uQNETYmmH9GIbSaGvibYEEgUFdaHJs6QIYTwtlGmL+8AVIhEvn3 +D1Ty2FJl1L5xRmMQ8B4lpBZ4VQDU/jD2dun8m+A0t5BVuSZAg6YACjZeHVkfGaIP +e6hgBGPzDpGIT8DEC59Yh50yA0GFmhK+2BoFPR0EBvFTsIRtm5ub3IBAJqXfaSZP +HXIvfM9QXQ5ruKhyYN1Nobz5Q/xxcy2Iqu//TK9k+Zq50BqkbMCvV2BwkU8FZ9C5 +son/rAjpuevIaCmMhxVG5vVI5QCndInC71RNBUu61nkN1J0a5kXIAxF71A8xuMH3 +n5V2HVWQUE4rLHauOCo17gbk0X3ZucpVIZ5Zm71aldNvK7SInjh6v/FUfjjtc7i6 +81404myIKvW+IQY2pc8PVMnjyTJaRweGdTqbM7sMumh33IUeMdQ28L5oS8gRxTWS +BiElm07Y2+oGeQVbC8hD29Tx2irek6kcQ/rF/J0Tg5w17wZl1LLJ1kTg5xG76xzV +Emj2greRSTsAkB/WvbMUm4LmVRTgYE1AtvM1cY+T8YsbmC5rnOwTZEfojthvkrkC +DQRWPUqBARAAuY/jgP8oo9B8yKciG/ck1ah2uskuEZ1YHs5SCP+AOTp6Upf8QjBc +/E2OtBqreeeL/d5wY50f6wcPtz/jDZpRdrdYTAkwwjq1JF4zRC+oPVDg+epKmeab +F4e+scXyBWm1dK1xkldegiP8HWtIEvmkMGHPONAMQ2yGeli3ga/cIZWgUFqOgH/+ +jLys1bwb19tiB/Fl9ksH5FzdqnKGjj9+krGLb0esonQBPSyCU5OFH2WqRWQ2zR+1 +4hknWPETKZKV+PVWSvZQKx4gw/Ck95x+PACP6qaTjECJP/is4k2M5HFNzrSKXQav +XhF3IU/G81YlDygKDeTqiyxYGA+szUajfTCHqUdtQ/Gq2P8yya6Dyu70o3DCnOXc +IaERe3Ap2sUsLzhfDBCAJCiH0t5lsERh+LfgfOfIXz4rsUnXc7WfZJ1GWRlxgj7Z +0M6bbr3U20JiH86t4Jjei558chZObvTUYJZLoomxXd1QroouIEW3JK1rWDLnItvv ++ZGgGETHghlz4pZn66/ZdxFcPGiR8XuT5pCTVEDmpoyL3groVclzA2jCfEXfRLXO ++uVM3aT20WeTAs0ybIoXiRsedIWe6f1TgyhjXpT8qs7usIZoq4AbT6WGw9Q6JnBN +xVOU6l9hQeWcMQJhtd+CBNQgthnuqePr/IczA+7YpNtdXguqGVXTitcAEQEAAYkC +HwQYAQIACQUCVj1KgQIbDAAKCRC5dGeqx3uWZ/8BD/9jAxuwz4oDhqmpiFdyii+K +4yzeImLQnuEKbOrCjJ6nbLaW/cGPzoGpAgwA7OTRAgZX/VVuozx3lm9TuOMKsNZA +phGPUTvuz9dhHsk3eCg/PSQmZ/2FJckFa6uZj157TKH0Egq0gUPFZJPOBgknI4kW +GKXjWAIJHwDFxBeYGJnodvt+qQ5I5s3xZmTTdxkhHABdtAQFcWpUjs9Maht/Tiha +h7X9g1QVBf/OrZWKaPhKQISDIxihK0xHTRVuuPpYOs+GALcflM912iOPnEn+BhXh +q3sEXAK3G+4rExZJkCrZqB3iXTnH9RUWtpDeEPToDJkVX7U3Ek0IMe83i8VaBo0X +LdKA3uvLOG9QJS5+vS/OHky2quLxa8n2hfagPFqKmIPOs+2HdZD0ue4ASqmWveLX +29TSnIrtq34/rQXuUM9LesXCMfL40fRbdu7Q1NTDLaiO3c1tjvrPkHs3dYI8qSuf +SByBt/tjEu2+z4M5xopfAbgWx+9jzN/RMEMflYv7P9nTpVlGPY9lgHO130xt9kqI +QszV2yurMlMb//4OodPhtoYYLnzItiTOTZu/v3PzroqGPotVNtOF7u2P4BDHYIM0 +e9Hr6YowiublH35PcRBrTjrwb+U7JIiRmiYDOVMbH2hL0kwgAnkUz+qS1ZVy8PRu +4HD4pkI3POeezjpwiyeG3w== +=Y6f+ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/app-crypt/openpgp-keys-openzfs/files/4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027-tonyhutter.asc b/app-crypt/openpgp-keys-openzfs/files/4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027-tonyhutter.asc new file mode 100644 index 000000000000..a9a5dcad43fe --- /dev/null +++ b/app-crypt/openpgp-keys-openzfs/files/4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027-tonyhutter.asc @@ -0,0 +1,51 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFk5kxgBEADvT/aR1SzR0oBZcOypkb48wAzir3ZzZFXByHh5dJgds9r/kDNG +Md6pXyWKW8nrUAPvYmCGMFjRl3CbDl5DHDiqGGEV615I27C4OLKJO64iCHdz/SDw +pDJDE1D/uvG7TeVygtqIpU3aqLcGfWPkJ1NtBV5veC7khrSppYYGv9q2bKPk40BA +5awZusED1clOQv0po/TTxoFdIciS4RBUTX5DnJ9mAHHvLK9GFP0U1e0Nd6aei7ER +jqjz0yHpMcB45pt6uNGsyzjM1r7wIWEy5gzCAvs8bUvtqOcal4XjY9suWGi/6v0Z +QSKw9mOp2kZvCUboLuUy1WhBsYNJ2MVZdU0bPQaLEe4a/wFEDssHfjFE8nMsC1AE +YM3gl7l3htUyIP+UJ9Hg6fj7M2pD20hbnUgXBfV9IMiwCChyGtgkciDdpOykj5Lj +QO7Nqv710yKigWBzxym9nRBNXLd2R6Z0YkmyV5MmUZUtTTfGjDKVBWkZoq83F4xi +gGPtRcSimujFo2dfNrsSdVJ26f5F/shkMnD6/+0Kyo7sBh/qqw3vNFoM4M1pfPar +PwSkOYc8lrOlIk/TX9Brs84mlqspjRzpKg5XrrJ2en7L7cgxRrFOWYRLC80hmlfe +YIrlkGrQJp3J76NfudHbz3gYffj8BYgalPV5GXVKLSXYtYXDzhlXWZRi6QARAQAB +tEFUb255IEh1dHRlciAoR1BHIGtleSBmb3Igc2lnbmluZyBaRlMgcmVsZWFzZXMp +IDxodXR0ZXIyQGxsbmwuZ292PokCOQQTAQIAIwUCWTmTGAIbAwcLCQgHAwIBBhUI +AgkKCwQWAgMBAh4BAheAAAoJEGrYYO7UWYAnd/0P/A6DXyRKEE15Esy4uPN7BVc6 +flRxbuY2HNvzs09tamG7QaRGA/+ON8nEIaAv5hVsdWmR+UjJE9VjiCmkiKG8nbME +oeukUFNZzevybsmRv3xdhZyPUbgUHa+pY7ed9rDxXauhxuTkQXqjM6FHMDyMpktQ +13m7RHfp1CJc1qiO23qRkVRQySImSJxqZHpyGQKQjev4IhN6nFi7lBl6lgrZ/RDV +9Ogq3ea1SKfFa98wg1zHq8q3cN9uQxZDzoUmSI9C6T/KZ9N1/YPaUAEB1UfU/9dr +67as9rBW7/9FLHeeUeRzW4Kc5p06ubmwu6IF0X1FT7+IHwyR6c654PpQgUaPNuY/ +sDx9975eT0cIBePUvg6GFO0ghEHPtegHBz/1HS/Z6DBEOZUhoyoXx3oQHGrFBTZJ +hCwViu/FUiViE3cyyBAiaP0iBVFNliila/3yoj3xQADI2j8JXKEgdLfuyJIRCSyS +lmZxcdSKVf9kbQg2It9IRJYQpn0+XnzsZVUyzOfFYbhCJq/nZuFU9tKTPffGmD+h +e+VnBEf/9kIMoRalWfhhk7/RzRXdvVjEPm4mcaKtmwvmIHxHcdjQwqU8qmmKsbma +dMSIn0rHQ0VB09wTWAbdp8REjCOTQkipvKJViZ9KLTpLY0rz7HyK833UGtQV+9Zi +teZgwWTOhSh4UWjw+jiYuQINBFk5kxgBEACe/kvatgdvG2VMCp6yawlHZzTEpuLi +FNKDSZR7NZLXt4ECEChJEOp5He5aVCIsyIgsq4O/trERxONqSAZ/3grewz927mtN +d/Uj66ImB2tl/LE/47ncixRuQbmCa8ulAIASE1kdEQyTUoS9r5SDDWdjrcgWsjnM +LjV0C8TkJRSlY/QPAMX9UCWhOpCtqHInYF5Em7ptID3pL7lqUb0hW103AT5z0myC +33U7nlBBdpnU18PiKsqkjjjSNfQazsq9GDjX3tEhHfKGfLHftohLyXVxmkg78Ryl +cO8IOs6P9qRUmc6XgVUWcMVSswPrJW9TrshXh3a/nvDkMbXs8yaxcV7kX9GD2u21 +QXbnC2EImlP2d1w89YD/C/2N4+RavTwwXypp5760vgD7wg2fbLJRNMY2YfA7jKMQ +2ZCGhuNNxs48dYkSj7FOgBMt261in1SZYLWK9aN+/xAFgP6OStZxqLbQbGynXKwv +luwHeBXgdT7oV/O1oCon+D7gMRzXKvmxXGY/QCBo/fo7t/nPLjZy0bQILDeO3+8I +p3h3cKP7f6HZn4oHXntGN/ZihMbEEbomOs7Ozo+MIg2tLFdazZclTUfSAsXKlPUR +VPUEFaNfVXrSYjLme6o3HzAcpLhUX17abbfWu1+1ZjaOmjBBR6T4l/5aBmO2sq5e +vvtnLQM23Cwn9QARAQABiQIfBBgBAgAJBQJZOZMYAhsMAAoJEGrYYO7UWYAndwUQ +ANZJW/W97oDRhEJCQXmgU+u4BT3PtFUBdIW+VbpY+FrhBOu52cZu+1H4NP8Lw8Pg +wiaHm04OOWB6qfJ1kf/W7sTVckuSjEDZpDBh7QKL6lT8RFFGTwwVs4udzJc7cZVO +Gl9rXoU3e8NBEk5Kmel0pA0XkCaifwHTdBOFsdk6kqqyeNUAVi0iK4f1D15v447C +zSVQuCu3nx8ew1S7lMAVoWhy60V7W4CEF5y2D3stlSxnYi5WMVaZDI5uub435v2l +vX/P6W6EQ+9zaGPA1mZrcnZ2+ZWtM4WaN4BtvzO5+RuarZwizh1SXRTIf8ltwged +6mAx06OI+yXoFjuGiiz30l/9c2jTjLyBf/BwW+QwUM+tVTiaEoJLF6YMRTCOML1V +dgHtbfmxyon8ZIb9P8Bs0fGO7CSvDSEWOF/I6pYF83CYh+76tBFRDUYLi6v4tNxs +/dtGsH8Fhkpriv5E4IaXCSEJkRcFYOTDBzAyZasSTi1s0Lmpz0A4CtyWFo9TPGgD +BPEuQrWCHBPNkUDwFVhSD2JVOKDF89XRSNddiGkyZ0wBDzLp8ZjT/cJszdfHZlkg +FJR97Bff3lDOnCW9DOI80NvAppWSf6RC8m4Tgn3ElJUTWsxu2AGOXAI5l3k27Yvy +XVHGWPTr+pL8TjB05SjDkzsh68kUZ3J2jZ0n03jtbXWc +=WTIO +-----END PGP PUBLIC KEY BLOCK----- diff --git a/app-crypt/openpgp-keys-openzfs/files/C33DF142657ED1F7C328A2960AB9E991C6AF658B-brianbehlendorf.asc b/app-crypt/openpgp-keys-openzfs/files/C33DF142657ED1F7C328A2960AB9E991C6AF658B-brianbehlendorf.asc new file mode 100644 index 000000000000..5dfbd470278c --- /dev/null +++ b/app-crypt/openpgp-keys-openzfs/files/C33DF142657ED1F7C328A2960AB9E991C6AF658B-brianbehlendorf.asc @@ -0,0 +1,32 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBEby9kIRBACl6ggDFcor8bG3nj1tFSBanC12CF5vo2oK7HxRBeEvKlBzqIfd +c6gcegZVGYm0EEMaW7ANjhdAm7LAuiC3PjhpMjvIh6f+jqiqYSI8XPjav9kLUXCq +R7bdwkpmUXe1PZ+fEbB1qAFCsueVzO2jNisnYB408yDBv9KGf6aUMk7CNwCg3XwG +2HObD4A6LvolmqaQp6t/N98D/2tFMKAiL/rIxCbownGA6blX22nJBkAcApCZswUi +jSZsjqXFRcWI9/+ckKyRpHYkGJUhiDykZ/kmw1ApLw+PQS3MXv+hfLfF34Dw5709 +Xf9j/YW9Z7h/IYhR985p9vi0Kt2mZokeNulQMRC6M4QMPOloIW4XZ3d+FeKzua7r +zEc1A/9pBt9uozz6k+GnjAOGQsS655nHW8xGOekVasHbWICM7mflj+nqovLZJN5D +vxE5MyklQNV8tGQA9Pw9AZDKw5kY0kpyvdE/3b4Odtivr0NoAwVlIT5aIcr+wuLV +PVcGx9vZKGpkTPGcDbDRH9zBeLu1G3qt+1SMDjw6QFWUbH6yVbQnQnJpYW4gQmVo +bGVuZG9yZiA8YmVobGVuZG9yZjFAbGxubC5nb3Y+iGAEExECACAFAknEFzACGwMG +CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAKuemRxq9liy4PAKDYlprKOQCJkVpO +Y4N4OKi4Cl06nQCgh9rkbIkRFeBSfqiEr2LquONDUNu0LkJyaWFuIEJlaGxlbmRv +cmYgKExMTkwpIDxiZWhsZW5kb3JmMUBsbG5sLmdvdj6IXgQTEQIAHgUCRvL2QgIb +AwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRAKuemRxq9li3IUAJ91uoYT9XVsWrDB +RlPoqjfWsKznVQCfaK+mRj7TpSmR9aw77ll52PdV21y5Ag0ERvL2ShAIANbPczuS +yBi5+eEv9q/onCrQoFAx8bCiy6ATfk4n2mEQdJiM3AP5fhYGIiVitYX52uNf+JiT +AkBGDL/MsUHuT5xtNVQYbk6EaIeXwWk6WDUmNEq203tBsXp5iGQrsBK/p5tdrtB2 +jWRRsTaz5MeDTH6ogPtMv0LSxyHyqGcc21b35vvt3x7TZwoyS21KvF4vQd1t0No3 +nFbEO7pHtO47t0Xs5KvoATSvWNcfPw3KsJAN8omxoaEsjv/YQRBOi84s4LHgj5KE +qOpRPs41qfVGNcgPWys74BPXDo5mei6DJo+mppKd1gNEXEo1QXmHiU4Oe7mZllsf +psjVeZYxnZa5y08AAwUH/A0Pc9e4WsArzx5NCl5dvJ7biXs6+gMIW8I4cv+k+iVw +0vlJMumuPzRTC4CglVjYFiszPqw2FsRTDBnHfgrd1urLuli5OWe7unO6w2+v2wsp +Dnc4IvygiVqxB2c7k8/SuiES68ypMZwBOCpucqvMi1YDHtDQYiydC3RajUjAUAwU +8P+jPdZxthaGYiaZ0yMgb7ZznB/bTeAINGDnQ+uhvW9KtGBhyRShpI3NlNzix+08 +rcNZ92jOXRNz8T9U0ykFCdGBm7iZlLNxGVU5u0N36HXRdWRXgLjNo3APqaglF+Rf +V9wf3RlNN64ISdiwPDe0wv5Bm6q1dlysnYqJGKQ4Uf6ISQQYEQIACQUCRvL2SgIb +DAAKCRAKuemRxq9liwm5AJ4gSyDQ6KvnvWwz/GITokfqEQscLACgyuSX45p3biIX +YMXfJucoJR6ZFKg= +=kHeM +-----END PGP PUBLIC KEY BLOCK----- diff --git a/app-crypt/openpgp-keys-openzfs/metadata.xml b/app-crypt/openpgp-keys-openzfs/metadata.xml new file mode 100644 index 000000000000..e44c7fdca139 --- /dev/null +++ b/app-crypt/openpgp-keys-openzfs/metadata.xml @@ -0,0 +1,12 @@ + + + + + gyakovlev@gentoo.org + Georgy Yakovlev + + + sam@gentoo.org + Sam James + + diff --git a/app-crypt/openpgp-keys-openzfs/openpgp-keys-openzfs-20210419.ebuild b/app-crypt/openpgp-keys-openzfs/openpgp-keys-openzfs-20210419.ebuild new file mode 100644 index 000000000000..651c9bbf5045 --- /dev/null +++ b/app-crypt/openpgp-keys-openzfs/openpgp-keys-openzfs-20210419.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="OpenPGP keys used to sign OpenZFS releases" +HOMEPAGE="https://openzfs.github.io/openzfs-docs/" +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +src_install() { + local files=( + # Ned Bass (releases) + "${FILESDIR}"/29D5610EAE2941E355A2FE8AB97467AAC77B9667-nedbass.asc + # Tony Hutter (releases) + "${FILESDIR}"/4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027-tonyhutter.asc + # Brian Behlendorf (master), but he signs RCs at least too + "${FILESDIR}"/C33DF142657ED1F7C328A2960AB9E991C6AF658B-brianbehlendorf.asc + ) + + insinto /usr/share/openpgp-keys + newins - openzfs.asc < <(cat "${files[@]}" || die) +} diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild index 99a25ac62f03..cffa5b85eb9b 100644 --- a/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild +++ b/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild @@ -21,7 +21,7 @@ RAINBOW_DESTDIR="opt/${PN}" QA_FLAGS_IGNORED="${RAINBOW_DESTDIR}/.*" QA_PRESTRIPPED="${RAINBOW_DESTDIR}/.*" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" DOCS=( readme.txt diff --git a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild index 91bc89eb3f73..e4a53800c6df 100644 --- a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild +++ b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild @@ -1,15 +1,17 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 WX_GTK_VER="3.0-gtk3" -inherit desktop eapi7-ver linux-info pax-utils toolchain-funcs wxwidgets +inherit desktop linux-info pax-utils toolchain-funcs wxwidgets MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)_MacOSX" + DESCRIPTION="Disk encryption with strong security based on TrueCrypt" HOMEPAGE="https://www.veracrypt.fr/en/Home.html" SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/VeraCrypt-VeraCrypt_${MY_PV}/src" # The modules not linked against in Linux include (but not limited to): # libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2 @@ -26,20 +28,15 @@ RDEPEND=" sys-fs/fuse:0 x11-libs/wxGTK:${WX_GTK_VER}[X?] app-admin/sudo - dev-libs/pkcs11-helper -" -DEPEND=" - ${RDEPEND} + dev-libs/pkcs11-helper" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - asm? ( dev-lang/yasm ) -" - -S="${WORKDIR}/VeraCrypt-VeraCrypt_${MY_PV}/src" + asm? ( dev-lang/yasm )" -pkg_setup() { - local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS" - linux-info_pkg_setup +CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS" +src_configure() { setup-wxwidgets } @@ -67,32 +64,31 @@ src_compile() { } src_test() { - "${S}/Main/veracrypt" --text --test || die "tests failed" + ./Main/veracrypt --text --test || die "tests failed" } src_install() { local DOCS=( Readme.txt ) - local HTML_DOCS=( ) dobin Main/veracrypt if use doc; then DOCS+=( "${S}"/../doc/EFI-DCS ) - docompress -x "/usr/share/doc/${PF}/EFI-DCS" - HTML_DOCS+=( "${S}"/../doc/html/. ) + docompress -x /usr/share/doc/${PF}/EFI-DCS + HTML_DOCS=( "${S}"/../doc/html/. ) fi einstalldocs - newinitd "${FILESDIR}/${PN}.init" ${PN} + newinitd "${FILESDIR}"/veracrypt.init veracrypt if use X; then local s for s in 16 48 128 256; do newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm done - make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security" + make_desktop_entry veracrypt "VeraCrypt" veracrypt "Utility;Security" fi - pax-mark -m "${D%/}/usr/bin/veracrypt" + pax-mark -m "${ED}"/usr/bin/veracrypt } pkg_postinst() { diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz index fb37417af914..1b0ee3cddd77 100644 Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ diff --git a/app-dicts/aspell-am/aspell-am-0.03.1.ebuild b/app-dicts/aspell-am/aspell-am-0.03.1.ebuild index f5ae375834ae..ec4f0185b19f 100644 --- a/app-dicts/aspell-am/aspell-am-0.03.1.ebuild +++ b/app-dicts/aspell-am/aspell-am-0.03.1.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-ar/aspell-ar-1.2.0.ebuild b/app-dicts/aspell-ar/aspell-ar-1.2.0.ebuild index eb1ba67e37a2..e41e19af9f02 100644 --- a/app-dicts/aspell-ar/aspell-ar-1.2.0.ebuild +++ b/app-dicts/aspell-ar/aspell-ar-1.2.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-ast/aspell-ast-0.01.ebuild b/app-dicts/aspell-ast/aspell-ast-0.01.ebuild index 3b31e7504d61..244b94a71d92 100644 --- a/app-dicts/aspell-ast/aspell-ast-0.01.ebuild +++ b/app-dicts/aspell-ast/aspell-ast-0.01.ebuild @@ -13,4 +13,4 @@ SRC_URI="https://ftp.gnu.org/gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-az/aspell-az-0.02.0.ebuild b/app-dicts/aspell-az/aspell-az-0.02.0.ebuild index 50b97f254de1..da0bf47c6cb7 100644 --- a/app-dicts/aspell-az/aspell-az-0.02.0.ebuild +++ b/app-dicts/aspell-az/aspell-az-0.02.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-bn/aspell-bn-0.01.1.1.ebuild b/app-dicts/aspell-bn/aspell-bn-0.01.1.1.ebuild index 48eb8070af7c..7e6bce3fc433 100644 --- a/app-dicts/aspell-bn/aspell-bn-0.01.1.1.ebuild +++ b/app-dicts/aspell-bn/aspell-bn-0.01.1.1.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-ca/aspell-ca-2.5.0.ebuild b/app-dicts/aspell-ca/aspell-ca-2.5.0.ebuild index 85c2bb3fb572..c7961cbe692d 100644 --- a/app-dicts/aspell-ca/aspell-ca-2.5.0.ebuild +++ b/app-dicts/aspell-ca/aspell-ca-2.5.0.ebuild @@ -15,6 +15,6 @@ SRC_URI="https://www.softcatala.org/pub/softcatala/aspell/${PV}/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2+" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" DOCS=( "README" "doc/ChangeLog" ) diff --git a/app-dicts/aspell-csb/aspell-csb-0.02.0.ebuild b/app-dicts/aspell-csb/aspell-csb-0.02.0.ebuild index 0288169e3540..267bc4116238 100644 --- a/app-dicts/aspell-csb/aspell-csb-0.02.0.ebuild +++ b/app-dicts/aspell-csb/aspell-csb-0.02.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-de/aspell-de-20161207.7.0.ebuild b/app-dicts/aspell-de/aspell-de-20161207.7.0.ebuild index 57cfea61a84f..46151ebb3893 100644 --- a/app-dicts/aspell-de/aspell-de-20161207.7.0.ebuild +++ b/app-dicts/aspell-de/aspell-de-20161207.7.0.ebuild @@ -13,4 +13,4 @@ SRC_URI="mirror://gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-el/aspell-el-0.08.0.ebuild b/app-dicts/aspell-el/aspell-el-0.08.0.ebuild index 5dda3c640613..c95aa70d8e6c 100644 --- a/app-dicts/aspell-el/aspell-el-0.08.0.ebuild +++ b/app-dicts/aspell-el/aspell-el-0.08.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-en/aspell-en-2020.12.07.0.ebuild b/app-dicts/aspell-en/aspell-en-2020.12.07.0.ebuild index a141d73bdeec..ca466ac14f95 100644 --- a/app-dicts/aspell-en/aspell-en-2020.12.07.0.ebuild +++ b/app-dicts/aspell-en/aspell-en-2020.12.07.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="Ispell myspell-en_CA-KevinAtkinson Princeton public-domain" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-fa/aspell-fa-0.11.0.ebuild b/app-dicts/aspell-fa/aspell-fa-0.11.0.ebuild index 0caf3cfa082b..db4a5b616ec3 100644 --- a/app-dicts/aspell-fa/aspell-fa-0.11.0.ebuild +++ b/app-dicts/aspell-fa/aspell-fa-0.11.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-fo/aspell-fo-0.2.16.1.ebuild b/app-dicts/aspell-fo/aspell-fo-0.2.16.1.ebuild index 53688a6b08c0..b8f6378341ea 100644 --- a/app-dicts/aspell-fo/aspell-fo-0.2.16.1.ebuild +++ b/app-dicts/aspell-fo/aspell-fo-0.2.16.1.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=5 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-fy/aspell-fy-0.12.0.ebuild b/app-dicts/aspell-fy/aspell-fy-0.12.0.ebuild index b9ea7b606027..7f6b0490c8ee 100644 --- a/app-dicts/aspell-fy/aspell-fy-0.12.0.ebuild +++ b/app-dicts/aspell-fy/aspell-fy-0.12.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-ga/aspell-ga-5.1.0.ebuild b/app-dicts/aspell-ga/aspell-ga-5.1.0.ebuild index dfe6d85d308c..1d39bfcd44c0 100644 --- a/app-dicts/aspell-ga/aspell-ga-5.1.0.ebuild +++ b/app-dicts/aspell-ga/aspell-ga-5.1.0.ebuild @@ -16,4 +16,4 @@ HOMEPAGE=" SRC_URI="https://github.com/kscanne/gaelspell/releases/download/v${PV%.*}/${MY_P}.tar.bz2" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-gd/aspell-gd-0.1.1.1.ebuild b/app-dicts/aspell-gd/aspell-gd-0.1.1.1.ebuild index f1f5aafebb95..d79c085eb84a 100644 --- a/app-dicts/aspell-gd/aspell-gd-0.1.1.1.ebuild +++ b/app-dicts/aspell-gd/aspell-gd-0.1.1.1.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=5 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-grc/aspell-grc-0.02.0.ebuild b/app-dicts/aspell-grc/aspell-grc-0.02.0.ebuild index 622ab2f741da..6bb4c6b4f0df 100644 --- a/app-dicts/aspell-grc/aspell-grc-0.02.0.ebuild +++ b/app-dicts/aspell-grc/aspell-grc-0.02.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-gu/aspell-gu-0.03.0.ebuild b/app-dicts/aspell-gu/aspell-gu-0.03.0.ebuild index 1be9fb086bad..237fb27ee330 100644 --- a/app-dicts/aspell-gu/aspell-gu-0.03.0.ebuild +++ b/app-dicts/aspell-gu/aspell-gu-0.03.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-gv/aspell-gv-0.50.0.ebuild b/app-dicts/aspell-gv/aspell-gv-0.50.0.ebuild index 72a5c2f85870..e477c455de36 100644 --- a/app-dicts/aspell-gv/aspell-gv-0.50.0.ebuild +++ b/app-dicts/aspell-gv/aspell-gv-0.50.0.ebuild @@ -8,4 +8,4 @@ ASPELL_LANG="Manx Gaelic" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-hi/aspell-hi-0.02.0.ebuild b/app-dicts/aspell-hi/aspell-hi-0.02.0.ebuild index bcac92a09b35..9a40db522549 100644 --- a/app-dicts/aspell-hi/aspell-hi-0.02.0.ebuild +++ b/app-dicts/aspell-hi/aspell-hi-0.02.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-hil/aspell-hil-0.11.0.ebuild b/app-dicts/aspell-hil/aspell-hil-0.11.0.ebuild index 22a3d9f722d0..be7221802677 100644 --- a/app-dicts/aspell-hil/aspell-hil-0.11.0.ebuild +++ b/app-dicts/aspell-hil/aspell-hil-0.11.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=5 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-hsb/aspell-hsb-0.02.0.ebuild b/app-dicts/aspell-hsb/aspell-hsb-0.02.0.ebuild index 0b1d857c7817..8078914c6260 100644 --- a/app-dicts/aspell-hsb/aspell-hsb-0.02.0.ebuild +++ b/app-dicts/aspell-hsb/aspell-hsb-0.02.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-hus/aspell-hus-0.03.1.ebuild b/app-dicts/aspell-hus/aspell-hus-0.03.1.ebuild index 860aaa136a47..8340efd2b507 100644 --- a/app-dicts/aspell-hus/aspell-hus-0.03.1.ebuild +++ b/app-dicts/aspell-hus/aspell-hus-0.03.1.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-ia/aspell-ia-0.50.1.ebuild b/app-dicts/aspell-ia/aspell-ia-0.50.1.ebuild index eeb3f79d455e..a43cc3a9a421 100644 --- a/app-dicts/aspell-ia/aspell-ia-0.50.1.ebuild +++ b/app-dicts/aspell-ia/aspell-ia-0.50.1.ebuild @@ -8,4 +8,4 @@ ASPELL_LANG="Interlingua" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-id/aspell-id-1.2.0.ebuild b/app-dicts/aspell-id/aspell-id-1.2.0.ebuild index b8ec49eeec9d..a9919fbf542e 100644 --- a/app-dicts/aspell-id/aspell-id-1.2.0.ebuild +++ b/app-dicts/aspell-id/aspell-id-1.2.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=5 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-kn/aspell-kn-0.01.1.ebuild b/app-dicts/aspell-kn/aspell-kn-0.01.1.ebuild index 6eb1e2b940b6..ffb538d88b8c 100644 --- a/app-dicts/aspell-kn/aspell-kn-0.01.1.ebuild +++ b/app-dicts/aspell-kn/aspell-kn-0.01.1.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-ku/aspell-ku-0.20.1.ebuild b/app-dicts/aspell-ku/aspell-ku-0.20.1.ebuild index a888ced53c63..7e51bc9f453d 100644 --- a/app-dicts/aspell-ku/aspell-ku-0.20.1.ebuild +++ b/app-dicts/aspell-ku/aspell-ku-0.20.1.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=5 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-ky/aspell-ky-0.01.0.ebuild b/app-dicts/aspell-ky/aspell-ky-0.01.0.ebuild index 40b8133343de..cf3f244ae609 100644 --- a/app-dicts/aspell-ky/aspell-ky-0.01.0.ebuild +++ b/app-dicts/aspell-ky/aspell-ky-0.01.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-lt/aspell-lt-1.3.2.ebuild b/app-dicts/aspell-lt/aspell-lt-1.3.2.ebuild index a6dd13161a84..ce9e57a6cbd3 100644 --- a/app-dicts/aspell-lt/aspell-lt-1.3.2.ebuild +++ b/app-dicts/aspell-lt/aspell-lt-1.3.2.ebuild @@ -14,4 +14,4 @@ SRC_URI="https://github.com/ispell-lt/ispell-lt/releases/download/rel-${PV}/${MY S="${WORKDIR}/${MY_P}" LICENSE="BSD" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-lv/aspell-lv-0.5.5.1.ebuild b/app-dicts/aspell-lv/aspell-lv-0.5.5.1.ebuild index f6d7a99ac930..068b144571d2 100644 --- a/app-dicts/aspell-lv/aspell-lv-0.5.5.1.ebuild +++ b/app-dicts/aspell-lv/aspell-lv-0.5.5.1.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-mg/aspell-mg-0.03.0.ebuild b/app-dicts/aspell-mg/aspell-mg-0.03.0.ebuild index d50ca5219416..9682e2c6b6b9 100644 --- a/app-dicts/aspell-mg/aspell-mg-0.03.0.ebuild +++ b/app-dicts/aspell-mg/aspell-mg-0.03.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=5 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-mi/aspell-mi-0.50.0.ebuild b/app-dicts/aspell-mi/aspell-mi-0.50.0.ebuild index f5036a101bb9..990b9ddf104f 100644 --- a/app-dicts/aspell-mi/aspell-mi-0.50.0.ebuild +++ b/app-dicts/aspell-mi/aspell-mi-0.50.0.ebuild @@ -8,4 +8,4 @@ ASPELL_LANG="Maori" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-mk/aspell-mk-0.50.0.ebuild b/app-dicts/aspell-mk/aspell-mk-0.50.0.ebuild index 8144e2901f97..8ae5d54dd8b7 100644 --- a/app-dicts/aspell-mk/aspell-mk-0.50.0.ebuild +++ b/app-dicts/aspell-mk/aspell-mk-0.50.0.ebuild @@ -8,4 +8,4 @@ ASPELL_LANG="Macedonian" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-ml/aspell-ml-0.04.1.ebuild b/app-dicts/aspell-ml/aspell-ml-0.04.1.ebuild index 753ab8f300a2..d781cf28f0fb 100644 --- a/app-dicts/aspell-ml/aspell-ml-0.04.1.ebuild +++ b/app-dicts/aspell-ml/aspell-ml-0.04.1.ebuild @@ -12,4 +12,4 @@ inherit aspell-dict-r1 SRC_URI="https://download-mirror.savannah.gnu.org/releases/smc/Spellchecker/${MY_P}.tar.bz2" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-mn/aspell-mn-0.06.2.ebuild b/app-dicts/aspell-mn/aspell-mn-0.06.2.ebuild index bc61a3ab64ba..877d095dafd6 100644 --- a/app-dicts/aspell-mn/aspell-mn-0.06.2.ebuild +++ b/app-dicts/aspell-mn/aspell-mn-0.06.2.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-mr/aspell-mr-0.10.0.ebuild b/app-dicts/aspell-mr/aspell-mr-0.10.0.ebuild index 5f891f2f0212..110bc89e026e 100644 --- a/app-dicts/aspell-mr/aspell-mr-0.10.0.ebuild +++ b/app-dicts/aspell-mr/aspell-mr-0.10.0.ebuild @@ -9,7 +9,7 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" src_prepare() { default diff --git a/app-dicts/aspell-ms/aspell-ms-0.50.0.ebuild b/app-dicts/aspell-ms/aspell-ms-0.50.0.ebuild index ac0910524db3..9fdcee0a9e0d 100644 --- a/app-dicts/aspell-ms/aspell-ms-0.50.0.ebuild +++ b/app-dicts/aspell-ms/aspell-ms-0.50.0.ebuild @@ -8,4 +8,4 @@ ASPELL_LANG="Malay" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-mt/aspell-mt-0.50.0.ebuild b/app-dicts/aspell-mt/aspell-mt-0.50.0.ebuild index e41a46f88f0f..f18c88683361 100644 --- a/app-dicts/aspell-mt/aspell-mt-0.50.0.ebuild +++ b/app-dicts/aspell-mt/aspell-mt-0.50.0.ebuild @@ -8,4 +8,4 @@ ASPELL_LANG="Maltese" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-nb/aspell-nb-0.50.1.0-r1.ebuild b/app-dicts/aspell-nb/aspell-nb-0.50.1.0-r1.ebuild index cf6e5b675a45..e4c85a05eb4a 100644 --- a/app-dicts/aspell-nb/aspell-nb-0.50.1.0-r1.ebuild +++ b/app-dicts/aspell-nb/aspell-nb-0.50.1.0-r1.ebuild @@ -8,7 +8,7 @@ ASPELL_LANG="Norwegian Bokmal" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND="!app-dicts/aspell-no" diff --git a/app-dicts/aspell-nds/aspell-nds-0.01.0.ebuild b/app-dicts/aspell-nds/aspell-nds-0.01.0.ebuild index f1ae129b01db..4d4add0b421f 100644 --- a/app-dicts/aspell-nds/aspell-nds-0.01.0.ebuild +++ b/app-dicts/aspell-nds/aspell-nds-0.01.0.ebuild @@ -9,7 +9,7 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" src_prepare() { default diff --git a/app-dicts/aspell-nn/aspell-nn-0.50.1.1.ebuild b/app-dicts/aspell-nn/aspell-nn-0.50.1.1.ebuild index ad66c737ff38..88549d8b0dd5 100644 --- a/app-dicts/aspell-nn/aspell-nn-0.50.1.1.ebuild +++ b/app-dicts/aspell-nn/aspell-nn-0.50.1.1.ebuild @@ -8,4 +8,4 @@ ASPELL_LANG="Norwegian Nynorsk" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-ny/aspell-ny-0.01.0.ebuild b/app-dicts/aspell-ny/aspell-ny-0.01.0.ebuild index 173d5b3659bf..e9180e2dc6da 100644 --- a/app-dicts/aspell-ny/aspell-ny-0.01.0.ebuild +++ b/app-dicts/aspell-ny/aspell-ny-0.01.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=5 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-or/aspell-or-0.03.1.ebuild b/app-dicts/aspell-or/aspell-or-0.03.1.ebuild index 8f6eaf82a3a4..3c56b632ca3d 100644 --- a/app-dicts/aspell-or/aspell-or-0.03.1.ebuild +++ b/app-dicts/aspell-or/aspell-or-0.03.1.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-pa/aspell-pa-0.01.1.ebuild b/app-dicts/aspell-pa/aspell-pa-0.01.1.ebuild index 3eda04c6a70d..ac522fbdd46d 100644 --- a/app-dicts/aspell-pa/aspell-pa-0.01.1.ebuild +++ b/app-dicts/aspell-pa/aspell-pa-0.01.1.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-pl/aspell-pl-6.0.20210216.0.ebuild b/app-dicts/aspell-pl/aspell-pl-6.0.20210216.0.ebuild index b75bcb4708a6..b34993bf1033 100644 --- a/app-dicts/aspell-pl/aspell-pl-6.0.20210216.0.ebuild +++ b/app-dicts/aspell-pl/aspell-pl-6.0.20210216.0.ebuild @@ -15,4 +15,4 @@ SRC_URI="https://sjp.pl/slownik/ort/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P/sjp-/}" LICENSE="Apache-2.0 CC-BY-4.0 GPL-2 LGPL-2.1 MPL-1.1 " -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0.ebuild b/app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0.ebuild index be983ba99d03..55cf6136f364 100644 --- a/app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0.ebuild +++ b/app-dicts/aspell-pt-br/aspell-pt-br-20131030.12.0.ebuild @@ -15,4 +15,4 @@ SRC_URI="mirror://gnu/${PN%%-*}/dict/${MY_ASPELL_LANG/-${PN##*-}/_${MY_ASPELL_SU S="${WORKDIR}/${MY_P}" LICENSE="LGPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-pt/aspell-pt-20190329.1.0.ebuild b/app-dicts/aspell-pt/aspell-pt-20190329.1.0.ebuild index 1a51c50672dd..182a27adc1f8 100644 --- a/app-dicts/aspell-pt/aspell-pt-20190329.1.0.ebuild +++ b/app-dicts/aspell-pt/aspell-pt-20190329.1.0.ebuild @@ -14,4 +14,4 @@ SRC_URI="mirror://gnu/${PN%-*}/dict/${MY_PN/aspell-/}/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-qu/aspell-qu-0.02.0.ebuild b/app-dicts/aspell-qu/aspell-qu-0.02.0.ebuild index 696378ddca33..30aa72ba2f9b 100644 --- a/app-dicts/aspell-qu/aspell-qu-0.02.0.ebuild +++ b/app-dicts/aspell-qu/aspell-qu-0.02.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-ro/aspell-ro-3.3.10.ebuild b/app-dicts/aspell-ro/aspell-ro-3.3.10.ebuild index 7efc4c58c9cf..4c479e7a159b 100644 --- a/app-dicts/aspell-ro/aspell-ro-3.3.10.ebuild +++ b/app-dicts/aspell-ro/aspell-ro-3.3.10.ebuild @@ -17,4 +17,4 @@ SRC_URI="mirror://sourceforge/rospell/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-rw/aspell-rw-0.50.0.ebuild b/app-dicts/aspell-rw/aspell-rw-0.50.0.ebuild index 957c98354fe4..907a46c1f27e 100644 --- a/app-dicts/aspell-rw/aspell-rw-0.50.0.ebuild +++ b/app-dicts/aspell-rw/aspell-rw-0.50.0.ebuild @@ -8,4 +8,4 @@ ASPELL_LANG="Kinyarwanda" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-sc/aspell-sc-1.0.ebuild b/app-dicts/aspell-sc/aspell-sc-1.0.ebuild index 455f5376305f..52139ded9b65 100644 --- a/app-dicts/aspell-sc/aspell-sc-1.0.ebuild +++ b/app-dicts/aspell-sc/aspell-sc-1.0.ebuild @@ -13,4 +13,4 @@ SRC_URI="https://ftp.gnu.org/gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-sk/aspell-sk-2.02.0.ebuild b/app-dicts/aspell-sk/aspell-sk-2.02.0.ebuild index e1ef97f23966..2f3ef00a1cf3 100644 --- a/app-dicts/aspell-sk/aspell-sk-2.02.0.ebuild +++ b/app-dicts/aspell-sk/aspell-sk-2.02.0.ebuild @@ -14,4 +14,4 @@ SRC_URI="https://spell.linux.sk/file_download/103/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2 LGPL-2.1 MPL-1.1" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-sw/aspell-sw-0.50.0.ebuild b/app-dicts/aspell-sw/aspell-sw-0.50.0.ebuild index 8bdd078e6cbb..edf724940050 100644 --- a/app-dicts/aspell-sw/aspell-sw-0.50.0.ebuild +++ b/app-dicts/aspell-sw/aspell-sw-0.50.0.ebuild @@ -8,4 +8,4 @@ ASPELL_LANG="Swahili Kiswahili" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-ta/aspell-ta-20040424.1.ebuild b/app-dicts/aspell-ta/aspell-ta-20040424.1.ebuild index c85798666c2a..1b4d67c8fe76 100644 --- a/app-dicts/aspell-ta/aspell-ta-20040424.1.ebuild +++ b/app-dicts/aspell-ta/aspell-ta-20040424.1.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-te/aspell-te-0.01.2.ebuild b/app-dicts/aspell-te/aspell-te-0.01.2.ebuild index 9f7f0fb3030d..685d17d1dbe6 100644 --- a/app-dicts/aspell-te/aspell-te-0.01.2.ebuild +++ b/app-dicts/aspell-te/aspell-te-0.01.2.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-tet/aspell-tet-0.1.1.ebuild b/app-dicts/aspell-tet/aspell-tet-0.1.1.ebuild index fe74e3886798..0cdd8932134d 100644 --- a/app-dicts/aspell-tet/aspell-tet-0.1.1.ebuild +++ b/app-dicts/aspell-tet/aspell-tet-0.1.1.ebuild @@ -13,4 +13,4 @@ SRC_URI="https://ftp.gnu.org/gnu/${PN%-*}/dict/${PN/aspell-/}/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-tk/aspell-tk-0.01.0.ebuild b/app-dicts/aspell-tk/aspell-tk-0.01.0.ebuild index c9d0506cc7ed..e1891c266a4e 100644 --- a/app-dicts/aspell-tk/aspell-tk-0.01.0.ebuild +++ b/app-dicts/aspell-tk/aspell-tk-0.01.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=5 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-tl/aspell-tl-0.4.0.ebuild b/app-dicts/aspell-tl/aspell-tl-0.4.0.ebuild index 1a7ead55016a..b3678e10fa04 100644 --- a/app-dicts/aspell-tl/aspell-tl-0.4.0.ebuild +++ b/app-dicts/aspell-tl/aspell-tl-0.4.0.ebuild @@ -12,4 +12,4 @@ inherit aspell-dict-r1 SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/tagalog-wordlist/${MY_P}.tar.bz2" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-tn/aspell-tn-1.0.1.0.ebuild b/app-dicts/aspell-tn/aspell-tn-1.0.1.0.ebuild index dc38bafae5cb..d819456ab517 100644 --- a/app-dicts/aspell-tn/aspell-tn-1.0.1.0.ebuild +++ b/app-dicts/aspell-tn/aspell-tn-1.0.1.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=5 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-tr/aspell-tr-0.50.0.ebuild b/app-dicts/aspell-tr/aspell-tr-0.50.0.ebuild index e572e3b2006b..b3dee96761cd 100644 --- a/app-dicts/aspell-tr/aspell-tr-0.50.0.ebuild +++ b/app-dicts/aspell-tr/aspell-tr-0.50.0.ebuild @@ -8,4 +8,4 @@ ASPELL_LANG="Turkish" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-uz/aspell-uz-0.6.0.ebuild b/app-dicts/aspell-uz/aspell-uz-0.6.0.ebuild index ce0ecb2f243c..9d34977fbabd 100644 --- a/app-dicts/aspell-uz/aspell-uz-0.6.0.ebuild +++ b/app-dicts/aspell-uz/aspell-uz-0.6.0.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-wa/aspell-wa-0.50.0.ebuild b/app-dicts/aspell-wa/aspell-wa-0.50.0.ebuild index 5730ac261dc2..459f13abe776 100644 --- a/app-dicts/aspell-wa/aspell-wa-0.50.0.ebuild +++ b/app-dicts/aspell-wa/aspell-wa-0.50.0.ebuild @@ -8,4 +8,4 @@ ASPELL_LANG="Walloon" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-yi/aspell-yi-0.01.1.1.ebuild b/app-dicts/aspell-yi/aspell-yi-0.01.1.1.ebuild index 5e49ee877d22..d8f51f9ecc08 100644 --- a/app-dicts/aspell-yi/aspell-yi-0.01.1.1.ebuild +++ b/app-dicts/aspell-yi/aspell-yi-0.01.1.1.ebuild @@ -9,4 +9,4 @@ ASPELL_VERSION=6 inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/aspell-zu/aspell-zu-0.50.0.ebuild b/app-dicts/aspell-zu/aspell-zu-0.50.0.ebuild index 6b89381af2dd..2a88715e0365 100644 --- a/app-dicts/aspell-zu/aspell-zu-0.50.0.ebuild +++ b/app-dicts/aspell-zu/aspell-zu-0.50.0.ebuild @@ -8,4 +8,4 @@ ASPELL_LANG="Zulu" inherit aspell-dict-r1 LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" diff --git a/app-dicts/verbiste/verbiste-0.1.44.ebuild b/app-dicts/verbiste/verbiste-0.1.44.ebuild index 97076d8d151a..216d19d2a72a 100644 --- a/app-dicts/verbiste/verbiste-0.1.44.ebuild +++ b/app-dicts/verbiste/verbiste-0.1.44.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 -inherit eutils gnome2-utils ltprune xdg-utils +inherit desktop xdg-utils DESCRIPTION="French conjugation system" HOMEPAGE="http://sarrazip.com/dev/verbiste.html" SRC_URI="http://sarrazip.com/dev/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="amd64 ppc x86" - IUSE="gtk" RDEPEND=" >=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" sys-devel/gettext virtual/pkgconfig " @@ -34,33 +34,28 @@ src_configure() { src_install() { default - prune_libtool_files + dodoc HACKING LISEZMOI # file is only installed with USE=gnome if use gtk; then sed -e 's/Exec=.*/Exec=verbiste-gtk/' \ -i src/gnome/verbiste.desktop || die - insinto usr/share/applications - doins src/gnome/verbiste.desktop + domenu src/gnome/verbiste.desktop fi -} -pkg_preinst() { - if use gtk; then - gnome2_icon_savelist - fi + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { if use gtk; then xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update fi } pkg_postrm() { if use gtk; then xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update fi } diff --git a/app-dicts/wordnet/wordnet-3.0-r4.ebuild b/app-dicts/wordnet/wordnet-3.0-r4.ebuild index bd72aae233cc..8fc6f3f46f76 100644 --- a/app-dicts/wordnet/wordnet-3.0-r4.ebuild +++ b/app-dicts/wordnet/wordnet-3.0-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils flag-o-matic multilib +inherit autotools epatch flag-o-matic multilib DESCRIPTION="A lexical database for the English language" HOMEPAGE="https://wordnet.princeton.edu/" diff --git a/app-dicts/wordnet/wordnet-3.0-r5.ebuild b/app-dicts/wordnet/wordnet-3.0-r5.ebuild index 68cdec705c13..fc8af0edea2c 100644 --- a/app-dicts/wordnet/wordnet-3.0-r5.ebuild +++ b/app-dicts/wordnet/wordnet-3.0-r5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils flag-o-matic +inherit autotools epatch flag-o-matic DESCRIPTION="A lexical database for the English language" HOMEPAGE="https://wordnet.princeton.edu/" diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz index 6953158fb0fe..2fbf7f329541 100644 Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ diff --git a/app-doc/csound-manual/csound-manual-6.15-r1.ebuild b/app-doc/csound-manual/csound-manual-6.15-r1.ebuild index d4cc8e1b6a5b..55b4000dcf73 100644 --- a/app-doc/csound-manual/csound-manual-6.15-r1.ebuild +++ b/app-doc/csound-manual/csound-manual-6.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,9 +25,9 @@ LANGS=" fr" IUSE+="${LANGS// / l10n_}" BDEPEND=" + app-arch/unzip media-libs/libpng:0 " -DEPEND="app-arch/unzip" S=${WORKDIR} diff --git a/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild b/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild index 3e55d5a96b64..77e0c00c309b 100644 --- a/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild +++ b/app-doc/elisp-manual/elisp-manual-18.1.03.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils +inherit epatch MY_P=${PN}-${PV/./-} DESCRIPTION="The GNU Emacs Lisp Reference Manual" diff --git a/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild b/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild index 57b9eb43552c..19b816d5d800 100644 --- a/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild +++ b/app-doc/elisp-manual/elisp-manual-19.2.4.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils +inherit epatch MY_P=${PN}-${PV/./-} DESCRIPTION="The GNU Emacs Lisp Reference Manual" diff --git a/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild b/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild index f215e0e85b79..8d1b60f332b4 100644 --- a/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild +++ b/app-doc/elisp-manual/elisp-manual-20.2.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils +inherit epatch MY_P=${PN}-${PV/./-} DESCRIPTION="The GNU Emacs Lisp Reference Manual" diff --git a/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild b/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild index 003f669a9546..094626bf1531 100644 --- a/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild +++ b/app-doc/elisp-manual/elisp-manual-21.2.8-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils +inherit epatch MY_P=${PN}-${PV/./-} DESCRIPTION="The GNU Emacs Lisp Reference Manual" diff --git a/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild b/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild index 5fd1f6ea0543..821eef0693d5 100644 --- a/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild +++ b/app-doc/elisp-manual/elisp-manual-22.2.9.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils +inherit epatch MY_P=${PN}-${PV/./-} DESCRIPTION="The GNU Emacs Lisp Reference Manual" diff --git a/app-doc/elisp-manual/elisp-manual-23.4.ebuild b/app-doc/elisp-manual/elisp-manual-23.4.ebuild index d6c789b30601..ba51ff8feb27 100644 --- a/app-doc/elisp-manual/elisp-manual-23.4.ebuild +++ b/app-doc/elisp-manual/elisp-manual-23.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils +inherit epatch DESCRIPTION="The GNU Emacs Lisp Reference Manual" HOMEPAGE="https://www.gnu.org/software/emacs/manual/" diff --git a/app-doc/elisp-manual/elisp-manual-24.5.ebuild b/app-doc/elisp-manual/elisp-manual-24.5.ebuild index 32e57a074436..0031da0c4b4a 100644 --- a/app-doc/elisp-manual/elisp-manual-24.5.ebuild +++ b/app-doc/elisp-manual/elisp-manual-24.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils +inherit epatch DESCRIPTION="The GNU Emacs Lisp Reference Manual" HOMEPAGE="https://www.gnu.org/software/emacs/manual/" diff --git a/app-doc/psmark/psmark-2.1.ebuild b/app-doc/psmark/psmark-2.1.ebuild index e11fae44bd4d..001312e4f688 100644 --- a/app-doc/psmark/psmark-2.1.ebuild +++ b/app-doc/psmark/psmark-2.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils toolchain-funcs +inherit epatch toolchain-funcs MY_PN=${PN}-v MY_P=${MY_PN}${PV} diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz index 63ac8b5a8e14..df98be0d1a31 100644 Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ diff --git a/app-editors/amyedit/amyedit-1.0-r3.ebuild b/app-editors/amyedit/amyedit-1.0-r3.ebuild index 5a41b9a271c3..eefaf494464f 100644 --- a/app-editors/amyedit/amyedit-1.0-r3.ebuild +++ b/app-editors/amyedit/amyedit-1.0-r3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils flag-o-matic +inherit autotools epatch flag-o-matic DESCRIPTION=" AmyEdit is a LaTeX editor" HOMEPAGE="http://amyedit.sf.net" diff --git a/app-editors/elvis/elvis-2.2.0-r6.ebuild b/app-editors/elvis/elvis-2.2.0-r6.ebuild index fba833b8c828..9fc2dbe91d13 100644 --- a/app-editors/elvis/elvis-2.2.0-r6.ebuild +++ b/app-editors/elvis/elvis-2.2.0-r6.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils versionator toolchain-funcs +inherit epatch versionator toolchain-funcs MY_PV=$(replace_version_separator 2 '_') diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest index 72d680f9a738..10a14bdbb4f2 100644 --- a/app-editors/gedit/Manifest +++ b/app-editors/gedit/Manifest @@ -1,2 +1,3 @@ DIST gedit-3.38.1.tar.xz 6861368 BLAKE2B 3b202dbb7df8e91b58bd345fcaa309546af07bce60dc4638a3c344996d6c04ef7fe8a4824360c0f55970b759f9d7e2929c207992a9c80ad686d39e94ff741b7a SHA512 cd52cbcece3b007692294ab01b95fae7deb744b08a44da2d3cafa82a86d94c104abcdd4dcbe10630e0d633c8cc3c75f5e5dc6c8452a8c4bc2e6bb3c0de7d5547 DIST gedit-40.0.tar.xz 6852672 BLAKE2B 80af344cb6e848338f0c5921ff15e1d3e8566967756fbb832767c5d39914915f1c746c78c45e22d534dd8fc02c7e214e793b5a315ce2357e2afb3ca97312e45e SHA512 b1f6fc4f4894c3ada8e85b81df2fca6870acf725074b56b2c85b1c8f04e004f193e8fad3ac0c641bd0df6a704604ec054e130c60f0480c1abf62a91cb181429e +DIST gedit-40.1.tar.xz 6850264 BLAKE2B 2baabac1254d56bf4c6a663012f88505c8f3cfcdd8fd8e020e05d807f727f71cf9088c398702f559e40ba7db31d3a9d135c1148f8a8b178c9107aa2675265910 SHA512 ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09 diff --git a/app-editors/gedit/gedit-40.1.ebuild b/app-editors/gedit/gedit-40.1.ebuild new file mode 100644 index 000000000000..d527b25c2977 --- /dev/null +++ b/app-editors/gedit/gedit-40.1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +VALA_MIN_API_VERSION="0.26" +VALA_USE_DEPEND="vapigen" + +inherit gnome.org gnome2-utils meson python-single-r1 vala xdg + +DESCRIPTION="A text editor for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Gedit" + +LICENSE="GPL-2+ CC-BY-SA-3.0" +SLOT="0" + +IUSE="+python gtk-doc spell" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +DEPEND=" + >=dev-libs/glib-2.64:2 + >=dev-libs/libpeas-1.14.1[gtk] + >=dev-libs/gobject-introspection-1.54:= + >=x11-libs/gtk+-3.22.0:3[introspection] + >=x11-libs/gtksourceview-4.0.2:4[introspection] + gui-libs/tepl:6 + + spell? ( >=app-text/gspell-0.2.5:0= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pycairo[${PYTHON_USEDEP}] + >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] + dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}] + ') + ) +" +RDEPEND="${DEPEND} + x11-themes/adwaita-icon-theme + gnome-base/gsettings-desktop-schemas + gnome-base/gvfs +" +BDEPEND=" + ${vala_depend} + app-text/docbook-xml-dtd:4.1.2 + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1 ) + dev-util/itstool + >=sys-devel/gettext-0.18 + virtual/pkgconfig +" +PATCHES=( + # Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily + # disagree with; those wanting them off in general would set that globally for gtk + "${FILESDIR}"/restore-overlay-scrollbars.patch + # Make gspell and python optional + "${FILESDIR}"/3.38-make-gspell-optional.patch + "${FILESDIR}"/3.38-make-python-optional.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + vala_src_prepare + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use python) + $(meson_use gtk-doc gtk_doc) + -Duser_documentation=true + $(meson_feature spell) + ) + meson_src_configure +} + +# Only appdata and desktop file validation in v3.32.2 +src_test() { :; } + +src_install() { + meson_src_install + if use python; then + python_optimize + python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/" + fi +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-editors/hexedit/hexedit-1.2.13.ebuild b/app-editors/hexedit/hexedit-1.2.13.ebuild index 31d52fa780a7..10627d3f7c55 100644 --- a/app-editors/hexedit/hexedit-1.2.13.ebuild +++ b/app-editors/hexedit/hexedit-1.2.13.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils +inherit autotools epatch DESCRIPTION="View and edit files in hex or ASCII" HOMEPAGE="http://rigaux.org/hexedit.html" diff --git a/app-editors/jedit/jedit-5.2.0-r1.ebuild b/app-editors/jedit/jedit-5.2.0-r1.ebuild index 3d842a2ef6be..e6ff8beafda0 100644 --- a/app-editors/jedit/jedit-5.2.0-r1.ebuild +++ b/app-editors/jedit/jedit-5.2.0-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 JAVA_PKG_IUSE="doc test" -inherit eutils java-pkg-2 java-ant-2 xdg-utils +inherit epatch java-pkg-2 java-ant-2 xdg-utils DESCRIPTION="Programmer's editor written in Java" HOMEPAGE="http://www.jedit.org" diff --git a/app-editors/jedit/jedit-5.4.0.ebuild b/app-editors/jedit/jedit-5.4.0.ebuild index 42744cd248a8..a7d779902ac9 100644 --- a/app-editors/jedit/jedit-5.4.0.ebuild +++ b/app-editors/jedit/jedit-5.4.0.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 JAVA_PKG_IUSE="doc test" - -inherit eutils java-pkg-2 java-ant-2 xdg-utils +inherit desktop java-pkg-2 java-ant-2 xdg-utils DESCRIPTION="Programmer's editor written in Java" HOMEPAGE="http://www.jedit.org" diff --git a/app-editors/levee/levee-3.5a.ebuild b/app-editors/levee/levee-3.5a.ebuild index 79cc2355d23d..3f4400b4c76e 100644 --- a/app-editors/levee/levee-3.5a.ebuild +++ b/app-editors/levee/levee-3.5a.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit toolchain-funcs eutils +inherit toolchain-funcs epatch DESCRIPTION="Really tiny vi clone, for things like rescue disks" HOMEPAGE="http://www.pell.chi.il.us/~orc/Code/" diff --git a/app-editors/nedit/nedit-5.6-r1.ebuild b/app-editors/nedit/nedit-5.6-r1.ebuild index 53a8b6f139cf..3e0c9aebeb9a 100644 --- a/app-editors/nedit/nedit-5.6-r1.ebuild +++ b/app-editors/nedit/nedit-5.6-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils toolchain-funcs +inherit desktop epatch toolchain-funcs DESCRIPTION="Multi-purpose text editor for the X Window System" HOMEPAGE="https://sourceforge.net/projects/nedit" diff --git a/app-editors/ted/ted-2.23.ebuild b/app-editors/ted/ted-2.23.ebuild index 41d6280abf91..d174bad221e0 100644 --- a/app-editors/ted/ted-2.23.ebuild +++ b/app-editors/ted/ted-2.23.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils toolchain-funcs xdg-utils +inherit epatch toolchain-funcs xdg-utils DESCRIPTION="X-based rich text editor" HOMEPAGE="https://www.nllgg.nl/Ted/" diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild index 22186d5e0150..557ca34677b6 100644 --- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: xemacs currently does not work with position independent code @@ -7,7 +7,7 @@ EAPI=7 WANT_AUTOCONF="2.1" -inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils desktop +inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop DESCRIPTION="highly customizable open source text editor and application development system" HOMEPAGE="http://www.xemacs.org/" diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild index 91fe80f8bfe7..51534cc420ba 100644 --- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild +++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild @@ -6,7 +6,7 @@ EAPI=7 -inherit autotools eutils flag-o-matic multilib xdg-utils desktop +inherit autotools flag-o-matic xdg-utils desktop DESCRIPTION="highly customizable open source text editor and application development system" HOMEPAGE="http://www.xemacs.org/" diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz index 82b7c7779e95..6b1cfb5e6668 100644 Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ diff --git a/app-emacs/blogmax/blogmax-20170321.ebuild b/app-emacs/blogmax/blogmax-20170321.ebuild index 1fced845ba4e..9984f6db09e9 100644 --- a/app-emacs/blogmax/blogmax-20170321.ebuild +++ b/app-emacs/blogmax/blogmax-20170321.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit elisp eutils readme.gentoo-r1 +inherit elisp edos2unix readme.gentoo-r1 DESCRIPTION="Blogging in Emacs" HOMEPAGE="https://billstclair.com/blogmax/index.html" diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 6d99a31d1405..9ad1a1edac55 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/dlx/dlx-1.5.20.ebuild b/app-emulation/dlx/dlx-1.5.20.ebuild index 30e768088a51..8d9015504860 100644 --- a/app-emulation/dlx/dlx-1.5.20.ebuild +++ b/app-emulation/dlx/dlx-1.5.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,14 +8,13 @@ inherit toolchain-funcs DESCRIPTION="DLX Simulator" HOMEPAGE="https://www.davidviner.com/dlx" SRC_URI="https://www.davidviner.com/zip/dlx/dlx.zip -> ${P}.zip" -S=${WORKDIR}/dlx +S="${WORKDIR}"/dlx LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" src_compile() { # CXX not used diff --git a/app-emulation/edumips64/edumips64-1.2.ebuild b/app-emulation/edumips64/edumips64-1.2.ebuild index 518464fb1ce0..90a3291c9a3b 100644 --- a/app-emulation/edumips64/edumips64-1.2.ebuild +++ b/app-emulation/edumips64/edumips64-1.2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" JAVA_PKG_IUSE="doc test" -inherit eutils java-pkg-2 java-ant-2 +inherit epatch java-pkg-2 java-ant-2 DESCRIPTION="A visual and cross-platform MIPS64 CPU Simulator" HOMEPAGE="https://www.edumips.org" diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest index 5a99bb140a2a..900869b8ed3d 100644 --- a/app-emulation/faudio/Manifest +++ b/app-emulation/faudio/Manifest @@ -1,5 +1 @@ -DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6 -DIST FAudio-19.09.tar.gz 901659 BLAKE2B 8bb99c67b6da2660e71c7a8a70f83130738a07e7f4ddd2001fb857c81a593935506a8c1fe6d24bfd064537ea4a5a603973c32d839228d7b3f45c9c300ba15147 SHA512 127f975c68e2b449fa7cadae0723925f35ca7a2841ea3fd85037febe964331de4b2e3031ab09c292ee5f40d90902dcf78c75cc3fe7fbe4d6f37a822b4d9eb966 -DIST FAudio-20.02.tar.gz 908051 BLAKE2B 7f9323e7528949680b39469b3549adbef9acafe6f293c643676117648fd6871639fa8c7a47fdc0e1232c0533c0af9e89953415a0935fa4ad7b831aa8a8243f30 SHA512 69995fa1fb9ea41182e47f8143252db517adf4e9dc4a0556c9032af5c867259cc7edc81196b10ef043e6118a2e3687b34368f3ac8ffe9294398c5143b9928476 -DIST FAudio-20.09.tar.gz 1133191 BLAKE2B 519467051e8ce82a8e3b7dcea13ad2b076510bdef363e2170373030a1cc8cc600c0a9627dcb38923e33588eb74081ab161d7596bbb7efe02961e9a38a2e36197 SHA512 a4f06cbb07e7baa0dcf59f93412f364a70a6757079cb21b51808dafed256e557e18866974e5145d0a8509b7a4f4a68bc130a49d6704571e0a43913e73abbd984 DIST FAudio-21.01.tar.gz 1134752 BLAKE2B 3acf80172744bfdc6fb44e373ee2a159ed4d49713fec38a8c6447d66c345445a435e1eb1656552289a634e3a628cfcf7df979a2d155edca1aef0c0334629424e SHA512 69405a28fdf3ff5026992bdd1d40d61653b834dac3ef2697a0e794deac2fa6257fe74b19d2fe225ce25a1ae3caec7082106f5ab6ea6109cc61e520b903d35b80 diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild deleted file mode 100644 index 93b1440ba5b1..000000000000 --- a/app-emulation/faudio/faudio-19.06.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# shellcheck disable=SC2034 -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake-multilib virtualx - -FAUDIO_PN="FAudio" -FAUDIO_PV="${PV}" -FAUDIO_P="${FAUDIO_PN}-${FAUDIO_PV}" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git" -else - SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz" - KEYWORDS="-* ~amd64 ~x86" - S="${WORKDIR}/${FAUDIO_P}" -fi - -DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms" -HOMEPAGE="https://fna-xna.github.io/" -LICENSE="ZLIB" -SLOT="0" - -IUSE="+abi_x86_32 +abi_x86_64 debug ffmpeg xnasong test utils" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" - -COMMON_DEPEND=" - >=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}] - ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] ) -" -RDEPEND="${COMMON_DEPEND} -" -DEPEND="${COMMON_DEPEND} -" - -multilib_src_configure() { - local mycmakeargs=( - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}" - "-DCMAKE_INSTALL_LIBDIR=$(get_libdir)" - "-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)" - "-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)" - "-DBUILD_TESTS=$(usex test ON OFF)" - "-DBUILD_UTILS=$(usex utils ON OFF)" - "-DFFMPEG=$(usex ffmpeg ON OFF)" - "-DXNASONG=$(usex xnasong ON OFF)" - ) - if use ffmpeg; then - mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)" ) - fi - cmake-utils_src_configure -} - -src_configure() { - cmake-multilib_src_configure -} - -multilib_src_compile() { - cmake-utils_src_make - emake -C "${BUILD_DIR}" all -} - -multilib_src_install() { - # FIXME: do we want to install the FAudio tools? - cmake-utils_src_install - - sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \ - "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \ - || die "sed failed" - insinto "/usr/$(get_libdir)/pkgconfig" - doins "${T}/faudio.pc" - - if use test; then - mkdir -p "${T}/$(get_libdir)" - cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed" - fi -} - -faudio_test() { - XDG_RUNTIME_DIR="/run/user/0" virtx "${T}/$(get_libdir)/faudio_tests" -} - -pkg_postinst() { - use test || return - - # FIXME: FAudio tests are broken and also don't appear to work - # in the Portage sandbox. - multilib_foreach_abi faudio_test -} diff --git a/app-emulation/faudio/faudio-19.09.ebuild b/app-emulation/faudio/faudio-19.09.ebuild deleted file mode 100644 index 93b1440ba5b1..000000000000 --- a/app-emulation/faudio/faudio-19.09.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# shellcheck disable=SC2034 -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake-multilib virtualx - -FAUDIO_PN="FAudio" -FAUDIO_PV="${PV}" -FAUDIO_P="${FAUDIO_PN}-${FAUDIO_PV}" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git" -else - SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz" - KEYWORDS="-* ~amd64 ~x86" - S="${WORKDIR}/${FAUDIO_P}" -fi - -DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms" -HOMEPAGE="https://fna-xna.github.io/" -LICENSE="ZLIB" -SLOT="0" - -IUSE="+abi_x86_32 +abi_x86_64 debug ffmpeg xnasong test utils" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" - -COMMON_DEPEND=" - >=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}] - ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] ) -" -RDEPEND="${COMMON_DEPEND} -" -DEPEND="${COMMON_DEPEND} -" - -multilib_src_configure() { - local mycmakeargs=( - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}" - "-DCMAKE_INSTALL_LIBDIR=$(get_libdir)" - "-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)" - "-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)" - "-DBUILD_TESTS=$(usex test ON OFF)" - "-DBUILD_UTILS=$(usex utils ON OFF)" - "-DFFMPEG=$(usex ffmpeg ON OFF)" - "-DXNASONG=$(usex xnasong ON OFF)" - ) - if use ffmpeg; then - mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)" ) - fi - cmake-utils_src_configure -} - -src_configure() { - cmake-multilib_src_configure -} - -multilib_src_compile() { - cmake-utils_src_make - emake -C "${BUILD_DIR}" all -} - -multilib_src_install() { - # FIXME: do we want to install the FAudio tools? - cmake-utils_src_install - - sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \ - "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \ - || die "sed failed" - insinto "/usr/$(get_libdir)/pkgconfig" - doins "${T}/faudio.pc" - - if use test; then - mkdir -p "${T}/$(get_libdir)" - cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed" - fi -} - -faudio_test() { - XDG_RUNTIME_DIR="/run/user/0" virtx "${T}/$(get_libdir)/faudio_tests" -} - -pkg_postinst() { - use test || return - - # FIXME: FAudio tests are broken and also don't appear to work - # in the Portage sandbox. - multilib_foreach_abi faudio_test -} diff --git a/app-emulation/faudio/faudio-20.02.ebuild b/app-emulation/faudio/faudio-20.02.ebuild deleted file mode 100644 index 5afb2e48be25..000000000000 --- a/app-emulation/faudio/faudio-20.02.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# shellcheck disable=SC2034 -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake-multilib virtualx - -FAUDIO_PN="FAudio" -FAUDIO_PV="${PV}" -FAUDIO_P="${FAUDIO_PN}-${FAUDIO_PV}" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git" -else - SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz" - KEYWORDS="-* amd64 x86" - S="${WORKDIR}/${FAUDIO_P}" -fi - -DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms" -HOMEPAGE="https://fna-xna.github.io/" -LICENSE="ZLIB" -SLOT="0" - -IUSE="+abi_x86_32 +abi_x86_64 debug dumpvoices ffmpeg xnasong test utils" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" - -COMMON_DEPEND=" - >=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}] - ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] ) -" -RDEPEND="${COMMON_DEPEND} -" -DEPEND="${COMMON_DEPEND} -" - -multilib_src_configure() { - local mycmakeargs=( - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}" - "-DCMAKE_INSTALL_LIBDIR=$(get_libdir)" - "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" - "-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)" - "-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)" - "-DBUILD_TESTS=$(usex test ON OFF)" - "-DBUILD_UTILS=$(usex utils ON OFF)" - "-DDUMP_VOICES=$(usex dumpvoices ON OFF)" - "-DFFMPEG=$(usex ffmpeg ON OFF)" - "-DXNASONG=$(usex xnasong ON OFF)" - ) - if use ffmpeg; then - mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)" ) - fi - cmake-utils_src_configure -} - -src_configure() { - cmake-multilib_src_configure -} - -multilib_src_compile() { - cmake-utils_src_make - emake -C "${BUILD_DIR}" all -} - -multilib_src_install() { - # FIXME: do we want to install the FAudio tools? - cmake-utils_src_install - - sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \ - "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \ - || die "sed failed" - insinto "/usr/$(get_libdir)/pkgconfig" - doins "${T}/faudio.pc" - - if use test; then - mkdir -p "${T}/$(get_libdir)" || die - cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed" - fi -} - -faudio_test() { - XDG_RUNTIME_DIR="/run/user/0" virtx "${T}/$(get_libdir)/faudio_tests" -} - -pkg_postinst() { - use test || return - - # FIXME: FAudio tests are broken and also don't appear to work - # in the Portage sandbox. - multilib_foreach_abi faudio_test -} diff --git a/app-emulation/faudio/faudio-20.09.ebuild b/app-emulation/faudio/faudio-20.09.ebuild deleted file mode 100644 index b6fb9ffe869b..000000000000 --- a/app-emulation/faudio/faudio-20.09.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# shellcheck disable=SC2034 -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake-multilib virtualx - -FAUDIO_PN="FAudio" -FAUDIO_PV="${PV}" -FAUDIO_P="${FAUDIO_PN}-${FAUDIO_PV}" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git" -else - SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz" - KEYWORDS="-* ~amd64 ~x86" - S="${WORKDIR}/${FAUDIO_P}" -fi - -DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms" -HOMEPAGE="https://fna-xna.github.io/" -LICENSE="ZLIB" -SLOT="0" - -IUSE="+abi_x86_32 +abi_x86_64 debug dumpvoices gstreamer xnasong test utils" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" - -COMMON_DEPEND=" - >=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}] - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - ) -" -RDEPEND="${COMMON_DEPEND} -" -DEPEND="${COMMON_DEPEND} -" - -multilib_src_configure() { - local mycmakeargs=( - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}" - "-DCMAKE_INSTALL_LIBDIR=$(get_libdir)" - "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" - "-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)" - "-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)" - "-DBUILD_TESTS=$(usex test ON OFF)" - "-DBUILD_UTILS=$(usex utils ON OFF)" - "-DDUMP_VOICES=$(usex dumpvoices ON OFF)" - "-DGSTREAMER=$(usex gstreamer ON OFF)" - "-DXNASONG=$(usex xnasong ON OFF)" - ) - cmake-utils_src_configure -} - -src_configure() { - cmake-multilib_src_configure -} - -multilib_src_compile() { - cmake-utils_src_make - emake -C "${BUILD_DIR}" all -} - -multilib_src_install() { - # FIXME: do we want to install the FAudio tools? - cmake-utils_src_install - - sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \ - "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \ - || die "sed failed" - insinto "/usr/$(get_libdir)/pkgconfig" - doins "${T}/faudio.pc" - - if use test; then - mkdir -p "${T}/$(get_libdir)" || die - cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed" - fi -} - -faudio_test() { - XDG_RUNTIME_DIR="/run/user/0" virtx "${T}/$(get_libdir)/faudio_tests" -} - -pkg_postinst() { - use test || return - - # FIXME: FAudio tests are broken and also don't appear to work - # in the Portage sandbox. - multilib_foreach_abi faudio_test -} diff --git a/app-emulation/faudio/metadata.xml b/app-emulation/faudio/metadata.xml index e5eb47a51e63..6161ab562269 100644 --- a/app-emulation/faudio/metadata.xml +++ b/app-emulation/faudio/metadata.xml @@ -17,12 +17,10 @@ Project Website: http://fna-xna.github.io/ FAudio dumps buffer data to individual files with RIFF/XWMA headers, usable with players like ffplay/testxwma. - FAudio has optional support for decoding xWMA resources using FFmpeg, requiring: - media-video/ffmpeg - Build support for optional XNG_SONG component (note: this not required by - app-emulation/wine-staging, app-emulation/wine-vanilla for faudio XAudio support). Build and run faudio testsuite. Build all faudio utilities. + Build support for optional XNG_SONG component (note: this not required by + app-emulation/wine-staging, app-emulation/wine-vanilla for faudio XAudio support). FNA-XNA/FAudio diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild index d3211b5fdcf1..9fdc1dc8bc30 100644 --- a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild +++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils rpm linux-info +inherit epatch rpm linux-info DESCRIPTION="XenServer Virtual Machine Tools" HOMEPAGE="https://www.citrix.com/" PV_BASE=${PV/_*} diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest index 408b35150b6b..d648745d8c8d 100644 --- a/app-emulation/xen-pvgrub/Manifest +++ b/app-emulation/xen-pvgrub/Manifest @@ -4,5 +4,6 @@ DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 26d3308148fb99baf8ad02eee4cc699cfac69 DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3 +DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2 SHA512 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6 DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.3.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.3.ebuild new file mode 100644 index 000000000000..18c5c56da87c --- /dev/null +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.3.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE='xml,threads(+)' + +inherit flag-o-matic multilib python-single-r1 toolchain-funcs + +MY_PV=${PV/_/-} + +XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" +LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci +GRUB_URL=https://alpha.gnu.org/gnu/grub + +UPSTREAM_VER= +[[ -n ${UPSTREAM_VER} ]] && \ + UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz" + +SRC_URI=" + https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz + $GRUB_URL/grub-0.97.tar.gz + $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz + $LIBPCI_URL/pciutils-2.2.9.tar.bz2 + $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz + $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz + $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz + ${UPSTREAM_PATCHSET_URI}" + +S="${WORKDIR}/xen-${MY_PV}" + +DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem" +HOMEPAGE="https://www.xenproject.org" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="sys-devel/gettext + sys-devel/bin86 + sys-apps/texinfo + x11-libs/pixman" + +RDEPEND="${PYTHON_DEPS} + >=app-emulation/xen-tools-${PV}" + +# python2 only +RESTRICT="test" + +pkg_setup() { + python-single-r1_pkg_setup +} + +retar-externals() { + # Purely to unclutter src_prepare + local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz" + + # eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative + sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \ + -i "${WORKDIR}"/zlib-1.2.3/configure || die + sed -e 's:^AR=ar rc:AR=ar:' \ + -e s':$(AR) $@:$(AR) rc $@:' \ + -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in} || die + einfo "zlib Makefile edited" + + cd "${WORKDIR}" || die + tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz || die + tar czp grub-0.97 -f grub-0.97.tar.gz || die + tar czp lwip -f lwip-1.3.0.tar.gz || die + tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz || die + tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz || die + mv $set "${S}"/stubdom/ || die + einfo "tarballs moved to source" +} + +src_prepare() { + # Upstream's patchset + if [[ -n ${UPSTREAM_VER} ]]; then + einfo "Try to apply Xen Upstream patch set" + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_OPTS="-p1" \ + eapply "${WORKDIR}"/patches-upstream + fi + + # Patch the unmergeable newlib, fix most of the leftover gcc QA issues + cp "${FILESDIR}"/newlib-implicits.patch stubdom || die + + # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading + eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch + + # fix jobserver in Makefile + eapply "${FILESDIR}"/${PN}-4.8-jserver.patch + + #Substitute for internal downloading. pciutils copied only due to the only .bz2 + cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom" + retar-externals || die "re-tar procedure failed" + + default +} + +src_configure() { + local myconf="--prefix=${PREFIX}/usr \ + --libdir=${PREFIX}/usr/$(get_libdir) \ + --libexecdir=${PREFIX}/usr/libexec \ + --disable-werror \ + --disable-xen" + + econf ${myconf} +} + +src_compile() { + unset CFLAGS + if test-flag-CC -fno-strict-overflow; then + append-flags -fno-strict-overflow + fi + + emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include + emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs + + if use x86; then + emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ + XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub + elif use amd64; then + emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ + XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub + if has_multilib_profile; then + multilib_toolchain_setup x86 + emake CC="$(tc-getCC)" AR="$(tc-getAR)" \ + XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub + fi + fi +} + +src_install() { + if use x86; then + emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub + fi + if use amd64; then + emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub + if has_multilib_profile; then + emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub + fi + fi +} + +pkg_postinst() { + elog "Official Xen Guide and the offical wiki page:" + elog "https://wiki.gentoo.org/wiki/Xen" + elog "https://wiki.xen.org/wiki/Main_Page" +} diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index f84dc7bd230f..d911db7e487c 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -8,6 +8,7 @@ DIST seabios-1.13.0.tar.gz 620952 BLAKE2B 460a7dd2b2775b981bbd890ed0a50fe905794c DIST xen-4.13.2-upstream-patches-2.tar.xz 58992 BLAKE2B 535d67ae6a30e23feb975172a9e4abd6d7feb6c8c969aa243fdf672ed6580fe46bf57ea5530eab70457e22af9163f95061fdf97d10faa3be9f4c92033187c950 SHA512 6b6cdf72d13c0e595be65e3107c0f68299e932b74d4a1c4d59bfe3be8b76840c47f6adeaddd0efac71d5158cee8d778a0be863eea8f032cb9acf4191f629d8ae DIST xen-4.13.2-upstream-patches-6.tar.xz 80980 BLAKE2B a20643c4f89f197e4001c0181249bc1a22b60874bc077ba2abee716b8e64bbbea0885a64632f3120960425a741328ceba1b44dc10a7a24039b328e1ded28f752 SHA512 0b097dfb04404ec6c609d35d924b3d2306c5f2de0501aa0b8e007e0af9a4ef394fae2d736435401bf8bd1fd661171c71ba712585bdb195649e3350ef9f953115 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3 +DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2 SHA512 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6 DIST xen-4.14.1-upstream-patches-3.tar.xz 27864 BLAKE2B 69a67e863a30c0079f7955dd5306f69890a4f6db91d4cf2d1806a2bbd8afad88db7789c7eda8da0ff2a945da04916ff4ab5eaa9e529a417112ae01e31151d0dc SHA512 19e5ef39616fffbff20b2f658d61e50e21741fe3c5c4ca89f67e72a1606b3a593f93e9090fb0b5c76c1c801f931c237d2be6329bd174fa911d66b81ad4a332dd DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9 DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf index 1cc00d3345f9..56028e12ee1b 100644 --- a/app-emulation/xen-tools/files/gentoo-patches.conf +++ b/app-emulation/xen-tools/files/gentoo-patches.conf @@ -61,6 +61,16 @@ ${_gx053} ${_gx050} ${_gx051} ${_gx054} ${_gx056} " +# xen-tools-4.13.3 patches set +_gpv_xen_tools_4133_0=" +${_gx038} +${_gx027} +${_gx028} ${_gx029} +${_gx037} +${_gx053} ${_gx050} ${_gx051} +${_gx054} ${_gx056} +" + # xen-tools-4.14.1 patches set _gpv_xen_tools_4141_0=" ${_gx039} diff --git a/app-emulation/xen-tools/xen-tools-4.13.3.ebuild b/app-emulation/xen-tools/xen-tools-4.13.3.ebuild new file mode 100644 index 000000000000..37bd7fd1281d --- /dev/null +++ b/app-emulation/xen-tools/xen-tools-4.13.3.ebuild @@ -0,0 +1,520 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE='ncurses,xml,threads(+)' + +inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs + +MY_PV=${PV/_/-} + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + REPO="xen.git" + EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" + S="${WORKDIR}/${REPO}" +else + KEYWORDS="amd64 ~arm ~arm64 x86" + UPSTREAM_VER= + SECURITY_VER= + # xen-tools's gentoo patches tarball + GENTOO_VER=21 + # xen-tools's gentoo patches version which apply to this specific ebuild + GENTOO_GPV=0 + # xen-tools ovmf's patches + OVMF_VER= + + SEABIOS_VER="1.12.1" + EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151" + EDK2_OPENSSL_VERSION="1_1_1g" + EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" + EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d" + IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6" + + [[ -n ${UPSTREAM_VER} ]] && \ + UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz" + [[ -n ${GENTOO_VER} ]] && \ + GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" + [[ -n ${OVMF_VER} ]] && \ + OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" + + SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz + https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz + ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz ) + ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz + https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz + https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz + https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz + ${OVMF_PATCHSET_URI} ) + ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} + ${GENTOO_PATCHSET_URI}" + + S="${WORKDIR}/xen-${MY_PV}" +fi + +DESCRIPTION="Xen tools including QEMU and xl" +HOMEPAGE="https://www.xenproject.org" +DOCS=( README ) + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make +# >=dev-lang/ocaml-4 stable +# Masked in profiles/eapi-5-files instead +IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ipxe? ( rombios ) + ovmf? ( hvm ) + pygrub? ( python ) + rombios? ( hvm ) + system-ipxe? ( rombios ) + ?? ( ipxe system-ipxe ) + ?? ( qemu system-qemu )" + +COMMON_DEPEND=" + sys-apps/pciutils + dev-libs/lzo:2 + dev-libs/glib:2 + dev-libs/yajl + dev-libs/libaio + dev-libs/libgcrypt:0 + sys-libs/zlib + ${PYTHON_DEPS} +" + +DEPEND="${COMMON_DEPEND} + >=sys-kernel/linux-headers-4.11 + $(python_gen_cond_dep ' + dev-python/lxml[${PYTHON_MULTI_USEDEP}] + pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] ) + ') + x86? ( sys-devel/dev86 + system-ipxe? ( sys-firmware/ipxe[qemu] ) + sys-power/iasl ) + api? ( dev-libs/libxml2 + net-misc/curl ) + + ovmf? ( + !arm? ( !arm64? ( dev-lang/nasm ) ) + $(python_gen_impl_dep sqlite) + ) + !amd64? ( >=sys-apps/dtc-1.4.0 ) + amd64? ( sys-power/iasl + system-seabios? ( sys-firmware/seabios ) + system-ipxe? ( sys-firmware/ipxe[qemu] ) + rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) + dev-lang/perl + app-misc/pax-utils + doc? ( + app-text/ghostscript-gpl + app-text/pandoc + $(python_gen_cond_dep ' + dev-python/markdown[${PYTHON_MULTI_USEDEP}] + ') + dev-texlive/texlive-latexextra + media-gfx/transfig + ) + hvm? ( x11-base/xorg-proto ) + qemu? ( + app-arch/snappy:= + x11-libs/pixman + sdl? ( + media-libs/libsdl[X] + media-libs/libsdl2[X] + ) + ) + system-qemu? ( app-emulation/qemu[xen] ) + ocaml? ( dev-ml/findlib + >=dev-lang/ocaml-4 ) + python? ( >=dev-lang/swig-4.0.0 )" + +RDEPEND="${COMMON_DEPEND} + sys-apps/iproute2[-minimal] + net-misc/bridge-utils + screen? ( + app-misc/screen + app-admin/logrotate + )" + +# hvmloader is used to bootstrap a fully virtualized kernel +# Approved by QA team in bug #144032 +QA_WX_LOAD=" + usr/libexec/xen/boot/hvmloader + usr/share/qemu-xen/qemu/hppa-firmware.img + usr/share/qemu-xen/qemu/s390-ccw.img + usr/share/qemu-xen/qemu/u-boot.e500 +" + +QA_PREBUILT=" + usr/libexec/xen/bin/elf2dmp + usr/libexec/xen/bin/ivshmem-client + usr/libexec/xen/bin/ivshmem-server + usr/libexec/xen/bin/qemu-edid + usr/libexec/xen/bin/qemu-img + usr/libexec/xen/bin/qemu-io + usr/libexec/xen/bin/qemu-keymap + usr/libexec/xen/bin/qemu-nbd + usr/libexec/xen/bin/qemu-pr-helper + usr/libexec/xen/bin/qemu-system-i386 + usr/libexec/xen/bin/virtfs-proxy-helper + usr/libexec/xen/libexec/xen-bridge-helper + usr/share/qemu-xen/qemu/s390-ccw.img + usr/share/qemu-xen/qemu/s390-netboot.img + usr/share/qemu-xen/qemu/u-boot.e500 +" + +RESTRICT="test" + +pkg_setup() { + python_setup + export "CONFIG_LOMOUNT=y" + + #bug 522642, disable compile tools/tests + export "CONFIG_TESTS=n" + + if [[ -z ${XEN_TARGET_ARCH} ]] ; then + if use x86 && use amd64; then + die "Confusion! Both x86 and amd64 are set in your use flags!" + elif use x86; then + export XEN_TARGET_ARCH="x86_32" + elif use amd64 ; then + export XEN_TARGET_ARCH="x86_64" + elif use arm; then + export XEN_TARGET_ARCH="arm32" + elif use arm64; then + export XEN_TARGET_ARCH="arm64" + else + die "Unsupported architecture!" + fi + fi +} + +src_prepare() { + local i + + # Upstream's patchset + if [[ -n ${UPSTREAM_VER} ]]; then + einfo "Try to apply Xen Upstream patch set" + eapply "${WORKDIR}"/patches-upstream + fi + + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + einfo "Try to apply Xen Security patch set" + # apply main xen patches + # Two parallel systems, both work side by side + # Over time they may concdense into one. This will suffice for now + EPATCH_SUFFIX="patch" + EPATCH_FORCE="yes" + + source "${WORKDIR}"/patches-security/${PV}.conf || die + + for i in ${XEN_SECURITY_MAIN}; do + eapply "${WORKDIR}"/patches-security/xen/$i + done + + # apply qemu-xen/upstream patches + pushd "${S}"/tools/qemu-xen/ > /dev/null + for i in ${XEN_SECURITY_QEMUU}; do + eapply "${WORKDIR}"/patches-security/qemuu/$i + done + popd > /dev/null + + # apply qemu-traditional patches + pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null + for i in ${XEN_SECURITY_QEMUT}; do + eapply "${WORKDIR}"/patches-security/qemut/$i + done + popd > /dev/null + fi + + # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err + mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die + pushd tools/firmware/ > /dev/null + ln -s seabios-dir-remote seabios-dir || die + popd > /dev/null + + # Gentoo's patchset + if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then + einfo "Try to apply Gentoo specific patch set" + source "${FILESDIR}"/gentoo-patches.conf || die + _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} + for i in ${!_gpv}; do + eapply "${WORKDIR}"/patches-gentoo/$i + done + fi + + # Ovmf's patchset + if use ovmf; then + if [[ -n ${OVMF_VER} ]];then + einfo "Try to apply Ovmf patch set" + pushd "${WORKDIR}"/edk2-*/ > /dev/null + eapply "${WORKDIR}"/patches-ovmf + popd > /dev/null + fi + mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die + rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die + rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die + rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die + rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die + mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die + mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die + cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die + cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die + cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die + fi + + # ipxe + if use ipxe; then + cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die + + # gcc 10 + cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die + echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die + fi + + mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die + + # Fix texi2html build error with new texi2html, qemu.doc.html + sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die + + use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die + sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ + -i tools/firmware/Makefile || die + + # Drop .config, fixes to gcc-4.6 + sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + + # drop flags + unset CFLAGS + unset LDFLAGS + unset ASFLAGS + unset CPPFLAGS + + if ! use pygrub; then + sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die + fi + + if ! use python; then + sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die + fi + + if ! use hvm; then + sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die + # Bug 351648 + elif ! use x86 && ! has x86 $(get_all_abis); then + mkdir -p "${WORKDIR}"/extra-headers/gnu || die + touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die + export CPATH="${WORKDIR}"/extra-headers + fi + + if use qemu; then + if use sdl; then + sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \ + tools/Makefile || die + else + sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \ + tools/qemu-xen-traditional/xen-setup || die + sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \ + tools/Makefile || die + fi + else + # Don't bother with qemu, only needed for fully virtualised guests + sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die + fi + + # Reset bash completion dir; Bug 472438 + sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ + -i Config.mk || die + sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die + + # xencommons, Bug #492332, sed lighter weight than patching + sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ + -i tools/hotplug/Linux/init.d/xencommons.in || die + + # fix bashishm + sed -e '/Usage/s/\$//g' \ + -i tools/hotplug/Linux/init.d/xendriverdomain.in || die + + # respect multilib, usr/lib/libcacard.so.0.0.0 + sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ + -i tools/qemu-xen/configure || die + + #bug 518136, don't build 32bit exactuable for nomultilib profile + if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then + sed -i -e "/x86_emulator/d" tools/tests/Makefile || die + fi + + # uncomment lines in xl.conf + sed -e 's:^#autoballoon=:autoballoon=:' \ + -e 's:^#lockfile=:lockfile=:' \ + -e 's:^#vif.default.script=:vif.default.script=:' \ + -i tools/examples/xl.conf || die + + # disable capstone (Bug #673474) + sed -e "s:\$\$source/configure:\0 --disable-capstone:" \ + -i tools/Makefile || die + + # disable glusterfs + sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \ + -i tools/Makefile || die + + # disable jpeg automagic + sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \ + -i tools/Makefile || die + + # disable png automagic + sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \ + -i tools/Makefile || die + + default +} + +src_configure() { + local myconf="--prefix=${PREFIX}/usr \ + --libdir=${PREFIX}/usr/$(get_libdir) \ + --libexecdir=${PREFIX}/usr/libexec \ + --localstatedir=${EPREFIX}/var \ + --disable-werror \ + --disable-xen \ + --enable-tools \ + --enable-docs \ + $(use_enable api xenapi) \ + $(use_enable ipxe) \ + $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \ + $(use_enable ocaml ocamltools) \ + $(use_enable ovmf) \ + $(use_enable pam) \ + $(use_enable rombios) \ + --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ + " + + use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" + use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64" + use amd64 && myconf+=" $(use_enable qemu-traditional)" + tc-ld-disable-gold # Bug 669570 + econf ${myconf} +} + +src_compile() { + local myopt + use debug && myopt="${myopt} debug=y" + use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y" + + if test-flag-CC -fno-strict-overflow; then + append-flags -fno-strict-overflow + fi + + emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt} + + if use doc; then + emake -C docs build + else + emake -C docs man-pages + fi +} + +src_install() { + # Override auto-detection in the build system, bug #382573 + export INITD_DIR=/tmp/init.d + export CONFIG_LEAF_DIR=../tmp/default + + # Let the build system compile installed Python modules. + local PYTHONDONTWRITEBYTECODE + export PYTHONDONTWRITEBYTECODE + + emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ + XEN_PYTHON_NATIVE_INSTALL=y install-tools + + # Created at runtime + rm -rv "${ED}/var/run" || die + + # Fix the remaining Python shebangs. + python_fix_shebang "${D}" + + # Remove RedHat-specific stuff + rm -rf "${D}"/tmp || die + + if use doc; then + emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs + dodoc -r docs/{pdf,txt} + else + emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032 + fi + dodoc ${DOCS[@]} + + newconfd "${FILESDIR}"/xendomains.confd xendomains + newconfd "${FILESDIR}"/xenstored.confd xenstored + newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled + newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains + newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored + newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled + newinitd "${FILESDIR}"/xencommons.initd xencommons + newconfd "${FILESDIR}"/xencommons.confd xencommons + newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev + newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev + newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog + + if use screen; then + cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die + cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die + keepdir /var/log/xen-consoles + fi + + # For -static-libs wrt Bug 384355 + if ! use static-libs; then + rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a + fi + + # for xendomains + keepdir /etc/xen/auto + + # Remove files failing QA AFTER emake installs them, avoiding seeking absent files + find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ + -o -name openbios-ppc -o -name palcode-clipper \) -delete || die + + keepdir /var/lib/xen/dump + keepdir /var/lib/xen/xenpaging + keepdir /var/lib/xenstored + keepdir /var/log/xen + + if use python; then + python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py" + python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so" + fi + + python_optimize +} + +pkg_postinst() { + elog "Official Xen Guide and the offical wiki page:" + elog "https://wiki.gentoo.org/wiki/Xen" + elog "https://wiki.xen.org/wiki/Main_Page" + elog "" + elog "Recommended to utilise the xencommons script to config system at boot" + elog "Add by use of rc-update on completion of the install" + + if ! use hvm; then + echo + elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" + elog "support enable the hvm use flag." + elog "An x86 or amd64 system is required to build HVM support." + fi + + if use qemu; then + elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" + elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" + elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" + elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" + fi +} diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index bdc4251e8c9b..0c2a0faab070 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -2,6 +2,7 @@ DIST xen-4.13.2-upstream-patches-4.tar.xz 65324 BLAKE2B 0e71e4600fffcf1341a52103 DIST xen-4.13.2-upstream-patches-5.tar.xz 76580 BLAKE2B 8eeab100c14d769174e7d935d4e081ffc2d72b771f8022ce5c31b89d860ddba5381baf55b87443dc3bc555b404595492d30bc7f2a103c77762004acfce70446e SHA512 5dd5c63267e9542626315efec94642901cff55f4a1f8148c58f86677254381242fce3d6c5c0ae72665b452441c54647d0b9a132a2a18ffb4ff7eaad86ef227de DIST xen-4.13.2-upstream-patches-6.tar.xz 80980 BLAKE2B a20643c4f89f197e4001c0181249bc1a22b60874bc077ba2abee716b8e64bbbea0885a64632f3120960425a741328ceba1b44dc10a7a24039b328e1ded28f752 SHA512 0b097dfb04404ec6c609d35d924b3d2306c5f2de0501aa0b8e007e0af9a4ef394fae2d736435401bf8bd1fd661171c71ba712585bdb195649e3350ef9f953115 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3 +DIST xen-4.13.3.tar.gz 39044539 BLAKE2B 5d0e57c76e12e1b86b78bbf561e947d70b9569a24412617a640346d2358b141a2741e7a3be454df52d198ad63e58b1519288de62330417c70e72445703f3fac2 SHA512 622127d824b9c49b57282a887fb404e0bad05ff60bccade82e4e0e9b5ad975ff9aa1fba83392e6d8379e9a15340e8ae9785c0913eb11027816e4600432eea6b6 DIST xen-4.14.1-upstream-patches-2.tar.xz 22920 BLAKE2B 890cd9bcc3c72b4ed192476a913de0377d50ddeb180e0d6dc4720e86662387a699ad74b263adf2b867b2421fcf3efdcacaa17bf581643afc50c9dc7e8a3dfc60 SHA512 ca0e53f40fe23d9a6c6374b460fcc0c8063e511f03ca86c02291fcb73bf9f91594de6fd615609997e0aac2e9c59ccc8512e4151a1d2646a70f3b5bacd95ad325 DIST xen-4.14.1-upstream-patches-3.tar.xz 27864 BLAKE2B 69a67e863a30c0079f7955dd5306f69890a4f6db91d4cf2d1806a2bbd8afad88db7789c7eda8da0ff2a945da04916ff4ab5eaa9e529a417112ae01e31151d0dc SHA512 19e5ef39616fffbff20b2f658d61e50e21741fe3c5c4ca89f67e72a1606b3a593f93e9090fb0b5c76c1c801f931c237d2be6329bd174fa911d66b81ad4a332dd DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9 diff --git a/app-emulation/xen/xen-4.13.3.ebuild b/app-emulation/xen/xen-4.13.3.ebuild new file mode 100644 index 000000000000..556820b0cbae --- /dev/null +++ b/app-emulation/xen/xen-4.13.3.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs + +MY_PV=${PV/_/-} +MY_P=${PN}-${MY_PV} + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="git://xenbits.xen.org/xen.git" + SRC_URI="" +else + KEYWORDS="amd64 ~arm -x86" + UPSTREAM_VER= + SECURITY_VER= + GENTOO_VER= + + [[ -n ${UPSTREAM_VER} ]] && \ + UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz + https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" + [[ -n ${SECURITY_VER} ]] && \ + SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" + [[ -n ${GENTOO_VER} ]] && \ + GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" + SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz + ${UPSTREAM_PATCHSET_URI} + ${SECURITY_PATCHSET_URI} + ${GENTOO_PATCHSET_URI}" +fi + +DESCRIPTION="The Xen virtual machine monitor" +HOMEPAGE="https://www.xenproject.org" +LICENSE="GPL-2" +SLOT="0" +IUSE="debug efi flask" + +DEPEND="${PYTHON_DEPS} + efi? ( >=sys-devel/binutils-2.22[multitarget] ) + !efi? ( >=sys-devel/binutils-2.22 )" +RDEPEND="" +PDEPEND="~app-emulation/xen-tools-${PV}" + +# no tests are available for the hypervisor +# prevent the silliness of /usr/lib/debug/usr/lib/debug files +# prevent stripping of the debug info from the /usr/lib/debug/xen-syms +RESTRICT="test splitdebug strip" + +# Approved by QA team in bug #144032 +QA_WX_LOAD="boot/xen-syms-${PV}" + +REQUIRED_USE="arm? ( debug )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + python-any-r1_pkg_setup + if [[ -z ${XEN_TARGET_ARCH} ]]; then + if use amd64; then + export XEN_TARGET_ARCH="x86_64" + elif use arm; then + export XEN_TARGET_ARCH="arm32" + elif use arm64; then + export XEN_TARGET_ARCH="arm64" + else + die "Unsupported architecture!" + fi + fi + + if use flask ; then + export "XSM_ENABLE=y" + export "FLASK_ENABLE=y" + fi +} + +src_prepare() { + # Upstream's patchset + [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream + + # Security patchset + if [[ -n ${SECURITY_VER} ]]; then + einfo "Try to apply Xen Security patch set" + # apply main xen patches + # Two parallel systems, both work side by side + # Over time they may concdense into one. This will suffice for now + source "${WORKDIR}"/patches-security/${PV}.conf + + local i + for i in ${XEN_SECURITY_MAIN}; do + eapply "${WORKDIR}"/patches-security/xen/$i + done + fi + + # Gentoo's patchset + [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo + + eapply "${FILESDIR}"/${PN}-4.11-efi.patch + + # Drop .config + sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + + if use efi; then + export EFI_VENDOR="gentoo" + export EFI_MOUNTPOINT="/boot" + fi + + default +} + +src_configure() { + use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" + + use debug && myopt="${myopt} debug=y" + + # remove flags + unset CFLAGS + unset LDFLAGS + unset ASFLAGS + + tc-ld-disable-gold # Bug 700374 +} + +src_compile() { + # Send raw LDFLAGS so that --as-needed works + emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} +} + +src_install() { + local myopt + use debug && myopt="${myopt} debug=y" + + # The 'make install' doesn't 'mkdir -p' the subdirs + if use efi; then + mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die + fi + + emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install + + # make install likes to throw in some extra EFI bits if it built + use efi || rm -rf "${D}/usr/$(get_libdir)/efi" +} + +pkg_postinst() { + elog "Official Xen Guide:" + elog " https://wiki.gentoo.org/wiki/Xen" + + use efi && einfo "The efi executable is installed in /boot/efi/gentoo" + + elog "You can optionally block the installation of /boot/xen-syms by an entry" + elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" + elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" + + ewarn + ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause" + ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems" + ewarn "to work fine." + ewarn + ewarn "Add sched=credit to xen command line options to use the legacy scheduler." + ewarn + ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B" +} diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz index 85219c66161b..a951bd1099a2 100644 Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ diff --git a/app-forensics/ovaldi/ovaldi-5.10.1.7.ebuild b/app-forensics/ovaldi/ovaldi-5.10.1.7.ebuild index e205472bb1bf..5241a7f739bd 100644 --- a/app-forensics/ovaldi/ovaldi-5.10.1.7.ebuild +++ b/app-forensics/ovaldi/ovaldi-5.10.1.7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils toolchain-funcs +inherit epatch toolchain-funcs DESCRIPTION="Free implementation of OVAL" HOMEPAGE="http://oval.mitre.org/language/interpreter.html" diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz index 4b5bb82e4f2b..e07de2891369 100644 Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ diff --git a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild index 84ab4c38fa3f..4532e744ba5b 100644 --- a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild +++ b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils +inherit autotools epatch DESCRIPTION="Japanese input method Anthy IMEngine for SCIM" HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMAnthy" diff --git a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild index 1d5570ba7d79..90545a676bfe 100644 --- a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild +++ b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild @@ -11,10 +11,8 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip LICENSE="unicode" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="" -DEPEND="app-arch/unzip" -RDEPEND="" +BDEPEND="app-arch/unzip" S="${WORKDIR}" diff --git a/app-i18n/unicode-data/unicode-data-12.1.0.ebuild b/app-i18n/unicode-data/unicode-data-12.1.0.ebuild index 77cce03aea3d..d5f7f27ee193 100644 --- a/app-i18n/unicode-data/unicode-data-12.1.0.ebuild +++ b/app-i18n/unicode-data/unicode-data-12.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,8 @@ SRC_URI="https://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip LICENSE="unicode" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" -DEPEND="app-arch/unzip" -RDEPEND="" +BDEPEND="app-arch/unzip" S="${WORKDIR}" diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz index c9af4a97ac4f..5ce6c7c9bfe4 100644 Binary files a/app-laptop/Manifest.gz and b/app-laptop/Manifest.gz differ diff --git a/app-laptop/tpb/tpb-0.6.4-r1.ebuild b/app-laptop/tpb/tpb-0.6.4-r1.ebuild index f8bff7aa3280..ee68708eff7b 100644 --- a/app-laptop/tpb/tpb-0.6.4-r1.ebuild +++ b/app-laptop/tpb/tpb-0.6.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit linux-info eutils +inherit linux-info epatch DESCRIPTION="IBM ThinkPad buttons utility" HOMEPAGE="https://savannah.nongnu.org/projects/tpb/" diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index 53df7173c52f..6c31d5b44cdb 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/actkbd/actkbd-0.2.8-r2.ebuild b/app-misc/actkbd/actkbd-0.2.8-r2.ebuild index 0b926c6873fa..28ba133c9bdf 100644 --- a/app-misc/actkbd/actkbd-0.2.8-r2.ebuild +++ b/app-misc/actkbd/actkbd-0.2.8-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit linux-info eutils toolchain-funcs +inherit linux-info toolchain-funcs DESCRIPTION="A keyboard shortcut daemon" HOMEPAGE="http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/" @@ -12,16 +12,12 @@ SRC_URI="http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${P}.tar LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND="" CONFIG_CHECK="~INPUT_EVDEV" -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.2.7-amd64.patch -} +PATCHES=( + "${FILESDIR}"/${PN}-0.2.7-amd64.patch +) src_compile() { emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" @@ -30,10 +26,12 @@ src_compile() { src_install() { dobin actkbd dodoc AUTHORS ChangeLog FAQ README TODO + docinto samples dodoc samples/actkbd.conf - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}.initd" ${PN} + + newconfd "${FILESDIR}"/${PN}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} } pkg_postinst() { diff --git a/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch b/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch index b962d7e861a7..574e341b5c79 100644 --- a/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch +++ b/app-misc/actkbd/files/actkbd-0.2.7-amd64.patch @@ -1,8 +1,7 @@ # Try to fix pointer assigned to int and vice-versa problems. Written by Joe Pelkey. -diff -ru actkbd-0.2.7.orig/actkbd.h actkbd-0.2.7/actkbd.h ---- actkbd-0.2.7.orig/actkbd.h 2006-05-02 13:24:01.000000000 -0400 -+++ actkbd-0.2.7/actkbd.h 2006-10-27 03:37:37.000000000 -0400 +--- a/actkbd.h ++++ b/actkbd.h @@ -122,7 +122,7 @@ typedef struct _attr_t attr_t; struct _attr_t { @@ -12,9 +11,8 @@ diff -ru actkbd-0.2.7.orig/actkbd.h actkbd-0.2.7/actkbd.h attr_t *next; /* The next node */ }; -diff -ru actkbd-0.2.7.orig/config.c actkbd-0.2.7/config.c ---- actkbd-0.2.7.orig/config.c 2006-08-20 07:05:36.000000000 -0400 -+++ actkbd-0.2.7/config.c 2006-10-27 03:55:21.000000000 -0400 +--- a/config.c ++++ b/config.c @@ -107,7 +107,7 @@ strtolower(attrs); while ((tmp = strsep(&attrs, ", \t")) != NULL) { diff --git a/app-misc/aldo/aldo-0.7.7.ebuild b/app-misc/aldo/aldo-0.7.7.ebuild index d4a4f66971ce..9aab66cb2ca6 100644 --- a/app-misc/aldo/aldo-0.7.7.ebuild +++ b/app-misc/aldo/aldo-0.7.7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 DESCRIPTION="A morse tutor" HOMEPAGE="https://www.nongnu.org/aldo/" @@ -10,13 +10,10 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" RDEPEND=">=media-libs/libao-0.8.5" DEPEND="${RDEPEND}" -DOCS=( AUTHORS ChangeLog NEWS README THANKS ) - src_compile() { emake LDFLAGS="${LDFLAGS}" } diff --git a/app-misc/beanstalkd/beanstalkd-1.10.ebuild b/app-misc/beanstalkd/beanstalkd-1.10.ebuild index 3d7f2e0b9f7a..0207e6355a88 100644 --- a/app-misc/beanstalkd/beanstalkd-1.10.ebuild +++ b/app-misc/beanstalkd/beanstalkd-1.10.ebuild @@ -3,7 +3,7 @@ EAPI=5 -inherit eutils systemd toolchain-funcs user +inherit systemd toolchain-funcs user DESCRIPTION="A simple, fast work queue" HOMEPAGE="http://kr.github.io/beanstalkd/" diff --git a/app-misc/beanstalkd/beanstalkd-1.11.ebuild b/app-misc/beanstalkd/beanstalkd-1.11.ebuild index 776d6dc48611..3f10665d8ffc 100644 --- a/app-misc/beanstalkd/beanstalkd-1.11.ebuild +++ b/app-misc/beanstalkd/beanstalkd-1.11.ebuild @@ -3,7 +3,7 @@ EAPI=5 -inherit eutils systemd toolchain-funcs user +inherit systemd toolchain-funcs user DESCRIPTION="A simple, fast work queue" HOMEPAGE="http://kr.github.io/beanstalkd/" diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest index 86f68d20ecee..09a11b1aa741 100644 --- a/app-misc/bijiben/Manifest +++ b/app-misc/bijiben/Manifest @@ -1 +1,2 @@ DIST bijiben-3.36.3.tar.xz 528772 BLAKE2B 2445f0b3b40aa9c556635d25e85b31f620a83a4be4ed4c6d3091d3f3c5f19d5b8fc13769ed56bea6a731184b9dfdd2f604a3f29ad8dbde9c019a1f58f4c41447 SHA512 dba2d9da6ae62dd10a75662b9b04475e0ba64f50065d1dab8da8601b6a4dc44cb4f2b6129dec1f4a415844bee80ff534704e703118838a993a4ffe3ebbe2d254 +DIST bijiben-40.0.tar.xz 642760 BLAKE2B 9c0f9f1d103e9775ce1369b16844828c11c2c43ba9808a5978d7090fe131d9dd54a25cd4fd06cb565b2d7936c6298a87f4a774cc5c30aa0cd6a86ae012b45043 SHA512 3fef381014109fe716d05b4b150f80778196c29af588e3a476b663aac5b113659f8ddfed82417811292bf9039a3d0982591503f72550130179ed1a7fef39edcd diff --git a/app-misc/bijiben/bijiben-40.0.ebuild b/app-misc/bijiben/bijiben-40.0.ebuild new file mode 100644 index 000000000000..6748c33e46a8 --- /dev/null +++ b/app-misc/bijiben/bijiben-40.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +inherit gnome.org gnome2-utils meson python-any-r1 xdg + +DESCRIPTION="Note editor designed to remain simple to use" +HOMEPAGE="https://wiki.gnome.org/Apps/Notes" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + app-misc/tracker:3= + >=dev-libs/glib-2.53.4:2 + net-libs/gnome-online-accounts:= + >=x11-libs/gtk+-3.19.3:3 + dev-libs/json-glib + >=gnome-extra/evolution-data-server-3.33.2:= + >=gui-libs/libhandy-1.0.0:1= + dev-libs/libxml2:2 + sys-apps/util-linux + >=net-libs/webkit-gtk-2.26:4 +" +RDEPEND="${DEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + dev-libs/appstream-glib + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + -Dupdate_mimedb=false + -Dprivate_store=false # private store is mainly meant for flatpak builds + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-misc/cdargs/cdargs-1.35-r2.ebuild b/app-misc/cdargs/cdargs-1.35-r2.ebuild index c1a76560ba1f..49a232fae2de 100644 --- a/app-misc/cdargs/cdargs-1.35-r2.ebuild +++ b/app-misc/cdargs/cdargs-1.35-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools elisp-common eutils +inherit autotools elisp-common DESCRIPTION="Bookmarks and browser for the shell builtin cd command" HOMEPAGE="http://www.skamphausen.de/cgi-bin/ska/CDargs" @@ -16,7 +16,8 @@ IUSE="emacs" DEPEND=" sys-libs/ncurses:0= - emacs? ( >=app-editors/emacs-23.1:* )" + emacs? ( >=app-editors/emacs-23.1:* ) +" RDEPEND="${DEPEND}" SITEFILE=50${PN}-gentoo.el @@ -24,10 +25,11 @@ SITEFILE=50${PN}-gentoo.el PATCHES=( "${FILESDIR}"/${P}-format_security.patch "${FILESDIR}"/${P}-tinfo.patch - ) +) src_prepare() { - epatch "${PATCHES[@]}" + default + mv configure.{in,ac} || die eautoreconf } @@ -41,12 +43,13 @@ src_compile() { src_install() { default - cd "${S}/contrib" || die + cd "${S}"/contrib || die insinto /usr/share/cdargs doins cdargs-bash.sh cdargs-tcsh.csh + if use emacs ; then elisp-install ${PN} cdargs.{el,elc} - elisp-site-file-install "${FILESDIR}/${SITEFILE}" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi } diff --git a/app-misc/cdargs/files/cdargs-1.35-format_security.patch b/app-misc/cdargs/files/cdargs-1.35-format_security.patch index 978a8e92c088..525ad2434651 100644 --- a/app-misc/cdargs/files/cdargs-1.35-format_security.patch +++ b/app-misc/cdargs/files/cdargs-1.35-format_security.patch @@ -1,86 +1,3 @@ - - - -cdargs.git - cdargs - - - - - - - - - - - - - - -index : cdargs.git - -f10 -f11 -f12 -f13 -f14 -f15 -f16 -f17 -f18 -f19 -f20 -f21 -f22 -f7 -f8 -f9 -master - -cdargsJesse Keating - -summaryrefslogtreecommitdiffstats - -log msg -author -committer -range - - - - - -path: root/cdargs-1.35_format_security.patchblob: 3ddc550e607e9f908b891c7e3626ee256484607e (plain) - -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 - -diff --git a/src/cdargs.cc b/src/cdargs.cc -index e505e4e..1fdfeb8 100644 --- a/src/cdargs.cc +++ b/src/cdargs.cc @@ -1301,7 +1301,7 @@ void helpscreen(void) { @@ -92,9 +9,3 @@ index e505e4e..1fdfeb8 100644 exit(1); } - - - - - - diff --git a/app-misc/cdargs/files/cdargs-1.35-tinfo.patch b/app-misc/cdargs/files/cdargs-1.35-tinfo.patch index d85a3b9b685c..a4ca4e28b10b 100644 --- a/app-misc/cdargs/files/cdargs-1.35-tinfo.patch +++ b/app-misc/cdargs/files/cdargs-1.35-tinfo.patch @@ -1,8 +1,3 @@ - configure.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index a21d664..263929e 100644 --- a/configure.in +++ b/configure.in @@ -8,10 +8,11 @@ dnl if test "$has_curses" = "false" ; then diff --git a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild index 1e999f50c638..666d31687f27 100644 --- a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild +++ b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild @@ -3,7 +3,7 @@ EAPI="5" -inherit versionator eutils flag-o-matic toolchain-funcs +inherit versionator epatch flag-o-matic toolchain-funcs # Columbia University only uses the third component, e.g. cku211.tar.gz for # what we would call 8.0.211. diff --git a/app-misc/detox/detox-1.2.0-r3.ebuild b/app-misc/detox/detox-1.2.0-r3.ebuild index ec5d2e34a18c..2ec1846e2a59 100644 --- a/app-misc/detox/detox-1.2.0-r3.ebuild +++ b/app-misc/detox/detox-1.2.0-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils +inherit epatch MY_P="${PN}-${PV/_/-}" diff --git a/app-misc/digitemp/digitemp-3.7.1.ebuild b/app-misc/digitemp/digitemp-3.7.1.ebuild index 01e1ebe0ca3a..65431c4aae4f 100644 --- a/app-misc/digitemp/digitemp-3.7.1.ebuild +++ b/app-misc/digitemp/digitemp-3.7.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs @@ -9,10 +9,10 @@ DESCRIPTION="Temperature logging and reporting using Maxim's iButtons and 1-Wire HOMEPAGE="https://www.digitemp.com/ https://www.ibutton.com/" SRC_URI="https://github.com/bcl/digitemp/archive/v${PV}.tar.gz -> ${P}.tar.gz" -IUSE="ds9097 ds9097u ds2490" SLOT="0" LICENSE="GPL-2" KEYWORDS="amd64 x86" +IUSE="ds9097 ds9097u ds2490" DEPEND="ds2490? ( virtual/libusb:0 )" @@ -21,6 +21,7 @@ targets() { if ! ( use ds9097 || use ds9097u || use ds2490 ); then echo ds9097u fi + for target in ds9097 ds9097u ds2490; do if use ${target}; then echo ${target} @@ -29,8 +30,13 @@ targets() { } src_prepare() { - sed -i -e "/^CFLAGS/s:-O2:${CFLAGS}:" \ - -e "/^LIBS/s:=:= ${LDFLAGS}:" Makefile + default + + sed -i \ + -e "/^CFLAGS/s:-O2:${CFLAGS}:" \ + -e "/^LIBS/s:=:= ${LDFLAGS}:" \ + Makefile || die + # default is to compile to the ds9097u. if ! ( use ds9097 || use ds9097u || use ds2490 ); then ewarn "If you don't choose a component to install, we default to ds9097u" @@ -40,9 +46,9 @@ src_prepare() { src_compile() { local targets=$(targets) - for target in $targets; do + for target in ${targets}; do emake clean - emake CC="$(tc-getCC)" LOCK="no" ${target} + emake CC="$(tc-getCC)" LOCK="no" ${target} done } @@ -53,23 +59,19 @@ src_install() { done if [[ $(targets|wc -l) -ge 1 ]]; then - echo ewarn "/usr/bin/digitemp has been symlinked to /usr/bin/digitemp_${target}" ewarn "If you want to access the others, they are available at /usr/bin/digitemp_*" - echo fi dodoc README FAQ TODO for example in perl python rrdb; do - insinto "/usr/share/doc/${PF}/${example}_examples" - doins -r ${example}/* + docinto ${example}_examples + dodoc -r ${example}/* done } pkg_postinst() { - echo elog "Examples of using digitemp with python, perl, and rrdtool are" elog "located in /usr/share/doc/${PF}/" - echo } diff --git a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild index b0196c0d391c..2c47d3562892 100644 --- a/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild +++ b/app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils +inherit epatch MY_P=${PN}_5.5-20060227 diff --git a/app-misc/fdutils/fdutils-5.5.20060227.ebuild b/app-misc/fdutils/fdutils-5.5.20060227.ebuild index 632a26a8982b..2df9ab872a03 100644 --- a/app-misc/fdutils/fdutils-5.5.20060227.ebuild +++ b/app-misc/fdutils/fdutils-5.5.20060227.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils +inherit epatch MY_P=${PN}_5.5-20060227 diff --git a/app-misc/gcal/gcal-3.6.3.ebuild b/app-misc/gcal/gcal-3.6.3.ebuild index b84cc575396a..9ff90a677275 100644 --- a/app-misc/gcal/gcal-3.6.3.ebuild +++ b/app-misc/gcal/gcal-3.6.3.ebuild @@ -3,7 +3,7 @@ EAPI=5 -inherit eutils flag-o-matic toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="The GNU Calendar - a replacement for cal" HOMEPAGE="https://www.gnu.org/software/gcal/" diff --git a/app-misc/geoclue/geoclue-2.5.7.ebuild b/app-misc/geoclue/geoclue-2.5.7.ebuild index 0fbeb1eca678..b039c33965dd 100644 --- a/app-misc/geoclue/geoclue-2.5.7.ebuild +++ b/app-misc/geoclue/geoclue-2.5.7.ebuild @@ -2,9 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_REQ_USE="xml(+)" VALA_USE_DEPEND="vapigen" -inherit meson systemd vala xdg +inherit meson python-any-r1 systemd vala xdg DESCRIPTION="A location information D-Bus service" HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home" @@ -30,6 +32,7 @@ RDEPEND="${DEPEND} sys-apps/dbus " BDEPEND=" + ${PYTHON_DEPS} dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( diff --git a/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch b/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch index ec2a1c51fdb8..6ae1d9a3ebf3 100644 --- a/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch +++ b/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch @@ -1,8 +1,3 @@ - src/git.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/git.c b/src/git.c -index c6040b2..595912d 100644 --- a/src/git.c +++ b/src/git.c @@ -1917,7 +1917,7 @@ main(argc, argv) diff --git a/app-misc/gnuit/files/gnuit-4.9.5-respect-AR.patch b/app-misc/gnuit/files/gnuit-4.9.5-respect-AR.patch new file mode 100644 index 000000000000..ea18af55bd8f --- /dev/null +++ b/app-misc/gnuit/files/gnuit-4.9.5-respect-AR.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,7 @@ AC_PREREQ(2.59) + AC_CANONICAL_HOST + AC_PROG_CC + AM_PROG_CC_C_O ++AM_PROG_AR + gl_EARLY + AC_PROG_CPP + AC_PROG_RANLIB diff --git a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild index 3f949e51f693..be1fe1604d60 100644 --- a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild +++ b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils +inherit autotools toolchain-funcs DESCRIPTION="GNU Interactive Tools - increase speed and efficiency of most daily tasks" HOMEPAGE="https://www.gnu.org/software/gnuit/" @@ -12,13 +12,22 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3 FDL-1.3" SLOT="0" KEYWORDS="amd64 ppc sparc x86" -IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-format-security.patch + "${FILESDIR}"/${PN}-4.9.5-respect-AR.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-format-security.patch + default + + # for AR patch + eautoreconf } src_configure() { + tc-export AR + # The transition option controls whether a "git" wrapper is installed, it is # disabled explicitly so we don't need to block on dev-vcs/git. econf --disable-transition @@ -26,8 +35,10 @@ src_configure() { src_install() { default + #emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}/html" install - mv "${D}/usr/bin/gitview" "${D}/usr/bin/gnuitview" || die + + mv "${ED}/usr/bin/gitview" "${ED}/usr/bin/gnuitview" || die } pkg_postinst() { diff --git a/app-misc/hddled/hddled-0.3.ebuild b/app-misc/hddled/hddled-0.3.ebuild index 97557da00d47..2e4b5b8cf0bb 100644 --- a/app-misc/hddled/hddled-0.3.ebuild +++ b/app-misc/hddled/hddled-0.3.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs DESCRIPTION="Show hard disk activity using the scroll lock LED" HOMEPAGE="http://members.optusnet.com.au/foonly/whirlpool/code/" SRC_URI="mirror://gentoo/${P}.c.xz" +S="${WORKDIR}" LICENSE="Unlicense" SLOT="0" @@ -17,22 +18,23 @@ IUSE="X" DEPEND="X? ( x11-libs/libX11 )" RDEPEND="${DEPEND}" -S=${WORKDIR} +src_prepare() { + default -src_unpack() { - unpack ${A} mv ${P}.c ${PN}.c || die } src_compile() { - $(tc-getCC) ${CFLAGS} -o ${PN} ${PN}.c ${LDFLAGS} || die + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ${PN} ${PN}.c ${LDFLAGS} || die + if use X ; then - $(tc-getCC) ${CFLAGS} -DX -lX11 -o x${PN} ${PN}.c ${LDFLAGS} || die + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DX -lX11 -o x${PN} ${PN}.c ${LDFLAGS} || die fi } src_install() { dobin ${PN} + if use X ; then dobin x${PN} elog "X version was renamed to x${PN}" diff --git a/app-misc/hexcompare/hexcompare-1.0.4.ebuild b/app-misc/hexcompare/hexcompare-1.0.4.ebuild index 7b11bccd5ad8..1dfa265504c5 100644 --- a/app-misc/hexcompare/hexcompare-1.0.4.ebuild +++ b/app-misc/hexcompare/hexcompare-1.0.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils toolchain-funcs +inherit epatch toolchain-funcs DESCRIPTION="ncurses-based visual comparison of binary files" HOMEPAGE="http://hexcompare.sourceforge.net/" diff --git a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild index 9cca69fbe4af..5cd00f0a8e56 100644 --- a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild +++ b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils flag-o-matic toolchain-funcs mono-env +inherit wrapper flag-o-matic toolchain-funcs mono-env DESCRIPTION="Server software for IRTrans" HOMEPAGE="http://www.irtrans.de" diff --git a/app-misc/jq/jq-1.7_pre20201109.ebuild b/app-misc/jq/jq-1.7_pre20201109.ebuild index 22f1f4f05b57..7d92e06d34ad 100644 --- a/app-misc/jq/jq-1.7_pre20201109.ebuild +++ b/app-misc/jq/jq-1.7_pre20201109.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}" LICENSE="MIT CC-BY-3.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x64-macos" IUSE="+oniguruma static-libs test" ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/ diff --git a/app-misc/kanatest/kanatest-0.4.8.ebuild b/app-misc/kanatest/kanatest-0.4.8.ebuild index 903fce705d6e..d24f05ecee86 100644 --- a/app-misc/kanatest/kanatest-0.4.8.ebuild +++ b/app-misc/kanatest/kanatest-0.4.8.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils gnome2-utils + +inherit autotools epatch gnome2-utils DESCRIPTION="Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet" HOMEPAGE="http://www.clayo.org/kanatest" @@ -11,14 +12,13 @@ SRC_URI="http://www.clayo.org/${PN}/${P}.tar.gz" LICENSE="GPL-2 GPL-2+" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" RDEPEND=">=x11-libs/gtk+-2.12:2= dev-libs/libxml2:=" DEPEND="${RDEPEND} virtual/pkgconfig" -DOCS="AUTHORS TRANSLATORS ChangeLog README" +DOCS=( AUTHORS TRANSLATORS ChangeLog README ) src_prepare() { epatch \ @@ -35,6 +35,14 @@ src_prepare() { eautoreconf } -pkg_preinst() { gnome2_icon_savelist; } -pkg_postinst() { gnome2_icon_cache_update; } -pkg_postrm() { gnome2_icon_cache_update; } +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild index 72d14a1b5177..98f2ac3db112 100644 --- a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild +++ b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs @@ -12,12 +12,13 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 arm ~mips ppc ~s390 sparc x86" -IUSE="" DEPEND="net-libs/liblockfile" RDEPEND="${DEPEND}" src_prepare() { + default + # Provide better Makefile, with clear separation between compilation # and installation. cp "${FILESDIR}/Makefile" . || die diff --git a/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch new file mode 100644 index 000000000000..1373a1010c1f --- /dev/null +++ b/app-misc/logitech-applet/files/logitech-applet-0.4_pre1-configure-error-handling.patch @@ -0,0 +1,20 @@ +--- a/configure.in ++++ b/configure.in +@@ -24,7 +24,7 @@ if test "$LUSB" = "no"; then + echo " http://libusb.sourceforge.net" + echo " or use the --with-libusb-includes option, if you have it installed" + echo " in an unusual place" +- exit ++ exit 1 + fi + AC_CHECK_LIB(usb, usb_init, LUSB="yes", LUSB="no") + if test "$LUSB" = "no"; then +@@ -33,7 +33,7 @@ if test "$LUSB" = "no"; then + echo " http://libusb.sourceforge.net" + echo " or use the --with-libusb-libraries option, if you have it installed" + echo " in an unusual place" +- exit ++ exit 1 + fi + + AC_OUTPUT(Makefile) diff --git a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild index 54066326d6cc..ed10f90c5788 100644 --- a/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild +++ b/app-misc/logitech-applet/logitech-applet-0.4_pre1-r3.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 + +inherit autotools MY_P=${P/_pre/test} MY_P=${MY_P/-applet/_applet} @@ -10,6 +11,7 @@ MY_P=${MY_P/-applet/_applet} DESCRIPTION="Control utility for some special features of some special Logitech USB mice!" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="mirror://gentoo/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0" @@ -18,10 +20,18 @@ KEYWORDS="amd64 x86" DEPEND="virtual/libusb:0" RDEPEND="${DEPEND}" -S=${WORKDIR}/${MY_P} +PATCHES=( + "${FILESDIR}"/${P}-mx300-mx518.patch + "${FILESDIR}"/${PN}-0.4_pre1-configure-error-handling.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-mx300-mx518.patch + default + + mv configure.{in,ac} || die + + # For error handling patch + eautoreconf } src_install() { diff --git a/app-misc/mmv/mmv-1.01b_p18-r1.ebuild b/app-misc/mmv/mmv-1.01b_p18-r1.ebuild index d9873bba502f..14d3ab3d55a8 100644 --- a/app-misc/mmv/mmv-1.01b_p18-r1.ebuild +++ b/app-misc/mmv/mmv-1.01b_p18-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit eutils flag-o-matic toolchain-funcs +inherit epatch flag-o-matic toolchain-funcs DEB_PATCH_VER=${PV#*_p} MY_VER=${PV%_p*} diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest index 7b4c152d3279..51100233c365 100644 --- a/app-misc/pax-utils/Manifest +++ b/app-misc/pax-utils/Manifest @@ -1,2 +1,2 @@ DIST pax-utils-1.2.9.tar.xz 705188 BLAKE2B 9eb9309f0317683dd06e491e6647ba20986f2cb248432fad0ed0eb277711e8d38c5b5148bc0b44e6dbc3d5d3d0093bccd4d10c057090801c49246a63f3bc0899 SHA512 47271cd75818728342e2a074fa05da24fce51ef0eeedb28237138525d7c86c207ca2b5d206fd02cb34529590340b726a14c54b205c65204539a51fb78ac55d41 -DIST pax-utils-1.3.tar.xz 717672 BLAKE2B 56e9677b96e38d8efbe0f1fd3e8d92f30b636a87a25cb73fc7452bd34546b25bc0c7dd05133ac99c88cbdb403a8a261f1ba55f6ba80d4571fd907284255c0e2c SHA512 8c200a217ca0a6f8dda74af9216f244d1ddb93ace1b853428cfcd26d1e0429ae199ebf54376ee3885f43ae42445341c76e1ee846def68376ae7aa63a788eeeab +DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102 diff --git a/app-misc/pax-utils/pax-utils-1.3.ebuild b/app-misc/pax-utils/pax-utils-1.3.1.ebuild similarity index 93% rename from app-misc/pax-utils/pax-utils-1.3.ebuild rename to app-misc/pax-utils/pax-utils-1.3.1.ebuild index 786da67c364c..474efb8559ac 100644 --- a/app-misc/pax-utils/pax-utils-1.3.ebuild +++ b/app-misc/pax-utils/pax-utils-1.3.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" PYTHON_COMPAT=( python3_{7,8,9} ) @@ -10,7 +10,8 @@ inherit python-single-r1 toolchain-funcs DESCRIPTION="ELF utils that can check files for security relevant properties" HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities" SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" + https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" diff --git a/app-misc/realpath/files/realpath-1.14-no-po4a.patch b/app-misc/realpath/files/realpath-1.14-no-po4a.patch index cfa780553646..44e13286bfac 100644 --- a/app-misc/realpath/files/realpath-1.14-no-po4a.patch +++ b/app-misc/realpath/files/realpath-1.14-no-po4a.patch @@ -1,8 +1,8 @@ Don't require po4a at build time. http://bugs.gentoo.org/269905 ---- realpath-1.14-orig/po/Makefile 2009-02-22 12:56:47.000000000 +0100 -+++ realpath-1.14/po/Makefile 2009-05-19 23:45:26.000000000 +0200 +--- a/po/Makefile ++++ b/po/Makefile @@ -4,5 +4,5 @@ # diff --git a/app-misc/realpath/files/realpath-1.15-prefix.patch b/app-misc/realpath/files/realpath-1.15-prefix.patch index f9534641382f..3e0837a8bf38 100644 --- a/app-misc/realpath/files/realpath-1.15-prefix.patch +++ b/app-misc/realpath/files/realpath-1.15-prefix.patch @@ -1,5 +1,3 @@ -diff --git a/common.mk b/common.mk -index 2443a40..0a342ee 100644 --- a/common.mk +++ b/common.mk @@ -8,17 +8,19 @@ override TOPDIR := $(dir $(call getCurrentMakefileName)) diff --git a/app-misc/realpath/files/realpath-1.16-nonls.patch b/app-misc/realpath/files/realpath-1.16-nonls.patch index d758d03ff89b..c1963ae46014 100644 --- a/app-misc/realpath/files/realpath-1.16-nonls.patch +++ b/app-misc/realpath/files/realpath-1.16-nonls.patch @@ -1,8 +1,3 @@ - src/realpath.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -diff --git a/src/realpath.c b/src/realpath.c -index 76fc909..e2cf86f 100644 --- a/src/realpath.c +++ b/src/realpath.c @@ -23,10 +23,9 @@ diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild index 2187339bb817..c982935ecdbd 100644 --- a/app-misc/realpath/realpath-1.18.ebuild +++ b/app-misc/realpath/realpath-1.18.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils flag-o-matic multilib prefix toolchain-funcs +inherit flag-o-matic prefix DESCRIPTION="Return the canonicalized absolute pathname" HOMEPAGE="http://packages.debian.org/unstable/utils/realpath" @@ -18,9 +18,16 @@ IUSE="nls" RDEPEND=" nls? ( virtual/libintl )" -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} nls? ( sys-devel/gettext ) - elibc_mintlib? ( virtual/libiconv )" +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.17-build.patch + "${FILESDIR}"/${PN}-1.14-no-po4a.patch + "${FILESDIR}"/${PN}-1.15-prefix.patch +) src_unpack() { unpack ${PN}_${PV}.tar.gz @@ -36,18 +43,22 @@ src_unpack() { } src_prepare() { - use nls || epatch "${FILESDIR}"/${PN}-1.16-nonls.patch - epatch \ - "${FILESDIR}"/${PN}-1.17-build.patch \ - "${FILESDIR}"/${PN}-1.14-no-po4a.patch \ - "${FILESDIR}"/${PN}-1.15-prefix.patch + if ! use nls ; then + eapply "${FILESDIR}"/${PN}-1.16-nonls.patch + fi + + default + + # Don't compress man pages + sed -i -e 's:gzip -9f:true:' common.mk || die + eprefixify common.mk } src_compile() { tc-export CC - use nls && use !elibc_glibc && append-libs -lintl - [[ ${CHOST} == *-mint* ]] && append-libs "-liconv" + + use nls && ! use elibc_glibc && append-libs -lintl local subdir for subdir in src man $(usex nls po ''); do @@ -61,12 +72,13 @@ src_install() { SUBDIRS="src man $(usex nls po '')" \ DESTDIR="${D}" \ install + newdoc debian/changelog ChangeLog.debian if use nls; then local dir for dir in "${WORKDIR}"/deb/usr/share/man/*; do - [ -f "${dir}"/man1/realpath.1 ] || continue + [[ -f "${dir}"/man1/realpath.1 ]] || continue newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1 done fi diff --git a/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild b/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild index 2241a0bfea34..7c0b4f11d35f 100644 --- a/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild +++ b/app-misc/rundeck-bin/rundeck-bin-2.6.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils java-pkg-2 rpm user +inherit epatch java-pkg-2 rpm user DESCRIPTION="Job Scheduler and Runbook Automation" HOMEPAGE="http://www.rundeck.org" diff --git a/app-misc/sonypid/sonypid-1.9.ebuild b/app-misc/sonypid/sonypid-1.9.ebuild index cb8e02458bd0..29fb9b0745ba 100644 --- a/app-misc/sonypid/sonypid-1.9.ebuild +++ b/app-misc/sonypid/sonypid-1.9.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs -DESCRIPTION="tool to use the Sony Vaios jog-dial as a mouse-wheel" +DESCRIPTION="Tool to use the Sony Vaios jog-dial as a mouse-wheel" HOMEPAGE="http://www.popies.net/sonypi/" SRC_URI="http://www.popies.net/sonypi/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 x86" -IUSE="" RDEPEND="x11-libs/libXtst" -DEPEND="${RDEPEND} - x11-base/xorg-proto" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" src_compile() { emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild index c19dc6ab4eee..ae063ea14f8f 100644 --- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild +++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild @@ -5,7 +5,7 @@ EAPI=6 WANT_AUTOMAKE=1.15 -inherit eutils autotools toolchain-funcs +inherit epatch autotools toolchain-funcs #MY_P=${P/_/-} MY_P=${P}-release diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild index 70c69baef6f5..4275fa3b36bc 100644 --- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild +++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild @@ -5,7 +5,7 @@ EAPI=6 WANT_AUTOMAKE=1.15 -inherit eutils autotools toolchain-funcs +inherit epatch autotools toolchain-funcs #MY_P=${P/_/-} MY_P=${P}-release diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild b/app-misc/sphinx/sphinx-2.2.11.ebuild index 59e47ea3505b..7b6c533c457e 100644 --- a/app-misc/sphinx/sphinx-2.2.11.ebuild +++ b/app-misc/sphinx/sphinx-2.2.11.ebuild @@ -5,7 +5,7 @@ EAPI=5 WANT_AUTOMAKE=1.15 -inherit eutils autotools toolchain-funcs +inherit epatch autotools toolchain-funcs #MY_P=${P/_/-} MY_P=${P}-release diff --git a/app-misc/srm/srm-1.2.15.ebuild b/app-misc/srm/srm-1.2.15.ebuild index c4fef52773d4..a086636c2048 100644 --- a/app-misc/srm/srm-1.2.15.ebuild +++ b/app-misc/srm/srm-1.2.15.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit autotools eutils +inherit autotools epatch DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking" HOMEPAGE="https://sourceforge.net/projects/srm/" diff --git a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild index a624e018c08c..fdae4089bf69 100644 --- a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild +++ b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils toolchain-funcs +inherit epatch toolchain-funcs DESCRIPTION="SDL based graphical file browser" HOMEPAGE="http://www.determinate.net/webdata/seg/tdfsb.html" diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild deleted file mode 100644 index f183632cfac5..000000000000 --- a/app-misc/vlock/vlock-2.2.3-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit epatch pam toolchain-funcs user - -COMMIT="f2afd55704bfe0a2d66e6b270d247e9b8a7b1664" - -DESCRIPTION="A console screen locker" -HOMEPAGE="https://github.com/WorMzy/vlock" -SRC_URI="https://github.com/WorMzy/vlock/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="pam test" -RESTRICT="!test? ( test )" - -RDEPEND=" - !>=sys-apps/kbd-2.0.4-r1[pam] - pam? ( sys-libs/pam )" - -DEPEND=" - ${RDEPEND} - test? ( dev-util/cunit )" - -DOCS=( ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-2.2.2-asneeded.patch" - "${FILESDIR}/${PN}-2.2.2-test_process.patch" -) - -pkg_setup() { - enewgroup "${PN}" -} - -src_configure() { - local myconf="--enable-shadow" - use pam && myconf="--enable-pam" - - # this package has handmade configure system which fails with econf... - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --libdir=/usr/$(get_libdir) \ - ${myconf} \ - CC="$(tc-getCC)" \ - LD="$(tc-getLD)" \ - CFLAGS="${CFLAGS} -pedantic -std=gnu99" \ - LDFLAGS="${LDFLAGS}" || die "configure failed" -} - -src_install() { - default - - # See bug #637598. - epatch "${FILESDIR}/${P}-echo-printf.patch" - - use pam && pamd_mimic_system vlock auth -} diff --git a/app-misc/vlock/vlock-2.2.3-r2.ebuild b/app-misc/vlock/vlock-2.2.3-r2.ebuild new file mode 100644 index 000000000000..eef753337853 --- /dev/null +++ b/app-misc/vlock/vlock-2.2.3-r2.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit pam toolchain-funcs + +EGIT_COMMIT="3542ef58a2b838cc8294fe82c341fb671c38611b" + +DESCRIPTION="Allows to lock one or all of the sessions of your console display" +HOMEPAGE="https://github.com/WorMzy/vlock" +SRC_URI="https://github.com/WorMzy/vlock/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +IUSE="pam test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + !sys-apps/kbd[pam] + pam? ( sys-libs/pam ) +" + +DEPEND=" + ${COMMON_DEPEND} + test? ( dev-util/cunit ) +" + +RDEPEND=" + ${COMMON_DEPEND} + acct-group/vlock +" + +DOCS=( ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO ) + +PATCHES=( + "${FILESDIR}/${PN}-2.2.2-asneeded.patch" + "${FILESDIR}/${PN}-2.2.2-test_process.patch" +) + +src_configure() { + local myeconfargs=( + CC="$(tc-getCC)" + CFLAGS="${CFLAGS} -pedantic -std=gnu99" + LD="$(tc-getLD)" + LDFLAGS="${LDFLAGS}" + $(usex pam '--enable-pam' '--enable-shadow') + --prefix="${EPREFIX}"/usr + --mandir="${EPREFIX}"/usr/share/man + --libdir="${EPREFIX}"/usr/$(get_libdir) + ) + + # This package has handmade configure system which fails with econf + ./configure "${myeconfargs[@]}" || die +} + +src_install() { + default + + # Bug #637598 + eapply "${FILESDIR}/${P}-echo-printf.patch" + + use pam && pamd_mimic_system vlock auth +} diff --git a/app-misc/vzstats/vzstats-0.5.1.ebuild b/app-misc/vzstats/vzstats-0.5.1.ebuild index b4f566ccc487..2d1ab2058c46 100644 --- a/app-misc/vzstats/vzstats-0.5.1.ebuild +++ b/app-misc/vzstats/vzstats-0.5.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit bash-completion-r1 @@ -12,19 +12,17 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND=" - virtual/cron - sys-process/cronbase - net-misc/curl[ssl] +DEPEND="sys-process/cronbase" +RDEPEND=" + ${DEPEND} app-portage/gentoolkit + net-misc/curl[ssl] sys-cluster/vzctl - " -RDEPEND="${DEPEND}" +" src_install() { - emake install install-cronjob DESTDIR="${D}" + emake install install-cronjob DESTDIR="${ED}" dodoc README newbashcomp bash_completion.sh vzstats } diff --git a/app-misc/wcd/wcd-5.2.7.ebuild b/app-misc/wcd/wcd-5.2.7.ebuild index 36a9d04865f5..8af0814c2438 100644 --- a/app-misc/wcd/wcd-5.2.7.ebuild +++ b/app-misc/wcd/wcd-5.2.7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils toolchain-funcs +inherit epatch toolchain-funcs DESCRIPTION="Wherever Change Directory" HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR" diff --git a/app-misc/wcd/wcd-6.0.2.ebuild b/app-misc/wcd/wcd-6.0.2.ebuild index 55b4560516c6..ff0d79dc7c2a 100644 --- a/app-misc/wcd/wcd-6.0.2.ebuild +++ b/app-misc/wcd/wcd-6.0.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="nls unicode" CDEPEND=" diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz index a2f6ec939ede..a95cb217447d 100644 Binary files a/app-mobilephone/Manifest.gz and b/app-mobilephone/Manifest.gz differ diff --git a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild index d7f1da29f215..6a145ab58049 100644 --- a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild +++ b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils autotools +inherit epatch autotools DESCRIPTION="A tool that converts Siemens phones VMO and VMI audio files to gsm and wav" HOMEPAGE="http://triq.net/obex/" diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz index 93b4ac47d06f..cad752ddbbeb 100644 Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ diff --git a/app-office/gnucash/files/gnucash-4.4-Fix-build-with-glib-2.68.patch b/app-office/gnucash/files/gnucash-4.4-Fix-build-with-glib-2.68.patch new file mode 100644 index 000000000000..1efa793db3ad --- /dev/null +++ b/app-office/gnucash/files/gnucash-4.4-Fix-build-with-glib-2.68.patch @@ -0,0 +1,2372 @@ +From ca76877e8e72a1e716e084eac6953e53ba1ed428 Mon Sep 17 00:00:00 2001 +From: Bill Nottingham +Date: Sat, 13 Feb 2021 16:35:27 -0500 +Subject: [PATCH] Fix build with glib 2.68 + +c0f2c3ae2 ("Fix build with glib2 2.67.x.") +7a7c26f87 ("Move glib and gtk includes out of extern C for tests.") +1dd426e31 ("Potentially fix CI test on Arch related to glib and c++") +cb0436501 ("More fixes for Arch ci failure") +e9dfd0d9e ("Still more fixes for Arch ci failure") +c49b45d8f ("Finish the glib 2.67 fixes for CI tests.") +--- + bindings/guile/test/test-scm-query.cpp | 4 ++-- + gnucash/gnome-utils/gnc-amount-edit.h | 2 ++ + gnucash/gnome-utils/gnc-tree-model-commodity.c | 1 + + gnucash/gnome/assistant-loan.cpp | 5 +++-- + gnucash/import-export/csv-imp/gnc-imp-props-price.cpp | 6 +++--- + gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp | 5 +++-- + .../test/test-import-pending-matches.cpp | 5 +++-- + gnucash/register/register-gnome/datecell-gnome.c | 1 + + libgnucash/app-utils/gnc-sx-instance-model.c | 1 + + libgnucash/app-utils/gnc-ui-balances.c | 1 + + libgnucash/app-utils/test/test-autoclear.cpp | 2 +- + libgnucash/app-utils/test/test-option-util.cpp | 7 ++++--- + libgnucash/app-utils/test/test-print-parse-amount.cpp | 5 +++-- + libgnucash/app-utils/test/test-print-queries.cpp | 6 +++--- + libgnucash/app-utils/test/test-scm-query-string.cpp | 7 +++---- + libgnucash/app-utils/test/test-sx.cpp | 5 +++-- + libgnucash/backend/dbi/gnc-backend-dbi.cpp | 7 ++++--- + libgnucash/backend/dbi/test/test-backend-dbi.cpp | 2 +- + libgnucash/backend/sql/gnc-address-sql.cpp | 4 ++-- + libgnucash/backend/sql/gnc-book-sql.cpp | 4 ++-- + libgnucash/backend/sql/gnc-customer-sql.cpp | 3 ++- + libgnucash/backend/sql/gnc-employee-sql.cpp | 2 +- + libgnucash/backend/sql/gnc-entry-sql.cpp | 2 +- + libgnucash/backend/sql/gnc-job-sql.cpp | 2 +- + libgnucash/backend/sql/gnc-price-sql.cpp | 3 +-- + libgnucash/backend/sql/gnc-recurrence-sql.cpp | 3 +-- + libgnucash/backend/sql/gnc-schedxaction-sql.cpp | 4 ++-- + libgnucash/backend/sql/gnc-vendor-sql.cpp | 4 ++-- + libgnucash/backend/sql/test/test-sqlbe.cpp | 3 ++- + libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp | 3 ++- + libgnucash/backend/xml/gnc-account-xml-v2.cpp | 4 ++-- + libgnucash/backend/xml/gnc-address-xml-v2.cpp | 4 ++-- + libgnucash/backend/xml/gnc-backend-xml.cpp | 7 ++++--- + libgnucash/backend/xml/gnc-bill-term-xml-v2.cpp | 2 -- + libgnucash/backend/xml/gnc-book-xml-v2.cpp | 4 ++-- + libgnucash/backend/xml/gnc-budget-xml-v2.cpp | 4 ++-- + libgnucash/backend/xml/gnc-commodity-xml-v2.cpp | 4 ++-- + libgnucash/backend/xml/gnc-customer-xml-v2.cpp | 4 ++-- + libgnucash/backend/xml/gnc-employee-xml-v2.cpp | 3 +-- + libgnucash/backend/xml/gnc-entry-xml-v2.cpp | 4 ++-- + libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp | 3 +-- + libgnucash/backend/xml/gnc-invoice-xml-v2.cpp | 3 +-- + libgnucash/backend/xml/gnc-job-xml-v2.cpp | 3 +-- + libgnucash/backend/xml/gnc-lot-xml-v2.cpp | 3 +-- + libgnucash/backend/xml/gnc-order-xml-v2.cpp | 3 +-- + libgnucash/backend/xml/gnc-owner-xml-v2.cpp | 3 +-- + libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp | 3 +-- + libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp | 3 +-- + libgnucash/backend/xml/gnc-tax-table-xml-v2.cpp | 3 +-- + libgnucash/backend/xml/gnc-transaction-xml-v2.cpp | 3 +-- + libgnucash/backend/xml/gnc-vendor-xml-v2.cpp | 3 +-- + libgnucash/backend/xml/gnc-xml-backend.cpp | 4 ++-- + libgnucash/backend/xml/gnc-xml-helper.cpp | 3 --- + libgnucash/backend/xml/gnc-xml-helper.h | 3 +++ + libgnucash/backend/xml/io-example-account.cpp | 6 +++--- + libgnucash/backend/xml/io-gncxml-gen.h | 4 +--- + libgnucash/backend/xml/io-gncxml-v2.cpp | 5 +++-- + libgnucash/backend/xml/io-utils.cpp | 2 +- + libgnucash/backend/xml/sixtp-dom-generators.cpp | 2 +- + libgnucash/backend/xml/sixtp-dom-parsers.cpp | 4 ++-- + libgnucash/backend/xml/sixtp-to-dom-parser.cpp | 5 ++--- + libgnucash/backend/xml/sixtp.cpp | 6 +++--- + libgnucash/backend/xml/sixtp.h | 2 +- + libgnucash/backend/xml/test/test-dom-converters1.cpp | 7 ++++--- + libgnucash/backend/xml/test/test-dom-parser1.cpp | 7 ++++--- + libgnucash/backend/xml/test/test-file-stuff.cpp | 7 ++++--- + libgnucash/backend/xml/test/test-file-stuff.h | 4 ++-- + .../backend/xml/test/test-load-example-account.cpp | 6 ++++-- + libgnucash/backend/xml/test/test-load-xml2.cpp | 7 ++++--- + libgnucash/backend/xml/test/test-save-in-lang.cpp | 8 +++++--- + libgnucash/backend/xml/test/test-xml-account.cpp | 8 +++++--- + libgnucash/backend/xml/test/test-xml-commodity.cpp | 8 +++++--- + libgnucash/backend/xml/test/test-xml-pricedb.cpp | 5 +++-- + libgnucash/backend/xml/test/test-xml-transaction.cpp | 5 +++-- + libgnucash/backend/xml/test/test-xml2-is-file.cpp | 3 +-- + libgnucash/core-utils/gnc-filepath-utils.cpp | 9 +++++---- + libgnucash/core-utils/gnc-locale-utils.cpp | 3 --- + libgnucash/core-utils/gnc-prefs.h | 4 ++++ + libgnucash/core-utils/test/gtest-path-utilities.cpp | 3 ++- + libgnucash/engine/SX-book.h | 4 ++++ + libgnucash/engine/engine-helpers.h | 4 ++++ + libgnucash/engine/gnc-commodity.h | 5 +++++ + libgnucash/engine/gnc-date.cpp | 2 +- + libgnucash/engine/gnc-date.h | 11 ++++++++++- + libgnucash/engine/gnc-engine.h | 5 +++++ + libgnucash/engine/gnc-numeric.cpp | 2 +- + libgnucash/engine/gncBusiness.h | 4 ++++ + libgnucash/engine/gncEntry.h | 6 ++++++ + libgnucash/engine/guid.h | 2 +- + libgnucash/engine/qof-string-cache.cpp | 3 ++- + libgnucash/engine/qof.h | 4 ++++ + libgnucash/engine/qofbook.cpp | 2 +- + libgnucash/engine/qofbook.h | 1 + + libgnucash/engine/qofchoice.cpp | 5 ----- + libgnucash/engine/qofclass.cpp | 3 --- + libgnucash/engine/qofevent.cpp | 3 --- + libgnucash/engine/qofid.cpp | 2 +- + libgnucash/engine/qoflog.cpp | 8 ++++---- + libgnucash/engine/qofobject.cpp | 3 --- + libgnucash/engine/qofquery.cpp | 2 +- + libgnucash/engine/qofsession.cpp | 2 +- + libgnucash/engine/test-core/test-engine-stuff.h | 2 +- + libgnucash/engine/test/test-account-object.cpp | 3 ++- + libgnucash/engine/test/test-commodities.cpp | 4 ++-- + libgnucash/engine/test/test-gnc-guid-old.cpp | 3 ++- + libgnucash/engine/test/test-group-vs-book.cpp | 3 ++- + libgnucash/engine/test/test-guid.cpp | 3 ++- + libgnucash/engine/test/test-lots.cpp | 3 ++- + libgnucash/engine/test/test-numeric.cpp | 2 +- + libgnucash/engine/test/test-qofinstance.cpp | 3 ++- + libgnucash/engine/test/test-qofsession-old.cpp | 3 ++- + libgnucash/engine/test/test-query.cpp | 3 ++- + libgnucash/engine/test/test-split-vs-account.cpp | 3 ++- + libgnucash/engine/test/test-transaction-reversal.cpp | 3 ++- + libgnucash/engine/test/test-transaction-voiding.cpp | 3 ++- + libgnucash/engine/test/utest-Account.cpp | 3 ++- + libgnucash/engine/test/utest-Split.cpp | 3 ++- + libgnucash/engine/test/utest-Transaction.cpp | 3 ++- + 118 files changed, 256 insertions(+), 199 deletions(-) + +diff --git a/bindings/guile/test/test-scm-query.cpp b/bindings/guile/test/test-scm-query.cpp +index 8ded44992..b8ae768e7 100644 +--- a/bindings/guile/test/test-scm-query.cpp ++++ b/bindings/guile/test/test-scm-query.cpp +@@ -18,12 +18,12 @@ + * * + \********************************************************************/ + ++#include + #include ++#include + + extern "C" + { +-#include +-#include + + #include "gnc-engine-guile.h" + #include "test-engine-stuff.h" +diff --git a/gnucash/gnome-utils/gnc-amount-edit.h b/gnucash/gnome-utils/gnc-amount-edit.h +index b107af1a3..45d88dd4a 100644 +--- a/gnucash/gnome-utils/gnc-amount-edit.h ++++ b/gnucash/gnome-utils/gnc-amount-edit.h +@@ -32,6 +32,8 @@ + #include "qof.h" + #include "gnc-ui-util.h" + ++#include ++ + #define GNC_TYPE_AMOUNT_EDIT (gnc_amount_edit_get_type()) + #define GNC_AMOUNT_EDIT(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, GNC_TYPE_AMOUNT_EDIT, GNCAmountEdit) + #define GNC_AMOUNT_EDIT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, GNC_TYPE_AMOUNT_EDIT, GNCAmountEditClass) +diff --git a/gnucash/gnome-utils/gnc-tree-model-commodity.c b/gnucash/gnome-utils/gnc-tree-model-commodity.c +index dbf1c5cca..cdb6e297d 100644 +--- a/gnucash/gnome-utils/gnc-tree-model-commodity.c ++++ b/gnucash/gnome-utils/gnc-tree-model-commodity.c +@@ -36,6 +36,7 @@ + + #include + ++#include + #include + #include + +diff --git a/gnucash/gnome/assistant-loan.cpp b/gnucash/gnome/assistant-loan.cpp +index ed08172f6..6878de2d4 100644 +--- a/gnucash/gnome/assistant-loan.cpp ++++ b/gnucash/gnome/assistant-loan.cpp +@@ -26,8 +26,6 @@ + extern "C" + { + #include +-#include +-#include + #include + #include + #include +@@ -52,6 +50,9 @@ extern "C" + #endif + } + ++#include ++#include ++#include + #include + #include + #include +diff --git a/gnucash/import-export/csv-imp/gnc-imp-props-price.cpp b/gnucash/import-export/csv-imp/gnc-imp-props-price.cpp +index 5419b1726..1116daeb6 100644 +--- a/gnucash/import-export/csv-imp/gnc-imp-props-price.cpp ++++ b/gnucash/import-export/csv-imp/gnc-imp-props-price.cpp +@@ -27,13 +27,13 @@ extern "C" { + #include + #endif + +-#include +-#include +- + #include "engine-helpers.h" + #include "gnc-ui-util.h" + } + ++#include ++#include ++ + #include + #include + #include +diff --git a/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp b/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp +index 4129c317a..dac6baf8e 100644 +--- a/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp ++++ b/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp +@@ -26,8 +26,6 @@ extern "C" { + #include + #endif + +-#include +-#include + + #include "engine-helpers.h" + #include "gnc-csv-account-map.h" +@@ -39,6 +37,9 @@ extern "C" { + + } + ++#include ++#include ++ + #include + #include + #include +diff --git a/gnucash/import-export/test/test-import-pending-matches.cpp b/gnucash/import-export/test/test-import-pending-matches.cpp +index e5dccc441..3d3d61dfc 100644 +--- a/gnucash/import-export/test/test-import-pending-matches.cpp ++++ b/gnucash/import-export/test/test-import-pending-matches.cpp +@@ -1,9 +1,10 @@ ++#include ++#include /* for references in import-backend.h */ ++ + extern "C" { + #include + #include + +-#include +-#include /* for references in import-backend.h */ + #include "import-backend.h" + #include "import-pending-matches.h" + #include "Split.h" +diff --git a/gnucash/register/register-gnome/datecell-gnome.c b/gnucash/register/register-gnome/datecell-gnome.c +index c716465b4..ca0b961f7 100644 +--- a/gnucash/register/register-gnome/datecell-gnome.c ++++ b/gnucash/register/register-gnome/datecell-gnome.c +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + #include + + #include "datecell.h" +diff --git a/libgnucash/app-utils/gnc-sx-instance-model.c b/libgnucash/app-utils/gnc-sx-instance-model.c +index 26a554f41..0f36e48af 100644 +--- a/libgnucash/app-utils/gnc-sx-instance-model.c ++++ b/libgnucash/app-utils/gnc-sx-instance-model.c +@@ -32,6 +32,7 @@ + + #include + #include ++#include + #include + #include + +diff --git a/libgnucash/app-utils/gnc-ui-balances.c b/libgnucash/app-utils/gnc-ui-balances.c +index 27ce97666..86b747cbc 100644 +--- a/libgnucash/app-utils/gnc-ui-balances.c ++++ b/libgnucash/app-utils/gnc-ui-balances.c +@@ -29,6 +29,7 @@ + #include "gnc-ui-util.h" + + #include ++#include + + #include "Account.h" + #include "Split.h" +diff --git a/libgnucash/app-utils/test/test-autoclear.cpp b/libgnucash/app-utils/test/test-autoclear.cpp +index abb84e1c5..9a44e3c9d 100644 +--- a/libgnucash/app-utils/test/test-autoclear.cpp ++++ b/libgnucash/app-utils/test/test-autoclear.cpp +@@ -22,7 +22,7 @@ + * Boston, MA 02110-1301, USA gnu@gnu.org * + ********************************************************************/ + #include "config.h" +- ++#include + // GoogleTest is written in C++, however, the function we test in C. + extern "C" { + #include "../gnc-ui-balances.h" +diff --git a/libgnucash/app-utils/test/test-option-util.cpp b/libgnucash/app-utils/test/test-option-util.cpp +index c00f32978..c4b1c0c40 100644 +--- a/libgnucash/app-utils/test/test-option-util.cpp ++++ b/libgnucash/app-utils/test/test-option-util.cpp +@@ -22,11 +22,12 @@ + * Boston, MA 02110-1301, USA gnu@gnu.org * + ********************************************************************/ + #include +-#include +-extern "C" +-{ ++#include + #include + #include ++ ++extern "C" ++{ + #include + #include + #include "test-engine-stuff.h" +diff --git a/libgnucash/app-utils/test/test-print-parse-amount.cpp b/libgnucash/app-utils/test/test-print-parse-amount.cpp +index 62d378530..8dea72099 100644 +--- a/libgnucash/app-utils/test/test-print-parse-amount.cpp ++++ b/libgnucash/app-utils/test/test-print-parse-amount.cpp +@@ -18,12 +18,13 @@ + * * + \********************************************************************/ + ++#include ++#include ++ + extern "C" + { + #include +-#include + #include +-#include + + #include "gnc-ui-util.h" + #include "gnc-numeric.h" +diff --git a/libgnucash/app-utils/test/test-print-queries.cpp b/libgnucash/app-utils/test/test-print-queries.cpp +index 9d6fa5a04..972758ea8 100644 +--- a/libgnucash/app-utils/test/test-print-queries.cpp ++++ b/libgnucash/app-utils/test/test-print-queries.cpp +@@ -18,13 +18,13 @@ + * * + \********************************************************************/ + ++#include ++#include + #include ++#include "guile-mappings.h" + + extern "C" + { +-#include +-#include +-#include "guile-mappings.h" + + #include "gnc-engine-guile.h" + #include "test-engine-stuff.h" +diff --git a/libgnucash/app-utils/test/test-scm-query-string.cpp b/libgnucash/app-utils/test/test-scm-query-string.cpp +index 13e9ad35e..a31078858 100644 +--- a/libgnucash/app-utils/test/test-scm-query-string.cpp ++++ b/libgnucash/app-utils/test/test-scm-query-string.cpp +@@ -18,14 +18,13 @@ + * * + \********************************************************************/ + +-#include +- +-extern "C" +-{ + #include + #include + #include "guile-mappings.h" ++#include + ++extern "C" ++{ + #include "gnc-engine-guile.h" + #include "gnc-guile-utils.h" + #include "test-engine-stuff.h" +diff --git a/libgnucash/app-utils/test/test-sx.cpp b/libgnucash/app-utils/test/test-sx.cpp +index b635c00d2..c6070d9ab 100644 +--- a/libgnucash/app-utils/test/test-sx.cpp ++++ b/libgnucash/app-utils/test/test-sx.cpp +@@ -18,11 +18,12 @@ + * * + \********************************************************************/ + ++#include ++#include ++ + extern "C" + { +-#include + #include +-#include + #include "SX-book.h" + #include "gnc-date.h" + #include "gnc-sx-instance-model.h" +diff --git a/libgnucash/backend/dbi/gnc-backend-dbi.cpp b/libgnucash/backend/dbi/gnc-backend-dbi.cpp +index 25699e5ca..f5886c7d1 100644 +--- a/libgnucash/backend/dbi/gnc-backend-dbi.cpp ++++ b/libgnucash/backend/dbi/gnc-backend-dbi.cpp +@@ -48,9 +48,6 @@ extern "C" + + #include + #include +-#include +-#include +- + #include "qof.h" + #include "qofquery-p.h" + #include "qofquerycore-p.h" +@@ -72,6 +69,10 @@ extern "C" + #endif + + } ++ ++#include ++#include ++ + #include + #include + #include +diff --git a/libgnucash/backend/dbi/test/test-backend-dbi.cpp b/libgnucash/backend/dbi/test/test-backend-dbi.cpp +index 4ba484448..acb21e40c 100644 +--- a/libgnucash/backend/dbi/test/test-backend-dbi.cpp ++++ b/libgnucash/backend/dbi/test/test-backend-dbi.cpp +@@ -19,11 +19,11 @@ + * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * + * Boston, MA 02110-1301, USA gnu@gnu.org * + \********************************************************************/ ++#include + + extern "C" + { + #include +-#include + #include "qof.h" + #include "cashobjects.h" + } +diff --git a/libgnucash/backend/sql/gnc-address-sql.cpp b/libgnucash/backend/sql/gnc-address-sql.cpp +index e3c18ca9b..8e78f0876 100644 +--- a/libgnucash/backend/sql/gnc-address-sql.cpp ++++ b/libgnucash/backend/sql/gnc-address-sql.cpp +@@ -31,12 +31,12 @@ extern "C" + { + #include + +-#include +- + #include "gnc-engine.h" + + #include "gncAddress.h" + } ++#include ++ + #include + #include + #include +diff --git a/libgnucash/backend/sql/gnc-book-sql.cpp b/libgnucash/backend/sql/gnc-book-sql.cpp +index d38487deb..580708f37 100644 +--- a/libgnucash/backend/sql/gnc-book-sql.cpp ++++ b/libgnucash/backend/sql/gnc-book-sql.cpp +@@ -29,8 +29,6 @@ extern "C" + { + #include + +-#include +- + #include "qof.h" + + #include "gnc-engine.h" +@@ -42,6 +40,8 @@ extern "C" + #endif + } + ++#include ++ + #include "gnc-sql-connection.hpp" + #include "gnc-sql-backend.hpp" + #include "gnc-sql-object-backend.hpp" +diff --git a/libgnucash/backend/sql/gnc-customer-sql.cpp b/libgnucash/backend/sql/gnc-customer-sql.cpp +index 6d3d84a9c..7fbc5c83c 100644 +--- a/libgnucash/backend/sql/gnc-customer-sql.cpp ++++ b/libgnucash/backend/sql/gnc-customer-sql.cpp +@@ -31,7 +31,6 @@ extern "C" + { + #include + +-#include + #include + #include + +@@ -40,6 +39,8 @@ extern "C" + #include "gncTaxTableP.h" + } + ++#include ++ + #include "gnc-sql-connection.hpp" + #include "gnc-sql-backend.hpp" + #include "gnc-sql-object-backend.hpp" +diff --git a/libgnucash/backend/sql/gnc-employee-sql.cpp b/libgnucash/backend/sql/gnc-employee-sql.cpp +index 20c7fb526..c5b17fdb7 100644 +--- a/libgnucash/backend/sql/gnc-employee-sql.cpp ++++ b/libgnucash/backend/sql/gnc-employee-sql.cpp +@@ -31,13 +31,13 @@ extern "C" + { + #include + +-#include + #include + #include + + #include "gnc-commodity.h" + #include "gncEmployeeP.h" + } ++#include + + #include "gnc-sql-connection.hpp" + #include "gnc-sql-backend.hpp" +diff --git a/libgnucash/backend/sql/gnc-entry-sql.cpp b/libgnucash/backend/sql/gnc-entry-sql.cpp +index 554a50e6c..f7b9ef4a3 100644 +--- a/libgnucash/backend/sql/gnc-entry-sql.cpp ++++ b/libgnucash/backend/sql/gnc-entry-sql.cpp +@@ -31,7 +31,6 @@ extern "C" + { + #include + +-#include + #include + #include + +@@ -40,6 +39,7 @@ extern "C" + #include "gncInvoiceP.h" + #include "gncTaxTableP.h" + } ++#include + + #include "gnc-sql-connection.hpp" + #include "gnc-sql-backend.hpp" +diff --git a/libgnucash/backend/sql/gnc-job-sql.cpp b/libgnucash/backend/sql/gnc-job-sql.cpp +index c68827152..421992ffd 100644 +--- a/libgnucash/backend/sql/gnc-job-sql.cpp ++++ b/libgnucash/backend/sql/gnc-job-sql.cpp +@@ -31,12 +31,12 @@ extern "C" + { + #include + +-#include + #include + #include + + #include "gncJobP.h" + } ++#include + + #include "gnc-sql-connection.hpp" + #include "gnc-sql-backend.hpp" +diff --git a/libgnucash/backend/sql/gnc-price-sql.cpp b/libgnucash/backend/sql/gnc-price-sql.cpp +index 1fcc5d5d9..95233b342 100644 +--- a/libgnucash/backend/sql/gnc-price-sql.cpp ++++ b/libgnucash/backend/sql/gnc-price-sql.cpp +@@ -29,8 +29,6 @@ extern "C" + { + #include + +-#include +- + #include "qof.h" + #include "gnc-pricedb.h" + +@@ -38,6 +36,7 @@ extern "C" + #include "splint-defs.h" + #endif + } ++#include + + #include "gnc-sql-connection.hpp" + #include "gnc-sql-backend.hpp" +diff --git a/libgnucash/backend/sql/gnc-recurrence-sql.cpp b/libgnucash/backend/sql/gnc-recurrence-sql.cpp +index 892b83d1a..3aa33e54a 100644 +--- a/libgnucash/backend/sql/gnc-recurrence-sql.cpp ++++ b/libgnucash/backend/sql/gnc-recurrence-sql.cpp +@@ -29,8 +29,6 @@ extern "C" + { + #include + +-#include +- + #include "qof.h" + #include "gnc-engine.h" + #include "Recurrence.h" +@@ -39,6 +37,7 @@ extern "C" + #include "splint-defs.h" + #endif + } ++#include + + #include "gnc-sql-connection.hpp" + #include "gnc-sql-backend.hpp" +diff --git a/libgnucash/backend/sql/gnc-schedxaction-sql.cpp b/libgnucash/backend/sql/gnc-schedxaction-sql.cpp +index c883a9208..c9147ec3a 100644 +--- a/libgnucash/backend/sql/gnc-schedxaction-sql.cpp ++++ b/libgnucash/backend/sql/gnc-schedxaction-sql.cpp +@@ -29,8 +29,6 @@ extern "C" + { + #include + +-#include +- + #include "qof.h" + #include "SchedXaction.h" + #include "SX-book.h" +@@ -41,6 +39,8 @@ extern "C" + #endif + } + ++#include ++ + #include "gnc-sql-connection.hpp" + #include "gnc-sql-backend.hpp" + #include "gnc-sql-object-backend.hpp" +diff --git a/libgnucash/backend/sql/gnc-vendor-sql.cpp b/libgnucash/backend/sql/gnc-vendor-sql.cpp +index 11b27686d..57dd78b4a 100644 +--- a/libgnucash/backend/sql/gnc-vendor-sql.cpp ++++ b/libgnucash/backend/sql/gnc-vendor-sql.cpp +@@ -30,8 +30,6 @@ + extern "C" + { + #include +- +-#include + #include + #include + +@@ -41,6 +39,8 @@ extern "C" + #include "gncTaxTableP.h" + } + ++#include ++ + #include "gnc-sql-connection.hpp" + #include "gnc-sql-backend.hpp" + #include "gnc-sql-object-backend.hpp" +diff --git a/libgnucash/backend/sql/test/test-sqlbe.cpp b/libgnucash/backend/sql/test/test-sqlbe.cpp +index 644711df4..0a6191c3f 100644 +--- a/libgnucash/backend/sql/test/test-sqlbe.cpp ++++ b/libgnucash/backend/sql/test/test-sqlbe.cpp +@@ -20,10 +20,11 @@ + * Boston, MA 02110-1301, USA gnu@gnu.org * + \********************************************************************/ + ++#include ++ + extern "C" + { + #include +-#include + #include "qof.h" + } + extern void test_suite_gnc_backend_sql (); +diff --git a/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp b/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp +index b89cde9a7..b7669f418 100644 +--- a/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp ++++ b/libgnucash/backend/sql/test/utest-gnc-backend-sql.cpp +@@ -20,11 +20,12 @@ + * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * + * Boston, MA 02110-1301, USA gnu@gnu.org * + ********************************************************************/ ++#include ++ + extern "C" + { + #include + #include +-#include + #include + } + /* Add specific headers for this class */ +diff --git a/libgnucash/backend/xml/gnc-account-xml-v2.cpp b/libgnucash/backend/xml/gnc-account-xml-v2.cpp +index 4feb75fae..3647c036c 100644 +--- a/libgnucash/backend/xml/gnc-account-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-account-xml-v2.cpp +@@ -25,14 +25,14 @@ + extern "C" + { + #include +- +-#include + #include + #include + #include + #include + } + ++#include ++ + #include "gnc-xml-helper.h" + #include "sixtp.h" + #include "sixtp-utils.h" +diff --git a/libgnucash/backend/xml/gnc-address-xml-v2.cpp b/libgnucash/backend/xml/gnc-address-xml-v2.cpp +index 026e3e430..c3484f674 100644 +--- a/libgnucash/backend/xml/gnc-address-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-address-xml-v2.cpp +@@ -24,11 +24,11 @@ + extern "C" + { + #include +- +-#include + #include + #include + } ++#include ++ + #include "gnc-xml-helper.h" + + #include "sixtp.h" +diff --git a/libgnucash/backend/xml/gnc-backend-xml.cpp b/libgnucash/backend/xml/gnc-backend-xml.cpp +index 10a0d7cd8..2acdf71a0 100644 +--- a/libgnucash/backend/xml/gnc-backend-xml.cpp ++++ b/libgnucash/backend/xml/gnc-backend-xml.cpp +@@ -32,9 +32,6 @@ extern "C" + #include + + +-#include +-#include +-#include + #include + #include + #include +@@ -76,6 +73,10 @@ extern "C" + #endif + } + ++#include ++#include ++#include ++ + #include + #include "gnc-backend-xml.h" + #include +diff --git a/libgnucash/backend/xml/gnc-bill-term-xml-v2.cpp b/libgnucash/backend/xml/gnc-bill-term-xml-v2.cpp +index c61f042b9..06c6799f2 100644 +--- a/libgnucash/backend/xml/gnc-bill-term-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-bill-term-xml-v2.cpp +@@ -24,8 +24,6 @@ + extern "C" + { + #include +- +-#include + #include + #include + +diff --git a/libgnucash/backend/xml/gnc-book-xml-v2.cpp b/libgnucash/backend/xml/gnc-book-xml-v2.cpp +index e049eb787..2270b9527 100644 +--- a/libgnucash/backend/xml/gnc-book-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-book-xml-v2.cpp +@@ -25,13 +25,13 @@ + extern "C" + { + #include +- +-#include + #include + #include + #include "qof.h" + } + ++#include ++ + #include "gnc-xml-helper.h" + + #include "sixtp.h" +diff --git a/libgnucash/backend/xml/gnc-budget-xml-v2.cpp b/libgnucash/backend/xml/gnc-budget-xml-v2.cpp +index b30d203f4..c39c6a0c7 100644 +--- a/libgnucash/backend/xml/gnc-budget-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-budget-xml-v2.cpp +@@ -24,12 +24,12 @@ + extern "C" + { + #include +- +-#include + #include + #include + } + ++#include ++ + #include "gnc-xml-helper.h" + #include "sixtp.h" + #include "sixtp-utils.h" +diff --git a/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp b/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp +index e09950db2..dd04f2100 100644 +--- a/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-commodity-xml-v2.cpp +@@ -24,13 +24,13 @@ + extern "C" + { + #include +- +-#include + #include + #include "AccountP.h" + #include "Account.h" + } + ++#include ++ + #include "gnc-xml-helper.h" + #include "sixtp.h" + #include "sixtp-utils.h" +diff --git a/libgnucash/backend/xml/gnc-customer-xml-v2.cpp b/libgnucash/backend/xml/gnc-customer-xml-v2.cpp +index dcaa9bff3..4396b7c15 100644 +--- a/libgnucash/backend/xml/gnc-customer-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-customer-xml-v2.cpp +@@ -24,8 +24,6 @@ + extern "C" + { + #include +- +-#include + #include + #include + +@@ -34,6 +32,8 @@ extern "C" + #include "gncTaxTableP.h" + } + ++#include ++ + #include "gnc-xml-helper.h" + #include "gnc-customer-xml-v2.h" + #include "gnc-address-xml-v2.h" +diff --git a/libgnucash/backend/xml/gnc-employee-xml-v2.cpp b/libgnucash/backend/xml/gnc-employee-xml-v2.cpp +index 5eec282a8..eaae536a2 100644 +--- a/libgnucash/backend/xml/gnc-employee-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-employee-xml-v2.cpp +@@ -24,12 +24,11 @@ + extern "C" + { + #include +- +-#include + #include + #include + #include "gncEmployeeP.h" + } ++#include + + #include "gnc-xml-helper.h" + #include "sixtp.h" +diff --git a/libgnucash/backend/xml/gnc-entry-xml-v2.cpp b/libgnucash/backend/xml/gnc-entry-xml-v2.cpp +index 25b88d935..df87a1f42 100644 +--- a/libgnucash/backend/xml/gnc-entry-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-entry-xml-v2.cpp +@@ -24,8 +24,6 @@ + extern "C" + { + #include +- +-#include + #include + #include + +@@ -35,6 +33,8 @@ extern "C" + #include "gncTaxTableP.h" + } + ++#include ++ + #include "gnc-xml-helper.h" + #include "sixtp.h" + #include "sixtp-utils.h" +diff --git a/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp b/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp +index fe875f7ef..ec3edac8b 100644 +--- a/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-freqspec-xml-v2.cpp +@@ -25,13 +25,12 @@ + extern "C" + { + #include +- +-#include + #include + #include "qof.h" + #include "SchedXaction.h" + #include "FreqSpec.h" + } ++#include + + #include "gnc-xml-helper.h" + #include "sixtp.h" +diff --git a/libgnucash/backend/xml/gnc-invoice-xml-v2.cpp b/libgnucash/backend/xml/gnc-invoice-xml-v2.cpp +index 333fbe5d4..3231198bc 100644 +--- a/libgnucash/backend/xml/gnc-invoice-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-invoice-xml-v2.cpp +@@ -24,14 +24,13 @@ + extern "C" + { + #include +- +-#include + #include + #include + + #include "gncBillTermP.h" + #include "gncInvoiceP.h" + } ++#include + + #include "gnc-xml-helper.h" + #include "sixtp.h" +diff --git a/libgnucash/backend/xml/gnc-job-xml-v2.cpp b/libgnucash/backend/xml/gnc-job-xml-v2.cpp +index ba1ab367f..1132a996d 100644 +--- a/libgnucash/backend/xml/gnc-job-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-job-xml-v2.cpp +@@ -24,12 +24,11 @@ + extern "C" + { + #include +- +-#include + #include + #include + #include "gncJobP.h" + } ++#include + + #include "gnc-xml-helper.h" + #include "sixtp.h" +diff --git a/libgnucash/backend/xml/gnc-lot-xml-v2.cpp b/libgnucash/backend/xml/gnc-lot-xml-v2.cpp +index 8bccae722..d42a5b4b7 100644 +--- a/libgnucash/backend/xml/gnc-lot-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-lot-xml-v2.cpp +@@ -25,13 +25,12 @@ + extern "C" + { + #include +- +-#include + #include + #include + #include "gnc-lot.h" + #include "gnc-lot-p.h" + } ++#include + + #include "gnc-xml-helper.h" + #include "sixtp.h" +diff --git a/libgnucash/backend/xml/gnc-order-xml-v2.cpp b/libgnucash/backend/xml/gnc-order-xml-v2.cpp +index 0b45ff9f0..3b95d6ce0 100644 +--- a/libgnucash/backend/xml/gnc-order-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-order-xml-v2.cpp +@@ -24,12 +24,11 @@ + extern "C" + { + #include +- +-#include + #include + #include + #include "gncOrderP.h" + } ++#include + + #include "gnc-xml-helper.h" + #include "sixtp.h" +diff --git a/libgnucash/backend/xml/gnc-owner-xml-v2.cpp b/libgnucash/backend/xml/gnc-owner-xml-v2.cpp +index c9fc9ba98..42931c3e7 100644 +--- a/libgnucash/backend/xml/gnc-owner-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-owner-xml-v2.cpp +@@ -24,8 +24,6 @@ + extern "C" + { + #include +- +-#include + #include + #include + #include "gncCustomerP.h" +@@ -33,6 +31,7 @@ extern "C" + #include "gncVendorP.h" + #include "gncEmployeeP.h" + } ++#include + + #include "gnc-xml-helper.h" + #include "sixtp.h" +diff --git a/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp b/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp +index e2dd884d7..b67e24b07 100644 +--- a/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-recurrence-xml-v2.cpp +@@ -24,12 +24,11 @@ + extern "C" + { + #include +- +-#include + #include + #include "qof.h" + #include "Recurrence.h" + } ++#include + + #include "gnc-xml.h" + #include "gnc-xml-helper.h" +diff --git a/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp b/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp +index cb104e1a0..195f5a738 100644 +--- a/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-schedxaction-xml-v2.cpp +@@ -23,12 +23,11 @@ + extern "C" + { + #include +- +-#include + #include + + #include "SX-book.h" + } ++#include + + #include "gnc-xml-helper.h" + #include "sixtp.h" +diff --git a/libgnucash/backend/xml/gnc-tax-table-xml-v2.cpp b/libgnucash/backend/xml/gnc-tax-table-xml-v2.cpp +index b9206a626..b8e602fa4 100644 +--- a/libgnucash/backend/xml/gnc-tax-table-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-tax-table-xml-v2.cpp +@@ -24,13 +24,12 @@ + extern "C" + { + #include +- +-#include + #include + #include + #include "gncEntry.h" + #include "gncTaxTableP.h" + } ++#include + + #include "gnc-xml-helper.h" + #include "sixtp.h" +diff --git a/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp b/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp +index b4aad7309..560c0d0c6 100644 +--- a/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-transaction-xml-v2.cpp +@@ -24,8 +24,6 @@ + extern "C" + { + #include +- +-#include + #include + #include "AccountP.h" + #include "Transaction.h" +@@ -33,6 +31,7 @@ extern "C" + #include "gnc-lot.h" + #include "gnc-lot-p.h" + } ++#include + #include "gnc-xml-helper.h" + + #include "sixtp.h" +diff --git a/libgnucash/backend/xml/gnc-vendor-xml-v2.cpp b/libgnucash/backend/xml/gnc-vendor-xml-v2.cpp +index 983e4f258..e88fe7932 100644 +--- a/libgnucash/backend/xml/gnc-vendor-xml-v2.cpp ++++ b/libgnucash/backend/xml/gnc-vendor-xml-v2.cpp +@@ -24,8 +24,6 @@ + extern "C" + { + #include
1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -
diff --git a/src/cdargs.cc b/src/cdargs.cc -index e505e4e..1fdfeb8 100644 --- a/src/cdargs.cc +++ b/src/cdargs.cc @@ -1301,7 +1301,7 @@ void helpscreen(void) { @@ -92,9 +9,3 @@ index e505e4e..1fdfeb8 100644 exit(1); } -