Version bump to ruby22 series.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 248 insertions, 6 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 6d0d7eaa529a..147a39ac7bb4 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.694 2014/12/07 07:18:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.695 2014/12/27 21:02:19 graaff Exp $
+
+*ruby-2.2.0 (27 Dec 2014)
+
+  27 Dec 2014; Hans de Graaff <graaff@gentoo.org> +ruby-2.2.0.ebuild,
+  metadata.xml:
+  Version bump to ruby22 series.
 
   07 Dec 2014; Hans de Graaff <graaff@gentoo.org> -ruby-1.9.3_p550.ebuild,
   -ruby-2.0.0_p594.ebuild, -ruby-2.0.0_p594-r1.ebuild, -ruby-2.1.4.ebuild,
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 5e1c0fee38c4..3f3fa3249fe8 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -4,18 +4,21 @@ Hash: SHA256
 DIST ruby-1.9.3-p551.tar.bz2 10049332 SHA256 b0c5e37e3431d58613a160504b39542ec687d473de1d4da983dabcf3c5de771e SHA512 5ea40f8c40cf116030ffdedbe436c1fdbf9a50b7bb44bc890845c9c2a885c34da711bc1a9e9694788c2f4710f7e6e0adc4410aec1ab18a25a27168f25ac3d68c WHIRLPOOL a4de6b7300e1f1cb22b01b1fbe0a73928baf6e5b1d083e8eb239e7696703e13774fdcb52bbb7f4253ea75b597663c43a8fbea2df7b77ed95f3fd8b2512ff1f1e
 DIST ruby-2.0.0-p598.tar.xz 8316092 SHA256 9dccf4c30e1bb004b18cb1129d9daac3c0ec510a671f4f4f13a2747897ffab35 SHA512 bf7b93d9fbaab98a64d1f45c3f3bbcdfebd3e1d0584dfb27696b2716d93c2ba13881e1edaef6d3eccd769ac2e21d6157024c902f3d891951a20b972c1942ef99 WHIRLPOOL 1c60cb96a1c5d75d157b281182e5caf16f8479d52c8eb61748c63884d9dbf020f6e79ccabdc50b6f35bba1eb994c04ade5cdda550902dd6135c3838263445d12
 DIST ruby-2.1.5.tar.xz 9371780 SHA256 22ba1eb8d475c9ed7e0541418d86044c1ea4c093ab79c300c38fc0f721afe9a3 SHA512 8a257da64158d49bc2810695baf4b5849ef83e3dde452bf1e4823e52e8261225427d729fce2fb4e9b53d6d17ca9c96d491f242535c2f963738b74f90944e2a0b WHIRLPOOL 7dab5db91e56ba95a221c456fbcebfb86aff038a084b7638f504e91e4c9b45a0ad7ee0296d6531281c33d75a31ee4f5ad05af6567a93034316f3992ebc5d6bf3
+DIST ruby-2.2.0.tar.xz 10304244 SHA256 848714e280fc5fb44dbac3b060b206e56c1947006324ee68a174d68b483ef8ca SHA512 cd7e52faa464df8aca7ccfa23a5f06248e1ad82bc8c9f1829aa1b51ff37b15973b8caaa68e914d837325b8d59427fda4f3cad82c50925e1c84e688324a2a155d WHIRLPOOL 6d06101015b6dee7f0f4409597b481d3ad08679237ad884866e513bbad2d851afc09ac414c60871d2ceeb9221013497f0c482c481c95c3e8f20a4664e95148fa
 DIST ruby-patches-1.9.3_p551.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 SHA512 fdb07393439dfcc97e5d4ecd12059ef69983b23588079e1292cec1c93544524a67265e4f61f75d20ac540ee9f9ace730a584462f94bea4919124a3264e6f0ae1 WHIRLPOOL 422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
 DIST ruby-patches-2.0.0_p598.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512 423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
 DIST ruby-patches-2.1.5.tar.bz2 2310 SHA256 1743dc0cec0adc1a0b5d90b0ed7908f888b8251b7a414049a57e6e32e01e4ad6 SHA512 b695621d210a7afc6704dd480bf3e7fc559174ebf240d2287338d60537ba45e5bf0f5defac6b254064d4b28077e2b97ef23b7eadc1bfa1a6bf2c616e828f937c WHIRLPOOL e9fde062fc04e4e22aec2dc55250f9007c64b07c7d03875b4073c19af9cfb0ae735d6dcb2b65bd1465a457cf0ff0602866600b5af1d520df3efc8a418763ab5b
+DIST ruby-patches-2.2.0.tar.bz2 2310 SHA256 1743dc0cec0adc1a0b5d90b0ed7908f888b8251b7a414049a57e6e32e01e4ad6 SHA512 b695621d210a7afc6704dd480bf3e7fc559174ebf240d2287338d60537ba45e5bf0f5defac6b254064d4b28077e2b97ef23b7eadc1bfa1a6bf2c616e828f937c WHIRLPOOL e9fde062fc04e4e22aec2dc55250f9007c64b07c7d03875b4073c19af9cfb0ae735d6dcb2b65bd1465a457cf0ff0602866600b5af1d520df3efc8a418763ab5b
 EBUILD ruby-1.9.3_p551.ebuild 6157 SHA256 c4313a3df51f41b9754c0faf6f07c09c72ac38aa82db57aca337c6ba146098a6 SHA512 d2a27edcd370d5ea20929aa588a9b84fadf3c76d0b5432fca96e6823f1212e97d89b99ee172f382193d29196e868aea16af41ff269538a5d19fda284591c12f5 WHIRLPOOL e863de6f1cb79a7dad8cb08df3b74ac208985a662efd080a1cc98a7c523d6e7462426814af966a1075122975cf8d48440c12e9dbd1c542cd68bdf08134fb866c
 EBUILD ruby-2.0.0_p598.ebuild 6470 SHA256 d3dd22c788424bbb4ecc71a9ddf68939bce8f70a46579357760b6dcfb9f996dc SHA512 0a1ad26d4d0765cf602532ed615d5f232b93f0ad10eb9051659537d3ca0be2c0ca390e36d325e0f674e76022cdcf7e2ec818b975b479cd95c9baf155fb816f20 WHIRLPOOL 88ad285301e7226eb1c8af2955d81a3229110b9d922a1999b0f8d4358fb82b8c5ebd9704dd0bc04a03d1892bdeb09b63d54e91ed7a5f73dbc45bce7d20935f47
 EBUILD ruby-2.1.5.ebuild 6525 SHA256 cc4d5640d616a10448d19aff0b0f69798ca62452139e50d51a7d2ae21175e316 SHA512 3d09da2f240c4c15215d4cdba0d3916f4e7b60d910d852453a479b84d69359edbdab525cbb32dba2de39ed36c1d52ae81f9cbe459a38f2a1a1e3f27fa8c53a21 WHIRLPOOL 2fbe0765389e6074a737a0195d4f1be550c6c54adf16da5279b5d3738750766d560a3731a9279c63c8e662f46907ce2cb73ce2f318355b85ba8bbfcb73b8255d
-MISC ChangeLog 104097 SHA256 823e5e46e9f31c37013ece3168aaa2400f20902cb53e4b4db673a37e365f84a7 SHA512 90aa4b40c2822eea3d6d5575f8e70e53a6ca2d13bd5372618ae3d44c58cc2d8598c0482f974c4f7ef9a03775fb857029c3a8d317d85b2db1083382d0c83ca735 WHIRLPOOL 4760112a5ffd5703ad5c6981d1a1c5e1b1fb6c3001b0689068382a755a64740ec8a79e05fe116d1c51247b138b4de693cb95cdd8cb64500f17503dff3cfbafbd
-MISC metadata.xml 992 SHA256 dd9e9c8252fc245f4f3c75c901e84faaceebcc1025742244871e49e7090d8a86 SHA512 7894c050d0b4dd875cd380e5db759ad7ed8c23edfff79accb169f4cbb185aed9b65c0d81e1cea3c53ef8f639423614a48de5265b069ec1ea11ef41498b1cd4f4 WHIRLPOOL e651f88aea9f39d9dcd9e6e5547699ec06568c99737948e7bee1554bdb6c45defbd7f98e435ad7c31305763e078d904b14aa14ddce084cd9c5b83dacd47c0402
+EBUILD ruby-2.2.0.ebuild 6500 SHA256 662f5ca8a30e5941c8efdcfdcb3835b3eb75664cfebe5314ceaa61203630e195 SHA512 8986ae2fc2393b7ffb65b2de610fb966559ba9de10545c8a7a80dcbd0142d80a1ca70e4c7f15014c66d345052a9f67d958b971abfc0cf5d23cfd8c585bf6708d WHIRLPOOL 9b9d7290f345dcd44dceba8278e2b6183ee37921658c18620cb2067fb1a88bdd1fd7ec4227814c9700bffe61fc5f9a0a5071c8e98c771961d039d32869593526
+MISC ChangeLog 104244 SHA256 63902d8da44802115986d54b37cede58d1bab9366663fce94b53e87f5bf0c09e SHA512 4c8f2dc085b3ef2f712a6725e9bdd32f38983f6074fe53c56db0c7a2cecb514b8e20e64c955f2c2761438bdcf78d65398cf63ea80dffbf34f2966e655066d660 WHIRLPOOL 2d5c5c2329599c934e307d6218b2ff4beff8b7c32b462d9812627da5d41013284e470d1c4e4bc93fcd404f94bedba8780eb5fd47d6943c3387d890941e77d6c7
+MISC metadata.xml 1084 SHA256 77b5afe4fc85576b9f4758b1cc1e9ad7021e40bdc341ca8a7932f54dba63a77b SHA512 3341c4c2bac3f5088827470ffaa842196c190d8732425fc0876cace29878602f62b4e0857e1eb52e8a2370df283735ed54da8d72802f8d09c9a513fe97e3e6ba WHIRLPOOL 481ca1b6f1bed13b2cdafe644f5478af62d29aa66374b5f2be55f5474a044d15894708dc1226f612c748d165cd1a26be5b0d307f290b74bca6a3c564a12e162a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSD/1MACgkQiIP6VqMIqNcl2AD/UmdythvSmxNIxryf2cESLADu
-SEI5zbwnENZtOMhKbi0A/iXvErAdcCZdLIx5Wv9MMh4uhkUWPI+S45E57HgkzV7u
-=/6gL
+iF4EAREIAAYFAlSfHlwACgkQiIP6VqMIqNd/HAD/Z+qfduLvnBqi7Yk+N1aQRlMu
+KdR7yIJzJBxlKdb6G2YA/j6CLYG03luSD2lL8i0Od2OgkBq4MjcDd1iPB7j7QQ0+
+=PbRp
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
index 255370541030..47732fa63ea4 100644
--- a/dev-lang/ruby/metadata.xml
+++ b/dev-lang/ruby/metadata.xml
@@ -23,5 +23,8 @@
     <flag name="rdoc">
       Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.
     </flag>
+	<flag name="jemalloc">
+	  Use <pkg>dev-libs/jemalloc</pkg> for memory allocation.
+	</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-lang/ruby/ruby-2.2.0.ebuild b/dev-lang/ruby/ruby-2.2.0.ebuild
new file mode 100644
index 000000000000..b5f228b612c1
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.2.0.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.2.0.ebuild,v 1.1 2014/12/27 21:02:19 graaff Exp $
+
+EAPI=5
+
+#PATCHSET=1
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(get_version_component_range 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+RUBYVERSION=2.2.0
+
+if [[ -n ${PATCHSET} ]]; then
+	if [[ ${PVR} == ${PV} ]]; then
+		PATCHSET="${PV}-r0.${PATCHSET}"
+	else
+		PATCHSET="${PVR}.${PATCHSET}"
+	fi
+else
+	PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.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 jemalloc +rdoc rubytests socks5 ssl xemacs ncurses +readline sse2"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	jemalloc? ( dev-libs/jemalloc )
+	ssl? ( dev-libs/openssl )
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	ncurses? ( sys-libs/ncurses )
+	readline?  ( sys-libs/readline )
+	dev-libs/libyaml
+	virtual/libffi
+	sys-libs/zlib
+	>=app-admin/eselect-ruby-20141227
+	!<dev-ruby/rdoc-3.9.4
+	!<dev-ruby/rubygems-1.8.10-r1"
+
+DEPEND="${RDEPEND}"
+PDEPEND="
+	virtual/rubygems:ruby22
+	>=dev-ruby/json-1.8.1[ruby_targets_ruby22]
+	>=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
+	rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	if use sse2 ; then
+		excluded_patches="012_no_forced_sse2.patch"
+	fi
+
+	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	# We can no longer unbundle all of rake because rubygems now depends
+	# on this. We leave the actual rake code around to bootstrap
+	# rubygems, but remove the bits that would cause a file collision.
+	einfo "Unbundling gems..."
+	cd "$S"
+	rm -r \
+		{bin,lib}/rake lib/rake.rb man/rake.1 \
+		bin/gem || die "removal failed"
+
+	# Fix a hardcoded lib path in configure script
+	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+		configure.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	# The Tk module can no longer be built because the module code is no
+	# longer compatible with newer stable versions.
+	# https://bugs.gentoo.org/show_bug.cgi?id=500894
+	local modules="tk"
+
+	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
+	filter-flags -fomit-frame-pointer
+	# In many places aliasing rules are broken; play it safe
+	# as it's risky with newer compilers to leave it as it is.
+	append-flags -fno-strict-aliasing
+	# SuperH needs this
+	use sh && append-flags -mieee
+
+	# Socks support via dante
+	if use socks5 ; then
+		# Socks support can't be disabled as long as SOCKS_SERVER is
+		# set and socks library is present, so need to unset
+		# SOCKS_SERVER in that case.
+		unset SOCKS_SERVER
+	fi
+
+	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
+	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+	fi
+
+	# ipv6 hack, bug 168939. Needs --enable-ipv6.
+	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+	# Determine which modules *not* to build depending in the USE flags.
+	if ! use readline ; then
+		modules="${modules},readline"
+	fi
+	if ! use berkdb ; then
+		modules="${modules},dbm"
+	fi
+	if ! use gdbm ; then
+		modules="${modules},gdbm"
+	fi
+	if ! use ssl ; then
+		modules="${modules},openssl"
+	fi
+	if ! use ncurses ; then
+		modules="${modules},curses"
+	fi
+
+	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
+		--program-suffix=${MY_SUFFIX} \
+		--with-soname=ruby${MY_SUFFIX} \
+		--docdir=${EPREFIX}/usr/share/doc/${P} \
+		--enable-shared \
+		--enable-pthread \
+		--disable-rpath \
+		--with-out-ext="${modules}" \
+		$(use_enable jemalloc jemalloc) \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		--enable-ipv6 \
+		$(use_enable debug) \
+		${myconf} \
+		--enable-option-checking=no \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	emake -j1 V=1 test || die "make test failed"
+
+	elog "Ruby's make test has been run. Ruby also ships with a make check"
+	elog "that cannot be run until after ruby has been installed."
+	elog
+	if use rubytests; then
+		elog "You have enabled rubytests, so they will be installed to"
+		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+		elog "than root, and you must place them into a writeable directory."
+		elog "Then call: "
+		elog
+		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+	else
+		elog "Enable the rubytests USE flag to install the make check tests"
+	fi
+}
+
+src_install() {
+	# Remove the remaining bundled gems. We do this late in the process
+	# since they are used during the build to e.g. create the
+	# documentation.
+	rm -rf ext/json || die
+
+	# Ruby is involved in the install process, we don't want interference here.
+	unset RUBYOPT
+
+	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+	for d in $(find "${S}/ext" -type d) ; do
+		RUBYLIB="${RUBYLIB}:$d"
+	done
+	export LD_LIBRARY_PATH RUBYLIB
+
+	emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+	# Remove installed rubygems copy
+	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+	rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+	if use doc; then
+		make DESTDIR="${D}" install-doc || die "make install-doc failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r sample
+	fi
+
+	dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+	if use rubytests; then
+		pushd test
+		insinto /usr/share/${PN}-${SLOT}/test
+		doins -r .
+		popd
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		eselect ruby set ruby${MY_SUFFIX}
+	fi
+
+	elog
+	elog "To switch between available Ruby profiles, execute as root:"
+	elog "\teselect ruby set ruby(19|20|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}