Fix gemspec for our way of handling json vs json_pure. Fixes bug 452882.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 43 insertions, 5 deletions

diff --git a/dev-ruby/hiera/ChangeLog b/dev-ruby/hiera/ChangeLog
index 39d1bc108b7e..0ed9248abf0c 100644
--- a/dev-ruby/hiera/ChangeLog
+++ b/dev-ruby/hiera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/hiera
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/ChangeLog,v 1.5 2013/01/04 07:06:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/ChangeLog,v 1.6 2013/01/20 08:57:13 graaff Exp $
+
+*hiera-1.1.2-r1 (20 Jan 2013)
+
+  20 Jan 2013; Hans de Graaff <graaff@gentoo.org> +hiera-1.1.2-r1.ebuild:
+  Fix gemspec for our way of handling json vs json_pure. Fixes bug 452882.
 
 *hiera-1.1.2 (04 Jan 2013)
 
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index bbb1e725b778..a6e825bf1267 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -4,13 +4,14 @@ Hash: SHA256
 DIST hiera-1.1.1.gem 22016 SHA256 578ea252be281a2dddd9c1a150c6cb773a2e78b320c64891b25c9799dcffe7a4 SHA512 5f938e43a2dfc4dc17cc19d3f5c40e7668997af7640d6a1d8805e12e793817405a577b90a4be1258c85380c33200d844666621a5bbe5ce985f38a2b713fe17b8 WHIRLPOOL 01612e03ee1d4b64d5913c1766110ed6a84445c17a61c97880baf541106ffce2d4d29a014a73e86d093a2fbe5658b3555114d9391bd753be9eb9922da13eb201
 DIST hiera-1.1.2.gem 22528 SHA256 f9249f5c6926b55d2e9a376938b06a8033a91ace566e6dec646ecd00fcb9d6c6 SHA512 d3a6d9806f9ffb0c72ebbbe0d5018106beeecb5af618b72f784a1cb027f9e50dda5f04c175958149839ad0d0066b72a1c2367727f26fc8fad068827a05e4631c WHIRLPOOL d6861c81e0ad1c34dda1af185c09faaa99e7d73a6db957be7d1c7cac9f48f6a5b2a55d391aea4df55116e2bbe0d1beaf9465da667c7f4602dba13ec0ca8dd38b
 EBUILD hiera-1.1.1.ebuild 627 SHA256 a7a10402f55c39220dc93cc12a7c79d67787582fd201192458c32937ff8b4d6e SHA512 76c2d7ade0f14e49ba6e4c85d594ce0fd19d82ea8437e88e7b4148eac8544c6a01e2093e52df18acb59a893c9e6625258229e7114c5d8db769a3a7f1058e133a WHIRLPOOL 92dc4b690615b4331fb432fd14dda73dc51530c31083abca536212f6188daf8e465ec2b35a170d902f36f49c9b8f1bb33e29083f92da1ef5c98177c0474206dc
+EBUILD hiera-1.1.2-r1.ebuild 805 SHA256 a0a86649f388df976fdabade77eb5d570cf03bbe88cbaedfec424a334b2ad295 SHA512 fab095a36984e5a1ee99942552e2f2be3f294d3a002837acdf4b3d5b27b566c8d2582628440b90f6180d3b18c58a0363bf03c4f8e0d1ac1e01ddd5501fb82c44 WHIRLPOOL 3a5c954b803309bd95b11f877cc25be7f982a2925ec4ec267d8eadc1b6ed39e53eb9ffc39bedc712b2cf47e6c62f6b08ea5d7a46b7bf873a8421abd0d38ef19a
 EBUILD hiera-1.1.2.ebuild 628 SHA256 9f92bc4fb5802529f79836d4fc83df1333e5bcc4ec1f8ae9f3c8cc4c60781ee6 SHA512 1f4b16f0fd6e5ce57056dd8618bfc80f70281cfbeed469af19568d12b12db96adb9e7620a49d6815db7595bc6c1a1a1304cc95517bdb41317598ac6bfb2329cb WHIRLPOOL b6da825dba99291b451b5f7d29a8f387511386fc5f268b28dd8bbe242e130eedd5998a48fbaa25294d657cf76fe0cc0c46325d61a9a4e5c528edd6270505e384
-MISC ChangeLog 768 SHA256 16f606feb712eeb3b43cb131cbd5303d241bc726bd0368ae12c5eaf57d9137de SHA512 092ede93dfcf8df782a359299d669811261903954ea73582de617b7e296a535049a76a66d0e4407db78c84ec57b136de41771fce45f3d3710fa17ab596c5a5ff WHIRLPOOL b0bebde5552f35a2966d2983548998ef6dfa7058cc0b2be4a661493e117e1a9a80c4d5009a3043907b95727e4e1e509993c9d1de4002432aec05b5cc4503528e
+MISC ChangeLog 949 SHA256 3a114005bf281ae35e2b43900407428979696c817a67a0425325278264b75cc0 SHA512 5e7d0bf176d844457d6f079bd2f593ce8ed43282b3e54c8111b36cf48a4fafd37df1eafb36ea682d4dfaf3549173c2736f11c38021bbd42dad8cda93096a1410 WHIRLPOOL 971d9a98d1f413f403ea637efe39d2fe4ff999006b71c6885bde235b904b7696023118b7718e2c483a6c80c9af9b18bec29f2eae1da089b841c0715012df01a9
 MISC metadata.xml 241 SHA256 75e52543259bf1db821e54ae9bf850c7a388b44bce3329173d1f11a823dd7122 SHA512 043804d3040c1a0a9d8c3f9ac33a3b4b6fd4b73e79804a38ea0bdd03e661467243917c336c5b94ed00868cc5e0e5ae3dcb35eac2a6de0b7302528aff9302ecdd WHIRLPOOL 7dd29937ac2991b19096ec182b3ffc2f13b8777a3aeac99ddfeb36ff5fbda090509f07a517ec5aa32e3c06cc31ab6f049a1146c8fc19bf617b810dae2623aa65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDmf3UACgkQiIP6VqMIqNdfUwD/X/KNm7cPI/txIwYFvSqXktS9
-xDktX/e27dsukTeH9OkA/0M5IZi1gjkOnUr+zWb+ZodvzG8K+Dgl0Rr3gqETGbhF
-=WMKn
+iF4EAREIAAYFAlD7sWoACgkQiIP6VqMIqNd7FwD8DupTxRHP7vNq90gKUJlH1yyg
+s2JEUtLJ0wYySbezmIoA+wVyiUJZKSoqtk0TEXWbol/ZU6baR4Qwute/QE8cT6/7
+=I61V
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/hiera/hiera-1.1.2-r1.ebuild b/dev-ruby/hiera/hiera-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..53177e58435a
--- /dev/null
+++ b/dev-ruby/hiera/hiera-1.1.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hiera/hiera-1.1.2-r1.ebuild,v 1.1 2013/01/20 08:57:13 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple pluggable Hierarchical Database"
+HOMEPAGE="http://projects.puppetlabs.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+ruby_add_rdepend "dev-ruby/json"
+
+all_ruby_prepare() {
+	# Our json package is either the compiled version or the pure
+	# version. Fix gemspec accordingly.
+	sed -i -e 's/json_pure/json/' ../metadata || die
+}