From b4048f52754b40c7fbfc1fa909d5483650106bb8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sat, 17 Feb 2007 19:17:23 +0000 Subject: [PATCH] Bump to the preview version, but without CJK support for now because Onigurama hasn't been updated yet. Thanks to M. Edward Borasky in bug #167364. Package-Manager: portage-2.1.2-r9 --- dev-lang/ruby/ChangeLog | 10 +- dev-lang/ruby/files/digest-ruby-1.8.6_pre1 | 3 + dev-lang/ruby/ruby-1.8.6_pre1.ebuild | 143 +++++++++++++++++++++ 3 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 dev-lang/ruby/files/digest-ruby-1.8.6_pre1 create mode 100644 dev-lang/ruby/ruby-1.8.6_pre1.ebuild diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index b85a82f87f65..255d23585112 100644 --- a/dev-lang/ruby/ChangeLog +++ b/dev-lang/ruby/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-lang/ruby # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.256 2007/02/11 14:19:50 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.257 2007/02/17 19:17:23 flameeyes Exp $ + +*ruby-1.8.6_pre1 (17 Feb 2007) + + 17 Feb 2007; Diego Pettenò + +ruby-1.8.6_pre1.ebuild: + Bump to the preview version, but without CJK support for now because + Onigurama hasn't been updated yet. Thanks to M. Edward Borasky in bug + #167364. 11 Feb 2007; Fabian Groffen ruby-1.8.4-r3.ebuild, ruby-1.8.5_p2.ebuild: diff --git a/dev-lang/ruby/files/digest-ruby-1.8.6_pre1 b/dev-lang/ruby/files/digest-ruby-1.8.6_pre1 new file mode 100644 index 000000000000..1c5a6ec9a9c3 --- /dev/null +++ b/dev-lang/ruby/files/digest-ruby-1.8.6_pre1 @@ -0,0 +1,3 @@ +MD5 12c52f3fbf628f6e5c75f1daeda75207 ruby-1.8.6-preview1.tar.gz 4580884 +RMD160 4dcf796eeea75c877996b2e311a157420b55093d ruby-1.8.6-preview1.tar.gz 4580884 +SHA256 098e04d0f309ead93f6ca8ff4f13be7298414bf9fcbfc66400cb10906af5a327 ruby-1.8.6-preview1.tar.gz 4580884 diff --git a/dev-lang/ruby/ruby-1.8.6_pre1.ebuild b/dev-lang/ruby/ruby-1.8.6_pre1.ebuild new file mode 100644 index 000000000000..0a326251e737 --- /dev/null +++ b/dev-lang/ruby/ruby-1.8.6_pre1.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_pre1.ebuild,v 1.1 2007/02/17 19:17:23 flameeyes Exp $ + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" + +# A new version is needed for 1.8.6, currently disabled. +ONIGURUMA="onigd2_5_8" + +inherit flag-o-matic alternatives eutils multilib autotools versionator + +MY_P="${P/_p/-p}" +MY_P="${MY_P/pre/preview}" + +DESCRIPTION="An object-oriented scripting language" +HOMEPAGE="http://www.ruby-lang.org/" +SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/$(get_version_component_range 1-2)/${MY_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 ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="debug socks5 tk doc threads examples ipv6" # cjk +RESTRICT="confcache" + +RDEPEND=">=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.1 + !=dev-lang/ruby-cvs-1.8* + !dev-ruby/rdoc + !dev-ruby/rexml" +DEPEND="${RDEPEND}" +PROVIDE="virtual/ruby" + +S=${WORKDIR}/${MY_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" +# MY_PV=$(get_version_component_range 1-2) +# make ${MY_PV/./} +# popd +# fi + + 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 + # 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 + + 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" + + MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) + 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 + dodir ${ROOT}usr/share/doc/${PF} + cp -pPR sample ${D}/${ROOT}usr/share/doc/${PF} + fi + + dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*}) + dosym libruby${SLOT/./}$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*}) + + dodoc ChangeLog MANIFEST README* ToDo +} + +pkg_postinst() { + 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 + elog + elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config" + elog +} + +pkg_postrm() { + if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then + ${ROOT}usr/sbin/ruby-config ruby${SLOT/./} + fi +} -- 2.26.2