gentoo resync : 10.11.2019

2 files changed, 0 insertions, 159 deletions

diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index b177b946ee1b..98e3246bb1f9 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -1,4 +1,3 @@
-AUX skopeo-0.1.22-make-ostree-optional.patch 7351 BLAKE2B dbb8062f8d88bcc4b7d72863434a6d58c4afee8e591ab69ef20b3ce9d349fe80ee48b8e092c82d9326084b82233074fd9b09f056a8fe7eb89060b298e2b181d0 SHA512 c5292c23d144df89dd1d0ac6de2eb68eb2f852c3b0f095906ab1a9c3a29337ae514a0c754f561729d2b8b645e5c5b3fb18c2bffd3903db754c677667bd58e90f
 DIST skopeo-0.1.37.tar.gz 2766509 BLAKE2B 59e3f4cf37694b4ae59fe4eca6afd8abe4f7ab1aec3c0cee409be6f0f648fd2929092ee9b5a2b167c5041202dac908cd39f693d8ae8eebf621be47f302bd885c SHA512 e2de3c65f864572fe74ca55ee107703a49855f0da71c440784b06d13ed724456cf7bf30e18a5cb15cf2e136edc688b56321cf7838a2cc66f39c4ea9d9686441e
 DIST skopeo-0.1.38.tar.gz 2947365 BLAKE2B 1d2d6ea2ed677f2b068ecca9b8dcee9d31280acb3f7acd8e0a59321d178244b506f4124eba8dd0519a3f5b307a6001d05a093cdf93189eccb55cf7c9cc41895b SHA512 83e53eb7632761eb444d4f824b6fee7a2e265e386fd1ba58e2d3194750f794a0e1cdc94a76222d12f589f851c459b165756661a76c09cc9c7dd9b2d6fff2b39f
 DIST skopeo-0.1.39.tar.gz 3850036 BLAKE2B e635be475f22cc25ab98e446424f4a6b0babe34f827a73f9c9c1533db782490e9af94e759ac78fbeeec1c0e1fa42eef9d09fb4e7ff1f4df654f65fe4c1a9f7b0 SHA512 c4aadc40f9d637c628cd96c204b3e9bc3a928c145521bed2e5046508fc936ff99442dda8b4a4cdd85c4d04e64a9ccee5ea8d563c6ebf4e6020d50d96b921716c
diff --git a/app-emulation/skopeo/files/skopeo-0.1.22-make-ostree-optional.patch b/app-emulation/skopeo/files/skopeo-0.1.22-make-ostree-optional.patch
deleted file mode 100644
index 1e81d8bff341..000000000000
--- a/app-emulation/skopeo/files/skopeo-0.1.22-make-ostree-optional.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From a49f22efd84d1cc656242319cca27cbdf8852e05 Mon Sep 17 00:00:00 2001
-From: William Hubbs <whubbs@gaikai.com>
-Date: Fri, 23 Jun 2017 12:34:25 -0500
-Subject: [PATCH] make ostree optional
-
----
- vendor/github.com/containers/image/README.md       | 14 ++++++---
- .../transports/alltransports/alltransports.go      |  2 +-
- .../image/transports/alltransports/ostree.go       |  8 +++++
- .../image/transports/alltransports/ostree_stub.go  |  9 ++++++
- .../github.com/containers/image/transports/stub.go | 36 ++++++++++++++++++++++
- .../containers/image/transports/stub_test.go       | 18 +++++++++++
- 6 files changed, 82 insertions(+), 5 deletions(-)
- create mode 100644 vendor/github.com/containers/image/transports/alltransports/ostree.go
- create mode 100644 vendor/github.com/containers/image/transports/alltransports/ostree_stub.go
- create mode 100644 vendor/github.com/containers/image/transports/stub.go
- create mode 100644 vendor/github.com/containers/image/transports/stub_test.go
-
-diff --git a/vendor/github.com/containers/image/README.md b/vendor/github.com/containers/image/README.md
-index ca8afd4..8e812bb 100644
---- a/vendor/github.com/containers/image/README.md
-+++ b/vendor/github.com/containers/image/README.md
-@@ -51,14 +51,20 @@ Ensure that the dependencies documented [in vendor.conf](https://github.com/cont
- are also available
- (using those exact versions or different versions of your choosing).
- 
--This library, by default, also depends on the GpgME C library. Either install it:
-+This library, by default, also depends on the GpgME and libostree C libraries. Either install them:
- ```sh
--Fedora$ dnf install gpgme-devel libassuan-devel
-+Fedora$ dnf install gpgme-devel libassuan-devel libostree-devel
- macOS$ brew install gpgme
- ```
--or use the `containers_image_openpgp` build tag (e.g. using `go build -tags …`)
--This will use a Golang-only OpenPGP implementation for signature verification instead of the default cgo/gpgme-based implementation;
-+or use the build tags described below to avoid the dependencies (e.g. using `go build -tags …`)
-+
-+### Supported build tags
-+
-+- `containers_image_openpgp`: Use a Golang-only OpenPGP implementation for signature verification instead of the default cgo/gpgme-based implementation;
- the primary downside is that creating new signatures with the Golang-only implementation is not supported.
-+- `containers_image_ostree_stub`: Instead of importing `ostree:` transport in `github.com/containers/image/transports/alltransports`, use a stub which reports that the transport is not supported. This allows building the library without requiring the `libostree` development libraries.
-+
-+  (Note that explicitly importing `github.com/containers/image/ostree` will still depend on the `libostree` library, this build tag only affects generic users of …`/alltransports`.)
- 
- ## Contributing
- 
-diff --git a/vendor/github.com/containers/image/transports/alltransports/alltransports.go b/vendor/github.com/containers/image/transports/alltransports/alltransports.go
-index dc70fad..dd80b7f 100644
---- a/vendor/github.com/containers/image/transports/alltransports/alltransports.go
-+++ b/vendor/github.com/containers/image/transports/alltransports/alltransports.go
-@@ -12,7 +12,7 @@ import (
- 	_ "github.com/containers/image/docker/daemon"
- 	_ "github.com/containers/image/oci/layout"
- 	_ "github.com/containers/image/openshift"
--	_ "github.com/containers/image/ostree"
-+	// The ostree transport is registered by ostree*.go
- 	_ "github.com/containers/image/storage"
- 	"github.com/containers/image/transports"
- 	"github.com/containers/image/types"
-diff --git a/vendor/github.com/containers/image/transports/alltransports/ostree.go b/vendor/github.com/containers/image/transports/alltransports/ostree.go
-new file mode 100644
-index 0000000..0fc5d7e
---- /dev/null
-+++ b/vendor/github.com/containers/image/transports/alltransports/ostree.go
-@@ -0,0 +1,8 @@
-+// +build !containers_image_ostree_stub
-+
-+package alltransports
-+
-+import (
-+	// Register the ostree transport
-+	_ "github.com/containers/image/ostree"
-+)
-diff --git a/vendor/github.com/containers/image/transports/alltransports/ostree_stub.go b/vendor/github.com/containers/image/transports/alltransports/ostree_stub.go
-new file mode 100644
-index 0000000..8b01afe
---- /dev/null
-+++ b/vendor/github.com/containers/image/transports/alltransports/ostree_stub.go
-@@ -0,0 +1,9 @@
-+// +build containers_image_ostree_stub
-+
-+package alltransports
-+
-+import "github.com/containers/image/transports"
-+
-+func init() {
-+	transports.Register(transports.NewStubTransport("ostree"))
-+}
-diff --git a/vendor/github.com/containers/image/transports/stub.go b/vendor/github.com/containers/image/transports/stub.go
-new file mode 100644
-index 0000000..087f69b
---- /dev/null
-+++ b/vendor/github.com/containers/image/transports/stub.go
-@@ -0,0 +1,36 @@
-+package transports
-+
-+import (
-+	"fmt"
-+
-+	"github.com/containers/image/types"
-+)
-+
-+// stubTransport is an implementation of types.ImageTransport which has a name, but rejects any references with “the transport $name: is not supported in this build”.
-+type stubTransport string
-+
-+// NewStubTransport returns an implementation of types.ImageTransport which has a name, but rejects any references with “the transport $name: is not supported in this build”.
-+func NewStubTransport(name string) types.ImageTransport {
-+	return stubTransport(name)
-+}
-+
-+// Name returns the name of the transport, which must be unique among other transports.
-+func (s stubTransport) Name() string {
-+	return string(s)
-+}
-+
-+// ParseReference converts a string, which should not start with the ImageTransport.Name prefix, into an ImageReference.
-+func (s stubTransport) ParseReference(reference string) (types.ImageReference, error) {
-+	return nil, fmt.Errorf(`The transport "%s:" is not supported in this build`, string(s))
-+}
-+
-+// ValidatePolicyConfigurationScope checks that scope is a valid name for a signature.PolicyTransportScopes keys
-+// (i.e. a valid PolicyConfigurationIdentity() or PolicyConfigurationNamespaces() return value).
-+// It is acceptable to allow an invalid value which will never be matched, it can "only" cause user confusion.
-+// scope passed to this function will not be "", that value is always allowed.
-+func (s stubTransport) ValidatePolicyConfigurationScope(scope string) error {
-+	// Allowing any reference in here allows tools with some transports stubbed-out to still
-+	// use signature verification policies which refer to these stubbed-out transports.
-+	// See also the treatment of unknown transports in policyTransportScopesWithTransport.UnmarshalJSON .
-+	return nil
-+}
-diff --git a/vendor/github.com/containers/image/transports/stub_test.go b/vendor/github.com/containers/image/transports/stub_test.go
-new file mode 100644
-index 0000000..f181a1a
---- /dev/null
-+++ b/vendor/github.com/containers/image/transports/stub_test.go
-@@ -0,0 +1,18 @@
-+package transports
-+
-+import (
-+	"testing"
-+
-+	"github.com/stretchr/testify/assert"
-+)
-+
-+func TestStubTransport(t *testing.T) {
-+	const name = "whatever"
-+
-+	s := NewStubTransport(name)
-+	assert.Equal(t, name, s.Name())
-+	_, err := s.ParseReference("this is rejected regardless of content")
-+	assert.Error(t, err)
-+	err = s.ValidatePolicyConfigurationScope("this is accepted regardless of content")
-+	assert.NoError(t, err)
-+}
--- 
-2.13.0
-