Revision bump to fix bug 503804 (forced SSE2 during compilation on x86). Thanks to Andrew Savchenko for providing a patch.

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

3 files changed, 245 insertions, 5 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 68aab7c4a315..d1ea58a6e2be 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.644 2014/04/09 08:57:36 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.645 2014/04/14 18:51:55 graaff Exp $
+
+*ruby-2.1.1-r1 (14 Apr 2014)
+
+  14 Apr 2014; Hans de Graaff <graaff@gentoo.org> +ruby-2.1.1-r1.ebuild:
+  Revision bump to fix bug 503804 (forced SSE2 during compilation on x86).
+  Thanks to Andrew Savchenko for providing a patch.
 
   09 Apr 2014; Hans de Graaff <graaff@gentoo.org> ruby-1.9.3_p484.ebuild,
   ruby-1.9.3_p545.ebuild, ruby-2.0.0_p353.ebuild, ruby-2.0.0_p353-r1.ebuild,
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index a325650f6159..7f35090bd84a 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -17,6 +17,7 @@ DIST ruby-patches-2.0.0_p353-r2.tar.bz2 2540 SHA256 016270a6128aa4354bcc13ebca03
 DIST ruby-patches-2.0.0_p353.tar.bz2 1929 SHA256 4feee409319dbcac7525fb9c1c76c36888a62ee0623c117ae532bf765845f0f9 SHA512 95cf20e26e43a1515843d74c558e3344ae33b7383362c1742a115c1b3e6d09e1ed947df8ab7fee6275e96c920bd0ef880647da70165ddccd40d0995ff43aae64 WHIRLPOOL 869055dd0e14af0dc285a11d95a891ab4686e1d16960d46728ddf680eee58d42570f64d058b88d30805b732b082c354a36dac5a816a7ce5f3034d1b22237aa5a
 DIST ruby-patches-2.0.0_p451.tar.bz2 2931 SHA256 7ed87d7eae176a7b164a2d11fdcc5ff98acf477f56e8030667c0e5ac3fd68781 SHA512 c477919b57ca2a0b3285bccc783887909245249d7c0a99430fa5e8ca6a01390ea4e87b3426fbde9ec811adbceedaedc9e1bb9c078a363b7c0cf4c679393d4b77 WHIRLPOOL 272093c06bd1109bc6ee91c014364373d3af68b4c26afdd90e1f3ce11eb206287655225d60c308e3c7e62070611a7fccbb2d4174d2726ee126ce9494c30cb7dc
 DIST ruby-patches-2.1.0.tar.bz2 1929 SHA256 9bc6cf595c274038a6e6945ee254c687fbc273d14746f9e887a3815d6b52897f SHA512 02007b7de38bb845b69b6d3e6363ef61ebbf8a8fcda56f9d66c384822ca58c8794fe47675353824120c66ac02ab460b739851ef33136fbb527ea4c5d7ed68ffb WHIRLPOOL e1e3335b3d17e9a22f84a77fe52954a4e71cac2125e5c7ceee76690b1b9351020156ed085a429d689d7ac58a394985d66f2ed3a67d71cc35cb791a98b1d10264
+DIST ruby-patches-2.1.1-r1.tar.bz2 2657 SHA256 fac8364861b27c00903642004535bfd14aa797e7d400517193ec685c5d155165 SHA512 09065614a3515ef37ec273d95571b4f54b5b5e2febb27e66b679433b5d673aa390494b4eaebaf43b328d4ef60d14b0eb0b044b1fdd43c81a8ee6ac12a74a064a WHIRLPOOL 9e3aa245a8c7f0ac985a8c3c5d51bb57102e9a13ea45700e0708568e564af45e95bec41aff91bdc8842258f6517556de5db7aaa76bfab6ab473af79554e02c9f
 DIST ruby-patches-2.1.1.tar.bz2 2351 SHA256 de72517ec72e681072f029b266ebb3947e91c1fcd81835217e794151fa026d05 SHA512 8b140046e2e2a6d19caebfd36a41b278b55ffa2fab7d4c959307b1af0c119ead6c27416f3582d1db02b1e47397f46e2e837508477f45b0c2c7b8dfb4f2f13314 WHIRLPOOL 388056522f88e3c0827fa3610d76a304b292c21eab9237118e5ac44a0969e3ae70b44b9e56bbfa39c926b16d49b4276dd230517caa453bee4add3dd928590a12
 EBUILD ruby-1.8.7_p374-r1.ebuild 5584 SHA256 d5d1c19832239a7cbdcb13bdbe66b123a22e5ab207be3852a040ebfe1ce61773 SHA512 14f82543fa21ece835f6d6203a84eaa4b15584db6b663fe666e61389944df83f6259bf292aa0cc86791f0300c9a893a930ffa12e6a110bbba84aeb5423261afd WHIRLPOOL 9595fe2a7501c102baa94e90beb4a57e52defce20576a09c0708755ca2c5a15cd0fec0157771f98810820d43d7e3b025d2653aad2fec9e39d7db748d7451d762
 EBUILD ruby-1.8.7_p374.ebuild 5528 SHA256 abd130fb48479ab4e3f82bac6b6f3fe7acf4416b98626c5d1a41af6498fa5ae8 SHA512 cc458d40b7f242dae1987aa70ba0cb5d0100c61a9d2a7eb04faa707b5d111e772a960299e238e8a40f4aed76d98304ef2c6aaabe7696bfffa685c214542ed411 WHIRLPOOL abafeeae7c0da381f0ab1cc8c8314c3118b0b9922c7e7f32e8f897e3f765679d38cef864c1cd2ec2d26236fc74dee4e419b2be362514b0364ff26427d4b2ed28
@@ -27,13 +28,14 @@ EBUILD ruby-2.0.0_p353-r2.ebuild 6596 SHA256 db2024625d4d6eeb9770d81a9b8bfb7faab
 EBUILD ruby-2.0.0_p353.ebuild 6505 SHA256 dd29cdfec77df7e0d811375d6e52deb0e3a9b9a118ab272fd869dab48e82b430 SHA512 7a3e163f81e99646f1eb30605b37a98ea639d4af0525dcd7d103ef816957369b4cfa831555005748b084c029f3f11876b090fd5e329d68055877a6b7bac4da76 WHIRLPOOL 725734370ef5cb4f5fe870e8649bfe759ad94029fef88a33c04e487ae3f7e9573fd873a17691ef6c5069d3f1f5d82dccab177b6093bba4028855863895bd7e1c
 EBUILD ruby-2.0.0_p451.ebuild 6609 SHA256 b0bdceb647b85bf6d7907a3daf9d760c72b3cbedf931d723f87d2dd98e9a431a SHA512 480d0c5a9aae4ec2e4f129b6ba963057a1b13667d33b49e098c64a84b8a5dc538c075afcf9430b92155b3aacb8ccc8ca8858efb95ca392fe60fb94e392ab8365 WHIRLPOOL 1cdf5173c39066a94a0bedc4fecd9622277b333b6b15a1c1e18e4284df23cfc0e41a8fb2b7285ca4c11f79e0f0218c2e8b3943036b598bbe232b367a884df895
 EBUILD ruby-2.1.0.ebuild 6638 SHA256 96d263540766212456439fa5b4785817c2efb2251b72ff685844100395f921ad SHA512 1cb0b8aaff76c3117f0e21fc2bb4b2bb57b95e3f42c16d7f2ff8b552c737dfc9281c9af3a934c03db03b3f2a6d80635619293953c71566ed1a0ee395791b7f53 WHIRLPOOL 3071caec5441b32486fe2ac8245d9a67f1c374247a5853fa9b023c5ac32c58dd4e6daca2a3e1a420629e1912927f1ba253d324e7f6ccbaec5cf24c94fe3197e3
+EBUILD ruby-2.1.1-r1.ebuild 6657 SHA256 94f39f4061c6e646e864a186fb10f998862300ab1ec4949afb5ce4816f3a8393 SHA512 ed23d5f1009c780e3441c3fa5c2ab13c84a73c2531272b91f0158b770417638dc623b142a1508d263670add0e775144b74a326c7bb7e7ddbe81ff385e4f27178 WHIRLPOOL 36455f4dd889bc9f70a57d21c643ee0a3575e3bc7886b72bd4c6bd64dcc6326c67638fe8419ec806810c46d470f12ae79179517dede00ea7456d89514d354ae6
 EBUILD ruby-2.1.1.ebuild 6654 SHA256 ec99a36043dc78790eb2ad4001b181e796e07968acaf41fd8df20282f0e0d64a SHA512 0159823f3e1fc83399c60cb3c6cef4b16fe2acb9a56100fc66dd5bc76d37473f8d5780f06715d8ccf34665e7e6944df7e5e91d6701433747d91a22eae208b3b5 WHIRLPOOL 2ba8da10adb6f3b6a3a837a6f367ad3451aa116b144a2fe6180befbc1522af2451476e9414c019d2d1888c38d65438e41314a3b2be8abbb464e83404319a5ba2
-MISC ChangeLog 96549 SHA256 051356cddee41be7c10ba3b1fc6f9220c16afe3adf0b82726efd2700d194716f SHA512 68ceb663c83ff19646873c925e60dd2e06a816f85661d3c0cfd433de0b37908c64dbd486818185d2d5be624b3ef58c0dc2f4919ed514204cc82580b1dd4c356e WHIRLPOOL 33788889ff69bc4cad9e5aa7d46f4f955a2a32d609afdca478df3633c1f7257b6ac78935443e7d641c521c56aab1efd776244551a34a7c8b1dfb0686e584dd1a
+MISC ChangeLog 96780 SHA256 a117e457eebf5c2555546132c5e888716e0d45f4053b62f342de7e6e9ab7c251 SHA512 21c79ad89d73ebbbf20dafd47a1d0b524113e1f77ae0e2bc9a0dfe4c80465db5337c1a6cfeb504f578edbbf95a4202fc61ea67588fb29ee6010db3a029f8a17c WHIRLPOOL 1bd5b4de8c2fdc86c9e018a935b3798b7b0d87e54de7dd5a744154648d60ac80838864a1fde9f1947ea7dffe509ea32b061d31b4df63bc63dcf24ff90d7846f4
 MISC metadata.xml 1384 SHA256 b3528b04bc1430564267c74d98de8107f7b55a20d6a76a2f04068d13c7136e0c SHA512 1e3b7c01915f4484e0ccba766b3649ef8d4e07c1a11be0a2ae28dbc6d8666719ae8ae3e5f4d478e21a3a913eb34c12d7e45f68701100987b81135417265a4eb1 WHIRLPOOL cf7e579efae2d3ac81e2447398addb65a645c0c65ad1bac6aa7ebe8265d5c9f8d3e86175feae988ff10596e9c8b56047cda22942c49224800c9167cefae5bca6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNFC4cACgkQiIP6VqMIqNdP4gD/Wl/yCBdsUpaXeUT4JKIHP2AD
-f6+D5evHBE53El/Ze3UA/32dZXK1hQyUNKlXuuErhNjg9MCdHmN9kmVKijolD+OW
-=dhbX
+iF4EAREIAAYFAlNMLlMACgkQiIP6VqMIqNdgqgD/bTj7IpLcjnCMOD2/q/vNEdaU
+xlLMo5tWwwsl9PUwbNAA/0tzHmeMMAmcKHCVmSigdO8f3qj/udWTGZnz90mzyXkx
+=7gxL
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-2.1.1-r1.ebuild b/dev-lang/ruby/ruby-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..b30960b64bac
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.1.1-r1.ebuild
@@ -0,0 +1,232 @@
+# 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.1.1-r1.ebuild,v 1.1 2014/04/14 18:51:55 graaff Exp $
+
+EAPI=5
+
+#PATCHSET=1
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+RUBYPL=$(get_version_component_range 4)
+
+MY_P="${PN}-$(get_version_component_range 1-3)"
+#MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+RUBYVERSION=2.1.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.1/${MY_P}.tar.bz2
+		 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 +rdoc rubytests socks5 ssl xemacs ncurses +readline"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	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-20100402
+	!<dev-ruby/rdoc-3.9.4
+	!<dev-ruby/rubygems-1.8.10-r1"
+
+DEPEND="${RDEPEND}"
+PDEPEND="
+	>=dev-ruby/rubygems-2.0.14[ruby_targets_ruby21]
+	>=dev-ruby/json-1.8.1[ruby_targets_ruby21]
+	>=dev-ruby/rake-0.9.6[ruby_targets_ruby21]
+	rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby21] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	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 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
+
+	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
+		"/usr/$(get_libdir)/libruby$(get_libname ${PV%.*})"
+	dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
+		"/usr/$(get_libdir)/libruby$(get_libname ${PV%_*})"
+
+	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
+}