[gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/, app-emulation/lxd/files/

["Michał Górny" <mgorny@gentoo.org>]

commit:     a067360ff9271f9d5c9903410be044a64b875c50
Author:     Virgil Dupras <hsoft <AT> hardcoded <DOT> net>
AuthorDate: Sat Aug 19 23:42:21 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 08:14:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a067360f

app-emulation/lxd-2.16: Fix broken SRC_URI

My bump to 2.16 had a broken SRC_URI and I didn't notice it because I
already had a local "lxd-2.16.tar.gz" distfile. Moreover, this file
wasn't even the proper one.

This commits fixes the problem, add a missing "zh" locale and removes
a spurious patch.

Bug: https://bugs.gentoo.org/628334
Closes: https://github.com/gentoo/gentoo/pull/5483
Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-emulation/lxd/Manifest                       |  2 +-
 app-emulation/lxd/files/lxd-2.16-fix-fr-po.patch | 11 -----------
 app-emulation/lxd/lxd-2.16.ebuild                |  8 +++-----
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index b3a0db784cc..73605742341 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -43,4 +43,4 @@ DIST github.com-stretchr-testify-f6abca593680b2315d2075e0f5e2a9751e3f431a.tar.gz
 DIST github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz 9899 SHA256 e63800ecdd704541bafcf8788d651a73599cdead61cd5bccedd31418c4fe58bc SHA512 fdd8a3cc1add7570269df6ad8867fd9d2da7bbf751416a5376ff123dcf959be13912b766f5214123e20fabd242a629e02f3bdaf0680782805afb81f6f08a78ae WHIRLPOOL ec73f593f37d28565f9efe9b21d17175353b922e144842666b81163538b5d464dcdb4857897f5c1a4362fb44637490c3994f958498672fc31054539f2b5c64e3
 DIST github.com-syndtr-gocapability-e7cb7fa329f456b3855136a2642b197bad7366ba.tar.gz 9894 SHA256 1c90570f690a5b753633bce84097942021893f180c9d27c0b83f7a1bddaf59d9 SHA512 ee2de5568b76b87723e80e081e16094093f09a6be68dd0920793e007d4b705808ec1eac7a15b4c0ce7ed20aff04978f4ade264ab5bf5bdc5e2fdc46db2f4116c WHIRLPOOL ce1a13e5374248ffccaa613d399447d619ad94156f6ebf198d9e63019bd698496d67770ef520b802c59451ff9ad95d9fd789e8c9f758d1df553e2432c3b29289
 DIST lxd-2.14.tar.gz 629982 SHA256 0ccf98257482458ff417c8af141a1f726fe7e696b7ab8b089ed1ee741280b2b8 SHA512 a1b6d7eb055a29ba3c28f9184e6dbac5f279332a6445347bbf8f946ab23b0afb353ac146b379f22922fe678ce034c18dc9d5d2f2dd7704b8cce1730c29dfa9c3 WHIRLPOOL 3483b15f7e09e8212fa5b646e5fc6be305b48e6cfcad5538ff9a4967820928b3f87931ca38fc4787ecab67216d2c876476880551ce56e3ed0c080a7b769e2823
-DIST lxd-2.16.tar.gz 629982 SHA256 0ccf98257482458ff417c8af141a1f726fe7e696b7ab8b089ed1ee741280b2b8 SHA512 a1b6d7eb055a29ba3c28f9184e6dbac5f279332a6445347bbf8f946ab23b0afb353ac146b379f22922fe678ce034c18dc9d5d2f2dd7704b8cce1730c29dfa9c3 WHIRLPOOL 3483b15f7e09e8212fa5b646e5fc6be305b48e6cfcad5538ff9a4967820928b3f87931ca38fc4787ecab67216d2c876476880551ce56e3ed0c080a7b769e2823
+DIST lxd-2.16.tar.gz 707146 SHA256 16d4b09f132f628dbacaa192c02ae27baf91a20a57e26cfea2a24b5af6077680 SHA512 63a870f3613f3e7e917bd06bc748d143586af543901cd4e2159015cb2f20fdf40ba7f04971d6dee2e8a5afd60fc1476cef29783ab5ec5e531c35360fdf83e70f WHIRLPOOL 74b8cdd09801840d87e81317e03d153afab833fff4b58efaf58c7c49703d447fd42d08892b83ef3f18635bdb61ebac0df1651ca99eb3d98710b032283b941b5f

diff --git a/app-emulation/lxd/files/lxd-2.16-fix-fr-po.patch b/app-emulation/lxd/files/lxd-2.16-fix-fr-po.patch
deleted file mode 100644
index 410efd9987e..00000000000
--- a/app-emulation/lxd/files/lxd-2.16-fix-fr-po.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /src/github.com/lxc/lxd/po/fr.po
-+++ /src/github.com/lxc/lxd/po/fr.po
-@@ -1110,7 +1110,7 @@ msgstr ""
- "Toutes les fonctionnalités de LXD peuvent être utilisées à l'aide des "
- "commandes ci-dessous.\n"
- "Pour de l'aide avec l'une des commandes, simplement les utiliser avec --"
--"help.\n"
-+"help."
- 
- #: lxc/action.go:45
- msgid "Time to wait for the container before killing it"

diff --git a/app-emulation/lxd/lxd-2.16.ebuild b/app-emulation/lxd/lxd-2.16.ebuild
index 28243c918ab..60e19a973a2 100644
--- a/app-emulation/lxd/lxd-2.16.ebuild
+++ b/app-emulation/lxd/lxd-2.16.ebuild
@@ -40,12 +40,13 @@ EGO_VENDOR=(
 	"gopkg.in/yaml.v2 eb3733d160e74a9c7e442f435eb3bea458e1d19f github.com/go-yaml/yaml"
 )
 
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ARCHIVE_URI="https://${EGO_PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-PLOCALES="de el fr it ja nl ru sr sv tr"
+# Portage complains about zh_Hans missing, but repoman doesn't like it when it's there.
+PLOCALES="de el fr it ja nl ru sr sv tr zh"
 IUSE="+daemon nls test"
 
 # IUSE and PLOCALES must be defined before l10n inherited
@@ -114,9 +115,6 @@ ERROR_VXLAN="VXLAN: needed for network commands"
 
 PATCHES=(
 	"${FILESDIR}/${P}-dont-go-get.patch"
-	# See https://github.com/lxc/lxd/pull/3390
-	# (I thought I could remove this for v2.16, but apparently not...)
-	"${FILESDIR}/${P}-fix-fr-po.patch"
 )
 
 # KNOWN ISSUES: