Respect user CFLAGS, bug 464716.

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

3 files changed, 80 insertions, 16 deletions

diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index 8ea45b7f886d..92729920b9bc 100644
--- a/dev-ruby/json/ChangeLog
+++ b/dev-ruby/json/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/json
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.120 2013/04/05 20:31:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.121 2013/04/09 17:35:04 graaff Exp $
+
+*json-1.7.7-r1 (09 Apr 2013)
+
+  09 Apr 2013; Hans de Graaff <graaff@gentoo.org> +json-1.7.7-r1.ebuild:
+  Respect user CFLAGS, bug 464716.
 
   05 Apr 2013; Agostino Sarubbo <ago@gentoo.org> json-1.7.7.ebuild:
   Stable for arm, wrt bug #464366
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 74e7a043b4a3..7a32d9274ab5 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST json-1.6.7.gem 143872 SHA256 02ad99f012ea4aaaab5b15fd3b0b44ac05aed08ef29e0173d46fcf01d63a070f SHA512 200c0fa2dfecdf78bc8d9faa6b8cccaaa61966d2314f2d7aee0ac778bd0a0959894c8c5bebf6cb858a084b041fd68fe5106ab6545be3bf7b3dc28e7449efe1d9 WHIRLPOOL 2a58c1219f5b82255a947fcea79aaccbe71b31e930efc9c3eb7d1a06f6e9f20c8fcc5e31f3fd07337d43e49723139ba0575c8027faa362cca25adc05bf3b6af9
 DIST json-1.6.8.gem 144384 SHA256 2c66ad4038eb4a0823ee8c2d8f0a4cbf66991011b031aab0d22ded2ca75e7708 SHA512 9e63f5d3a85f6bdb93ff15b40aac4ad7d576f801ba9acb0401e87e27485f62f66209cab096131d92fa4bb015cfe2ff72cfffa632b4ff45542b402ab687d12a3c WHIRLPOOL 364cb032ab3ea62f491858d5ae9d2cd49cc51d5b4ffb0512496dd282a127da65dd154a0fcacd0e76b39c7bf9bb46e93d7fdbcde6f40a7a90e5c3bf876654cd96
@@ -8,23 +8,14 @@ DIST json-1.7.7.gem 148480 SHA256 fd702ed46565b354d7508e88bb3c4855f7fdd771ab8943
 EBUILD json-1.6.7.ebuild 1981 SHA256 4968ab9d7bb7ef9eb1cff6cccc635ecb9089d3daa196dc163c020c618bf4bece SHA512 927d677c6db3037d7a863834a707a3c3f41cdc53e0db3f36810a22c176d9a597ea680487ede9731d4860e1ad84bc965d0c46c92a22f56f00e50aa8210d186fbd WHIRLPOOL 9a07de4356f76b73b59291292b2d24486b6c34679cf2bdf974ca686721a16878006e8d4b50cee3a3f3e19ffbe1b1622702cba1ddae8161b3bdd578a9a0bcf08f
 EBUILD json-1.6.8.ebuild 1982 SHA256 01a927c37523bd075c784d23dd220eb441a624edd5dba105c9f77df4faa9a25e SHA512 47a4110ebeb74eb0af0f6125aacf6d36a71f299f0eef1a432299454e99bbe553ace49d6ac1922357b439c82675022ca0240f78441db4d60153dbb3f0db05bdc2 WHIRLPOOL 95ff7f0cdcee79650695b35dac919146869b67319ec61199046f3059cd1a9667c4489e1fb2959c0967e7f88cdd0500aa3e8a479aa89b6e3dfde27731df958fab
 EBUILD json-1.7.6.ebuild 2009 SHA256 0253e2df6b3687ed7203df127b4d0803166807020edbcf887865d57c97b45d80 SHA512 e2dcf4c211d56acee786f40ca863b9e22ab2af35b0aafce38dc711d0d0b6aa311be12292b664b720a82f6c9ad8038771b71de4c8ad65ef27bb21afaabb2717ee WHIRLPOOL fe9b681c22f603dcc58a4ca9d1a470b779189e091f2d676f85ffb9064432f11134f94d54b8c954a1c3784d23c5204f0af6f7c580a6860b9c9b67d91a3dd2d8a8
+EBUILD json-1.7.7-r1.ebuild 2146 SHA256 d45278d30740b3cefff705740f7fb954e20bb2d13e80f712f6e9f64157102407 SHA512 f48a9f528be1328a64b8c12cd4de74ecc050bb8458e764d18c246f650c762602fd332686f660fbfbc717b95c8a588f2e339dbd1059fb86b2697bbaadaa999781 WHIRLPOOL 7db21419888209353d8bbb3a2846a81384f89387e0f2503834b90dab86b9ccd8aee4e0c03a94df5df918e76a42fbcbe08305ef980cda274a0dc9cff79266fb0f
 EBUILD json-1.7.7.ebuild 1999 SHA256 f14e5fca00dca514d77dc45e5a7b1a25c1595291af55ce7eb6ddfd406ef75dd5 SHA512 1b594bba58b26cba91f91baf3c810ba30ac9cffb152905e19156a4dd5092fe0be97d04af7d8581318e37d4f1bce6d56a115b6a292eafe33c6bf01ede8e49a950 WHIRLPOOL de16968722029b4178dfa0544c9696a0792eef04ce0bdccc673912983a0d2727262d312a92816da646b575657e3a133acb4f1c3a1166b45346184d2bc6605512
-MISC ChangeLog 15037 SHA256 a9cfe049d9de6a853e7e8605a4d0d1c3f43de7f3b0cbfcbf4abe3ab688cdafb1 SHA512 c8dee72bf8cb1fbe05f7969b20b58c50b3756fff98c4d0d5b10407d964b4503b1bf1474e379d0626f88b164199355c7f7381c5f668de0da52f0a1692faea294d WHIRLPOOL 5c2d9b2b6762b41e3ff857084493a2094d887ac20753b1cc4f2e1325636343261025a8886c7e9e0b77d6506402b207cb30d598dd4e5ba5ba0e02187c3d611d10
+MISC ChangeLog 15179 SHA256 a0dc30f4dc7a44116716087c2a8354b601762463c2087ddfd4e11a39a45df89b SHA512 87d5faeac3b7c5a688da0065bf82978527bd5a8db5527575eefd1379c7b08f60c010577dbb7953876b9e6f950505546c9f199b3f5934d909b388db1db39ee94e WHIRLPOOL a2e59effa090af06ba7aaf7039af5f07da748c9f746b9eda41afbb13b335dd54aee8eb51c45f192fa30aa0ae2eb728499b14a70fd196c4064936da94a651fc9f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRXzPyAAoJELp701BxlEWfvw8QAKQdfIrvJZJhQLDKXEM1UNgA
-SaB7gaQqqbG3efk06RKlhajWKYxM+Nx6Fsgg7+B+VVAVBQcpZ9ySEcctOZZ8CNfp
-SE1outTJ0/qTwVtm2i/T7p7lzjFS+XXOu/Ux+YdU3zfbq5ElBknsMUvouirkbCxD
-aUWMtslLzZ5gH+C/YmBwgyZ/rEnLvby9NfED+P7CRn7l7QEtr9bY6GC0YARLlf8G
-lZjPz2a38riMrvdmN+TTd0lwT4pg2PF2GjP+tbVtD7RFevRzNCcIlc03HHSd5ASZ
-hPjDUJLSy5gLXV3zG/sSIo7UUiutsUxnzqu+x4Ep5sgdV/e4AqAua9TyHpUwkwb7
-TUro6rmpkDhYrEcy+5reyFdzptB0TGnqvhPwPlNzznBo1NBhXCJ+hlQpOE+IBIlN
-qyhEncB1pEZ2zrksrw7ae2mfgYkpOGQsPMIRjVQ+zDTKyFLnQf4UwFQKzhlJurOS
-e5lBFwIdiY186GsVKQH7W685JO6INi4pHdhv1+a54wHk8bSA7LsiI1e1q9iRH2Eb
-t6l0ZlgI47Zc0s67VA4HYRn5H+GpHTly4Ql8jXL7mw5kCYFtZQ8jW/eviT90lIPk
-XaqFxLGRDxSAeu53hKvFmYCmEzQtfVzOzJ4dScj3xHz6N7jOKa4OMF4GRAjXybDA
-pqZX6td0yzh2dVpqW5sP
-=l/1A
+iF4EAREIAAYFAlFkUU4ACgkQiIP6VqMIqNeyxAD/QQJ9PPfxNGjuxr0Ubp8l1wrp
+e0uuv5CE47bSIiB3/EEA/RVxj97xljrRvatrkKuXUh4BV2aDEc3/Pyqr7FO3Q4kt
+=Rwet
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.7.7-r1.ebuild b/dev-ruby/json/json-1.7.7-r1.ebuild
new file mode 100644
index 000000000000..102b7a50fe88
--- /dev/null
+++ b/dev-ruby/json/json-1.7.7-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.7.7-r1.ebuild,v 1.1 2013/04/09 17:35:04 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="json.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A JSON implementation as a Ruby extension."
+HOMEPAGE="http://json.rubyforge.org/"
+LICENSE="|| ( Ruby GPL-2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+	dev-util/ragel"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	# Avoid building the extension twice!
+	# And use rdoc instead of sdoc which we don't have packaged
+	# And don't call git to list files. We're using the pregenerated spec anyway.
+	sed -i \
+		-e 's| => :compile||' \
+		-e 's| => :clean||' \
+		-e 's|sdoc|rdoc|' \
+		-e 's|`git ls-files`|""|' \
+		Rakefile || die "rakefile fix failed"
+
+	# Remove hardcoded and broken -O setting.
+	sed -i -e '/^unless/,/^end/ d' -e '/^  (if|unless)/,/^  end/ d' ext/json/ext/*/extconf.rb || die
+}
+
+each_ruby_compile() {
+	# Since 1.5.0 a Java extension is provided but it does not compile.
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		${RUBY} -S rake compile || die "extension compile failed"
+	fi
+}
+
+each_ruby_test() {
+	JSON=pure \
+	${RUBY} -Iext:lib -S testrb tests/test_*.rb || die "pure ruby tests failed"
+
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		JSON=ext \
+		${RUBY} -Iext:lib -S testrb tests/test_*.rb || die "ext ruby tests failed"
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		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
+}