Cleanup.

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

4 files changed, 9 insertions, 189 deletions

diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index 17f56b6969db..560f8cc3b828 100644
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/nokogiri
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.84 2012/12/01 18:56:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.85 2012/12/20 06:46:22 graaff Exp $
+
+  20 Dec 2012; Hans de Graaff <graaff@gentoo.org> -nokogiri-1.4.4-r1.ebuild,
+  -nokogiri-1.5.2.ebuild:
+  Cleanup.
 
   01 Dec 2012; Raúl Porcel <armin76@gentoo.org> nokogiri-1.5.5.ebuild:
   alpha/ia64/sparc/x86 stable wrt #440094
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 0193b4b97f5d..0947d1cf0e00 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -2,18 +2,14 @@
 Hash: SHA256
 
 AUX nokogiri-1.4.4-libxml-2.7.8.patch 729 SHA256 56fbfb502adbb04dc77373a2d7c3708cf7b7cf21f0419f2fc6ff40dc6fa56321 SHA512 a61e9af8a4f94fa90fe07fc1b7348e85baa9da0922e3b55aea33b4c5940fa29cfab0f1e906c382989e23080269bf993771f444074014024cb9414fd166885ebb WHIRLPOOL 375d3fa74410cd783a15e6b7e399822733c14bbe8601e0a79e90aaedf40964700934293ea04b2eb69b81671a44f89368ccaa2b191505ecfad3043eaa8cbc82c5
-DIST nokogiri-1.4.4.gem 198656 SHA256 3d1ed8cc4b6caf1f1cdb7b53be26e72ab70b7111d463d76f898f1f32d998a7b2 SHA512 bcf760ce63ef5b2b759ceef05323709537936a785984238be6d3289a3787c3d449d810144709a18fa14359e2c075ac085376c2cd42afb999984e1d3d2004e671 WHIRLPOOL 18551eacd081f4fee25c0417c9e99c6d5147b6705a4aff7a532e93e25b91f9f847f297f8b1b4d43d10f2e6482bfc4d8581454312d094cd43f8acec41f3e8f5d1
-DIST nokogiri-1.5.2.tgz 1988760 SHA256 d977baa45baa700c107a25eefea6e4b4b2771dd05204d734eee2dab9d69b1dbc SHA512 d8be36176a9d10defaa0593b92c2fcbdb7314e068864ed4749bebca851c9a3811a2985f0804141260be51b549001fbe8e2e071bc05b00399b522123ecc6cedaf WHIRLPOOL 8e125e119d21e6be25e96b6872249f241126a89c8fb606406a9f205e241ad6f490dc86f048528bdf65c25b192fffe4f9d5b348d788532fbefb0ac8bea6f77dc2
 DIST nokogiri-1.5.5.tgz 2003354 SHA256 18c1dd504596e9f60267f48d9b9b28901bf1ba66be53b64ac78b32f5d277c685 SHA512 d70ea5975cd769f6b6d6e4cfae0daa5ddb430258e19ad70ac8caca6185a5a9dd08d4178ae39fa93dae09141508f754ff4166d7b6c4130eeabe081e2f653b99f9 WHIRLPOOL d8c9a60849056323eb9b2569d589358001623467af6e7926bbdfb842f2af46bacb75c6257289ab07803c9dda3cf48a971ad4e09617beb2d0a3d6fdf9cd9ae702
-EBUILD nokogiri-1.4.4-r1.ebuild 1959 SHA256 c1bdf07b1dbbda0deca4392da606f977c6b902aa7988d5ec6b424b6c55ec1726 SHA512 8b1088749accba0625d9464afd1cef7b735f178eb52e3dc0f61c9228b0f28125d6f7a2d4bc6832c8a106aaa7a399c6f8c695bf7f939f55d0e6e035b1ba98e624 WHIRLPOOL 70d7608b881d7827b2dc4b3806339da95b4205c54a75296a260eb67495aa05a0512313b0e96169d49473a288475688bcbf041ea99d98371ed2aa7ae1f5f2415b
-EBUILD nokogiri-1.5.2.ebuild 3031 SHA256 40afc46aa0f77f77ae2928909a055077235a16915c4a2f4b78923b1467566f31 SHA512 e95212856b554781793a680d82102ff8bdfcc4a6462f2d8747733c6376c97b4b2a9b4860712a8ffa30a6e0ef952c136f7a40bc3f147604347e0575504b83b1eb WHIRLPOOL b635243f161a42f866f89b17215be683a91a90c1d712267e04c58b6bb13dfc56ea22aaacc26fd6cfa608d65883875fb4593c2d8ea3b68708a058f31bf49a1e01
 EBUILD nokogiri-1.5.5.ebuild 3037 SHA256 8f39f08cec343ab4744389d299054a064120995ef832c9ee76fc528bfc6e2fa4 SHA512 8d937d550019f8f467d88241c6bceb551d021abd9fa56a289c15aca324e03fd8c279d5ae64d4ac1ca772d590836c83788b1eb84921ead6e7e93e1e683a36f5a8 WHIRLPOOL f5ab630bed20d11aba68448f9dbc1d6d11265cf3f61092e4c4178b2234fcad29908c684b6e364d2f0e99484ff709635d5873576dffc638a9330136ba2b4fa1fe
-MISC ChangeLog 12096 SHA256 b12595358b1a216cb8fdd4b1d02d7087893e4e7c3ca2c0c18ed89e43ad11041c SHA512 93a9712b53618d5fc7bfe6961184a958812e5f38a8a75d2a773a2ace48d53ce2566e3bec56d483c869ae2e0b35db3f9e9829040a1d2f9788e8d63f1c39734793 WHIRLPOOL 7cbd52995b4570712552e6f909ee24be6de49497202f48b8b448269655098f752a5ac8fdd6bc948b5a2990fc9a9585e63062c640506d621fa5d0ca2a135841c4
+MISC ChangeLog 12210 SHA256 03cb514f91da6872b00c4e045f049c51012ce31ab8b2b7835265ebfb74724bd6 SHA512 9708e00dd7cb086adb12bf0ba8185ee41dc4b9642d456f7f492e5aa37b57b1056751d8e12cc697e540610701810179196cd201f0eaebadbfef4990172557335f WHIRLPOOL d7569d93c662a9fbb7bc742e4212a5ef27078fdbc1db5609a433e76ccfa2674699e4f391a8df1eb469d6685b7710e7a55c1b79df997870a7dcd3a37498d866a9
 MISC metadata.xml 548 SHA256 b001ebe70b094bd1ddc9d3fa45fa754e23362feb325c7e74e97f8d4c815ded7c SHA512 3026a9136ea5e6d070d81f179d46691640b5698b6fa0f0b24ca711567baffabc5ee99051e3d7ce836f088436e3ed60535fc531c8f0fa9ec1719233e86d7ecb21 WHIRLPOOL daf8f6b1d8f98df60c0a4d0d378e211c2dcdf136e9f855e0dd371d8c3f39f32103f9d505392d571786d65ba51c20849dfd05b1fc7b39b36b35c1cb70133ee429
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC6UuUACgkQuQc30/atMkC00QCeNqrYacJYAfcuibAC2gTUq80D
-cDsAn3dGvE48cDevnUUC5YY18cCpINN8
-=W3n9
+iF4EAREIAAYFAlDStO8ACgkQiIP6VqMIqNebQwEAhtPyfG+o+gdkG+5G9xaQHB5Z
+G+ficr1O4CG08FwWasEA/1s5+vg0HrDBZpaLyPb1I51aUK8rhYuuwpDqiMIqBps5
+=yNbz
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/nokogiri/nokogiri-1.4.4-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.4.4-r1.ebuild
deleted file mode 100644
index 761f555d5a10..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,77 +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/nokogiri/nokogiri-1.4.4-r1.ebuild,v 1.10 2012/10/28 17:46:30 armin76 Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc"
-
-inherit ruby-fakegem eutils multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser."
-HOMEPAGE="http://nokogiri.rubyforge.org/"
-LICENSE="MIT"
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-IUSE="ffi"
-
-RDEPEND="${RDEPEND}
-	dev-libs/libxml2
-	dev-libs/libxslt"
-DEPEND="${DEPEND}
-	dev-libs/libxml2
-	dev-libs/libxslt"
-
-# The tests require _minitest_, not the virtual; what is shipped with
-# Ruby 1.9 is *not* enough, unfortunately
-ruby_add_bdepend "
-	dev-ruby/rake-compiler
-	dev-ruby/rexical
-	dev-ruby/hoe
-	dev-ruby/racc
-	doc? ( dev-ruby/rdoc )
-	test? ( dev-ruby/minitest )"
-
-ruby_add_rdepend "ffi? ( virtual/ruby-ffi )"
-
-USE_RUBY=jruby ruby_add_rdepend "dev-ruby/weakling"
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}/${P}-libxml-2.7.8.patch"
-
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		Rakefile || die
-}
-
-nokogiri_ffi() {
-	[[ $(basename ${RUBY}) == "jruby" ]] || use ffi
-}
-
-each_ruby_configure() {
-	nokogiri_ffi && return
-	${RUBY} -Cext/${PN} extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/generated_tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/generated_tokenizer.rb || die "rexical failed"
-	fi
-
-	nokogiri_ffi && return
-	emake -Cext/${PN} \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	nokogiri_ffi && export NOKOGIRI_FFI=yes
-	each_fakegem_test
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.5.2.ebuild b/dev-ruby/nokogiri/nokogiri-1.5.2.ebuild
deleted file mode 100644
index 78d56720d914..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.5.2.ebuild
+++ /dev/null
@@ -1,103 +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/nokogiri/nokogiri-1.5.2.ebuild,v 1.9 2012/11/06 17:06:59 jer Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc"
-
-inherit ruby-fakegem eutils multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser."
-HOMEPAGE="http://nokogiri.rubyforge.org/"
-LICENSE="MIT"
-SRC_URI="https://github.com/tenderlove/nokogiri/tarball/v${PV} -> ${P}.tgz"
-RUBY_S="tenderlove-nokogiri-*"
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 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}
-	dev-libs/libxml2
-	dev-libs/libxslt"
-DEPEND="${DEPEND}
-	dev-libs/libxml2
-	dev-libs/libxslt"
-
-# The tests require _minitest_, not the virtual; what is shipped with
-# Ruby 1.9 is *not* enough, unfortunately
-ruby_add_bdepend "
-	dev-ruby/rake-compiler
-	dev-ruby/rexical
-	dev-ruby/hoe
-	dev-ruby/rdoc
-	dev-ruby/racc
-	test? ( dev-ruby/minitest )"
-
-# tests currently work only with Ruby 1.9; there is a small issue with
-# JRuby, but it's insignificant, while 1.8 and EE 1.8 are failing due to
-# the hashing order changes.
-RESTRICT="ruby_targets_ruby18? ( test )
-	ruby_targets_ree18? ( test )
-	ruby_targets_jruby? ( test )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-}
-
-each_ruby_configure() {
-	case ${RUBY} in
-		*jruby)
-			;;
-		*)
-			${RUBY} -Cext/${PN} extconf.rb \
-				--with-zlib-include="${EPREFIX}"/usr/include \
-				--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-				--with-iconv-include="${EPREFIX}"/usr/include \
-				--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-				--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-				--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-				--with-xslt-dir="${EPREFIX}"/usr \
-				--with-iconvlib=iconv \
-				|| die "extconf.rb failed"
-			;;
-	esac
-}
-
-each_ruby_compile() {
-	case ${RUBY} in
-		*jruby)
-			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-			fi
-
-			${RUBY} -S rake compile || die
-			;;
-		*)
-			if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-				${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-			fi
-
-			if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-				${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-			fi
-
-			emake -Cext/${PN} \
-				CFLAGS="${CFLAGS} -fPIC" \
-				archflag="${LDFLAGS}" || die "make extension failed"
-			cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-			;;
-	esac
-}