Fix by Jungshik Shin for cross-compiling #473970.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 50 insertions, 16 deletions

diff --git a/dev-util/ragel/ChangeLog b/dev-util/ragel/ChangeLog
index 458955f1a3dc..777656bce462 100644
--- a/dev-util/ragel/ChangeLog
+++ b/dev-util/ragel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/ragel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ChangeLog,v 1.62 2013/03/09 09:17:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ChangeLog,v 1.63 2013/08/28 06:26:15 vapier Exp $
+
+  28 Aug 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/ragel-6.7-cross-compile.patch, ragel-6.7-r1.ebuild, ragel-6.8.ebuild:
+  Fix by Jungshik Shin for cross-compiling #473970.
 
 *ragel-6.8 (09 Mar 2013)
 
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 3dfc5dd70742..5621edf721f6 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -2,20 +2,27 @@
 Hash: SHA256
 
 AUX ragel-6.7+gcc-4.7.patch 5585 SHA256 bcdee795c9a063d4a42f49f2ba642a922aa705769c455b9b375bfab47c7e137c SHA512 160aea4100328accbe423e98f7f5741309b9e293aea992f287cb5d9fab25ae74c76933e924658dd4670d317b01e76d37c3defeeb47ada07370b819a16515ebf4 WHIRLPOOL 332ea976cc95139491b767ce31142a8408fbf79cdd16434c7527c270fe42cc1911581124fde5a33dcefe4d61a78c2ea38f0e484015d0fe3b40611305da45c46b
+AUX ragel-6.7-cross-compile.patch 576 SHA256 b393221908d6524567c2b9a08e51e8b1998313ac457a7a04ac3d00db031b84d5 SHA512 0ab26720537bdb77194159145d5fc2e01ee96f3d197d947693141e0559e18b4da3ac7b058d7de4a9d4d9cf9c4ab63649839da359ed3aabcb5ea7163ec975d5b1 WHIRLPOOL 0b38984463c4178cbeca5c6253eb9da992d0e095df22ecf97a6894e5660a846bc6adbc657ec04de554f4263ad3816afafb939a54047f85e4da00a123d8482059
 DIST ragel-6.7.tar.gz 1182734 SHA256 46df8e3f117a730f8896061c95ea8e8f53e9789cb053c2eea047833724fd7a30 SHA512 a85c1d5d4fd7d903c823c2ddc8b5f1d5dd5f715f11bc04f10fb78ea5632b3aa33c5b4861f89179fa9d6b4944484216ee93bbd25dd0b5958d2419e434b781b78a WHIRLPOOL 52f1614e16390949fe070df46c9929b5871e35923b38e6c277f0d4688e45f610a16a6635240cea0622892c675aebf092e3f6a9c626684ed1a4af8191ff3c6d6f
 DIST ragel-6.8.tar.gz 1211146 SHA256 dd7f7d22f3a58147379bda61334d341c2caa0caf9f71897e3e4ec05c8f398764 SHA512 3c7fa4ca0cfcd5d19e0ff8746ca427f5a1eefb0af09db5d2ee55ced9bcc35c588a5db146dcfdec46b83fb63d94ff9ace117b4cfcb07e2c57aec67a6cbe249458 WHIRLPOOL 540ba0c5a712ae0426982e08e7aa7b1fa1ff33e3d9c2095353939ed2c45e04048ebcdf93292ead8e70abbd8fa230dddbfeea8d485955142d0615ddb94c8a0b9a
-EBUILD ragel-6.7-r1.ebuild 1236 SHA256 5afda4df40d49ddcc341b34d25bbc04033a9b3b2b6c7f20859d6e27f6bf0b988 SHA512 98238175fb6160869bbc96ece08b7042e763136d79fae41b947cf687eacfc2f0edcd9cfdd9a3a08a567579ecd5a927ef32d294ce4098beab7bfc9750c69d5833 WHIRLPOOL cbcf46092e5c8f9cda0de47361f821e9a5006e9326e86b0545a778c85914fe7266c938bd4f34f79e8080a01b0c2a947696ecea91ec944442acabfe4a582110f5
-EBUILD ragel-6.8.ebuild 1169 SHA256 1ea0e41627a54a61c7f2d4f1dcb4ecb4ce1c8fa408feee9a67cf9fddac9e7cfa SHA512 7e127614fae7ed5751cd636f8c587b9093c2718ab4f0666df22dce2e4f119fc8106031ea0fa88d57e0793a723ea5c1ec2645c8feab4594b05a508a8638b8ef46 WHIRLPOOL f50719bd53e5083bfbe70153194645008397b6841516276ccd5bc04f62cebc6e21f3fe2f09017eedc843f8c05bb10972a1d161484d1ccfeec82569594e1e0218
-MISC ChangeLog 8311 SHA256 2d20ccbd6cf3531b121e55b79c357cafbe1b65274c3685f4d42d4d9d358ccdd8 SHA512 50ff411c8239f5cf86537949784ea13f94e2a9726e225948b9bcc1c964184c676d2f0eb5ebfbbc0604f3995942c8f02c7a43666030b816619e7beadf1adfacd0 WHIRLPOOL 7ef0b04bd2da544f40b8c04d722219097259390259aa728a5724578ab668ad77d05182ceb5e8bd36c80f95ce708079ac460df4cb3c9cb1ae48e5d828f826715b
+EBUILD ragel-6.7-r1.ebuild 1257 SHA256 0390d0628bf96834d3dbe2e73a8ffb3d12f3af39ddff1d550d0fd4c527637b0a SHA512 4876305ff23804059989b7f7526d8815618e1ba14130267e270ff164a8b281a710582dcbeb0934ad59ee354591a6d168163af37d7eb3b86dc48919037c974759 WHIRLPOOL d1da483461c6c285a2e25536ccc133606ed1d64cd2c77ef4fda7999047aef6bc10bf8f8b548de69cb51a0b44aa6adfa23336b67fb133270fb711ee1dba12fd34
+EBUILD ragel-6.8.ebuild 1194 SHA256 c22cf2aaecfc8c0121be16f155a6f764bd5b177a0654eb55a5f0e50037412542 SHA512 b4ce58f790fd1245da3f154ec91fda4c2608d0890a74bb59f3323716151bc5015c0f233f40e76a8e47d252d8249c97c02709a7017aaee49e251de595fdd7c2ff WHIRLPOOL d708b6f446ed8188962cec0fdaff4e25cc7235f0c48738607210aa78e210243e6900873785585430afe52312124dcd3f6f54c2670eb70ed310a425a2def35abe
+MISC ChangeLog 8490 SHA256 16d8fb78e8153a1d388ee3491d9df11b2f8d9d9c0af67b842b77c67b1efc5c39 SHA512 13c5c4dddb866d781ef0b5cf9fd9e8b762933404652fe4cc99631a0cfbb852dff4f11cc4bfad462d6678974ab36481fa2ba0eff213dd6adbcd14783dea5721e0 WHIRLPOOL d1a2c8f5b4ffb43b90883213f950210874a4bfced50855ba7922964669000c932a1e725fa0e0127b4682a53250af4ea5e760b2dffbef68db4bcdc4755f854d8c
 MISC metadata.xml 279 SHA256 50eea971c8ec62875a9cecd73b7a4febc6567a7148e3ba3178d990c5e420e986 SHA512 384cef252409c121954226584be31b3da30ea75df6f81c33a3de9f6a317561c521361aff15eec657660a6b1384dbe3d2e82487e37cdb76ea6fb3090d98bf147a WHIRLPOOL b6ae65012b9f52cae19861d7909e8d3672d0cb8b5aa237f4d7b31b9e609ce0664e35deacfb2446d57e195fc1031b28410bb466510d32b29b2f9a4e65757cf923
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJROv5IAAoJEBzRPIrUMBNCo5gH/3URMjhz3DzGsKH2Fvioev+h
-YewtcMlWP1iAzjrgUJQ9Wce+wIcAKrxkYChX9I/d98BNX35eypl8a69gGnnmSXKO
-X5+0gPf4mu8F2u1otia4nBtygP1g7BZAONKD37LQ6XchjI6T9YB2cfgaaHc7KUFb
-kYVTO+TbsZFqvAHn0BMteQQ0G9Qtw2LTm2Fw3OF0LIvPIPPBOcb5ze1XNUA3JZzY
-rFKSr8FuNVdubXo/T6itMPLGxqmF8JTU14lRU9S1H1pW+hbFRah6TkQt32gUh0QX
-n7RFDnEgB+OghQe7jWFAFnxlCdb19Ov796uSh0Wr3v9GkQUwjTCr6/jajFpoqfU=
-=ez0m
+iQIcBAEBCAAGBQJSHZgPAAoJELEHsLL7fEFWEOwP/22SpQKYOWIE5t+FAhkzF20E
+BGL82qjBv4S7H8k16gcGlshEPIeIuxbYnhOujZ/DN5nA3tYe0iX9QIT9GTrz21Kn
+qgDKdJfhiw5UA7OVaxJBV9QsLJ4TBGAvaOHL0MAOXxSbEmSnwjcgvMCwAoxLfYD0
+uCIGiQ1GJ0MmdIxn1N0D9QNlne4eVs+6TJ3/cG2Sj4Qm2TCEuphwWhqxl1mqNueR
+VLjFl5tKHze60G76aMaDTxWccBZzVyi/JvM8LXyMbNt2Qnklgot3PAs58VKox3KR
+1epc5TMoU5IkoHuuDwzuNRJnM9zo+59UFcLCvGjn60/OJ3yXZqlcqU/+hyiu69sd
+Mi7WiHtCNN8E4DtR4u5aWAeYxC1YHNVvtJzwZKiISo2iM9cMLcT7j+ovOYFmbyAG
+sujuo3QR45tU7YFOq34ICdUGhLTmgbQuEyx5GPCWu+fA46EFGhsnMxn9vRr8scNn
+me7QkUWLK2BAw0bupGMRnXSLT74B3sRv4ORU4UskP7Exyq1IRXuCbWgTnvGHa90F
+zN8UmkaAgro0U6ffQ2bb4AEXDLcX8nV4CvGZV15TmRs3QuGHB59U7bVyWpgn8dxp
+37xXDsRmCcBUtX+hmOT9rPT79nHLNk4uIFyrEmrQj8XmxUFdsKopsNBQt1Uih0+S
+TIdlyWb+z5CAcmaRKoet
+=OGDg
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ragel/files/ragel-6.7-cross-compile.patch b/dev-util/ragel/files/ragel-6.7-cross-compile.patch
new file mode 100644
index 000000000000..e953a1aeeeef
--- /dev/null
+++ b/dev-util/ragel/files/ragel-6.7-cross-compile.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/473970
+
+already sent upstream
+
+patch by Jungshik Shin
+
+--- ragel-6.7/configure.in
++++ ragel-6.7/configure.in
+@@ -27,9 +27,9 @@
+ 
+ dnl Choose defaults for the build_parsers and build_manual vars. If the dist
+ dnl file is present in the root then default to no, otherwise go for it.
+-AC_CHECK_FILES( $srcdir/DIST, 
+-	[ . $srcdir/DIST; ], 
+-	[ build_parsers=yes; build_manual=yes; ] )
++
++AS_IF([test -r $srcdir/DIST], [. $srcdir/DIST], [build_parsers=yes;
++       build_manual=yes])
+ 
+ dnl
+ dnl Enable arg to explicitly control the building of the manual
diff --git a/dev-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild
index 950f41834c61..f727bafb05da 100644
--- a/dev-util/ragel/ragel-6.7-r1.ebuild
+++ b/dev-util/ragel/ragel-6.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ragel-6.7-r1.ebuild,v 1.12 2013/01/28 15:01:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ragel-6.7-r1.ebuild,v 1.13 2013/08/28 06:26:15 vapier Exp $
 
 EAPI=4
 
@@ -25,6 +25,7 @@ DOCS=( ChangeLog CREDITS README TODO )
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}+gcc-4.7.patch
+	epatch "${FILESDIR}"/${P}-cross-compile.patch #473970
 	sed -i -e '/CXXFLAGS/d' configure.in || die
 
 	eautoreconf
@@ -44,6 +45,6 @@ src_install() {
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim || die "doins ragel.vim failed"
+		doins ragel.vim
 	fi
 }
diff --git a/dev-util/ragel/ragel-6.8.ebuild b/dev-util/ragel/ragel-6.8.ebuild
index 05a86395b0c7..6567ac6f5a91 100644
--- a/dev-util/ragel/ragel-6.8.ebuild
+++ b/dev-util/ragel/ragel-6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ragel-6.8.ebuild,v 1.1 2013/03/09 09:17:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ragel-6.8.ebuild,v 1.2 2013/08/28 06:26:15 vapier Exp $
 
 EAPI=5
 
@@ -24,6 +24,7 @@ RESTRICT=test
 DOCS=( ChangeLog CREDITS README TODO )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.7-cross-compile.patch #473970
 	sed -i -e '/CXXFLAGS/d' configure.in || die
 
 	eautoreconf
@@ -39,6 +40,6 @@ src_install() {
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim || die "doins ragel.vim failed"
+		doins ragel.vim
 	fi
 }