Fix src_test to work properly

(Portage version: 2.1.3.9)

4 files changed, 83 insertions, 5 deletions

diff --git a/dev-ruby/IceRuby/ChangeLog b/dev-ruby/IceRuby/ChangeLog
index db9373bfb1e0..4ec9216ee0c9 100644
--- a/dev-ruby/IceRuby/ChangeLog
+++ b/dev-ruby/IceRuby/ChangeLog
@@ -1,6 +1,10 @@
 # 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.10 2007/09/25 12:58:47 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/ChangeLog,v 1.11 2007/09/25 18:53:44 caleb Exp $
+
+  25 Sep 2007; Caleb Tennis <caleb@gentoo.org>
+  +files/testing-Makefile.patch, IceRuby-3.2.1-r1.ebuild:
+  Fix src_test to work properly
 
   25 Sep 2007; Caleb Tennis <caleb@gentoo.org> IceRuby-3.2.1-r1.ebuild:
   Fix up quoting a bit
diff --git a/dev-ruby/IceRuby/IceRuby-3.2.1-r1.ebuild b/dev-ruby/IceRuby/IceRuby-3.2.1-r1.ebuild
index 9c534299679c..e20b70470f6a 100644
--- a/dev-ruby/IceRuby/IceRuby-3.2.1-r1.ebuild
+++ b/dev-ruby/IceRuby/IceRuby-3.2.1-r1.ebuild
@@ -1,12 +1,13 @@
 # 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-r1.ebuild,v 1.2 2007/09/25 12:58:47 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/IceRuby-3.2.1-r1.ebuild,v 1.3 2007/09/25 18:53:44 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"
+SRC_URI="http://www.zeroc.com/download/Ice/3.2/${P}.tar.gz
+	test? ( http://www.zeroc.com/download/Ice/3.2/${P/Ruby/}.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,7 +21,7 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-lang/python-2.4 )"
 
 src_unpack() {
-	unpack "${A}"
+	unpack "${P}.tar.gz"
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-Makefile.patch"
@@ -56,5 +57,26 @@ src_install() {
 }
 
 src_test() {
-	emake test || die "Test failed"
+	ICEFILE="${P/Ruby/}.tar.gz"
+	ICEWORKDIR="${WORKDIR}/${P/Ruby/}"
+
+	# Unpack Ice
+	cd "${WORKDIR}"
+	unpack "${ICEFILE}"
+
+	# Patch Ice so we only build the necessary parts
+	cd "${ICEWORKDIR}"
+	epatch ${FILESDIR}/testing-Makefile.patch
+
+	# Build Ice core libraries
+	cd "${ICEWORKDIR}/src"
+	emake || die "Ice test build failed"
+
+	# Build the testing binaries
+	cd "${ICEWORKDIR}/test"
+	emake || die "Ice test build died"
+
+	# Run IceRuby's actual tests
+	cd "${S}"
+	ICE_HOME=${ICEWORKDIR} emake test || die "Ruby test failed"
 }
diff --git a/dev-ruby/IceRuby/files/digest-IceRuby-3.2.1-r1 b/dev-ruby/IceRuby/files/digest-IceRuby-3.2.1-r1
index 81a0e82c619d..1f338403c3ea 100644
--- a/dev-ruby/IceRuby/files/digest-IceRuby-3.2.1-r1
+++ b/dev-ruby/IceRuby/files/digest-IceRuby-3.2.1-r1
@@ -1,3 +1,6 @@
+MD5 77bb04788747d0f4f7ef35f7a4c2800f Ice-3.2.1.tar.gz 2090576
+RMD160 c3394486ba13e94c2491b0dc48dc19c3e7565ecd Ice-3.2.1.tar.gz 2090576
+SHA256 bd24cfe0296d81e2b04ea8d97b32a4f13fdd949d0f038f4c7e0922b395075149 Ice-3.2.1.tar.gz 2090576
 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
diff --git a/dev-ruby/IceRuby/files/testing-Makefile.patch b/dev-ruby/IceRuby/files/testing-Makefile.patch
new file mode 100644
index 000000000000..e9edb66a1c3f
--- /dev/null
+++ b/dev-ruby/IceRuby/files/testing-Makefile.patch
@@ -0,0 +1,49 @@
+--- test/Makefile.orig	2007-09-25 10:47:24.000000000 -0400
++++ test/Makefile	2007-09-25 10:47:30.000000000 -0400
+@@ -12,13 +12,7 @@
+ include $(top_srcdir)/config/Make.rules
+ 
+ SUBDIRS		= IceUtil \
+-		  Ice \
+-                  IceSSL \
+-		  IceStorm \
+-		  Freeze \
+-		  FreezeScript \
+-		  Glacier2 \
+-		  IceGrid
++		  Ice
+ 
+ $(EVERYTHING)::
+ 	@for subdir in $(SUBDIRS); \
+--- src/Makefile.orig	2007-09-25 10:31:16.000000000 -0400
++++ src/Makefile	2007-09-25 10:52:38.000000000 -0400
+@@ -15,28 +15,7 @@
+ 		  icecpp \
+ 		  Slice \
+ 		  slice2cpp \
+-		  slice2cs \
+-		  slice2vb \
+-		  slice2freeze \
+-		  slice2freezej \
+-		  slice2docbook \
+-		  slice2java \
+-		  slice2py \
+-		  slice2cppe \
+-		  slice2javae \
+-		  slice2rb \
+-		  slice2html \
+-		  Ice \
+-		  IceXML \
+-		  IceSSL \
+-		  Freeze \
+-		  FreezeScript \
+-		  IceBox \
+-		  IceStorm \
+-		  Glacier2 \
+-		  IcePatch2 \
+-		  IceGrid \
+-		  ca
++		  Ice
+ 
+ $(EVERYTHING)::
+ 	@for subdir in $(SUBDIRS); \