Version bump

(Portage version: 2.1.6.9/cvs/Linux i686)

3 files changed, 162 insertions, 2 deletions

diff --git a/dev-ruby/IceRuby/ChangeLog b/dev-ruby/IceRuby/ChangeLog
index 7c8ceb0d4704..72ebfdfe3527 100644
--- a/dev-ruby/IceRuby/ChangeLog
+++ b/dev-ruby/IceRuby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/IceRuby
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/ChangeLog,v 1.14 2008/05/21 18:12:04 caleb Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/ChangeLog,v 1.15 2009/03/28 23:36:45 caleb Exp $
+
+*IceRuby-3.3.1 (28 Mar 2009)
+
+  28 Mar 2009; Caleb Tennis <caleb@gentoo.org>
+  +files/IceRuby-3.3.1-Makefile.patch, +IceRuby-3.3.1.ebuild:
+  Version bump
 
 *IceRuby-3.3.0 (21 May 2008)
 
diff --git a/dev-ruby/IceRuby/IceRuby-3.3.1.ebuild b/dev-ruby/IceRuby/IceRuby-3.3.1.ebuild
new file mode 100644
index 000000000000..e886da97ee6c
--- /dev/null
+++ b/dev-ruby/IceRuby/IceRuby-3.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/IceRuby-3.3.1.ebuild,v 1.1 2009/03/28 23:36:45 caleb Exp $
+
+inherit eutils
+
+MY_P=${P/Ruby/}
+
+DESCRIPTION="ICE middleware C++ bindings"
+HOMEPAGE="http://www.zeroc.com/index.html"
+SRC_URI="http://www.zeroc.com/download/Ice/3.3/${MY_P}.tar.gz"
+
+S=${WORKDIR}/${MY_P}/rb
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="test debug"
+
+RDEPEND="~dev-cpp/Ice-3.3.1
+	>=dev-lang/ruby-1.8.6"
+
+DEPEND="${RDEPEND}
+	test? ( >=dev-lang/python-2.4 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+
+	MAKE_RULES="${S}/config/Make.rules"
+
+	mkdir -p "${S}/bin"
+	mkdir -p "${S}/lib"
+
+	cp /usr/bin/slice2rb "${S}"/../cpp/bin
+
+	if use amd64; then
+		sed -i -e "s:^#LP64:LP64:g" "${MAKE_RULES}" \
+		|| die "Failed to set lib64 directory"
+	fi
+
+	if ! use debug; then
+		sed -i -e "s:#OPTIMIZE:OPTIMIZE:" \
+		"${MAKE_RULES}" || die "Failed to remove debug"
+	fi
+
+#	sed -i -e \
+#	"s:.*CXXFLAGS[^\+]*\=\s:CXXFLAGS = ${CXXFLAGS} :g" \
+#	"${MAKE_RULES}.Linux" || die "CXXFLAGS patching failed!"
+}
+
+src_compile() {
+	make depend
+	emake || die "Died during make"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install Failed!"
+}
diff --git a/dev-ruby/IceRuby/files/IceRuby-3.3.1-Makefile.patch b/dev-ruby/IceRuby/files/IceRuby-3.3.1-Makefile.patch
new file mode 100644
index 000000000000..a294395f1f57
--- /dev/null
+++ b/dev-ruby/IceRuby/files/IceRuby-3.3.1-Makefile.patch
@@ -0,0 +1,93 @@
+--- 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	2008-04-02 13:13:25.000000000 -0400
++++ config/Make.rules	2008-04-02 13:15:14.000000000 -0400
+@@ -12,13 +12,13 @@
+ # if it does not exist.
+ #
+ 
+-prefix			?= /opt/Ice-$(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.
+@@ -45,8 +45,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"]')
+ 
+@@ -56,7 +58,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)
+ 
+ # ----------------------------------------------------------------------
+@@ -77,8 +79,8 @@
+ endif
+ 
+ libdir			= $(top_srcdir)/ruby
+-install_rubydir		= $(prefix)/ruby
+-install_libdir	        = $(prefix)/ruby
++install_rubylibdir	= $(DESTDIR)/$(RUBY_SITELIB_DIR)
++install_rubyarchdir	= $(DESTDIR)/$(RUBY_SITELIB_DIR)
+ 
+ #
+ # Platform specific definitions
+--- Makefile.orig	2008-04-23 09:17:07.000000000 -0400
++++ Makefile	2008-04-23 09:17:27.000000000 -0400
+@@ -13,11 +13,11 @@
+ 
+ SUBDIRS		= src ruby
+ 
+-install:: install-common
+-	@if test ! -d $(install_rubydir) ; \
++install::
++	@if test ! -d $(install_rubylibdir) ; \
+ 	then \
+-	    echo "Creating $(install_rubydir)..." ; \
+-	    $(call mkdir,$(install_rubydir)) ; \
++	    echo "Creating $(install_rubylibdir)..." ; \
++	    mkdir -p $(install_rubylibdir) ; \
+ 	fi
+ 
+ $(EVERYTHING)::
+