From 949fe8e9691e717b6dab344017eb3e82a096c74b Mon Sep 17 00:00:00 2001 From: Erik Mackdanz Date: Wed, 13 Apr 2016 22:47:36 -0500 Subject: app-emulation/lxd: remove old Package-Manager: portage-2.2.28 --- app-emulation/lxd/Manifest | 1 - .../lxd/files/lxd-2.0.0_beta3-dont-go-get.patch | 20 --- .../lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch | 11 -- app-emulation/lxd/files/lxd-2.0.0_beta3.confd | 27 ---- app-emulation/lxd/files/lxd-2.0.0_beta3.initd | 50 ------- app-emulation/lxd/lxd-2.0.0_beta3.ebuild | 162 --------------------- 6 files changed, 271 deletions(-) delete mode 100644 app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch delete mode 100644 app-emulation/lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch delete mode 100644 app-emulation/lxd/files/lxd-2.0.0_beta3.confd delete mode 100644 app-emulation/lxd/files/lxd-2.0.0_beta3.initd delete mode 100644 app-emulation/lxd/lxd-2.0.0_beta3.ebuild (limited to 'app-emulation') diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest index 9007c246af6c..2f42ca7771f7 100644 --- a/app-emulation/lxd/Manifest +++ b/app-emulation/lxd/Manifest @@ -1,4 +1,3 @@ DIST lxd-2.0.0.tar.bz2 2305314 SHA256 da5bab198cff8bee4528f35537221a252b4b2a23d655921aabbf281b0fd2ec6a SHA512 23e791403f81951c9e5227b804fb400d80dde56f17ff71d511be4514943bd4bac7f4ade738294a4a88d9c4f73e4302f6c5b0e22eb245083fb1eeee6e01e207c4 WHIRLPOOL 72b1dc86547a8d0db74eca5e07fd33bf0545c1dbafba894a6316e77d36673fef5b765df68b4d6cd39d2db9a1dacfb757696ec982023aed329e38201aef1a5562 -DIST lxd-2.0.0_beta3.tar.bz2 2283443 SHA256 a3bdf6c081ebed01fcd1ae92a6d3ebf2e7d6ffea606fe3cb83559366e7dc90aa SHA512 3f80c1236ac9a92a350b4221478dd69eb2693672d73859738b691b9462155d0a907de90deab9950980500ab0faa5ec815bc6191cedf2d34d3757757f585570ec WHIRLPOOL 6d425c26ef37bc65871cf08946f0a80e5b9a3e01da5edd07605e94a2b418e6d2163ee90210c4439350000c35a18efa97102dcbab90ccd1577d6164b5b2e271b4 DIST lxd-2.0.0_beta4.tar.bz2 2291955 SHA256 6487750275e21ab3e862ea56807b9fcf28e9a646040e1f50f3967e9f76cf27e5 SHA512 ae67b9098946f037c1c938cc46f141fb8089ae33b980dd55cebc9cc3f14fbcd645e810e185fdc61dacbd6437569d079e4d9bd9763d12fefb65cfcecf13c10b28 WHIRLPOOL 6c781b47b80d044128647567b6de81352b174e2224e9ff91f2e1eacc5dfbb9141e53aa74e9bce479ebee1bb6c691282849897c34f815415623abcf3d666c7033 DIST lxd-2.0.0_rc2.tar.bz2 2306077 SHA256 d74babbd5c537430a574a13c0f70c7633affc9bbd0e21bf0039872bdfb801fe9 SHA512 6a21620e19277293a3b665d4061f5aa9443d1a9a5ab88fa885096ff77acf828b215e247136bb99ea1ba230f015181bc9a86a919664c9288577509a2146a5aa66 WHIRLPOOL f88e0f3b5ecd9803bc8baee864ffbdf33b39f331a5e5ceb170b2792d2e26b6f4faae3a8cc6aae090e81accd3835408f2956a117095bc790ca7c16cd7f21d205e diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch b/app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch deleted file mode 100644 index d2e622ec73b7..000000000000 --- a/app-emulation/lxd/files/lxd-2.0.0_beta3-dont-go-get.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.orig 2016-02-19 00:16:40.720102639 +0000 -+++ Makefile 2016-02-19 00:18:10.886096473 +0000 -@@ -12,17 +12,11 @@ - - .PHONY: default - default: -- # Must run twice due to go get race -- -go get -t -v -d ./... -- -go get -t -v -d ./... - go install -v $(DEBUG) ./... - @echo "LXD built successfully" - - .PHONY: client - client: -- # Must run twice due to go get race -- -go get -t -v -d ./... -- -go get -t -v -d ./... - go install -v $(DEBUG) ./lxc - @echo "LXD client built successfully" - diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch b/app-emulation/lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch deleted file mode 100644 index 7373b66969b7..000000000000 --- a/app-emulation/lxd/files/lxd-2.0.0_beta3-nc-binary-name.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600 -+++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600 -@@ -91,7 +91,7 @@ - * command (i.e. the command to run on --server). However, we're - * hardcoding that at the other end, so we can just ignore it. - */ -- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name()) -+ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name()) - cmd := exec.Command( - "rsync", - "-arvP", diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3.confd b/app-emulation/lxd/files/lxd-2.0.0_beta3.confd deleted file mode 100644 index 3d553276a5e3..000000000000 --- a/app-emulation/lxd/files/lxd-2.0.0_beta3.confd +++ /dev/null @@ -1,27 +0,0 @@ -# Group which owns the shared socket -LXD_OPTIONS+=" --group lxd" - - - -# Enable cpu profiling into the specified file -#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile" - -# Enable memory profiling into the specified file -#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile" - - - -# Enables debug mode -#LXD_OPTIONS+=" --debug" - -# For debugging, print a complete stack trace every n seconds -#LXD_OPTIONS+=" --print-goroutines-every 5" - -# Enables verbose mode -#LXD_OPTIONS+=" -v" - -# Logfile to log to -#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log" - -# Enables syslog logging -#LXD_OPTIONS+=" --syslog" diff --git a/app-emulation/lxd/files/lxd-2.0.0_beta3.initd b/app-emulation/lxd/files/lxd-2.0.0_beta3.initd deleted file mode 100644 index ec23258c19d1..000000000000 --- a/app-emulation/lxd/files/lxd-2.0.0_beta3.initd +++ /dev/null @@ -1,50 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -DAEMON=/usr/sbin/lxd -PIDFILE=/run/lxd.pid - -extra_commands="stopall" - -depend() { - need net - use lxcfs - - # remove with 2.0 release - need cgmanager -} - -start() { - ebegin "Starting lxd server" - - start-stop-daemon --start \ - --pidfile ${PIDFILE} \ - --exec ${DAEMON} \ - --background \ - --make-pidfile \ - -- \ - ${LXD_OPTIONS} - - eend $? -} - -stop() { - if [[ $RC_GOINGDOWN = YES ]] || [[ $RC_REBOOT = YES ]]; then - stopall - else - ebegin "Stopping lxd service (but not containers)" - start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE} - eend $? - fi -} - -stopall() { - ebegin "Stopping lxd service and containers" - if "${DAEMON}" shutdown; then - /etc/init.d/lxd zap - rm -f ${PIDFILE} - fi - eend $? -} diff --git a/app-emulation/lxd/lxd-2.0.0_beta3.ebuild b/app-emulation/lxd/lxd-2.0.0_beta3.ebuild deleted file mode 100644 index f57f3fbc6b42..000000000000 --- a/app-emulation/lxd/lxd-2.0.0_beta3.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DESCRIPTION="Fast, dense and secure container management" -HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" -EGO_PN_PARENT="github.com/lxc" -EGO_PN="${EGO_PN_PARENT}/lxd" -SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -PLOCALES="de fr ja" -IUSE="+daemon nls test" - -# IUSE and PLOCALES must be defined before l10n inherited -inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot - -# The compiler is forced in golang-base: -# DEPEND=">=dev-lang/go-1.4.2:=" -# ... so the dep is omitted here (and I disagree with := in this case) - -DEPEND=" - dev-go/go-crypto - dev-libs/protobuf - dev-vcs/git - nls? ( sys-devel/gettext ) - test? ( - app-misc/jq - dev-db/sqlite - net-misc/curl - sys-devel/gettext - ) -" - -RDEPEND=" - daemon? ( - app-admin/cgmanager - app-arch/xz-utils - app-emulation/lxc[cgmanager,seccomp] - net-analyzer/openbsd-netcat - net-misc/bridge-utils - net-misc/rsync[xattr] - sys-apps/iproute2 - virtual/acl - ) -" - -# KNOWN ISSUES: -# - Translations may not work. I've been unsuccessful in forcing -# localized output. Anyway, upstream (Canonical) doesn't install the -# message files. - -# TODO: -# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would -# be preferable for that support to go into the golang-build eclass not -# this package directly. - -src_prepare() { - cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir" - - epatch "${FILESDIR}/${P}-dont-go-get.patch" - - # Upstream requires the openbsd flavor of netcat (with -U), but - # Gentoo installs that with a renamed binary - epatch "${FILESDIR}/${P}-nc-binary-name.patch" - - tmpgoroot="${T}/goroot" - mkdir -p "$tmpgoroot" || die "Failed to create temporary GOROOT" - cp -sR "$(get_golibdir_gopath)"/* "${tmpgoroot}" || die "Failed to copy files to temporary GOROOT" - - # Warn on unhandled locale changes - l10n_find_plocales_changes po "" .po -} - -src_compile() { - golang-build_src_compile - - cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir" - - tmpgoroot="${T}/goroot" - if use daemon; then - # Build binaries - GOPATH="${S}:${tmpgoroot}" emake - else - # build client tool - GOPATH="${S}:${tmpgoroot}" emake client - fi - - use nls && emake build-mo -} - -src_test() { - if use daemon; then - # Go native tests should succeed - golang-build_src_test - fi -} - -src_install() { - # Installs all src,pkg to /usr/lib/go-gentoo - golang-build_src_install - - cd "${S}" - dobin bin/lxc - use daemon && dosbin bin/lxd - - cd "src/${EGO_PN}" - - if use nls; then - for lingua in ${PLOCALES}; do - if use linguas_${lingua}; then - domo po/${lingua}.mo - fi - done - fi - - if use daemon; then - newinitd "${FILESDIR}"/${P}.initd lxd - newconfd "${FILESDIR}"/${P}.confd lxd - - systemd_dounit "${FILESDIR}"/lxd.service - fi - - newbashcomp config/bash/lxd-client lxc - - dodoc AUTHORS CONTRIBUTING.md README.md - - docinto specs - dodoc specs/* -} - -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." -} -- cgit v1.2.3-65-gdbad