3 files changed, 3 insertions, 43 deletions
diff --git a/app-emulation/docker-swarm/Manifest b/app-emulation/docker-swarm/Manifest
index 19c9b673a1fc..3532201e0275 100644
--- a/app-emulation/docker-swarm/Manifest
+++ b/app-emulation/docker-swarm/Manifest
@@ -1,9 +1,7 @@
-DIST docker-swarm-1.2.0.tar.gz 4474619 BLAKE2B 2a0f6f06b549e8f0319c3c7f0e3a0b756a3c13aeb7cbee519e0c483b4c8831187e47b1eaae918efdce3c9fe3bf7d4da02c5e7d55b6235da5dba7827465b81508 SHA512 dab97d7df9d38c7bc7a1565788c84a13c8c792161d61a904ba9e45f43fbf835d055bd1c1a0f1d2f9b29f9b7fc6ed6fe19aef75b53288188caf82b152d37392ac
 DIST docker-swarm-1.2.5.tar.gz 4619026 BLAKE2B cae94bcb1bbb1f495b18662ac62ad3295d22547b332d6b6c4e55c070650fc3a1c314ef1ef696787b3109c0c5dce3c48979adc85031c0d65834d3d8ff5bd417b3 SHA512 2684c1fbb8e01c062c62137c874825120d0f2da0ca13808c1558ef01680a6f4d77bbff3769d1f59d9bb8011066f202dbb89c23d25597283cc24245db70731992
 DIST gobrake-2.0.8.tar.gz 6392 BLAKE2B ec3eccd5a52442163108c9e8f83e2e7a19ed45438c91e541d75af5cd44f382899098cecc5130c5d36a62ca53f1dc2062a82ec9e04b17e2db835cecdfbaa3b565 SHA512 76d1dfc55ddcbfa0b719d9eb3a75a0c8bc9d2f0308fef391cc59efa7c6b7607860c61c1e77d609d3a2d2cad473da359d0f1df98775a6da791a70d81f98ce5e6c
 DIST gogo-protobuf-0.3.tar.gz 2116795 BLAKE2B 6b90ad97648e75724c69bb9b8d3cfb17b919a1121813c09ec463df99c290c117b0e0b87f43b285eb5147a205f2f926c223cc4b4d58205a286af2afa87dbd7f5b SHA512 57e1b1715d4811800da8cf9f2c72d202deae622d89715d7eff2ff0c406a0ea3778c187443abb17b072ae6fe57382844807f103837032759dab5420c860b99fb8
 DIST logrus-0.11.0.tar.gz 24165 BLAKE2B 5d71a4b78d5c46e71401a08d9b0228236f74e864d14206bd6450268a3a41d5f2ac7155c39f250b9906ec132fa63ace6e8888f0ec482ed4a0828696326bbba25e SHA512 ee0b813e277cef0533800a966e6e07884b8de64e75c200439979f00986d84f98cfc750f7d4cb2a2b57d6524941fbba0c6211ce37da50d9a8ca99274f81639620
 DIST logrus-airbrake-hook-2.1.1.tar.gz 3896 BLAKE2B a41877c8201d39f79fd0fabb7bba8d513c14931ab6a2d59b9dbe5907ce32a67d852f8cd25a2ed058ee95d321e430818d5258b4e047f3b809503da58a96bc8876 SHA512 8559f821731ee086a267f43f6e150e18b24a32a2556c45499b2ec42a85642a0581a862fc827b8b9a1949d003b5e36e69972df92a005111b94e2aa9678c336240
-EBUILD docker-swarm-1.2.0.ebuild 941 BLAKE2B 7ec81166468e0be4cdebeecff453ec3808dd2a9760e139074223d85aec2b0cfa0b96b620e9ebeae26e2b011fd8bb38ae10e98eabffa8b35e2075869104d0ebd1 SHA512 809046fb932178783350cd6cb09327960656dab3b67b10d80941cc9a977561546ea9bfdc05b1f577eebc98a8b84157e568a07220a45a12b8367e4c18a203b593
-EBUILD docker-swarm-1.2.5.ebuild 2139 BLAKE2B 575c2840e4a82292373239962ec22630b1b45d6acae433750e1b4e0f4956693cd52734f38015a9f0b86461be55b58739d70326a60f29734b02d0b7e02f64804f SHA512 ab65af5d107c5153c1f50a41be577d3250384d3b50b2ca1a7626c30a58ae918314e1dfb9f9c5a745c125cad5768a8888d3cc9a0bf97f973bc5b5012dc0b7a8d4
+EBUILD docker-swarm-1.2.5.ebuild 2170 BLAKE2B 5f72fefbe686c03f7f55b2b3ba8776f5f010a728004ff957fb36f6ebcbbe243f036fd04cae8f6c6d34b8c96e1f7f3babe9018b5816602a748eae29d35a063c44 SHA512 3a3fbc32ab43fec5e3443022280ff7765d396ec1d06814f66be3eb446f1761b245aa06ee02fe0193b6728719c8fa7908b30c17e85290feab75f27761eb9bfd5f
 MISC metadata.xml 303 BLAKE2B 876c526defdc7c039b7923f9860e3fef8bfc3c835e4cc8a50e54ae3ae535c53a27fea39f17a3fbe46939a330e16e9534ebd6ec64d3141075694c4010bb858ef4 SHA512 b724e0dbde2212d3071b201aca8572059e0756f3be2a056097c84ea802ae4365a9682767725a02e3333f5f5cbd31f8e30a0a2b54b3e32619d75fbaa8400a9c22
diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild b/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild
deleted file mode 100644
index c0ec9a067395..000000000000
--- a/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGO_PN=github.com/docker/${PN##*-}/...
-
-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="A Docker-native clustering system"
-HOMEPAGE="https://docs.docker.com/swarm"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND=">=dev-lang/go-1.6:=
-	!!<app-admin/consul-0.6.3-r1"
-RDEPEND=""
-S=${WORKDIR}/${P}/src/${EGO_PN%/*}
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}:${S}/Godeps/_workspace:$(get_golibdir_gopath)" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_install() {
-	dobin "${WORKDIR}/${P}/bin/${PN#docker-}"
-	dosym swarm /usr/bin/docker-swarm
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
-}
diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild b/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
index 10d18218802d..95e2cbea5ca8 100644
--- a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
+++ b/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://${EGO_PN%/*}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/Sirupsen/logrus/archive/v0.11.0.tar.gz -> logrus-0.11.0.tar.gz"
 DESCRIPTION="A Docker-native clustering system"
 HOMEPAGE="https://docs.docker.com/swarm"
-LICENSE="Apache-2.0 CC-BY-SA-4.0"
+LICENSE="Apache-2.0 CC-BY-SA-4.0 BSD BSD-2 ISC MIT MPL-2.0 WTFPL-2"
 SLOT="0"
 IUSE=""
 RESTRICT="test"