Cleanup.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

5 files changed, 9 insertions, 130 deletions

diff --git a/dev-ruby/htmlentities/ChangeLog b/dev-ruby/htmlentities/ChangeLog
index deb3e2b91831..0a72b52a7577 100644
--- a/dev-ruby/htmlentities/ChangeLog
+++ b/dev-ruby/htmlentities/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for dev-ruby/htmlentities
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/htmlentities/ChangeLog,v 1.30 2012/08/14 18:36:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/htmlentities/ChangeLog,v 1.31 2012/08/14 18:46:42 graaff Exp $
 
   14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Update metadata.xml so that it's the same as most other packages.
 
+  14 Aug 2012; Hans de Graaff <graaff@gentoo.org> -htmlentities-4.2.2.ebuild:
+  Cleanup.
+
   05 Aug 2012; Agostino Sarubbo <ago@gentoo.org> htmlentities-4.3.1.ebuild:
   Stable for amd64, wrt bug #428688
 
diff --git a/dev-ruby/htmlentities/htmlentities-4.2.2.ebuild b/dev-ruby/htmlentities/htmlentities-4.2.2.ebuild
deleted file mode 100644
index e834c16fffdf..000000000000
--- a/dev-ruby/htmlentities/htmlentities-4.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/htmlentities/htmlentities-4.2.2.ebuild,v 1.5 2011/01/02 11:39:10 phajdan.jr Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple library for encoding/decoding entities in (X)HTML documents."
-HOMEPAGE="http://htmlentities.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-macos"
-IUSE=""
-
-ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. test/test_all.rb || die "tests failed"
-}
diff --git a/dev-ruby/httpclient/ChangeLog b/dev-ruby/httpclient/ChangeLog
index e3305378050a..095967c78dbf 100644
--- a/dev-ruby/httpclient/ChangeLog
+++ b/dev-ruby/httpclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/httpclient
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/httpclient/ChangeLog,v 1.41 2012/05/21 10:17:12 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/httpclient/ChangeLog,v 1.42 2012/08/14 18:49:02 graaff Exp $
+
+  14 Aug 2012; Hans de Graaff <graaff@gentoo.org>
+  -httpclient-2.1.5.2-r1.ebuild, -httpclient-2.2.4.ebuild:
+  Cleanup.
 
   21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> httpclient-2.2.2.ebuild:
   x86 stable wrt bug #393583
diff --git a/dev-ruby/httpclient/httpclient-2.1.5.2-r1.ebuild b/dev-ruby/httpclient/httpclient-2.1.5.2-r1.ebuild
deleted file mode 100644
index 22ff802de35c..000000000000
--- a/dev-ruby/httpclient/httpclient-2.1.5.2-r1.ebuild
+++ /dev/null
@@ -1,35 +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/httpclient/httpclient-2.1.5.2-r1.ebuild,v 1.11 2012/05/01 18:24:15 armin76 Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_TEST="-Ilib test"
-RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="'httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby"
-HOMEPAGE="http://dev.ctor.org/http-access2/"
-SRC_URI="http://dev.ctor.org/download/${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	!dev-ruby/http-access2"
-
-RESTRICT="test"
-
-# tests are known to fail, but at least they fail for all
-# implementations in the same way.
-ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
diff --git a/dev-ruby/httpclient/httpclient-2.2.4.ebuild b/dev-ruby/httpclient/httpclient-2.2.4.ebuild
deleted file mode 100644
index 99e6ec2f63a6..000000000000
--- a/dev-ruby/httpclient/httpclient-2.2.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/httpclient/httpclient-2.2.4.ebuild,v 1.4 2012/05/01 18:24:15 armin76 Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ree18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_TEST="-Ilib test"
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="'httpclient' gives something like the functionality of libwww-perl (LWP) in Ruby"
-HOMEPAGE="https://github.com/nahi/httpclient"
-SRC_URI="https://github.com/nahi/httpclient/tarball/v${PV} -> ${P}.tgz"
-RUBY_S="nahi-httpclient-*"
-
-LICENSE="Ruby"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	!dev-ruby/http-access2"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare () {
-	rm Gemfile || die
-	sed -i -e '/[bB]undler/s:^:#:' Rakefile || die
-
-	# Comment out harmless test failures with ruby 1.8, bug 411191
-	sed -i -e '228,268 s:^:#:' test/test_http-access2.rb || die
-
-	# Comment out test requiring network access that makes assumptions
-	# about the environment, bug 395155
-	sed -i -e '/test_async_error/,/^  end/ s:^:#:' test/test_httpclient.rb || die
-}
-
-each_ruby_prepare() {
-	# Don't run two tests that are known to fail with jruby. This is a
-	# bug in jruby that won't be fixed until jruby 1.7.
-	# https://github.com/nahi/httpclient/issues/61
-	case ${RUBY} in
-		*jruby)
-			sed -i -e '/test_get_gzipped_content/,/end/s:^:#:' \
-				-e '/test_socket_local/,/^  end/s:^:#:' \
-				test/test_httpclient.rb
-			;;
-		*)
-			;;
-	esac
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb test/test_*.rb || die
-}