Provide locations to libraries, and help extconf to guess the library name of libiconv for Prefix platforms. Marked ~x64-macos

Package-Manager: portage-2.2.01.19074-prefix/cvs/Darwin i386

3 files changed, 24 insertions, 21 deletions

diff --git a/dev-ruby/nokogiri/ChangeLog b/dev-ruby/nokogiri/ChangeLog
index 87ab6e367238..56c31dfc2982 100644
--- a/dev-ruby/nokogiri/ChangeLog
+++ b/dev-ruby/nokogiri/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/nokogiri
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.60 2011/08/02 16:31:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/ChangeLog,v 1.61 2011/08/27 09:43:35 grobian Exp $
+
+  27 Aug 2011; Fabian Groffen <grobian@gentoo.org> nokogiri-1.5.0.ebuild:
+  Provide locations to libraries, and help extconf to guess the library name of
+  libiconv for Prefix platforms. Marked ~x64-macos
 
   02 Aug 2011; Markos Chandras <hwoarang@gentoo.org> nokogiri-1.4.4-r1.ebuild:
   Stable on amd64 wrt bug #348510
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index ca9b24fec2f4..5f2f79b3c37c 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,27 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 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.0.gem 187904 RMD160 ab4f6f9704f71899edb815f033e4f70560653b3c SHA1 c82f210a45b7c6b87c681e79a29e6a08ec8c6d71 SHA256 47adaf8891dc9ea6f3b58435cf5cfabacb04390064eea1739c8a26678039ebc5
 EBUILD nokogiri-1.4.4-r1.ebuild 1957 RMD160 6aa5995c0fa6cac323d9d85b6ae3d0b0487ea909 SHA1 15f8b6581ce4bcc56c009a8b54b589e5e5cdfff6 SHA256 0e36b64a376f94f72710ba0a3acdee673c853c35f5230d57a1f9bd066994aabb
-EBUILD nokogiri-1.5.0.ebuild 1844 RMD160 2841d653e40cfa148771f13bfaa0b0237933f244 SHA1 9027400e38a6504698fd1bc04ef80633f598b245 SHA256 996550b14f34d9cc3c3130d955d1196286f93dc192da25c79c99db48a6365b69
-MISC ChangeLog 9034 RMD160 e998c324b226b7dbc9d4be79eab3462298a34751 SHA1 92118f7897ee631dc57ee87abbf05c4bd893bec8 SHA256 2e014d08c30ad438cd06390d2b2cd8645191e76718bf8a79ade7e88a1a004a68
+EBUILD nokogiri-1.5.0.ebuild 2225 RMD160 11e4b608711dbd4efe379c97dd3342bac82be17e SHA1 9f94c90ccd340ed634789b6cc6e8684173ecd6be SHA256 dab33ef2dc1515b03bb3e9ca34ba22d7a6f01720f18af8d464d7eaaeb85fbb32
+MISC ChangeLog 9239 RMD160 7d60fa5570521f675e0607bf4ea1dcbe2e17fc30 SHA1 41a16390951f9361ef8cd92d3f34c3890b33ec5b SHA256 bd0b2534f020987d17e78fb8d3c8039aa39386e85db914eee29e9ed29178731a
 MISC metadata.xml 548 RMD160 f7ad1aa047983cec3f318daa55967b1f59a6cbcd SHA1 0efa90c1c82af2fe4fd5feca24263d6330e258b0 SHA256 b001ebe70b094bd1ddc9d3fa45fa754e23362feb325c7e74e97f8d4c815ded7c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iQIcBAEBCgAGBQJOOCZyAAoJEPqDWhW0r/LCnFQQAIGTEZBOMAf/3APx8usCQ1yH
-q7mDtdtaSkxJJjtroLAVNvH6nqx6I0gQCtIMtEoKQJzEhxyldtc78AbckfwipkDG
-gEnO4QES5iCqNmOfTbUX3apyy/cNphsRpUo6hcGKhKbug898aoZwszMUq3LfK+AV
-9IfciQbhsDW/lxi6NLbwB0d/rYtuwY+WiQ7Vmn4tt3l7YDMTX1VXD17J1Xx3SDy7
-qEFZUbUrkEDz5CB4AB1bsxR827Zx6pHkHMibt7jKddKZTH3pmSMQrDDwaGzN9SEv
-XP1ukg/Fl2aPNZ5XUua6clvDq64SH5hWw81Ta6oopAFmQuRZoxOw3kwkorYzmCWr
-JjfAJ552C6R01w+JpXgP1u2Iph0rxKTMoXoY469uS5g6mEOZe2U2LUvNkLV4G/hx
-WWpjP9GByK/SuXt5fhSIg+DXY3tYyqn063NDfU7+EYmCcOvduZG2IkEdoilnUoOZ
-uOa38Tz90f/vHMr2hxt6+viBfgdIhM8cz1z5DImc9J+5OcXiFmjxTg1YhCkG8plj
-rzbOIT5QhNgrm7CCPyuZ4vruStJYP6tuEH9QYcDaGS2H2+6FA59/ZnT8+51g0Qq5
-crKwqEHMXpVNA2M/Mfogq6eWUzkmOChUKmjKNA+bnHlzUj0EwzkyXg03iPnObtMX
-UGHOetIWusMugAlNEasG
-=lW2d
+iEYEARECAAYFAk5YvE0ACgkQX3X2B8XHTonRZQCgjltHZ54ck2caHqojTQKBTyVN
+i30AnjGDIdVRmU1+Dm6ZPh73qIOY1oaJ
+=vgO6
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/nokogiri/nokogiri-1.5.0.ebuild b/dev-ruby/nokogiri/nokogiri-1.5.0.ebuild
index 843ed80822f5..e99a2e755cb3 100644
--- a/dev-ruby/nokogiri/nokogiri-1.5.0.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.0.ebuild,v 1.1 2011/07/09 10:15:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nokogiri/nokogiri-1.5.0.ebuild,v 1.2 2011/08/27 09:43:35 grobian Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser."
 HOMEPAGE="http://nokogiri.rubyforge.org/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 SLOT="0"
 IUSE=""
 
@@ -49,7 +49,16 @@ all_ruby_prepare() {
 }
 
 each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die "extconf.rb failed"
+	${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() {