gentoo resync : 29.10.2017

4 files changed, 5 insertions, 93 deletions

diff --git a/app-emulation/docker-machine/Manifest b/app-emulation/docker-machine/Manifest
index e275b82348d1..b13c7b0a4337 100644
--- a/app-emulation/docker-machine/Manifest
+++ b/app-emulation/docker-machine/Manifest
@@ -1,10 +1,6 @@
-DIST docker-machine-0.10.0.tar.gz 1605832 SHA256 ed64698723436e68341a1ebd8486006293eac306bfa8628e924b38bfcb5b039d SHA512 337ed74474b5e55e10ccd7c8bb3b778d06fc2c56c1646678715548ddeb41a0b7320212d498ad96cbdd08137f78013506b569c4e0aa0a2f28169264d64d814f7c WHIRLPOOL 06802376ba23ec1706ad09c784e3ceb70aab439d88523c2845a69a895e9a31911737bbf889f91627caae79e31cf8039265382183f7112987f0de6aea58adf138
-DIST docker-machine-0.12.0.tar.gz 1663612 SHA256 2238dbb8580ca2399c64fa6cda0089a9dde6142d4dcbb8d750aedbeee042fbfe SHA512 5fd27fcae1a44ed45db229342c93b3d53f0c193eaaf95d8f12d6e2be830c14c13154fd9338050f28b52bc0a5f8586bd72b802afc042b8d7f6c4d5dd5bc4c12ac WHIRLPOOL c0e6929447a1c6c582ce5e1aa2a01452661d9e1b9edcd43de75fd3300f200454c7b94196cf38a055befbebceb75decb7a303108ebd19e0512dae56d9ab55b6af
 DIST docker-machine-0.12.2.tar.gz 1725590 SHA256 d8b89fcaa8226bd0ed294630b12740def88c70b1924ca4cc1ea05a19b25c05a3 SHA512 58b2ed13b56034f5bfb8374397aead67c669fc544409932f6c29ca56578ad61b3f584a8f32b281cafac56a9647d6e215ab5138045c2c6810a5d202c68bfdb3b0 WHIRLPOOL 391f7dc350ff45cc8754a1f17162b78879ebd81dee38be83cda4c7f78aaccaecf5917ad55fad6e22e9540401ddb10a355a3f17e91eddf2761686981dbf86dfed
-DIST docker-machine-0.9.0.tar.gz 1603705 SHA256 8e445e70a92c98a5e73594d8aea07b31dda6fa4ed2d1e7643663f0267e05f25f SHA512 f405f4b50e493d8c3e7526e89c8b45edf9167c9c04a1dfc9dafad3070f32a9a38570f02b900ceb322a43c596558c07b8f0b060cc4afe1fe2b6b6f4af0179a779 WHIRLPOOL 39b504327264c6f0ba2268fac2fa03c1b4f5f93c9e347d6f459e4a5f6bbfe773c5c272fb63d10fb272b92aa622e7474679f67200583f10fb5156f3198b0c1adb
-EBUILD docker-machine-0.10.0.ebuild 894 SHA256 c745699ffccabe14062205652b5ad7fa27c0880dbd721779e6dd38904d75693a SHA512 c910c83ddc89c7c6d43a396820a476e405dd0222ef5cd8be7e53d11ca29833ae79ba79bdce20efebf17b22a4957d31446238fd1af00ad4391740b1198d7e9c9c WHIRLPOOL 40803d0a1c8e787548b5d218e28fef63572793c4ac8a3c869e4643e0155ca748222b49dcbaf524b4e201d2b739bc34c3c7f55cd6b69efe7c2cb0ae487d2da4f2
-EBUILD docker-machine-0.12.0.ebuild 894 SHA256 c745699ffccabe14062205652b5ad7fa27c0880dbd721779e6dd38904d75693a SHA512 c910c83ddc89c7c6d43a396820a476e405dd0222ef5cd8be7e53d11ca29833ae79ba79bdce20efebf17b22a4957d31446238fd1af00ad4391740b1198d7e9c9c WHIRLPOOL 40803d0a1c8e787548b5d218e28fef63572793c4ac8a3c869e4643e0155ca748222b49dcbaf524b4e201d2b739bc34c3c7f55cd6b69efe7c2cb0ae487d2da4f2
+DIST docker-machine-0.13.0.tar.gz 1730091 SHA256 f75f6602a6d013a7b2ae517c3bdb07d8977825c1a0506157831fcd2ae083dc25 SHA512 c31b3505e475f5e55310cc3b8805db8b94522703956a640954c3898c584fc3a07830c346535855cbb2fb10016dd0e7ef72e7174e919a3651f05e18b652132121 WHIRLPOOL 336249121f9b15011e4fbf64f11363d57718567927b8eb7b6868f544ee986b037856729925c6477330e9c38b36a2ce62ba8c94917df57fdca4e5af676aec975e
 EBUILD docker-machine-0.12.2.ebuild 904 SHA256 13d14a9bda778fb4edc00ef046e5bf1a7c588fc5696b9d89265427be1f6c3415 SHA512 1d71e0fdeec91958575e92675c16274ad82d196384fdd1276e03baf2dfd31fbe33e9f8a48d44ea3014190fbe053b03b31cd648e9c5a5eee025a43f4923762331 WHIRLPOOL 0289f74c9a9524d097439d03c5d074afdadb76bdddb0b0049c51d119d9f58cae89940cbe66f3332f401306b5bf5e14c29b20c9ee32d0f44f5adeb24e6bffbcaf
-EBUILD docker-machine-0.9.0.ebuild 904 SHA256 a2a4b9bd8ac1d6ec92287183e99fe1fc0a61bd06568b3b2da4fee6e60210d0ab SHA512 d841664501488d4c4a2fa2e98b663f5865466e44b57ce8803b091890346b3a63c4e8f0fa5be896958b97f9667003aa72bec3ccb82359069bade29213059ba618 WHIRLPOOL 168b71378b86e44f446498c1c7940279d9146852407ac99d159c9e606ce509e2acb2d7fe9427ea853496f75d54ef4a2e24fc238738bf0ac82e8b8f196845f0bf
+EBUILD docker-machine-0.13.0.ebuild 904 SHA256 13d14a9bda778fb4edc00ef046e5bf1a7c588fc5696b9d89265427be1f6c3415 SHA512 1d71e0fdeec91958575e92675c16274ad82d196384fdd1276e03baf2dfd31fbe33e9f8a48d44ea3014190fbe053b03b31cd648e9c5a5eee025a43f4923762331 WHIRLPOOL 0289f74c9a9524d097439d03c5d074afdadb76bdddb0b0049c51d119d9f58cae89940cbe66f3332f401306b5bf5e14c29b20c9ee32d0f44f5adeb24e6bffbcaf
 MISC ChangeLog 2295 SHA256 8d8a25fef31e53e0f66327f9d37540ee994eb0e69c4be866fc5771716c5af2bf SHA512 c04992c741e57a7fb39740e4c0afd5ecee13969c5490ad16f01a5a342f686596cbe796eb9f410c1d1d14f03008175a760aa89c9ae61fd41a403870c2423169fc WHIRLPOOL 55be5950c7f3ca6f4178f0a830ca43528db9f715255266a4c934b778a81351eb2791aa6a17e8e5e0e5d678b368f931051a0507a8ed8d13b314c6ea0cd6b189b5
 MISC metadata.xml 305 SHA256 ac57e0fbfac5cd756815724694163bb9c0a422772f12329e001958b853d1d2d2 SHA512 9d29b2f3f29ec6838395364bd85b38f0e54fc3a89f79041d5ddd492ef999018cff92e5ef6e6bcb5bc32cd7f57059531d10fd3ac5a5481da1fb1218081916a8bc WHIRLPOOL 193898fcd0e44d119c24769c82dcd6a6388436abc8aa4d25f87fcddf08e5a1e6644f474b4eb97ae15d123f21bc15bc17e88565c1d4946c8b9419e7568da4fcc7
diff --git a/app-emulation/docker-machine/docker-machine-0.12.0.ebuild b/app-emulation/docker-machine/docker-machine-0.12.0.ebuild
deleted file mode 100644
index 9a9deea991e6..000000000000
--- a/app-emulation/docker-machine/docker-machine-0.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN=github.com/docker/machine
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Machine management for a container-centric world"
-HOMEPAGE="https://docs.docker.com/machine/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND=">=dev-lang/go-1.7:="
-RDEPEND=""
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-src_prepare() {
-	eapply_user
-	# don't pre-strip binaries
-	sed -e 's|\(GO_LDFLAGS := $(GO_LDFLAGS) -w\) -s|\1|' -i mk/main.mk ||die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" emake build || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
-}
diff --git a/app-emulation/docker-machine/docker-machine-0.10.0.ebuild b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
index 9a9deea991e6..1697e3defa68 100644
--- a/app-emulation/docker-machine/docker-machine-0.10.0.ebuild
+++ b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
@@ -19,20 +19,18 @@ DESCRIPTION="Machine management for a container-centric world"
 HOMEPAGE="https://docs.docker.com/machine/"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
+IUSE="hardened"
 RESTRICT="test"
-DEPEND=">=dev-lang/go-1.7:="
-RDEPEND=""
 S=${WORKDIR}/${P}/src/${EGO_PN}
 
 src_prepare() {
-	eapply_user
+	default
 	# don't pre-strip binaries
 	sed -e 's|\(GO_LDFLAGS := $(GO_LDFLAGS) -w\) -s|\1|' -i mk/main.mk ||die
 }
 
 src_compile() {
-	GOPATH="${WORKDIR}/${P}" emake build || die
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" emake build || die
 }
 
 src_install() {
diff --git a/app-emulation/docker-machine/docker-machine-0.9.0.ebuild b/app-emulation/docker-machine/docker-machine-0.9.0.ebuild
deleted file mode 100644
index 42b0669e9d18..000000000000
--- a/app-emulation/docker-machine/docker-machine-0.9.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN=github.com/docker/machine/...
-
-if [[ ${PV} = *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="Machine management for a container-centric world"
-HOMEPAGE="https://docs.docker.com/machine/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND=">=dev-lang/go-1.7:="
-RDEPEND=""
-S=${WORKDIR}/${P}/src/${EGO_PN%/*}
-
-src_prepare() {
-	eapply_user
-	# don't pre-strip binaries
-	sed -e 's|\(GO_LDFLAGS := $(GO_LDFLAGS) -w\) -s|\1|' -i mk/main.mk ||die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" emake build || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
-}