gentoo resync : 15.12.2019

4 files changed, 11 insertions, 60 deletions

diff --git a/app-emulation/reg/Manifest b/app-emulation/reg/Manifest
index ce08f301286f..3ce4b0121f34 100644
--- a/app-emulation/reg/Manifest
+++ b/app-emulation/reg/Manifest
@@ -1,9 +1,7 @@
 AUX reg-0.16.0-config.patch 8488 BLAKE2B d1c60fe817ef722f522ecd7503a7000b065c01853a01c22c2c37b1c0d10f8062c73636b40565f65de885e8fb583d318230e0c0ed8ca8f958f48369d14595089d SHA512 05a30d6cd08ff823be993cba4089d2290f6f58272c50f79ed3d84c915cdf5154789f9f809e4225b39397eab16052d1a5f002e43794d992184bc9528c2d378ccf
 AUX reg.confd 68 BLAKE2B 90fbc7677653b2e1389a0a0dd4c06f8a108fc70f6ae8d53fb94a5ef4669296679cf0f15bf985594837b0d455206f1b928df8a65596e81c0c717c5908c1987b0c SHA512 c0e7e68e8fd09cd46af3a01dc3507ef55dc25016b00e425e673734c864f05c63fcf3dc10b7ca987f166b33cfbfea62ca6c3458b73e28d3683d5bc81cbda84c4e
 AUX reg.initd 595 BLAKE2B 36a5fd61c46810c1924c86c00392348e0907501f896114c3c523daebfd110e5ea292d4087fc4a41ba91ccd952c1c6b27fe1b1db60364575352a9eb9e4b207258 SHA512 96919a0d2f29631c4296bcf8adfb78d63f5d732ed350491f7df14f45744c945559110454a0c24726962da7519dd790a37a6c6a2e0d3586599dc7231743fbe03a
-DIST github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz 60814 BLAKE2B a77b7d72e2937af71a0734c21bee7a1d7770157c27f1ddfa164c66fd5461f86a2ef46e002087092ef011caae572838bcc9537a8290cd54dfafb7f54423e47c48 SHA512 184a0e658a4eac3b867533cd0e494bd84db94fbe10e8df0d0b755c7ffc95bc99e2f84c0157183ca74cdc79289a85dcf7f1dea8a4c89a253565baf473b3627eae
-DIST reg-0.16.0.tar.gz 2991496 BLAKE2B e94a53c79ff062013e091d4c558870ef5c25af181cba201a44fa38b9dfe8816d6f3fd581f4e9a3dafe5b3753a3755c31f8b2f4a347da134a969fc93ac296897c SHA512 1e4d936e406998ffaa176e7834b28970b594f88a339fd8447bef2f944efa9b51c1d35bf71b384b3ed1b3e84be08db6d7fd487f4a3c65aa2de0308d6128cf0070
-DIST reg-0.16.0_p20190102.tar.gz 2994965 BLAKE2B c7cb8a0eaa1599a5464b7a98c3df0b146dbbfea884260b7c8cbf5393a9384c8875e38ea4e45c5f888c65b9bb8c326cf9934d9b3c32a4809fe8e3b23239e8f2a8 SHA512 90e92c15b7ca4f2a5f943cb80096af0eba50acd7691963609c25f15a6795f886843776180754ab7d28477f1fc3a4b8d916bc9ac99b768368471b31564d14769c
-EBUILD reg-0.16.0.ebuild 1126 BLAKE2B b061bda221d78e6104a5c8a00bc347d37f0d3b7462c1ece2bbaf07c3ad5fc6780a03523ffb745f3a642039dfaa6f8ee8d4320dc4f69280303769cfbd1fd960bd SHA512 9853a61cb5025252a2f08279775f79c3848b104fffb5201efd314fc4ecacbbf10ce5700f3d497caba3025c644c43094ea92daeca16dbcacab2d126b9c619e327
-EBUILD reg-0.16.0_p20190102.ebuild 1326 BLAKE2B a973bfe6b7348f5cc314933204ed2cc418b957e2cd2364aea78065cd1c014d41bfbeb9483abbd1ac2a3ebce56ce89e12bc13f19a1cf1ac3a21503517303e5265 SHA512 44711363dccbef18a9638147f63098dab41edcc77f46b43ba96e29d7ab4f31bd756495677a4ee6731b271fbfad2011527184ce05ab42c63a4a595cb3cb3caeff
-MISC metadata.xml 326 BLAKE2B 82f2440e792104c0c9e1afe4d95b9972efc7b233524637e32f11c2b5746aba7990d88f01a542e25f7a5c9c52aac0c5c1e25bc5703d3e855ea8e8ef4ffe87929c SHA512 9fea1224db7eb9316eff5bd89ebf748cbf35160516b33a9c9a3a07d1db6a2fa64dafcf8623a24af09429f7b76cc94ee02a39145162d0b039cb9d0137bc51a20e
+DIST github.com-go-yaml-yaml-eb3733d160e7.tar.gz 64789 BLAKE2B a59db73ba751c932695913770550e115d46df28c4cff402325cf5324c97069e3acccb9faf39826a5da416f8c5b0cc69377cef41a6b1451afa82c7ae8bd620544 SHA512 9e34c34c907d1177e072eb5f3b421b8a3af0e68b490508691d745cdcf1145d9bcfd2592d909a4b05e7f12bfb62355d49861f6d2e1bd29b69cf026ef631965289
+DIST reg-0.16.1.tar.gz 3163977 BLAKE2B b161200e7b96b26054e121853bafb4751865de1146f07fa48418a6624beeebd10eb8fcde1af90f9dd3c20ffd8d5807a106d012bf996944c96b5ff841b0079fb4 SHA512 77fbd543de6e94c504e98a0364895b19099e3cde55a85a4413730de58de8e84f50889fdcfaffa1c76ae412a603ed6d5f4b1d57566ec814cf88df70278e91aee6
+EBUILD reg-0.16.1.ebuild 1363 BLAKE2B 6ed76524b8f00b8669886f214f2cb702e93b89cf1d44db5373e7ff60830c1dd94e1a26ef95711cae8958a7a2ded0e1ce4b9638aa03fb22ba082a695961d6c080 SHA512 d31c2dcc3d1e1b1f1ddfc1563c49441670602a2ed345ffa78b0e7a3e1edc98ca1b04cc1c77395724704bf5331189e99683564176937df5cf8d98fffcd0e43f9f
+MISC metadata.xml 329 BLAKE2B c53497eb2cc3ce8f9cd548466b4e56ae194a02627065820c352d21b22a3fd746b930f11acda0b91f292e7bb29b6efcf2ed8ae4f50866fa518cac3ab8f8d94c5b SHA512 d4967fea58279c7c8efde8d4dada48c6cf3db21c417d741f72d3f777dedb7734ba6284a112534efa8d7a6374ab2a3013e33a759da27a91675c9b9f88c19cc8e3
diff --git a/app-emulation/reg/metadata.xml b/app-emulation/reg/metadata.xml
index e08ad1ff9a01..7496d961803e 100644
--- a/app-emulation/reg/metadata.xml
+++ b/app-emulation/reg/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">genuinetools/reg</remote-id>
diff --git a/app-emulation/reg/reg-0.16.0.ebuild b/app-emulation/reg/reg-0.16.0.ebuild
deleted file mode 100644
index 2268e22b2171..000000000000
--- a/app-emulation/reg/reg-0.16.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot user
-
-EGO_PN="github.com/genuinetools/reg"
-GIT_COMMIT="4a4d0e5d108ca9558879bdf1aba94d09e921cf1e"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Docker registry v2 command line client"
-HOMEPAGE="https://github.com/genuinetools/reg"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup reg
-	enewuser reg -1 -1 /var/lib/reg reg
-}
-
-src_prepare() {
-	pushd src/${EGO_PN} || die
-	default
-	popd || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc src/${EGO_PN}/README.md
-	insinto /var/lib/${PN}
-	doins -r src/${EGO_PN}/server/*
-	newinitd "${FILESDIR}"/reg.initd reg
-	newconfd "${FILESDIR}"/reg.confd reg
-
-	keepdir /var/log/reg
-	fowners -R reg:reg /var/log/reg /var/lib/reg/static
-}
diff --git a/app-emulation/reg/reg-0.16.0_p20190102.ebuild b/app-emulation/reg/reg-0.16.1.ebuild
index e1be9fc0449f..bfd5ac25d064 100644
--- a/app-emulation/reg/reg-0.16.0_p20190102.ebuild
+++ b/app-emulation/reg/reg-0.16.1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=6
 
-EGO_VENDOR=( "gopkg.in/yaml.v2 a3f3340b5840cee44f372bddb5880fcbc419b46a github.com/go-yaml/yaml" )
+EGO_VENDOR=( "gopkg.in/yaml.v2 eb3733d160e7 github.com/go-yaml/yaml" )
 
 inherit golang-build golang-vcs-snapshot user
 
 EGO_PN="github.com/genuinetools/reg"
-GIT_COMMIT="d959057b30da67d5f162790f9d5b5160686901fd"
+GIT_COMMIT="4203e559f331009df04a3ca47820989c6c43e138"
 ARCHIVE_URI="https://${EGO_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 KEYWORDS="~amd64"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
 DESCRIPTION="Docker registry v2 command line client"
 HOMEPAGE="https://github.com/genuinetools/reg"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
+LICENSE="MIT Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC"
 SLOT="0"
 IUSE=""
 
@@ -35,8 +35,9 @@ src_prepare() {
 }
 
 src_compile() {
+	export -n GOCACHE GOPATH XDG_CACHE_HOME
 	pushd src/${EGO_PN} || die
-	GOPATH="${S}" GO111MODULE=on go build -mod=vendor -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
+	GO111MODULE=on go build -mod=vendor -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
 	popd || die
 }