Cleanup.

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

4 files changed, 11 insertions, 151 deletions

diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index 0307a80fc860..18808f51af51 100644
--- a/dev-ruby/json/ChangeLog
+++ b/dev-ruby/json/ChangeLog
@@ -1,6 +1,10 @@
 # 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.127 2013/04/14 11:48:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.128 2013/06/30 08:36:31 graaff Exp $
+
+  30 Jun 2013; Hans de Graaff <graaff@gentoo.org> -json-1.6.7.ebuild,
+  -json-1.7.6.ebuild:
+  Cleanup.
 
   14 Apr 2013; Agostino Sarubbo <ago@gentoo.org> json-1.7.7.ebuild:
   Stable for sh, wrt bug #464366
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index d91b4ac68f6c..3630ad39d806 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,31 +1,17 @@
 -----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
-DIST json-1.7.6.gem 146432 SHA256 4aa06575429fd28919d137dccb8b3c11bd0518466d94dc185fffc8fa3f6bb008 SHA512 520baa7413e620b6eb514b27156298551d9d14bed26740dfb1ab633f0ccdb7916e735c467e4f7839f802dcaedad6701ec09c447396e1f18e22864ca468c6d643 WHIRLPOOL bb4772574789fd8b6c8788cb5887b288b24df8e048b0de5b3f33306c963a2b608403306fb5675422f776a0f0f9979cae2a297bc4f960c61e29a0a350ef7deb3a
 DIST json-1.7.7.gem 148480 SHA256 fd702ed46565b354d7508e88bb3c4855f7fdd771ab89435d7ecbbe98deb0b7ec SHA512 b73cc6427854b00fecc36fb6a3da89562b9ef352342d2766da7c22a9311620c12090d84704b9dda9ca35da5893676f1c1b2ced53ca06da27194230825f73b7e8 WHIRLPOOL 29c4a581c60a2311ac77eaec278bb123be18f4c6acac23d286e3116a8a84df3ae5089be0116827e579f5460b803cf3d8066cb8ff9c298a4b045e67c473c0d431
-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 1994 SHA256 1029fc804a2be258dad78a72143e12f97d871f859d7ae673bdea2587c00fef70 SHA512 83595f04a4eb7da1c7d3fa79dfa0e698e7458f8a6a00f728459f81b2c551ba8c484876f2155357d2a9fd84fc5b140d419608cac011fefdf5a68c5552155d839f WHIRLPOOL f44f2eb684c5695510cec499099274c654779e1befa75194d2609b5b098dbedf3fe420dfaa3ed1625c5401685380aa523c92e34d5143c0798465b0ab5039cc51
-MISC ChangeLog 15796 SHA256 1017f4b1ba3af117155eaa0b0348873b926d7d778e8b2929a7b1f86ddac47aec SHA512 c403244cf93408b97a0ba923a1b117a220d4559560b4441dcd4b085b4d025fcc09268eda13c01aa2f52affa5cd5377672c14a1bcdac4e44457385fa8eebdcbcb WHIRLPOOL 7211b49021831033d7c3e05d08ee4f1e8779da7db5be1acc0f37d0ffc8041db75343d13af3c879b462b0e6bd55080e2f99e91f5b55b997e67334c4679757043f
+MISC ChangeLog 15903 SHA256 1b10be83e1240effa646b3af1cf4096ee61e0843e6fb659d114cc676355b22ed SHA512 55b3da0bd648d9eb77a578404ee7db91203d726e9ce3baa77851aff9ba95183e8ee8410d41904ed5161aca62ee7328d0721fd60610a01abaab7ce83f33dd7d2b WHIRLPOOL 45c36eba56977d4e3c3272fc2981bb189650ca27b056c31798a5bc42c5834e337c71a773a7f4e53fcb366fded45d986a45bc3d55490d6d89deab435211cf4a28
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRapbsAAoJELp701BxlEWfdvgP/REu5oRI8wSGHEF/vfZdyMDf
-FRhlsLUEHGtt7CpJH1nrVTbIwJ0QflV3KgdllGnDGjJ7pOwRmMbuevXOupY97EFf
-8jZ+8wxKCauZzXg7V27Ol55r5sE5FiiT79+RSD30xHwwyYfmKSKRid07Nx1Qe3GY
-P+vD4P/tcOw/6/hRI9XnKEmvKvI2ERfwU/aeQFaa8hmkj/QPxnDkyyr5g5Qk8AyG
-RLGrGYRy0LjyKQmC/MZnDmJyutve6lF/d4/xZxtKyjHAWZhuiDoV5FMTGH2SDUZw
-xN+nAM4FbrR0WqtUNZRzBKY2NrvhaKBSfQ8PzSAgn9+pJ0N5pQjhY24vkF7y/YmJ
-5DSCePD3i1aHxrEfr+tL0akn2PhvgaThiqyh4He7nDQocrL0/4BfQxKSOqeNOVeX
-NE1GdhQ9Eua5oW9UAORxqIO0Wfz9Ie+PJ5FOcshgOa2brIeMSp0z2pd1ZkX9ZDFo
-KLQXKc02PeShIKAMzhPlA7qPMSW1R4YTBAcNgjxRHIfsigFAWcshA3yEAUO2jv0S
-ms4id1iok/lqqyr8Gn85TFDJOV63p/AKJYL8NbaL2PYi1yAYiGSsRxJqwi2F08Pe
-yxTOI/vqgmOnHBuc/f1ucwa/T8wvoCAx0JdUX8kzwW+2yp5f+SByfZ/RjKA4dxRk
-71KS2OGZC/zG9I9JEmzW
-=nyD5
+iF4EAREIAAYFAlHP7hAACgkQiIP6VqMIqNfX2wD+IIHhgaMJczJqeznwB/UdI8LP
+ion8aPIVa8xObfmHzBQA/1axayKXdVVPXghH0CXzoYO1CqOUBHlNNlXecpsmGcIj
+=WXMg
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.6.7.ebuild b/dev-ruby/json/json-1.6.7.ebuild
deleted file mode 100644
index b87625a03257..000000000000
--- a/dev-ruby/json/json-1.6.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.6.7.ebuild,v 1.8 2012/11/06 16:48:30 jer Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ree18 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 ~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"
-}
-
-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
-}
diff --git a/dev-ruby/json/json-1.7.6.ebuild b/dev-ruby/json/json-1.7.6.ebuild
deleted file mode 100644
index bc6f5491b419..000000000000
--- a/dev-ruby/json/json-1.7.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.6.ebuild,v 1.2 2013/01/28 15:15:43 aballier Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ree18 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"
-}
-
-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
-}