Bump for a cached connection fix

Package-Manager: portage-2.1.2.7

5 files changed, 98 insertions, 5 deletions

diff --git a/dev-ruby/IceRuby/ChangeLog b/dev-ruby/IceRuby/ChangeLog
index 66c5edd0c023..ea44d1b065cc 100644
--- a/dev-ruby/IceRuby/ChangeLog
+++ b/dev-ruby/IceRuby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/IceRuby
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/ChangeLog,v 1.4 2007/03/13 14:04:44 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/ChangeLog,v 1.5 2007/07/24 12:06:28 caleb Exp $
+
+*IceRuby-3.2.0-r1 (24 Jul 2007)
+
+  24 Jul 2007; Caleb Tennis <caleb@gentoo.org>
+  +files/cached_connection.patch, +IceRuby-3.2.0-r1.ebuild:
+  bump to fix cached connection checking
 
 *IceRuby-3.2.0 (13 Mar 2007)
 
diff --git a/dev-ruby/IceRuby/IceRuby-3.2.0-r1.ebuild b/dev-ruby/IceRuby/IceRuby-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..2ce8b6739eb5
--- /dev/null
+++ b/dev-ruby/IceRuby/IceRuby-3.2.0-r1.ebuild
@@ -0,0 +1,62 @@
+# 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.2.0-r1.ebuild,v 1.1 2007/07/24 12:06:28 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.2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="test debug"
+
+RDEPEND="=dev-cpp/Ice-3.2*
+	>=dev-lang/ruby-1.8.4"
+
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/python-2.4 )"
+
+src_unpack() {
+#	export ICE_HOME=/usr
+	unpack ${A}
+	cd "${S}"
+
+	epatch ${FILESDIR}/${P}-Makefile.patch
+	epatch ${FILESDIR}/cached_connection.patch
+
+	mkdir -p ${S}/bin
+	mkdir -p ${S}/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 3db6dc73fd3b..0775311a0df6 100644
--- a/dev-ruby/IceRuby/Manifest
+++ b/dev-ruby/IceRuby/Manifest
@@ -10,20 +10,28 @@ AUX array_fix-3.1.1.patch 1596 RMD160 444e6d86c7250f7af5c46ac0c09f0043fc696b55 S
 MD5 e3012f59a7988c4a949bed6de1f8c4b2 files/array_fix-3.1.1.patch 1596
 RMD160 444e6d86c7250f7af5c46ac0c09f0043fc696b55 files/array_fix-3.1.1.patch 1596
 SHA256 9e71d44a83e8c71627c053d19bef50bdba772b26c848039825728e9bf7f3efb4 files/array_fix-3.1.1.patch 1596
+AUX cached_connection.patch 368 RMD160 8301b0245ba5d528be2b7581c4d70108bd0efe5b SHA1 cd57fbf80b04613dd396bf7a33205fc0f4e5fba2 SHA256 4524bf829567ecd96bb039a1f7bf8a62efcb5a56382d4f1dbd566572e45c08a7
+MD5 0e0514bd40795a954b667f42faa5e5aa files/cached_connection.patch 368
+RMD160 8301b0245ba5d528be2b7581c4d70108bd0efe5b files/cached_connection.patch 368
+SHA256 4524bf829567ecd96bb039a1f7bf8a62efcb5a56382d4f1dbd566572e45c08a7 files/cached_connection.patch 368
 DIST IceRuby-3.1.1.tar.gz 337998 RMD160 7c8fdd43469432bbfabc9ca49018349a4418c928 SHA1 7bf2b3d5f3f17b6284d81d0d0dc38de81db16786 SHA256 1dee046bab93e4320a2b69a6b6b4beb16bd7a2e8b45553299c468773f9e57f8e
 DIST IceRuby-3.2.0.tar.gz 95823 RMD160 56c8464918673820993a4c364a16069bf5420cbf SHA1 b3cd3eeaa219d572a372392af613589111d8351f SHA256 b3d89a8811f163dc6725bde1b56487675e6549d203129abad4abb6a6167ce87f
 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.2.0-r1.ebuild 1364 RMD160 8db8fe548b9262d4261d5e3ab487fe788974ada5 SHA1 c5000e24d15aba3137b597da5ea57ede066ab09d SHA256 7a72d9f8124bbe470fc895ffc4fab95f6dedc9eb3551e54546070870e471102c
+MD5 41bc2adc1de9df5ddafe64e19da08fa5 IceRuby-3.2.0-r1.ebuild 1364
+RMD160 8db8fe548b9262d4261d5e3ab487fe788974ada5 IceRuby-3.2.0-r1.ebuild 1364
+SHA256 7a72d9f8124bbe470fc895ffc4fab95f6dedc9eb3551e54546070870e471102c IceRuby-3.2.0-r1.ebuild 1364
 EBUILD IceRuby-3.2.0.ebuild 1317 RMD160 5a2f7ced9946a9f0c7d6f47968cb5accf648cf18 SHA1 377a2bb8b03c4fae50c74b8f8e6825482046e388 SHA256 aaa08b3717ce24d07982178b8af7b7cc2eee221366cfeebe99c24deb5e24ae1f
 MD5 c9e71825369c9692565132760e17de42 IceRuby-3.2.0.ebuild 1317
 RMD160 5a2f7ced9946a9f0c7d6f47968cb5accf648cf18 IceRuby-3.2.0.ebuild 1317
 SHA256 aaa08b3717ce24d07982178b8af7b7cc2eee221366cfeebe99c24deb5e24ae1f IceRuby-3.2.0.ebuild 1317
-MISC ChangeLog 997 RMD160 64bebf38e873d912330d95ad58ed7852d24464c6 SHA1 b37daa4c07043445d4bb031a0fa4275694dc82e7 SHA256 eeac7f37fe41416884328ac6b666e0b39767feabfae41ffe9b9f0c7cd0776c76
-MD5 07231838e7b66b755e5d6a588ca778a7 ChangeLog 997
-RMD160 64bebf38e873d912330d95ad58ed7852d24464c6 ChangeLog 997
-SHA256 eeac7f37fe41416884328ac6b666e0b39767feabfae41ffe9b9f0c7cd0776c76 ChangeLog 997
+MISC ChangeLog 1179 RMD160 bd24983f02954bfee010466ccc33848447e0409a SHA1 430211dd7f035948941ad04e44c93e2a56e3c3de SHA256 14a9eac641ae296c4942b9efa6baa33721d99a39052b808e993160128372ff46
+MD5 ee81470dcfefe32bdcb65e6f2666a533 ChangeLog 1179
+RMD160 bd24983f02954bfee010466ccc33848447e0409a ChangeLog 1179
+SHA256 14a9eac641ae296c4942b9efa6baa33721d99a39052b808e993160128372ff46 ChangeLog 1179
 MISC metadata.xml 395 RMD160 824fce41b363dcf8701aefea3b030852c290416c SHA1 c193aaf6a87cc88495597c67ad8f913cabd9adcc SHA256 6ca761b49f13da5280c535c04facd4919a991b24fc033fa7c151e45c8acc51ee
 MD5 f5e750cc0394d806839049a1b1b9e64e metadata.xml 395
 RMD160 824fce41b363dcf8701aefea3b030852c290416c metadata.xml 395
@@ -34,3 +42,6 @@ SHA256 8f3523efe5403131d8a7dd99c4fe1479236f699698a9aa0459c5300ed04953f9 files/di
 MD5 33cc0c417ab4eaa8414794f5aeb17dc4 files/digest-IceRuby-3.2.0 238
 RMD160 6e162efb354e454b1e14fe4ff83e1bc46442ddad files/digest-IceRuby-3.2.0 238
 SHA256 d838e19c9883594849dba593c8df881f6ccfd96dc57e3a1d6113f86c216144fd files/digest-IceRuby-3.2.0 238
+MD5 33cc0c417ab4eaa8414794f5aeb17dc4 files/digest-IceRuby-3.2.0-r1 238
+RMD160 6e162efb354e454b1e14fe4ff83e1bc46442ddad files/digest-IceRuby-3.2.0-r1 238
+SHA256 d838e19c9883594849dba593c8df881f6ccfd96dc57e3a1d6113f86c216144fd files/digest-IceRuby-3.2.0-r1 238
diff --git a/dev-ruby/IceRuby/files/cached_connection.patch b/dev-ruby/IceRuby/files/cached_connection.patch
new file mode 100644
index 000000000000..2acd2f8f3868
--- /dev/null
+++ b/dev-ruby/IceRuby/files/cached_connection.patch
@@ -0,0 +1,11 @@
+--- src/IceRuby/Proxy.cpp.orig	2007-07-24 08:02:19.000000000 -0400
++++ src/IceRuby/Proxy.cpp	2007-07-24 08:02:35.000000000 -0400
+@@ -990,7 +990,7 @@
+     {
+         Ice::ObjectPrx p = getProxy(self);
+         Ice::ConnectionPtr conn = p->ice_getCachedConnection();
+-        if(!conn)
++        if(conn)
+         {
+             return createConnection(conn);
+         }
diff --git a/dev-ruby/IceRuby/files/digest-IceRuby-3.2.0-r1 b/dev-ruby/IceRuby/files/digest-IceRuby-3.2.0-r1
new file mode 100644
index 000000000000..657acb05e89f
--- /dev/null
+++ b/dev-ruby/IceRuby/files/digest-IceRuby-3.2.0-r1
@@ -0,0 +1,3 @@
+MD5 12acd1d20ea9ca0350651c1094a673e2 IceRuby-3.2.0.tar.gz 95823
+RMD160 56c8464918673820993a4c364a16069bf5420cbf IceRuby-3.2.0.tar.gz 95823
+SHA256 b3d89a8811f163dc6725bde1b56487675e6549d203129abad4abb6a6167ce87f IceRuby-3.2.0.tar.gz 95823