drop old wrt #548884
authorKacper Kowalik <xarthisius@gentoo.org>
Fri, 8 May 2015 17:28:03 +0000 (17:28 +0000)
committerKacper Kowalik <xarthisius@gentoo.org>
Fri, 8 May 2015 17:28:03 +0000 (17:28 +0000)
Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

app-emulation/docker/ChangeLog
app-emulation/docker/Manifest
app-emulation/docker/docker-1.5.0.ebuild [deleted file]

index 8e9de6aeb99a3cf842e26c6d52a8824953806c91..e05500af4ac4fc63484f67c4ccead4288a4c0975 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/docker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.45 2015/05/08 17:26:21 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.46 2015/05/08 17:27:58 xarthisius Exp $
+
+  08 May 2015; Kacper Kowalik <xarthisius@gentoo.org> -docker-1.5.0.ebuild:
+  drop old wrt #548884
 
 *docker-1.6.1 (08 May 2015)
 
index 172482ab8e7b0fb413ef8e7ab056c705c85f0be5..3dff11dc7170cc9ea4d87bba6eb424e2bca7b611 100644 (file)
@@ -4,26 +4,24 @@ Hash: SHA256
 AUX docker-r2.confd 581 SHA256 94e1c07b09701f3b0b1c4f6f917206da3b32f8d7e961c3850c4391ebd59df0b4 SHA512 5838270ff9ce7b9a562b2449ba5f4ad72db956dd03f6a1b006c8019ff43fea1c4ae1e2a4818fb092b6096cff6bd9ce539b05b7940412c55b3bb3e30c356da944 WHIRLPOOL a8e3759b6c86855afa7e784d50a7926fc888d50ec03dc2d9dcd70c3f2dd11caf6670196d91f383cab1d603f32a968bed4b3a0668ec1a38d41dc1142ec92235cc
 AUX docker-r2.initd 1767 SHA256 0cb83137cf3d37aadf450dd30ec9e0ceca3d865867f7fe64a43a1d5f42d2ecf8 SHA512 1250f8b16ded27877cf2759fca1d69f37ce308d4d5e5a29438210e847894617fa088260b0cfd87e1ee65ed26a4293d98c79462c1ccc93aac14203fbfed4b69a2 WHIRLPOOL 272f04feb587a0f91079f41ad90868f99c28a21a5ec35876f38dbbd342a53796dd4ec822fa2cd3506f22485b6a0147d24da2e7ab89da7875f84e3e9fab50c3c8
 AUX docker.service 249 SHA256 ddf23c8bd07303a87f7e76881b14c023c54835feba575998d6f5a9a7ec8a0a0a SHA512 d7564489486b3547cb79057fa44cb3eb0aa6c50ec47eca12579748170d62ab435395d173fdf39fcec8e86f4778db7413b7fa0ab85dbbd2fc1636164d4aad8b37 WHIRLPOOL 553f8a93a5d7cb6cc037a2004e19efa06520eba363e12574a5d251d10b23d9f24d1a023eb9915968a9bb661bddb577163948fb180a85ca9c916cac5c6680b1df
-DIST docker-1.5.0.tar.gz 6459415 SHA256 cf97a1b3a75a63d3b7cb743b5376a1b1bc00eac651dce9e3f094202901a43c48 SHA512 cc620570c67454bedfae73de86b722a845fce4b0bd46446d1190ae98917010db54fbf82951167ebf62358e53dedb45fff2a7f25014c79b42efc2a5f2b611b4d9 WHIRLPOOL acb62b6c1b354212cf250b60227c5dbedc7fe6c6e729fc887653b776a991cd13650c643e20abf06a4326412cb10a1b4e2a20bac0a1fbc056b8d2cf2d54d1fcd0
 DIST docker-1.6.1.tar.gz 5713944 SHA256 aa3534277d11b32bc3564b801aeed0502f067317e7e111bd91ce2d989d34c51e SHA512 d2647f191fd295c8a9326e11ddbf6e77f33b70f14e3ebd37db3c9fa1f4946e0e3f426078ee847f52d7c57fc7783d26afe3e5d2e7ff17d8e6bb4f71609e8f5ef2 WHIRLPOOL e12c799ef63a0646f7393b00b6c1e200f350f7089445c58819ae5b53d66d18d985cb9f8fde1cd3ecfa55c2f0186064fc7080b7ebba132404aa15502029881602
-EBUILD docker-1.5.0.ebuild 6822 SHA256 19f5e21476163342094b3de4571c6cb04e9cb5a6759cbcf7fa5b69055a34e977 SHA512 5629aa2ae6402a75fcd94278e1e107c6ce529db7764d8bfd3e9f4f656b0e59f3901769b9ca4126e2ce822d9b3b73cf217a39c7bd302b3b7f21288804525e611e WHIRLPOOL ddb1cdaff5c6393434b129df788e4df9062e43a22904dea89dfa72a68af889ec9071b062c97ae7bd758e111774afca181418e5e7c306b07efb1d6ba872cf115c
 EBUILD docker-1.6.1.ebuild 7037 SHA256 30ec6658d6e919af06245eb246ce78ff705864276ee13e27c7575ddca5919f74 SHA512 1f9b2e51ab3e0f324caedce55a91ba10d1fb0b966b17d12db088d96fe7db911de21029cdc59870c95c4a8e3c4d43378b26be485604f38ae31bf3545e30a2fde1 WHIRLPOOL 1d1675fa48cf8eeed05e862bf606ce544bd71f618233be559028c1dac8abb7fb6558d336466ac7ca0784d65ff3b96c7188d19a93c6e53abee948e6c8d2f15a55
-MISC ChangeLog 7486 SHA256 c8be44c98407802b7b70a67bb092a46bf4e2bac21dfe7cd526da34bfc3599036 SHA512 8eff26f305b635055bdc516a473743b6e483560d653eeec4a82c8ae35f8c3ec9e75e286140dd8d90c6c869ad878e53829378999f2fa5ce54375c577b469e093a WHIRLPOOL cfaa11803666e21f8a1a59611739d6641f5335a24ec5aee7d82b6a539ed8f8fb0b94e2f101fed307bf93e1b251336ca1d7a1ecb25f300ea1623402c600fffc3d
+MISC ChangeLog 7586 SHA256 ac813f260882476fdbb96b43eea3ec505e7db81e855c3b247c615068d8b798db SHA512 55dd6800ac0b3bb10373061a4bde6b818130b1a6a811d19723ce4c73195d8e0fceee3dd99578ec816fa6d431d2e8a0409d03e720fdc451267ba9ed1c91538c0e WHIRLPOOL 31ba8ee7b0afb8b5c473a357d344e07cdecb6d632322bb8a0b89e98a4599295e0a9a121200a6d672f64e57b90faa0d33eac535066c600529f485f92037302a50
 MISC metadata.xml 1404 SHA256 47b10fac828cc7c80f752c786452104d924bee553c0e6f95e8de5de585ef832d SHA512 e88b6183842f53cec880671f2c9785b1690917f4214f13f521747cc968f6be9cad0a5b09ca36705b69a168b8c4db4271f754c345f4042f5baccbd249e80eaed1 WHIRLPOOL 8c9dc0c496e788fed2fcffb826cbadbd8d4646fcfff5e807dc0946b360b15a833fbdb4d2bf45cd54e771d783ddd747f4ded575ee2e3e99998da774505e39e596
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVTPHCAAoJEF0huFKJUZL5eJwP/0Al1rGoXEq1noym4JPcfmiR
-LRTddx0OWm8neKGVafOKiQ7xD2Yk7eX5/GtBJm1hGh+hVBk+KmuukKRf/6IC/iau
-dn88dgC06WBJ1L36613jE7JJRgFObhwyKO19m1B98sLkWya3SeM92EtThvQXhmCT
-D+XSbtaBuucb3qFGrC12ZLv4/CX7DitfnsH7anPZ3JzJrSO5O7mAGqCQ8n1QGNBm
-agv9KHr22V1677ewX0V/pFw1AfgJDwl+jG3sHlBFNElHztqL2EgXXj50ZnJvUPnH
-DsSm9GHgY92xfxWSk7NEroNZUgxVQDKty0NiRWS8zuFSekzHaHfzniHdaYnOt1jl
-rTbqmt32vUs5x4AReJqw7pzpFYlayNVLb8pZxmLDfIsrJPTuSopZz3SPWB8GjXil
-MT9yEHeb1ky3LrfDRdmuhY40Tuv89B8xmCrZuOuI1APvAGSunbrvEhz1SWTpRvDx
-kNlyVOeOyoKNzoUCgiOpjykn+NxW9WmpJQscPxfDOv6ugMDN9hOfHIQl2sOUXtnK
-pdPMR80o45PyazF7MJLJAOrKX7Z2Y0KrO7d9E1L6nlxiuMn1/SOserMq00+Te4Fq
-XV1SiRf42xzEfj8g7EQvAxZ2bsXdmzQdGFpbffd7BfE6TLl75MTWCRju2cMCw3eH
-vH1YJMim8AzpjMm7YA1G
-=T+S7
+iQIcBAEBCAAGBQJVTPIfAAoJEF0huFKJUZL5kNIQAJDX2LvLsZL1iSIX+Yg7v1to
+8OQUzVUJL899wrZpsi89lpbGxPUiZQO6/bjsPYoXo+15Aobzxln1mHKF0y89vTg4
+ixnurxTIMQ87bA7rBKVhPvnnDHzAvyFgUDU8pk90U792nYJ8yEgTKWLKcLu4cFyn
+pUjwm3wTPVCIpGIeG3itnb4rHsL33nS6BqNS5fWbGRs5upPNDelUGsX5VKxEO59m
+DSaUMq9yMCid0sHwKfgG3R3oLkTcgiMV8LOytYSXSEAbY5gu384iF40Pa4z5uCeU
+GC6S0/Yi8Tq1sYzKYrQrp1Bk2HJt9sDUJSMfY2FeerW2DtXwrMlVHOwTkco/sm4T
+ztyNvTobryibHnoLBLq/7aVX+eYifghub8gWNvd1WAl+1qtXZLTe3I7iOMddeVne
+mLxM5BuQBLnw1U66KE3bZGEXu/wieiE/Wtk4ZxD0+7s0ploqwY1JcBPj0EvCwfCS
+Fi7cdDOPzje6rMoM3feRo785UpdMhoU6j0lQzIe4Wq/fxMrRGqz05qb0OvvaclSL
+wDJCfgZXUabob7tsLkszA0njezfMP7ts/QNsmICZy1LxbQC789QBudZdw9I35XuF
+azcpvIyDaJEIEcLpPP+7/ApQXtgosBblwNN3ivdsaSuPI3jUjTB2/vMVuDHXCbpK
+p0nuDJansVkVqx+vYA9f
+=hJr8
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/docker/docker-1.5.0.ebuild b/app-emulation/docker/docker-1.5.0.ebuild
deleted file mode 100644 (file)
index 825a067..0000000
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.5.0.ebuild,v 1.4 2015/03/14 02:47:43 xarthisius Exp $
-
-EAPI=5
-
-DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
-HOMEPAGE="https://www.docker.com"
-
-GITHUB_URI="github.com/docker/docker"
-
-if [[ ${PV} == *9999 ]]; then
-       SRC_URI=""
-       EGIT_REPO_URI="git://${GITHUB_URI}.git"
-       inherit git-2
-else
-       MY_PV="${PV/_/-}"
-       MY_P="${PN}-${MY_PV}"
-       SRC_URI="https://${GITHUB_URI}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-       S="${WORKDIR}/${MY_P}"
-       DOCKER_GITCOMMIT="a8a31ef"
-       KEYWORDS="~amd64"
-       [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-fi
-
-inherit bash-completion-r1 linux-info multilib systemd udev user
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="aufs btrfs +contrib +device-mapper doc lxc overlay vim-syntax zsh-completion"
-
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
-CDEPEND="
-       >=dev-db/sqlite-3.7.9:3
-       device-mapper? (
-               >=sys-fs/lvm2-2.02.89[thin]
-       )
-"
-
-DEPEND="
-       ${CDEPEND}
-       >=dev-lang/go-1.3
-       btrfs? (
-               >=sys-fs/btrfs-progs-3.16.1
-       )
-"
-
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
-RDEPEND="
-       ${CDEPEND}
-
-       !app-emulation/docker-bin
-       >=net-firewall/iptables-1.4
-       sys-process/procps
-       >=dev-vcs/git-1.7
-       >=app-arch/xz-utils-4.9
-
-       lxc? (
-               >=app-emulation/lxc-1.0.7
-       )
-       aufs? (
-               || (
-                       sys-fs/aufs3
-                       sys-kernel/aufs-sources
-               )
-       )
-"
-
-RESTRICT="installsources strip"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-       ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-       ~DEVPTS_MULTIPLE_INSTANCES
-       ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER CGROUP_SCHED CPUSETS
-       ~MACVLAN ~VETH ~BRIDGE
-       ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-       ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
-       ~NF_NAT ~NF_NAT_NEEDED
-
-       ~MEMCG_SWAP
-       ~RESOURCE_COUNTERS
-       ~CGROUP_PERF
-"
-
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-
-pkg_setup() {
-       if kernel_is lt 3 8; then
-               eerror ""
-               eerror "Using Docker with kernels older than 3.8 is unstable and unsupported."
-               eerror " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
-               die 'Kernel is too old - need 3.8 or above'
-       fi
-
-       # for where these kernel versions come from, see:
-       # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
-       if ! {
-               kernel_is ge 3 16 \
-               || { kernel_is 3 15 && kernel_is ge 3 15 5; } \
-               || { kernel_is 3 14 && kernel_is ge 3 14 12; } \
-               || { kernel_is 3 12 && kernel_is ge 3 12 25; }
-       }; then
-               ewarn ""
-               ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
-               ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
-               ewarn ""
-               ewarn "See also https://github.com/docker/docker/issues/2960"
-       fi
-
-       if use aufs; then
-               CONFIG_CHECK+="
-                       ~AUFS_FS
-               "
-               # TODO there must be a way to detect "sys-kernel/aufs-sources" so we don't warn "sys-fs/aufs3" users about this
-               # an even better solution would be to check if the current kernel sources include CONFIG_AUFS_FS as an option, but that sounds hairy and error-prone
-               ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used"
-       fi
-
-       if use btrfs; then
-               CONFIG_CHECK+="
-                       ~BTRFS_FS
-               "
-       fi
-
-       if use device-mapper; then
-               CONFIG_CHECK+="
-                       ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS
-               "
-       fi
-
-       if use overlay; then
-               CONFIG_CHECK+="
-                       ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
-               "
-       fi
-
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       # allow user patches (use sparingly - upstream won't support them)
-       epatch_user
-}
-
-src_compile() {
-       # if we treat them right, Docker's build scripts will set up a
-       # reasonable GOPATH for us
-       export AUTO_GOPATH=1
-
-       # setup CFLAGS and LDFLAGS for separate build target
-       # see https://github.com/tianon/docker-overlay/pull/10
-       export CGO_CFLAGS="-I${ROOT}/usr/include"
-       export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-       # if we're building from a zip, we need the GITCOMMIT value
-       [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
-       if gcc-specs-pie; then
-               sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die
-               grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-
-               sed -i 's/LDFLAGS_STATIC_DOCKER="/LDFLAGS_STATIC_DOCKER="-extldflags -fno-PIC /' hack/make/dynbinary || die
-               grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
-       fi
-
-       # let's set up some optional features :)
-       export DOCKER_BUILDTAGS=''
-       for gd in aufs btrfs device-mapper overlay; do
-               if ! use $gd; then
-                       DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-               fi
-       done
-
-       # time to build!
-       ./hack/make.sh dynbinary || die 'dynbinary failed'
-
-       # TODO get go-md2man and then include the man pages using docs/man/md2man-all.sh
-}
-
-src_install() {
-       VERSION=$(cat VERSION)
-       newbin bundles/$VERSION/dynbinary/docker-$VERSION docker
-       exeinto /usr/libexec/docker
-       newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit
-
-       newinitd contrib/init/openrc/docker.initd docker
-       newconfd contrib/init/openrc/docker.confd docker
-
-       systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-       udev_dorules contrib/udev/*.rules
-
-       dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-       if use doc; then
-               # TODO doman contrib/man/man*/*
-
-               docompress -x /usr/share/doc/${PF}/md
-               docinto md
-               dodoc -r docs/sources/*
-       fi
-
-       dobashcomp contrib/completion/bash/*
-
-       if use zsh-completion; then
-               insinto /usr/share/zsh/site-functions
-               doins contrib/completion/zsh/*
-       fi
-
-       if use vim-syntax; then
-               insinto /usr/share/vim/vimfiles
-               doins -r contrib/syntax/vim/ftdetect
-               doins -r contrib/syntax/vim/syntax
-       fi
-
-       if use contrib; then
-               mkdir -p "${D}/usr/share/${PN}/contrib"
-               cp -R contrib/* "${D}/usr/share/${PN}/contrib"
-       fi
-}
-
-pkg_postinst() {
-       udev_reload
-
-       elog ""
-       elog "To use Docker, the Docker daemon must be running as root. To automatically"
-       elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-       elog "  rc-update add docker default"
-       elog "Similarly for systemd:"
-       elog "  systemctl enable docker.service"
-       elog ""
-
-       # create docker group if the code checking for it in /etc/group exists
-       enewgroup docker
-
-       elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-       elog "  usermod -aG docker youruser"
-       elog ""
-}