diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-24 19:58:07 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-24 19:58:07 +0000 |
| commit | 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch) | |
| tree | da76713365257a445f3ae3b95470917f59d46728 /app-admin/puppet | |
| parent | 4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff) | |
gentoo resync : 24.02.2018
Diffstat (limited to 'app-admin/puppet')
| -rw-r--r-- | app-admin/puppet/Manifest | 4 | ||||
| -rw-r--r-- | app-admin/puppet/puppet-4.10.10-r1.ebuild (renamed from app-admin/puppet/puppet-4.10.10.ebuild) | 3 | ||||
| -rw-r--r-- | app-admin/puppet/puppet-5.4.0-r1.ebuild (renamed from app-admin/puppet/puppet-5.4.0.ebuild) | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index b1809d5b7620..1d26c7cf2264 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -14,9 +14,9 @@ DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0a DIST puppet-5.3.4.tar.gz 2889645 BLAKE2B f1f4e2d9dfe457f89aa7d99724eaa9368ea50027747e2506b5cbfa176c1a9060bf87ce8c037b78f3c86c2e2974087f9ab4fc76cb7374f1a348ff410e9cfa83e1 SHA512 f24008651be15cf5c915f7a03dc0319eb2d076ddfb06c44fd846421fe29baba27ea43b29134077e1dc7c14a48b44104dcaaefe73bfdb00d7667c1c25a1b871fd DIST puppet-5.3.5.tar.gz 2890869 BLAKE2B 1baeddbaa47803811e14bfdbbf5624b617ced2ec6ec6b8072d51a556455838bf0934b1e0c578ef6b4d5df763260c0fa0f027295e3c8403c172a25fcc72179283 SHA512 d48b836a9c7db451c73048917e091a1dd3e1c259f4dde7a8867fe9931d9dbab46219f4b4dfa739669bb8d713a9defe13eae0d5b2dd26a6930b589f4cb0ab1361 DIST puppet-5.4.0.tar.gz 2958138 BLAKE2B 2cb7e890774abde7183a7b3ac33771fe8006f526b7780a566788591cba20c1ff7540429a4ead13830700fc07105fdaec4317de69f4efa44c4b245b31164b6048 SHA512 6b6955416e4f14ba45318c1afce7db77226da2d14f8dbfeca059780caf188f9687bf31dff4a4c57f8172468e09c35e021721a8b8caf99050d72f90b290fbdb71 -EBUILD puppet-4.10.10.ebuild 5737 BLAKE2B a88a8d8fbdfa65751d4cad48af0234e7c1891eb35855cbb2ee9b4a62d75538af9d6c1445ec056505046d753a40eb93cc5bc65e9e2fb719c1f377ca1188941d81 SHA512 7592ae092281c6212bd958dce00d622252271db2f8d38fa447f3f53f756f0cad0f43c518aa0c652b6452b0856165b0db64fff48d3f797b65cbe9058a441b75b0 +EBUILD puppet-4.10.10-r1.ebuild 5635 BLAKE2B 42c4009603b09985df1574ca66ea4821a337e2859b31c3d923e4784003c486fb648e27cfbc42e638477913659720883cb5ed09fc51f5e895f03eff867738a9a9 SHA512 6f2d6b3ae4a7bcd053eca8dc599cba96b8043797c0ebf7689f660207d777514a01caa98985d426cbb05811dc7ad2d45f9927e098927a5cb34292ecdae376cb02 EBUILD puppet-4.10.8.ebuild 5564 BLAKE2B 51164a6bd2fb31c08d9a1f0f08fa67861f11c1b6de316322f9596defbc3df05b980d897bad8b13f0c7fc3d3344eae0fdf81574555f6736969f797d6d91306424 SHA512 c9a64796ff31f9416606ee37e019d400294a1bbcbbfe1603577e47bf64ee95d0afd307711c06cde3a6bbc01fecae7c2b755ab16700ff697aa01f6cff5e510c74 EBUILD puppet-5.3.4.ebuild 3928 BLAKE2B 86cb095bbca6b665ac749539b97865fffa6192fc9a6ce6b9599e29d51221043075db5120bbf80c4e297030f3dac4011dff9fca116d0736d740c81fe3c8bab92f SHA512 ed742128919ea071b7cabb2cf1cdaa45710a09aa9e4e49306e1cd9c601b0a6955700afbdb8013d500a04ae10cf3cbc2d83e88f225157fb1d617701e2112facf4 EBUILD puppet-5.3.5.ebuild 3928 BLAKE2B 86cb095bbca6b665ac749539b97865fffa6192fc9a6ce6b9599e29d51221043075db5120bbf80c4e297030f3dac4011dff9fca116d0736d740c81fe3c8bab92f SHA512 ed742128919ea071b7cabb2cf1cdaa45710a09aa9e4e49306e1cd9c601b0a6955700afbdb8013d500a04ae10cf3cbc2d83e88f225157fb1d617701e2112facf4 -EBUILD puppet-5.4.0.ebuild 3928 BLAKE2B 86cb095bbca6b665ac749539b97865fffa6192fc9a6ce6b9599e29d51221043075db5120bbf80c4e297030f3dac4011dff9fca116d0736d740c81fe3c8bab92f SHA512 ed742128919ea071b7cabb2cf1cdaa45710a09aa9e4e49306e1cd9c601b0a6955700afbdb8013d500a04ae10cf3cbc2d83e88f225157fb1d617701e2112facf4 +EBUILD puppet-5.4.0-r1.ebuild 3823 BLAKE2B b3bd66d6e2092770cb01396984baec8da30fe3895b9bec3f5841389ab3bc993359ec7ede122ad2175e3e66b338cf78b959e5af8f299db2f3d28b799a817e4a3e SHA512 54018f928369d6c858ec6fa09eaefada36e572291ed5a274645f174a3fa29d89c887a1de65963a1a7582fff06c71c7bdad774749616fcd392197dea2e11d2aa7 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64 diff --git a/app-admin/puppet/puppet-4.10.10.ebuild b/app-admin/puppet/puppet-4.10.10-r1.ebuild index c404e787afc1..a75388c365f1 100644 --- a/app-admin/puppet/puppet-4.10.10.ebuild +++ b/app-admin/puppet/puppet-4.10.10-r1.ebuild @@ -79,9 +79,6 @@ all_ruby_prepare() { epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch" fi - # fix compatibility with ruby 2.3.6/2.4.3 webrick - epatch "${FILESDIR}/puppet-4-webrick-ruby.patch" - # Use working version of mocha sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die diff --git a/app-admin/puppet/puppet-5.4.0.ebuild b/app-admin/puppet/puppet-5.4.0-r1.ebuild index 1f8461b191db..c274ee7b9505 100644 --- a/app-admin/puppet/puppet-5.4.0.ebuild +++ b/app-admin/puppet/puppet-5.4.0-r1.ebuild @@ -71,9 +71,6 @@ all_ruby_prepare() { # fix systemd path epatch "${FILESDIR}/puppet-systemd.patch" - # backport upstream fix for ruby 2.3.6 compatibility - epatch "${FILESDIR}/puppet-4-webrick-ruby.patch" - # Avoid specs that can only run in the puppet.git repository. This # should be narrowed down to the specific specs. rm spec/integration/parser/compiler_spec.rb || die |