Cleanup.

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

4 files changed, 11 insertions, 136 deletions

diff --git a/dev-ruby/hpricot/ChangeLog b/dev-ruby/hpricot/ChangeLog
index 35f7a0f30477..49f4d5bbf33e 100644
--- a/dev-ruby/hpricot/ChangeLog
+++ b/dev-ruby/hpricot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/hpricot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.44 2013/01/15 05:17:20 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hpricot/ChangeLog,v 1.45 2013/07/16 07:37:40 graaff Exp $
+
+  16 Jul 2013; Hans de Graaff <graaff@gentoo.org> -hpricot-0.8.4.ebuild,
+  -hpricot-0.8.6.ebuild:
+  Cleanup.
 
   15 Jan 2013; Rick Farina <zerochaos@gentoo.org> hpricot-0.8.6-r1.ebuild:
   adding ~arm keywords to net-analyzer/metasploit rdeps
diff --git a/dev-ruby/hpricot/Manifest b/dev-ruby/hpricot/Manifest
index a99c854cec09..159fc499167f 100644
--- a/dev-ruby/hpricot/Manifest
+++ b/dev-ruby/hpricot/Manifest
@@ -1,28 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX hpricot-0.8.6-fast_xs.patch 650 SHA256 82d2b8c3b4df44da8f7a8a1b5263cff57f27b853b84843e9d4edcf305d184216 SHA512 cbb1aa6138ec98e2eac9bcad8d06ed7c435a8ca503e062776576cfdddb944b294b270dd30e2c2924441ea527445df149e7ce34d085652ca6f184c4e66d209b8d WHIRLPOOL 4511612f245a6f36b86d4f2de24169013d216d6b981a3dfe0eb53f81714f8ec0fcd504701a207e74170ea6fd7d3fc971ecb87c862778dc304978d5bea418c00a
-DIST hpricot-0.8.4.gem 278016 SHA256 234590794c68ccf809f5803baaec6bb02016d0860f93229d5bd6e05ca06cbf5a SHA512 2ca12674c3699a2c1ea85b8e22efe3e3e89459ae1f458b8b2e8e3103f23243dfbb662b1dbed06970bc5d999aeccf0cf9b8fa0693f0ae4d890916c72b99dbae26 WHIRLPOOL 25ff97e4f2273b1f00982e2d161b6ab29aaf415400461bf1e1bfc1c37245b97f703f1292e496eadfa933362bbd2d8ce708a77ce540bac49dbfa77e7bebbff810
 DIST hpricot-0.8.6.gem 293888 SHA256 dfe8f4b3414ba8377d7626030f3aa605caadee9de87cffbeadf8a50359eac8ca SHA512 f0ea9168ae79d099cdb751dd5a205e0896dfb229759e499fff833e94209d1497aa97becb285176dcbcc1fee19bc11913ca3ac0d7a467067e5d837c1eb6e310ad WHIRLPOOL d45ca1c1d8edfab43abcc0a14c3b035b9b9b934d95212ce61109692d83bbc641c34451b3dbd946fe9af7583628ab76eaeb097c909db5a182d2a86973b755ad4c
-EBUILD hpricot-0.8.4.ebuild 1081 SHA256 7dde13da5f5df37c6908b9bc13e71211cef7b43ed150b0143d428d38c2a7dbd4 SHA512 d67718c3c8a4b10df5b4accddafb7aa0b2ca8f9a2f0b234bd105022bff7580c399f20a4cec3411967223af1013bb2aa911daa555a9059d5ec9ca380bf3b9e64a WHIRLPOOL 07d1b4406a60b6f15da632e2e4a289b4f8af299c292b949e079a473c8744d669abf32c891d0333fc1c83c1d39559cfc9fa9c08a623c3703aba6e929a1eead0e0
 EBUILD hpricot-0.8.6-r1.ebuild 2165 SHA256 b10afc64d7f90b1cec51b9cb2cbad30b40f8faaaaa283c5a560381bdc31a4c1e SHA512 8114609735799c285582703d02411cd50e93e0aa263ad08dad9b545ed15e37b2bb89716a34b78563249e9ceda6560898b2a6ecb72bae797054e9c1d343dda7e6 WHIRLPOOL 033da6ad8834d940a7d77310362699ced9b2f0cc6158efaa9ab9a191e235addfe2e5db385d0baab34b53d9030514619849c748e3a02bf73fcd7161a93d8634d8
-EBUILD hpricot-0.8.6.ebuild 2298 SHA256 50f80511bb86d47111dac350b8f18f5cebce78bc654098ec83a66988593257f4 SHA512 e535e73a23147bc09f277c6d1dd5cc72871354755a7bbb9609f6c58cc6cc7a70a0358508cb531c98175250b491b2bc78c700fc999723d49eaf025c23cd6ba910 WHIRLPOOL 8b380f9f0ae3d74f9d974d4de04a2fad6e0877ed4c97d2c72c2b765d1c02cf353a35a2c72a1ca8aa8d5544f28a7071bc7a7ed138b4099b6cbc9febc70b4cbba0
-MISC ChangeLog 5882 SHA256 faba4946955120b8875de25ee374a3eac6ab98685e60c9cdf036568d4864afc3 SHA512 7c01b427c2f3ec2db938fecda3f07b41435f85ff744478906786b6ab6e5e06c8242bf2c3c35bcf502d72d6e0eb014827b80bf75fc19f43dc256cb5d5b2268ff0 WHIRLPOOL df54e505cc95559e3cf1185febe560c4498ae98cccf044d952456d72892968722de28afddf273dd4dc5fe1a47547031aac0e39c74916504a2fdda17d69b520af
+MISC ChangeLog 5989 SHA256 905534fd5ca57c3161472958943e4452bed8253f00671b1636cd362e806e276d SHA512 1458e86a1335d821081b102c9af000b9e07d794c34692842c4e78a9d94aaa881265b225666be61d0b777b4168ff505e4a347d7069d12ae4a38939b78d280ded5 WHIRLPOOL d3bc41eadc63187e8ca36e370532386ddd3ce81514542bb1383c480f5ecf2ecc0632ad955e917a91511c314670bb5109999171534b62fe2de66f7daff6cdbbd2
 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)
 
-iQIcBAEBCgAGBQJQ9OakAAoJEKXdFCfdEflKZrUQAJJZZBg3EUIwp3tm81SM+6WK
-Usxl4/ZlGSX1p5Sjem8Jm+qEe8V3y9rjA9/dR10dCKd5lL1c4wmA5vhez9H+i9dw
-t5Y2P9EuwlKsTJyKGRLRRdgL7Zp6x9njkN0hPg2xBpMmIH8fJWRkSRg2+VzUGJX8
-Z9sA33aUDD1l1RJnUy5j1fcjZ5k5ikX/eunA06AEksdDkOqCmLMpHoLyogetJBO0
-j+zPKanyL7go1YQ22qF4FFndM3vn9pTcwODagK5TZCBYhgi4XmY2a0VyFP3BwMMN
-Lkb8D/79zZAErM+9NHeb9iJ/nSOj+cYmM9UQxgsiW3b6EVkLt0cFbl72AGGbgJYl
-X59hLKne5s6t5GfRGl2RPGA5UTcvM0r5Vmz3EOHjwA+JgElSAAzDpo30nyhQgEsR
-BGgkln2uux5K84YXYdbm7kUwanphm7vhgIe0V24D9H+jGUr+lIw0ibjo4DliQEQ6
-Yx7T/PkbW1kFtPvNsy1hCommmQBLmiN7dHA0PBvL223f6ivxdH9pf/BXRIUIQOB8
-6RlQOmhDUq92ttbz6yX23CpFQv2Une0v7OBNnweNRpGZVtkw0MRG85LRda2O34pG
-4PtdSziccb1Spr0PdWq3JaqZf+1hQZ9FMTLyTKsPXhzbqLVTWCeoS1vQD+y4WYut
-51WtQzUmbUG09g7SYARQ
-=MhGW
+iF4EAREIAAYFAlHk+EUACgkQiIP6VqMIqNc4KgD/dDFbuFhM94nyg5r124j5fyX3
++zzPv8/9WC34754gbGkA+gMf32fE6tjY5Ys8kSSaC0RPzULOsG5CZaToeb33qs/m
+=IRIk
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/hpricot/hpricot-0.8.4.ebuild b/dev-ruby/hpricot/hpricot-0.8.4.ebuild
deleted file mode 100644
index f1dec0154b03..000000000000
--- a/dev-ruby/hpricot/hpricot-0.8.4.ebuild
+++ /dev/null
@@ -1,41 +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/hpricot/hpricot-0.8.4.ebuild,v 1.5 2012/10/28 18:14:59 armin76 Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ree18 jruby"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fast and liberal HTML parser for Ruby."
-HOMEPAGE="http://wiki.github.com/hpricot/hpricot"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc 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="${DEPEND}
-	dev-util/ragel
-	ruby_targets_jruby? ( >=virtual/jdk-1.5 )"
-
-ruby_add_bdepend "dev-ruby/rake
-	dev-ruby/rake-compiler
-	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.6.ebuild b/dev-ruby/hpricot/hpricot-0.8.6.ebuild
deleted file mode 100644
index 7b37e63c46b8..000000000000
--- a/dev-ruby/hpricot/hpricot-0.8.6.ebuild
+++ /dev/null
@@ -1,75 +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/hpricot/hpricot-0.8.6.ebuild,v 1.2 2012/10/28 18:14:58 armin76 Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ree18 ruby19 jruby"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fast and liberal HTML parser for Ruby."
-HOMEPAGE="http://wiki.github.com/hpricot/hpricot"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~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="${DEPEND}
-	dev-util/ragel
-	ruby_targets_jruby? ( >=virtual/jdk-1.5 )"
-RDEPEND="${RDEPEND}"
-
-ruby_add_bdepend "dev-ruby/rake
-	dev-ruby/rake-compiler
-	test? ( virtual/ruby-test-unit )"
-
-# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
-RUBY_TARGETS="${RUBY_TARGETS/jruby/}" \
-	ruby_add_rdepend="dev-ruby/fast_xs"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-
-	# Fix encoding assumption of environment for Ruby 1.9.
-	# https://github.com/hpricot/hpricot/issues/52
-	# sed -i -e '1 iEncoding.default_external=Encoding::UTF_8 if RUBY_VERSION =~ /1.9/' test/load_files.rb || die
-}
-
-each_ruby_prepare() {
-	# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
-	[[ ${RUBY} == */jruby ]] && continue
-
-	pushd .. &>/dev/null
-	epatch "${FILESDIR}"/${P}-fast_xs.patch
-	popd .. &>/dev/null
-}
-
-each_ruby_configure() {
-	# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
-	if [[ ${RUBY} == */jruby ]]; then
-		${RUBY} -Cext/fast_xs extconf.rb || die "fast_xs/extconf.rb failed"
-	fi
-
-	${RUBY} -Cext/hpricot_scan extconf.rb || die "hpricot_scan/extconf.rb failed"
-}
-
-each_ruby_compile() {
-	local modname=$(get_modname)
-
-	# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
-	if [[ ${RUBY} == */jruby ]]; then
-		modname=".jar"
-		emake -Cext/fast_xs || die "make fast_xs failed"
-		cp ext/fast_xs/fast_xs.jar lib/ || die
-	fi
-
-	emake -Cext/hpricot_scan CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "make hpricot_scan failed"
-	cp ext/hpricot_scan/hpricot_scan${modname} lib/ || die
-}