From 4b1b6d4963c1d9a5ef017401a92c3f136f016cc4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Mon, 9 Oct 2006 12:04:22 +0000 Subject: [PATCH] Mask again -fomit-frame-poointer as per bug #150413 and 148965. Package-Manager: portage-2.1.2_pre2-r7 --- dev-lang/ruby/ChangeLog | 7 +- dev-lang/ruby/Manifest | 25 +++- dev-lang/ruby/files/digest-ruby-1.8.5-r2 | 6 + dev-lang/ruby/ruby-1.8.5-r2.ebuild | 148 +++++++++++++++++++++++ 4 files changed, 181 insertions(+), 5 deletions(-) create mode 100644 dev-lang/ruby/files/digest-ruby-1.8.5-r2 create mode 100644 dev-lang/ruby/ruby-1.8.5-r2.ebuild diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index 9ac9eb9ec284..b166d53a83eb 100644 --- a/dev-lang/ruby/ChangeLog +++ b/dev-lang/ruby/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/ruby # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.222 2006/10/06 13:05:35 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.223 2006/10/09 12:04:22 flameeyes Exp $ + +*ruby-1.8.5-r2 (09 Oct 2006) + + 09 Oct 2006; Diego Pettenò +ruby-1.8.5-r2.ebuild: + Mask again -fomit-frame-poointer as per bug #150413 and 148965. *ruby-1.8.5-r1 (06 Oct 2006) diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 3c6efa1be3ee..321ad8207246 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX oniguruma-2.3.1-gentoo.patch 593 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f SHA1 a512797b26b023d6fc8d38f70598d90c7b248bce SHA256 cb976a2907e29d25b23fc3e8db18b40f65fbde1f22b6c511cd6cf57f4bca08b3 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f files/oniguruma-2.3.1-gentoo.patch 593 @@ -26,14 +29,18 @@ EBUILD ruby-1.8.5-r1.ebuild 3922 RMD160 14ceb901f76fd2f8f4aa1cbb018ab5f8f82f395d MD5 3cb8618bca2557d2091c45c0bee38ae8 ruby-1.8.5-r1.ebuild 3922 RMD160 14ceb901f76fd2f8f4aa1cbb018ab5f8f82f395d ruby-1.8.5-r1.ebuild 3922 SHA256 8ec2f01318ab61a7342d1cd716208abb2439de8db71272781dcd6f61f3420eb9 ruby-1.8.5-r1.ebuild 3922 +EBUILD ruby-1.8.5-r2.ebuild 4023 RMD160 71a53a080be3b66be4d8de5bc88af569ef825c4f SHA1 93ab2d2dab12bc255f56790cae559795f3037736 SHA256 972284e3cbe7832ef3af5efe36486ee3a444f8a37d9ed62abc340f283d8dea14 +MD5 e377592c12333d94226d171f9fabef84 ruby-1.8.5-r2.ebuild 4023 +RMD160 71a53a080be3b66be4d8de5bc88af569ef825c4f ruby-1.8.5-r2.ebuild 4023 +SHA256 972284e3cbe7832ef3af5efe36486ee3a444f8a37d9ed62abc340f283d8dea14 ruby-1.8.5-r2.ebuild 4023 EBUILD ruby-1.8.5.ebuild 3942 RMD160 7c9683b77f9b777aeace1a0349d3ffb39d2c7e8a SHA1 d2960cc487f4e830e3aebbe66f52dd7794288fa2 SHA256 8bf77eb4d1c7a673e7327bb545e83e2cfeddda89496b50e69f77c9bf64f595a3 MD5 9b3fdc793fe7594ca237cd87bf4a80e3 ruby-1.8.5.ebuild 3942 RMD160 7c9683b77f9b777aeace1a0349d3ffb39d2c7e8a ruby-1.8.5.ebuild 3942 SHA256 8bf77eb4d1c7a673e7327bb545e83e2cfeddda89496b50e69f77c9bf64f595a3 ruby-1.8.5.ebuild 3942 -MISC ChangeLog 32074 RMD160 139c18931e7c676e38dc93eaa9e310f1190ad1d9 SHA1 505ffbbe87909f6fa1e8ebba8d09791b99b46ccf SHA256 1cfa59c042f69929ecde0a073f6f1ff709cc3ff92d2c67fcccbbddd06169ab54 -MD5 eab24cebc8be2db6a9b99defa8cda445 ChangeLog 32074 -RMD160 139c18931e7c676e38dc93eaa9e310f1190ad1d9 ChangeLog 32074 -SHA256 1cfa59c042f69929ecde0a073f6f1ff709cc3ff92d2c67fcccbbddd06169ab54 ChangeLog 32074 +MISC ChangeLog 32251 RMD160 1d74267a688c04c3856f584cbfcfc2305da8a7cd SHA1 d64297fa6df971c97cad587c384a9f86487a7814 SHA256 11c180a035109dd706b937f5e6dd9fe62e98951a95941b61ecc3473aa21d031d +MD5 2a53823e8e3804a169499683db16092e ChangeLog 32251 +RMD160 1d74267a688c04c3856f584cbfcfc2305da8a7cd ChangeLog 32251 +SHA256 11c180a035109dd706b937f5e6dd9fe62e98951a95941b61ecc3473aa21d031d ChangeLog 32251 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157 @@ -50,3 +57,13 @@ SHA256 7c362e231f229a4afbd81fc401069c1411f7833a9b56122c3b3acd9d9de71eee files/di MD5 86b5d06a5da72078a1755ad84cf57d56 files/digest-ruby-1.8.5-r1 467 RMD160 094acdf2c1878e06040137dd5f14a790116dccbd files/digest-ruby-1.8.5-r1 467 SHA256 7c362e231f229a4afbd81fc401069c1411f7833a9b56122c3b3acd9d9de71eee files/digest-ruby-1.8.5-r1 467 +MD5 86b5d06a5da72078a1755ad84cf57d56 files/digest-ruby-1.8.5-r2 467 +RMD160 094acdf2c1878e06040137dd5f14a790116dccbd files/digest-ruby-1.8.5-r2 467 +SHA256 7c362e231f229a4afbd81fc401069c1411f7833a9b56122c3b3acd9d9de71eee files/digest-ruby-1.8.5-r2 467 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFKjrqAiZjviIA2XgRAhTZAJ9gp6rSI9yqcNYsvgr66rJBdXVyIgCdFcgs +F9cjGYHVHggtrr7M8xHkiRQ= +=HLyy +-----END PGP SIGNATURE----- diff --git a/dev-lang/ruby/files/digest-ruby-1.8.5-r2 b/dev-lang/ruby/files/digest-ruby-1.8.5-r2 new file mode 100644 index 000000000000..55d88e714851 --- /dev/null +++ b/dev-lang/ruby/files/digest-ruby-1.8.5-r2 @@ -0,0 +1,6 @@ +MD5 b3b6b2d2f77f1f485d055d74f6eb6f2a onigd2_5_4.tar.gz 212280 +RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 onigd2_5_4.tar.gz 212280 +SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b onigd2_5_4.tar.gz 212280 +MD5 3fbb02294a8ca33d4684055adba5ed6f ruby-1.8.5.tar.gz 4438603 +RMD160 991899146c23c9ea30ac09f41b7077fa0c8686b6 ruby-1.8.5.tar.gz 4438603 +SHA256 19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58 ruby-1.8.5.tar.gz 4438603 diff --git a/dev-lang/ruby/ruby-1.8.5-r2.ebuild b/dev-lang/ruby/ruby-1.8.5-r2.ebuild new file mode 100644 index 000000000000..41133d28a548 --- /dev/null +++ b/dev-lang/ruby/ruby-1.8.5-r2.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5-r2.ebuild,v 1.1 2006/10/09 12:04:22 flameeyes Exp $ + +ONIGURUMA="onigd2_5_4" + +inherit flag-o-matic alternatives eutils gnuconfig multilib autotools + +DESCRIPTION="An object-oriented scripting language" +HOMEPAGE="http://www.ruby-lang.org/" +SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${P}.tar.gz + cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )" + +LICENSE="Ruby" +SLOT="1.8" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="debug socks5 tk cjk doc threads examples ipv6" +RESTRICT="confcache" + +RDEPEND="virtual/libc + >=sys-libs/gdbm-1.8.0 + >=sys-libs/readline-4.1 + >=sys-libs/ncurses-5.2 + socks5? ( >=net-proxy/dante-1.1.13 ) + tk? ( dev-lang/tk ) + >=dev-ruby/ruby-config-0.3 + !=dev-lang/ruby-cvs-1.8* + !dev-ruby/rdoc + !dev-ruby/rexml" + +DEPEND="sys-devel/autoconf + ${RDEPEND}" +PROVIDE="virtual/ruby" + +S=${WORKDIR}/${P%_*} + +src_unpack() { + unpack ${A} + + if use cjk ; then + einfo "Applying ${ONIGURUMA}" + pushd ${WORKDIR}/oniguruma +# epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch + econf --with-rubydir=${S} || die "econf failed" + make ${PV/./} + popd + fi + + # Enable build on alpha EV67 (but run gnuconfig_update everywhere) + gnuconfig_update || die "gnuconfig_update failed" + + cd ${S} + + # 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_compile() { + # -fomit-frame-pointer makes ruby segfault, see bug #150413. + filter-flags -fomit-frame-pointer + + # 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 + + # On ia64 we need to build without optimization #48824 + if use ia64; then + replace-flags '-O*' -O0 + fi + + econf --program-suffix=${SLOT/./} --enable-shared \ + $(use_enable socks5 socks) \ + $(use_enable doc install-doc) \ + $(use_enable threads pthread) \ + $(use_enable ipv6 ipv6) \ + $(use_enable debug debug) \ + --with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \ + || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + LD_LIBRARY_PATH=${D}/usr/$(get_libdir) + RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}" + for d in $(find ${S}/ext -type d) ; do + RUBYLIB="${RUBYLIB}:$d" + done + export LD_LIBRARY_PATH RUBYLIB + + make DESTDIR=${D} install || die "make install failed" + + if use doc; then + make DESTDIR=${D} install-doc || die "make install-doc failed" + fi + + if use examples; then + dodir ${ROOT}usr/share/doc/${PF} + cp -pPR sample ${D}/${ROOT}usr/share/doc/${PF} + fi + + if use ppc-macos ; then + dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%.*}.dylib + dosym /usr/lib/libruby${SLOT/./}.${PV%_*}.dylib /usr/lib/libruby.${PV%_*}.dylib + else + dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%.*} + dosym libruby${SLOT/./}.so.${PV%_*} /usr/$(get_libdir)/libruby.so.${PV%_*} + fi + + dodoc COPYING* ChangeLog MANIFEST README* ToDo +} + +pkg_postinst() { + if ! use ppc-macos ; then + ewarn + ewarn "Warning: Vim won't work if you've just updated ruby from" + ewarn "1.6.x to 1.8.x due to the library version change." + ewarn "In that case, you will need to remerge vim." + ewarn + + if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then + ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} + fi + einfo + einfo "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config" + einfo + fi +} + +pkg_postrm() { + if ! use ppc-macos ; then + if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then + ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} + fi + fi +} -- 2.26.2