version bump

Package-Manager: portage-2.1.3.5

5 files changed, 203 insertions, 5 deletions

diff --git a/dev-ruby/IceRuby/ChangeLog b/dev-ruby/IceRuby/ChangeLog
index 8751019fef4b..f7ceadc37ca8 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.6 2007/07/24 12:07:18 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/ChangeLog,v 1.7 2007/08/15 15:45:54 caleb Exp $
+
+*IceRuby-3.2.1 (15 Aug 2007)
+
+  15 Aug 2007; Caleb Tennis <caleb@gentoo.org>
+  +files/IceRuby-3.2.1-Makefile.patch, +IceRuby-3.2.1.ebuild:
+  version bump
 
   24 Jul 2007; Caleb Tennis <caleb@gentoo.org>
   -files/IceRuby-3.1.1-Makefile.patch, -files/array_fix-3.1.1.patch,
diff --git a/dev-ruby/IceRuby/IceRuby-3.2.1.ebuild b/dev-ruby/IceRuby/IceRuby-3.2.1.ebuild
new file mode 100644
index 000000000000..8e7e05cc802b
--- /dev/null
+++ b/dev-ruby/IceRuby/IceRuby-3.2.1.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.2.1.ebuild,v 1.1 2007/08/15 15:45:54 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.1
+	>=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
+
+	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 70c4f83c72fa..64b1d8ecb0dd 100644
--- a/dev-ruby/IceRuby/Manifest
+++ b/dev-ruby/IceRuby/Manifest
@@ -2,11 +2,16 @@ AUX IceRuby-3.2.0-Makefile.patch 3791 RMD160 79346934cbfc081a366d6f530737d3f8a14
 MD5 7fe6845dbdbf4a736ffbc265c3571f9c files/IceRuby-3.2.0-Makefile.patch 3791
 RMD160 79346934cbfc081a366d6f530737d3f8a1421ea0 files/IceRuby-3.2.0-Makefile.patch 3791
 SHA256 42b613deac59ca0c2245ffeab1c0f11380d3eb1f9b398c983506c123a7e09bc4 files/IceRuby-3.2.0-Makefile.patch 3791
+AUX IceRuby-3.2.1-Makefile.patch 3791 RMD160 79346934cbfc081a366d6f530737d3f8a1421ea0 SHA1 67adbd6c16761ac01a2efb1152c5efe053b9aaa1 SHA256 42b613deac59ca0c2245ffeab1c0f11380d3eb1f9b398c983506c123a7e09bc4
+MD5 7fe6845dbdbf4a736ffbc265c3571f9c files/IceRuby-3.2.1-Makefile.patch 3791
+RMD160 79346934cbfc081a366d6f530737d3f8a1421ea0 files/IceRuby-3.2.1-Makefile.patch 3791
+SHA256 42b613deac59ca0c2245ffeab1c0f11380d3eb1f9b398c983506c123a7e09bc4 files/IceRuby-3.2.1-Makefile.patch 3791
 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.2.0.tar.gz 95823 RMD160 56c8464918673820993a4c364a16069bf5420cbf SHA1 b3cd3eeaa219d572a372392af613589111d8351f SHA256 b3d89a8811f163dc6725bde1b56487675e6549d203129abad4abb6a6167ce87f
+DIST IceRuby-3.2.1.tar.gz 98496 RMD160 7c852a275fe5d37bee2654889ed268022e7f1cd7 SHA1 c0e94d2957d946157494fa3cbfb05b1a5b352fe3 SHA256 319ccbf5945a9f213695c67a4bdead8605c25c0c6de926e272c4a21619ae30bf
 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
@@ -15,10 +20,14 @@ EBUILD IceRuby-3.2.0.ebuild 1317 RMD160 5a2f7ced9946a9f0c7d6f47968cb5accf648cf18
 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 1345 RMD160 37f0f50cbdbe5fa186202e13cfa216ee4632b790 SHA1 193782fb9819cb3264e6e6a57913efb466bb0d7b SHA256 7fd16a5824d7257f0b0f1108770466f7171b28a04d6a409bd407444164fb206a
-MD5 a8d759e88635a0f3ef35bb34389b2a25 ChangeLog 1345
-RMD160 37f0f50cbdbe5fa186202e13cfa216ee4632b790 ChangeLog 1345
-SHA256 7fd16a5824d7257f0b0f1108770466f7171b28a04d6a409bd407444164fb206a ChangeLog 1345
+EBUILD IceRuby-3.2.1.ebuild 1318 RMD160 389c8c919c152a3f3b35f091a72fd168c696052c SHA1 d45a1467b7c28de1f77183ebda2c6ad3564ebe12 SHA256 e071c5485dafc69c7fbb16e4211212dc8903efe6fe3cae230464e5d508dea97a
+MD5 0e6e18c7118c19bd8b7bd82b4788ff1f IceRuby-3.2.1.ebuild 1318
+RMD160 389c8c919c152a3f3b35f091a72fd168c696052c IceRuby-3.2.1.ebuild 1318
+SHA256 e071c5485dafc69c7fbb16e4211212dc8903efe6fe3cae230464e5d508dea97a IceRuby-3.2.1.ebuild 1318
+MISC ChangeLog 1500 RMD160 7aafb2eeda508940e972f0cace5219a435662366 SHA1 6bf6826a76bde93d4dda154fe3b32aba2bde81d2 SHA256 17e6c3c6079d992e8a483cd23f8305642d3eb98901aaf928e9b8bfab2c2aad5f
+MD5 b3ad2bb3399cebecfd7e91eb7dae4acc ChangeLog 1500
+RMD160 7aafb2eeda508940e972f0cace5219a435662366 ChangeLog 1500
+SHA256 17e6c3c6079d992e8a483cd23f8305642d3eb98901aaf928e9b8bfab2c2aad5f ChangeLog 1500
 MISC metadata.xml 395 RMD160 824fce41b363dcf8701aefea3b030852c290416c SHA1 c193aaf6a87cc88495597c67ad8f913cabd9adcc SHA256 6ca761b49f13da5280c535c04facd4919a991b24fc033fa7c151e45c8acc51ee
 MD5 f5e750cc0394d806839049a1b1b9e64e metadata.xml 395
 RMD160 824fce41b363dcf8701aefea3b030852c290416c metadata.xml 395
@@ -29,3 +38,6 @@ SHA256 d838e19c9883594849dba593c8df881f6ccfd96dc57e3a1d6113f86c216144fd files/di
 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
+MD5 bbd8b629f63bbe51392901c44a9e2069 files/digest-IceRuby-3.2.1 238
+RMD160 54bc121539a6209c5c721fc24cfee2a3d16ea8f9 files/digest-IceRuby-3.2.1 238
+SHA256 c519cdf468c4b9baac7c6454a2dd32d2b2add51eb3c7bdb71ecf7ee7274458d2 files/digest-IceRuby-3.2.1 238
diff --git a/dev-ruby/IceRuby/files/IceRuby-3.2.1-Makefile.patch b/dev-ruby/IceRuby/files/IceRuby-3.2.1-Makefile.patch
new file mode 100644
index 000000000000..3093e58a78bc
--- /dev/null
+++ b/dev-ruby/IceRuby/files/IceRuby-3.2.1-Makefile.patch
@@ -0,0 +1,116 @@
+--- Makefile.orig	2007-03-13 08:29:51.000000000 -0400
++++ Makefile	2007-03-13 08:31:16.000000000 -0400
+@@ -13,13 +13,13 @@
+ 
+ SUBDIRS		= src ruby
+ 
+-INSTALL_SUBDIRS	= $(install_libdir) $(install_rubydir)
++INSTALL_SUBDIRS	= $(install_rubylibdir) $(install_rubyarchdir)
+ 
+ install::
+ 	@if test ! -d $(prefix) ; \
+ 	then \
+ 	    echo "Creating $(prefix)..." ; \
+-	    $(call mkdir,$(prefix)) ; \
++            mkdir -p $(prefix) ; \
+ 	fi
+ 	@for subdir in $(INSTALL_SUBDIRS); \
+ 	do \
+@@ -38,9 +38,5 @@
+ 	    ( cd $$subdir && $(MAKE) $@ ) || exit 1; \
+ 	done
+ 
+-install::
+-	$(call installdata,ICE_LICENSE,$(prefix))
+-	$(call installdata,LICENSE,$(prefix))
+-
+ test::
+ 	@python $(top_srcdir)/allTests.py
+--- ruby/Makefile.orig	2007-03-13 08:31:21.000000000 -0400
++++ ruby/Makefile	2007-03-13 08:31:50.000000000 -0400
+@@ -128,8 +128,8 @@
+ 	@echo "Installing generated code"
+ 	@for i in $(MODULES) ; \
+ 	do \
+-	    $(INSTALL_DATA) $${i}.rb $(install_rubydir) ; \
+-	    $(INSTALL_DATA) -r $$i $(install_rubydir) ; \
++	    $(INSTALL_DATA) $${i}.rb $(install_rubylibdir) ; \
++	    $(INSTALL_DATA) -r $$i $(install_rubylibdir) ; \
+ 	done
+ 
+ clean::
+--- src/IceRuby/Makefile.orig	2007-03-13 08:31:58.000000000 -0400
++++ src/IceRuby/Makefile	2007-03-13 08:35:59.000000000 -0400
+@@ -48,6 +48,6 @@
+ 	ln -s $(SONAME) $@
+ 
+ install:: all
+-	$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
++	$(call installlib,$(install_rubyarchdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
+ 
+ include .depend
+--- config/Make.rules.orig	2007-03-13 08:33:15.000000000 -0400
++++ config/Make.rules	2007-03-13 08:35:04.000000000 -0400
+@@ -18,13 +18,13 @@
+ # if it does not exist.
+ #
+ 
+-prefix			= /opt/IceRuby-$(VERSION)
++prefix			= $(DESTDIR)/usr
+ 
+ #
+ # The "root directory" for runpath embedded in executables. Can be unset
+ # to avoid adding a runpath to Ice executables.
+ #
+-embedded_runpath_prefix  ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
++#embedded_runpath_prefix  ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
+ 
+ #
+ # Define OPTIMIZE as yes if you want to build with optimization.
+@@ -51,8 +51,10 @@
+     RUBY = ruby
+ endif
+ 
+-RUBY_INCLUDE_DIR	= $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(archdir)")')
+-RUBY_LIB_DIR		= $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(libdir)")')
++RUBY_ARCH_DIR	= $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(archdir)")')
++RUBY_LIB_DIR		= $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(rubylibdir)")')
++RUBY_SITEARCH_DIR	= $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(sitearchdir)")')
++RUBY_SITELIB_DIR		= $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(sitelibdir)")')
+ 
+ RUBY_SHARED		= $(shell $(RUBY) -e 'require "rbconfig"; puts Config::MAKEFILE_CONFIG["ENABLE_SHARED"]')
+ 
+@@ -62,7 +64,7 @@
+     RUBY_LIB		= $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("-l$$(RUBY_SO_NAME)-static")')
+ endif
+ 
+-RUBY_FLAGS		= -I$(RUBY_INCLUDE_DIR)
++RUBY_FLAGS		= -I$(RUBY_ARCH_DIR)
+ RUBY_LIBS		= -L$(RUBY_LIB_DIR) $(RUBY_LIB)
+ 
+ ifneq ($(ICE_HOME),)
+@@ -100,7 +102,8 @@
+ endif
+ 
+ install_bindir		= $(prefix)/bin
+-install_rubydir		= $(prefix)/ruby
++install_rubylibdir	= $(DESTDIR)/$(RUBY_SITELIB_DIR)
++install_rubyarchdir	= $(DESTDIR)/$(RUBY_SITEARCH_DIR)
+ 
+ INSTALL			= cp -fp
+ INSTALL_PROGRAM		= ${INSTALL}
+--- config/Make.rules.orig	2007-03-13 09:51:34.000000000 -0400
++++ config/Make.rules	2007-03-13 09:51:59.000000000 -0400
+@@ -93,11 +93,7 @@
+ libdir			= $(top_srcdir)/ruby
+ rubydir			= $(top_srcdir)/ruby
+ 
+-ifneq ($(ICE_HOME),)
+-    slicedir		= $(ICE_HOME)/slice
+-else
+-    slicedir		= /usr/share/Ice-$(VERSION)/slice
+-endif
++slicedir		= /usr/share/Ice/slice
+ 
+ install_bindir		= $(prefix)/bin
+ install_rubydir		= $(prefix)/ruby
diff --git a/dev-ruby/IceRuby/files/digest-IceRuby-3.2.1 b/dev-ruby/IceRuby/files/digest-IceRuby-3.2.1
new file mode 100644
index 000000000000..81a0e82c619d
--- /dev/null
+++ b/dev-ruby/IceRuby/files/digest-IceRuby-3.2.1
@@ -0,0 +1,3 @@
+MD5 17c61065ab67c232283d8710302379d3 IceRuby-3.2.1.tar.gz 98496
+RMD160 7c852a275fe5d37bee2654889ed268022e7f1cd7 IceRuby-3.2.1.tar.gz 98496
+SHA256 319ccbf5945a9f213695c67a4bdead8605c25c0c6de926e272c4a21619ae30bf IceRuby-3.2.1.tar.gz 98496