From: Caleb Tennis Date: Fri, 2 Feb 2007 14:10:48 +0000 (+0000) Subject: Add a patch to fix an array bug X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4ce8903469bed903faaee52e6e3433322cd05717;p=gentoo.git Add a patch to fix an array bug Package-Manager: portage-2.1.2-r5 --- diff --git a/dev-ruby/IceRuby/ChangeLog b/dev-ruby/IceRuby/ChangeLog index 5d966251887e..35dd8f7da376 100644 --- a/dev-ruby/IceRuby/ChangeLog +++ b/dev-ruby/IceRuby/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/IceRuby -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/ChangeLog,v 1.1 2006/10/30 14:37:08 caleb Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/ChangeLog,v 1.2 2007/02/02 14:10:48 caleb Exp $ + +*IceRuby-3.1.1-r1 (02 Feb 2007) + + 02 Feb 2007; Caleb Tennis +files/array_fix-3.1.1.patch, + +IceRuby-3.1.1-r1.ebuild: + Add a patch to fix an array bug *IceRuby-3.1.1 (30 Oct 2006) diff --git a/dev-ruby/IceRuby/IceRuby-3.1.1-r1.ebuild b/dev-ruby/IceRuby/IceRuby-3.1.1-r1.ebuild new file mode 100644 index 000000000000..a92d5e20fb6f --- /dev/null +++ b/dev-ruby/IceRuby/IceRuby-3.1.1-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/IceRuby-3.1.1-r1.ebuild,v 1.1 2007/02/02 14:10:48 caleb Exp $ + +inherit eutils + +DESCRIPTION="ICE middleware C++ bindings" +HOMEPAGE="http://www.zeroc.com/index.html" +SRC_URI="http://www.zeroc.com/download/Ice/3.1/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="test debug" + +DEPEND="=dev-cpp/Ice-3.1* + >=dev-lang/ruby-1.8.4 + test? ( >=dev-lang/python-2.4 )" + +ICE_HOME=/usr + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch ${FILESDIR}/${P}-Makefile.patch + epatch ${FILESDIR}/array_fix-${PV}.patch + + mkdir -p ${WORKDIR}/bin + mkdir -p ${WORKDIR}/lib + + if use amd64; then + sed -i -e "s:^#LP64:LP64:g" ${S}/config/Make.rules \ + || die "Failed to set lib64 directory" + fi + + if ! use debug; then + sed -i -e "s:#OPTIMIZE:OPTIMIZE:" \ + ${S}/config/Make.rules || die "Failed to remove debug" + fi + + sed -i -e \ + "s:.*CXXFLAGS[^\+]*\=\s:CXXFLAGS = ${CXXFLAGS} :g" \ + ${S}/config/Make.rules.Linux || die "CXXFLAGS patching failed!" +} + +src_compile() { + cd ${S} + export ICE_HOME=/usr + make || die "Died during make" +} + +src_install() { + export ICE_HOME=/usr + make DESTDIR="${D}" install || die "Install Failed!" +} + +src_test() { + export ICE_HOME=/usr + make test || die "Test failed" +} diff --git a/dev-ruby/IceRuby/Manifest b/dev-ruby/IceRuby/Manifest index 00bf15c99963..b7a5153851bd 100644 --- a/dev-ruby/IceRuby/Manifest +++ b/dev-ruby/IceRuby/Manifest @@ -2,15 +2,23 @@ AUX IceRuby-3.1.1-Makefile.patch 3216 RMD160 f6c2f7666ae944684d542e8b7e170d501d0 MD5 34db10d7fe3c89360215a6362b49661b files/IceRuby-3.1.1-Makefile.patch 3216 RMD160 f6c2f7666ae944684d542e8b7e170d501d0486a7 files/IceRuby-3.1.1-Makefile.patch 3216 SHA256 c00a9dc0bc8e62a9562a339d4e889ea39b6922f4b239800ab3a9e9d33fa85119 files/IceRuby-3.1.1-Makefile.patch 3216 +AUX array_fix-3.1.1.patch 1351 RMD160 0f1747465e4b107bc20dd48217934eea82fee090 SHA1 f10c23f7ab39b27a50dbdcbf6462ff9cf0aa8bae SHA256 f1fc5c3fa2955d797e38fe95d2f5bae9708e95ef1658f51760495823a50185e2 +MD5 b88e8d07b8a37dff42e0041f41430c72 files/array_fix-3.1.1.patch 1351 +RMD160 0f1747465e4b107bc20dd48217934eea82fee090 files/array_fix-3.1.1.patch 1351 +SHA256 f1fc5c3fa2955d797e38fe95d2f5bae9708e95ef1658f51760495823a50185e2 files/array_fix-3.1.1.patch 1351 DIST IceRuby-3.1.1.tar.gz 337998 RMD160 7c8fdd43469432bbfabc9ca49018349a4418c928 SHA1 7bf2b3d5f3f17b6284d81d0d0dc38de81db16786 SHA256 1dee046bab93e4320a2b69a6b6b4beb16bd7a2e8b45553299c468773f9e57f8e +EBUILD IceRuby-3.1.1-r1.ebuild 1341 RMD160 0da6c067479466fee6887999732615600b3d9098 SHA1 37ba6ce13c6b433c0f797b3d9e932e69283e0f99 SHA256 e7897db3215fd80e461d6cc9ce2d3e863debb315cce4dc5d9a905e6996bd9d03 +MD5 fe57883c6c412670ae1a074936b2cbd9 IceRuby-3.1.1-r1.ebuild 1341 +RMD160 0da6c067479466fee6887999732615600b3d9098 IceRuby-3.1.1-r1.ebuild 1341 +SHA256 e7897db3215fd80e461d6cc9ce2d3e863debb315cce4dc5d9a905e6996bd9d03 IceRuby-3.1.1-r1.ebuild 1341 EBUILD IceRuby-3.1.1.ebuild 1296 RMD160 f410bf5075946425402e2cc9aac62c9a6f65e1bb SHA1 e969f6eb2077a21b075b52658c36c286c5055a4e SHA256 77d31d722f85e7a10d1a558d65ee5d11ab4cabdaa85f2a96b635629a222fa54e MD5 616f0b74b769ef9d945926f4136ebf22 IceRuby-3.1.1.ebuild 1296 RMD160 f410bf5075946425402e2cc9aac62c9a6f65e1bb IceRuby-3.1.1.ebuild 1296 SHA256 77d31d722f85e7a10d1a558d65ee5d11ab4cabdaa85f2a96b635629a222fa54e IceRuby-3.1.1.ebuild 1296 -MISC ChangeLog 376 RMD160 c72ea3c1d32099d88f76b7debd4c9e9874bcce13 SHA1 55e1ecd332800a0f0db7af9fdc39cf4de2315e18 SHA256 15a447c7b63d00a8605912f3b09d141e8f33793ff1c137f898ba99ae873ef416 -MD5 4e6a4e9543d73b0fa27f1cc90ffab1ea ChangeLog 376 -RMD160 c72ea3c1d32099d88f76b7debd4c9e9874bcce13 ChangeLog 376 -SHA256 15a447c7b63d00a8605912f3b09d141e8f33793ff1c137f898ba99ae873ef416 ChangeLog 376 +MISC ChangeLog 549 RMD160 5fdf0df785be423c5da1325cc643e723a041e0da SHA1 1bcafa5ad9aba84fba6eeccc53b08057134fe627 SHA256 be437d21a0dcfcac16efcad078a19872b103dbdcd2cbe2919dd74ef6cc1385f7 +MD5 c91efa502cc3f11bfab00abfdc7447e4 ChangeLog 549 +RMD160 5fdf0df785be423c5da1325cc643e723a041e0da ChangeLog 549 +SHA256 be437d21a0dcfcac16efcad078a19872b103dbdcd2cbe2919dd74ef6cc1385f7 ChangeLog 549 MISC metadata.xml 395 RMD160 824fce41b363dcf8701aefea3b030852c290416c SHA1 c193aaf6a87cc88495597c67ad8f913cabd9adcc SHA256 6ca761b49f13da5280c535c04facd4919a991b24fc033fa7c151e45c8acc51ee MD5 f5e750cc0394d806839049a1b1b9e64e metadata.xml 395 RMD160 824fce41b363dcf8701aefea3b030852c290416c metadata.xml 395 @@ -18,3 +26,6 @@ SHA256 6ca761b49f13da5280c535c04facd4919a991b24fc033fa7c151e45c8acc51ee metadata MD5 551237dd41500ee49c3b673cbb98d358 files/digest-IceRuby-3.1.1 241 RMD160 db515c18310404d18edabda92af469beeae64804 files/digest-IceRuby-3.1.1 241 SHA256 8f3523efe5403131d8a7dd99c4fe1479236f699698a9aa0459c5300ed04953f9 files/digest-IceRuby-3.1.1 241 +MD5 551237dd41500ee49c3b673cbb98d358 files/digest-IceRuby-3.1.1-r1 241 +RMD160 db515c18310404d18edabda92af469beeae64804 files/digest-IceRuby-3.1.1-r1 241 +SHA256 8f3523efe5403131d8a7dd99c4fe1479236f699698a9aa0459c5300ed04953f9 files/digest-IceRuby-3.1.1-r1 241 diff --git a/dev-ruby/IceRuby/files/array_fix-3.1.1.patch b/dev-ruby/IceRuby/files/array_fix-3.1.1.patch new file mode 100644 index 000000000000..20fa180d5dbe --- /dev/null +++ b/dev-ruby/IceRuby/files/array_fix-3.1.1.patch @@ -0,0 +1,65 @@ +--- src/IceRuby/Types.cpp.orig 2007-02-02 08:58:24.000000000 -0500 ++++ src/IceRuby/Types.cpp 2007-02-02 09:02:41.000000000 -0500 +@@ -548,7 +548,7 @@ + { + RARRAY(arr)->ptr[i] = INT2FIX(seq[i]); + } +- RARRAY(arr)->len = sz; ++ RARRAY(arr)->len++; + break; + } + case PrimitiveInfo::KindShort: +@@ -561,7 +561,7 @@ + { + RARRAY(arr)->ptr[i] = INT2FIX(seq[i]); + } +- RARRAY(arr)->len = sz; ++ RARRAY(arr)->len++; + break; + } + case PrimitiveInfo::KindInt: +@@ -574,7 +574,7 @@ + { + RARRAY(arr)->ptr[i] = INT2FIX(seq[i]); + } +- RARRAY(arr)->len = sz; ++ RARRAY(arr)->len++; + break; + } + case PrimitiveInfo::KindLong: +@@ -587,7 +587,7 @@ + { + RARRAY(arr)->ptr[i] = callRuby(rb_ll2inum, seq[i]); + } +- RARRAY(arr)->len = sz; ++ RARRAY(arr)->len++; + break; + } + case PrimitiveInfo::KindFloat: +@@ -600,7 +600,7 @@ + { + RARRAY(arr)->ptr[i] = callRuby(rb_float_new, seq[i]); + } +- RARRAY(arr)->len = sz; ++ RARRAY(arr)->len++; + break; + } + case PrimitiveInfo::KindDouble: +@@ -613,7 +613,7 @@ + { + RARRAY(arr)->ptr[i] = callRuby(rb_float_new, seq[i]); + } +- RARRAY(arr)->len = sz; ++ RARRAY(arr)->len++; + break; + } + case PrimitiveInfo::KindString: +@@ -626,7 +626,7 @@ + { + RARRAY(arr)->ptr[i] = createString(seq[i]); + } +- RARRAY(arr)->len = sz; ++ RARRAY(arr)->len++; + break; + } + } diff --git a/dev-ruby/IceRuby/files/digest-IceRuby-3.1.1-r1 b/dev-ruby/IceRuby/files/digest-IceRuby-3.1.1-r1 new file mode 100644 index 000000000000..4a75c2084f7c --- /dev/null +++ b/dev-ruby/IceRuby/files/digest-IceRuby-3.1.1-r1 @@ -0,0 +1,3 @@ +MD5 d48d954b92afb3399ffdfea9f3ff0c21 IceRuby-3.1.1.tar.gz 337998 +RMD160 7c8fdd43469432bbfabc9ca49018349a4418c928 IceRuby-3.1.1.tar.gz 337998 +SHA256 1dee046bab93e4320a2b69a6b6b4beb16bd7a2e8b45553299c468773f9e57f8e IceRuby-3.1.1.tar.gz 337998