From: Diego Elio Pettenò Date: Mon, 25 Dec 2006 14:23:16 +0000 (+0000) Subject: Version bump, thanks to M. Edward Borasky in bug #158458. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2e0a6eda2c18001d35c16e2880e88255796dfce;p=gentoo.git Version bump, thanks to M. Edward Borasky in bug #158458. Package-Manager: portage-2.1.2_rc4 --- diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index 9725aebc4206..9007d6827d53 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.247 2006/12/14 14:20:08 pclouds Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.248 2006/12/25 14:23:15 flameeyes Exp $ + +*ruby-1.8.5_p12 (25 Dec 2006) + + 25 Dec 2006; Diego Pettenò +ruby-1.8.5_p12.ebuild: + Version bump, thanks to M. Edward Borasky in bug #158458. 14 Dec 2006; Nguyễn Thái Ngọc Duy ruby-1.8.5_p2.ebuild: diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 26fd8990b6f9..38f90b2ae609 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 @@ -18,6 +21,7 @@ DIST onigd2_5_0.tar.gz 210448 RMD160 2b3638e6300f8b994f334a064381b8013b286db0 SH DIST onigd2_5_4.tar.gz 212280 RMD160 6f694c6cf12f803d0bc608f493789c92c3cbcf68 SHA1 68438f08aed58bb4655e9268268a0311ea524df7 SHA256 cd4b4177633e8e42e34c26e3f41b0b9bccf747dc51d72a38943fef9cbc0eaa7b DIST onigd2_5_7.tar.gz 215529 RMD160 43cf52af1243acf21932690307ed7b0c81ff2771 SHA1 041cac9ce58f3002228a98db3c4c6934f5682593 SHA256 205b2857d77efc4caa3b98eaf91fd1cc8b8722b497df933d1fbd23f7a5186549 DIST ruby-1.8.4.tar.gz 4312965 RMD160 1c0572a4ee369af57a3db68027b2566052eac944 SHA1 93999577c7fc4decc6b2fe8fefa96e743f278fbf SHA256 71432841b3965b7ab2d83f0dc7c3049195ea4e9267a8dc2d825a8a0466982930 +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.5.tar.gz 4438603 RMD160 991899146c23c9ea30ac09f41b7077fa0c8686b6 SHA1 0638ea26e1088fc9f4237abde8c85331689ce77c SHA256 19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58 EBUILD ruby-1.8.4-r1.ebuild 3771 RMD160 75635c3b811cf62a939aabd5f160555b7a5c0ef0 SHA1 3e7919428f597dd8c33e0a0b598724e3e8898a40 SHA256 b7174f171b5a08c5aa76726b525ef7710cdf317f1e01e28fddb66fcb28a136ce @@ -44,14 +48,18 @@ EBUILD ruby-1.8.5.ebuild 3845 RMD160 490491505737dfe394b73f851a3a51592de3072b SH MD5 c4dd9cb7619ea13a0859d7d62238eb2f ruby-1.8.5.ebuild 3845 RMD160 490491505737dfe394b73f851a3a51592de3072b ruby-1.8.5.ebuild 3845 SHA256 4ef73244db14906d94a508f76ad158da30b986b15601ca7ccd180c1871e14118 ruby-1.8.5.ebuild 3845 +EBUILD ruby-1.8.5_p12.ebuild 4043 RMD160 5231473542ef9fb2f9be69a74e4e65f4acd136d7 SHA1 7a87c8afc0a36dcbb4595409845bc3e6db880d8f SHA256 4f48bc88507f304f75401384d7950c879c4334d70c038ae78ca4045d456f7443 +MD5 1a845c62ce334eb05d1481f609ac78f4 ruby-1.8.5_p12.ebuild 4043 +RMD160 5231473542ef9fb2f9be69a74e4e65f4acd136d7 ruby-1.8.5_p12.ebuild 4043 +SHA256 4f48bc88507f304f75401384d7950c879c4334d70c038ae78ca4045d456f7443 ruby-1.8.5_p12.ebuild 4043 EBUILD ruby-1.8.5_p2.ebuild 3877 RMD160 9ef236ee4b2a198130dcf8536efc53c1c733dfe9 SHA1 c0e556d857cdcd0327e24067646bc93dc29a835e SHA256 d3fec2a44df02c17c209ad739da230ee05cf5f904f85407f737947bee6c5cf38 MD5 c598ea156c561894e932a4ffacb388ba ruby-1.8.5_p2.ebuild 3877 RMD160 9ef236ee4b2a198130dcf8536efc53c1c733dfe9 ruby-1.8.5_p2.ebuild 3877 SHA256 d3fec2a44df02c17c209ad739da230ee05cf5f904f85407f737947bee6c5cf38 ruby-1.8.5_p2.ebuild 3877 -MISC ChangeLog 35519 RMD160 e9dd41faf5ec133b177af098475c5e4b7e5884e0 SHA1 7b0c1fcef4c359008ae2504f1a6e1d086877c063 SHA256 28b76630d4007687967740b137f7bfa39a321a6d490dcdfe7a630ee73ccfbc70 -MD5 6840206853096fca9b79e076378e520f ChangeLog 35519 -RMD160 e9dd41faf5ec133b177af098475c5e4b7e5884e0 ChangeLog 35519 -SHA256 28b76630d4007687967740b137f7bfa39a321a6d490dcdfe7a630ee73ccfbc70 ChangeLog 35519 +MISC ChangeLog 35690 RMD160 7cf34d30cdcbba116b817f8143b17a4bec059432 SHA1 186d7c8acc9221530831185dc53876c7ad24b240 SHA256 3cdd593c70755c9c96b410148ef54727dd25a6f2b4c18a65e07dd914c8373fe2 +MD5 6c6257119af8e086cc09beec97a5813f ChangeLog 35690 +RMD160 7cf34d30cdcbba116b817f8143b17a4bec059432 ChangeLog 35690 +SHA256 3cdd593c70755c9c96b410148ef54727dd25a6f2b4c18a65e07dd914c8373fe2 ChangeLog 35690 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157 @@ -74,6 +82,16 @@ SHA256 7c362e231f229a4afbd81fc401069c1411f7833a9b56122c3b3acd9d9de71eee files/di MD5 86b5d06a5da72078a1755ad84cf57d56 files/digest-ruby-1.8.5-r3 467 RMD160 094acdf2c1878e06040137dd5f14a790116dccbd files/digest-ruby-1.8.5-r3 467 SHA256 7c362e231f229a4afbd81fc401069c1411f7833a9b56122c3b3acd9d9de71eee files/digest-ruby-1.8.5-r3 467 +MD5 38994925e244ad8051444051b686a436 files/digest-ruby-1.8.5_p12 479 +RMD160 e4a79dc12d5afff9e0e06f170019118d46a7f18d files/digest-ruby-1.8.5_p12 479 +SHA256 e77239665a3c99021c592c35dc6ea2e92c9e5f2363a8a276913957298e637616 files/digest-ruby-1.8.5_p12 479 MD5 a0f9393d90ca3858fcfd6dd87f6221ba files/digest-ruby-1.8.5_p2 476 RMD160 7be7dc6b21f0cdf287cfc61a413e36eef54d702f files/digest-ruby-1.8.5_p2 476 SHA256 94ab349ecba8a20a6642d7d93f8cee673fdbf8f548990d0d79f1c18c41349ec4 files/digest-ruby-1.8.5_p2 476 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFFj97bAiZjviIA2XgRAgniAKDsRgrkoBlpNGj5Zg9n9VE8T60jEACfa9KO +sTjuyEhsePdg3UbQRdXGrmk= +=MDgF +-----END PGP SIGNATURE----- diff --git a/dev-lang/ruby/files/digest-ruby-1.8.5_p12 b/dev-lang/ruby/files/digest-ruby-1.8.5_p12 new file mode 100644 index 000000000000..386047e9dce9 --- /dev/null +++ b/dev-lang/ruby/files/digest-ruby-1.8.5_p12 @@ -0,0 +1,6 @@ +MD5 dcaa0b3608990791a5348e94b2f427d5 onigd2_5_7.tar.gz 215529 +RMD160 43cf52af1243acf21932690307ed7b0c81ff2771 onigd2_5_7.tar.gz 215529 +SHA256 205b2857d77efc4caa3b98eaf91fd1cc8b8722b497df933d1fbd23f7a5186549 onigd2_5_7.tar.gz 215529 +MD5 d7d12dd9124c9b7d55cdbbee313e3931 ruby-1.8.5-p12.tar.gz 4526961 +RMD160 104e78ea4ce0d8fbd3ca1195ca064eda9c9721ea ruby-1.8.5-p12.tar.gz 4526961 +SHA256 c72ad433adee87c79ece02f506008afa9ea783a11d1acdaf4107306caede5d0a ruby-1.8.5-p12.tar.gz 4526961 diff --git a/dev-lang/ruby/ruby-1.8.5_p12.ebuild b/dev-lang/ruby/ruby-1.8.5_p12.ebuild new file mode 100644 index 000000000000..5dcede29e152 --- /dev/null +++ b/dev-lang/ruby/ruby-1.8.5_p12.ebuild @@ -0,0 +1,146 @@ +# 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_p12.ebuild,v 1.1 2006/12/25 14:23:16 flameeyes Exp $ + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" + +ONIGURUMA="onigd2_5_7" + +inherit flag-o-matic alternatives eutils multilib autotools versionator + +MY_P="${P/_p/-p}" + +DESCRIPTION="An object-oriented scripting language" +HOMEPAGE="http://www.ruby-lang.org/" +SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="debug socks5 tk cjk doc threads examples ipv6" +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 + !=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" + + 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 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 +}