Added revised ebuilds from my overlay, solving bug #236264 (they contain ruby, python and c# bindings now) and bug #312133. Thanks to b33fc0d3 for the cross-compile patch. Version bump (bug #312869, thanks to Philip Kovacs for the stream-patches and the adapted openssl-patch).

(Portage version: 2.2_rc67/cvs/Linux x86_64)

7 files changed, 665 insertions, 1 deletions

diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog
index caa993e0ec5e..54eb33338cf8 100644
--- a/dev-libs/Ice/ChangeLog
+++ b/dev-libs/Ice/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.1 2010/06/08 08:25:34 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.2 2010/06/09 20:22:51 dev-zero Exp $
+
+*Ice-3.4.0 (09 Jun 2010)
+*Ice-3.3.1-r2 (09 Jun 2010)
+
+  09 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> +Ice-3.3.1-r2.ebuild,
+  +files/Ice-3.3.1-cross-compile.patch, +Ice-3.4.0.ebuild,
+  +files/Ice-3.4.0-openssl.patch, +files/Ice-3.4.0-stream1.patch,
+  +files/Ice-3.4.0-stream2.patch:
+  Added revised ebuilds from my overlay, solving bug #236264 (they contain
+  ruby, python and c# bindings now) and bug #312133. Thanks to b33fc0d3 for
+  the cross-compile patch. Version bump (bug #312869, thanks to Philip
+  Kovacs for the stream-patches and the adapted openssl-patch).
 
   08 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> +Ice-3.2.0.ebuild,
   +files/Ice-3.2.0-Makefile.patch, +Ice-3.2.1.ebuild,
diff --git a/dev-libs/Ice/Ice-3.3.1-r2.ebuild b/dev-libs/Ice/Ice-3.3.1-r2.ebuild
new file mode 100644
index 000000000000..9c4d5c9c8531
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.3.1-r2.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.3.1-r2.ebuild,v 1.1 2010/06/09 20:22:51 dev-zero Exp $
+
+EAPI="2"
+
+PYTHON_DEPEND="python? 2"
+RESTRICT_PYTHON_ABIS="3.*"
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby18"
+
+inherit eutils toolchain-funcs versionator python mono ruby-ng
+
+DESCRIPTION="ICE middleware C++ library and generator tools"
+HOMEPAGE="http://www.zeroc.com/"
+SRC_URI="http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.tar.gz
+	doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.pdf.gz )"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples +ncurses mono python ruby test debug"
+
+RDEPEND=">=dev-libs/expat-2.0.1
+	>=app-arch/bzip2-1.0.4
+	>=dev-libs/openssl-0.9.8g
+	>=sys-libs/db-4.6.21:4.6[-nocxx]
+	=dev-cpp/libmcpp-2.7.2
+	ruby? ( $(ruby_implementation_depend ruby18) )
+	mono? ( dev-lang/mono )
+	!dev-python/IcePy
+	!dev-ruby/IceRuby"
+DEPEND="${RDEPEND}
+	ncurses? ( sys-libs/ncurses sys-libs/readline )
+	test? ( >=dev-lang/python-2.4 )"
+
+pkg_setup() {
+	use python && python_pkg_setup
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-openssl.patch"
+
+	if tc-is-cross-compiler ; then
+		export CROSS_COMPILE=yes
+		epatch "${FILESDIR}/${P}-cross-compile.patch"
+	fi
+
+	sed -i \
+		-e 's|\(install_docdir[[:space:]]*\):=|\1?=|' \
+		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
+		cpp/config/Make.rules || die "sed failed"
+
+	sed -i \
+		-e 's|\(install_pythondir[[:space:]]*\):=|\1?=|' \
+		-e 's|\(install_rubydir[[:space:]]*\):=|\1?=|' \
+		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
+		{py,rb}/config/Make.rules || die "sed failed"
+
+	sed -i \
+		-e 's|-O2 ||g' \
+		cpp/config/Make.rules.Linux || die "sed failed"
+
+	sed -i \
+		-e 's|install-common||' \
+		-e 's|demo||' \
+		{cpp,cs,php,py,rb}/Makefile || die "sed failed"
+
+	sed -i \
+		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
+		cs/config/Make.rules.cs || die "sed failed"
+
+	if ! use test ; then
+		sed -i \
+			-e 's|^\(SUBDIRS.*\)test|\1|' \
+			{cpp,cs,php,py,rb}/Makefile || die "sed failed"
+	fi
+}
+
+src_configure() {
+	MAKE_RULES="prefix=\"${D}/usr\"
+		install_docdir=\"${D}/usr/share/doc/${PF}\"
+		install_configdir=\"${D}/usr/share/Ice-${PV}/config\"
+		embedded_runpath_prefix=\"\"
+		LP64=yes"
+
+	use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
+	use debug && OPTIONS"${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes"
+
+	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I/usr/include/db4.6"
+	sed -i \
+		-e "s|c++|$(tc-getCXX)|" \
+		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
+		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
+		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
+		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-4.6|" \
+		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"
+
+	if use python ; then
+		MAKE_RULES_PY="install_pythondir=\"${D}/$(python_get_sitedir)\"
+			install_libdir=\"${D}/$(python_get_sitedir)\""
+	fi
+
+	if use ruby ; then
+		SITERUBY="$(ruby -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
+		MAKE_RULES_RB="install_rubydir=\"${D}/${SITERUBY}\"
+			install_libdir=\"${D}/${SITERUBY}\""
+
+		# make it use ruby18 only
+		sed -i \
+			-e 's|RUBY = ruby|\018|' \
+			rb/config/Make.rules || die "sed failed"
+	fi
+
+	MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${D}/usr/$(get_libdir)\" GAC_DIR=/usr/$(get_libdir)"
+
+}
+
+src_compile() {
+	if tc-is-cross-compiler ; then
+		export CXX="${CHOST}-g++"
+	fi
+
+	emake -C cpp ${MAKE_RULES} || die "emake failed"
+
+	if use doc ; then
+		emake -C cpp/doc || die "building docs failed"
+	fi
+
+	if use python ; then
+		emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} || die "emake py failed"
+	fi
+
+	if use ruby ; then
+		emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} || die "emake rb failed"
+	fi
+
+	if use mono ; then
+		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} || die "emake cs failed"
+	fi
+}
+
+src_install() {
+	dodoc CHANGES README
+
+	insinto /usr/share/${P}
+	doins -r slice
+
+	emake -C cpp ${MAKE_RULES} install || die "emake install failed"
+
+	docinto cpp
+	dodoc CHANGES README
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples-cpp
+		doins cpp/config/*.cfg
+		doins -r cpp/demo/*
+	fi
+
+	if use doc ; then
+		dohtml -r cpp/doc/reference/*
+		dodoc "${WORKDIR}/${P}.pdf"
+	fi
+
+	if use python ; then
+		dodir $(python_get_sitedir)
+		emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} install || die "emake py install failed"
+
+		docinto py
+		dodoc py/CHANGES py/README
+
+		if use examples ; then
+			insinto /usr/share/doc/${PF}/examples-py
+			doins -r py/demo/*
+		fi
+
+		cd "${D}/$(python_get_sitedir)"
+		PYTHON_MODULES=(*.py)
+		PYTHON_MODULES+=(Glacier2 IceBox IceGrid IcePatch2 IceStorm)
+		cd "${S}"
+	fi
+
+	if use ruby ; then
+		dodir "${SITERUBY}"
+		emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} install || die "emake rb install failed"
+
+		docinto rb
+		dodoc rb/CHANGES rb/README
+
+		if use examples ; then
+			insinto /usr/share/doc/${PF}/examples-rb
+			doins -r rb/demo/*
+		fi
+	fi
+
+	if use mono ; then
+		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} install || die "emake cs install failed"
+
+		docinto cs
+		dodoc cs/CHANGES cs/README
+
+		if use examples ; then
+			insinto /usr/share/doc/${PF}/examples-cs
+			doins -r cs/demo/*
+		fi
+	fi
+}
+
+src_test() {
+	emake -C cpp ${MAKE_RULES} test || die "emake test failed"
+
+	if use python ; then
+		emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} test || die "emake py test failed"
+	fi
+
+	if use ruby ; then
+		emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} test || die "emake rb test failed"
+	fi
+
+	if use mono ; then
+		ewarn "Tests for C# are currently disabled."
+#		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} test || die "emake cs test failed"
+	fi
+}
+
+pkg_postinst() {
+	use python && EAPI="3" python_mod_optimize "${PYTHON_MODULES[@]}"
+}
+
+pkg_postrm() {
+	use python && EAPI="3" python_mod_cleanup "${PYTHON_MODULES[@]}"
+}
diff --git a/dev-libs/Ice/Ice-3.4.0.ebuild b/dev-libs/Ice/Ice-3.4.0.ebuild
new file mode 100644
index 000000000000..4e49862ff434
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.4.0.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.0.ebuild,v 1.1 2010/06/09 20:22:51 dev-zero Exp $
+
+EAPI="2"
+
+PYTHON_DEPEND="python? 2"
+RESTRICT_PYTHON_ABIS="3.*"
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby18"
+
+inherit eutils toolchain-funcs versionator python mono ruby-ng
+
+DESCRIPTION="ICE middleware C++ library and generator tools"
+HOMEPAGE="http://www.zeroc.com/"
+SRC_URI="http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.tar.gz
+	doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.pdf.gz )"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples +ncurses mono python ruby test debug"
+
+RDEPEND=">=dev-libs/expat-2.0.1
+	>=app-arch/bzip2-1.0.4
+	>=dev-libs/openssl-0.9.8o
+	>=sys-libs/db-4.8.30:4.8[-nocxx]
+	=dev-cpp/libmcpp-2.7.2
+	ruby? ( $(ruby_implementation_depend ruby18) )
+	mono? ( dev-lang/mono )
+	!dev-python/IcePy
+	!dev-ruby/IceRuby"
+DEPEND="${RDEPEND}
+	ncurses? ( sys-libs/ncurses sys-libs/readline )
+	test? ( >=dev-lang/python-2.4 )"
+
+pkg_setup() {
+	use python && python_pkg_setup
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-openssl.patch" \
+		"${FILESDIR}/${P}-stream1.patch" \
+		"${FILESDIR}/${P}-stream2.patch"
+
+	if tc-is-cross-compiler ; then
+		export CROSS_COMPILE=yes
+		epatch "${FILESDIR}/${P}-cross-compile.patch"
+	fi
+
+	sed -i \
+		-e 's|\(install_docdir[[:space:]]*\):=|\1?=|' \
+		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
+		cpp/config/Make.rules || die "sed failed"
+
+	sed -i \
+		-e 's|\(install_pythondir[[:space:]]*\):=|\1?=|' \
+		-e 's|\(install_rubydir[[:space:]]*\):=|\1?=|' \
+		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
+		{py,rb}/config/Make.rules || die "sed failed"
+
+	sed -i \
+		-e 's|-O2 ||g' \
+		cpp/config/Make.rules.Linux || die "sed failed"
+
+	sed -i \
+		-e 's|install-common||' \
+		-e 's|demo||' \
+		{cpp,cs,php,py,rb}/Makefile || die "sed failed"
+
+	sed -i \
+		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
+		cs/config/Make.rules.cs || die "sed failed"
+
+	if ! use test ; then
+		sed -i \
+			-e 's|^\(SUBDIRS.*\)test|\1|' \
+			{cpp,cs,php,py,rb}/Makefile || die "sed failed"
+	fi
+}
+
+src_configure() {
+	MAKE_RULES="prefix=\"${D}/usr\"
+		install_docdir=\"${D}/usr/share/doc/${PF}\"
+		install_configdir=\"${D}/usr/share/Ice-${PV}/config\"
+		embedded_runpath_prefix=\"\"
+		LP64=yes"
+
+	use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
+	use debug && OPTIONS"${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes"
+
+	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I/usr/include/db4.6"
+	sed -i \
+		-e "s|c++|$(tc-getCXX)|" \
+		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
+		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
+		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
+		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-4.6|" \
+		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"
+
+	if use python ; then
+		MAKE_RULES_PY="install_pythondir=\"${D}/$(python_get_sitedir)\"
+			install_libdir=\"${D}/$(python_get_sitedir)\""
+	fi
+
+	if use ruby ; then
+		SITERUBY="$(ruby -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
+		MAKE_RULES_RB="install_rubydir=\"${D}/${SITERUBY}\"
+			install_libdir=\"${D}/${SITERUBY}\""
+
+		# make it use ruby18 only
+		sed -i \
+			-e 's|RUBY = ruby|\018|' \
+			rb/config/Make.rules || die "sed failed"
+	fi
+
+	MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${D}/usr/$(get_libdir)\" GAC_DIR=/usr/$(get_libdir)"
+
+}
+
+src_compile() {
+	if tc-is-cross-compiler ; then
+		export CXX="${CHOST}-g++"
+	fi
+
+	emake -C cpp ${MAKE_RULES} || die "emake failed"
+
+	if use doc ; then
+		emake -C cpp/doc || die "building docs failed"
+	fi
+
+	if use python ; then
+		emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} || die "emake py failed"
+	fi
+
+	if use ruby ; then
+		emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} || die "emake rb failed"
+	fi
+
+	if use mono ; then
+		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} || die "emake cs failed"
+	fi
+}
+
+src_install() {
+	dodoc CHANGES README
+
+	insinto /usr/share/${P}
+	doins -r slice
+
+	emake -C cpp ${MAKE_RULES} install || die "emake install failed"
+
+	docinto cpp
+	dodoc CHANGES README
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples-cpp
+		doins cpp/config/*.cfg
+		doins -r cpp/demo/*
+	fi
+
+	if use doc ; then
+		dohtml -r cpp/doc/reference/*
+		dodoc "${WORKDIR}/${P}.pdf"
+	fi
+
+	if use python ; then
+		dodir $(python_get_sitedir)
+		emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} install || die "emake py install failed"
+
+		docinto py
+		dodoc py/CHANGES py/README
+
+		if use examples ; then
+			insinto /usr/share/doc/${PF}/examples-py
+			doins -r py/demo/*
+		fi
+
+		cd "${D}/$(python_get_sitedir)"
+		PYTHON_MODULES=(*.py)
+		PYTHON_MODULES+=(Glacier2 IceBox IceGrid IcePatch2 IceStorm)
+		cd "${S}"
+	fi
+
+	if use ruby ; then
+		dodir "${SITERUBY}"
+		emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} install || die "emake rb install failed"
+
+		docinto rb
+		dodoc rb/CHANGES rb/README
+
+		if use examples ; then
+			insinto /usr/share/doc/${PF}/examples-rb
+			doins -r rb/demo/*
+		fi
+	fi
+
+	if use mono ; then
+		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} install || die "emake cs install failed"
+
+		# TODO: anyone has an idea what those are for?
+		rm "${D}"/usr/bin/*.xml
+
+		docinto cs
+		dodoc cs/CHANGES cs/README
+
+		if use examples ; then
+			insinto /usr/share/doc/${PF}/examples-cs
+			doins -r cs/demo/*
+		fi
+	fi
+}
+
+src_test() {
+	emake -C cpp ${MAKE_RULES} test || die "emake test failed"
+
+	if use python ; then
+		emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} test || die "emake py test failed"
+	fi
+
+	if use ruby ; then
+		emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} test || die "emake rb test failed"
+	fi
+
+	if use mono ; then
+		ewarn "Tests for C# are currently disabled."
+#		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} test || die "emake cs test failed"
+	fi
+}
+
+pkg_postinst() {
+	use python && EAPI="3" python_mod_optimize "${PYTHON_MODULES[@]}"
+}
+
+pkg_postrm() {
+	use python && EAPI="3" python_mod_cleanup "${PYTHON_MODULES[@]}"
+}
diff --git a/dev-libs/Ice/files/Ice-3.3.1-cross-compile.patch b/dev-libs/Ice/files/Ice-3.3.1-cross-compile.patch
new file mode 100644
index 000000000000..059965df97f5
--- /dev/null
+++ b/dev-libs/Ice/files/Ice-3.3.1-cross-compile.patch
@@ -0,0 +1,103 @@
+--- ./Ice-3.3.1/cpp/config/Make.rules.orig	2009-07-28 12:35:31.000000000 +0300
++++ ./Ice-3.3.1/cpp/config/Make.rules	2009-07-28 12:39:50.000000000 +0300
+@@ -214,18 +214,26 @@
+     $(error You need to define mkshlib in Make.rules.$(UNAME)) 
+ endif
+ 
+-ifdef ice_src_dist
++ifndef ice_cross_compile
++  ifdef ice_src_dist
+     SLICEPARSERLIB	= $(libdir)/$(call mklibfilename,Slice,$(VERSION))
+     SLICE2CPP		= $(bindir)/slice2cpp
+     SLICE2XSD		= $(bindir)/slice2xsd
+     SLICE2FREEZE	= $(bindir)/slice2freeze
+     SLICE2DOCBOOK	= $(bindir)/slice2docbook
+-else
++  else
+     SLICEPARSERLIB	= $(ice_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION))
+     SLICE2CPP		= $(ice_dir)/$(binsubdir)/slice2cpp
+     SLICE2XSD		= $(ice_dir)/$(binsubdir)/slice2xsd
+     SLICE2FREEZE	= $(ice_dir)/$(binsubdir)/slice2freeze
+     SLICE2DOCBOOK	= $(ice_dir)/$(binsubdir)/slice2docbook
++  endif
++else
++    SLICEPARSERLIB	= /usr/lib/$(call mklibfilename,Slice,$(VERSION))
++    SLICE2CPP		= /usr/bin/slice2cpp
++    SLICE2XSD		= /usr/bin/slice2xsd
++    SLICE2FREEZE	= /usr/bin/slice2freeze
++    SLICE2DOCBOOK	= /usr/bin/slice2docbook
+ endif
+ 
+ EVERYTHING		= all depend clean install 
+--- ./Ice-3.3.1/cpp/config/Make.rules.Linux.orig	2009-07-28 12:03:52.000000000 +0300
++++ ./Ice-3.3.1/cpp/config/Make.rules.Linux	2009-07-28 12:25:15.000000000 +0300
+@@ -78,7 +78,7 @@
+       endif
+    endif
+ 
+-   CXXFLAGS		= $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT -I/usr/include/nptl
++   CXXFLAGS		= $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT
+ 
+    ifneq ($(GENPIC),no)
+       CXXFLAGS		+= -fPIC
+@@ -154,9 +154,7 @@
+ 
+ endif
+ 
+-NPTL_LIB		= /usr/$(libsubdir)/nptl
+-
+-BASELIBS		= -lIceUtil -L$(NPTL_LIB) -lpthread -lrt
++BASELIBS	= -lIceUtil -lpthread -lrt
+ LIBS			= $(BZIP2_RPATH_LINK) -lIce $(BASELIBS)
+ 
+ ICEUTIL_OS_LIBS         = 
+--- ./Ice-3.3.1/cpp/include/IceUtil/Config.h.orig	2009-07-28 12:17:41.000000000 +0300
++++ ./Ice-3.3.1/cpp/include/IceUtil/Config.h	2009-07-28 12:26:02.000000000 +0300
+@@ -16,16 +16,8 @@
+ // Most CPUs support only one endianness, with the notable exceptions
+ // of Itanium (IA64) and MIPS.
+ //
+-#if defined(__i386)     || defined(_M_IX86) || defined(__x86_64)  || \
+-    defined(_M_X64)     || defined(_M_IA64) || defined(__alpha__) || \
+-    defined(__MIPSEL__)
+-#   define ICE_LITTLE_ENDIAN
+-#elif defined(__sparc) || defined(__sparc__) || defined(__hppa)      || \
+-      defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \
+-      defined(__MIPSEB__)
+-#   define ICE_BIG_ENDIAN
+-#else
+-#   error "Unknown architecture"
++#ifdef __GLIBC__
++		#include <endian.h>
+ #endif
+ 
+ //
+--- ./Ice-3.3.1/cpp/Makefile.orig	2009-07-28 12:02:58.000000000 +0300
++++ ./Ice-3.3.1/cpp/Makefile	2009-07-28 12:17:05.000000000 +0300
+@@ -11,11 +11,11 @@
+ 
+ include $(top_srcdir)/config/Make.rules
+ 
+-SUBDIRS		= config src include test demo
++SUBDIRS		= config src include
+ 
+ INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
+ 
+-install:: install-common
++install:: 
+ 	@for subdir in $(INSTALL_SUBDIRS); \
+ 	do \
+ 	    if test ! -d $$subdir ; \
+--- ./Ice-3.3.1/config/Make.common.rules.orig	2009-07-28 12:12:17.000000000 +0300
++++ ./Ice-3.3.1/config/Make.common.rules	2009-07-28 12:25:41.000000000 +0300
+@@ -40,6 +40,10 @@
+ ice_bin_dist = 1
+ endif
+ 
++ifeq ($(CROSS_COMPILE),yes)
++ice_cross_compile = 1
++endif
++
+ ifeq ($(UNAME),SunOS)
+     ifeq ($(MACHINE_TYPE),sun4u)
+        lp64suffix	= /sparcv9
diff --git a/dev-libs/Ice/files/Ice-3.4.0-openssl.patch b/dev-libs/Ice/files/Ice-3.4.0-openssl.patch
new file mode 100644
index 000000000000..1440cedfe438
--- /dev/null
+++ b/dev-libs/Ice/files/Ice-3.4.0-openssl.patch
@@ -0,0 +1,11 @@
+--- ./cpp/src/IceSSL/Instance.cpp.orig	2010-04-03 16:00:51.000000000 -0400
++++ ./cpp/src/IceSSL/Instance.cpp	2010-04-03 16:03:45.000000000 -0400
+@@ -1058,7 +1058,7 @@
+ {
+     Trace out(_logger, _securityTraceCategory);
+     out << "SSL summary for " << (incoming ? "incoming" : "outgoing") << " connection\n";
+-    SSL_CIPHER* cipher = SSL_get_current_cipher(ssl);
++    const SSL_CIPHER* cipher = SSL_get_current_cipher(ssl);
+     if(!cipher)
+     {
+         out << "unknown cipher\n";
diff --git a/dev-libs/Ice/files/Ice-3.4.0-stream1.patch b/dev-libs/Ice/files/Ice-3.4.0-stream1.patch
new file mode 100644
index 000000000000..2e49abbce3f1
--- /dev/null
+++ b/dev-libs/Ice/files/Ice-3.4.0-stream1.patch
@@ -0,0 +1,47 @@
+--- ./cpp/src/slice2cpp/Gen.cpp
++++ ./cpp/src/slice2cpp/Gen.cpp
+@@ -6629,21 +6629,34 @@ Slice::Gen::StreamVisitor::visitModuleStart(const ModulePtr& m)
+     {
+         return false;
+     }
+-    H.zeroIndent();
+-    H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
+-    H << nl << "#else";
+-    H.restoreIndent();
+-    H << nl << "namespace Ice" << nl << '{';
++    if(UnitPtr::dynamicCast(m->container()))
++    {
++        //
++        // Only emit this for the top-level module.
++        //
++        H << sp;
++        H.zeroIndent();
++        H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX
++        H << nl << "#else";
++        H.restoreIndent();
++        H << nl << "namespace Ice" << nl << '{';
++    }
+     return true;
+ }
+ 
+ void
+-Slice::Gen::StreamVisitor::visitModuleEnd(const ModulePtr&)
++Slice::Gen::StreamVisitor::visitModuleEnd(const ModulePtr& m)
+ {
+-    H << nl << '}';
+-    H.zeroIndent();
+-    H << nl << "#endif";
+-    H.restoreIndent();
++    if(UnitPtr::dynamicCast(m->container()))
++    {
++        //
++        // Only emit this for the top-level module.
++        //
++        H << nl << '}';
++        H.zeroIndent();
++        H << nl << "#endif";
++        H.restoreIndent();
++    }
+ }
+ 
+ bool
diff --git a/dev-libs/Ice/files/Ice-3.4.0-stream2.patch b/dev-libs/Ice/files/Ice-3.4.0-stream2.patch
new file mode 100644
index 000000000000..cced0b8dd67d
--- /dev/null
+++ b/dev-libs/Ice/files/Ice-3.4.0-stream2.patch
@@ -0,0 +1,13 @@
+--- ./cpp/src/slice2cpp/Gen.cpp
++++ ./cpp/src/slice2cpp/Gen.cpp
+@@ -354,6 +354,10 @@ Slice::Gen::generate(const UnitPtr& p)
+         {
+             H << "\n#include <Ice/Stream.h>";
+         }
++        else
++        {
++            H << "\n#include <Ice/StreamF.h>";
++        }
+     }
+ 
+     if(_checksum)