From 88ecd2c8ec0fe8737d9ab6a4003fb7f388ef7386 Mon Sep 17 00:00:00 2001
From: Alex Legler <a3li@gentoo.org>
Date: Tue, 30 Aug 2011 19:35:59 +0000
Subject: [PATCH] Patchlevel bump. Thanks to Shota Fukumori for proposing an
 ebuild. Removing old patchlevels.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
---
 dev-lang/ruby/ChangeLog                       |   9 +-
 dev-lang/ruby/Manifest                        |  22 +-
 ...by-1.9.2.ebuild => ruby-1.9.2_p290.ebuild} |   7 +-
 dev-lang/ruby/ruby-1.9.2_rc2-r1.ebuild        | 214 ------------------
 4 files changed, 20 insertions(+), 232 deletions(-)
 rename dev-lang/ruby/{ruby-1.9.2.ebuild => ruby-1.9.2_p290.ebuild} (95%)
 delete mode 100644 dev-lang/ruby/ruby-1.9.2_rc2-r1.ebuild

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index d0dbcbde9896..defa9582c119 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.502 2011/08/10 18:16:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.503 2011/08/30 19:35:59 a3li Exp $
+
+*ruby-1.9.2_p290 (30 Aug 2011)
+
+  30 Aug 2011; Alex Legler <a3li@gentoo.org> -ruby-1.9.2_rc2-r1.ebuild,
+  -ruby-1.9.2.ebuild, +ruby-1.9.2_p290.ebuild:
+  Patchlevel bump. Thanks to Shota Fukumori for proposing an ebuild. Removing
+  old patchlevels.
 
   10 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org>
   ruby-1.8.7_p334-r2.ebuild:
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 84538141f8a0..b2ae9757c65c 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST ruby-1.8.7-p334.tar.bz2 4190857 RMD160 f3d078d526f1b19d3255dc236f5a46062883e7c9 SHA1 4311ce257f2e54f247bfe07b48e799d293d041f2 SHA256 3e7f1a15fb2c205ac9eb0da804983b83bf8c0ffeb2f146d1eb9e0579ea2507da
 DIST ruby-1.9.2-p0.tar.bz2 8495472 RMD160 dc15937c884b0f93863e9871304bae95e1233e15 SHA1 c0fc7e1047f1eac7e554e9818513593b0d398698 SHA256 e9710990ed8c2e794123aba509010471915fb13c27dae0118831d2001a9c8d3b
-DIST ruby-1.9.2-rc2.tar.bz2 8480974 RMD160 d1f1eded267407699d6975bc284f00a6ad7930a5 SHA1 d4cbbb275b0534ccf4da27847972989adcfdb76d SHA256 692ebae991b104482dc9f0d220c1afb6b690a338b3b815aaa4f62954d2fa1b4a
+DIST ruby-1.9.2-p290.tar.bz2 8811237 RMD160 9722a91445fa81a101a2a8ab5753780c4601cc5a SHA1 8f25a74f50a10fdd9724e3c74ccd7bae596e198b SHA256 403b3093fbe8a08dc69c269753b8c6e7bd8f87fb79a7dd7d676913efe7642487
 DIST ruby-patches-1.8.7_p334-r1.tar.bz2 2060 RMD160 6c20b0cf9ce9f15dc0d0d63afc7f93abd7521317 SHA1 85360153650e942f1cfe4041018fcf1406c1c979 SHA256 fc6069897b0e6480e46c7fca3d8ef3508b6c106f34a8695a6784b20b97f5cc61
 DIST ruby-patches-1.8.7_p334-r2.tar.bz2 2638 RMD160 02feaf918801b8a81716ceb1e9761eca149246d0 SHA1 cbbd3d9d473458d44b83c5d8c9016a62db0337f4 SHA256 d4316ca0f4b504d5aa237c8852533c8e504da76d9aec8305227d12910239e431
 DIST ruby-patches-1.8.7_p334.tar.bz2 1770 RMD160 80c131ba5ea75941fd038bd8ea74078ff9c2f62c SHA1 85eb95d4bbb451fe403e3edd8c224e61d7c429ba SHA256 a3ce905072d3e0111a59a7901523bb760e3852d1d197cfc6fed80f7434fe8ff2
 DIST ruby-patches-1.9.2-r1.tar.bz2 2272 RMD160 d10f950c40384fe41f7eba14e55621aaa7c0ca06 SHA1 b9eb2d01f49ebf032257f84b00ec56420172234d SHA256 d4dd786cf637e5d4415b850bceca16caa9f6bd0b515fff09a64bdc18bc151de4
-DIST ruby-patches-1.9.2.tar.bz2 2272 RMD160 d10f950c40384fe41f7eba14e55621aaa7c0ca06 SHA1 b9eb2d01f49ebf032257f84b00ec56420172234d SHA256 d4dd786cf637e5d4415b850bceca16caa9f6bd0b515fff09a64bdc18bc151de4
-DIST ruby-patches-1.9.2_rc2-r1.tar.bz2 2403 RMD160 345fcf857e8760f66ded3759a9a84d4a4d94b067 SHA1 985dbbec258c319d1a256c53af1f79148cc7bdf6 SHA256 2b1b45ad4195fc8aba26858fc4ca31769a9c49af9711902bac95732baf26ed0f
+DIST ruby-patches-1.9.2_p290.tar.bz2 2246 RMD160 66e8287fa35cf34c471dc19215f4a6f63b67661b SHA1 b1a07618a62877ced18000ceb77bbbed132492e6 SHA256 bc01ad4e6e6dc5cae4c323cc16e9a441f38652eab3e6e3cecdff3baf46102889
 EBUILD ruby-1.8.7_p334-r1.ebuild 5572 RMD160 7a4fcb776af39dfce8f260ba5306a096e975fd81 SHA1 0857e58658e704b35e4f4eecc92c7fe47866ffff SHA256 9fc6b371b978fa2f9ddfd47f696575838cfb1893b7b9d63a548229ef9ccfd50d
 EBUILD ruby-1.8.7_p334-r2.ebuild 5581 RMD160 89236897da74277d8a5e95db6a1c3069c94a9cc4 SHA1 d829e326c6427be75ead646da31e6b9209540ea9 SHA256 99047695afacfa3f9375830de5a0aa0cfd099477d962dedeccc44ece5f52304e
 EBUILD ruby-1.8.7_p334.ebuild 5565 RMD160 8938c0deae0864973e8a4c4d3b2b7ca3e6e59d02 SHA1 7468f35da38e80050873ec9bffee83bdcffb6771 SHA256 f07c61ba15682d54b17b5c96033c54bdeafb3fb41af26ed0f90432d91fcaa039
 EBUILD ruby-1.9.2-r1.ebuild 6192 RMD160 2b6f13582639836819074839e0ec72492bf91d04 SHA1 81c01c6d6e553c0ce36cdfcffafdc4f38e72f07f SHA256 3ca4845d5277c4c0bf3e6fb0b73d7fef497937735115f9960a4425a9a6c5a65c
-EBUILD ruby-1.9.2.ebuild 6202 RMD160 8f66ed6c02a2c3d3380a9f67495231215936a7eb SHA1 b2ef86a24c06d5425d0960644e2b6101af4bc23d SHA256 ce85ca5181a0e6b67cc3c52e988275c8452ce430499eba788479c6d87fe59ec5
-EBUILD ruby-1.9.2_rc2-r1.ebuild 5831 RMD160 0ea468ff652e77e0961c842b9532b5eb38b95572 SHA1 aece647c15994af766adacb44b11e112bfa2306d SHA256 27be9162a4c84a4cb51931cdd6f5d37ddf7331a01a1e5479d56c5e4704c65871
-MISC ChangeLog 77053 RMD160 30977148cbb517285b79bd3fbb78b2c103e29c5a SHA1 a242acdb6e37fc45f7f94a41b30708884fc2a912 SHA256 848986160045890f7c9219ce3246656a9d808a44e1e79f9e89b72b7164baf56d
+EBUILD ruby-1.9.2_p290.ebuild 6190 RMD160 7ff2f74b7a3493d392d98c69e7e68e182577d58e SHA1 53b1bbf3342bcff8b310019703d5c4767d525d5a SHA256 ef1dfd69cc1a598a5732048fd0d6c6a84cca7ecc572f8657275b244e11cf286f
+MISC ChangeLog 77296 RMD160 e37abd4afeeeea524995bd364cecb44461ba3d27 SHA1 6b665842d8e6d18e75312709157f3dcc6259e57b SHA256 c84c178bb379160e2bd556c8bf0ce3dd09911565134416158f36d905ded7d29b
 MISC metadata.xml 1388 RMD160 2e3de2f87f5bade79976069f8a4e89ecff342d10 SHA1 a0ed685628b1f5de88e81e1aacc56c28bb2bb52f SHA256 365a88ae053d47050b6b50d05eb518755a3aeb0c91ca77d2d8eeabfd24a2447f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk5CyvEACgkQIiMqcbOVdxTZlgP9EvlTSIpXH5B7pTjYtlix+cqg
-4iU2KC/YpbIrABOw+Bsw1XwzLC0+M/RjH2wSVXNyFxZqv5j7XPJIu0Yv1CHjUJvG
-nzEMqro0iyL3jjSw+SxhREeP7gpJutxMH4qavfExaCH7nTL/0pE8wpYlV0W2tfzT
-RgdjwoBmg2iPYOLOxRQ=
-=wRV3
+iF4EAREIAAYFAk5dO6sACgkQ3Ca6Xy8+rvTKOAD/VWXc0DqzHUhFdb6TaFNTFZ4L
+4AKO8jcExsGO/XFxOOAA/j8lKFIG5jD9NYfXs9RYBfUk8bw4JvCByXQYD6mfM7Ef
+=lVsk
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.9.2.ebuild b/dev-lang/ruby/ruby-1.9.2_p290.ebuild
similarity index 95%
rename from dev-lang/ruby/ruby-1.9.2.ebuild
rename to dev-lang/ruby/ruby-1.9.2_p290.ebuild
index bf0c0e51aff8..2f56bdf197e6 100644
--- a/dev-lang/ruby/ruby-1.9.2.ebuild
+++ b/dev-lang/ruby/ruby-1.9.2_p290.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.2.ebuild,v 1.6 2011/03/07 12:20:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.2_p290.ebuild,v 1.1 2011/08/30 19:35:59 a3li Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ inherit autotools eutils flag-o-matic multilib versionator
 
 RUBYPL=$(get_version_component_range 4)
 
-MY_P="${PN}-$(get_version_component_range 1-3)-p${RUBYPL:-0}"
+MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-p0}"
 S=${WORKDIR}/${MY_P}
 
 SLOT=$(get_version_component_range 1-2)
@@ -34,7 +34,7 @@ SRC_URI="mirror://ruby/${MY_P}.tar.bz2
 		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline yaml" #libedit
 
 # libedit support is removed everywhere because of this upstream bug:
@@ -71,7 +71,6 @@ src_prepare() {
 	einfo "Unbundling gems..."
 	rm -r \
 		{bin,lib}/rake \
-		{lib,ext}/racc* \
 		ext/json \
 		bin/gem \
 		|| die "removal failed"
diff --git a/dev-lang/ruby/ruby-1.9.2_rc2-r1.ebuild b/dev-lang/ruby/ruby-1.9.2_rc2-r1.ebuild
deleted file mode 100644
index 400d74f40afa..000000000000
--- a/dev-lang/ruby/ruby-1.9.2_rc2-r1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.2_rc2-r1.ebuild,v 1.3 2011/01/06 10:10:38 ssuominen Exp $
-
-EAPI=2
-
-#PATCHSET=
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-# 1.9.2 still uses 1.9.1
-RUBYVERSION=1.9.1
-
-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/${MY_P}.tar.bz2
-		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 rubytests socks5 ssl tk xemacs ncurses +readline yaml" #libedit
-
-# libedit support is removed everywhere because of this upstream bug:
-# http://redmine.ruby-lang.org/issues/show/3698
-
-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-lang/ruby-cvs-${SLOT}*
-	!<dev-ruby/rdoc-2
-	!dev-ruby/rexml"
-#	libedit? ( dev-libs/libedit )
-#	!libedit? ( readline? ( sys-libs/readline ) )
-
-DEPEND="${RDEPEND}"
-PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	einfo "Unbundling gems..."
-	rm -r \
-		{bin,lib}/{rake,rdoc}* \
-		{lib,ext}/racc* \
-		ext/json \
-		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=
-
-	# -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
-
-	# 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"
-
-#	if use libedit; then
-#		einfo "Using libedit to provide readline extension"
-#		myconf="${myconf} --enable-libedit --with-readline"
-#	elif use readline; then
-#		einfo "Using readline to provide readline extension"
-#		myconf="${myconf} --with-readline"
-#	else
-#		myconf="${myconf} --without-readline"
-#	fi
-	myconf="${myconf} $(use_with readline)"
-
-	econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--enable-shared \
-		--enable-pthread \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		$(use_with ncurses curses) \
-		$(use_with yaml psych) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 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() {
-	# 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 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems 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-1.8.7 README* ToDo || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}
-		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(18|19|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
-- 
2.26.2