From 91c0ec2d7067f6ab1ef578bd9967b32ca07eb502 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 May 2018 14:00:47 +0100 Subject: gentoo resync : 22.05.2018 --- app-emulation/lxd/Manifest | 3 + .../lxd/files/ja-translation-newline.patch | 11 ++ app-emulation/lxd/lxd-3.1.ebuild | 180 +++++++++++++++++++++ 3 files changed, 194 insertions(+) create mode 100644 app-emulation/lxd/files/ja-translation-newline.patch create mode 100644 app-emulation/lxd/lxd-3.1.ebuild (limited to 'app-emulation/lxd') diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest index d0a868fdfaa1..6ab8fa73df1e 100644 --- a/app-emulation/lxd/Manifest +++ b/app-emulation/lxd/Manifest @@ -1,3 +1,4 @@ +AUX ja-translation-newline.patch 402 BLAKE2B 238fc0f118070b428abf7b7ce72474f3bcbb80ebbe82b78174e105f07b8f29fd0bf77bc29cb3063951c6ac64cfbf8dc04acde620758be2073657ec306c4b3ed2 SHA512 2992d43cd142ed9b5517c84bbff8b77ef0d7d95364223bb9a51cc26a0ee20184a326882ceff59bc0b0b992c71fe3118cbd7b964ec012b73b16636de4fdf78bd4 AUX lxd-dont-go-get.patch 428 BLAKE2B fef476db95d5e3a2730d718b72725e5af86581dc0c25dc8665fdbf6c2914c056224f4f45318eea873f9ecb95ee33b0195f19b1d203fbce3bf8e1b8e7ced13b30 SHA512 eff965ddc918da9bf2bb9293b08a1aad33f1f7a69027767a74f8872a8eb045ef2a002536329c3cbd6730f1710ebb6f5e7e5c284121157e824a1aabef3a0de8b8 AUX lxd.confd 589 BLAKE2B a4ee8e9643f7add254baf2f83900e15029577b69460818640220197af8ad56862c9c96b82d6a0c38bbe7023893a787b3eeda80e64359ed44863e9aa4c61cc07a SHA512 14892b2efa96f4938497a7ea0b7b2b7ab630b287c8444b666d24b4aa4fd7af265d2dcb91b4defdfa0b33da610cdc04dc3c8751f00df9209a7933bf30ea9f0790 AUX lxd.confd.1 538 BLAKE2B f020d83375bddc3e88f752d4be49c65893901893eaa572f212c655f4d3c5631b41238ed917c70f16b4c092d82ced13011edd6e91140cda251ebf8745591cd886 SHA512 9ea61647a8da82bc595f78882adf5a6c71483c7adf8965d7d32016a67a0da6510f8dc3d09fd29f77d5f6d5f18282bca3b3b5c2abffaa67265a4fd4ddb07f31a8 @@ -101,7 +102,9 @@ DIST github.com-syndtr-gocapability-33e07d32887e1e06b7c025f27ce52f62c7990bc0.tar DIST github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz 9899 BLAKE2B 584e75a9c47d28498aedb5c85b3409c79c84ec9fc47a5a9dc77aa117b4e48f681f72a12a03fafa566a405def40b4961bb7343cad0c6ecb3cd9da883a51ed20d6 SHA512 fdd8a3cc1add7570269df6ad8867fd9d2da7bbf751416a5376ff123dcf959be13912b766f5214123e20fabd242a629e02f3bdaf0680782805afb81f6f08a78ae DIST lxd-2.21.tar.gz 882352 BLAKE2B 80542bcc03c05667ee0207dfbfd2bf41c5a6ef69178aec06ad62fe3521ed012ed9b82c68c0254e0299e8e1dfd274a0622f32bde730480a950ab6ba15ddae5f4b SHA512 9a8ec3a97e4c861a80311dbdecbf5a485c0af85d6ba6b20680ca17e6ac877de3f27cfdcf0a111ba0db2b7c562dfe2f41336b562b7c13350c4543505b3c17357e DIST lxd-3.0.0.tar.gz 1152282 BLAKE2B e84808c626064ba6985c08119905510c2a9659edca09887a55bfe006eaba4a624215d48978e18ab642f34e54e58fc1d2e04303c9db73c332df8c5d29568fb779 SHA512 b4de839d26080f2b14b1f6f04a92b000e1abaa0712377528b87ca79e01b9c46b7b6c7f7ce5365f37f7a0ae8a2459bcdc6010fcb2a238d78e34d090750ae070f3 +DIST lxd-3.1.tar.gz 27979442 BLAKE2B 0b74e3f76a7ab835b042b52b469a6fe11e7077d567e0658d13fab2192fd25d99518d65ba319c981a2e4677319e280cccae26f70ef99e9911264dc028ca5628fd SHA512 61f64d08dd80f7f676f386912f4dfc0d0af38cce0287de7865123b9da667b54ab91d22b76ffe03480e04ae0fbd8dc837d7d519d0e34409377c3d7e6624bf636c EBUILD lxd-2.21.ebuild 7883 BLAKE2B f933f15dd551c335bbe7cf95a9dbe35f4b272ff720e7aa080f984705e899e5da47c4e6f0617860896467bcec481a50591f6f3c0f731f1f2ff2df0178aaaf8882 SHA512 27167d7c8a2dc7aa988016cbb90bd3ae272732a709d8938ae3b77ffbacf12b818df27bf1ddaec9c3372403ad1380dcc7b9df6f8bce237742d02fb881b60aa552 EBUILD lxd-3.0.0-r1.ebuild 9946 BLAKE2B 67f3de152205eff10b4aecab6c1aa5f3f47f49909a50eb79b5cf00af694868718187902d7fa8644f4d1cc84301b9caf22975b8e8f382dcb535957fcfb541380a SHA512 9e7004315be3852e57331426f9c0db66304f532e288a9f5e63bc0fba6558168af643d73bd26fc5e48fa6f1d15b2b4ef36e366e0180b3ca3e98016d2e76edb71f EBUILD lxd-3.0.0.ebuild 9944 BLAKE2B 710cb242086f23b7325c535d177322815ccf15d0e17421f4f8d91b525f5bfe2efc730bbcc64e4da93d1de4ca529af50e762dc4eb7c97ac1c3775796de758ac4a SHA512 d94e776eb43cbdf38850fe8d891326de862a4c53d45b65119f90327f7fbba04ba04fe8c6559ef2fccf521ccfb83b54729fc5a79e40a9050242b651e8c3aa151a +EBUILD lxd-3.1.ebuild 5334 BLAKE2B 14511c25eb06a4c72ea07c3f297aaec32c9d1dd78248620c6f8326f1b74fe23bf4b149041ad23381c8d196da2a3872b83da53255c98234263b9de39618bfb739 SHA512 f7e998cbfaa91ce34eda0e1694091a51da236dc5d82e10380f66484c0c1454dd852ad5af605e8280a9f03c30aa35292c88014d9393b5a9a29ce12d24ff1831fb MISC metadata.xml 967 BLAKE2B d30e9eb1d5a4237c34ffc19d6845732dd37aa362db0d5147a8c9b849e4cb72a26d4f937e37b84084740fb9eaadd7a09c7679827b4324efcb316b6453ec2604c6 SHA512 746e4288b187759a05a597ae8ba6f62d1ae43c6682a2a13958b86117f91df68b19306654f339a06e4e7495f72a3dfab218be4e10e1dc92922284150634689f2d diff --git a/app-emulation/lxd/files/ja-translation-newline.patch b/app-emulation/lxd/files/ja-translation-newline.patch new file mode 100644 index 000000000000..bbda24c6f37e --- /dev/null +++ b/app-emulation/lxd/files/ja-translation-newline.patch @@ -0,0 +1,11 @@ +--- /po/ja.po 2018-05-20 19:42:38.932990198 -0500 ++++ /po/ja.po 2018-05-20 19:42:55.839944861 -0500 +@@ -1380,7 +1380,7 @@ + "イメージのエイリアスを一覧表示します\n" + "\n" + "指定するフィルタはイメージのハッシュ値の一部でもイメージのエイリアスの一部で" +-"も構いません。" ++"も構いません。\n" + + #: lxc/image.go:888 + msgid "List images" diff --git a/app-emulation/lxd/lxd-3.1.ebuild b/app-emulation/lxd/lxd-3.1.ebuild new file mode 100644 index 000000000000..7f27f52217fb --- /dev/null +++ b/app-emulation/lxd/lxd-3.1.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Fast, dense and secure container management" +HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" + +LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="+daemon +ipv6 +dnsmasq nls test" + +inherit bash-completion-r1 linux-info systemd user + +SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz" + +DEPEND=" + >=dev-lang/go-1.9.4 + dev-libs/protobuf + nls? ( sys-devel/gettext ) + test? ( + app-misc/jq + net-misc/curl + sys-devel/gettext + ) +" + +RDEPEND=" + daemon? ( + app-arch/xz-utils + >=app-emulation/lxc-2.0.7[seccomp] + dnsmasq? ( + net-dns/dnsmasq[dhcp,ipv6?] + ) + net-misc/rsync[xattr] + sys-apps/iproute2[ipv6?] + sys-fs/squashfs-tools + virtual/acl + ) +" + +CONFIG_CHECK=" + ~BRIDGE + ~DUMMY + ~IP6_NF_NAT + ~IP6_NF_TARGET_MASQUERADE + ~IPV6 + ~IP_NF_NAT + ~IP_NF_TARGET_MASQUERADE + ~MACVLAN + ~NETFILTER_XT_MATCH_COMMENT + ~NET_IPGRE + ~NET_IPGRE_DEMUX + ~NET_IPIP + ~NF_NAT_MASQUERADE_IPV4 + ~NF_NAT_MASQUERADE_IPV6 + ~VXLAN +" + +ERROR_BRIDGE="BRIDGE: needed for network commands" +ERROR_DUMMY="DUMMY: needed for network commands" +ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands" +ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands" +ERROR_IPV6="IPV6: needed for network commands" +ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands" +ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands" +ERROR_MACVLAN="MACVLAN: needed for network commands" +ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands" +ERROR_NET_IPGRE="NET_IPGRE: needed for network commands" +ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands" +ERROR_NET_IPIP="NET_IPIP: needed for network commands" +ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands" +ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands" +ERROR_VXLAN="VXLAN: needed for network commands" + +EGO_PN="github.com/lxc/lxd" + +PATCHES=( + "${FILESDIR}/ja-translation-newline.patch" # https://github.com/lxc/lxd/pull/4572 +) + +# LXD tarball is packaged with a nice "dist" folder containing all dependencies +# that were vendored by upstream at release time. That saves us the trouble of +# vendoring the dependencies ourselves. This is why there was this drastic drop +# in ebuild complexity compared to pre 3.0.0-r2 ebuilds. +src_compile() { + export GOPATH="${S}/dist" + + # We don't use the Makefile here because it builds targets with the + # assumption that `pwd` is in a deep gopath namespace, which we're not. + # It's simpler to manually call "go install" than patching the Makefile. + # + # ABOUT "-tags libsqlite3": we used to link to the system's sqlite3 library + # but since v3.0.0, LXD depends on github.com/CanonicalLtd/dqlite which + # at the time of this writing, depends on patched version of sqlite with + # replication capabilities added. We don't have that patch in dev-db/sqlite. + # Therefore, we let LXD use its own private copy of sqlite. + go install -v -x ${EGO_PN}/lxc || die "Failed to build the client" + + if use daemon; then + go install -v -x ${EGO_PN}/fuidshift || die "Failed to build fuidshift" + go install -v -x ${EGO_PN}/lxd || die "Failed to build the daemon" + fi + + use nls && emake build-mo +} + +src_test() { + if use daemon; then + export GOPATH="${S}/dist" + # This is mostly a copy/paste from the Makefile's "check" rule, but + # patching the Makefile to work in a non "fully-qualified" go namespace + # was more complicated than this modest copy/paste. + # Also: sorry, for now a network connection is needed to run tests. + # Will properly bundle test dependencies later. + go get -v -x github.com/rogpeppe/godeps + go get -v -x github.com/remyoudompheng/go-misc/deadcode + go get -v -x github.com/golang/lint/golint + go test -v ${EGO_PN}/lxd + else + einfo "No tests to run for client-only builds" + fi +} + +src_install() { + local bindir="dist/bin" + dobin ${bindir}/lxc + if use daemon; then + dosbin ${bindir}/lxd + dobin ${bindir}/fuidshift + fi + + if use nls; then + domo po/*.mo + fi + + if use daemon; then + newinitd "${FILESDIR}"/${PN}.initd lxd + newconfd "${FILESDIR}"/${PN}.confd.1 lxd + + systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service + fi + + newbashcomp scripts/bash/lxd-client lxc + + dodoc AUTHORS README.md doc/* +} + +pkg_postinst() { + einfo + einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information," + einfo "including a Quick Start." + + # The messaging below only applies to daemon installs + use daemon || return 0 + + # The control socket will be owned by (and writeable by) this group. + enewgroup lxd + + # Ubuntu also defines an lxd user but it appears unused (the daemon + # must run as root) + + einfo + einfo "Though not strictly required, some features are enabled at run-time" + einfo "when the relevant helper programs are detected:" + einfo "- sys-apps/apparmor" + einfo "- sys-fs/btrfs-progs" + einfo "- sys-fs/lvm2" + einfo "- sys-fs/lxcfs" + einfo "- sys-fs/zfs" + einfo "- sys-process/criu" + einfo + einfo "Since these features can't be disabled at build-time they are" + einfo "not USE-conditional." + einfo + einfo "Networks with bridge.mode=fan are unsupported due to requiring" + einfo "a patched kernel and iproute2." +} -- cgit v1.2.3