Version bump. Enable most of the tests again.

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

3 files changed, 122 insertions, 11 deletions

diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index 8853f93e9768..f1ca81e6edbe 100644
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,11 @@
 # 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.73 2012/06/23 10:00:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.74 2012/07/03 18:23:15 graaff Exp $
+
+*nokogiri-1.5.5 (03 Jul 2012)
+
+  03 Jul 2012; Hans de Graaff <graaff@gentoo.org> +nokogiri-1.5.5.ebuild:
+  Version bump. Enable most of the tests again.
 
   23 Jun 2012; Agostino Sarubbo <ago@gentoo.org> nokogiri-1.5.2.ebuild:
   Stable for amd64, wrt bug #423071
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 8269cdc43d7f..fdbb3230c115 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX nokogiri-1.4.4-libxml-2.7.8.patch 729 RMD160 06a660ef03645ca35cf93fb5aa5ec46a5ce0da34 SHA1 9bcd7a6fbefc75db8691200e9714460864a51ed3 SHA256 56fbfb502adbb04dc77373a2d7c3708cf7b7cf21f0419f2fc6ff40dc6fa56321
 DIST nokogiri-1.4.4.gem 198656 RMD160 9f5fc2b15da160ccd03a096cf3074afb46e1a170 SHA1 15f5c381d98a4e53a879981b8fbc301d3561c675 SHA256 3d1ed8cc4b6caf1f1cdb7b53be26e72ab70b7111d463d76f898f1f32d998a7b2
 DIST nokogiri-1.5.2.tgz 1988760 RMD160 5acd8d4bbf8916f53237b102db21049510539e73 SHA1 fb75adc5fe4ea7e9cf6defdd634dc7614b2da045 SHA256 d977baa45baa700c107a25eefea6e4b4b2771dd05204d734eee2dab9d69b1dbc
+DIST nokogiri-1.5.5.tgz 2003354 RMD160 79e0b7e983059d3539de5d359b908fe27f97d8cc SHA1 ff3a8065dd81f32bb817abe4f8f911be1ccc23f6 SHA256 18c1dd504596e9f60267f48d9b9b28901bf1ba66be53b64ac78b32f5d277c685
 EBUILD nokogiri-1.4.4-r1.ebuild 1955 RMD160 f5df02170751a2f071e04eb98a3fa99ee81bfafd SHA1 fdfcf88bf9c4195fabda7d4429d68d63e1887906 SHA256 9d028084c87b8b9ccbae8f15b9c73e5c464971dd3f408205cc942e25efb8514a
 EBUILD nokogiri-1.5.2.ebuild 3031 RMD160 1aef7c23b2d880328e05a77a50e5573237601570 SHA1 ec331396e5dd1ab4dcd3d984fbfedf70ed82d54c SHA256 dd4430ee533a251e790531961ca954df3efed01c0cb170a8b2a2a25f8ae6535e
-MISC ChangeLog 10845 RMD160 857401d329299f5f256833fa96d8714c5ab79574 SHA1 ac281839b85641e6b3b55def1a5a172eb3d1907a SHA256 ad6397374cc9a71688c1d362a28fcb917b815e4d93cb568eee49030a61030e84
+EBUILD nokogiri-1.5.5.ebuild 3037 RMD160 ed77085ca8b82cc09691e4458881bdd5d4bdebf9 SHA1 3fd53a2d751430cc954fc857e690a1cdfc3c12f2 SHA256 701d1ed1674b8898556bc8a9fc0c88baadc84df347e08bfe5b5845809a3ea5b9
+MISC ChangeLog 11002 RMD160 15933b9dd7dce0e433163015977ce80a1fae4957 SHA1 af2e6de2ad6ecb3cae73dbcc33de0efbaddaa411 SHA256 99aa1ed23d9af1a5d3608700354ff1987e7542486c2ca6d72815f714505f9749
 MISC metadata.xml 548 RMD160 f7ad1aa047983cec3f318daa55967b1f59a6cbcd SHA1 0efa90c1c82af2fe4fd5feca24263d6330e258b0 SHA256 b001ebe70b094bd1ddc9d3fa45fa754e23362feb325c7e74e97f8d4c815ded7c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP5ZOpAAoJEOTDgjZ80txdCKEH/jo80yhG59RNMF6ZlDCJLrGe
-RwvtNBd87aymItgbhozeTb+/6zuFXIV+YHcpaK7rgM3+hHPSF+RIjwD7LQCJ4HcB
-Aq5wWNwOpBpqYs6ZNnJD2vcBrGm3lhzvDFXPFe58baEZe4cYja5tiQkjvDoCiTSM
-tyfO+IP1ONMeKLCTF+cet1HbV7eaoKEsagWIVnqJABgZKkzeiiPhBkUFMFA8vFeV
-TsAD0hFCLRJ/5BDLe0iQSu0JujEBnzKY1SgnHgp6MUl3cGT0mMCDsebvVQZx6bzp
-r/7rxcVgqnoNMkGCljEY4v83su4WzHUrxw3Pqi648VoStR/frm3uYCBnk4kd9BM=
-=z0XY
+iF4EAREIAAYFAk/zOJ4ACgkQiIP6VqMIqNfRQwEAl1AMwmCW3Z85e0CgawSbIMu5
+gTlbLzXtqe3WKjZLUiEA/jicISRJ5pHnc52Bs/nN7B2jfTF2C2UWf/EjJDltmicb
+=F1e8
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/nokogiri/nokogiri-1.5.5.ebuild b/dev-ruby/nokogiri/nokogiri-1.5.5.ebuild
new file mode 100644
index 000000000000..ee9d84b65978
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.5.5.ebuild
@@ -0,0 +1,108 @@
+# 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.5.ebuild,v 1.1 2012/07/03 18:23:15 graaff 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 ROADMAP.md STANDARD_RESPONSES.md"
+
+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/sparklemotion/nokogiri/tarball/v${PV} -> ${P}.tgz"
+RUBY_S="sparklemotion-nokogiri-*"
+
+KEYWORDS="~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 )"
+
+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_prepare() {
+	case ${RUBY} in
+		*jruby)
+			# Avoid failing tests:
+			# https://github.com/sparklemotion/nokogiri/issues/721
+			rm test/xslt/test_exception_handling.rb test/test_xslt_transforms.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
+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
+}