From f78108598211053d41752a83e0345441bb9014ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Feb 2018 16:09:52 +0000 Subject: gentoo resync : 11.02.2018 --- app-emulation/flannel/Manifest | 6 ++-- app-emulation/flannel/flannel-0.10.0.ebuild | 51 +++++++++++++++++++++++++++++ app-emulation/flannel/flannel-0.9.0.ebuild | 51 ----------------------------- app-emulation/flannel/metadata.xml | 4 +++ 4 files changed, 58 insertions(+), 54 deletions(-) create mode 100644 app-emulation/flannel/flannel-0.10.0.ebuild delete mode 100644 app-emulation/flannel/flannel-0.9.0.ebuild (limited to 'app-emulation/flannel') diff --git a/app-emulation/flannel/Manifest b/app-emulation/flannel/Manifest index 25946987e203..2460ebdfb6e6 100644 --- a/app-emulation/flannel/Manifest +++ b/app-emulation/flannel/Manifest @@ -4,8 +4,8 @@ AUX flanneld.confd 40 BLAKE2B 7e3aae756e872ead179c34119e39bb054c7e23255b647c9c4f AUX flanneld.initd 518 BLAKE2B 36859121c77fcd7b53f679eff455ad1ba1f9c6c58fc6a015e195c7639434f941106c44349671c1fe15f4f0c63c3d753f69e9b8cfe2a8d706cd33dbf62a928154 SHA512 3f6f33fe90adca1dd17b503ce0cd3a7f3cc0ca7fc10d0ca5b631f4c87ed513c0133dfd7679618cf95540b252b3176f9bbefd6454867ef792258c46cafc039d86 AUX flanneld.logrotated 77 BLAKE2B 778f7289a6268cf6b150b1c58895514808c304b56baca56b1df3297df4ff0a4c9ec6e70a3ddbf16c55c0bd5be146bcfa20f7b4ac8ceb08fa9af223164c19a905 SHA512 d84258a164adcec0f1cef7fcafcf0cadb3bf3959b393b905c4897274adeff476279ce96ec42e9aa9d574c6bd7d37649d92c7c52563975f85d303cade990a3942 AUX flanneld.service 476 BLAKE2B ea838e26be0834943bafb985a37e71b45219bffbd68784b8442c065d9bafc8c9cb2b097c8a00629c19faf4b7bb1fb4ae33071e51d4bf6ffdd62cf5898de1f3cf SHA512 4a7d09f25f117b1cda9b02914a394c0d6d6ddd6c02503f61c0646ede1934cb4cad831992058c5738401b1ac7be6e4c7cd83b1c4a70c04084bb4bb01338c08220 -DIST flannel-0.9.0.tar.gz 8090296 BLAKE2B f3592a9d448219683a1d34c5c291206ebb331b801455fd4bc3c1e7909576d865943cad9e6c79915bb6be5d8fd47d910a4fb550a1352ea0a506f90dcf2312964c SHA512 b91a3da1b69c806d9af87d4c5f8702c845b328978e375d957bbb8dd3eeb35547cc63f8f13bef7520a8e012e4e958a7c6ca047d0b06a1f9a0e31f61ec2be40a4d +DIST flannel-0.10.0.tar.gz 4799262 BLAKE2B 7341f34f72bf2d51aa727d03eb94f376fd9da825dea1865db9d0b46d5bcc0338569b8aa81c3442b101768cd7b58bef3957bea86a38e8c1cca921b7a03d1b2bf3 SHA512 b71fff80f7c4891279e82c6c430cdbff1eb3966cc4817d1c2c5ed7a731e9466f04e51532734244510ab47cba07557c052fbaa9a4a9ecced56fa1e37f6681b1c9 DIST flannel-0.9.1.tar.gz 8090942 BLAKE2B 94da69c9ef82438a55a238910130beedd55418d1f2a1a9e0d49b36fb5626b9346b4b1dbb46dfdbb839e6303a9906521c5e7bfa7ca695455d1b40167f3245c05f SHA512 ce265effa1924dbd2fa366cf97945ec94ecfc5701dfbaae2d44d1177a36b5e2268b1d9535f2d5dccd84ebb50d8cc8844c46f025fa1f233f85f6dfa0a30d53fe3 -EBUILD flannel-0.9.0.ebuild 1403 BLAKE2B f45390522d39d49fb33487bdeee660b0f02d7c1a324bcc25e6f24f6c1f99a30df653b3fa155f7799ef450e2ee501fda8558734e8c537ecc2a9bf7ea1df362659 SHA512 d4154712b76066d0c88c2308f38f14101a4713c6dceb8330bed71b4d3b2c53655197fd09454e8d710cd29e050c3734bfd0a85bc9141d8bbc2af202c8859116ab +EBUILD flannel-0.10.0.ebuild 1403 BLAKE2B 669a75baef87e9c5cf6f8c221f3a16e91dfc15b9dcb59d06fc1a2f1790e07b52ebaa47c970c1a046e88caad122beeb83bf3ebecc6c70db143287ee6417710ec8 SHA512 2ba72e8c1f358224876b5ad2504a8cfe12b7d748a1038c69eac03b1d6e43f10473ac1b2cfa2c6daa32728004526f82b064f842fa82256e01473e5b7c2e0ddf6b EBUILD flannel-0.9.1.ebuild 1403 BLAKE2B f45390522d39d49fb33487bdeee660b0f02d7c1a324bcc25e6f24f6c1f99a30df653b3fa155f7799ef450e2ee501fda8558734e8c537ecc2a9bf7ea1df362659 SHA512 d4154712b76066d0c88c2308f38f14101a4713c6dceb8330bed71b4d3b2c53655197fd09454e8d710cd29e050c3734bfd0a85bc9141d8bbc2af202c8859116ab -MISC metadata.xml 305 BLAKE2B d34792ab0473ba56a75b4e9dc559b4a12b2eed48313cfecac65ce7b13a9df59a651721fbdd72a744314181f4002b52510c9200b85c1fac6fa03d3d78573db842 SHA512 ff219bf7233d4659475fd4e25366d5eef5d3575cd1250d6c9bbddc7351515418ca17730a8df61d102c71b515813b20bb182b355448db16b5fb43a9a46401bd04 +MISC metadata.xml 417 BLAKE2B e6ca7a068ab883a47cd7bd9d1fcad86c0e2e76304225d17c1aa1f02ebed1fd58bd885e8484873b6c900717e78a7398339f49f5fd74f100467c7d09b5b5800bff SHA512 f776dd802b80a94b819998c46ce5adcd163942fade01f13b3ea6c718bab1fcc6b08cdd0630f51fea305deb760fe9e8b3dd750dab3b2d1e3b2c6a257e7d4b1595 diff --git a/app-emulation/flannel/flannel-0.10.0.ebuild b/app-emulation/flannel/flannel-0.10.0.ebuild new file mode 100644 index 000000000000..3fd362881d8c --- /dev/null +++ b/app-emulation/flannel/flannel-0.10.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit golang-vcs-snapshot systemd user + +KEYWORDS="~amd64" +DESCRIPTION="An etcd backed network fabric for containers" +EGO_PN="github.com/coreos/flannel" +HOMEPAGE="https://github.com/coreos/flannel" +SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="hardened" +RESTRICT="test" + +src_prepare() { + default + sed -e "s:^var Version =.*:var Version = \"${PV}\":" \ + -i "${S}/src/${EGO_PN}/version/version.go" || die +} + +src_compile() { + CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\ + GOPATH="${WORKDIR}/${P}" \ + go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" + [[ -x bin/${PN} ]] || die +} + +src_test() { + GOPATH="${WORKDIR}/${P}" \ + go test -v -work -x "${EGO_PN}" || die +} + +src_install() { + newbin "bin/${PN}" ${PN}d + cd "src/${EGO_PN}" || die + exeinto /usr/libexec/flannel + doexe dist/mk-docker-opts.sh + insinto /etc/systemd/system/docker.service.d + newins "${FILESDIR}/flannel-docker.conf" flannel.conf + newinitd "${FILESDIR}"/flanneld.initd flanneld + newconfd "${FILESDIR}"/flanneld.confd flanneld + keepdir /var/log/${PN} + insinto /etc/logrotate.d + newins "${FILESDIR}"/flanneld.logrotated flanneld + systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf + systemd_dounit "${FILESDIR}/flanneld.service" + dodoc README.md +} diff --git a/app-emulation/flannel/flannel-0.9.0.ebuild b/app-emulation/flannel/flannel-0.9.0.ebuild deleted file mode 100644 index 5135efe94f88..000000000000 --- a/app-emulation/flannel/flannel-0.9.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit golang-vcs-snapshot systemd user - -KEYWORDS="~amd64" -DESCRIPTION="An etcd backed network fabric for containers" -EGO_PN="github.com/coreos/flannel" -HOMEPAGE="https://github.com/coreos/flannel" -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="hardened" -RESTRICT="test" - -src_prepare() { - default - sed -e "s:^var Version =.*:var Version = \"${PV}\":" \ - -i "${S}/src/${EGO_PN}/version/version.go" || die -} - -src_compile() { - CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"\ - GOPATH="${WORKDIR}/${P}" \ - go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" - [[ -x bin/${PN} ]] || die -} - -src_test() { - GOPATH="${WORKDIR}/${P}" \ - go test -v -work -x "${EGO_PN}" || die -} - -src_install() { - newbin "bin/${PN}" ${PN}d - cd "src/${EGO_PN}" || die - exeinto /usr/libexec/flannel - doexe dist/mk-docker-opts.sh - insinto /etc/systemd/system/docker.service.d - newins "${FILESDIR}/flannel-docker.conf" flannel.conf - newinitd "${FILESDIR}"/flanneld.initd flanneld - newconfd "${FILESDIR}"/flanneld.confd flanneld - keepdir /var/log/${PN} - insinto /etc/logrotate.d - newins "${FILESDIR}"/flanneld.logrotated flanneld - systemd_newtmpfilesd "${FILESDIR}/flannel.tmpfilesd" flannel.conf - systemd_dounit "${FILESDIR}/flanneld.service" - dodoc README.md -} diff --git a/app-emulation/flannel/metadata.xml b/app-emulation/flannel/metadata.xml index 26007a60b41b..cfe71d5ee793 100644 --- a/app-emulation/flannel/metadata.xml +++ b/app-emulation/flannel/metadata.xml @@ -4,6 +4,10 @@ zmedico@gentoo.org + + mrueg@gentoo.org + Manuel Rüger + coreos/flannel -- cgit v1.2.3