| 1 |
commit: a20941347bf2d9ff15f182b50f093880361fe6e2 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 14 08:21:43 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 14 08:25:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2094134 |
| 7 |
|
| 8 |
app-emulation/lxd: fix file collision with vendor deps (bug 615444) |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=615444 |
| 11 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 12 |
|
| 13 |
app-emulation/lxd/Manifest | 1 + |
| 14 |
app-emulation/lxd/lxd-2.11.ebuild | 22 +++++++++++++++++++++- |
| 15 |
2 files changed, 22 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest |
| 18 |
index dba7edb0899..67814337f99 100644 |
| 19 |
--- a/app-emulation/lxd/Manifest |
| 20 |
+++ b/app-emulation/lxd/Manifest |
| 21 |
@@ -1,2 +1,3 @@ |
| 22 |
+DIST go-flags-460c7bb0abd6e927f2767cadc91aa6ef776a98b4.tar.gz 54792 SHA256 382dbeca4e436aa1717c9a413fc53197eb3f94fbbb0b2ba3b0d1a405c9262504 SHA512 d8c748a2617d0997ad69d64530289dc53a310381ba101b942d3e7df04ef9fd79e1d26879c485cb6e8e5c710f42411dbe5b4b157cfd36a511a19c88d336f34fea WHIRLPOOL fb23a71928c1d3d1cdbb1fecaadfed843b986d2f76a9ca57b171d80051f81a886ec7d8b292b0e054d69ed9e2fd55c1f544767332334655cd01a6c83633d6e711 |
| 23 |
DIST lxd-2.11.tar.bz2 2407968 SHA256 829643811a711c8e3c118274d517091b4fbd4701b760e46d7f53fcc4d356455d SHA512 8269a20e0c0c0f3a3a247af15fcda3aa764cd2353d8a7aa9183646dbf19a080ce09bf31ff91a9faca3eda494460a788deabdb145a59c2aa1861f2df89c43294b WHIRLPOOL ba12b4c41969e17b5f9beaa7908ca7be18d3ce35ae27c762a556fe6d59f48962cf0ccaecc512887d40338e6e26ccdc2cdf6c89d87fd1b2028fb5e04f3a74b639 |
| 24 |
DIST lxd-2.8.tar.bz2 2317466 SHA256 57f08bd3c26ea4f32453aa163b502301ae0a80716d6de56b069eeebb35850011 SHA512 fdf906add25ab0b79ea7669ad569873a256f0cfc220ed816b0dc2c9b1e525a19e2606678d90d50c4f548b4322a2896d4c12069337f9571a9a4f6646fb6f673a5 WHIRLPOOL 049f3664e60e8f6fd98c8403db31db6e1dd5f6efed2e74b9007f9f99a4b337e9f58852253d226fc294c4bc964dd6d5d732a8a386606f206a74d83a32470dc1d3 |
| 25 |
|
| 26 |
diff --git a/app-emulation/lxd/lxd-2.11.ebuild b/app-emulation/lxd/lxd-2.11.ebuild |
| 27 |
index b211ffbcaf0..16dace1d2ba 100644 |
| 28 |
--- a/app-emulation/lxd/lxd-2.11.ebuild |
| 29 |
+++ b/app-emulation/lxd/lxd-2.11.ebuild |
| 30 |
@@ -7,6 +7,7 @@ DESCRIPTION="Fast, dense and secure container management" |
| 31 |
HOMEPAGE="https://linuxcontainers.org/lxd/introduction/" |
| 32 |
EGO_PN_PARENT="github.com/lxc" |
| 33 |
EGO_PN="${EGO_PN_PARENT}/lxd" |
| 34 |
+GO_FLAGS_COMMIT="460c7bb0abd6e927f2767cadc91aa6ef776a98b4" |
| 35 |
|
| 36 |
# The source is repackaged using a script at: |
| 37 |
# https://dev.gentoo.org/~stasibear/lxd_repackage.py |
| 38 |
@@ -16,7 +17,9 @@ EGO_PN="${EGO_PN_PARENT}/lxd" |
| 39 |
# and anyway portage requires that fetching is only done from SRC_URI. |
| 40 |
# The only sane alternative I've seen is in the consul ebuild, which |
| 41 |
# is more transparent but raises other questions. |
| 42 |
-SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2" |
| 43 |
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2 |
| 44 |
+ https://github.com/jessevdk/go-flags/archive/${GO_FLAGS_COMMIT}.tar.gz -> |
| 45 |
+ go-flags-${GO_FLAGS_COMMIT}.tar.gz" |
| 46 |
|
| 47 |
LICENSE="Apache-2.0" |
| 48 |
SLOT="0" |
| 49 |
@@ -106,6 +109,23 @@ src_prepare() { |
| 50 |
|
| 51 |
# Warn on unhandled locale changes |
| 52 |
l10n_find_plocales_changes po "" .po |
| 53 |
+ |
| 54 |
+ mkdir -p "${S}/src/${EGO_PN}/vendor/github.com/jessevdk" |
| 55 |
+ mv "${WORKDIR}/go-flags-${GO_FLAGS_COMMIT}" \ |
| 56 |
+ "${S}/src/${EGO_PN}/vendor/github.com/jessevdk/go-flags" || \ |
| 57 |
+ die "Failed to move go-flags" |
| 58 |
+ |
| 59 |
+ # gopkg.in/lxc/go-lxc.v2/examples/clone.go:17: too many errors |
| 60 |
+ rm -rf "${S}/src/gopkg.in/lxc/go-lxc.v2/examples" || die |
| 61 |
+ |
| 62 |
+ while read -r -d ''; do |
| 63 |
+ [[ -d ${REPLY} ]] || continue # parent moved already |
| 64 |
+ [[ ${REPLY} =~ ^${S}/src/${EGO_PN%/*}(/|$) ]] && continue |
| 65 |
+ mkdir -p "$(dirname "${S}/src/${EGO_PN}/vendor/${REPLY#${S}/src}")" |
| 66 |
+ mv "${REPLY}" "${S}/src/${EGO_PN}/vendor/${REPLY#${S}/src}" || \ |
| 67 |
+ die "Failed to move ${REPLY##*/}" |
| 68 |
+ done < <(find "${S}/src" -mindepth 2 -maxdepth 3 -type d -print0) |
| 69 |
+ find "${S}/src" -maxdepth 3 -type d -empty -delete |
| 70 |
} |
| 71 |
|
| 72 |
src_compile() { |
Archives