Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/serf/
Date: Fri, 01 Sep 2017 21:42:11
Message-Id: 1504302122.aa3d638f68a107d074e34ddb0792d32c9a534459.zmedico@gentoo
1 commit: aa3d638f68a107d074e34ddb0792d32c9a534459
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 1 21:40:00 2017 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 1 21:42:02 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3d638f
7
8 app-admin/serf: remove old versions for bug 628654
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.2
11
12 app-admin/serf/Manifest | 3 --
13 app-admin/serf/serf-0.8.0.ebuild | 105 ---------------------------------------
14 2 files changed, 108 deletions(-)
15
16 diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
17 index 57f6f41847b..7ee22730f66 100644
18 --- a/app-admin/serf/Manifest
19 +++ b/app-admin/serf/Manifest
20 @@ -1,6 +1,3 @@
21 DIST github.com-mitchellh-gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 SHA256 826666828f1ec3e535268fa95d983362c6c773e9a87aa94613e7a47805d22e38 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d WHIRLPOOL 89d52013bfb563a11a4042760470ac317398c3f8a61b9e7734c3ac2737d916126ad10a113948eb5a8362de3d77e598e42f4a0510760ae67465bde08658947f7a
22 DIST github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a
23 -DIST gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 SHA256 826666828f1ec3e535268fa95d983362c6c773e9a87aa94613e7a47805d22e38 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d WHIRLPOOL 89d52013bfb563a11a4042760470ac317398c3f8a61b9e7734c3ac2737d916126ad10a113948eb5a8362de3d77e598e42f4a0510760ae67465bde08658947f7a
24 -DIST iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a
25 -DIST serf-0.8.0.tar.gz 1439191 SHA256 f56e8da3e6cf748c20ae629aacfd652a04adfacfd0ee0af6560c33933d93547a SHA512 2e074ee8d002e6c7803f23d50d42800cf660ee22c968be8adf4f5e4cefde6dd39bf601c9bd91544d5f45d639ed0eec82c31a0fd1b903e8a0223f2cdd967bbf36 WHIRLPOOL 09b5e5471c14e11bbeb214a64ec57720cd31779c9d331bba2eea31cac9859cdff12d925923514272101449f7d62b671e685f768af1cf2f2497ad1a7a36402570
26 DIST serf-0.8.1.tar.gz 1445011 SHA256 266d38c08d7459d38ba901d7cdaf36122a3cb77049fa537f5ab17fac1747d094 SHA512 81a4bc2e1659324980fd59464af021ad5ec80431dc1b49b875bb0c97c8f92766dfee9b204bd8c9ab4e175a281bc23815f5e3008ecfb2848c7354c33603bb5514 WHIRLPOOL 1d7a39b84b939b73dda817df3f9b98c044a93e20561ed7cb573ee68afc2742a3f7aea9cfc837b6b25cd1abdf390bc84c2460b97b27c2a0090f13f9a73b5a7779
27
28 diff --git a/app-admin/serf/serf-0.8.0.ebuild b/app-admin/serf/serf-0.8.0.ebuild
29 deleted file mode 100644
30 index e4be0991b39..00000000000
31 --- a/app-admin/serf/serf-0.8.0.ebuild
32 +++ /dev/null
33 @@ -1,105 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit systemd user
40 -
41 -KEYWORDS="~amd64"
42 -EGO_PN="github.com/hashicorp/serf"
43 -DESCRIPTION="Service orchestration and management tool"
44 -HOMEPAGE="https://www.serfdom.io/"
45 -SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
46 - https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz
47 - https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
48 -"
49 -
50 -SLOT="0"
51 -LICENSE="MPL-2.0"
52 -IUSE=""
53 -RESTRICT="test"
54 -
55 -DEPEND="
56 - >=dev-lang/go-1.6:=
57 - >=dev-go/go-tools-0_pre20160121"
58 -RDEPEND=""
59 -
60 -pkg_setup() {
61 - enewgroup serf
62 - enewuser serf -1 -1 /var/lib/${PN} serf
63 -}
64 -
65 -get_archive_go_package() {
66 - local archive=${1} uri x
67 - for x in ${SRC_URI}; do
68 - if [[ ${x} == http* ]]; then
69 - uri=${x}
70 - elif [[ ${x} == ${archive} ]]; then
71 - break
72 - fi
73 - done
74 - uri=${uri#https://}
75 - echo ${uri%/archive/*}
76 -}
77 -
78 -unpack_go_packages() {
79 - local go_package x
80 - # Unpack packages to appropriate locations for GOPATH
81 - for x in ${A}; do
82 - unpack ${x}
83 - if [[ ${x} == *.tar.gz ]]; then
84 - go_package=$(get_archive_go_package ${x})
85 - mkdir -p src/${go_package%/*}
86 - mv ${go_package##*/}-* src/${go_package} || die
87 - fi
88 - done
89 -}
90 -
91 -src_unpack() {
92 - mkdir "${S}" || die
93 - cd "${S}" || die
94 - unpack_go_packages
95 -}
96 -
97 -src_prepare() {
98 - eapply_user
99 - # Avoid the need to have a git checkout
100 - sed -e 's:^GIT.*::' \
101 - -e 's:-X main.GitCommit.*:" \\:' \
102 - -i "${S}/src/${EGO_PN}/scripts/build.sh" || die
103 -
104 - # go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
105 - sed -e 's:go get -u -v $(GOTOOLS)::' \
106 - -e 's:^GIT.*::' \
107 - -i "${S}/src/${EGO_PN}/GNUmakefile" || die
108 -}
109 -
110 -src_compile() {
111 - export GOPATH="${S}"
112 - go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
113 - # The dev target sets causes build.sh to set appropriate XC_OS
114 - # and XC_ARCH, and skips generation of an unused zip file,
115 - # avoiding a dependency on app-arch/zip.
116 - PATH=${PATH}:${S}/bin \
117 - emake -C "${S}/src/${EGO_PN}" dev
118 -}
119 -
120 -src_install() {
121 - local x
122 -
123 - dobin "${S}/bin/${PN}"
124 -
125 - keepdir /etc/serf.d
126 - insinto /etc/serf.d
127 -
128 - for x in /var/{lib,log}/${PN}; do
129 - keepdir "${x}"
130 - fowners serf:serf "${x}"
131 - done
132 -
133 - newinitd "${FILESDIR}/serf.initd" "${PN}"
134 - newconfd "${FILESDIR}/serf.confd" "${PN}"
135 - insinto /etc/logrotate.d
136 - newins "${FILESDIR}/${PN}.logrotated" "${PN}"
137 - systemd_dounit "${FILESDIR}/serf.service"
138 -}