From e23cdda4dbb0c83b9e682ab5e916085a35203da5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Jun 2018 07:00:28 +0100 Subject: gentoo resync : 23.06.2018 --- app-crypt/keybase/Manifest | 4 ++- app-crypt/keybase/keybase-2.1.0.ebuild | 54 ++++++++++++++++++++++++++++++++++ app-crypt/keybase/keybase-9999.ebuild | 54 +++++++++++++--------------------- 3 files changed, 78 insertions(+), 34 deletions(-) create mode 100644 app-crypt/keybase/keybase-2.1.0.ebuild (limited to 'app-crypt/keybase') diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest index d92a88588270..af571f7ae0bc 100644 --- a/app-crypt/keybase/Manifest +++ b/app-crypt/keybase/Manifest @@ -2,6 +2,7 @@ DIST keybase-1.0.41.tar.gz 31643095 BLAKE2B 72fe94c8996b0dfad3d75f487545d5cb96ff DIST keybase-1.0.44.tar.gz 31729876 BLAKE2B 945700824e630591f7b79dd5e8253156ee8e3ab1349f9ad584311d781cd9c98a5176884aa2fa34ac164af2194941822e56e96d7783843f649a97058edf015670 SHA512 a50c33548745e3c946099105c6926e4b4cd37a96c57d86ca7259b7b864f92a9e2b8823b992d7e367ee93a5832481360d66e170ba59a5cf99296dde20c1538c41 DIST keybase-1.0.48.tar.gz 34026876 BLAKE2B c620a664b47f66932d1b49c22509aac73a6c82d77399019284f2887cdbf5166477ca824fcb2c2099d175fe4a38436c84c15b96a1c4faa4cdda62a9044b95e1c4 SHA512 fac72b7827dff350589e28e0d602b024130bc6bee8dd282dc141db773e493fcd4043aef6ce5382f92e1841619245c5819adf23d6dcf32b409939c275f40a03f1 DIST keybase-2.0.0.tar.gz 34340958 BLAKE2B fa9bcf2285a987131e00a5bc8b06ad09fa86f3bf3de87cc4e48669131fcf93e2c515435fc1e9d6663455d16744889131d09b5957fa5f78f9d3ecc91d10667bc1 SHA512 d7b91c9a0ef69442501956ba3a09f40490adf76ef38bf945617793a8238daee68f3fc2be7a5d2118531c2364f5604016ec241226a22bd217dbab3dafbf77fd25 +DIST keybase-2.1.0.tar.gz 34444571 BLAKE2B 834f1001b136461c5665f12530d660e619d93c8b4e4b5f0c96da94af23f0667c778d7ddabc65d0585ac472cd91f89240bc4260b2034bf20c26b4047839570299 SHA512 0d71a22b5f56442fdc03848f831487da097dc817bfcacfb5a8eea1a9a13e87d231619216b6bab61862de71289373977c4c8d345518152137c8804005bf20e3e4 EBUILD keybase-1.0.41-r1.ebuild 1406 BLAKE2B 98696edcda23f847bbae3bafba3746cab2ca20b63b097b9609fbe89f563d23273039cc0851314d28df3367f002392cfd27dbb0a47a6fb2770e6f3618f1761924 SHA512 8b2c29ff8ebc3c942c1d9bcf0a14b45381853ad72593a18f0c92123e2d915c62ab4b92ed61f121c9c23f0397d966423eb2b2fa2636f591f6cf73a5b490b2c1ce EBUILD keybase-1.0.41-r2.ebuild 1410 BLAKE2B e5b26e70ba64cec09589f277189035526d3ac4e7125515aaf849b068718108e2307f5c4dccfdbe122695de46ae03865224ed44dd72480882912b71afaa4e3c4d SHA512 e5b394c14fa27db7def0bcfa9c42e0d33a0414a24beb902f0379e9b902ba104d8dc2583ebf0d349849e7390f2f9de82e48f6ebad401bbf6c5c9a23b5b66ae391 EBUILD keybase-1.0.41.ebuild 959 BLAKE2B f94747768552a47f9ca7f9d786d6933caa3fb8df52e183cea08f953cc5e611e94e16bcf107d086a0c625ae888e907d583cd43af1147da5ab0d46eaafd148fb75 SHA512 6c8f0f09c879583bda20b6a693fee84d7ac8434d01c2e60131bf85ceec27eea91874870543b5c1b26e133ef7afd0e7f185ed582b4d49ff669cfa2cc1e0f76db7 @@ -9,5 +10,6 @@ EBUILD keybase-1.0.44-r1.ebuild 1601 BLAKE2B 37f326eb08651557328e0bc111255228abf EBUILD keybase-1.0.44.ebuild 1594 BLAKE2B 45c65cd0f7b749d8d07a06426b6ab9d7fe16acadeb7b0616b87edc4ebc490f66c6cfe0155ac4d409dc782273a063d144de19fdece9498f9723e03873cc2b95f3 SHA512 b6d0c8ea90998229f934b02b3822565f2368b72f828b6428528fb41649bbd62256e5396171568eadbf2ff9e2887e9322424afa6767889bde316850144b0eaaa3 EBUILD keybase-1.0.48.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287 EBUILD keybase-2.0.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287 -EBUILD keybase-9999.ebuild 1570 BLAKE2B 4c8878853bee91128b71b4d37f7e4d3853a9117f9945e15b60405d99efb0e4abbd10d200170ad96d5d6df4a0c61e1ba59119dead1b62dd5ef25472cb0e5743ff SHA512 d7b401bfa1fbb0eeb65b829bc8c7df2d68c3d3e35513f74685e59d8246b59cbf168e55aa91ce6646c2d78254770e19edc0b0bbc58e036119024a3176c11fe3dd +EBUILD keybase-2.1.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287 +EBUILD keybase-9999.ebuild 1268 BLAKE2B 7c57de5a44a42066ff20ace9720cbf1dbeb2b900794a94b82be66c4becbbfcc0148cd5038de6bb2f412b1dc86c4b23af336b81748e81fcf5069548c9cd9e26d3 SHA512 7b56be4322b630105f093853cb33afd2377b1df1b9ddb75e44579c64b76918940a0576aee4a39df55b49f0307b08144a3418a8835bb2cdcd0d3b868886ca0e3e MISC metadata.xml 465 BLAKE2B a1dcb592edbf2e5a45bd985adea8fa09504f75b17f689f38c415dff3efd0a4c67b3476c8c7568dc2b8351117281c94da4235cb1b9144d1636f04ae3b2055164e SHA512 68da266d0856035ec7f0b2ac5f8746ad6c7afa023ccf2d592be43fbf45f12f1443afdceb075ab57efeeceb97dfcc0a3997ed7177e12ae6291467e97c17e10810 diff --git a/app-crypt/keybase/keybase-2.1.0.ebuild b/app-crypt/keybase/keybase-2.1.0.ebuild new file mode 100644 index 000000000000..af077ef41e52 --- /dev/null +++ b/app-crypt/keybase/keybase-2.1.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit golang-build systemd + +DESCRIPTION="Client for keybase.io" +HOMEPAGE="https://keybase.io/" +SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + ~app-crypt/kbfs-${PV}" +RDEPEND=" + app-crypt/gnupg" + +src_unpack() { + unpack "${P}.tar.gz" + ln -vs "client-${PV}" "${P}" || die + mkdir -vp "${S}/src/github.com/keybase" || die + ln -vs "${S}" "${S}/src/github.com/keybase/client" || die +} + +src_compile() { + EGO_PN="github.com/keybase/client/go/keybase" \ + EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \ + golang-build_src_compile +} + +src_test() { + EGO_PN="github.com/keybase/client/go/keybase" \ + golang-build_src_test +} + +src_install() { + dobin "${T}/keybase" + dobin "${S}/packaging/linux/run_keybase" + systemd_douserunit "${S}/packaging/linux/systemd/keybase.service" + dodir "/opt/keybase" + insinto "/opt/keybase" + doins "${S}/packaging/linux/crypto_squirrel.txt" +} + +pkg_postinst() { + elog "Start/Restart keybase: run_keybase" + elog "Run the service: keybase service" + elog "Run the client: keybase login" + ewarn "Note that the user keybasehelper is obsolete and can be removed" +} diff --git a/app-crypt/keybase/keybase-9999.ebuild b/app-crypt/keybase/keybase-9999.ebuild index 181e16cb154b..e1c48d66de9c 100644 --- a/app-crypt/keybase/keybase-9999.ebuild +++ b/app-crypt/keybase/keybase-9999.ebuild @@ -3,9 +3,7 @@ EAPI=6 -inherit eutils systemd user versionator git-r3 - -MY_PV=$(replace_version_separator 3 '-') +inherit golang-build systemd git-r3 DESCRIPTION="Client for keybase.io" HOMEPAGE="https://keybase.io/" @@ -14,53 +12,43 @@ EGIT_REPO_URI="https://github.com/keybase/client.git" LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="+suid" +IUSE="" DEPEND=" - >=dev-lang/go-1.6:0 - app-crypt/kbfs" + ~app-crypt/kbfs-${PV}" RDEPEND=" app-crypt/gnupg" -S="${WORKDIR}/src/github.com/keybase/client" - -pkg_setup() { - enewuser keybasehelper -} - src_unpack() { git-r3_src_unpack - mkdir -p "$(dirname "${S}")" || die - ln -s "${WORKDIR}/${PN}-${MY_PV}" "${S}" || die + ln -vs "client" "${P}" || die + mkdir -vp "${S}/src/github.com/keybase" || die + ln -vs "${S}" "${S}/src/github.com/keybase/client" || die } src_compile() { - GOPATH="${WORKDIR}:${S}/go/vendor" \ - go build -v -x \ - -tags production \ - -o "${T}/keybase" \ - github.com/keybase/client/go/keybase || die - GOPATH="${WORKDIR}" \ - go build -v -x \ - -tags production \ - -o "${T}/keybase-mount-helper" \ - github.com/keybase/client/go/mounter/keybase-mount-helper || die + EGO_PN="github.com/keybase/client/go/keybase" \ + EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \ + golang-build_src_compile +} + +src_test() { + EGO_PN="github.com/keybase/client/go/keybase" \ + golang-build_src_test } src_install() { dobin "${T}/keybase" - dodir "/var/lib/keybase" - fowners keybasehelper:keybasehelper "/var/lib/keybase" - dosym "/tmp/keybase" "/var/lib/keybase/mount1" - dobin "${T}/keybase-mount-helper" - fowners keybasehelper:keybasehelper "/usr/bin/keybase-mount-helper" - use suid && fperms 4755 "/usr/bin/keybase-mount-helper" dobin "${S}/packaging/linux/run_keybase" systemd_douserunit "${S}/packaging/linux/systemd/keybase.service" + dodir "/opt/keybase" + insinto "/opt/keybase" + doins "${S}/packaging/linux/crypto_squirrel.txt" } pkg_postinst() { - elog "Run the service: keybase service" - elog "Run the client: keybase login" - elog "Restart keybase: run_keybase" + elog "Start/Restart keybase: run_keybase" + elog "Run the service: keybase service" + elog "Run the client: keybase login" + ewarn "Note that the user keybasehelper is obsolete and can be removed" } -- cgit v1.2.3