Also install the nokogiri header files and shared object so it can be compiled and...

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

diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index efe9bebf308bcb26c814034401f7ce8bd0b8bc2e..5826775e03e4b6e5259b932d23712bd1d2cf7063 100644 (file)
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/nokogiri
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.122 2014/12/23 16:04:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.123 2014/12/25 08:03:53 graaff Exp $
+
+*nokogiri-1.6.5-r1 (25 Dec 2014)
+
+  25 Dec 2014; Hans de Graaff <graaff@gentoo.org> +nokogiri-1.6.5-r1.ebuild:
+  Also install the nokogiri header files and shared object so it can be
+  compiled and linked against by nokogumbo.
 
   23 Dec 2014; Agostino Sarubbo <ago@gentoo.org> nokogiri-1.6.4.1.ebuild:
   Stable for alpha, wrt bug #532532

diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index e57aad95c0b84869ed9ff62de741de43380e161d..2afcee0b690f2a82a44c8382d6b76f814ee49486 100644 (file)
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -6,23 +6,14 @@ DIST nokogiri-1.6.4.1-git.tgz 2251386 SHA256 5a326466d5bcd1b197c26d933f8ae5b4343
 DIST nokogiri-1.6.5-git.tgz 2252955 SHA256 7df072192f441fa18e0ae3dd3eac8e4b3e5e8e0b685240a235e6c9d57162ff11 SHA512 d23584651081ede05e0395b67a1e8e5cf7cf6270a6846d3f9417af5763f690e64d7eae0ea7c579387428eacf292730165b95514fcf0a6eea6f5677c2b9a7e3bb WHIRLPOOL 958528a09197d99439d88c0a2ad3001dab747ee7c77799a91edff5734010cd8d349d2ad4a9287cee463498253d2d1157a10d0d0eb0f7f2c16d6d996dc0d28c2b
 EBUILD nokogiri-1.5.10.ebuild 2892 SHA256 2341805855d92ee018a7ef9cf16554a70a28b3010f10e53213af56eb3ea770b9 SHA512 0276aa62351931469f62eac4b99faa280e3b0cfe8b590c389aa0a1e78a0c2322945bfc69ef23d31785cf03734dd71e9955cfb9621ae125cccc5d75f584dced32 WHIRLPOOL 2ff242d7970b1436cbafd7668fb61abce6497758d47ff389bc77cdd062cbbbad20494ec506feb967bc699d2eeec2a8ad142ca70ee85154bba1db9fac3c4ad054
 EBUILD nokogiri-1.6.4.1.ebuild 2562 SHA256 b1f7e28bcfd23b73e9a5fb58fe148eaf028b292e42af7a410d9c98d4bb5ac105 SHA512 e4a740bc3fd9767a7e5154b828c675bc4060338fe5d73dce9bd88ba4aed87145b3c380df7f448619d9583717b95012432caa9682a98b52cc876a7796704a3733 WHIRLPOOL 87feeade5b07a0812c8279869c941af3cb76c615d9e39cf86bb852dc4911090ceaf877e2f4148856dcde5a5f409d849636429fe40e3014fcc66eb42e1063fb7a
+EBUILD nokogiri-1.6.5-r1.ebuild 2854 SHA256 802d223b23d541e69694f07b99f61816849e7509c583e84af97bf1d644c0138f SHA512 40939e34857089f80ab5181b4c04339e780e2fb78ef4ec41c7676d9dfeff94d9efec5e583992a728ed1e1b7ef91198c9bf6dadfa9ffafd52fa0b5466ccd86050 WHIRLPOOL 4c425a80ba36e87b7699172e4666a380d99a354db71d491f4a138d283c9010534e18fd635e3e77348149671a4828bd895e66a4d606de22bb0307cde5642cb6bd
 EBUILD nokogiri-1.6.5.ebuild 2576 SHA256 33d41910db4a45336605cd2c05d9522aeb2ebc1434330c6251e1781fedafef44 SHA512 f43f4d3f09c4e362001a8f4414843e102dc763db5d935f05030350c949f2549094d95801b84d6e40548fbdf09264eb357a3d811e4a0672e43b2c20c4158c53d4 WHIRLPOOL 16ac55c852c6420dff19b40b03570bb6ed8fdbc2c863871b0ce35993fd5618f2e633c36cdf148962735f9d3cd418b8c50bff91230e77cbc6fd4ec2ce86da0e2b
-MISC ChangeLog 17048 SHA256 a445730f284929c1077e9a51643c5152339b42d1f2164a2674a3ce5b8ecc5d5b SHA512 9414317964115c7680d4f9acdadff8fbbfcabd1b2cafb74537c73684eba23acbef23cbe2d69e9945e42d1ca8b84eb8f8b709f02fb97e184c4da9277ec6e1f0c9 WHIRLPOOL 7aac256c9903f7d9122dc0bdc82a2d3a5c931d930acbc6273eb6e153310ac12dfbbd0cff9c23d68e9abe6edf9e8a4a2920b44cf60bf7ed012f91167da4e6561f
+MISC ChangeLog 17279 SHA256 00f73829f787bb5718f3a0127da76c0ed7b3ba00aa7466f9129b0981312a2125 SHA512 09154a756be6a74e8e91d2594e8694d5c13cf468ac9f1d9ebae63499bcaf90a3088025849551f20d9b01bad96c920f4aa1b00a2429f56426153c1e161f25d978 WHIRLPOOL b8f991274525185a2640c02aa7519b41ba316fab0165273e527271f4c648ca466b77c1acc73006d796a4965f9ecfeffc9e6cef703e14ed009fa86bc796af8481
 MISC metadata.xml 159 SHA256 abab7965b1f41e0acf6b54c554945c1c9fa35b5afab848d784dc58c298bc4679 SHA512 39d857a527ff3a066b0fa7a6e57f789e60178ca13c5ddaa93802b58ec8d45f47418c2ce85c389e2eed619216aca72d761651efa5a401d84357df9b24b478b3fb WHIRLPOOL ddb2c776f81935d41c9e81592c1ddbabc4f94422f44bab6e312730aa541994234a2405ea5ba2782818404a730be20dc53c9cc205efbf8f0843bd21cf839b0980
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUmZKEAAoJELp701BxlEWfl2cP/2XGZ7TFPrAoidZH4WNiVGcv
-hiVOfcdozSFx9FyCJWbvk4i1wH7q4mpaGGrlk95NagokRyX2ir7BOkljQkVhXTDg
-P4BEjV7GMKuYEkpZ61LuHo0OjG37G+9vEEiNLioxolyI51220KcX+KWcU1gwB9S5
-7UbDFodosNuFfTsZ2++Ubo47rrcpaEjznwhYIL16VKuwNUp5yiA6KNuzyKnKBzxZ
-McZHJfCehY6THZJAnimmWJv/pN6ZONp/fGfq7SvcAOYcgeZlehUMwjSmsMlN6hpg
-wCiLbRaTfoSQIIozXJ2Vm4zlpDDAPA9kHIdNABG8+bBrwQmD2hseVObtX8aUKRUT
-G4DVbYy94IdC41bWS2j5Umv9iLtiqkXemQxPIFw52ZO+YjViW0N39q/eGQdnXPL4
-0qg1C5u02p2ffZGh1hK+lm+CFW4zB6Oet8wuLW7G8+Bq6ZPXyFK7bisXjZRlPCmZ
-/OAcUN2HUChniETDg93fibuch8ATdATrd5BgyFu+sLqRUk6gLeqr8vj38ADFcW4m
-g5aKGzySU2Nlz6/yGHWjEqt4wxduzfpiNu4OJZBJGd+VXHSNtVMBWLU7HQIK9lKS
-2WXPfhlO4AgttlBBIPz3aWrFXH4bDxuOq8OQhoMjPw0q7LWDNc8kQBbdAG2ArDoi
-Z/xyyKrVrEefiCfnsf2D
-=aoBm
+iF4EAREIAAYFAlSbxO4ACgkQiIP6VqMIqNdylwD/e3B0sUM183+1ifYx4aSHLjGp
+Otl5mS3vHpo5aWhqsqgA/3ES34Qs+qaho7LLbuKPyrMX1do6Jd++RSmBuZrZLWwZ
+=WHhu
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/nokogiri/nokogiri-1.6.5-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.6.5-r1.ebuild
new file mode 100644 (file)
index 0000000..0f6d11e
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.6.5-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.6.5-r1.ebuild,v 1.1 2014/12/25 08:03:53 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc CHANGELOG.ja.rdoc README.rdoc README.ja.rdoc ROADMAP.md STANDARD_RESPONSES.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="ext"
+
+inherit ruby-fakegem eutils multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="http://nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~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-2.9.2:=
+       dev-libs/libxslt
+       virtual/libiconv"
+DEPEND="${DEPEND}
+       >=dev-libs/libxml2-2.9.2
+       dev-libs/libxslt
+       virtual/libiconv"
+
+# The tests require _minitest_, not the virtual; what is shipped with
+# Ruby 1.9 is *not* enough, unfortunately
+ruby_add_bdepend "
+       dev-ruby/hoe
+       dev-ruby/rake-compiler
+       dev-ruby/rexical
+       dev-ruby/rdoc
+       dev-ruby/racc
+       test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+       sed -i \
+               -e '/tasks\/cross_compile/s:^:#:' \
+               -e '/:test.*prerequisites/s:^:#:' \
+               -e '/license/ 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() {
+       NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+               ${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"
+}
+
+each_ruby_compile() {
+       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} \
+               V=1 \
+               CFLAGS="${CFLAGS} -fPIC" \
+               archflag="${LDFLAGS}" || die "make extension failed"
+       cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_install() {
+       # Clean up "ext" directory before installing it. nokogumbo expects
+       # the header files and shared object to be in ext.
+       rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
+
+       each_fakegem_install
+}