Cleanup old versions, use new syntax.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 10 insertions, 114 deletions

diff --git a/dev-ruby/hpricot/ChangeLog b/dev-ruby/hpricot/ChangeLog
index e73fc4b3f8c2..62592696e65f 100644
--- a/dev-ruby/hpricot/ChangeLog
+++ b/dev-ruby/hpricot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/hpricot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.20 2010/02/01 16:39:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.21 2010/05/22 13:33:37 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> -hpricot-0.8.ebuild,
+  -hpricot-0.8.2.ebuild, hpricot-0.8.2-r1.ebuild:
+  Cleanup old versions, use new syntax.
 
 *hpricot-0.8.2-r1 (01 Feb 2010)
 
diff --git a/dev-ruby/hpricot/hpricot-0.8.2-r1.ebuild b/dev-ruby/hpricot/hpricot-0.8.2-r1.ebuild
index 0d4263736fcc..82eef8dbeccb 100644
--- a/dev-ruby/hpricot/hpricot-0.8.2-r1.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.2-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/hpricot/hpricot-0.8.2-r1.ebuild,v 1.1 2010/02/01 16:39:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.2-r1.ebuild,v 1.2 2010/05/22 13:33:37 flameeyes Exp $
 
 EAPI=2
 
@@ -21,11 +21,12 @@ IUSE=""
 
 # Probably needs the same jdk as JRuby but I'm not sure how to express
 # that just yet.
-DEPEND="dev-util/ragel
+DEPEND="${DEPEND}
+	dev-util/ragel
 	ruby_targets_jruby? ( >=virtual/jdk-1.5 )"
 
-ruby_add_bdepend dev-ruby/rake
-ruby_add_bdepend test virtual/ruby-test-unit
+ruby_add_bdepend "dev-ruby/rake
+	test? ( virtual/ruby-test-unit )"
 
 all_ruby_prepare() {
 	# Fix issue #11 from upstream
diff --git a/dev-ruby/hpricot/hpricot-0.8.2.ebuild b/dev-ruby/hpricot/hpricot-0.8.2.ebuild
deleted file mode 100644
index 84709e30835d..000000000000
--- a/dev-ruby/hpricot/hpricot-0.8.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.2.ebuild,v 1.3 2010/01/16 08:33:22 fauli Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ruby19 jruby"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast and liberal HTML parser for Ruby."
-HOMEPAGE="http://wiki.github.com/why/hpricot"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-# Probably needs the same jdk as JRuby but I'm not sure how to express
-# that just yet.
-DEPEND="dev-util/ragel
-	ruby_targets_jruby? ( >=virtual/jdk-1.5 )"
-
-ruby_add_bdepend dev-ruby/rake
-ruby_add_bdepend test virtual/ruby-test-unit
-
-each_ruby_compile() {
-	case $(basename ${RUBY}) in
-		jruby)
-			${RUBY} -S rake compile_java || die "rake compile failed"
-			;;
-		*)
-			${RUBY} -S rake compile || die "rake compile failed"
-			;;
-	esac
-}
diff --git a/dev-ruby/hpricot/hpricot-0.8.ebuild b/dev-ruby/hpricot/hpricot-0.8.ebuild
deleted file mode 100644
index 83e40be959fa..000000000000
--- a/dev-ruby/hpricot/hpricot-0.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/hpricot-0.8.ebuild,v 1.2 2009/05/09 12:24:23 flameeyes Exp $
-
-EAPI=2
-
-inherit ruby
-
-GITHUB_USER=why
-
-USE_RUBY="ruby18"
-
-DESCRIPTION="A fast and liberal HTML parser for Ruby."
-HOMEPAGE="http://wiki.github.com/why/hpricot"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc test"
-
-DEPEND="dev-util/ragel
-	dev-ruby/rake"
-RDEPEND=">=dev-lang/ruby-1.8.4"
-
-dofakegemspec() {
-	cat - > "${T}"/${P}.gemspec <<EOF
-Gem::Specification.new do |s|
-  s.name = "${PN}"
-  s.version = "${PV}"
-  s.summary = "${DESCRIPTION}"
-  s.homepage = "${HOMEPAGE}"
-end
-EOF
-
-	insinto $(${RUBY} -r rbconfig -e 'print Config::CONFIG["vendorlibdir"]' | sed -e 's:vendor_ruby:gems:')/specifications
-	doins "${T}"/${P}.gemspec || die "Unable to install fake gemspec"
-}
-
-src_compile() {
-	rake compile || die "rake failed"
-
-	if use doc; then
-		rake rdoc || die "rake rdoc failed"
-	fi
-}
-
-src_test() {
-	for ruby in $USE_RUBY; do
-		[[ -n `type -p $ruby` ]] || continue
-		$ruby $(type -p rake) test || die "testsuite failed"
-	done
-}
-
-src_install() {
-	pushd lib
-	doruby -r *.rb hpricot || die "doruby failed"
-	exeinto $(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
-	doexe *.so || die "doruby failed"
-	popd
-
-	if use doc; then
-		dohtml -r doc/* || die "dohtml failed"
-	fi
-
-	dodoc CHANGELOG README || die "dodoc failed"
-
-	dofakegemspec
-}