From: Hans de Graaff <graaff@gentoo.org>
Date: Sun, 18 Dec 2011 18:09:12 +0000 (+0000)
Subject: Version bump to 1.9.3p0. Still has massive failures in the rubytests test suite which... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e9825f0becac0a9305de4e99fd03ffbe7d374ad0;p=gentoo.git

Version bump to 1.9.3p0. Still has massive failures in the rubytests test suite which need to be diagnosed first.

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

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index c3f6ae069016..4f5e1bf5497b 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # 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.514 2011/10/22 17:16:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.515 2011/12/18 18:09:12 graaff Exp $
+
+*ruby-1.9.3_p0 (18 Dec 2011)
+
+  18 Dec 2011; Hans de Graaff <graaff@gentoo.org> +ruby-1.9.3_p0.ebuild:
+  Version bump to 1.9.3p0. Still has massive failures in the rubytests test
+  suite which need to be diagnosed first.
 
   22 Oct 2011; Jeroen Roovers <jer@gentoo.org> ruby-1.9.3_rc1.ebuild:
   Add workaround for target_arch issue (bug #342819). Marked ~hppa (bug
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index c46b5a1853fa..14d3f1b42b02 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,26 +1,29 @@
 -----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.8.7-p352.tar.bz2 4207576 RMD160 9a0ea7e7eb83c809d2890b08db2e78eeb93dee0d SHA1 9f3d039e9bfeda54ea2c2175bbeace375a1ea1ae SHA256 9df4e9108387f7d24a6ab8950984d0c0f8cdbc1dad63194e744f1a176d1c5576
 DIST ruby-1.9.2-p290.tar.bz2 8811237 RMD160 9722a91445fa81a101a2a8ab5753780c4601cc5a SHA1 8f25a74f50a10fdd9724e3c74ccd7bae596e198b SHA256 403b3093fbe8a08dc69c269753b8c6e7bd8f87fb79a7dd7d676913efe7642487
+DIST ruby-1.9.3-p0.tar.bz2 9554576 RMD160 92e95f1d41f89864e2e4791b522a815e6bf51711 SHA1 f63c116411b981ef54c2caeefb9ccc4d71a5d2cf SHA256 ca8ba4e564fc5f98b210a5784e43dfffef9471222849e46f8e848b37e9f38acf
 DIST ruby-1.9.3-rc1.tar.bz2 9552727 RMD160 d81a0f8933804f83fc7db4689ec18669701233a8 SHA1 d922890fabd97016e2a30ee7f7b3241df98e72a6 SHA256 951a8810086abca0e200f81767a518ee2730d6dc9b0cc2c7e3587dcfc3bf5fc8
 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_p352.tar.bz2 2646 RMD160 7af0ab7c86c9284ade489d3a07eb592cb8f20827 SHA1 f4df1f011a96153d4e804be1080a493b454a1852 SHA256 695895d4ab77294975669d879f0b03e08af5fcd750b967b44305031b2c115da6
 DIST ruby-patches-1.9.2_p290.tar.bz2 2246 RMD160 66e8287fa35cf34c471dc19215f4a6f63b67661b SHA1 b1a07618a62877ced18000ceb77bbbed132492e6 SHA256 bc01ad4e6e6dc5cae4c323cc16e9a441f38652eab3e6e3cecdff3baf46102889
+DIST ruby-patches-1.9.3_p0.tar.bz2 2228 RMD160 5fc6e647ec3f1fe6cbe8014121aa6265c8cd9315 SHA1 10fc10bdde1cc40d4153be840a1314da1d988049 SHA256 22116a403a111701972a5a10d5c31b0bb86dd822c346d0079e86e03866d55df6
 DIST ruby-patches-1.9.3_rc1.tar.bz2 2228 RMD160 5fc6e647ec3f1fe6cbe8014121aa6265c8cd9315 SHA1 10fc10bdde1cc40d4153be840a1314da1d988049 SHA256 22116a403a111701972a5a10d5c31b0bb86dd822c346d0079e86e03866d55df6
 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_p352.ebuild 5566 RMD160 fe282bd97112fcb877ebb57ee43538dd3c759f97 SHA1 6ec3b45330b15db35672238f7939f1f36ae36b2c SHA256 6b048c8621cd3ee0cf3bb64caf6f1790dd1d853bd7695a7404d7ca08f55b85c8
 EBUILD ruby-1.9.2_p290.ebuild 6279 RMD160 2215a7788c875b45e778b51d438b5335a3ceb3b3 SHA1 569fc00a5f8898c6bee0be94073aa60c1bee00d9 SHA256 43b723866205d109c964cff9f8c155ffc05c7f552fc67676c12c69b3e6bb50d4
+EBUILD ruby-1.9.3_p0.ebuild 6311 RMD160 5fe710fb837e9c49f142c9596f148bc80fe8889f SHA1 c35cda3c8e1217412de1b68d51e83b8da404210b SHA256 cd63b8931ed421084514c0b5cec8e032ecaaed29375e4bb3c495b65a783ed85c
 EBUILD ruby-1.9.3_rc1.ebuild 6363 RMD160 2a66f37da64ed1983f7461eade5eecd6afba19b0 SHA1 51959ffd869f0a83d44af291b9df29e30fd3bc1a SHA256 5de11a1edacb1e88ff953965f7a9ce7d9b5e17cea2a0a18f305e7f07300f94bc
-MISC ChangeLog 78677 RMD160 2888e11c32246d472e217f6ac8a977a6cf3b4145 SHA1 df26b03b60ca8ae83c03a22a42f157c88ad8e321 SHA256 aceef8b4a49b8c17788b2fcf8671c8dc432c03d471295a693ed4f7b1dadfe976
+MISC ChangeLog 78902 RMD160 4af3b25fc05d65c7b50d366ca2ec0c05baa1a212 SHA1 df61a26e32b9106da6112261e94eb5f11b46633a SHA256 a29d2af380665322f8211b28f6a3d747bf1bbd966c2dd156b0b7204b8527a2ba
 MISC metadata.xml 1388 RMD160 2e3de2f87f5bade79976069f8a4e89ecff342d10 SHA1 a0ed685628b1f5de88e81e1aacc56c28bb2bb52f SHA256 365a88ae053d47050b6b50d05eb518755a3aeb0c91ca77d2d8eeabfd24a2447f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6i+osACgkQVWmRsqeSphMN0gCfbvUGU2WIMgvgWtyEb8EdhBGf
-wccAn1YuB4wos+EtfyU4mejls/kXGrD6
-=G0zW
+iF4EAREIAAYFAk7uLE4ACgkQiIP6VqMIqNdo9gD/QKeaQsECPpn1JfRu4BxWdsXV
+G6XzJjKSoq0cvflYDmkBAI9LgXf/hcSuXxA4PIv0DDp/QP7hjpsbNL5pO1hQO4UZ
+=zfCf
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.9.3_p0.ebuild b/dev-lang/ruby/ruby-1.9.3_p0.ebuild
new file mode 100644
index 000000000000..d98068d8a677
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.9.3_p0.ebuild
@@ -0,0 +1,225 @@
+# 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.3_p0.ebuild,v 1.1 2011/12/18 18:09:12 graaff Exp $
+
+EAPI=2
+
+#PATCHSET=
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+RUBYPL=$(get_version_component_range 4)
+
+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})
+# 1.9.3 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/1.9/${MY_P}.tar.bz2
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~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:
+# 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/rubygems-1.3.7-r4
+	!dev-ruby/rexml"
+#	libedit? ( dev-libs/libedit )
+#	!libedit? ( readline? ( sys-libs/readline ) )
+
+DEPEND="${RDEPEND}"
+PDEPEND="
+	rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	einfo "Unbundling gems..."
+	cd "$S"
+	rm -r \
+		{bin,lib}/rake lib/rake.rb man/rake.1 \
+		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
+	# 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"
+
+#	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)"
+
+	# Set a faux target (bug #342819)
+	use hppa && myconf="${myconf} --target=parisc"
+
+	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"
+	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-1.8.7 README* ToDo || 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(18|19|...)"
+	elog
+}
+
+pkg_postrm() {
+	eselect ruby cleanup
+}