New version, remove old versions

(Portage version: 2.1.2.1)

7 files changed, 62 insertions, 109 deletions

diff --git a/dev-ruby/IceRuby/ChangeLog b/dev-ruby/IceRuby/ChangeLog
index 1811b283fda9..66c5edd0c023 100644
--- a/dev-ruby/IceRuby/ChangeLog
+++ b/dev-ruby/IceRuby/ChangeLog
@@ -1,6 +1,14 @@
 # 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.3 2007/03/08 21:12:22 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/ChangeLog,v 1.4 2007/03/13 14:04:44 caleb Exp $
+
+*IceRuby-3.2.0 (13 Mar 2007)
+
+  13 Mar 2007; Caleb Tennis <caleb@gentoo.org>
+  +files/IceRuby-3.2.0-Makefile.patch,
+  -files/IceRuby-3.2.0_beta1-Makefile.patch, -IceRuby-3.1.1.ebuild,
+  -IceRuby-3.2.0_beta1.ebuild, +IceRuby-3.2.0.ebuild:
+  version bump, remove old versions
 
 *IceRuby-3.2.0_beta1 (08 Mar 2007)
 
diff --git a/dev-ruby/IceRuby/IceRuby-3.1.1.ebuild b/dev-ruby/IceRuby/IceRuby-3.1.1.ebuild
deleted file mode 100644
index f891ab8e54af..000000000000
--- a/dev-ruby/IceRuby/IceRuby-3.1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.3 2006/10/30 15:37:59 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
-
-	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/IceRuby-3.2.0_beta1.ebuild b/dev-ruby/IceRuby/IceRuby-3.2.0.ebuild
index 4ae002834418..3a5c99354d41 100644
--- a/dev-ruby/IceRuby/IceRuby-3.2.0_beta1.ebuild
+++ b/dev-ruby/IceRuby/IceRuby-3.2.0.ebuild
@@ -1,29 +1,26 @@
 # 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_beta1.ebuild,v 1.1 2007/03/08 21:12:22 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/IceRuby-3.2.0.ebuild,v 1.1 2007/03/13 14:04:44 caleb Exp $
 
 inherit eutils
 
-MY_P=${P/.0_beta1/b}
-
 DESCRIPTION="ICE middleware C++ bindings"
 HOMEPAGE="http://www.zeroc.com/index.html"
-SRC_URI="http://www.zeroc.com/download/Ice/3.2/${MY_P}.tar.gz"
+SRC_URI="http://www.zeroc.com/download/Ice/3.2/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="test debug"
 
-S=${WORKDIR}/${MY_P}
+RDEPEND="=dev-cpp/Ice-3.2*
+	>=dev-lang/ruby-1.8.4"
 
-DEPEND="=dev-cpp/Ice-3.2*
-	>=dev-lang/ruby-1.8.4
+DEPEND="${RDEPEND}
 	test? ( >=dev-lang/python-2.4 )"
 
-ICE_HOME=/usr
-
 src_unpack() {
+#	export ICE_HOME=/usr
 	unpack ${A}
 	cd "${S}"
 
@@ -49,16 +46,16 @@ src_unpack() {
 
 src_compile() {
 	cd ${S}
-	export ICE_HOME=/usr
+#	export ICE_HOME=/usr
 	make || die "Died during make"
 }
 
 src_install() {
-	export ICE_HOME=/usr
+#	export ICE_HOME=/usr
 	make DESTDIR="${D}" install || die "Install Failed!"
 }
 
 src_test() {
-	export ICE_HOME=/usr
+#	export ICE_HOME=/usr
 	make test || die "Test failed"
 }
diff --git a/dev-ruby/IceRuby/files/IceRuby-3.2.0_beta1-Makefile.patch b/dev-ruby/IceRuby/files/IceRuby-3.2.0-Makefile.patch
index c1925eb23e2f..3093e58a78bc 100644
--- a/dev-ruby/IceRuby/files/IceRuby-3.2.0_beta1-Makefile.patch
+++ b/dev-ruby/IceRuby/files/IceRuby-3.2.0-Makefile.patch
@@ -1,24 +1,24 @@
---- Makefile.orig	2007-03-08 15:55:09.000000000 -0500
-+++ Makefile	2007-03-08 15:56:04.000000000 -0500
+--- 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_slicedir)
-+INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_rubylibdir) $(install_slicedir) $(install_rubyarchdir)
+-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) ; \
++            mkdir -p $(prefix) ; \
  	fi
  	@for subdir in $(INSTALL_SUBDIRS); \
  	do \
-@@ -61,9 +61,5 @@
- 	    done \
- 	fi
+@@ -38,9 +38,5 @@
+ 	    ( cd $$subdir && $(MAKE) $@ ) || exit 1; \
+ 	done
  
 -install::
 -	$(call installdata,ICE_LICENSE,$(prefix))
@@ -26,9 +26,9 @@
 -
  test::
  	@python $(top_srcdir)/allTests.py
---- ruby/Makefile.orig	2007-03-08 15:56:11.000000000 -0500
-+++ ruby/Makefile	2007-03-08 15:56:30.000000000 -0500
-@@ -127,8 +127,8 @@
+--- 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 \
@@ -39,18 +39,18 @@
  	done
  
  clean::
---- src/IceRuby/Makefile.orig	2007-03-08 15:56:40.000000000 -0500
-+++ src/IceRuby/Makefile	2007-03-08 15:56:55.000000000 -0500
-@@ -39,6 +39,6 @@
- 	$(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH))
+--- 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 installrubylib,$(rubydir)/$(LIBNAME),$(install_rubydir))
-+	$(call installrubylib,$(rubydir)/$(LIBNAME),$(install_rubyarchdir))
+-	$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
++	$(call installlib,$(install_rubyarchdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
  
  include .depend
---- config/Make.rules.orig	2007-03-08 15:57:05.000000000 -0500
-+++ config/Make.rules	2007-03-08 15:59:29.000000000 -0500
+--- 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.
  #
@@ -67,22 +67,20 @@
  
  #
  # Define OPTIMIZE as yes if you want to build with optimization.
-@@ -51,10 +51,10 @@
+@@ -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_SHARED		= $(shell $(RUBY) -e 'require "rbconfig"; puts Config::MAKEFILE_CONFIG["ENABLE_SHARED"]')
 +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_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_SITELIB_DIR		= $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(sitelibdir)")')
  
- ifeq ("$(RUBY_SHARED)","yes")
-     RUBY_LIB		= $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("-l$$(RUBY_SO_NAME)")')
-@@ -62,7 +62,7 @@
+ 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
  
@@ -91,15 +89,28 @@
  RUBY_LIBS		= -L$(RUBY_LIB_DIR) $(RUBY_LIB)
  
  ifneq ($(ICE_HOME),)
-@@ -110,8 +110,9 @@
+@@ -100,7 +102,8 @@
  endif
  
  install_bindir		= $(prefix)/bin
--install_slicedir	= $(prefix)/slice
 -install_rubydir		= $(prefix)/ruby
-+install_slicedir	= $(prefix)/share/IceRuby/slice
 +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.1.1 b/dev-ruby/IceRuby/files/digest-IceRuby-3.1.1
deleted file mode 100644
index 4a75c2084f7c..000000000000
--- a/dev-ruby/IceRuby/files/digest-IceRuby-3.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/dev-ruby/IceRuby/files/digest-IceRuby-3.2.0 b/dev-ruby/IceRuby/files/digest-IceRuby-3.2.0
new file mode 100644
index 000000000000..657acb05e89f
--- /dev/null
+++ b/dev-ruby/IceRuby/files/digest-IceRuby-3.2.0
@@ -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
diff --git a/dev-ruby/IceRuby/files/digest-IceRuby-3.2.0_beta1 b/dev-ruby/IceRuby/files/digest-IceRuby-3.2.0_beta1
deleted file mode 100644
index d4a854a48ecd..000000000000
--- a/dev-ruby/IceRuby/files/digest-IceRuby-3.2.0_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5e21e439cf463025809fcb8fc1bb7f42 IceRuby-3.2b.tar.gz 264922
-RMD160 ea99a68e1935e90d7fa4c001635a972aa9c3c9a0 IceRuby-3.2b.tar.gz 264922
-SHA256 705669368631194ec26978975a4e9891b0db7ccc86eab2e20184767123aa01fd IceRuby-3.2b.tar.gz 264922