[gentoo-commits] repo/gentoo:master commit in: dev-util/drone/files/, dev-util/drone/

[Manuel Rüger]

commit:     ea412ffc904f65ae9d9484b0a218331f18a621db
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 12:21:50 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 12:21:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea412ffc

dev-util/drone: Version bump to 0.8.0_rc1

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-util/drone/Manifest                            |  4 ++
 dev-util/drone/drone-0.8.0_rc1.ebuild              | 51 ++++++++++++++++++++++
 dev-util/drone/files/drone-agent.initd             |  2 +-
 dev-util/drone/files/drone-server.confd            | 47 ++++++++++++++++++++
 .../{drone-agent.initd => drone-server.initd}      | 12 ++---
 5 files changed, 109 insertions(+), 7 deletions(-)

diff --git a/dev-util/drone/Manifest b/dev-util/drone/Manifest
index e291ae1459e..46a0a21a717 100644
--- a/dev-util/drone/Manifest
+++ b/dev-util/drone/Manifest
@@ -1,4 +1,8 @@
 DIST drone-0.7.1_p20170603.tar.gz 4131569 SHA256 a0941ec8131f5384b1eabd160de004861ba25c0a103b85a760e727d1bd9b5fdd SHA512 2348f70c41a86d7cb223549ca5215c07f693b3156f471e620db6569dae32b072ff63f5e7134aa644bf1826b450e8f7855aafde1eac44692724a522db2a62a5db WHIRLPOOL 8d552731ae1a2e5a28e4601771b5911aef7efba522b74bcfa043f74fb96a433392eb6d5a3f849b7fb10932093e81543ca27eaa14b4638f4e0b90dab606f3f7f4
 DIST drone-0.7.2.tar.gz 4133002 SHA256 d1a326b7b4de20c101202ef89471744298ba11510c7bc8517e0256cf817f86a0 SHA512 ce49e9e6ba57ea0580186bf7038cc9f156bda2d974de3920a6cb953c4bd616467b3ba0fe397938f06c33adcf9df77686686dd76032f6eb6a69268b2df622b412 WHIRLPOOL a3cec86c2d1d3b52022c4e1647c5d3c15899ad80bac050dd9a5b872c6e78f5838042d8e4c25c93012de07f4181ee81780e1c97c0b3c12429042f30a2011fbf8d
 DIST drone-0.7.3.tar.gz 4133041 SHA256 997ce994fb852ffc0c98f20ba17d9ff458b396019207e923cd5863ec7599211e SHA512 4c85e964f43ce3076996cd1cbcfc3675d74b254278d046d1e7d4b7f04ee5fcc55a6de04947c3f8102be474e0ef3fbd5d0006ac2b39aae04fe2bc6b466b513c66 WHIRLPOOL 18cfc24df5735b11f767b0ec323f591e44b08192abb05eff3984ef6bd8ce3df548924fb69b9543cb3c92c3b26f3bddfdfd105ec4014ebe2bd5c2b420c7fe6c2f
+DIST drone-0.8.0_rc1.tar.gz 3961594 SHA256 20bb7a178faf5a883dfdae1714f5b210b818e906bba405cfd6bc1a7beefc26d1 SHA512 2c0cb2a8ee94deab7088f1994a47737004ec11f3fe160ebc0fd18cb1db7ce4a58404749433aad3fca6f03638d870786611f4b165140aa5786f837f5c9bd159bf WHIRLPOOL 8aa5b00035fb9ff03156fc0a660ae0b0749e13836d5cf3b716b52f2638feaef85a7c371187f1013e42eaf56969bcf16861bf022ac062b89b8da642459dd7ae54
 DIST github.com-drone-drone-ui-2910d0ee662816a2463d31f0988b1ecccd0410b5.tar.gz 167172 SHA256 5817bfb4fe7546a492d840f7a42a0dc6ede1eeacfc735024276bb90fb1522b5d SHA512 d4c6fbeba9ae5c55533a76fdcf6c251516aa4f8c650f49add7e9392d22a131438bd829670df801495d361417ec12cce07e9d9c28aacd1ce1adc0024408cf3cca WHIRLPOOL f941daae3f12c96fd439680c5ca81ccbe3aea2b76b1e250ef009a0fe7883514909113b6c9ab923bcb05a5950dec9b57bd849bedb8767225f6eece583f4fe63de
+DIST github.com-drone-drone-ui-4fbdb1a34a3fab8fa0d67507f62d5725fe73c298.tar.gz 481923 SHA256 3f577b743c8b78f136a53bf4638cb38aaea690800033c4de3650145ce21f5a94 SHA512 1650d97bdc6b2754451e98b89637e327403884ce3a362018ac6e454ddc361530524bc12df865c6d1025bd72194550e8b1ca9f6e2bcee92aabf52232cd411d50f WHIRLPOOL 1222004502f3797ebbf41d572851fe4cead5c4d4ec09e6b26d60ed6e5dee19761ad1bb22acd55996f2010dc574318b2b875f67dd3d8a4aa739f4d112bcc76746
+DIST github.com-golang-net-ab5485076ff3407ad2d02db054635913f017b0ed.tar.gz 912826 SHA256 cfd39e1a0a94e10fc01b1cca6f5c1016440baf466562053093916d3fbbab2843 SHA512 ff98b6ce2d6177640cce91f1059c220b450935f2e6dcca83f3a8d7e9f7745593c765233d3a4b1ac42f7ffe72cd3e98c33f3c8cefc7c54f423233433f0958691b WHIRLPOOL 9e0690a795581f570b073477d3f6e46324d4b569c263e20bdb89af857568e83c6692ad73157ac439f3994e2c1ffb1b5a9e5dc7ae5b3decd41603c428f050b1b4
+DIST github.com-golang-protobuf-0a4f71a498b7c4812f64969510bcb4eca251e33a.tar.gz 253438 SHA256 6da84e9a2fc14512377268c2dafd3c17ae88278fa12cc1f2055042841806cde4 SHA512 011bc5a799f239c22733931f5b994578a99ecdb2939a59ce65674bfd8c5e0370ff1a9a4cb6fcaa3896e6afc7762f6862472e3925263efa719362ba2a2a4bf12e WHIRLPOOL 16080afe973bf7d0f44707668ee16b9c11bbce81c3f4eed1dc62de702c3ab3c6fa9cb368d8e7c4e5dd07e3f6d41c92665b840ce45a647134de3a5672a0ee1800

diff --git a/dev-util/drone/drone-0.8.0_rc1.ebuild b/dev-util/drone/drone-0.8.0_rc1.ebuild
new file mode 100644
index 00000000000..e9bafc618a6
--- /dev/null
+++ b/dev-util/drone/drone-0.8.0_rc1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone"
+EGIT_COMMIT="eaa6d41699585e09bcc13651671480d0abdf684e"
+EGO_VENDOR=( "github.com/drone/drone-ui 4fbdb1a34a3fab8fa0d67507f62d5725fe73c298"
+	"github.com/golang/protobuf 0a4f71a498b7c4812f64969510bcb4eca251e33a"
+	"golang.org/x/net ab5485076ff3407ad2d02db054635913f017b0ed github.com/golang/net" )
+
+inherit golang-build golang-vcs-snapshot user
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
+HOMEPAGE="https://github.com/drone/drone"
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata
+	dev-go/go-bindata-assetfs:="
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
+}
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
+	GOPATH="${WORKDIR}/${P}" go build -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
+	popd || die
+}
+
+src_install() {
+	dobin src/release/drone-{agent,server}
+	dodoc src/github.com/drone/drone/README.md
+	keepdir /var/log/drone /var/lib/drone
+	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
+	newinitd "${FILESDIR}"/drone-server.initd drone-server
+	newconfd "${FILESDIR}"/drone-server.confd drone-server
+	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
+	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
+}

diff --git a/dev-util/drone/files/drone-agent.initd b/dev-util/drone/files/drone-agent.initd
index b0e387f0b60..16bd320fd2e 100644
--- a/dev-util/drone/files/drone-agent.initd
+++ b/dev-util/drone/files/drone-agent.initd
@@ -7,7 +7,7 @@ pidfile=${pidfile:-"/run/drone/${SVCNAME}.pid"}
 user=${user:-drone}
 group=${group:-drone}
 
-command="/usr/bin/drone-server agent"
+command="/usr/bin/drone-agent"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
 	--stdout /var/log/drone/${SVCNAME}.log \

diff --git a/dev-util/drone/files/drone-server.confd b/dev-util/drone/files/drone-server.confd
new file mode 100644
index 00000000000..3d4fd461402
--- /dev/null
+++ b/dev-util/drone/files/drone-server.confd
@@ -0,0 +1,47 @@
+# arguments for drone
+# See also http://readme.drone.io/admin/installation-reference/
+#DRONE_SECRET=
+#DRONE_DEBUG=false
+#DRONE_SERVER_CERT=
+#DRONE_SERVER_KEY=
+#DRONE_ADMIN=
+#DRONE_ORGS=
+#DRONE_OPEN=false
+#DRONE_YAML=.drone.yml
+#DRONE_CACHE_TTY=15m
+DRONE_DATABASE_DRIVER=sqlite3
+DRONE_DATABASE_DATASOURCE="/var/lib/drone/drone.sqlite"
+DRONE_GITHUB=true
+#DRONE_GITHUB_URL=https://github.com
+#DRONE_GITHUB_CLIENT=
+#DRONE_GITHUB_SECRET=
+#DRONE_GITHUB_SCOPE=
+#DRONE_GITHUB_GIT_USERNAME=
+#DRONE_GITHUB_GIT_PASSWORD=
+#DRONE_GITHUB_PRIVATE_MODE=false
+#DRONE_GITHUB_MERGE_REF=true
+#DRONE_GITHUB_CONTEXT=continuous-integration/drone
+#DRONE_GITHUB_SKIP_VERIFY=false
+#DRONE_GOGS=false
+#DRONE_GOGS_URL=
+#DRONE_GOGS_GIT_USERNAME=
+#DRONE_GOGS_GIT_PASSWORD=
+#DRONE_GOGS_PRIVATE_MODE=
+#DRONE_GOGS_SKIP_VERIFY=false
+#DRONE_BITBUCKET=false
+#DRONE_BITBUCKET_CLIENT=
+#DRONE_BITBUCKET_SECRET=
+#DRONE_STASH=false
+#DRONE_STASH_URL=
+#DRONE_STASH_CONSUMER_KEY=
+#DRONE_STASH_CONSUMER_RSA=
+#DRONE_STASH_GIT_USERNAME=
+#DRONE_STASH_GIT_PASSWORD=
+#DRONE_GITLAB=false
+#DRONE_GITLAB_URL=https://gitlab.com
+#DRONE_GITLAB_CLIENT=
+#DRONE_GITLAB_SECRET=
+#DRONE_GITLAB_GIT_USERNAME=
+#DRONE_GITLAB_GIT_PASSWORD=
+#DRONE_GITLAB_SKIP_VERIFY=false
+#DRONE_GITLAB_PRIVATE_MODE=false

diff --git a/dev-util/drone/files/drone-agent.initd b/dev-util/drone/files/drone-server.initd
similarity index 54%
copy from dev-util/drone/files/drone-agent.initd
copy to dev-util/drone/files/drone-server.initd
index b0e387f0b60..db2ae65a8bb 100644
--- a/dev-util/drone/files/drone-agent.initd
+++ b/dev-util/drone/files/drone-server.initd
@@ -1,17 +1,17 @@
 #!/sbin/openrc-run
-# Copyright 2017 Gentoo Foundation
+# Copyright 2016-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-description="Drone CI Agent"
-pidfile=${pidfile:-"/run/drone/${SVCNAME}.pid"}
+description="Drone CI"
+pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
 user=${user:-drone}
 group=${group:-drone}
 
-command="/usr/bin/drone-server agent"
+command="/usr/bin/drone-server"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/drone/${SVCNAME}.log \
-	--stderr /var/log/drone/${SVCNAME}.log"
+	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
+	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
 
 start_pre() {
 	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"