diff options
Diffstat (limited to 'app-admin')
21 files changed, 372 insertions, 229 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz Binary files differindex 4a72b06039be..7a2c6547311e 100644 --- a/app-admin/Manifest.gz +++ b/app-admin/Manifest.gz diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest index 219132167776..5720bd422ba9 100644 --- a/app-admin/ansible/Manifest +++ b/app-admin/ansible/Manifest @@ -1,4 +1,3 @@ -AUX ansible-2.3.2.0-fix_key_error.patch 2733 BLAKE2B 0ce0c7f6bdd8f42f3796847d16037d667c53c0cc1855d1f0d6101e44425bc4edbf724153ec5e3744621aed18d042b0bce075496dd552ecff3037f1e7738a36ad SHA512 fc124b19d7fd2d60ab6d7f5185e23334740ca549a8d06eb093ac194e8f17ca92cb0a64735726e9313d026985182e33eea7f1c56a511aba938216cafa0810ca7e DIST ansible-2.4.1.0.tar.gz 6675552 BLAKE2B 00497b33e833149510669c9e481b0893a2d016caf2949fa064ca0a2e4f62a6c5a3f94597673822418253b85abaf380308115dfaa4c1acd88f0c73322d87822d4 SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0 EBUILD ansible-2.4.1.0-r1.ebuild 1441 BLAKE2B c7d99a3d842b55015f0839ec115c341fd5e543c5b045573681a071d956fa74931135388f9cf081a26b80a40db0040fb63c2a6037d5cf496a5d39945eed955f2b SHA512 611e6a76d51e16fdfb0131862c39935938b439ed36e0bc5724bbc78f3944d9048e33c277120a6f681a647102c648dbcf2052f7008960cd97ee7afa133f16c41c diff --git a/app-admin/ansible/files/ansible-2.3.2.0-fix_key_error.patch b/app-admin/ansible/files/ansible-2.3.2.0-fix_key_error.patch deleted file mode 100644 index 80b9350d3e37..000000000000 --- a/app-admin/ansible/files/ansible-2.3.2.0-fix_key_error.patch +++ /dev/null @@ -1,74 +0,0 @@ -From fbe9ec58c7f48d2cef4a49ba96e84bce5933d654 Mon Sep 17 00:00:00 2001 -From: Denis Dupeyron <calchan@gentoo.org> -Date: Wed, 9 Aug 2017 12:01:31 -0500 -Subject: [PATCH] template: fix KeyError: 'undefined variable: 0 - -Fixes: https://github.com/ansible/ansible/issues/20494 - -Based on a patch by Zac Medico at: -https://github.com/zmedico/ansible/pull/1/commits/32e5613a95e525c3a25b8cd5aa1beaa75a4b0d5c ---- - lib/ansible/template/template.py | 10 ++++++++-- - lib/ansible/template/vars.py | 14 +++++++++++++- - 2 files changed, 21 insertions(+), 3 deletions(-) - -diff --git a/lib/ansible/template/template.py b/lib/ansible/template/template.py -index 55936f4..fe11471 100644 ---- a/lib/ansible/template/template.py -+++ b/lib/ansible/template/template.py -@@ -33,5 +33,11 @@ class AnsibleJ2Template(jinja2.environment.Template): - ''' - - def new_context(self, vars=None, shared=False, locals=None): -- return self.environment.context_class(self.environment, vars.add_locals(locals), self.name, self.blocks) -- -+ if vars is not None: -+ if isinstance(vars, dict): -+ vars = vars.copy() -+ if locals is not None: -+ vars.update(locals) -+ else: -+ vars = vars.add_locals(locals) -+ return self.environment.context_class(self.environment, vars, self.name, self.blocks) -diff --git a/lib/ansible/template/vars.py b/lib/ansible/template/vars.py -index fc6140c..2bf95ac 100644 ---- a/lib/ansible/template/vars.py -+++ b/lib/ansible/template/vars.py -@@ -19,6 +19,8 @@ - from __future__ import (absolute_import, division, print_function) - __metaclass__ = type - -+from collections import Mapping -+ - from ansible.compat.six import iteritems - from jinja2.utils import missing - from ansible.module_utils._text import to_native -@@ -27,7 +29,7 @@ from ansible.module_utils._text import to_native - __all__ = ['AnsibleJ2Vars'] - - --class AnsibleJ2Vars: -+class AnsibleJ2Vars(Mapping): - ''' - Helper class to template all variable content before jinja2 sees it. This is - done by hijacking the variable storage that jinja2 uses, and overriding __contains__ -@@ -68,6 +70,16 @@ class AnsibleJ2Vars: - return True - return False - -+ def __iter__(self): -+ keys = set() -+ keys.update(self._templar._available_variables, self._locals, self._globals, *self._extras) -+ return iter(keys) -+ -+ def __len__(self): -+ keys = set() -+ keys.update(self._templar._available_variables, self._locals, self._globals, *self._extras) -+ return len(keys) -+ - def __getitem__(self, varname): - if varname not in self._templar._available_variables: - if varname in self._locals: --- -2.13.3 - diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest index bd2832ecd0d8..24692b4eea0f 100644 --- a/app-admin/hddtemp/Manifest +++ b/app-admin/hddtemp/Manifest @@ -14,5 +14,4 @@ AUX update-hddtemp.db 819 BLAKE2B 2322abe8bc4c4f49a4c16267783d9d7ee46666e1e11b70 DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd05007f4b4b8d74eb378ba810ea9aad96951b7a9b3b0f872130677fca1f294d86f855327dcfa5a263c9f3c7d58fbbba502e SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059 EBUILD hddtemp-0.3_beta15-r26.ebuild 2972 BLAKE2B f273cee116ed77f85fdedaab31f82c6a7bd109b306a9d56745767050cc65ed79c2b28875f934b02fbdde87db6e8e1185605525f1562d930d3b5eadf8bc4edd0c SHA512 64c30191b0103c410b9d8461c283738a56ccdc09b7fd2f9d8ee3f4e05f1a16768d2e94fe74f7638e1ed8c3852976a19fe9f3766581c49ed884f686495eca1bf5 -EBUILD hddtemp-0.3_beta15-r7.ebuild 2624 BLAKE2B 5bf8b396d227f649fb99eb54e8f70e5aee830543a31f5690ed7cc0b06df4a7898428510c61672390bf99781f9d109fa6c7758a8db55f214b09838514bcd35c71 SHA512 e52873a21479241b582ce0648aa8c973298b1adbced6738172733537a267d421f52bf454672f81578ab1293cb79ebd9ba3487c9b7024a66c4be073338bb40d87 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3 diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild deleted file mode 100644 index 1350815a28ca..000000000000 --- a/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils autotools readme.gentoo systemd - -MY_P=${P/_beta/-beta} -DBV=20080531 - -DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives" -HOMEPAGE="https://savannah.nongnu.org/projects/hddtemp/" -SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirror://gentoo/hddtemp-${DBV}.db.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86" -IUSE="nls selinux" - -DEPEND="" -RDEPEND="selinux? ( sec-policy/selinux-hddtemp )" - -S="${WORKDIR}/${MY_P}" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="In order to update your hddtemp database, run: -emerge --config =${CATEGORY}/${PF} - -If your hard drive is not recognized by hddtemp, please consider -submitting your HDD info for inclusion into the Gentoo hddtemp -database by filing a bug at https://bugs.gentoo.org/ - -If hddtemp complains but finds your HDD temperature sensor, use the ---quiet option to suppress the warning. -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-satacmds.patch - epatch "${FILESDIR}"/${P}-byteswap.patch - epatch "${FILESDIR}"/${P}-execinfo.patch - epatch "${FILESDIR}"/${P}-nls.patch - epatch "${FILESDIR}"/${P}-iconv.patch - epatch "${FILESDIR}"/${P}-dontwake.patch - mv "${S}"/configure.{in,ac} || die - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - local myconf - - myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db" - # disabling nls breaks compiling - use nls || myconf="--disable-nls ${myconf}" - econf ${myconf} -} - -src_install() { - default - dodoc README TODO ChangeLog - - insinto /usr/share/hddtemp - newins "${WORKDIR}/hddtemp-${DBV}.db" hddtemp.db - doins "${FILESDIR}"/hddgentoo.db - - update_db "${D}/usr/share/hddtemp/hddgentoo.db" "${D}/usr/share/hddtemp/hddtemp.db" - newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp - newinitd "${FILESDIR}"/hddtemp-init hddtemp - systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service" - systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf - - readme.gentoo_create_doc -} - -update_db() { - local src=$1 - local dst=$2 - - while read line ; do - if [[ -z $(echo "${line}" | sed -re 's/(^#.*|^\w*$)//') ]]; then - echo "${line}" >> "${dst}" - fi - - id=$(echo "${line}" | grep -o '"[^"]*"') - - grep "${id}" "${dst}" 2>&1 >/dev/null || echo "${line}" >> "${dst}" - done < "${src}" -} - -pkg_config() { - cd "${ROOT}"/usr/share/hddtemp || die - - einfo "Trying to download the latest hddtemp.db file" - wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db \ - || die "failed to download hddtemp.db" - - update_db "hddgentoo.db" "hddtemp.db" -} diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest index da7d3da628ab..ad1af5ac85a8 100644 --- a/app-admin/helm/Manifest +++ b/app-admin/helm/Manifest @@ -87,5 +87,6 @@ DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 3892 DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4 DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 BLAKE2B fe292aaad3f31173e1ed0e0d9dff74b9f5c46803acee9476f86a4822327296bfe52009d68c1b7bc2ed246596032e74a597eb951795a37eea9518a01ab4b3ad9e SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8 DIST helm-2.7.2.tar.gz 823059 BLAKE2B 3c4b3270055931e92bdafa29dcb182524e08744b3631bedb384bc34c3fd71dfd3aa60a9754b270d8b69999824166314439e14b53f9659543d69ff30ac7dc8116 SHA512 8ab947faa891102d89f229d79b6e78992b7a37d9bccc2a7c882482dc8143619acb1409d5643717d8d10fbd7e0df9da07a1ee18019bdb6befa4ce189112001b4e +EBUILD helm-2.7.2-r1.ebuild 8495 BLAKE2B 4dec9f5450105ed814d5f5ae978aafeb5790171e1e35cc36e0903590fc3129fcc82863421457dcce98c14851aabdfcf7755c507ae53f8d0a904934e6c9a325f2 SHA512 6e4ff8e304bf46838e2db5213bfe0a8209b30602b61abbe77bd3517ae6bbdcdd30a282095eabe3120ae43d99521bae5135844063fb184f35dc115e513d148807 EBUILD helm-2.7.2.ebuild 8289 BLAKE2B f442ba6ae7d1d690543810d8fd24a699a0fe8bd19d16cf7e9c0d17664a9fc2b0d398a9120619e01d39ffd8c9145a1a5df28ea19847becafb48640901bb5054f0 SHA512 dc1f91c21a71e51d3c87db17b0d543ec4aca1c4b36da9f65bfe02ba7b693d6a66a6957fa5597f95a7c5d9132b8e9126d270c96ce7ec8fcfe454defe40a714180 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4 diff --git a/app-admin/helm/helm-2.7.2-r1.ebuild b/app-admin/helm/helm-2.7.2-r1.ebuild new file mode 100644 index 000000000000..362b7d6e042f --- /dev/null +++ b/app-admin/helm/helm-2.7.2-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="k8s.io/helm" + +EGO_VENDOR=( +"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang" +"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64" +"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b" +"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d" +"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4" +"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0" +"github.com/chai2010/gettext-go bf70f2a70fb1b1f36d90d671a72795984eab0fcb" +"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90" +"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8" +"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20" +"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c" +"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756" +"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d" +"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1" +"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528" +"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46" +"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6" +"github.com/evanphx/json-patch 944e07253867aacae43c04b2e6a239005443f33a" +"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5" +"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540" +"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee" +"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98" +"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272" +"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff" +"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72" +"github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a" +"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7" +"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed" +"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433" +"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7" +"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017" +"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c" +"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba" +"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961" +"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42" +"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6" +"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722" +"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4" +"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8" +"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40" +"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc" +"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" +"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e" +"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342" +"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0" +"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd" +"github.com/Masterminds/sprig efda631a76d70875162cdc25ffa0d0164bf69758" +"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329" +"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f" +"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a" +"github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b" +"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb" +"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13" +"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4" +"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6" +"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317" +"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6" +"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207" +"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259" +"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4" +"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e" +"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3" +"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb" +"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77" +"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57" +"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7" +"github.com/technosophos/moniker ab470f5e105a44d0c87ea21bacd6a335c4816d83" +"github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74" +"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto" +"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net" +"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2" +"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys" +"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text" +"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine" +"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto" +"google.golang.org/grpc 8050b9cbc271307e5a716a9d782803d09b0d6f2d github.com/grpc/grpc-go" +"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf" +"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml" +"k8s.io/api cadaf100c0a3dd6b254f320d6d651df079ec8e0a github.com/kubernetes/api" +"k8s.io/apiextensions-apiserver a5bbfd114a9b122acd741c61d88c84812375d9e1 github.com/kubernetes/apiextensions-apiserver" +"k8s.io/apimachinery 3b05bbfa0a45413bfa184edbf9af617e277962fb github.com/kubernetes/apimachinery" +"k8s.io/apiserver c1e53d745d0fe45bf7d5d44697e6eface25fceca github.com/kubernetes/apiserver" +"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go" +"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi" +"k8s.io/kubernetes 0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4 github.com/kubernetes/kubernetes" +"k8s.io/metrics 8efbc8e22d00b9c600afec5f1c14073fd2412fce github.com/kubernetes/metrics" +"k8s.io/utils 9fdc871a36f37980dd85f96d576b20d564cc0784 github.com/kubernetes/utils" +"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util" +) +inherit golang-build golang-vcs-snapshot bash-completion-r1 + +GIT_COMMIT="04769b7c26109aabfc9c6b645b345d665b6bd0cd" + +ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${EGO_VENDOR_URI}" +KEYWORDS="~amd64" + +DESCRIPTION="Kubernetes Package Manager" +HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh" +SRC_URI="${ARCHIVE_URI}" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +RESTRICT="test" + +src_prepare() { + default + sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\ + -e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\ + -e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo ${PV}#"\ + -e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die + + rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor || die +} + +src_compile() { + pushd src/${EGO_PN} || die + GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die + ./scripts/setup-apimachinery.sh || die + GOBINDIR="$(pwd)/bin" GOPATH="${S}"\ + go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die + popd || die + bin/${PN} completion bash > ${PN}.bash || die + bin/${PN} completion zsh > ${PN}.zsh || die +} + +src_install() { + newbashcomp ${PN}.bash ${PN} + insinto /usr/share/zsh/site-functions + newins ${PN}.zsh _${PN} + + dobin bin/${PN} + dodoc src/${EGO_PN}/README.md +} diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest index 68aa17541e2c..e8f963c7c344 100644 --- a/app-admin/mongo-tools/Manifest +++ b/app-admin/mongo-tools/Manifest @@ -1,7 +1,4 @@ -AUX mongo-tools-3.0.0-build.patch 528 BLAKE2B 0fd1a8fde4f19166a519f5bf02c02335dc4b6c682666f915e285edbe59106b4b8c774ba661097af34bf7e7c4eaa5904568f5e15bfa0935442c58d9fb6263bdd9 SHA512 9bf9e247f49a4fbc251ce878b82d457136b3ede890458afbd92b27a9f283e44e02bab92b2817cd1c3160a807ce8a7e6296e813f3573c2b733f2701fdb07323fe -AUX mongo-tools-3.0.12-build.patch 626 BLAKE2B e2d535e3342f445ecc55889ea69ef905c0129a438a3db2dcdbf5c38a91db7da9baab0cd794e2f34680394260b0f1232c5651e141256ed440177468575615e98f SHA512 bd1374dc2e1ec0b0ef18fe47015519c1981b12decee47ff85544b6be7f721080e91ecbafc1c07eee4a43d733a2310ac1a001bb051e8981c11e9ede652c7bbc8a AUX mongo-tools-3.2.10-pie.patch 551 BLAKE2B 74fc48378747c5d9a0a9ac0c14a6747d05cadcce91b97eb9392a95a3b59037268a7a76eb38706e7ed5be1fe0442e8b939e1a2466e5a02832b94d9937039f8030 SHA512 9a309e8d4d3776fef5209bdaedf416f3a43d51ffacff8fa602dacc288b1413dfb7eeca2cbd88a976a1648161bd671321e8f333a6843ee0477ea41cfcad040d1b -AUX mongo-tools-3.2.5-build.patch 609 BLAKE2B 0e97c47f982982f33541aeab5065cbb63df45a3e3315ed74b0018406d2a692a9246da8ddfa74d142f95fad0f9b222666dbb63b9deecfb4d4761e51be781b29c8 SHA512 f2eb353a0981fca03eab0d44ed6adf7bcb4d6446ceaaf96499e254170679582981ad2f81c7dfe6ff10d783745d90c1b55bb7eb0efe1ddcf1c4ccb52b920efc99 DIST mongo-tools-3.0.14.tar.gz 2413148 SHA256 5a3f706827a9567fc98e2b64a33a2071c68c89090c6f135a508cb4e615051db1 SHA512 0e77417b2c36080515a2ff611427cb18f6d6c2432159c2a09af8d6ff14ae7f25ecbfe0a6631eeb7de084fdfe517a09364d731f5b63923404b6319fc1ca44b840 WHIRLPOOL 615153e87ea0b3cfd837066f850f92e7ea9c533e09bf6e3f4231ff489ac21a5a52a4afe06c827304e9340f9e8172714dae969c65cdd7215939a35c7026d60d98 DIST mongo-tools-3.0.15.tar.gz 2413131 SHA256 9e1a936b42eff999a83afc3885faee0c64592ff43d3620d1b9d69d44b7d84d38 SHA512 b5baeea89f5287e055c43c58cfc31e4618df2b7b7fffd7d77248131daf503522b1d041253df8d3ad2ffa22efff344334dc05e3a3462cf7c646d4e83040bd95dc WHIRLPOOL 46c992dcc90fabe8f698e89a93232cc2e450a7dd560fb64a5f954b7937a98e298af8d4fa4bf626ccbcf96bef80743b6bbbb9d7e6fcb9b012dd8da68a1c382276 DIST mongo-tools-3.2.12.tar.gz 2712079 SHA256 cda5e869b9233d591e91cac0b4c709a2e71dcabd9ac6bcc8b33d906ce3b13afd SHA512 66f7beb85a83ad6a217e65bba97ace6ad0bf84688f40e598e5fb1cf4bbe481b4069e1247d6829f8d06c8230d33c3e0c8bd8465a975576cad584065c361b6fb72 WHIRLPOOL 46123dc3c97fdf20ff94ac373e774932bd30aca677047fe3366653aaab269bf6d7e59cb420cf1e5716558fa959cb3649ee359cc27932bac276e6d24d2eea43b1 diff --git a/app-admin/mongo-tools/files/mongo-tools-3.0.0-build.patch b/app-admin/mongo-tools/files/mongo-tools-3.0.0-build.patch deleted file mode 100644 index f7fd93b04a51..000000000000 --- a/app-admin/mongo-tools/files/mongo-tools-3.0.0-build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- build.sh.orig 2015-02-17 16:55:47.000000000 +0000 -+++ build.sh 2015-02-18 09:22:30.671123198 +0000 -@@ -19,5 +19,5 @@ - for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do - echo "Building ${i}..." - # Build the tool, using -ldflags to link in the current gitspec -- go build -o "bin/$i" -ldflags "-X github.com/mongodb/mongo-tools/common/options.Gitspec `git rev-parse HEAD`" -tags "$tags" "$i/main/$i.go" -+ go build -o "bin/$i" -tags "$tags" "$i/main/$i.go" - done - diff --git a/app-admin/mongo-tools/files/mongo-tools-3.0.12-build.patch b/app-admin/mongo-tools/files/mongo-tools-3.0.12-build.patch deleted file mode 100644 index f3d881948679..000000000000 --- a/app-admin/mongo-tools/files/mongo-tools-3.0.12-build.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/build.sh 2016-04-29 20:14:54.000000000 +0200 -+++ b/build.sh 2016-05-17 17:22:50.830113156 +0200 -@@ -19,5 +19,5 @@ - for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do - echo "Building ${i}..." - # Build the tool, using -ldflags to link in the current gitspec -- go build -o "bin/$i" -ldflags "-X github.com/mongodb/mongo-tools/common/options.Gitspec=`git rev-parse HEAD` -X github.com/mongodb/mongo-tools/common/options.VersionStr=$(git describe)" -tags "$tags" "$i/main/$i.go" -+ go build -o "bin/$i" -tags "$tags" "$i/main/$i.go" || exit 1 - done diff --git a/app-admin/mongo-tools/files/mongo-tools-3.2.5-build.patch b/app-admin/mongo-tools/files/mongo-tools-3.2.5-build.patch deleted file mode 100644 index 31d94dd65cad..000000000000 --- a/app-admin/mongo-tools/files/mongo-tools-3.2.5-build.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/build.sh 2016-04-21 17:31:22.156178084 +0200 -+++ b/build.sh 2016-04-21 17:32:07.723421116 +0200 -@@ -19,5 +19,5 @@ - for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do - echo "Building ${i}..." - # Build the tool, using -ldflags to link in the current gitspec -- go build -o "bin/$i" -ldflags "-X github.com/mongodb/mongo-tools/common/options.Gitspec `git rev-parse HEAD` -X github.com/mongodb/mongo-tools/common/options.VersionStr $(git describe)" -tags "$tags" "$i/main/$i.go" -+ go build -o "bin/$i" -tags "$tags" "$i/main/$i.go" - done diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest index 010b2bea82a2..0c35f6cf6fd7 100644 --- a/app-admin/salt/Manifest +++ b/app-admin/salt/Manifest @@ -23,6 +23,7 @@ AUX salt-2016.3.4-dont-test-ordering.patch 1485 BLAKE2B 4075d7c43d7f6b419357aed1 AUX salt-2016.3.4-test-nonexist-dirs.patch 1655 BLAKE2B 5e7907e0a10c4ee78b599ec98d38088c97889ae2002602db0c207fb210e2960e7b4b92c08f027854e6dd9205b000bb09e7b243346af755e6824561752e3ef2e9 SHA512 ee81b8104f066e1d161207fe82d8349eb8c40701544784a2b6e66842fe9e07d7edffa24cad8c5d2037e2e7fa0368c614ed177fdf7359c89255d068767968e8fd AUX salt-2016.3.5-tmpdir.patch 1982 BLAKE2B b8d587e6139ac49b78892572070d0985fb78de3986fedfc8df04276da69a6f7f0c28fcb1f41df282747c80bfaba266fdcfeb58890e494f32873d870add388d98 SHA512 755ac34298c6cbc57cf7404b209bd45ad216c07bb55b303e97375e1912aead765dddddbe3331314e4f245c6848e62447a5bb16b04367f20bb8387e89d0254859 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17 +AUX salt-2017.7.2-fix_disk_format.patch 2111 BLAKE2B e8a1c24cd780e29092e3112256bbe3cf518dac49479abfcac0b2432b8528c448241bfc0cce5bbf20b1be674cd49766c151547cfb4d5ef0894b3c9a1d28ad332e SHA512 33c73a70e163135c238b85ad6a0beaed5ed5d339fee19dfa15f7dd073200cb788ec5234d89939eab1a8b080ccd0b22ed0a5409cfaad27ac1abbbda3f018f3d75 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed @@ -33,11 +34,12 @@ DIST salt-2015.5.10.tar.gz 5693422 SHA256 863a96e70f8521af35fe11b10d25b3205a0bfb DIST salt-2015.8.13.tar.gz 7036243 SHA256 cca82c9a4f267692660b098c1f76e54ab6a24131391893719bde0eb3a1ed2959 SHA512 ec8626f7360542bfeea90fc3d6fd9d9d015da4c2a6adf9957c22501ed9531b0a44d2cbc4853c41856b4cd46c142d2441884ec99700f3c0a5310cc428f9f1ec2a WHIRLPOOL c21f3bdc5fd674ea664c7e8fd58ef6685328a6ee3679850f3e9a085b1e604e1224a3323b906b47075fb8dd39f373583fb549e7b0f3f725d44928bcf716955a10 DIST salt-2016.11.8.tar.gz 10142142 SHA256 e75f4178465d9198fcd5822643460c94d63de6221316367d5b85356ef8b1994a SHA512 0adc544ca460d13d2adb11b04575bd079a3dad1be3468bea7d32d0b74416b78546e4c86c75551bba09786be8e9810a6e30232414c4f5851cbc9a0fb4b894e0de WHIRLPOOL aa2ba8a4afbdd412e133364b4b034b7a34cb5af43fcbed929451624444440a07b143977ecf1db5cfcbbd53c98aedc15dae5ab8c246e48ab3b7c1053d30054b66 DIST salt-2016.3.8.tar.gz 8519835 SHA256 9558379a11882348c1299ca094b638feb6bdf8f0d443d2055a71d0c9a52427e3 SHA512 bba41d4c70e278aa7196d292fb27b926dce32f4cc67c5b23b6c219ad59178b1a8b26e8adeb3a7bd587c25cc1c8ff36a207ea2a2f68d13d64f37a34f96f35ecd1 WHIRLPOOL 14e18eabd1287f05b0387455890f31c030ce6c84c831a12d0c691f76a3181dba0d3c12a15935c0f786c02fe6887d17a0fad492356814166c23865e3f98831f44 -DIST salt-2017.7.2.tar.gz 11471191 SHA256 ff3bc7de5abf01b8acbd144db5811b00867179b2353f5c6f7f19241e2eff2840 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b WHIRLPOOL 85e6ae3ba1a5b7c1e3e8546daec6ceb4ec60fb915409dd8000298b394b933f24a4b1d5740ebe230930bf8de76e7934d1ae3c919a058fdf6bf60638c260e6a585 +DIST salt-2017.7.2.tar.gz 11471191 BLAKE2B 0b7184eb4dcb29f2a9603117d1c6fb9c729093c1ff11e18370929ec3fdbfe7bf8c0914f17260c3f613842c23359205a4a84d3e0bcd67476705e50f805bcd7b69 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b EBUILD salt-2015.5.10.ebuild 4120 BLAKE2B b6c3f5f5fcb44721f55828b5d472b81d0bb3ef42e9ddd699c1bd52ce9c26929773662000b7984ed1ba573cff6bf476d2dc4b2026012d7ace822036aeb235b480 SHA512 083d1fefcb43b825d0e52e9cde37802c146261b98dc45d5ad780753b35f80444931529ca2334671515f69d5f8de6af6eb38512ea6806d9d06af24464b13c1270 EBUILD salt-2015.8.13-r1.ebuild 4539 BLAKE2B 59bf43c454f1ea434abba97219920d938b6c0a92c2a4ac58e61a03620d19a959a589558e6dae174c76c6e2f84fadfe0b43d8b0a04dde7ecc764ebb8d6063a44c SHA512 9f581b8892282b96044511bbf444c9e95b1d548d9f39fe972e97aa9e801d961071301eeb1df41734a0c33a100d70d43a6c0bc3b04e7cf7c469dcc19aef577330 EBUILD salt-2015.8.13.ebuild 4481 BLAKE2B eb797e470c44a94019cefaf8638b00f42dfc075a9ab70733fa55f897533c2801f131830be6a7caf9f34981a72c451e23d84712133c382645a585f30d77815324 SHA512 e3a39c1c44ce16b6bb63a05d135cf46f1a0676a419d70441f0d051b5f6f8f8f3a6b961961d03d7cfcab71b50866fcb1234f76f800c29050dd900743eb29e4586 EBUILD salt-2016.11.8.ebuild 4623 BLAKE2B e01c069e867334c3312df92d6235c85124ae2bf2d1ac591e083e928f3522bdf3a4bc77351170721b2b290356776bb82ec8ca0afd894a1d28deb46df25d2831e2 SHA512 946eccb7bbe7175d81fa3746e6c87d7880ede9ed9c1f27106c2d6d782cbc001b05976fa113e2c5dc8b03c8b5d9a6ebfb0dd739250f82bf623ae4ab0f799f6738 EBUILD salt-2016.3.8.ebuild 4670 BLAKE2B 6dc1143d60af6a1fd029f991fe8f1438c87865bc3369aef10ea45b3ec3e282bb02cddce76e9cd40289ec401600dfd70e141cc741214d6fa49c68fa88fa8153cb SHA512 3c9133d50c9abee9fc4dad7fcf9c643c84b0f3f8399fb71dc7e92e105f5dc4666b66c1bb308fd6950fe81d79fadc2a0eeaba14c75d9c6a2fe8e8c1ebb3d5cf02 +EBUILD salt-2017.7.2-r1.ebuild 4381 BLAKE2B e8f1a417b75b19e24474b96d8681b477045d19c1dbca1c3b4fd5e90e9aca7fa2d7f3bfa6223a8e508fd8695875e268bb12a246c4217376a3c37d6faba45e243d SHA512 2976747e1d16c4d3eb0868f489feba22fad18ce74543c6ffed5fd25d760594f1871e90ee0e6a8cf0827f131d7581cb6e50921ef9997e5f2cda32f4610cccf603 EBUILD salt-2017.7.2.ebuild 4331 BLAKE2B fa924819154053c76ac002074d0d31867e7cd9b98b4abdae7a00a9aefd5281649d1924dc833c2f3ef8123796baec48d77c547ebcc410ce988a252986b9005486 SHA512 91f78244df90369ca0f1251618c463ef0c5ae34c2a7569c8cc23dd2cd5d4fc9000c0da521846a82d938fd1a49506d567307898c1368ffeb98babc93eabe6821b MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969 diff --git a/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch b/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch new file mode 100644 index 000000000000..9e58d93f7dd4 --- /dev/null +++ b/app-admin/salt/files/salt-2017.7.2-fix_disk_format.patch @@ -0,0 +1,48 @@ +From 18fb0be96a146589ccbd642caa9244480c51140b Mon Sep 17 00:00:00 2001 +From: Matthew Summers <msummers42@gmail.com> +Date: Mon, 9 Oct 2017 20:38:52 -0500 +Subject: [PATCH 1/2] addresses issue #43307, disk.format_ to disk.format + +This change fixes breakage. It appears the disk.format_ func is +aliased to disk.format in modules/disk.py +--- + salt/states/blockdev.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/salt/states/blockdev.py b/salt/states/blockdev.py +index 4b0dc5ca81d..e6ecfeab3f1 100644 +--- a/salt/states/blockdev.py ++++ b/salt/states/blockdev.py +@@ -159,7 +159,7 @@ def formatted(name, fs_type='ext4', force=False, **kwargs): + ret['result'] = None + return ret + +- __salt__['disk.format_'](name, fs_type, force=force, **kwargs) ++ __salt__['disk.format'](name, fs_type, force=force, **kwargs) + + # Repeat fstype check up to 10 times with 3s sleeping between each + # to avoid detection failing although mkfs has succeeded + +From 16e1c1dfc86920b7a00dbf7c39b805c359e4d13b Mon Sep 17 00:00:00 2001 +From: Matthew Summers <matthew.summers@syapse.com> +Date: Mon, 16 Oct 2017 09:47:40 -0500 +Subject: [PATCH 2/2] fixed test addressing issue #43307, disk.format_ to + disk.format + +--- + tests/unit/states/test_blockdev.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/unit/states/test_blockdev.py b/tests/unit/states/test_blockdev.py +index e5899f1c70a..9b559dddfe5 100644 +--- a/tests/unit/states/test_blockdev.py ++++ b/tests/unit/states/test_blockdev.py +@@ -100,7 +100,7 @@ def test_formatted(self): + + # Test state return when block device format fails + with patch.dict(blockdev.__salt__, {'cmd.run': MagicMock(return_value=mock_ext4), +- 'disk.format_': MagicMock(return_value=True)}): ++ 'disk.format': MagicMock(return_value=True)}): + comt = ('Failed to format {0}'.format(name)) + ret.update({'comment': comt, 'result': False}) + with patch.object(salt.utils, 'which', diff --git a/app-admin/salt/salt-2017.7.2-r1.ebuild b/app-admin/salt/salt-2017.7.2-r1.ebuild new file mode 100644 index 000000000000..88f1dd3f8114 --- /dev/null +++ b/app-admin/salt/salt-2017.7.2-r1.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit eutils systemd distutils-r1 + +DESCRIPTION="Salt is a remote execution and configuration manager" +HOMEPAGE="http://saltstack.org/" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git" + EGIT_BRANCH="develop" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~x86 ~amd64" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" +IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" + +RDEPEND="sys-apps/pciutils + dev-python/jinja[${PYTHON_USEDEP}] + >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] + virtual/python-futures[${PYTHON_USEDEP}] + libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) + mako? ( dev-python/mako[${PYTHON_USEDEP}] ) + ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) + libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) + openssl? ( + dev-libs/openssl:*[-bindist] + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) + raet? ( + >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] + >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] + >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] + ) + zeromq? ( + >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + ) + cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) + mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) + portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) + keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) + mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) + redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) + selinux? ( sec-policy/selinux-salt ) + timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) + nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) + neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) + gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) + profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) + vim-syntax? ( app-vim/salt-vim )" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/pytest-salt[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/timelib[${PYTHON_USEDEP}] + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] ) + >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] + >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] + ${RDEPEND} + )" + +DOCS=( README.rst AUTHORS ) + +REQUIRED_USE="|| ( raet zeromq )" +RESTRICT="x86? ( test )" + +PATCHES=( + "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" + "${FILESDIR}/salt-2017.7.2-fix_disk_format.patch" +) + +python_prepare() { + rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die + rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die + rm tests/unit/states/test_boto_vpc.py || die +} + +python_install_all() { + local svc + USE_SETUPTOOLS=1 distutils-r1_python_install_all + + for svc in minion master syndic api; do + newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} + newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} + systemd_dounit "${FILESDIR}"/salt-${svc}.service + done + + insinto /etc/${PN} + doins -r conf/* +} + +python_test() { + local tempdir + # testsuite likes lots of files + ulimit -n 3072 || die + + # ${T} is too long a path for the tests to work + tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)" + mkdir "${T}/$(basename "${tempdir}")" + mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die + + ( + cleanup() { + rm -f "${tempdir}" + rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die + } + + trap cleanup EXIT + + addwrite "${tempdir}" + ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" + + USE_SETUPTOOLS=1 SHELL="/bin/bash" \ + TMPDIR="${tempdir}" \ + ${EPYTHON} tests/runtests.py \ + --unit-tests --no-report --verbose + + ) || die "testing failed" +} diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest index 10ced15593a3..d69ca12f6c1d 100644 --- a/app-admin/setools/Manifest +++ b/app-admin/setools/Manifest @@ -6,9 +6,9 @@ AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff84800 DIST setools-3.3.8-04-gentoo-patches.tar.bz2 94986 SHA256 9a8a43ac97606fde9b2610ceed65f640638929853f871ce530982bedfd919b64 SHA512 39bf00b6aaf31821c6e2e2fb4c460dd1914fba4bf8385acebedf88f1533da990f1fb925dd49d75827aebef3f394a50a1edea46a07204193b58c65a066a064e6a WHIRLPOOL 4a92e4cf6930584de931c5d0805815aacd1c1af4434ca8e73414eda33588a55ef8d7bdfe4195be642889eee480128cbe12d1c5612e07ea304021b230e0b74816 DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371 DIST setools-4.0.1.tar.gz 399888 SHA256 4c2049877f2f68e4485b72bc280fe20127b49a019169a2cf1d8295c908bdcdfe SHA512 d0a36cfddc6a6f47ecaa8402141271558e97467b6c449d18b98bf6fe894189f29a32fb672e3ff573efdb44964bd361283c68c2906d02f8a9c1269b6b71903bc2 WHIRLPOOL 017e709c113b28175787249af8aa1dcc99a5034eadcc76e97a394f9f89afcc1e7fe3eeb8ec105c541a6260d8a2eb4b1aa8155ba2297ecdf6d640ba112857a442 -DIST setools-4.1.1.tar.gz 461649 SHA256 46a927ea2b163cbe1d35cc35da43e45853e13720c7e02d4cf75a498783c19610 SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04 WHIRLPOOL a2982268bb6f407f080718cf841eed097b62e09f5cdb972850d2de7da09562bf0e1b3092fbfd6770ee03aa8146c637241a9ea44618b7fd1c0d8da393c1b9d9f2 +DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04 EBUILD setools-3.3.8-r7.ebuild 3686 BLAKE2B 440799c9f4d5a944adb5bbe4f6826c1445835db6a6c0ff3a3278f516fc67b4aac83f535dbb4b306524766f947dd40dcb4ff9edd2b24ffae13a85e92c62eaca9e SHA512 984ceb81a0fd293e16097cbbf8aba94ad2418095cd21de4ac322c02ea77d1a64cce97ddceaa8495b1f6a02fe927511532d54572a8c88888014796529ade6126c EBUILD setools-4.0.1.ebuild 1245 BLAKE2B 93963b8a7f7a82c105d52e23645f6b81097df55095141b72d0216a66333a90cce40b0afac652bc243d98b872301a1c5fcbcd474dcf6e9fa81ed753d12c682853 SHA512 1803bfdb18d0fb1278c24ed5272bbb55327381debc023fce62f9897c1d863a8afe4d509c0514bd24f52ac77ba7d64702ee6bce4ed33467bf0bf72a3ba778efb3 -EBUILD setools-4.1.1.ebuild 1309 BLAKE2B d2db2b9ff10789643828279348a2720648445e7774552cbbdc511efab5e09a4d708d482d2eb4720e4aab16591bdba60465c4543a85bf2203df92c4c00288ad2a SHA512 8013267116ab4ad01152f1b28575f96f1213670ec1de7d82ccb89ad225b1af3c828733d25e68681e00823bef429a5f8bdb270dce8be4bfd24da4397506c308ce +EBUILD setools-4.1.1.ebuild 1332 BLAKE2B f6da35b0c3b00d49cde181a8a2db68472fa3ef7c2811a4eea03a39c6f82c876db649cae40bfa8dd7f63719de26c60351206bccb7bbbafb401a3b70d28545feae SHA512 ed772cbd7c472a013640c352282d5686e24816dea756121dd01667608496b2bb181f4eea71a0fcd2a273d70e6703a7acfd9f4009f7ef30b721a63ef226f5b51d EBUILD setools-9999.ebuild 1311 BLAKE2B c287cedf48779a0ef27a08b3675642ade46079fc3e63445fd13849d0f8e5fdc65a417c3af9073799101638b8000a1fc9e17fce3c3da6269367dd516dc0df2325 SHA512 8eaf4dc0b43c38adc6e206eccb60f52e34e1049e29a8ba51ce035f61307ee28a513867732ac8fe03f0a6e02adadc9c9b7afdd3f1edecd2f5e7918a64bbf2b9e6 MISC metadata.xml 403 BLAKE2B 954bfb344e48933f43c746ed626da3851b9e887b9d1c68541fa97356992c2e80f0626198d2170b431d32489347bb6e5ee46d2577a5d672940892ec5d5fd87e4e SHA512 be645abfaf1149e2f2a9b7f0613b61f015df81a16bc6dde593513aa2ba7b4a9a8fba65520b53a2511ba65c022258f48bcd2aed3f85c273a35c94359e358a8fa6 diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild index f33d361a1154..28df40b3ee55 100644 --- a/app-admin/setools/setools-4.1.1.ebuild +++ b/app-admin/setools/setools-4.1.1.ebuild @@ -39,6 +39,7 @@ DEPEND="${RDEPEND} test? ( python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] ) dev-python/tox[${PYTHON_USEDEP}] + sys-apps/checkpolicy )" python_prepare_all() { diff --git a/app-admin/system-tools-backends/Manifest b/app-admin/system-tools-backends/Manifest index 372414f8248b..6cd70e98636b 100644 --- a/app-admin/system-tools-backends/Manifest +++ b/app-admin/system-tools-backends/Manifest @@ -1,4 +1,3 @@ -AUX stb.rc 418 BLAKE2B 7edd24d8e93e4f66be8efdadb8f6b1dfb2641b0a946e846408d98b66f7824c27c7bed7270fe935c02821b677bbedf1a20b7a630bb6d9c2b0e57d50b236ee7533 SHA512 847f19a82ae1e2d6f0c6be1ed77c46033bba1e85b99ac3764afd285f0192f09cf5928a6214ef4266c96255c35fd902148c5f068ce914898354476636cd10646c AUX system-tools-backends-2.8.2-cve-2008-4311.patch 1984 BLAKE2B fdceba11d1f10d200709a7b0a391da459d7d59c69900243cacaeb9f372eb74033d2d7e3be32ba10fbccdf15c8acc04b7a2e2cb524f5c540c06113140a33a6171 SHA512 ec8d2f526ad16f286aeef6d521ae3f2909676b846ad2a715d23c5a30b02f0608e42d550691e0e07493d70d1141093dc59c36a55afa82032c6d28e128ab1fd49b AUX system-tools-backends-2.8.2-default-permissions.patch 945 BLAKE2B a825942ddf3bb8cf00d9c355f7864fc2aa48c0e2a89cc7098914204a4724e581623cfc798b9e39eb543ec5245b3ef4973798c1a8b3b46233975bd040bdc10102 SHA512 0225f2825928c123cde5781d8d34c64e71ac6c4349e7440bc4e37cbbaaa99b55ca86f14459477a0a4ab3bd60625f95427d3779bd167d10f721a2b2c4ca9a20ae DIST system-tools-backends-2.10.2.tar.bz2 448939 SHA256 1dbe5177df46a9c7250735e05e77129fe7ec04840771accfa87690111ca2c670 SHA512 9ee3e0643122740493265e532350fed9056334de0ea3d6656daa1d42b97f76f0f85024ac87e732fe5122a1e31ad009a1d2f119720081673a06696b81452fb990 WHIRLPOOL 2357ca2249b8f7c7ce3fc7ffcb4c49bcd83040d77910bbb1ce19e47750da999e6d359689d14c284a84b421287d5a8d3d183fc1debd0b119aa520dd125ca1a599 diff --git a/app-admin/system-tools-backends/files/stb.rc b/app-admin/system-tools-backends/files/stb.rc deleted file mode 100644 index 814f0d359570..000000000000 --- a/app-admin/system-tools-backends/files/stb.rc +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need dbus -} - -start() { - ebegin "Starting system-tools-backend" - start-stop-daemon --start --exec /usr/sbin/system-tools-backends -- -D - eend $? -} - -stop() { - ebegin "Stopping system-tools-backend" - start-stop-daemon --stop --pidfile /var/run/system-tools-backends.pid - eend $? -} - diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest index 20b3db4acd2d..f89f0352933b 100644 --- a/app-admin/testdisk/Manifest +++ b/app-admin/testdisk/Manifest @@ -1,3 +1,4 @@ -DIST testdisk-7.0.tar.bz2 676990 SHA256 00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 WHIRLPOOL 9ef3ed733f13477435123089cbd6168c189591284aa72dc9636470b35a21a32222d6871916b43e3c2ba4ac6da85979d6ec249b22c2573b77db7b2bcc280b85f1 -EBUILD testdisk-7.0-r3.ebuild 2443 BLAKE2B 6e3ce9784e34190e089ed5b5b294c154f0e12536c308a82b3a9d472930af269ece3fdc2474a360265f8bdf079006ea658ed0145c3691687740ef0ea47874bbc3 SHA512 0e3e7478ddb21b301167f1ee39d67803e4f68912100194f7d6eba378281eaf2efeb36cadc773cb22aac896095e780288a53a13d0c21093fa858827dca63b1068 +AUX testdisk-7.0-qtbindir.patch 958 BLAKE2B 0d3ba4622cc6a83fe6b1fe65dd51203e05c936b7fc169fa5c070a3e77e799eac4f87068a6a6bbe9a3d6fbe25a8c6afae3a5251a72137eb4fdd4afb966e724a9e SHA512 c17dd97e058633cc3ca1f51d371bcce9d702dc2ffbd80eaad2aa1830d17c604702b23e4fb4d1516ab888f55899817e132be535d723c6b7275686d9513c6d6e31 +DIST testdisk-7.0.tar.bz2 676990 BLAKE2B deeeee290f05d4a992ff69c990cca8480c74e67ba2df0b523640833b968ed98dc9f44e5f33b2666daf07286dd8349b98171d6c65f7f3baae3d5cca159a5c9584 SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 +EBUILD testdisk-7.0-r3.ebuild 2490 BLAKE2B 05e6b8c2362f82795092e86d4962b61bf18372c07f6c10a5ec63a3e6f16835a674800edaa84c8cab3ad0d5134f08228e24a5dd825fea4a8b73e6c21d08fc5e83 SHA512 b9abc56f703cdb6398fa694e428c32fb0951d3cbd790eea41da6c24df019e47b971df902aae086e9ab85c3c4861b20b5d4c602a2a6058aede5e8ed69cf43ca3b MISC metadata.xml 447 BLAKE2B da97d4af9961ab42d914dd33abbf433e5974ed49efb2ac2c4ff6cfdd50735bddc48b9b9e15d86a3701d740c73ef9df31439599fdd1cb6a37a306ddcf1cdafc73 SHA512 f6e65d544043790ff6b654dce7e4995214fde5f5c5f35926e396721cc223c97f06a918d7d345e9f4f51c82437af41887a0cb442eb0c7172f839df3249eb58095 diff --git a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch new file mode 100644 index 000000000000..cb99e503829d --- /dev/null +++ b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch @@ -0,0 +1,27 @@ +--- a/configure.ac 2015-04-18 11:04:47.000000000 +0200 ++++ b/configure.ac 2017-12-04 20:34:51.804861863 +0100 +@@ -854,17 +854,14 @@ + + if test "$use_qt" = "true"; + then +- PKG_CHECK_MODULES(QTGUI, [QtGui >= 4.0.1],,use_qt=false) +- AC_CHECK_TOOLS(MOC,[moc-qt4 moc],) +- if test x$MOC = x ; then +- AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.) ++ PKG_CHECK_MODULES([QTGUI], [QtCore >= 4.8.0 QtGui], [ ++ QT_PATH="$( eval $PKG_CONFIG --variable=libdir QtCore )/bin" ++ AC_PATH_PROGS([MOC], [moc-qt4 moc], [moc], [$QT_PATH]) ++ AC_PATH_PROGS([RCC], [rcc-qt4 rcc], [rcc], [$QT_PATH]) ++ ], [ ++ AC_MSG_ERROR([Qt4 not found]) + use_qt=false +- fi +- AC_CHECK_TOOLS(RCC,[rcc-qt4 rcc],) +- if test x$RCC = x ; then +- AC_MSG_WARN(Could not find a rcc-qt4 or rcc tool in your PATH.) +- use_qt=false +- fi ++ ]) + qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS" + qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS" + fi diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild index 22e8db9dfe2c..30247d7d1ca6 100644 --- a/app-admin/testdisk/testdisk-7.0-r3.ebuild +++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild @@ -47,6 +47,8 @@ RDEPEND="!static? ( ${DEPEND} )" AUTOTOOLS_IN_SOURCE_BUILD=1 DOCS=( ) +PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" ) + src_configure() { local myconf |