Version bump. Also include p359 as a patch to fix marshall bugs exposed by Rails 3.2.

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

3 files changed, 208 insertions, 16 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 6e546c17a89c..4de004ec56ac 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.529 2012/03/01 22:49:37 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.530 2012/04/20 10:42:50 graaff Exp $
+
+*ruby-1.8.7_p358 (20 Apr 2012)
+
+  20 Apr 2012; Hans de Graaff <graaff@gentoo.org> +ruby-1.8.7_p358.ebuild:
+  Version bump. Also include p359 as a patch to fix marshall bugs exposed by
+  Rails 3.2.
 
   01 Mar 2012; Naohiro Aota <naota@gentoo.org> ruby-1.9.3_p125.ebuild:
   Add ~x86-fbsd, #332593
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index af7ce882c454..22557b516c47 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -3,32 +3,25 @@ Hash: SHA256
 
 DIST ruby-1.8.7-p352.tar.bz2 4207576 RMD160 9a0ea7e7eb83c809d2890b08db2e78eeb93dee0d SHA1 9f3d039e9bfeda54ea2c2175bbeace375a1ea1ae SHA256 9df4e9108387f7d24a6ab8950984d0c0f8cdbc1dad63194e744f1a176d1c5576
 DIST ruby-1.8.7-p357.tar.bz2 4208157 RMD160 9034fb641f0260aed590856cd9400f186a3dd56a SHA1 ba5ec0ab663976f00fb405be6cfef546bcf0e4e9 SHA256 5c64b63a597b4cb545887364e1fd1e0601a7aeb545e576e74a6d8e88a2765a37
+DIST ruby-1.8.7-p358.tar.bz2 4209883 RMD160 7196a000d39e4cd24e7911839c828642d54377bd SHA1 2b78dc421cfbca81ef1375a1c3da9f0f70c548fa SHA256 309ccd427e47ef41a70f96462bd3c2ef2e7911ce1b22432ab502f5bc6e949c1b
 DIST ruby-1.9.3-p0.tar.bz2 9554576 RMD160 92e95f1d41f89864e2e4791b522a815e6bf51711 SHA1 f63c116411b981ef54c2caeefb9ccc4d71a5d2cf SHA256 ca8ba4e564fc5f98b210a5784e43dfffef9471222849e46f8e848b37e9f38acf
 DIST ruby-1.9.3-p125.tar.bz2 9733962 RMD160 37517b3b0ab27ec09e3c5a5c48102d39f9657e28 SHA1 bcdd597cfea7f79fb949314f265fc36af7de16a5 SHA256 c67a59443052b5a9219eb4cee3892bdfbc6f250f0c8e214e02256a4cc7ef5526
 DIST ruby-patches-1.8.7_p352.tar.bz2 2646 RMD160 7af0ab7c86c9284ade489d3a07eb592cb8f20827 SHA1 f4df1f011a96153d4e804be1080a493b454a1852 SHA256 695895d4ab77294975669d879f0b03e08af5fcd750b967b44305031b2c115da6
 DIST ruby-patches-1.8.7_p357.tar.bz2 2444 RMD160 4287e30945390ee38ef06e91f4eb560d5e888a0b SHA1 4be75adacd5f912b8a80144a0474da4299bc4246 SHA256 779d98e7c325eaf5bdb652dc7ceebda604792cddcce547766966021e60e68aac
+DIST ruby-patches-1.8.7_p358.tar.bz2 4852 RMD160 cfcf25c694d0a3bf43d88311ce6711296036b3ef SHA1 f399d81f525a9f3bf8375f4632801a60f7756d10 SHA256 7afcafa54bfcf4a2f2bb5b95e14aa304d84e9388c9680243db8dc397aa3008cf
 DIST ruby-patches-1.9.3_p0.tar.bz2 2228 RMD160 5fc6e647ec3f1fe6cbe8014121aa6265c8cd9315 SHA1 10fc10bdde1cc40d4153be840a1314da1d988049 SHA256 22116a403a111701972a5a10d5c31b0bb86dd822c346d0079e86e03866d55df6
 DIST ruby-patches-1.9.3_p125.tar.bz2 1852 RMD160 0d149615670187ef59f7e2b511195e423c022ad2 SHA1 581bea96a9a390a4818ae5420793d3986031c762 SHA256 bc025f4a304a74531aa683b1a8a806f68b4a96fcf26fa42d9660218b9a1cef1a
 EBUILD ruby-1.8.7_p352.ebuild 5566 RMD160 fe282bd97112fcb877ebb57ee43538dd3c759f97 SHA1 6ec3b45330b15db35672238f7939f1f36ae36b2c SHA256 6b048c8621cd3ee0cf3bb64caf6f1790dd1d853bd7695a7404d7ca08f55b85c8
 EBUILD ruby-1.8.7_p357.ebuild 5519 RMD160 90f6f4ee76b5e64baea43559feab04b808ab84c8 SHA1 8bd46321d331de2c1127984b272e959b4a3944d9 SHA256 6243fe1a6e29a0ce1d7073ec7984a7089e6d00b350e13e76bdbaa5b85a24ed68
+EBUILD ruby-1.8.7_p358.ebuild 5529 RMD160 6674546aaee685ff350dfdab96bf692f6483fc5a SHA1 a9780e07354007fa23a2665f427b83b92055ad02 SHA256 dcd92c353af9beb10eae191545db17ed3fa03626625f0b94c0ce77d4021b480e
 EBUILD ruby-1.9.3_p0.ebuild 6269 RMD160 eb62d4f33d691de1e8175cd0c72e10bd1a2d712d SHA1 dfff2b20a926b5ed25419dcb3857ef7fa0704d35 SHA256 5ade38e90ddca6d5bade0958ea69ddedb9aeb45bc406c45f1ec9b53dda8e3f9d
 EBUILD ruby-1.9.3_p125.ebuild 6275 RMD160 47c74c5bb332a68a7abd6960e6cda9dc1ae4e0dd SHA1 0d9f1a44055acced1ecb0be74e4b5b0d290a97c2 SHA256 fe1e7ae82c1a9f44b5598068d75014628b281beb5201201b9b09deb2e160c337
-MISC ChangeLog 80919 RMD160 c02539d06d0be7cf62a3733cad4e81c868844ee7 SHA1 aa47dcd4cfaeffab294d4c2f6df1392393e6b1f4 SHA256 32164c4e69ab7b18048406aea0e93991ee101877a6cf10397268472203c944e7
+MISC ChangeLog 81118 RMD160 ec6586ddd0fe21c363224612cb90c19149c32d46 SHA1 63030a1d6e6ddca96fbc38102a54433c66ae74e2 SHA256 e0a8550e33abcc9629ae9101eb1c566b757b18ace24858ee9fade0f8205fc339
 MISC metadata.xml 1388 RMD160 2e3de2f87f5bade79976069f8a4e89ecff342d10 SHA1 a0ed685628b1f5de88e81e1aacc56c28bb2bb52f SHA256 365a88ae053d47050b6b50d05eb518755a3aeb0c91ca77d2d8eeabfd24a2447f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPT/z3AAoJEDYO1FT4VRUUSDIP/25QjuR1XXNEdUyD2eOzIh+G
-iN0FGd9uq4V76zMhXqkX75WrbTX8UkQgjtJo5i9OQnqqUMSNQRamcrwG4ibyoxeA
-XYRaO3ndx9aHOsx0T7GOaN1FsSWFqtje+QS80Do/y/9Az1j3M8k8ywn4sdV5+Xav
-n6tn74mOn7nn5NRUfnbvmn7u5eQloLufppTcQla9X8JuHGNgFPLsh7x9SXX6gXIx
-aSfR+DX4vfMOudtc/1CIquL0o2hTd4MMNrhFHrHZXQ9ljx5FehPx+IjTVzMMrddi
-QUKL9nzmqvWn5iWRjQVIxAYfvaB+6d02mgCO1QxNz9mah5W2YyboXEtLol0oZgZj
-ivKhbIF5vJiIKOAz0FUP8JOQUCbFy74USQeKti3+LTWyDyBtSWk73KwKs/pwQlL8
-x/AnZQPPnyi2s/xvGqsSbGM3KxVJsWYsRPHFtC+Et5ZG1onN2IihcmN76+5atFIF
-XVYQ+SolK5i3OigXxJKWq0NQ9DDdmZi8J+5Wr8xRcel78pMYbIWcE+g5rWfbOn98
-Aa4n11TV2ys3mb2dMF8RGddLbucTON9eWhlQtr4MKGsmg9Y9yAp5mWJiTlQHLS1t
-48bb/6UPRxe5gjmZEqMlX6es6k873ThNQdfFoOOtHpC4bCML5hm/vr/YG0FssGb2
-2HUeovw88sOMu92yc2ZB
-=Hxl2
+iF4EAREIAAYFAk+RPbQACgkQiIP6VqMIqNdEHAD9GJcF9B41HSh3WUiehYkEq19Z
+kvuFGwN5OLifsZn61FkA/0irhTQQziS5vkix6yjza8HnfFkPBbCz/Jg8OqySkUM4
+=NSPp
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.8.7_p358.ebuild b/dev-lang/ruby/ruby-1.8.7_p358.ebuild
new file mode 100644
index 000000000000..dc59573ce03f
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.7_p358.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p358.ebuild,v 1.1 2012/04/20 10:42:50 graaff Exp $
+
+EAPI=2
+
+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.8 and 1.9 series disagree on this
+RUBYVERSION=$(get_version_component_range 1-2)
+
+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/${SLOT}/${MY_P}.tar.bz2
+		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby GPL-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="+berkdb debug doc examples +gdbm ipv6 rubytests socks5 ssl threads tk xemacs ncurses +readline libedit"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( sys-libs/gdbm )
+	ssl? ( >=dev-libs/openssl-0.9.8m )
+	socks5? ( >=net-proxy/dante-1.1.13 )
+	tk? ( dev-lang/tk[threads=] )
+	ncurses? ( sys-libs/ncurses )
+	libedit? ( dev-libs/libedit )
+	!libedit? ( readline? ( sys-libs/readline ) )
+	sys-libs/zlib
+	>=app-admin/eselect-ruby-20100603
+	!<dev-ruby/rdoc-2"
+DEPEND="${RDEPEND}"
+PDEPEND="xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	# 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
+
+	econf \
+		--program-suffix="${MY_SUFFIX}" \
+		--enable-shared \
+		$(use_enable socks5 socks) \
+		$(use_enable doc install-doc) \
+		$(use_enable threads pthread) \
+		--enable-ipv6 \
+		$(use_enable debug) \
+		$(use_with berkdb dbm) \
+		$(use_with gdbm) \
+		$(use_with ssl openssl) \
+		$(use_with tk) \
+		$(use_with ncurses curses) \
+		${myconf} \
+		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
+		--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"
+
+	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
+	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
+
+	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 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
+}