From ad6182343997a405079870a2fe91c4e0c6b94595 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Sep 2019 19:33:39 +0100 Subject: gentoo resync : 25.09.2019 --- dev-db/etcd/Manifest | 6 +-- dev-db/etcd/etcd-3.3.15.ebuild | 2 +- dev-db/etcd/etcd-3.4.0.ebuild | 81 --------------------------------------- dev-db/etcd/etcd-3.4.1.ebuild | 86 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 85 deletions(-) delete mode 100644 dev-db/etcd/etcd-3.4.0.ebuild create mode 100644 dev-db/etcd/etcd-3.4.1.ebuild (limited to 'dev-db/etcd') diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest index 27d9f3b9e93c..4233d8c380c4 100644 --- a/dev-db/etcd/Manifest +++ b/dev-db/etcd/Manifest @@ -5,7 +5,7 @@ AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12 AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce DIST etcd-3.3.15.tar.gz 6271373 BLAKE2B 85786a2a4acaf144f80461a56775b8c91164e8f0c0034ef0741d98383ac400720ca69b855588a076dc174364330c0e12df73a36570983138e33a32cdbe69e22f SHA512 9fbc02c4aacb000335d558e9c5d4df672194d1b1b8511918efa35a6123bcd7f1a06ecc527f7ff01af7c7f0e818b4809918e640fd596ec51898bf511849f0a2c5 -DIST etcd-3.4.0.tar.gz 8931860 BLAKE2B abeb78866b751a3a124f1aaba2b6709402a51d0c5f36a45c8386816e4059172206c7e3420865209a53cecf7452a8c8b510a6fd50b5c7a9fefaac577e5d3c4413 SHA512 8e130cc76a2284c98bb72e3832e10e25e45c6fbaa5da7c6a7a2dd14a069d4fea7659b13c1450b87b869e5936bdad47606d0c65292febb7257369531ff2658674 -EBUILD etcd-3.3.15.ebuild 1989 BLAKE2B 533264f964f7fb88f11dfdd7114d104c8b0b47ae05512651d9f0d8492ab16ce678232637281da132fba9c34ebe7e5f7622a23f162b8bed564315153d65d5facd SHA512 aaaf9251fc4d5d411333e62f557d8477f603c261d319dbe823304a2c8840de286b842d2949ec3c0cc99cff41e84e627212e38619ed75adadf6089b793f424854 -EBUILD etcd-3.4.0.ebuild 2077 BLAKE2B 3f9fef30fe99652a34c6e221c57f0b6f3cff5ab504b53e012772f372652b6c9e7af9619f34e3408c478b8d97fe8b90a7c566bc98ab8c13da664a3f3bab53484c SHA512 cae7940cc3c7a402b66baf3719a5bbfad1c12e6edfda23fcaca0d5fc46ca00143d3db75041ca5fd8ee1eb0a11749dc338a9d0f2c37558509ffff3f9f433573ec +DIST etcd-3.4.1.tar.gz 8931994 BLAKE2B 4cfb8a87082be3323b9adb4290c91c4419b8c8d9b343196af07424f126afda4e702da7fed578d8fcd04d1c2c2e34524fb341734afc9c41d5e43ba103c865b262 SHA512 c5c0cd25ae12e02c162490d46ab726b4a1ab5a027435a884cf61b995d5dc290d58534ec271ed41efd7dd3a30b0bd040f74081d943e32928cce16e56484e3bfc5 +EBUILD etcd-3.3.15.ebuild 2003 BLAKE2B 67ad4d265af60a2acae219b2af516682a4ecbe960c2ef57a0d52f67e5abb46ef9e45faa7d1c5d97a08976a23fec6591f4a9405c42c97c1cc250b89b94967f574 SHA512 bacc3c09dcb728aae3f547e32ecf95774a102e4b10a63b2e13d4ae83551ac5feafd76a293a14cc2f916d1749c841b3b5f61ea4a0d068769b73cf32860d78c8a2 +EBUILD etcd-3.4.1.ebuild 2274 BLAKE2B 6866bc3a7a596ecaa2e8c2b02c205a0c447da557eee501205105369cad8b19d739ef7b3b0da697181144025cd06d2c0ab2788174386c57aa0025e59f3c5eacdc SHA512 ad4e19b4932d4e1882a45ff7349e6e56b0c479925f7c6c333e2f4d7d613d38500bec39de448e0376e37926bac8fbfce1b470c328b75fdcae2e8e971b3eeda121 MISC metadata.xml 679 BLAKE2B 7374379a18107011df792be631428834334ad8e6da5cfe404f18555e8c168d3fc716a1c8d6cb5cf1d9ccd173737aecf93a165f846865dbb6ba4a76bd4669b446 SHA512 8070d8b51dd3319e8b159072db237dcc5299361c2f74fa086fc4cbc174cc6a5c8f7659310332b54b2275e2bc3d028323c4dfa5775e21693a339f54312582d2f0 diff --git a/dev-db/etcd/etcd-3.3.15.ebuild b/dev-db/etcd/etcd-3.3.15.ebuild index b3ed26c899a4..45845631992d 100644 --- a/dev-db/etcd/etcd-3.3.15.ebuild +++ b/dev-db/etcd/etcd-3.3.15.ebuild @@ -12,7 +12,7 @@ MY_PV="${PV/_rc/-rc.}" DESCRIPTION="Highly-available key value store for shared configuration and service discovery" HOMEPAGE="https://github.com/etcd-io/etcd" SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" +LICENSE="Apache-2.0 BSD BSD-2 MIT" SLOT="0" IUSE="doc +server" DEPEND=">=dev-lang/go-1.12:=" diff --git a/dev-db/etcd/etcd-3.4.0.ebuild b/dev-db/etcd/etcd-3.4.0.ebuild deleted file mode 100644 index 97d43f62eaf2..000000000000 --- a/dev-db/etcd/etcd-3.4.0.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user systemd golang-vcs-snapshot - -KEYWORDS="~amd64" -EGO_PN="go.etcd.io/etcd" -GIT_COMMIT="898bd13" -MY_PV="${PV/_rc/-rc.}" -DESCRIPTION="Highly-available key value store for shared configuration and service discovery" -HOMEPAGE="https://github.com/etcd-io/etcd" -SRC_URI="${HOMEPAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc +server" -DEPEND=">=dev-lang/go-1.12:=" -RDEPEND="!dev-db/etcdctl" - -src_prepare() { - default - sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\ - -i "${S}"/src/${EGO_PN}/build || die - sed -e 's:\(for p in \)shellcheck :\1 :' \ - -e 's:^ gofmt \\$:\\:' \ - -e 's:^ govet \\$:\\:' \ - -i "${S}"/src/${EGO_PN}/test || die - # missing ... in args forwarded to print-like function - sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \ - -i "${S}"/src/${EGO_PN}/raft/logger.go || die - - # Avoid network-sandbox violations since go-1.13 - rm src/${EGO_PN}/go.mod || die -} - -pkg_setup() { - if use server; then - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} - fi -} - -src_compile() { - export -n GOCACHE XDG_CACHE_HOME #651934 - export GOPATH=${S} - pushd src/${EGO_PN} || die - GO_BUILD_FLAGS=-v ./build || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dobin bin/etcdctl - use doc && dodoc -r Documentation - if use server; then - insinto /etc/${PN} - doins "${FILESDIR}/${PN}.conf" - dobin bin/etcd - dodoc README.md - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - keepdir /var/lib/${PN} - fowners ${PN}:${PN} /var/lib/${PN} - fperms 0700 /var/lib/${PN} - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} - fperms 755 /var/log/${PN} - fi - popd || die -} - -src_test() { - pushd src/${EGO_PN} || die - GO111MODULES=off ./test || die - popd || die -} diff --git a/dev-db/etcd/etcd-3.4.1.ebuild b/dev-db/etcd/etcd-3.4.1.ebuild new file mode 100644 index 000000000000..66e471bbadb0 --- /dev/null +++ b/dev-db/etcd/etcd-3.4.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit user systemd golang-vcs-snapshot + +KEYWORDS="~amd64" +EGO_PN="go.etcd.io/etcd" +GIT_COMMIT="a14579f" +MY_PV="${PV/_rc/-rc.}" +DESCRIPTION="Highly-available key value store for shared configuration and service discovery" +HOMEPAGE="https://github.com/etcd-io/etcd" +SRC_URI="${HOMEPAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Apache-2.0 BSD BSD-2 MIT" +SLOT="0" +IUSE="doc +server" +DEPEND=">=dev-lang/go-1.12:=" +RDEPEND="!dev-db/etcdctl" + +src_prepare() { + default + sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\ + -i "${S}"/src/${EGO_PN}/build || die + sed -e 's:\(for p in \)shellcheck :\1 :' \ + -e 's:^ gofmt \\$:\\:' \ + -e 's:^ govet \\$:\\:' \ + -e 's:^ govet_shadow \\$:\\:' \ + -i "${S}"/src/${EGO_PN}/test || die + # missing ... in args forwarded to print-like function + sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \ + -i "${S}"/src/${EGO_PN}/raft/logger.go || die + + sed -e 's:TestGetDefaultInterface(:_\0:' \ + -e 's:TestGetDefaultHost(:_\0:' \ + -i "${S}"/src/${EGO_PN}/pkg/netutil/routes_linux_test.go || die + + # Avoid network-sandbox violations since go-1.13 + rm src/${EGO_PN}/go.mod || die +} + +pkg_setup() { + if use server; then + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} + fi +} + +src_compile() { + export -n GOCACHE XDG_CACHE_HOME #651934 + export GOPATH=${S} + pushd src/${EGO_PN} || die + GO_BUILD_FLAGS=-v ./build || die + popd || die +} + +src_install() { + pushd src/${EGO_PN} || die + dobin bin/etcdctl + use doc && dodoc -r Documentation + if use server; then + insinto /etc/${PN} + doins "${FILESDIR}/${PN}.conf" + dobin bin/etcd + dodoc README.md + systemd_dounit "${FILESDIR}/${PN}.service" + systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" + keepdir /var/lib/${PN} + fowners ${PN}:${PN} /var/lib/${PN} + fperms 0700 /var/lib/${PN} + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} + fperms 755 /var/log/${PN} + fi + popd || die +} + +src_test() { + pushd src/${EGO_PN} || die + GO111MODULES=off ./test || die + popd || die +} -- cgit v1.2.3