Version bump. Fixes rdoc handling wrt bug 333897 by Park Ji-in. Drop hppa and x86-fbsd due to a new dependency on rdoc.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 244 insertions, 7 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 3905607715d7..17c24df6251c 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.472 2010/08/23 20:34:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.473 2010/08/24 18:08:09 a3li Exp $
+
+*ruby-1.9.2 (24 Aug 2010)
+
+  24 Aug 2010; Alex Legler <a3li@gentoo.org> +ruby-1.9.2.ebuild,
+  metadata.xml:
+  Version bump. Fixes rdoc handling wrt bug 333897 by Park Ji-in. Drop hppa
+  and x86-fbsd due to a new dependency on rdoc.
 
   23 Aug 2010; Markus Meier <maekke@gentoo.org> ruby-1.8.7_p302.ebuild:
   arm stable, bug #332957
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 23f85541869e..50f0b512c9c6 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.6-p399.tar.bz2 3972399 RMD160 1c0bb41966c9f6011fa40b9de58ef95cb6610710 SHA1 4a7b5ec1ccbeb8c6c0c49c844471a5ee14cdaa98 SHA256 20ca08aeefa21ca2581a9791f8f9ace3addc92bd978cf36f2f95c109085a50a7
 DIST ruby-1.8.7-p249.tar.bz2 4153461 RMD160 96b238bd7194652ec194a505c2e5911441c5c5ee SHA1 2947f21f22e9345a3e94d84e6f88e7d0fc98a871 SHA256 8b89448fc79df6862660e9f77e884f06c76da28f078d8edd2f17567a615f3af5
 DIST ruby-1.8.7-p302.tar.bz2 4184764 RMD160 763bc840316cb1080d46445cdc3ca7722d576591 SHA1 d93bd2f1099f3473b496cda2422b27a8da2beb00 SHA256 3537cc81cc2378a2bc319cd16c4237ddee14a2839cfd1515b27dce108d061a68
+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-patches-1.8.6_p399.tar.bz2 3782 RMD160 d0faa549dc93ed1ff372ea8edac427e948c6c3bd SHA1 f1702eca97623a123ef49e38f21ac4cc0b0fe94e SHA256 d6b8218856ba4aaf0f0724035d13e165b82b17bc6a6f2b89800bf3628062f77b
 DIST ruby-patches-1.8.7_p249.tar.bz2 1499 RMD160 98670658db00a1c4ad563e68bf25263fd7f317fd SHA1 d371f7f25a75ac8626e2e87a570bb52a60579fb8 SHA256 b35ba05fb07c0264a9232e756cd80ff7f284fb8aa464368ce028d67fa11f31af
 DIST ruby-patches-1.8.7_p302.tar.bz2 1768 RMD160 4db5e9d674555f863d71a5e807a39e08b3cfedeb SHA1 31fb976e35253b8e38b7851686fae715f9c197e8 SHA256 4d742cc7aedf6c56eba09e0f3e699ca24e38425944399db131aa49dc8f4f962a
+DIST ruby-patches-1.9.2.tar.bz2 2272 RMD160 d10f950c40384fe41f7eba14e55621aaa7c0ca06 SHA1 b9eb2d01f49ebf032257f84b00ec56420172234d SHA256 d4dd786cf637e5d4415b850bceca16caa9f6bd0b515fff09a64bdc18bc151de4
 DIST ruby-patches-1.9.2_rc2-r0.2.tar.bz2 1669 RMD160 2ffb5afed0b83c6057f2a6690126228407464ea8 SHA1 7eeba042beeb7b044b63d4c760aca3ebb7d10f66 SHA256 89e021312256e6d6b2880794b7f15226b5b19709263933dc4bda432908370673
 DIST ruby-patches-1.9.2_rc2-r1.tar.bz2 2403 RMD160 345fcf857e8760f66ded3759a9a84d4a4d94b067 SHA1 985dbbec258c319d1a256c53af1f79148cc7bdf6 SHA256 2b1b45ad4195fc8aba26858fc4ca31769a9c49af9711902bac95732baf26ed0f
 EBUILD ruby-1.8.6_p399.ebuild 5625 RMD160 25224e7efb58c95c9f7dacd95e288ae5f6baca59 SHA1 626f63f1db475535a80654ebfb9751e0bff94538 SHA256 2d7f79c028548b9595641fe77fc3d902f21b0938d03863b24cb997a9ce0e16fd
 EBUILD ruby-1.8.7_p249.ebuild 5344 RMD160 1c78a00aceb9f3ddeb6c18f4c45d289bc507b370 SHA1 34808e3e70b3c0c20f87f991ebdd9d51dd98b848 SHA256 3d2a1eb8198d65adad424198f35e42679408ffb44e5e9c281f98ee9a45c970eb
 EBUILD ruby-1.8.7_p302.ebuild 5595 RMD160 9a19148dcb2808b3f0a3233046568d611bb7d212 SHA1 30315f6cc79dbeeff8a45a513c283b6b815f921f SHA256 184483d1fa6fcf4805abc02b701b69cb086df719dcfa3d80ed426f9cf69fc173
+EBUILD ruby-1.9.2.ebuild 6130 RMD160 001da9d1a41d5d5e378dd9ec2b8b2accdd7c941e SHA1 fde433ef32590014caef371682d43497a42a3cf0 SHA256 2735c81001616f6ac78ac9f72073dcd7b7112c2f6fa575e1bea4ce5d1e467725
 EBUILD ruby-1.9.2_rc2-r1.ebuild 5856 RMD160 730f24c7e6215a5f645e580a213c2eb525109725 SHA1 2e2d6a6822c59b353cd11ce8f6843a194b04d0f4 SHA256 299524f03ab280539e0d5fc6ba87facd5e36789977420cf22e0dd653c7f06d48
 EBUILD ruby-1.9.2_rc2.ebuild 5745 RMD160 4c740109d13eb0447d8390ec7791c664da8635c2 SHA1 60663280b00a0f5f963567b09ced755ae722b86f SHA256 ef2c8c819b799a34d6741ca7b81f9aa87477768d5e8d4955cdc1bb12b95229b2
-MISC ChangeLog 73313 RMD160 b6176f1803746a857ec18f7d2a2931ea8ded9855 SHA1 f98d28b9c56a0e1b46cc0b3e5f33d3a2475940ca SHA256 7076c912cdc90facf361bc653252551d380ec3ca2579911ed34f7ede1d073058
-MISC metadata.xml 1290 RMD160 ec57ec384046e961b936cf75351e9529abf66e59 SHA1 c0c82f3fc28636419f1ed273384560b9b0059f84 SHA256 278a675c46272062d635b79ab226883ac1ccb58db2f3f37cd77bee13f40ff2cc
+MISC ChangeLog 73544 RMD160 adeb0d9cd23fc7ffb0fbe04ed469ce16d871d8d0 SHA1 ee42fd137d30b11375a556f527f612bccb1d2dc6 SHA256 62853460b653e79058a0c0272a87c9ec95dc76b5357c7683a80607a898f50edf
+MISC metadata.xml 1388 RMD160 2e3de2f87f5bade79976069f8a4e89ecff342d10 SHA1 a0ed685628b1f5de88e81e1aacc56c28bb2bb52f SHA256 365a88ae053d47050b6b50d05eb518755a3aeb0c91ca77d2d8eeabfd24a2447f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxy23wACgkQkKaRLQcq0GJ6DACgo6bwA/4QSceinE5XY3JCyKa0
-50wAoKwu8mQLRaCVm/zqiK+DoqwHJNzo
-=zcVd
+iF4EAREIAAYFAkx0Co0ACgkQ3Ca6Xy8+rvQCZgD+Ka8/BOOLoNW7BcvkJ/W82afq
+/q+EIPaYNvz1eqET4i8A/j8FX4c3LL42DmI9uXGoWiFM7L7yseciBJOekqG9p1Qa
+=PBTS
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
index 72dd241655f5..963d76edceeb 100644
--- a/dev-lang/ruby/metadata.xml
+++ b/dev-lang/ruby/metadata.xml
@@ -32,5 +32,9 @@
       extension, available since Ruby 1.9.2_rc2, in alternative to the
       bundled syck-based parser.
     </flag>
+
+    <flag name='rdoc'>
+      Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/dev-lang/ruby/ruby-1.9.2.ebuild b/dev-lang/ruby/ruby-1.9.2.ebuild
new file mode 100644
index 000000000000..49e87d9547e4
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.9.2.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2010 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.1 2010/08/24 18:08:09 a3li 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)-p${RUBYPL:-0}"
+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 ~ppc ~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 )
+	dev-libs/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-2.5.11[ruby_targets_ruby19] )
+	xemacs? ( app-xemacs/ruby-modes )"
+
+PROVIDE="virtual/ruby"
+
+src_prepare() {
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+		epatch "${WORKDIR}/patches"
+
+	einfo "Unbundling gems..."
+	rm -r \
+		{bin,lib}/rake \
+		{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"
+	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
+}