Cleanup.

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

6 files changed, 9 insertions, 266 deletions

diff --git a/dev-ruby/json/ChangeLog b/dev-ruby/json/ChangeLog
index 8de4e97ca47a..432aaacaa04b 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.102 2013/01/28 15:15:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.103 2013/02/11 19:17:42 graaff Exp $
+
+  11 Feb 2013; Hans de Graaff <graaff@gentoo.org> -json-1.5.4.ebuild,
+  -json-1.5.4-r1.ebuild, -json-1.7.4.ebuild, -json-1.7.5.ebuild:
+  Cleanup.
 
   28 Jan 2013; Alexis Ballier <aballier@gentoo.org> json-1.7.6.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 3b2a43a4157e..0bd3843422fc 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,23 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST json-1.5.4.gem 678912 SHA256 3acf6c344e5f9089b6e4d675d18384bb61a36c81d038ce9a65906987711c789e SHA512 f38768fb3bb2f9a5348d662b65c608eec635aa6ae931245d8afeca03ced587ad55186d78f95a1dad95700621bad526ea2eac51e4db4c66b46c726eaa4f02a897 WHIRLPOOL ffb1903ee5bb2193c5cc08e5ee872fca92a4981663fa77ce9f27ff897ce6279fd793eec2df92716c09deab62afa9bc1876c02a542e06b2722b0bf991eb61d051
 DIST json-1.6.7.gem 143872 SHA256 02ad99f012ea4aaaab5b15fd3b0b44ac05aed08ef29e0173d46fcf01d63a070f SHA512 200c0fa2dfecdf78bc8d9faa6b8cccaaa61966d2314f2d7aee0ac778bd0a0959894c8c5bebf6cb858a084b041fd68fe5106ab6545be3bf7b3dc28e7449efe1d9 WHIRLPOOL 2a58c1219f5b82255a947fcea79aaccbe71b31e930efc9c3eb7d1a06f6e9f20c8fcc5e31f3fd07337d43e49723139ba0575c8027faa362cca25adc05bf3b6af9
-DIST json-1.7.4.gem 145920 SHA256 d2129e3fa9f5ed1629367559a0740d8d920e0f5d328e7450a380ee8040eb9e4d SHA512 c0e5deceb3f67009abc6297ab5845885256bfc23079fdd09ed2e8ba4a05fb836be50cc64f00768cd7c0f2997f4dcdf02e096b116ca453913aba08d808ca3883c WHIRLPOOL 694311f2614cecfc6352ede4b8f2d69b029c037a16cdf0ab9dc793483fd0c269ba3efae99fb13bb14d0eda896b3f545afdfe2891faf3369514e72da5ca4be0d6
-DIST json-1.7.5.gem 145920 SHA256 e064596aed55983ece9b4864a347ace1b2f0d3541292c5bf4be955994f8d8e7c SHA512 840f83f7f56becb9e3f53e951e51d2d340148387cac92822f36b3f61766e55e4c04a7c958d39457ddd351ac510ab7e373cc1b773c0203b0ca0ece83a1d384b3d WHIRLPOOL 4b69f87fbb617e6cdbcd76299d666bdac940ad280fa76ef1ea8783316703f88fbcde86d1606025edc7dae13b9b6bd33ff41387c8b3f1fc38326e226b0fff3c78
 DIST json-1.7.6.gem 146432 SHA256 4aa06575429fd28919d137dccb8b3c11bd0518466d94dc185fffc8fa3f6bb008 SHA512 520baa7413e620b6eb514b27156298551d9d14bed26740dfb1ab633f0ccdb7916e735c467e4f7839f802dcaedad6701ec09c447396e1f18e22864ca468c6d643 WHIRLPOOL bb4772574789fd8b6c8788cb5887b288b24df8e048b0de5b3f33306c963a2b608403306fb5675422f776a0f0f9979cae2a297bc4f960c61e29a0a350ef7deb3a
-EBUILD json-1.5.4-r1.ebuild 1897 SHA256 0844022cc65f022e88b008cc8ebf0e17c51be3d584c056210490ae4102a6992d SHA512 7819d3ee8464b5af534a1d97cfe5873bbcf61324694fdb35c34377089a709545a33fde4bede444e4cd303965cd0888acbe368fd56f177491fc97f995aca59180 WHIRLPOOL 291e1774253b5cb687ecaa6c521885768a584368469ef81a6e49776d8de42240bd53ac659ba22670086596e842db0001e341238bb55f91da794ada6422a46978
-EBUILD json-1.5.4.ebuild 1882 SHA256 7d30ea4d1ddc3b04c248752a50c68080152c2c971352286689bcea02601d49a5 SHA512 98b79c0ba0d366ddf68360a3f01f8cf31bb8fb3b74c620eb1fb9aa31ef2ff43d767eaf10819f12a3e5fb04fae56c9908737a3eb4b4ba7d22c8172505245006d2 WHIRLPOOL 75bc2da173664550e50e9c7b4df1aef40cc9fe5ba928b2ea2a474445c4b8c12d538232115d0321e210d03cfa56d9ba3118193b8ed70d87d14a2c6c97d51ea1d1
 EBUILD json-1.6.7.ebuild 1981 SHA256 4968ab9d7bb7ef9eb1cff6cccc635ecb9089d3daa196dc163c020c618bf4bece SHA512 927d677c6db3037d7a863834a707a3c3f41cdc53e0db3f36810a22c176d9a597ea680487ede9731d4860e1ad84bc965d0c46c92a22f56f00e50aa8210d186fbd WHIRLPOOL 9a07de4356f76b73b59291292b2d24486b6c34679cf2bdf974ca686721a16878006e8d4b50cee3a3f3e19ffbe1b1622702cba1ddae8161b3bdd578a9a0bcf08f
-EBUILD json-1.7.4.ebuild 1995 SHA256 9e35b383be8a2faa6dfef6b8a6953482c1e3877da18f8871ebd7689a54b9ba2d SHA512 30c270d192be99cf06cc1e9555e4373f262effd51d2204a4124eb1f91155251584cee987f5ff8bebe32e09a65c23489393082fd598ff926592b5cd7e66674d2a WHIRLPOOL a781c8848e6058870462e35f20e7df4756753e0077c24ca24c8dbfae03c35b1b3c927d63b29e70ae02a8d792ca517d67f99fc53935bd8ad05dcca02147c93bed
-EBUILD json-1.7.5.ebuild 1995 SHA256 fa78cb0ece60d495e33633d5cd1ae831d55e710959d1243238ff692aed9a4623 SHA512 f28b51360ea4fab611072a554492af23208eb1476953826d8d1e934212aca490ef154e33f8512d03c7231015967795a9f85325340a9844e0922585a4f58097a0 WHIRLPOOL d53a395b3f70cda87efd1976192a893e6e39cbbd2886634224270b3bdd2f353fb161d3f539038838c9f5919fe90b938c560d0dffcfc29d1b5f628eea88829aef
 EBUILD json-1.7.6.ebuild 2009 SHA256 0253e2df6b3687ed7203df127b4d0803166807020edbcf887865d57c97b45d80 SHA512 e2dcf4c211d56acee786f40ca863b9e22ab2af35b0aafce38dc711d0d0b6aa311be12292b664b720a82f6c9ad8038771b71de4c8ad65ef27bb21afaabb2717ee WHIRLPOOL fe9b681c22f603dcc58a4ca9d1a470b779189e091f2d676f85ffb9064432f11134f94d54b8c954a1c3784d23c5204f0af6f7c580a6860b9c9b67d91a3dd2d8a8
-MISC ChangeLog 13046 SHA256 ee136b54c6003410af425012a7d9bc73e41670abb425fe792feee0807a194f7b SHA512 1b5ee38b8015938d2f3180275cd5f9bda0024ae084177d013e0edf71299909b356655bca070e71d57d70dbdf29e375edac5988c73543747d63c23417e39d884b WHIRLPOOL 2ac3dfda0533005ffc424188e8395b15d56bda06f2c723636d64023e266aa9343efb4766621674dfe46f44d5273a0c4a0291dbd330ae37df300afac17313f5f9
+MISC ChangeLog 13191 SHA256 4ba1b94347a4f2f3b1d14bbfa6dc2f4b6592437d48a0ab6b8ebf22270327d1ac SHA512 c1b0115879d53d565bb31865bccb931a24104eecbb01387c56bbfe4aeb37c9ccc0ebb54f6354dd873001338a4d78c5a1c97ccea4107a412396e98f090d0fe5ed WHIRLPOOL 8df0dfc9a4e51037cebfdb1e98e892162e606f81127d65f2693d6f3e940634f142869dd50d7c85e0cde3ae750fa5328812e86e534815429dbf079c2eed2eae24
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEGliAACgkQvFcC4BYPU0pGggCfRs8MF76PeAJLyqkmBIoHS3n+
-NhIAoKnVnBNnp/gmNqq0H+v405wB0mdu
-=PEnm
+iF4EAREIAAYFAlEZQ9cACgkQiIP6VqMIqNcYQAD/a/E/G4B27wAZiVOaftK3DrUt
+Ib217Omr0ZurByg6L3IA/1VaSQgdjP0MzFJXfaRkHXYP9Hy0ZPiasE8UZOjZfIfD
+=KTfn
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/json/json-1.5.4-r1.ebuild b/dev-ruby/json/json-1.5.4-r1.ebuild
deleted file mode 100644
index d768bc942210..000000000000
--- a/dev-ruby/json/json-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,62 +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.5.4-r1.ebuild,v 1.6 2012/07/25 20:33:10 blueness Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ree18 jruby ruby19"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( virtual/ruby-test-unit )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	sed -i \
-		-e 's| => :compile||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		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 -rtest/unit -e "Dir['test/*.rb'].each{|f| require f}" || die "pure ruby tests failed"
-
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		JSON=ext \
-		${RUBY} -Iext:lib -rtest/unit -e "Dir['test/*.rb'].each{|f| require f}" || 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.5.4.ebuild b/dev-ruby/json/json-1.5.4.ebuild
deleted file mode 100644
index ea11f76d5c90..000000000000
--- a/dev-ruby/json/json-1.5.4.ebuild
+++ /dev/null
@@ -1,62 +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.5.4.ebuild,v 1.9 2012/03/08 23:01:12 ranger Exp $
-
-EAPI=2
-USE_RUBY="ruby18 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	test? ( virtual/ruby-test-unit )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	sed -i \
-		-e 's| => :compile||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		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 -rtest/unit -e "Dir['test/*.rb'].each{|f| require f}" || die "pure ruby tests failed"
-
-	if [[ $(basename ${RUBY}) != "jruby" ]]; then
-		JSON=ext \
-		${RUBY} -Iext:lib -rtest/unit -e "Dir['test/*.rb'].each{|f| require f}" || 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.4.ebuild b/dev-ruby/json/json-1.7.4.ebuild
deleted file mode 100644
index 55ea579b596e..000000000000
--- a/dev-ruby/json/json-1.7.4.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.7.4.ebuild,v 1.1 2012/07/31 05:48:26 graaff 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.5.ebuild b/dev-ruby/json/json-1.7.5.ebuild
deleted file mode 100644
index 4eb3655eabd6..000000000000
--- a/dev-ruby/json/json-1.7.5.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.7.5.ebuild,v 1.1 2012/08/21 19:04:25 graaff Exp $
-
-EAPI=4
-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
-}