Fix compile when ruby has USE="cjk". Bug #191203 thanks to : Brenden Matthews. Keyword ~amd64

Package-Manager: portage-2.1.3.9

4 files changed, 50 insertions, 24 deletions

diff --git a/dev-ruby/ruby-mmap/ChangeLog b/dev-ruby/ruby-mmap/ChangeLog
index 444bd13dd7c3..4b5633843053 100644
--- a/dev-ruby/ruby-mmap/ChangeLog
+++ b/dev-ruby/ruby-mmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/ruby-mmap
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ChangeLog,v 1.11 2007/09/04 19:59:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ChangeLog,v 1.12 2007/09/18 17:14:18 rbrown Exp $
+
+  18 Sep 2007; Richard Brown <rbrown@gentoo.org>
+  +files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch,
+  ruby-mmap-0.2.6.ebuild:
+  Fix compile when ruby has USE="cjk". Bug #191203 thanks to : Brenden
+  Matthews. Keyword ~amd64
 
   04 Sep 2007; Hans de Graaff <graaff@gentoo.org> -ruby-mmap-0.2.4.ebuild:
   Remove in-between version that will never become stable
diff --git a/dev-ruby/ruby-mmap/Manifest b/dev-ruby/ruby-mmap/Manifest
index 8d58017943ce..498459f3056c 100644
--- a/dev-ruby/ruby-mmap/Manifest
+++ b/dev-ruby/ruby-mmap/Manifest
@@ -1,20 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch 555 RMD160 2a1d612022435f6f2067df54acbe991505d8e64d SHA1 18ff24387324dc4429cf67e96d47808407b3ddd7 SHA256 16142a66e277a2013a3f1b483e30944aff9c0351a929d684b18960d8ae109c41
+MD5 54e97310ecd2762d41b04c4c1727cb14 files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch 555
+RMD160 2a1d612022435f6f2067df54acbe991505d8e64d files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch 555
+SHA256 16142a66e277a2013a3f1b483e30944aff9c0351a929d684b18960d8ae109c41 files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch 555
 DIST mmap-0.2.2.tar.gz 26310 RMD160 ae1ae24fe06a4e9a546649ce59c85ff7510fc132 SHA1 fd25db1aba1aaabe31267eca496f5d523d78c1e8 SHA256 5c4c9bc76ad6e320faa8b8a490d46083c21f2e79485a820bbf2b4c5b2499a4d5
 DIST mmap-0.2.6.tar.gz 21646 RMD160 0b086829257bf36449c2e5ece4f3a4f19e2b1fbc SHA1 bebb7308068e934cfc79da71435b2fb27e8958b3 SHA256 a209754ee4fc9cb46ec6576cb9ca7215bd65daf1b6e9bec3b0443e1b0ed4d671
 EBUILD ruby-mmap-0.2.2.ebuild 623 RMD160 faf6255f8fdee1976cb33177a788d30b385c7895 SHA1 ab302ef9142f55f9ab469261c4dad5eef5aa4353 SHA256 c6b933d7598f4e252de15c66f70ed403c1c8e7554a69c977c49ca6253af7a899
 MD5 cf5ce050168a557027e94fe613051359 ruby-mmap-0.2.2.ebuild 623
 RMD160 faf6255f8fdee1976cb33177a788d30b385c7895 ruby-mmap-0.2.2.ebuild 623
 SHA256 c6b933d7598f4e252de15c66f70ed403c1c8e7554a69c977c49ca6253af7a899 ruby-mmap-0.2.2.ebuild 623
-EBUILD ruby-mmap-0.2.6.ebuild 628 RMD160 06ce897cb334b3dbc44195a3ab00fdbc8382d4e5 SHA1 6531d65a20ba7a6bfd2e3ce3681be2ec87e55ea8 SHA256 d6fa04b652fffb7c087f7950a114ea2d664490213540dfe397e27ad5924e8df8
-MD5 2569676f80a523d5afbf9529c73267e0 ruby-mmap-0.2.6.ebuild 628
-RMD160 06ce897cb334b3dbc44195a3ab00fdbc8382d4e5 ruby-mmap-0.2.6.ebuild 628
-SHA256 d6fa04b652fffb7c087f7950a114ea2d664490213540dfe397e27ad5924e8df8 ruby-mmap-0.2.6.ebuild 628
-MISC ChangeLog 1488 RMD160 43607f7b72c198abb1649d78364bf0d04661b1f1 SHA1 75760afb5f3f7c3c54a6936791fd652571ec6958 SHA256 07d7c29d93d6e70280790da8b288c175f1bf2789c8289d6dfa4ae4a2781fd06c
-MD5 96beb189dc37a8da109e19101a4b386d ChangeLog 1488
-RMD160 43607f7b72c198abb1649d78364bf0d04661b1f1 ChangeLog 1488
-SHA256 07d7c29d93d6e70280790da8b288c175f1bf2789c8289d6dfa4ae4a2781fd06c ChangeLog 1488
+EBUILD ruby-mmap-0.2.6.ebuild 756 RMD160 776c5cdc50e5d7d6cd3a41087fdd503735829438 SHA1 b563b3e22001092fd85ea8dd056e06a9cf7bf856 SHA256 b1eeea28f6453abf1c1fd8f23db00f4cedad49910a931165ee5b2d6f48458d2f
+MD5 4e53289eb0027283f4a2ff82ea6627de ruby-mmap-0.2.6.ebuild 756
+RMD160 776c5cdc50e5d7d6cd3a41087fdd503735829438 ruby-mmap-0.2.6.ebuild 756
+SHA256 b1eeea28f6453abf1c1fd8f23db00f4cedad49910a931165ee5b2d6f48458d2f ruby-mmap-0.2.6.ebuild 756
+MISC ChangeLog 1718 RMD160 06ddb12cabb1a414a7ad8708eac448e9f4d21c14 SHA1 16bf8164b4d0d762fc2439b4bf55e3e80d2fed94 SHA256 aaec131df00fd112944c90601750399787c540237813dca72aa0f4d7ef42675a
+MD5 8141a78bf47f4ba65944d34a76d6a4d6 ChangeLog 1718
+RMD160 06ddb12cabb1a414a7ad8708eac448e9f4d21c14 ChangeLog 1718
+SHA256 aaec131df00fd112944c90601750399787c540237813dca72aa0f4d7ef42675a ChangeLog 1718
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -25,10 +26,3 @@ SHA256 789d1ef8f49033d6f61adf195654fb8989bab7f596cee3f7313d6c519d2b24dd files/di
 MD5 366f72e1fb37020ed8162113d94ff303 files/digest-ruby-mmap-0.2.6 229
 RMD160 8a7f8085bc50ff8dec0045bf1fef9d19af8293ea files/digest-ruby-mmap-0.2.6 229
 SHA256 36911f6564bd3e8c7174b7f8c863ad94edab535a7f76b68d07dca3cff02c301e files/digest-ruby-mmap-0.2.6 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFG3bki0BM77Tkv120RAmA8AJ9eZX1NBLmAlua9xragXKIdCons7QCfT0Td
-lV4WwmvowgGAD9AywfnGMQE=
-=ofoJ
------END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-mmap/files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch b/dev-ruby/ruby-mmap/files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch
new file mode 100644
index 000000000000..6b5160b4fc62
--- /dev/null
+++ b/dev-ruby/ruby-mmap/files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch
@@ -0,0 +1,20 @@
+--- mmap.c.orig	Thu Feb  1 14:52:50 2007
++++ mmap.c	Thu Feb  1 14:55:16 2007
+@@ -1113,7 +1113,7 @@
+ 	}
+ 	else {
+ 	    RSTRING(str)->ptr += start;
+-	    repl = rb_reg_regsub(repl, str, regs);
++	    repl = rb_reg_regsub(repl, str, regs, pat);
+ 	    RSTRING(str)->ptr -= start;
+ 	}
+ 	if (OBJ_TAINTED(repl)) tainted = 1;
+@@ -1211,7 +1211,7 @@
+ 	}
+ 	else {
+ 	    RSTRING(str)->ptr += start;
+-	    val = rb_reg_regsub(repl, str, regs);
++	    val = rb_reg_regsub(repl, str, regs, pat);
+ 	    RSTRING(str)->ptr -= start;
+ 	}
+ 	if (OBJ_TAINTED(repl)) tainted = 1;
diff --git a/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild b/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild
index 10a71be20d3b..104b8f029064 100644
--- a/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild
+++ b/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild,v 1.1 2007/01/08 21:44:26 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild,v 1.2 2007/09/18 17:14:18 rbrown Exp $
 
 inherit ruby
 
@@ -15,13 +15,19 @@ SRC_URI="ftp://moulon.inra.fr/pub/ruby/${MY_P}.tar.gz"
 SLOT="0"
 USE_RUBY="ruby18 ruby19"
 LICENSE="Ruby"
-KEYWORDS="~alpha ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/ruby-1.8"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
 
+	if built_with_use dev-lang/ruby cjk; then
+		cd "${S}"
+		epatch "${FILESDIR}/${P}-oniguruma_rb_reg_regsub.patch"
+	fi
+}
+
+src_compile() {
 	ruby_src_compile all rdoc || die
 }