commit: 812b908cd0072211e2c9a193a30844423092be8d Author: Ultrabug <ultrabug <AT> gentoo <DOT> org> AuthorDate: Thu Mar 26 12:16:34 2015 +0000 Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> CommitDate: Thu Mar 26 12:16:34 2015 +0000 URL: https://gitweb.gentoo.org/dev/ultrabug.git/commit/?id=812b908c
ebuild simplification app-admin/consul/Manifest | 5 +-- app-admin/consul/consul-0.3.1.ebuild | 84 ------------------------------------ app-admin/consul/consul-0.4.1.ebuild | 27 +++--------- app-admin/consul/consul-9999.ebuild | 21 +++------ 4 files changed, 15 insertions(+), 122 deletions(-) diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest index be7853f..f40e4d7 100644 --- a/app-admin/consul/Manifest +++ b/app-admin/consul/Manifest @@ -1,5 +1,4 @@ AUX consul-agent.confd 382 SHA256 f1c9bc500314f507f34362bea2b2e55258414b779c14e4f3ddc169aa78f875c2 SHA512 1068517b4c64d9d12072e04c8b50ab0c9a57d0780c50a9e501d51af99d3fffd86cdcab6c913e23b1de187bc698ef0a79b6ac58cd2f28a425d74596a606f3dc62 WHIRLPOOL 08029897a59e6d74670e78f80d299a1c7a4b118e583067cd26a4bf385e40a4e5772a139f40c5e7fefea94f46408b3eeb36d906352c3ff9c9f7a2cc200414c174 AUX consul-agent.initd 1269 SHA256 2799e56571fc6359d291592d1350e0754dc792f138746aa246f3cd25132039ca SHA512 746d233ddd68f5343c526356a00d4af032917832d33b2695639cdce7f7e829335ddc2f1ecdf2bba0c76f5ceb14ca6a3f542e2e7ff450f504e775667082ae1286 WHIRLPOOL 55050e26d28034bf7473260dee0ee2d4a4313ec97aceb0de07e5b872103beca99f7e211a2ea8160cdd2f114d4c67b8845823cdc979c66525d5cd4c12129ec369 -EBUILD consul-0.3.1.ebuild 1548 SHA256 06ec50067b4fadae97631feb215ead3a872632c793bc033f3824106070a04158 SHA512 36993369e6052c7e074c941d47fac51c3845c244be1aca7413f8037d75127d51c88d296323c0f78b675cb28badddc4dbad1092cb60a91ea7408873f466ceddd3 WHIRLPOOL 1abddcbc6fb7f3d71140646a926fcae0045a0097debee49221046882389bb89a7152dc94590115e9522e097e313a5a8a6d24cffcd9e0c0dc4b414f30054977ca -EBUILD consul-0.4.1.ebuild 1548 SHA256 06ec50067b4fadae97631feb215ead3a872632c793bc033f3824106070a04158 SHA512 36993369e6052c7e074c941d47fac51c3845c244be1aca7413f8037d75127d51c88d296323c0f78b675cb28badddc4dbad1092cb60a91ea7408873f466ceddd3 WHIRLPOOL 1abddcbc6fb7f3d71140646a926fcae0045a0097debee49221046882389bb89a7152dc94590115e9522e097e313a5a8a6d24cffcd9e0c0dc4b414f30054977ca -EBUILD consul-9999.ebuild 1421 SHA256 eb68665ccbd97261edf476cb1cb2f6cdbcc78a118fbc950f355364751e0b5f6c SHA512 2d6130bfce73960e2763d1c92849bcfe9443561e4e4fe006137cea6a62262378a2dbd80227a1881f91a45daf73d0fdd0ff2d1b5efa81b84e5c2174008e33d592 WHIRLPOOL caac446ec3805ca5870c10a09abe63afddaba7b75df7e30da9b05ff50f7469e2397fa7d34be1dbda27f1de10dc58db0f9520a2ad9e1c99231e7321dd3fb3d6d0 +EBUILD consul-0.4.1.ebuild 1222 SHA256 0036dde3278181656a70804f2d636ffa07563521ca59cbcf371d96af081299e7 SHA512 afccca73fad04ad29dd427ff00927d08808b8c2020ed52bf84ba437a124a1f3db5e4f7431564c148c357fdbd85fbce2780d77749ebe5dfd910cd3299e4e78f0f WHIRLPOOL 1326bd780a0a80945decaf1e87a95d9a423935fa1b54d48fcdfede3a90ccc8410f663557e2ff6de4cf71ff609e39fdd4e141a04d84c56f34ab026f162a073a7c +EBUILD consul-9999.ebuild 1221 SHA256 85fc7b1ae380fd0c53b2e6b2be3b186ef0d7b1598c888ecfa695a5df8e908c7f SHA512 cd96aaa135bb3f034f0fa37dd27c4fcc63ace8c2bd078b39399d55c719ef889c64fa2f218863171295cb7712991e0f28995703a3db2a2d2d3990b1b7fe51aee9 WHIRLPOOL 7a5c12163b60f6bec384570cb685aba683b3866cd44865f17fb44700e103b23da52fd09f41d6a410d4e599226143f3da7b3e44f792c3ca7e276cef5bc822188b diff --git a/app-admin/consul/consul-0.3.1.ebuild b/app-admin/consul/consul-0.3.1.ebuild deleted file mode 100644 index e4ac91c..0000000 --- a/app-admin/consul/consul-0.3.1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -DESCRIPTION="tool for service discovery, monitoring and configuration." -HOMEPAGE="http://www.consul.io"; -SRC_URI="" - -EGIT_REPO_URI="git://github.com/hashicorp/consul.git" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - EGIT_COMMIT="v${PV}" - KEYWORDS="~amd64 ~x86" -fi - -inherit git-2 user - -LICENSE="MPL-2.0" -SLOT="0" -IUSE="web" - -DEPEND=" - >=dev-lang/go-1.2 - dev-vcs/git - web? ( dev-ruby/bundler dev-ruby/sass ) -" -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup consul - enewuser consul -1 -1 /var/lib/${PN} consul -} - -src_prepare() { - # see : https://github.com/hashicorp/consul/pull/188 - sed -e 's/format:/format: deps/g' -i Makefile || die -} - -src_compile() { - # create a suitable GOPATH - export GOPATH="${WORKDIR}/gopath" - mkdir -p "$GOPATH" || die - - local MY_S="${GOPATH}/src/github.com/hashicorp/consul" - - # move consul itself in our GOPATH - mkdir -p "${GOPATH}/src/github.com/hashicorp" || die - mv "${S}" "${MY_S}" || die - - # piggyback our $S - ln -sf "${MY_S}" "${S}" || die - - # let's do something fun - emake - - # build the web UI - if use web; then - cd ui - bundle - emake dist - fi -} - -src_install() { - dobin bin/consul - - dodir /etc/consul.d - - for x in /var/{lib,log}/${PN}; do - keepdir "${x}" - fowners consul:consul "${x}" - done - - if use web; then - insinto /var/lib/${PN}/ui - doins -r ui/dist/* - fi - - newinitd "${FILESDIR}/consul-agent.initd" "${PN}-agent" - newconfd "${FILESDIR}/consul-agent.confd" "${PN}-agent" -} diff --git a/app-admin/consul/consul-0.4.1.ebuild b/app-admin/consul/consul-0.4.1.ebuild index e4ac91c..7451f69 100644 --- a/app-admin/consul/consul-0.4.1.ebuild +++ b/app-admin/consul/consul-0.4.1.ebuild @@ -9,6 +9,8 @@ HOMEPAGE="http://www.consul.io"; SRC_URI="" EGIT_REPO_URI="git://github.com/hashicorp/consul.git" +S="${WORKDIR}/src/github.com/hashicorp/${PN}" + if [[ ${PV} == *9999 ]]; then KEYWORDS="" else @@ -22,36 +24,21 @@ LICENSE="MPL-2.0" SLOT="0" IUSE="web" -DEPEND=" - >=dev-lang/go-1.2 +DEPEND=">=dev-lang/go-1.4 dev-vcs/git - web? ( dev-ruby/bundler dev-ruby/sass ) -" + dev-vcs/mercurial + web? ( dev-ruby/bundler dev-ruby/sass )" RDEPEND="${DEPEND}" + pkg_setup() { enewgroup consul enewuser consul -1 -1 /var/lib/${PN} consul } -src_prepare() { - # see : https://github.com/hashicorp/consul/pull/188 - sed -e 's/format:/format: deps/g' -i Makefile || die -} - src_compile() { # create a suitable GOPATH - export GOPATH="${WORKDIR}/gopath" - mkdir -p "$GOPATH" || die - - local MY_S="${GOPATH}/src/github.com/hashicorp/consul" - - # move consul itself in our GOPATH - mkdir -p "${GOPATH}/src/github.com/hashicorp" || die - mv "${S}" "${MY_S}" || die - - # piggyback our $S - ln -sf "${MY_S}" "${S}" || die + export GOPATH="${WORKDIR}" # let's do something fun emake diff --git a/app-admin/consul/consul-9999.ebuild b/app-admin/consul/consul-9999.ebuild index 027fd14..dead9aa 100644 --- a/app-admin/consul/consul-9999.ebuild +++ b/app-admin/consul/consul-9999.ebuild @@ -9,6 +9,8 @@ HOMEPAGE="http://www.consul.io"; SRC_URI="" EGIT_REPO_URI="git://github.com/hashicorp/consul.git" +S="${WORKDIR}/src/github.com/hashicorp/${PN}" + if [[ ${PV} == *9999 ]]; then KEYWORDS="" else @@ -22,11 +24,10 @@ LICENSE="MPL-2.0" SLOT="0" IUSE="web" -DEPEND=" - >=dev-lang/go-1.2 +DEPEND=">=dev-lang/go-1.4 dev-vcs/git - web? ( dev-ruby/bundler dev-ruby/sass ) -" + dev-vcs/mercurial + web? ( dev-ruby/bundler dev-ruby/sass )" RDEPEND="${DEPEND}" pkg_setup() { @@ -36,17 +37,7 @@ pkg_setup() { src_compile() { # create a suitable GOPATH - export GOPATH="${WORKDIR}/gopath" - mkdir -p "$GOPATH" || die - - local MY_S="${GOPATH}/src/github.com/hashicorp/consul" - - # move consul itself in our GOPATH - mkdir -p "${GOPATH}/src/github.com/hashicorp" || die - mv "${S}" "${MY_S}" || die - - # piggyback our $S - ln -sf "${MY_S}" "${S}" || die + export GOPATH="${WORKDIR}" # let's do something fun emake
