dev-lang/ruby: Refresh with upstream

Package-Manager: portage-2.2.7

4 files changed, 18 insertions, 12 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index b1e15b85..074b89ed 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,3 +1,9 @@
+*ruby-2.0.0_p247-r2 (01 Nov 2013)
+
+  01 Nov 2013; Bertrand Jacquin <beber@meleeweb.net> +ruby-2.0.0_p247-r2.ebuild,
+  -ruby-2.0.0_p247-r1.ebuild:
+  dev-lang/ruby: Refresh with upstream
+
   14 Aug 2013; Bertrand Jacquin <beber@meleeweb.net> metadata.xml:
   dev-lang/ruby: fix metadata.xml indent
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 7573a4de..24cc5705 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -4,8 +4,8 @@ AUX ruby-2.0.0_p247-SVNr40636-asm-ilp32.diff 617 SHA256 e9cf9ac459601d09a4a62440
 DIST ruby-1.9.3-p448.tar.bz2 10052488 SHA256 a7372230357bfff8e4525fb8019046da521561fe66b02c25d8efc10c9877bc91 WHIRLPOOL 8ee50c811aac11c9b1b7e64bcd8c90af94b9cc84082bb4303fd001943b1b0b2ff26ff431d52fb3e1b996bcb68ca670f426c771902c3541b4a62cd60ae272e387
 DIST ruby-2.0.0-p247.tar.bz2 10804581 SHA256 08e3d4b85b8a1118a8e81261f59dd8b4ddcfd70b6ae554e0ec5ceb99c3185e8a WHIRLPOOL 59eb0a5d71125b63226435d825f5793fd9ff7f065851b902ee45f974fdaf5f5498d12b07d8e20e668a1e4636dbc8f34d025f8713bd98e3c565327484e484a863
 DIST ruby-patches-1.9.3_p448-r1.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 WHIRLPOOL 422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
-DIST ruby-patches-2.0.0_p247-r1.tar.bz2 1929 SHA256 4feee409319dbcac7525fb9c1c76c36888a62ee0623c117ae532bf765845f0f9 WHIRLPOOL 869055dd0e14af0dc285a11d95a891ab4686e1d16960d46728ddf680eee58d42570f64d058b88d30805b732b082c354a36dac5a816a7ce5f3034d1b22237aa5a
+DIST ruby-patches-2.0.0_p247-r2.tar.bz2 1929 SHA256 4feee409319dbcac7525fb9c1c76c36888a62ee0623c117ae532bf765845f0f9 WHIRLPOOL 869055dd0e14af0dc285a11d95a891ab4686e1d16960d46728ddf680eee58d42570f64d058b88d30805b732b082c354a36dac5a816a7ce5f3034d1b22237aa5a
 EBUILD ruby-1.9.3_p448-r1.ebuild 6151 SHA256 a2254d1f2e874ba9b20d9a11ecef9f8256d0f361c35680d1dc664b1ed563e8fe WHIRLPOOL e80f64cdf7b54bf1c1e8e6c8550126a0ab38fda7131a35acf9de00f39672a2bd188e404b370b3eae0bf4ab6d512b92535ebb734c4e13c677a57ce34d9ad4f9d5
-EBUILD ruby-2.0.0_p247-r1.ebuild 6648 SHA256 bffe08ba2cbf7e81cac00e2e5a185070eeb4ddd6a3944bb5b978d28d8e49da82 WHIRLPOOL 6caca656f75681d9c0531b173561f561cee43b14e6a3da62e667970caea99ded66369e620492e9063dcc45c539ff96fb85bef50071d069818f0163407cc55cc6
-MISC ChangeLog 519 SHA256 8c25d1bd3b64e83f985b4b2ed985ffb9a88e18d0a13e767e489340239485fa40 WHIRLPOOL 3bf2531e9ee933c6a4ec0baee6b2c08e7841620d843cca4bf05780ed30069347c762a28e47292e19f5f41d528273ac3414aaeb44b2cd1bcb8b9e7726af15d38a
+EBUILD ruby-2.0.0_p247-r2.ebuild 6624 SHA256 e2672a92d2be78cf83b083de8dfbca2cd778f0ca70fa69a050bbbf69711cd2bf WHIRLPOOL baa3d67b8c0491440a8da64db05bfd7d57f9e2c2b4aac81b2311ad1caeea33840e7607e64c2afdf179e4f3d4b63cf9bb31e923a69b12fc04ef55bfc79d778d78
+MISC ChangeLog 705 SHA256 393e8f43093b2d5b8f4fcfaf43732266f4dc9f028d190cf84385c4103075768e WHIRLPOOL 101670a7669732363fd5defc95a6d4b0439cab91df2416757395c02f3262d2a45d90cb3e8b60a382f78f6d4f226910d8f96a7dde6dc1f8545b9c80d9d2505ac7
 MISC metadata.xml 1135 SHA256 4eb2a9282b6a9ec8da39dece1406618a5134adc75bc27bb8b73109ce1bfc4e62 WHIRLPOOL 3aeaa05e3e8f762ba9d6f779165ce9b715e0858cec3b19b73d3c2ecc5236be9f1cd67f6dddfe1fadf9e9bde2b8f1f77e1e9d2400bf8bf8cefdc1dd367ad21342
diff --git a/dev-lang/ruby/ruby-2.0.0_p247-r1.ebuild b/dev-lang/ruby/ruby-2.0.0_p247-r2.ebuild
index f9b12b82..0fa61f4b 100644
--- a/dev-lang/ruby/ruby-2.0.0_p247-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p247-r2.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-lang/ruby/ruby-2.0.0_p247-r1.ebuild,v 1.1 2013/07/29 19:06:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p247-r2.ebuild,v 1.1 2013/10/14 18:38:57 graaff Exp $
 
 EAPI=5
 
@@ -34,7 +34,7 @@ SRC_URI="mirror://ruby/2.0/${MY_P}.tar.bz2
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml"
+IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
 
 RDEPEND="
 	berkdb? ( sys-libs/db )
@@ -44,7 +44,7 @@ RDEPEND="
 	tk? ( dev-lang/tk[threads] )
 	ncurses? ( sys-libs/ncurses )
 	readline?  ( sys-libs/readline )
-	yaml? ( dev-libs/libyaml )
+	dev-libs/libyaml
 	virtual/libffi
 	sys-libs/zlib
 	>=app-admin/eselect-ruby-20100402
@@ -125,6 +125,7 @@ src_configure() {
 		--with-soname=ruby${MY_SUFFIX} \
 		--enable-shared \
 		--enable-pthread \
+		--enable-psych \
 		--disable-rpath \
 		$(use_enable socks5 socks) \
 		$(use_enable doc install-doc) \
@@ -135,7 +136,6 @@ src_configure() {
 		$(use_with ssl openssl) \
 		$(use_with tk) \
 		$(use_with ncurses curses) \
-		$(use_with yaml psych) \
 		${myconf} \
 		--enable-option-checking=no \
 		|| die "econf failed"
diff --git a/metadata/md5-cache/dev-lang/ruby-2.0.0_p247-r1 b/metadata/md5-cache/dev-lang/ruby-2.0.0_p247-r2
index e313eed2..3afb84a5 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.0.0_p247-r1
+++ b/metadata/md5-cache/dev-lang/ruby-2.0.0_p247-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An object-oriented scripting language
 EAPI=5
 HOMEPAGE=http://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml
+IUSE=berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20] >=dev-ruby/json-1.7.7[ruby_targets_ruby20] >=dev-ruby/rake-0.9.6[ruby_targets_ruby20] rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.0
-SRC_URI=mirror://ruby/2.0/ruby-2.0.0-p247.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.0.0_p247-r1.tar.bz2
+SRC_URI=mirror://ruby/2.0/ruby-2.0.0-p247.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.0.0_p247-r2.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	8b38b0911d1a88cc7c0a22b59b10b5cb	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	89580da5ec17ad687fcde876c542b91e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=6e7c67f94b1af591d8253c49555e3534
+_md5_=267b42814fef9296b376c440fbdec2d6