From 9448baebd7993f22e89ff1bd69e23b3146113664 Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sun, 19 Apr 2015 18:05:11 +0000 Subject: [PATCH] Fix overly strict gem dependencies that are not in line with Gentoo ruby policy. Add ruby20, ruby21, ruby22, fixing bug 541638. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x8883FA56A308A8D7! --- app-admin/r10k/ChangeLog | 9 ++++++++- app-admin/r10k/Manifest | 14 ++++++++++++-- .../{r10k-1.1.3.ebuild => r10k-1.1.3-r1.ebuild} | 16 +++++++++------- 3 files changed, 29 insertions(+), 10 deletions(-) rename app-admin/r10k/{r10k-1.1.3.ebuild => r10k-1.1.3-r1.ebuild} (82%) diff --git a/app-admin/r10k/ChangeLog b/app-admin/r10k/ChangeLog index c5d5cd38b190..898264b92436 100644 --- a/app-admin/r10k/ChangeLog +++ b/app-admin/r10k/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/r10k # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/ChangeLog,v 1.8 2015/04/13 23:15:21 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/ChangeLog,v 1.9 2015/04/19 18:05:10 graaff Exp $ + +*r10k-1.1.3-r1 (19 Apr 2015) + + 19 Apr 2015; Hans de Graaff -r10k-1.1.3.ebuild, + +r10k-1.1.3-r1.ebuild: + Fix overly strict gem dependencies that are not in line with Gentoo ruby + policy. Add ruby20, ruby21, ruby22, fixing bug 541638. 13 Apr 2015; Manuel Rüger -r10k-1.1.0.ebuild, -r10k-1.1.1.ebuild, r10k-1.1.3.ebuild: diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest index 3c91a71a45cb..93871b64d5dd 100644 --- a/app-admin/r10k/Manifest +++ b/app-admin/r10k/Manifest @@ -1,4 +1,14 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST r10k-1.1.3.gem 30720 SHA256 4b4732046a7478f28668dd3db08ce2527bb45c6da83ec0c604f16d09fce9b91a SHA512 9ddb06c3535c4d5f4f0d8156ddf7671f248283874ef7fab4a2e9d00534e6d165e1b7a32937ecef8043a7fb8ff1143a9dd7bc388f0d7c810de86bc369a22fb502 WHIRLPOOL ea9b3a291cc581c719c2852a0d5f268be2389ed783368a0b20c6dc81b047d5725c60956de3282a353dfefd034a4be2eadaceba1a79ee9c0c16b3afaca3be2ac8 -EBUILD r10k-1.1.3.ebuild 1902 SHA256 81b6e06074dfdb379ab0d6d1cb3da9a4f7676442a20a540ca32ef0f575a704b9 SHA512 45b3a8e1d0d2f4dd47bf286277dc7faa79ad188873ed155b576eb5b19acd812dc858d95097a51f5cce0fdc13ed548583dfb4ddc651c0a1c6fcce56cc78db0cdd WHIRLPOOL f6dbc8ca4bfa4ec235c6de7f3aab9f61ca0a9f5d44e2f8f4ccf9dd07337d159a65a572eef558cc04b499620cadb813fab440a2295139e51d5d56bf89bc7a8a78 -MISC ChangeLog 1213 SHA256 b84b0326265ccd8afc38e62c8cfa09f5bbb346fe7fbe8eb0f5c06043bfc1083b SHA512 7724b9b45a47f80a742e49a6e9653812b1c408ce3fb6e9b511d485987a53d13acd46146e9e73190e5bbb5cc5e77295a2b19db4eddb42764faf68930f0caf8f46 WHIRLPOOL edadfa518c5c69eb419474b4f6eff62db9397c47df1de5347dbb0a837337fa43c9a984bc9bb07836d04dfe2baf6d1e99ae4863406a8784114383a376b9030442 +EBUILD r10k-1.1.3-r1.ebuild 1938 SHA256 acfd72e096f84032208d65f25287c7cd80d44107ce88b3b6c8b2b897d4be8433 SHA512 d3bbd099f59d72c9548061ad1a671411f923b826bd711eaafc340d6d1cb939976000e1cbab7168ca8c88823f5a221fe6ff68a9e09065082d4d2184349a4df18f WHIRLPOOL 826cf4a53a9df8077cdee47224934cf08c629cde478ab87bffc130c3577334c26292677102325e166486babeaac86f603e785d3a29ed2040eb6fa65007cee02e +MISC ChangeLog 1472 SHA256 50747486873f8bd9ef55c46d953687eb9e2f0924927a44054377f73d91d0a0bd SHA512 f8e05d72f1040af90f73917e9f1c79f73a6b7e3d162ca9080ad8d62a3d161b965c3a5fb900622d58317283b213df29bdd04a1abbc115445cc30613f08a891fe0 WHIRLPOOL a0cdb1eb32f2fa1101e8887fe92cfb4b4d11198fcdbe3d7fe7de5cfb0fd0d77097784402625fa197779c72511666723ead02931d4ea25ff47f5eeee6b41b534b MISC metadata.xml 632 SHA256 1a57c1a088c094b7a4d0e0297e7a1e91348d9bfcabe05fa46becaf723d55c817 SHA512 86fe543e55b889cb1fa653a68ae159ca42dec71807046c10e26a28f433f121e0dbf7de87dc312377e53e21df2a1f77be9928fddcdd974813761d1048ca04c67a WHIRLPOOL 59f0397740455357e07d462d92c9108c3d5a71101092c0c7afc2a458cf63c92839f016304519080c119f79614c58d73fd62a156f4db23a03d8d877ee79902ee1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iF4EAREIAAYFAlUz7lcACgkQiIP6VqMIqNcKwwD/a/RAcxF4DJRi+Sa/f08+hw8X +D4PT0rZYB4J92qyEO8IA/10VEox55e3QQc5R7pYXntag1IKX66pI5tWm9OSUk12U +=XMuA +-----END PGP SIGNATURE----- diff --git a/app-admin/r10k/r10k-1.1.3.ebuild b/app-admin/r10k/r10k-1.1.3-r1.ebuild similarity index 82% rename from app-admin/r10k/r10k-1.1.3.ebuild rename to app-admin/r10k/r10k-1.1.3-r1.ebuild index 318403c37035..945f4e869c1d 100644 --- a/app-admin/r10k/r10k-1.1.3.ebuild +++ b/app-admin/r10k/r10k-1.1.3-r1.ebuild @@ -1,14 +1,16 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/r10k-1.1.3.ebuild,v 1.2 2015/04/13 23:15:21 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/r10k-1.1.3-r1.ebuild,v 1.1 2015/04/19 18:05:10 graaff Exp $ EAPI=5 -USE_RUBY="ruby19" +USE_RUBY="ruby19 ruby20 ruby21" RUBY_FAKEGEM_RECIPE_TEST="rspec" RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + inherit ruby-fakegem DESCRIPTION="Puppet environment and module deployment" @@ -19,20 +21,20 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+git" -ruby_add_bdepend "test? ( =dev-ruby/rspec-2.14* )" - ruby_add_rdepend " >=dev-ruby/colored-1.2 - =dev-ruby/cri-2.4* + =dev-ruby/cri-2* >=dev-ruby/systemu-2.5.2 - =dev-ruby/log4r-1.1.10 dev-ruby/json" RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )" all_ruby_prepare() { - sed -i 's/json_pure/json/' "${WORKDIR}/all/metadata" || die "metadata fix failed" + sed -i -e 's/json_pure/json/' \ + -e '/cri/ s/2.4.0/2.4/' \ + -e '/systemu/ s/2.5.2/2.5/' \ + -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die } pkg_postinst() { -- 2.26.2