Remove support for ruby[cjk].

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

4 files changed, 13 insertions, 37 deletions

diff --git a/dev-ruby/ruby-mmap/ChangeLog b/dev-ruby/ruby-mmap/ChangeLog
index 67ec34701a6c..806de3abb226 100644
--- a/dev-ruby/ruby-mmap/ChangeLog
+++ b/dev-ruby/ruby-mmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/ruby-mmap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ChangeLog,v 1.14 2009/05/09 01:16:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ChangeLog,v 1.15 2009/08/15 13:13:46 graaff Exp $
+
+  15 Aug 2009; Hans de Graaff <graaff@gentoo.org> ruby-mmap-0.2.6.ebuild,
+  -files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch:
+  Remove patches for ruby versions with cjk support. We no longer have
+  versions of dev-lang/ruby with the cjk USE flag. This also eliminates
+  deprecated use of built_with_use.
 
   09 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   ruby-mmap-0.2.6.ebuild:
diff --git a/dev-ruby/ruby-mmap/Manifest b/dev-ruby/ruby-mmap/Manifest
index 8e4e70d71916..03b1dcc92309 100644
--- a/dev-ruby/ruby-mmap/Manifest
+++ b/dev-ruby/ruby-mmap/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch 555 RMD160 2a1d612022435f6f2067df54acbe991505d8e64d SHA1 18ff24387324dc4429cf67e96d47808407b3ddd7 SHA256 16142a66e277a2013a3f1b483e30944aff9c0351a929d684b18960d8ae109c41
 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
-EBUILD ruby-mmap-0.2.6.ebuild 768 RMD160 20a974b75d3e467521d20cfd671ff5fbcc36ebe6 SHA1 a674d9507bb3458dc354ce7edbe68d210ff835f0 SHA256 46a1d5936eca343d9a973d463af657ee70ff69ed7e5a24ea33e2edcf24afebe6
-MISC ChangeLog 1978 RMD160 f7d379e52784d1b6632b044bc7f2b617812364e5 SHA1 4e24436497276cc9b5a0340f23568a04d2313fdc SHA256 9f90e83a5c66c76fcfe0a97ca0e9e484fdc27e6abcb7e69592a1da74c4cda648
+EBUILD ruby-mmap-0.2.6.ebuild 600 RMD160 04fd9de8823ef6a5af024cbae26419f7ba49a6c4 SHA1 a8c214633b1d134cf2da2e7111054ba49fbb24fc SHA256 442abe895b4b828092525e5b7141abd2015e481731441c70d9a4572f0475b5d7
+MISC ChangeLog 2285 RMD160 9d978340719561f4a68504fd3278b2c9ef8b0742 SHA1 be8841b241e72411265ce382bf9f2a90d5b52144 SHA256 f8454d3eadf607f6e090d2507f5201850caf28d0473453881f62b44420c75018
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoE2V8ACgkQAiZjviIA2Xj+hQCfR0HyEH93/RwbNuIdM2OeMjSv
-NncAoJ5mMK3VXpm2asLBmWZ4q5Kjr5sF
-=mfSJ
+iEYEARECAAYFAkqGtJQACgkQVYU2Ai8K93fpFACgvoulXa1ahusd1lAngnVSD9hy
+AYoAn2jRNHWD2CF8MnhggSBal0HLT3N+
+=6AUN
 -----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
deleted file mode 100644
index 6b5160b4fc62..000000000000
--- a/dev-ruby/ruby-mmap/files/ruby-mmap-0.2.6-oniguruma_rb_reg_regsub.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 ef8c308b69c7..4dca1dc88b1f 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-2009 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.4 2009/05/09 01:16:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ruby-mmap-0.2.6.ebuild,v 1.5 2009/08/15 13:13:46 graaff Exp $
 
 inherit ruby
 
@@ -19,15 +19,6 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-
-	if built_with_use --missing false dev-lang/ruby cjk; then
-		cd "${S}"
-		epatch "${FILESDIR}/${P}-oniguruma_rb_reg_regsub.patch"
-	fi
-}
-
 src_compile() {
 	ruby_src_compile all rdoc || die
 }