fixed configure check for ruby-1.9 and above, bug 424789

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

4 files changed, 38 insertions, 21 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 9c486ffb0777..0367f1052652 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/elinks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.143 2012/06/28 17:05:31 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.144 2012/07/04 18:45:08 axs Exp $
+
+  04 Jul 2012; Ian Stakenvicius <axs@gentoo.org> elinks-0.12_pre5-r2.ebuild,
+  +files/elinks-0.12_pre5-ruby-config.patch:
+  fixed configure check for ruby-1.9 and above, bug 424789
 
   28 Jun 2012; Ian Stakenvicius <axs@gentoo.org> elinks-0.12_pre5-r2.ebuild,
   +files/elinks-0.12_pre5-sm185-jsval-fixes.patch:
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 8dce9670cdab..3aa3754fa0f4 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX elinks-0.10.1-utf_8_io-default.patch 456 RMD160 69bcd2fe9a85381d53ef7d2c3da32e15d8eae36b SHA1 c9141e89ba62da5277d0df42e73f4eb258e23552 SHA256 3255c36e7107323d7415995c3c5d2458acf7b739848fb9804157b708956a7010
-AUX elinks-0.10.4.conf-syscharset.diff 2580 RMD160 3bb9037e75adc225915a4a6b41afff0ef09f1eba SHA1 fe28f5ae8f290f15f1165273f22e9417f5648e40 SHA256 3269413843aabff245ee3dce522a475e5b3042adf4676b644a63d323bb77818c
-AUX elinks-0.11.2-lua-5.1.patch 538 RMD160 7bd83ed15ea14cc41b909c4022eee082a47fb706 SHA1 0183f106db71725ccb0f2b83746373ca9e5f0522 SHA256 d931af4db13b53be32def17417d86ee916511209ce9a54f25d017ee2d24473d4
-AUX elinks-0.11.2-lua-5.patch 2125 RMD160 be94e085a7b231dad1681566c533699b2a6d2745 SHA1 d1af052c0700951c703f26ac39f09d1cbbf43081 SHA256 4e0f7b622111696e52e15745d8ac35249a95def36eb5aa782487c7901125260c
-AUX elinks-0.11.3-lua-5.patch 1841 RMD160 61ef22891e59893542326df7803c63ac81117622 SHA1 17682210d407b3efb47bbab9b47463b937d6bffe SHA256 f04d11e01824fb2cf4387b87cd531d64ad280d21e9bcb57e461ace56419d1220
-AUX elinks-0.11.5-makefile.patch 1109 RMD160 7d20513b6922f895b4e4050a37550706500952c7 SHA1 4edd6e791ac08f37ee933652ded7049e04e3b6c2 SHA256 5b37be9328b80b9a995de94cf0a053ad63d43a2e0550df6e0c5a4cdc94276e1f
-AUX elinks-0.12_pre5-compilation-fix.patch 464 RMD160 afe5e31db6a7ed454052e8f0220e3a5c35aca0e1 SHA1 58a69b5b48f1699451e7a508540b14962888b4d8 SHA256 984c3e1127c18eb0925fbe1cca5bb2a7b214c6cd082db434e8fe37e082715e7e
-AUX elinks-0.12_pre5-sm185-jsval-fixes.patch 3921 RMD160 3926023d28e2442dc0451e6590b234bb07dc02e1 SHA1 b69a66f85af8f7fc5eb01839afffaab81b85230b SHA256 d59f9e97f5d495803e0ac35726bf42592a8f726c2367fbc08b8fe9de79de4a2f
-AUX elinks-0.12pre5-spidermonkey-callback.patch 513 RMD160 50dc290e366e92b3c6235571e5772fc80fdf3e60 SHA1 50bedb0a965db8f455110d75ae24cb857c55d00b SHA256 14b65ba92e8693105945d20de6e8f07ec946f17fbbf5248b4f8c431a92b88982
-DIST elinks-0.10.4.conf.bz2 5370 RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70 SHA1 7f7b009b1b6cb746e90835d2b612f1aa6b5d3a1e SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209
+AUX elinks-0.10.1-utf_8_io-default.patch 456 SHA256 3255c36e7107323d7415995c3c5d2458acf7b739848fb9804157b708956a7010 SHA512 f71d901664395e6edea34ff2093a4fe3c477c994400c116206dec514cc71f4ff877c12f6d3f43eafd28c87aad59bfe4f61e7022d29bff71d4051432526e28180 WHIRLPOOL 6b4a66b266050a67f0099aa463050c45fd95d0155175f09a74a7af5be92c07c727a3f1a308796f5dddc37697e56d881af3dc91401754f260c54d8ca8ee839b32
+AUX elinks-0.10.4.conf-syscharset.diff 2580 SHA256 3269413843aabff245ee3dce522a475e5b3042adf4676b644a63d323bb77818c SHA512 3b17025054f9cf2ed9934ce5c19859eb50a216a295e6712659c4899c3539e3fc571e6f289809ad2d07be44330b96107a8dd65754c23f978bd54def28a24b88b3 WHIRLPOOL 230294ec39cec90ae84fd23644bcdadb97de8635eb794b4baf8e93d0b0fc2932f7b54ee25f6c4e49166aa4e296ab05f5588561fcab56867bb3caee0b9ab9db16
+AUX elinks-0.11.2-lua-5.1.patch 538 SHA256 d931af4db13b53be32def17417d86ee916511209ce9a54f25d017ee2d24473d4 SHA512 48aca9662b3d9b43ba027d2328acdafe6363f3e2a69e6f2a6d468718c28f12de6247c629273a11aef0b053010a7b7250c03db39fab1cb4cd6d237bd1c69fccef WHIRLPOOL 4f84c457ed14a2d7414edbe374623e5295aa9ee8aa71403d386a46b499143a97d1dc78ff5d8951d602f8d60cefc648f79ed02038267cb58ae79ba062e68d1e34
+AUX elinks-0.11.2-lua-5.patch 2125 SHA256 4e0f7b622111696e52e15745d8ac35249a95def36eb5aa782487c7901125260c SHA512 9bff6a3214472e09ed2e112e508b140dc9c0e0299c59c355e3756bc63c25a79db4b8f5fae0b2ea872f84e081bb56b615821d6fcea90611294e3355d646faae9f WHIRLPOOL bbd21952804baf4c734089d1c6de67a092ba21a0b1531bd9a5a0f09ae9cf522512828136f32185d8772b4df69c6b0d8c513cd4b052610bf5444bdef18d36315c
+AUX elinks-0.11.3-lua-5.patch 1841 SHA256 f04d11e01824fb2cf4387b87cd531d64ad280d21e9bcb57e461ace56419d1220 SHA512 58fd0477c39bedaf38a7ea632df38483a760b460ac8a70afec5c6449d39bb14db91616ba31bcb45cd247e3b5e880099d7ce6bd4cbba754a416fb5e62994b2e31 WHIRLPOOL 24942289c278b4e0958bb316f881d684a1864c27f1b073a118c20179944ce8a560d27d1aa0115ddd498e181d1caed2b5885771338e871d82d2393c2947ad057d
+AUX elinks-0.11.5-makefile.patch 1109 SHA256 5b37be9328b80b9a995de94cf0a053ad63d43a2e0550df6e0c5a4cdc94276e1f SHA512 f26ccefcc4ed3e9fe2e7e7de3d89479a25fe3bc823a489fc38df3fda0f5d784111500b69d42083e7f741466b4c33a549545c59ceec9311903c9d5e440e890103 WHIRLPOOL 9dfd3aea78b3aeafce69d6c0b2599ad46ca7cd2bd9bcb8d55f181b291411dc54f6f98a0eb71b4cfa2c92f33620bdfe15982536f350c7fdd724d7790e95c1e913
+AUX elinks-0.12_pre5-compilation-fix.patch 464 SHA256 984c3e1127c18eb0925fbe1cca5bb2a7b214c6cd082db434e8fe37e082715e7e SHA512 7c1232f4f15579f8073cdea7397e4a34d5bec51268eb61cdff854f221615b027c385b81871e7b5fbefeda1ddf5de3008719724b9853798bc198866a25c8840fe WHIRLPOOL 1a3303d1ed36429bf47b4a1e55a87917d3fe20417f218999c1a02a90c199b4a1dc914a674c86fce8c62cb5cb3ab11019c2547de8c9cb44fe5660f2673b706062
+AUX elinks-0.12_pre5-ruby-config.patch 554 SHA256 ad8dd39bf4cf9aca5b1dfa1d092972c4fd3f3bd1612b67817d86228e19e8a868 SHA512 0c56d456dfbd6a60a85c062eff09f1eefd8ec72dbac26c3c8a1141ebb06562a4457e9d9f12ccbf17eb559e44e9120d2c31b8cda40519045b7f50ab579646bd29 WHIRLPOOL 6c629626f167cd02f1fd9e07006d0232abce5e3c1d58e97da3509d92b295228f09ef11a5ae049eb830f03bebd5f8c917b97739b082421963dc484841b3ddeaa9
+AUX elinks-0.12_pre5-sm185-jsval-fixes.patch 3921 SHA256 d59f9e97f5d495803e0ac35726bf42592a8f726c2367fbc08b8fe9de79de4a2f SHA512 62a96d53b529c409d81094899c75cd7943176628e2b7301a005c6ebf9f660e813fbf1f3df213c43148d425e933208f761090b23b6ae75da93a93b13a1e924a34 WHIRLPOOL 03ae46d5a9497ac81db5cca364aa6cda4bfb3dc5864482e11778dfef752ae4c76a374026fafa3e2507c9626c528b483bd68a3277647b4c200de95197507fefa5
+AUX elinks-0.12pre5-spidermonkey-callback.patch 513 SHA256 14b65ba92e8693105945d20de6e8f07ec946f17fbbf5248b4f8c431a92b88982 SHA512 81a2397b90531db291526fed738fd3661362c3d20c4bc330f909375cea3779f32f4286c8c43700bf7c19d6eb177e97acb3c32f15abba052651ee5b947f3bec43 WHIRLPOOL 224e95b0f09c61de04c1b6e9845a56ca94ee5c99fb90a7c9e57800c1cede50658091d7b1b3a7aec5a0bad9b7eff2e5ca4a1f7a107381bf8208b08e1624661f3d
+DIST elinks-0.10.4.conf.bz2 5370 SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209 SHA512 defdc743d78f9620eac60f4cfc1c07ecc6d18d1d771899b6eec184bea818d612ef110219127284a5b7c53ca07746fc90fbeb97344b3aef7f1f894ed839443296 WHIRLPOOL c6dd65a281a0f48461ddac18e9981c029acd4906a294a02cfcf40429a18b443dee92a7c3317e704dc61fb519df3fa80da14c49a3f138640e223b64372669aa3a
 DIST elinks-0.11.7.tar.bz2 2467915 RMD160 2e6e863d08f9accb71892ba6f236f795c83cba9c SHA1 d13edc1477d0ab32cafe7d3c1f3a23ae1c0a5c54 SHA256 456db6f704c591b1298b0cd80105f459ff8a1fc07a0ec1156a36c4da6f898979
-DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 RMD160 14936822390e22e95bf2fc8d60fd16fa9c484629 SHA1 95658432dc826e6fa618fe23cf250a50aeff2dd9 SHA256 64f7c4a657128983d054bd0d2027e11facd42fcc86bd8dfdf5b27ffbacbd54c8
-DIST elinks-0.12pre5.tar.bz2 2783523 RMD160 4983083f21928da78f937b4dea09f8937c3a9cb9 SHA1 15fb38fa938a0eec9d5f22fdd538a6785e2854af SHA256 2d19547831098acff0c5f97f9fbc7912240f122961fd49fb8b76738417dd24d2
-EBUILD elinks-0.11.7.ebuild 4358 RMD160 afd06665d1a437205efb1452ae4a0a00c2ff5e78 SHA1 484b2b315d846c71f4f1f5f1ac4363199104c62a SHA256 2824d95dc5f12044a82a944c506dea477e1db14ed3d370062c23284b8e6a4bd4
-EBUILD elinks-0.12_pre5-r2.ebuild 5172 RMD160 7dd46f0ee157342efc879f06d2e07c55139e4680 SHA1 ae8fec2e2a13a12de23eeae2e47b11560c77649c SHA256 2e7806590a2177c066481c7bb766a9fdf83dda5148c4dad85f7ff3c1414c9ed7
-MISC ChangeLog 27580 RMD160 690d12cea62160a8bc1116ecf4e69a6c5b4a8e06 SHA1 d7dd368e33a0db892d6b72fbe36b1d542a862c73 SHA256 562c77fb9d1ce5fb8d0dc5fcaafa61e71e3dd8bba12141d8a8c230a31dab32f4
-MISC metadata.xml 497 RMD160 3b538ecd57ee0fb1e4ca34240313abc7288e0f35 SHA1 6025d6b01f0ecbd3e4023552ae16f9f483f3e882 SHA256 46c078d1cc7e933e17fc97f3fba58c8a6de73e65dc240cf96b18a7e5f9912b31
+DIST elinks-0.12_pre5-js185-patches.tar.bz2 13820 SHA256 64f7c4a657128983d054bd0d2027e11facd42fcc86bd8dfdf5b27ffbacbd54c8 SHA512 1552aeacdecb0a2db357402e0474d6b4810c767609d1d399b3350a4bcdc21ba9c0bde5a5d0bffd1d7b27d41ac46e3e85ae2527d715a1645a2dd51ab14b8eab3c WHIRLPOOL e6f7746407cd6654c19d4bc71dc4d0fd63070a78f7bc7c43f11f6e388268de963748597b0a2fd03cd22632651800b990ec0819d54799be9bfc4589332e11dbdd
+DIST elinks-0.12pre5.tar.bz2 2783523 SHA256 2d19547831098acff0c5f97f9fbc7912240f122961fd49fb8b76738417dd24d2 SHA512 d731d58d97a3d96f099a92c91d378983278cf1699961ae1790d57c78d671618eb3e37845b0fbd3d73d3ab5df2d590b9fd2cff5b3357a79f29a25f31cd4f38081 WHIRLPOOL e6e6f00c58fbbd42a273d729da4b5ae5c1d0398ac3affa6a98bec41364d8c48e4048167ab0be61a563f1eea00a50f98364beb262ccc68eebb181e2d9e11bb3fb
+EBUILD elinks-0.11.7.ebuild 4358 SHA256 2824d95dc5f12044a82a944c506dea477e1db14ed3d370062c23284b8e6a4bd4 SHA512 b41e2a0bcbc6eacf19b7435955b57fef0c21d8fd0817f4358cd7c3b6e81cdaac5acc80e788bf5fd955cf1bff6e6f472cc0d1183b73215399d289ecf1a528c84e WHIRLPOOL 83963d82bc0e494d383e0a0341a3b76a6288fa7d92eb6bfe99ebfc3e119ba025bc9c7d7cdd0c4a55779bb77b1b5c387093e7ba433eefa22cac4af89e818b9573
+EBUILD elinks-0.12_pre5-r2.ebuild 5217 SHA256 eab0b39016d34bbb2069954b2d2260c10ee03c5a9558b62a99865a9bf8efe989 SHA512 7d188edff4daf9070dc16812dfd38536c3a6b56490ef3e7979781d0979df7872977297d23e0e961cce9cf6bb83614e5e74352bc8622ca5cbd54202686b2bca0f WHIRLPOOL 80c33e9bac29ca29e500b277d7ccc0fa6bf46157e116534903c860987bb543ab8f4ae2c278fc5fae56a94a74196ad265574cab74949fce26d7e16d9da51225e5
+MISC ChangeLog 27762 SHA256 760622a7a00d7619463673b53c0df09b569b2828f761434c33b7d4a48dba6169 SHA512 c8bb7618a3fe1b6a7a59092d17f4a85b2c9798b242e27be9244faa5c1e0430b9b09cf5b24aa23e714757959c1a4cb9dde753c1f43bd7d2180be261dc350adb92 WHIRLPOOL a946970ad259240f7b859be194c802707b2fddbde99fba9232aef4bacee3b4959d5bba7b8c3cb8a827cd00f372e5e1df5c51b2877cc00e4eece0339407bc6a8b
+MISC metadata.xml 497 SHA256 46c078d1cc7e933e17fc97f3fba58c8a6de73e65dc240cf96b18a7e5f9912b31 SHA512 8a0477bedea04f987b7e395e8c8dd15ace2ac7dfb64a71e3a7d2ccd9bb269af4c5f138a3e93e1598cab4655c4ec37cd0c2b11b587a9f692dca7439e35ab7b2a3 WHIRLPOOL d776babefb84a40889ddfa3f6b21922442bf2665ce3d0303ad270ec4f79e44395290131acc789d47862b6600e7df560cbee3f2393fe4c176af4dc7a6c6691f56
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/sjvkACgkQ2ugaI38ACPBeMgEAuOPuFLEC6Mjh3iVy+SUT3z+7
-+z48Na3mWcVsEO9kTmYBAJvrJnHE3NXNmqUJriJRdbWiZBi1g0oZhd1b873UxrTB
-=R3FT
+iF4EAREIAAYFAk/0j1kACgkQ2ugaI38ACPAWYQD+OI3UxxpBooBIvrOOU6bglC5p
+Rlua9wgy3Q0IQnPQJMsA/jn8MizCtZ6emncAPqSUdhIjR5DgDXP9vRrAhe0cwxkX
+=5emh
 -----END PGP SIGNATURE-----
diff --git a/www-client/elinks/elinks-0.12_pre5-r2.ebuild b/www-client/elinks/elinks-0.12_pre5-r2.ebuild
index 4045468dcf11..fcb793d1f4bf 100644
--- a/www-client/elinks/elinks-0.12_pre5-r2.ebuild
+++ b/www-client/elinks/elinks-0.12_pre5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre5-r2.ebuild,v 1.2 2012/06/28 17:05:31 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre5-r2.ebuild,v 1.3 2012/07/04 18:45:08 axs Exp $
 
 EAPI=4
 inherit eutils autotools flag-o-matic
@@ -68,6 +68,7 @@ src_prepare() {
 			epatch "${FILESDIR}"/${MY_P}-spidermonkey-callback.patch
 		fi
 	fi
+	epatch "${FILESDIR}"/${P}-ruby-config.patch
 
 	sed -i -e 's/-Werror//' configure*
 	eautoreconf
diff --git a/www-client/elinks/files/elinks-0.12_pre5-ruby-config.patch b/www-client/elinks/files/elinks-0.12_pre5-ruby-config.patch
new file mode 100644
index 000000000000..83117e8ed450
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-ruby-config.patch
@@ -0,0 +1,11 @@
+--- a/config/m4/ruby.m4	2009-07-07 08:23:17.000000000 -0400
++++ b/config/m4/ruby.m4	2012-07-04 14:37:13.000000000 -0400
+@@ -32,7 +32,7 @@
+ 	if test "$CONFIG_SCRIPTING_RUBY" != "no"; then
+ 
+ 		AC_MSG_CHECKING(Ruby version)
+-		if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION or RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
++		if $CONFIG_SCRIPTING_RUBY -e 'exit((RUBY_VERSION or VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then
+ 			ruby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts "#{VERSION rescue RUBY_VERSION}"'`
+ 			AC_MSG_RESULT($ruby_version)
+