From 36e323e09ba62c9612bb9bb9b2c08e838aa8bf55 Mon Sep 17 00:00:00 2001 From: Caleb Tennis Date: Sun, 4 Mar 2007 19:37:17 +0000 Subject: [PATCH] 1.8.6 pre3 Package-Manager: portage-2.1.2-r12 --- dev-lang/ruby/ChangeLog | 7 +- dev-lang/ruby/Manifest | 26 ++-- dev-lang/ruby/files/digest-ruby-1.8.6_pre3 | 3 + dev-lang/ruby/ruby-1.8.6_pre3.ebuild | 143 +++++++++++++++++++++ 4 files changed, 164 insertions(+), 15 deletions(-) create mode 100644 dev-lang/ruby/files/digest-ruby-1.8.6_pre3 create mode 100644 dev-lang/ruby/ruby-1.8.6_pre3.ebuild diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index 255d23585112..e376f1498879 100644 --- a/dev-lang/ruby/ChangeLog +++ b/dev-lang/ruby/ChangeLog @@ -1,6 +1,11 @@ # 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.257 2007/02/17 19:17:23 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.258 2007/03/04 19:37:17 caleb Exp $ + +*ruby-1.8.6_pre3 (04 Mar 2007) + + 04 Mar 2007; Caleb Tennis +ruby-1.8.6_pre3.ebuild: + 1.8.6 pre 3 *ruby-1.8.6_pre1 (17 Feb 2007) diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index fb7edd31949f..58069bc86115 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX ruby-1.8.4-glibc24-eaccess.diff 2619 RMD160 8ec70e117b01a53917b47c829455f77023d393b9 SHA1 bd3600fc8e22ef083663b6b90bb1ec748aa87cce SHA256 bde0e69a78528560c574df8e53bce25a243e86a4cdbb6b33bdc9310f15f861a7 MD5 bb134d27fc11d3ac2f6ca0526e2ee5a1 files/ruby-1.8.4-glibc24-eaccess.diff 2619 RMD160 8ec70e117b01a53917b47c829455f77023d393b9 files/ruby-1.8.4-glibc24-eaccess.diff 2619 @@ -15,6 +12,7 @@ DIST ruby-1.8.4.tar.gz 4312965 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 S DIST ruby-1.8.5-p12.tar.gz 4526961 RMD160 104e78ea4ce0d8fbd3ca1195ca064eda9c9721ea SHA1 15a34958c12e2fe5f41bec0ac935398b60d9c72e SHA256 c72ad433adee87c79ece02f506008afa9ea783a11d1acdaf4107306caede5d0a DIST ruby-1.8.5-p2.tar.gz 4519151 RMD160 3ad4c4a4d02930cbb1a582ea5fa19db04f55ab3b SHA1 f614bba73f447ddf35f8a4beb71ccc3df87831a5 SHA256 496844dc90571454a50552912f02a42df7fc4f89cef5bd3cd4854cecf3fd1d30 DIST ruby-1.8.6-preview1.tar.gz 4580884 RMD160 4dcf796eeea75c877996b2e311a157420b55093d SHA1 95ce669f7f570dbbcc58116dee36e79fddef58ed SHA256 098e04d0f309ead93f6ca8ff4f13be7298414bf9fcbfc66400cb10906af5a327 +DIST ruby-1.8.6-preview3.tar.gz 4590346 RMD160 03871964c878c51a8561fccd26fb7c96d9071d2c SHA1 86822acfe5a38c76719ea420c7a00c0ef7c5fd4f SHA256 e7c7208d027d866a37f358d2074e0eefaec76ad28bff368ba0e2c3633f082777 EBUILD ruby-1.8.4-r3.ebuild 3657 RMD160 e08c44ea87f106d8ae87e0049aa9b8c6046375d2 SHA1 8716b95424b35f3a33e01fa22bfe34c951032e92 SHA256 847759d7afee808b7edec119f41716ed56966ff4e5487c417ea31adc1cd18c4f MD5 b7936d3be8be473aef4f90a66889ad51 ruby-1.8.4-r3.ebuild 3657 RMD160 e08c44ea87f106d8ae87e0049aa9b8c6046375d2 ruby-1.8.4-r3.ebuild 3657 @@ -31,10 +29,14 @@ EBUILD ruby-1.8.6_pre1.ebuild 4180 RMD160 d2ef1edcd37483e2557d87fcfadd770ebed7cd MD5 0a2cf42cf1a11201444f24f35166cf73 ruby-1.8.6_pre1.ebuild 4180 RMD160 d2ef1edcd37483e2557d87fcfadd770ebed7cdfa ruby-1.8.6_pre1.ebuild 4180 SHA256 c7c1e4ce650e2c1d2eebfe4702b63338ac85094405b78e41035ae3d4de59ca43 ruby-1.8.6_pre1.ebuild 4180 -MISC ChangeLog 37228 RMD160 359d5e977c96a89abefa464100591056db18e372 SHA1 6c3a5ff08b24095e907bfaf2c8f8d4c54a3a87de SHA256 9ba17bb28ba7cb6cb1ab04046ea93bf5e31aad556e7abf1df4201591e54cefb4 -MD5 033c39b7833108bdfb079dd8c205894c ChangeLog 37228 -RMD160 359d5e977c96a89abefa464100591056db18e372 ChangeLog 37228 -SHA256 9ba17bb28ba7cb6cb1ab04046ea93bf5e31aad556e7abf1df4201591e54cefb4 ChangeLog 37228 +EBUILD ruby-1.8.6_pre3.ebuild 4176 RMD160 f21e2b019b22ee2f64252058894c77e2f733d8f5 SHA1 7c02c5619b0e775c5af03b42766ad966ae5ad4d2 SHA256 2fb89f63d8fe44678810628883e70cc5ae8f415971622ef9b02b77f6dfd6aec0 +MD5 250962daddf8f09414d679f7f642716e ruby-1.8.6_pre3.ebuild 4176 +RMD160 f21e2b019b22ee2f64252058894c77e2f733d8f5 ruby-1.8.6_pre3.ebuild 4176 +SHA256 2fb89f63d8fe44678810628883e70cc5ae8f415971622ef9b02b77f6dfd6aec0 ruby-1.8.6_pre3.ebuild 4176 +MISC ChangeLog 37343 RMD160 b989d07d7e09ec05188076db4982d76e1f4a2445 SHA1 faf638041e37db65b93cf2d74746cf0ff3a96ff8 SHA256 297eab2e76e90f082cf87190632a67cb76043cb3411c26762fa8eb80431186f9 +MD5 522f5b30e5cef78faf6216cb47dd00b9 ChangeLog 37343 +RMD160 b989d07d7e09ec05188076db4982d76e1f4a2445 ChangeLog 37343 +SHA256 297eab2e76e90f082cf87190632a67cb76043cb3411c26762fa8eb80431186f9 ChangeLog 37343 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157 @@ -51,10 +53,6 @@ SHA256 94ab349ecba8a20a6642d7d93f8cee673fdbf8f548990d0d79f1c18c41349ec4 files/di MD5 e1b51b71b8dc46892665721197d57976 files/digest-ruby-1.8.6_pre1 262 RMD160 1d8f6d5b0272b4be75b83833e2c73a657a271721 files/digest-ruby-1.8.6_pre1 262 SHA256 7e7c281c1d784e8c72c7cdf674bb75e29871a39ed9fb241d0b7d30e4fefe7977 files/digest-ruby-1.8.6_pre1 262 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF11TKAiZjviIA2XgRAn2HAJ9o8Y0p0V2wnJVPqThR0mGt52L5QQCgo8xJ -YZQGRLTHeDUF+M54gE1i9yg= -=T27C ------END PGP SIGNATURE----- +MD5 2795267bb263641095c9c3ce44748835 files/digest-ruby-1.8.6_pre3 262 +RMD160 72fe69c6880f574f83045fb0cb68a687745f90f2 files/digest-ruby-1.8.6_pre3 262 +SHA256 6b07e028dc8a550802764ff6afea577c54e5108ba95efdba0d70d252bf72aa4b files/digest-ruby-1.8.6_pre3 262 diff --git a/dev-lang/ruby/files/digest-ruby-1.8.6_pre3 b/dev-lang/ruby/files/digest-ruby-1.8.6_pre3 new file mode 100644 index 000000000000..a47215d8945d --- /dev/null +++ b/dev-lang/ruby/files/digest-ruby-1.8.6_pre3 @@ -0,0 +1,3 @@ +MD5 9ff2f92773e9f3ccfe1b8fec22c38848 ruby-1.8.6-preview3.tar.gz 4590346 +RMD160 03871964c878c51a8561fccd26fb7c96d9071d2c ruby-1.8.6-preview3.tar.gz 4590346 +SHA256 e7c7208d027d866a37f358d2074e0eefaec76ad28bff368ba0e2c3633f082777 ruby-1.8.6-preview3.tar.gz 4590346 diff --git a/dev-lang/ruby/ruby-1.8.6_pre3.ebuild b/dev-lang/ruby/ruby-1.8.6_pre3.ebuild new file mode 100644 index 000000000000..ce70a7b6f765 --- /dev/null +++ b/dev-lang/ruby/ruby-1.8.6_pre3.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_pre3.ebuild,v 1.1 2007/03/04 19:37:17 caleb 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