gentoo resync : 22.12.2021

8 files changed, 0 insertions, 512 deletions

diff --git a/app-emulation/docker-registry/Manifest b/app-emulation/docker-registry/Manifest
deleted file mode 100644
index b3f8073448e4..000000000000
--- a/app-emulation/docker-registry/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX docker-registry-2.7.0-notification-metrics.patch 15565 BLAKE2B 31d3bc9d40c07939aca340d0c9bb516eb5afb9191f5d5d7c92b85f9f6dc8e1d86b659df337565eb09a0d08558ee50e1301734fcfa0449a920fcb332c00452c1a SHA512 a2161e5d2638f5682d70d900aba86cba3ca61ae99f7e325a5691c2cc4e5408f4a543c6204a05c19748494f1145e8468cf27e359ffad624fdac1e710974654e2c
-AUX registry.confd 85 BLAKE2B 0997c1ad7ee8fc165a87cfebeea75694487c8d8b62130fb19fd4d9c55cc605754537deaea6e114a9fb28e46eb67bb6ab9d01de0971163acf22f223ca8ec84605 SHA512 7cbd19f545b659e2d295938b320710ae20b3c2222fcb6668216985c6e55bf51647041dec1c33ab7271e464f13001d8095fef9240d3390cff7e65028d3432c4f4
-AUX registry.initd 606 BLAKE2B ed8af2651d91be13578edb561c067cfd3e72dfe42a6111be8930d61f233248b7364659a8db5a9800eaa167d76a8b2daf9d121970622de235e61fa0f10ad85174 SHA512 af7780264d068adcd0d6a6768b88ab43c26081b71d1ebd591ca6d175e413cdeee935a6f50d9833775690f0b47daadcc33286f86fb5eb98d2e674b225122aabce
-AUX registry.logrotated 89 BLAKE2B c16fab4c6a3c4fd9f48370ae30505408a49e07c2a7ea7fc119717efcd840ad489c92855e27a5546219b3cdeb257642eb65abc2d544859295688925ae2e94ecb3 SHA512 f824b33a1fa38802a8aa79599843b0ea065603799823352e9515c50bfc61c43a03e9eb5327f9c687b8c3864fc633ad1a46bff9e91f4c54a46a09e67d2f6f833b
-AUX registry.service 323 BLAKE2B 1be481d08a283793d10ef870fc299e1c284087878e67ec54f44e662c616127bc411fdde19659cf7acd69787054c624c5c5206434c36b4e5a0fcceaf79c2e78f0 SHA512 67d2b69c1fc497774e3171628fa73b9b9521e19c76414e32721994f2ba614bd3c6896c578c9d9b8af0ad4972b9da0c504ef787a7585a550be4bfe1bd40eafc15
-DIST docker-registry-2.7.1.tar.gz 1996699 BLAKE2B 2e22db69f476be5a4688f5b3d6b41fbbf71460351543ae849f707dd5b3d56624f674815a25214002886b057f0859f75fd197bb275a7b3cc8a7787422f716ad0e SHA512 f6baf0e7aa96ebe828c628f7dfd84ee899331c3c1bdab86662aef595b092702b6d9b2c9be766a6de6d153ff4ca55d85c5fd8785a0968f285f56a32a50092c754
-EBUILD docker-registry-2.7.1-r1.ebuild 1463 BLAKE2B 21bbb8b8842540b479e22f7b7e5ce6c2c0f4f4c5ac37a64718c87c6abdef2a550b97ed495d35360d92d9545fe003656366713b27eff9b217859f83aaf834d48c SHA512 da38b17318bc05a0de3980dc1e4815dee8b459dab435993ac2b94c75a1fecfbbcd855c04809627e5d08b477a8bfe381425bdb9f85c6ff5558316e44b65fed80b
-MISC metadata.xml 311 BLAKE2B 16d2abf82e5ae5b180aa81a3d5e1f0f7f638b30d9a5053443af8d512d8094d5923d0a74f58cdc77d6c209128669eaadde427ff50309d37fa275b643887d0df70 SHA512 b574810da841eb8b0f9e48a1f013e7e3705097f2ea6f9a255e57d8ce2800f1b507b5cdbdcf0ffedc339227f8dac9d37fb2ae4bb39cd91895f82674f246a432e3
diff --git a/app-emulation/docker-registry/docker-registry-2.7.1-r1.ebuild b/app-emulation/docker-registry/docker-registry-2.7.1-r1.ebuild
deleted file mode 100644
index 78708f327413..000000000000
--- a/app-emulation/docker-registry/docker-registry-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-vcs-snapshot systemd
-
-EGIT_COMMIT="2461543d988979529609e8cb6fca9ca190dc48da"
-EGO_PN="github.com/docker/distribution"
-
-DESCRIPTION="Docker Registry 2.0"
-HOMEPAGE="https://github.com/docker/distribution"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-DEPEND="
-	acct-group/registry
-	acct-user/registry
-"
-RDEPEND="${DEPEND}"
-
-SVCNAME="registry"
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN} || die
-	eapply "${FILESDIR}"/${PN}-2.7.0-notification-metrics.patch
-	sed -e "s/git describe.*/echo ${PV})/" \
-		-e "s/git rev-parse.*/echo ${EGIT_COMMIT})/" \
-		-e "s/-s -w/-w/" \
-		-i Makefile || die
-	popd || die
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #681072
-	GOPATH="${S}" GO_BUILD_FLAGS="-v" emake -C src/${EGO_PN} binaries
-}
-
-src_install() {
-	exeinto /usr/libexec/${PN}
-	doexe src/${EGO_PN}/bin/*
-	insinto /etc/docker/registry
-	newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
-	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
-	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
-	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
-	keepdir /var/log/${SVCNAME}
-	fowners ${SVCNAME}:${SVCNAME} /var/log/${SVCNAME}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
-}
diff --git a/app-emulation/docker-registry/files/docker-registry-2.7.0-notification-metrics.patch b/app-emulation/docker-registry/files/docker-registry-2.7.0-notification-metrics.patch
deleted file mode 100644
index 8adf364ce164..000000000000
--- a/app-emulation/docker-registry/files/docker-registry-2.7.0-notification-metrics.patch
+++ /dev/null
@@ -1,398 +0,0 @@
-From 7b2292ee20c5d49053cc5262dfbc99ce121b9b74 Mon Sep 17 00:00:00 2001
-From: tifayuki <tifayuki@gmail.com>
-Date: Tue, 13 Feb 2018 13:30:56 -0800
-Subject: [PATCH 1/4] Add notification metrics
-
-It adds notification related prometheus metrics, including:
-  - total count for events/success/failure/error
-  - total count for notification per each status code
-  - gauge of the pending notification queue
-
-Signed-off-by: tifayuki <tifayuki@gmail.com>
----
- metrics/prometheus.go    |  3 +++
- notifications/metrics.go | 28 ++++++++++++++++++++++++++++
- 2 files changed, 31 insertions(+)
-
-diff --git a/metrics/prometheus.go b/metrics/prometheus.go
-index b5a532144..91b32b23d 100644
---- a/metrics/prometheus.go
-+++ b/metrics/prometheus.go
-@@ -10,4 +10,7 @@ const (
- var (
- 	// StorageNamespace is the prometheus namespace of blob/cache related operations
- 	StorageNamespace = metrics.NewNamespace(NamespacePrefix, "storage", nil)
-+
-+	// NotificationsNamespace is the prometheus namespace of notification related metrics
-+	NotificationsNamespace = metrics.NewNamespace(NamespacePrefix, "notifications", nil)
- )
-diff --git a/notifications/metrics.go b/notifications/metrics.go
-index a20af1687..69960e9cb 100644
---- a/notifications/metrics.go
-+++ b/notifications/metrics.go
-@@ -5,6 +5,18 @@ import (
- 	"fmt"
- 	"net/http"
- 	"sync"
-+
-+	prometheus "github.com/docker/distribution/metrics"
-+	"github.com/docker/go-metrics"
-+)
-+
-+var (
-+	// eventsCounter counts total events of incoming, success, failure, and errors
-+	eventsCounter = prometheus.NotificationsNamespace.NewLabeledCounter("events", "The number of total events", "type")
-+	// pendingGauge measures the pending queue size
-+	pendingGauge = prometheus.NotificationsNamespace.NewGauge("pending", "The gauge of pending events in queue", metrics.Total)
-+	// statusCounter counts the total notification call per each status code
-+	statusCounter = prometheus.NotificationsNamespace.NewLabeledCounter("status", "The number of status code", "code")
- )
- 
- // EndpointMetrics track various actions taken by the endpoint, typically by
-@@ -61,6 +73,9 @@ func (emsl *endpointMetricsHTTPStatusListener) success(status int, events ...Eve
- 	defer emsl.safeMetrics.Unlock()
- 	emsl.Statuses[fmt.Sprintf("%d %s", status, http.StatusText(status))] += len(events)
- 	emsl.Successes += len(events)
-+
-+	statusCounter.WithValues(fmt.Sprintf("%d %s", status, http.StatusText(status))).Inc(1)
-+	eventsCounter.WithValues("Successes").Inc(1)
- }
- 
- func (emsl *endpointMetricsHTTPStatusListener) failure(status int, events ...Event) {
-@@ -68,12 +83,17 @@ func (emsl *endpointMetricsHTTPStatusListener) failure(status int, events ...Eve
- 	defer emsl.safeMetrics.Unlock()
- 	emsl.Statuses[fmt.Sprintf("%d %s", status, http.StatusText(status))] += len(events)
- 	emsl.Failures += len(events)
-+
-+	statusCounter.WithValues(fmt.Sprintf("%d %s", status, http.StatusText(status))).Inc(1)
-+	eventsCounter.WithValues("Failures").Inc(1)
- }
- 
- func (emsl *endpointMetricsHTTPStatusListener) err(err error, events ...Event) {
- 	emsl.safeMetrics.Lock()
- 	defer emsl.safeMetrics.Unlock()
- 	emsl.Errors += len(events)
-+
-+	eventsCounter.WithValues("Errors").Inc(1)
- }
- 
- // endpointMetricsEventQueueListener maintains the incoming events counter and
-@@ -87,12 +107,17 @@ func (eqc *endpointMetricsEventQueueListener) ingress(events ...Event) {
- 	defer eqc.Unlock()
- 	eqc.Events += len(events)
- 	eqc.Pending += len(events)
-+
-+	eventsCounter.WithValues("Events").Inc()
-+	pendingGauge.Inc(1)
- }
- 
- func (eqc *endpointMetricsEventQueueListener) egress(events ...Event) {
- 	eqc.Lock()
- 	defer eqc.Unlock()
- 	eqc.Pending -= len(events)
-+
-+	pendingGauge.Dec(1)
- }
- 
- // endpoints is global registry of endpoints used to report metrics to expvar
-@@ -149,4 +174,7 @@ func init() {
- 	}))
- 
- 	registry.(*expvar.Map).Set("notifications", &notifications)
-+
-+	// register prometheus metrics
-+	metrics.Register(prometheus.NotificationsNamespace)
- }
-
-From 4497e40eda1e0024f055c09ab480b7816a1147b1 Mon Sep 17 00:00:00 2001
-From: Honglin Feng <tifayuki@gmail.com>
-Date: Thu, 11 Oct 2018 21:39:02 +0800
-Subject: [PATCH 2/4] add label to the metrics
-
-Signed-off-by: Honglin Feng <tifayuki@gmail.com>
----
- notifications/endpoint.go   |  2 +-
- notifications/http_test.go  |  2 +-
- notifications/metrics.go    | 26 ++++++++++++++------------
- notifications/sinks_test.go |  2 +-
- 4 files changed, 17 insertions(+), 15 deletions(-)
-
-diff --git a/notifications/endpoint.go b/notifications/endpoint.go
-index a8a52d0c9..854f1dd6c 100644
---- a/notifications/endpoint.go
-+++ b/notifications/endpoint.go
-@@ -58,7 +58,7 @@ func NewEndpoint(name, url string, config EndpointConfig) *Endpoint {
- 	endpoint.url = url
- 	endpoint.EndpointConfig = config
- 	endpoint.defaults()
--	endpoint.metrics = newSafeMetrics()
-+	endpoint.metrics = newSafeMetrics(name)
- 
- 	// Configures the inmemory queue, retry, http pipeline.
- 	endpoint.Sink = newHTTPSink(
-diff --git a/notifications/http_test.go b/notifications/http_test.go
-index de47f789e..b7845cf95 100644
---- a/notifications/http_test.go
-+++ b/notifications/http_test.go
-@@ -63,7 +63,7 @@ func TestHTTPSink(t *testing.T) {
- 	})
- 	server := httptest.NewTLSServer(serverHandler)
- 
--	metrics := newSafeMetrics()
-+	metrics := newSafeMetrics("")
- 	sink := newHTTPSink(server.URL, 0, nil, nil,
- 		&endpointMetricsHTTPStatusListener{safeMetrics: metrics})
- 
-diff --git a/notifications/metrics.go b/notifications/metrics.go
-index 69960e9cb..4464edd8f 100644
---- a/notifications/metrics.go
-+++ b/notifications/metrics.go
-@@ -12,11 +12,11 @@ import (
- 
- var (
- 	// eventsCounter counts total events of incoming, success, failure, and errors
--	eventsCounter = prometheus.NotificationsNamespace.NewLabeledCounter("events", "The number of total events", "type")
-+	eventsCounter = prometheus.NotificationsNamespace.NewLabeledCounter("events", "The number of total events", "type", "to")
- 	// pendingGauge measures the pending queue size
--	pendingGauge = prometheus.NotificationsNamespace.NewGauge("pending", "The gauge of pending events in queue", metrics.Total)
-+	pendingGauge = prometheus.NotificationsNamespace.NewLabeledGauge("pending", "The gauge of pending events in queue", metrics.Total, "to")
- 	// statusCounter counts the total notification call per each status code
--	statusCounter = prometheus.NotificationsNamespace.NewLabeledCounter("status", "The number of status code", "code")
-+	statusCounter = prometheus.NotificationsNamespace.NewLabeledCounter("status", "The number of status code", "code", "to")
- )
- 
- // EndpointMetrics track various actions taken by the endpoint, typically by
-@@ -34,14 +34,16 @@ type EndpointMetrics struct {
- // safeMetrics guards the metrics implementation with a lock and provides a
- // safe update function.
- type safeMetrics struct {
-+	EndpointName string
- 	EndpointMetrics
- 	sync.Mutex // protects statuses map
- }
- 
- // newSafeMetrics returns safeMetrics with map allocated.
--func newSafeMetrics() *safeMetrics {
-+func newSafeMetrics(name string) *safeMetrics {
- 	var sm safeMetrics
- 	sm.Statuses = make(map[string]int)
-+	sm.EndpointName = name
- 	return &sm
- }
- 
-@@ -74,8 +76,8 @@ func (emsl *endpointMetricsHTTPStatusListener) success(status int, events ...Eve
- 	emsl.Statuses[fmt.Sprintf("%d %s", status, http.StatusText(status))] += len(events)
- 	emsl.Successes += len(events)
- 
--	statusCounter.WithValues(fmt.Sprintf("%d %s", status, http.StatusText(status))).Inc(1)
--	eventsCounter.WithValues("Successes").Inc(1)
-+	statusCounter.WithValues(fmt.Sprintf("%d %s", status, http.StatusText(status)), emsl.EndpointName).Inc(1)
-+	eventsCounter.WithValues("Successes", emsl.EndpointName).Inc(1)
- }
- 
- func (emsl *endpointMetricsHTTPStatusListener) failure(status int, events ...Event) {
-@@ -84,8 +86,8 @@ func (emsl *endpointMetricsHTTPStatusListener) failure(status int, events ...Eve
- 	emsl.Statuses[fmt.Sprintf("%d %s", status, http.StatusText(status))] += len(events)
- 	emsl.Failures += len(events)
- 
--	statusCounter.WithValues(fmt.Sprintf("%d %s", status, http.StatusText(status))).Inc(1)
--	eventsCounter.WithValues("Failures").Inc(1)
-+	statusCounter.WithValues(fmt.Sprintf("%d %s", status, http.StatusText(status)), emsl.EndpointName).Inc(1)
-+	eventsCounter.WithValues("Failures", emsl.EndpointName).Inc(1)
- }
- 
- func (emsl *endpointMetricsHTTPStatusListener) err(err error, events ...Event) {
-@@ -93,7 +95,7 @@ func (emsl *endpointMetricsHTTPStatusListener) err(err error, events ...Event) {
- 	defer emsl.safeMetrics.Unlock()
- 	emsl.Errors += len(events)
- 
--	eventsCounter.WithValues("Errors").Inc(1)
-+	eventsCounter.WithValues("Errors", emsl.EndpointName).Inc(1)
- }
- 
- // endpointMetricsEventQueueListener maintains the incoming events counter and
-@@ -108,8 +110,8 @@ func (eqc *endpointMetricsEventQueueListener) ingress(events ...Event) {
- 	eqc.Events += len(events)
- 	eqc.Pending += len(events)
- 
--	eventsCounter.WithValues("Events").Inc()
--	pendingGauge.Inc(1)
-+	eventsCounter.WithValues("Events", eqc.EndpointName).Inc()
-+	pendingGauge.WithValues(eqc.EndpointName).Inc(1)
- }
- 
- func (eqc *endpointMetricsEventQueueListener) egress(events ...Event) {
-@@ -117,7 +119,7 @@ func (eqc *endpointMetricsEventQueueListener) egress(events ...Event) {
- 	defer eqc.Unlock()
- 	eqc.Pending -= len(events)
- 
--	pendingGauge.Dec(1)
-+	pendingGauge.WithValues(eqc.EndpointName).Dec(1)
- }
- 
- // endpoints is global registry of endpoints used to report metrics to expvar
-diff --git a/notifications/sinks_test.go b/notifications/sinks_test.go
-index 06f88b2c9..4a69486b5 100644
---- a/notifications/sinks_test.go
-+++ b/notifications/sinks_test.go
-@@ -66,7 +66,7 @@ func TestBroadcaster(t *testing.T) {
- func TestEventQueue(t *testing.T) {
- 	const nevents = 1000
- 	var ts testSink
--	metrics := newSafeMetrics()
-+	metrics := newSafeMetrics("")
- 	eq := newEventQueue(
- 		// delayed sync simulates destination slower than channel comms
- 		&delayedSink{
-
-From 73e4232b5171c2988b0daeea517aa07386e7945d Mon Sep 17 00:00:00 2001
-From: Honglin Feng <tifayuki@gmail.com>
-Date: Mon, 15 Oct 2018 19:50:38 +0800
-Subject: [PATCH 3/4] run go fmt
-
-Signed-off-by: Honglin Feng <tifayuki@gmail.com>
----
- registry/storage/driver/s3-aws/s3.go     | 10 +++++-----
- registry/storage/linkedblobstore.go      | 16 ++++++++--------
- registry/storage/linkedblobstore_test.go |  4 ++--
- 3 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/registry/storage/driver/s3-aws/s3.go b/registry/storage/driver/s3-aws/s3.go
-index 800435d01..9cd87dbab 100644
---- a/registry/storage/driver/s3-aws/s3.go
-+++ b/registry/storage/driver/s3-aws/s3.go
-@@ -476,11 +476,11 @@ func New(params DriverParameters) (*Driver, error) {
- 	// }
- 
- 	d := &driver{
--		S3:                          s3obj,
--		Bucket:                      params.Bucket,
--		ChunkSize:                   params.ChunkSize,
--		Encrypt:                     params.Encrypt,
--		KeyID:                       params.KeyID,
-+		S3:        s3obj,
-+		Bucket:    params.Bucket,
-+		ChunkSize: params.ChunkSize,
-+		Encrypt:   params.Encrypt,
-+		KeyID:     params.KeyID,
- 		MultipartCopyChunkSize:      params.MultipartCopyChunkSize,
- 		MultipartCopyMaxConcurrency: params.MultipartCopyMaxConcurrency,
- 		MultipartCopyThresholdSize:  params.MultipartCopyThresholdSize,
-diff --git a/registry/storage/linkedblobstore.go b/registry/storage/linkedblobstore.go
-index de591c8a5..3fb1da26f 100644
---- a/registry/storage/linkedblobstore.go
-+++ b/registry/storage/linkedblobstore.go
-@@ -312,14 +312,14 @@ func (lbs *linkedBlobStore) newBlobUpload(ctx context.Context, uuid, path string
- 	}
- 
- 	bw := &blobWriter{
--		ctx:                    ctx,
--		blobStore:              lbs,
--		id:                     uuid,
--		startedAt:              startedAt,
--		digester:               digest.Canonical.Digester(),
--		fileWriter:             fw,
--		driver:                 lbs.driver,
--		path:                   path,
-+		ctx:        ctx,
-+		blobStore:  lbs,
-+		id:         uuid,
-+		startedAt:  startedAt,
-+		digester:   digest.Canonical.Digester(),
-+		fileWriter: fw,
-+		driver:     lbs.driver,
-+		path:       path,
- 		resumableDigestEnabled: lbs.resumableDigestEnabled,
- 	}
- 
-diff --git a/registry/storage/linkedblobstore_test.go b/registry/storage/linkedblobstore_test.go
-index e0ffd2796..85376f715 100644
---- a/registry/storage/linkedblobstore_test.go
-+++ b/registry/storage/linkedblobstore_test.go
-@@ -162,8 +162,8 @@ type mockBlobDescriptorServiceFactory struct {
- func (f *mockBlobDescriptorServiceFactory) BlobAccessController(svc distribution.BlobDescriptorService) distribution.BlobDescriptorService {
- 	return &mockBlobDescriptorService{
- 		BlobDescriptorService: svc,
--		t:                     f.t,
--		stats:                 f.stats,
-+		t:     f.t,
-+		stats: f.stats,
- 	}
- }
- 
-
-From 5c66b577b027e3b314680f245be4213a002fcee0 Mon Sep 17 00:00:00 2001
-From: Honglin Feng <tifayuki@gmail.com>
-Date: Mon, 15 Oct 2018 20:18:36 +0800
-Subject: [PATCH 4/4] run go fmt and goimports
-
-Signed-off-by: Honglin Feng <tifayuki@gmail.com>
----
- registry/storage/driver/s3-aws/s3.go     | 10 +++++-----
- registry/storage/linkedblobstore.go      | 16 ++++++++--------
- registry/storage/linkedblobstore_test.go |  4 ++--
- 3 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/registry/storage/driver/s3-aws/s3.go b/registry/storage/driver/s3-aws/s3.go
-index 9cd87dbab..800435d01 100644
---- a/registry/storage/driver/s3-aws/s3.go
-+++ b/registry/storage/driver/s3-aws/s3.go
-@@ -476,11 +476,11 @@ func New(params DriverParameters) (*Driver, error) {
- 	// }
- 
- 	d := &driver{
--		S3:        s3obj,
--		Bucket:    params.Bucket,
--		ChunkSize: params.ChunkSize,
--		Encrypt:   params.Encrypt,
--		KeyID:     params.KeyID,
-+		S3:                          s3obj,
-+		Bucket:                      params.Bucket,
-+		ChunkSize:                   params.ChunkSize,
-+		Encrypt:                     params.Encrypt,
-+		KeyID:                       params.KeyID,
- 		MultipartCopyChunkSize:      params.MultipartCopyChunkSize,
- 		MultipartCopyMaxConcurrency: params.MultipartCopyMaxConcurrency,
- 		MultipartCopyThresholdSize:  params.MultipartCopyThresholdSize,
-diff --git a/registry/storage/linkedblobstore.go b/registry/storage/linkedblobstore.go
-index 3fb1da26f..de591c8a5 100644
---- a/registry/storage/linkedblobstore.go
-+++ b/registry/storage/linkedblobstore.go
-@@ -312,14 +312,14 @@ func (lbs *linkedBlobStore) newBlobUpload(ctx context.Context, uuid, path string
- 	}
- 
- 	bw := &blobWriter{
--		ctx:        ctx,
--		blobStore:  lbs,
--		id:         uuid,
--		startedAt:  startedAt,
--		digester:   digest.Canonical.Digester(),
--		fileWriter: fw,
--		driver:     lbs.driver,
--		path:       path,
-+		ctx:                    ctx,
-+		blobStore:              lbs,
-+		id:                     uuid,
-+		startedAt:              startedAt,
-+		digester:               digest.Canonical.Digester(),
-+		fileWriter:             fw,
-+		driver:                 lbs.driver,
-+		path:                   path,
- 		resumableDigestEnabled: lbs.resumableDigestEnabled,
- 	}
- 
-diff --git a/registry/storage/linkedblobstore_test.go b/registry/storage/linkedblobstore_test.go
-index 85376f715..e0ffd2796 100644
---- a/registry/storage/linkedblobstore_test.go
-+++ b/registry/storage/linkedblobstore_test.go
-@@ -162,8 +162,8 @@ type mockBlobDescriptorServiceFactory struct {
- func (f *mockBlobDescriptorServiceFactory) BlobAccessController(svc distribution.BlobDescriptorService) distribution.BlobDescriptorService {
- 	return &mockBlobDescriptorService{
- 		BlobDescriptorService: svc,
--		t:     f.t,
--		stats: f.stats,
-+		t:                     f.t,
-+		stats:                 f.stats,
- 	}
- }
- 
diff --git a/app-emulation/docker-registry/files/registry.confd b/app-emulation/docker-registry/files/registry.confd
deleted file mode 100644
index bfa97f127ef1..000000000000
--- a/app-emulation/docker-registry/files/registry.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# arguments for docker-registry
-command_args="serve /etc/docker/registry/config.yml"
diff --git a/app-emulation/docker-registry/files/registry.initd b/app-emulation/docker-registry/files/registry.initd
deleted file mode 100644
index b81303c624d1..000000000000
--- a/app-emulation/docker-registry/files/registry.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Docker Registry 2.0"
-pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
-user=${user:-${RC_SVCNAME}}
-group=${group:-${RC_SVCNAME}}
-
-command="/usr/libexec/docker-${RC_SVCNAME}/${RC_SVCNAME}"
-command_args="${command_args:-serve /etc/docker/registry/config.yml}"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
-	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-
-depend() {
-	need net
-}
diff --git a/app-emulation/docker-registry/files/registry.logrotated b/app-emulation/docker-registry/files/registry.logrotated
deleted file mode 100644
index 3cb63f949a08..000000000000
--- a/app-emulation/docker-registry/files/registry.logrotated
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/registry/registry.log {
-	missingok
-	size 5M
-	rotate 3
-	compress
-	copytruncate
-}
diff --git a/app-emulation/docker-registry/files/registry.service b/app-emulation/docker-registry/files/registry.service
deleted file mode 100644
index 14ff5f9c0b77..000000000000
--- a/app-emulation/docker-registry/files/registry.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Docker Registry 2.0
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-User=registry
-PrivateDevices=Yes
-Environment="DOCKER_REGISTRY_ARGS=serve /etc/docker/registry/config.yml"
-ExecStart=/usr/libexec/docker-registry/registry $DOCKER_REGISTRY_ARGS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-emulation/docker-registry/metadata.xml b/app-emulation/docker-registry/metadata.xml
deleted file mode 100644
index e9f15ec90c2b..000000000000
--- a/app-emulation/docker-registry/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zmedico@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">docker/distribution</remote-id>
-  </upstream>
-</pkgmetadata>