summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2010-06-12 10:43:28 +0000
committerHans de Graaff <graaff@gentoo.org>2010-06-12 10:43:28 +0000
commit5f8867e2d274e41714189d73cb86ee87c583a8b4 (patch)
treeb029f56ac3c1b0b83fc760cc093b0f3fb30f8c59 /dev-ruby/json
parentVersion bump (diff)
downloadhistorical-5f8867e2d274e41714189d73cb86ee87c583a8b4.tar.gz
historical-5f8867e2d274e41714189d73cb86ee87c583a8b4.tar.bz2
historical-5f8867e2d274e41714189d73cb86ee87c583a8b4.zip
Fix static modname and add x64-macos keyword, fixing bug 323371. Thanks to Ramon van Alteren for the patch.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby/json')
-rw-r--r--dev-ruby/json/ChangeLog6
-rw-r--r--dev-ruby/json/Manifest14
-rw-r--r--dev-ruby/json/json-1.4.3-r1.ebuild10
3 files changed, 17 insertions, 13 deletions
diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index e8dd9016054c..1958dc5cf729 100644
--- a/dev-ruby/json/ChangeLog
+++ b/dev-ruby/json/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/json
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.32 2010/05/24 19:09:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.33 2010/06/12 10:43:28 graaff Exp $
+
+ 12 Jun 2010; Hans de Graaff <graaff@gentoo.org> json-1.4.3-r1.ebuild:
+ Fix static modname and add x64-macos keyword, fixing bug 323371. Thanks to
+ Ramon van Alteren for the patch.
24 May 2010; Pacho Ramos <pacho@gentoo.org> json-1.2.2.ebuild:
stable amd64, bug 316883
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 3b7ee9ecade8..2e98eba5a984 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,17 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
DIST json-1.2.2.gem 386048 RMD160 d0451e6b6a781ef840860136cea7513f2e58f9ee SHA1 056c6dd361f2985167f49ef040bc2b119d899179 SHA256 9b0e4c2fcc1d61354106ff803b6d89357584c8969b0028c71070591d04f64012
DIST json-1.4.3.gem 397824 RMD160 964a5c58e3621e8300650e5d8d62ea34c35f2b12 SHA1 a02bc81d86c3c956e4f2a49e55aa3959b99409d7 SHA256 46f26a861601de5d4332952c51a9cc867f36e4b54bcb496801b949cd8df17e64
EBUILD json-1.2.2.ebuild 1851 RMD160 b739bcca43d7fec853ffb2c81c1f5870bc05f2d0 SHA1 91cbf260090bc7d1e51ca2b7832b4c845cbc29d9 SHA256 692057261f74953197ac27c6cd46bace623f0eae0e7d68faf387f60c599f7689
-EBUILD json-1.4.3-r1.ebuild 1871 RMD160 475c85d196475622d3a2d8586b92607f8b83e528 SHA1 8be70624fef563a1cd312ae3e0f52283961e3d51 SHA256 94bb1012d6fe2ddf39897119337904abc3dd127f68e7a4e64405c16a1f4d8646
+EBUILD json-1.4.3-r1.ebuild 1932 RMD160 5f48acf6a32ee88c1cddfb9c5ab65c3d106e7036 SHA1 d11d83dad5ec757badc2d35a8d72ce7982e8ebd1 SHA256 7a5c2e5c8bb1cd2fac285fd681efb5239a5808f830675ed965cdefc382644e36
EBUILD json-1.4.3.ebuild 1873 RMD160 f0f0601205dfe91cf3dd24dfd43696b7ea5dc850 SHA1 3c357c9ae02b59e42222b0d5d7c96d93a654355d SHA256 e239409220596c99bdf9e136f187c71482530acbe3255470131820ea1eabe9fb
-MISC ChangeLog 4719 RMD160 601d56cf231ff2417e9e61870bc93504567fdbe9 SHA1 0dcfe736c9c565c4fa838d2b6bb97406519731f7 SHA256 4eb8b2bbe9195ce0f95c5795b5de3334820da291c67c6303e50442d5a018f315
+MISC ChangeLog 4905 RMD160 c0331eeebaf47ef509ab804d0f6ba4cd7a87fe1f SHA1 6c3cb1431298376fc237d30a8d8c4de857154068 SHA256 d13a06b85594776499d223e58fe08d170ad763c98fd889ef1c56d176aa1b3cd0
MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkv6zwMACgkQCaWpQKGI+9SbMgCfYy3jZAS6gpXZ7NI4ROj53+OA
-IiwAmwYQVHc7AT9jNFTqGEuKqpgPA7iO
-=oFLg
+iF4EAREIAAYFAkwTZNwACgkQZihJkut28SvNIAD/RZnN1E1e7VD3OANKCosw3SIU
+2X11ejRMFII/ppF+XtIBAIlETtsy2Xw03J5IUBo5QXHhBEOBjrgl79vnPGxqwvzE
+=PYBB
-----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.4.3-r1.ebuild b/dev-ruby/json/json-1.4.3-r1.ebuild
index bc8cb9f28aa7..4388547f641a 100644
--- a/dev-ruby/json/json-1.4.3-r1.ebuild
+++ b/dev-ruby/json/json-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.4.3-r1.ebuild,v 1.1 2010/05/23 21:47:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.4.3-r1.ebuild,v 1.2 2010/06/12 10:43:28 graaff Exp $
EAPI=2
USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -9,14 +9,14 @@ RUBY_FAKEGEM_TASK_DOC="doc"
RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README"
RUBY_FAKEGEM_DOCDIR="doc"
-inherit ruby-fakegem
+inherit multilib ruby-fakegem
DESCRIPTION="A JSON implementation as a Ruby extension."
HOMEPAGE="http://json.rubyforge.org/"
LICENSE="|| ( Ruby GPL-2 )"
SRC_URI="mirror://rubygems/${P}.gem"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris ~x64-macos"
SLOT="0"
IUSE=""
@@ -59,7 +59,7 @@ each_ruby_test() {
each_ruby_install() {
each_fakegem_install
if [[ $(basename ${RUBY}) != "jruby" ]]; then
- ruby_fakegem_newins ext/json/ext/generator.so lib/json/ext/generator.so
- ruby_fakegem_newins ext/json/ext/parser.so lib/json/ext/parser.so
+ ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
+ ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
fi
}