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
commit5838b95b178238bdff248dbee95467003ee75bc9 (patch)
tree6945e86b9acdaeac553458a8b522b4e03b7fdf3a /dev-ruby/json
parentVersion bump (diff)
downloadgentoo-2-5838b95b178238bdff248dbee95467003ee75bc9.tar.gz
gentoo-2-5838b95b178238bdff248dbee95467003ee75bc9.tar.bz2
gentoo-2-5838b95b178238bdff248dbee95467003ee75bc9.zip
Fix static modname and add x64-macos keyword, fixing bug 323371. Thanks to Ramon van Alteren for the patch.
(Portage version: 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/json-1.4.3-r1.ebuild10
2 files changed, 10 insertions, 6 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/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
}