Removed old versions

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

11 files changed, 8 insertions, 1115 deletions

diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog
index e664c20629d4..9341eb7a67b1 100644
--- a/dev-libs/Ice/ChangeLog
+++ b/dev-libs/Ice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/Ice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.14 2012/07/05 12:32:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.15 2012/11/16 12:43:49 polynomial-c Exp $
+
+  16 Nov 2012; Lars Wendler <polynomial-c@gentoo.org> -Ice-3.2.0.ebuild,
+  -files/Ice-3.2.0-Makefile.patch, -Ice-3.2.1.ebuild,
+  -files/Ice-3.2.1-Makefile.patch, -files/Ice-3.2.1-gcc43.patch,
+  -Ice-3.3.1.ebuild, -Ice-3.3.1-r1.ebuild, -files/Ice-3.3.1-Makefile.patch,
+  -files/Ice-3.3.1-openssl.patch, -Ice-3.4.1.ebuild:
+  non-maintainer commit: Removed old versions.
 
   05 Jul 2012; Agostino Sarubbo <ago@gentoo.org> Ice-3.4.2.ebuild:
   Stable for amd64, wrt bug #418415
diff --git a/dev-libs/Ice/Ice-3.2.0.ebuild b/dev-libs/Ice/Ice-3.2.0.ebuild
deleted file mode 100644
index 0ee973633ef4..000000000000
--- a/dev-libs/Ice/Ice-3.2.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.2.0.ebuild,v 1.1 2010/06/08 08:25:34 dev-zero 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="~amd64 ~x86"
-IUSE="ncurses test debug"
-
-RDEPEND=">=dev-libs/expat-2.0
-	>=app-arch/bzip2-1.0.3
-	>=dev-libs/openssl-0.9.8
-	=sys-libs/db-4.5.20*"
-
-DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses sys-libs/readline )
-	test? ( >=dev-lang/python-2.4 )"
-
-pkg_setup() {
-	if built_with_use sys-libs/db nocxx; then
-		eerror "sys-libs/db must be compiled with C++ support!"
-		eerror "Remove the 'nocxx' use flag and try again."
-		die "Fix use flags and re-emerge"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-
-	if use amd64; then
-		sed -i -e "s:^#LP64:LP64:g" ${S}/config/Make.rules \
-		|| die "Failed to set lib64 directory"
-	fi
-
-	if ! use ncurses; then
-		sed -i -e "s#^USE_READLINE.*#USE_READLINE      ?= yes#g" \
-		${S}/config/Make.rules || die "Failed to set no readline"
-	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_install() {
-	make DESTDIR="${D}" install || die "Install Failed!"
-}
-
-src_test() {
-	make test || die "Test failed"
-}
diff --git a/dev-libs/Ice/Ice-3.2.1.ebuild b/dev-libs/Ice/Ice-3.2.1.ebuild
deleted file mode 100644
index d9337c8ea324..000000000000
--- a/dev-libs/Ice/Ice-3.2.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.2.1.ebuild,v 1.1 2010/06/08 08:25:34 dev-zero 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="amd64 x86"
-IUSE="ncurses test debug"
-
-RDEPEND=">=dev-libs/expat-2.0
-	>=app-arch/bzip2-1.0.3
-	>=dev-libs/openssl-0.9.8
-	=sys-libs/db-4.5.20*"
-
-DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses sys-libs/readline )
-	test? ( >=dev-lang/python-2.4 )"
-
-pkg_setup() {
-	if built_with_use sys-libs/db nocxx; then
-		eerror "sys-libs/db must be compiled with C++ support!"
-		eerror "Remove the 'nocxx' use flag and try again."
-		die "Fix use flags and re-emerge"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-
-	MAKE_RULES="${S}/config/Make.rules"
-
-	if use amd64; then
-		sed -i -e "s:^#LP64:LP64:g" "${MAKE_RULES}" \
-		|| die "Failed to set lib64 directory"
-	fi
-
-	if ! use ncurses; then
-		sed -i -e "s#^USE_READLINE.*#USE_READLINE      ?= yes#g" \
-		"${MAKE_RULES}" || die "Failed to set no readline"
-	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_install() {
-	emake DESTDIR="${D}" install || die "Install Failed!"
-}
-
-src_test() {
-	emake test || die "Test failed"
-}
diff --git a/dev-libs/Ice/Ice-3.3.1-r1.ebuild b/dev-libs/Ice/Ice-3.3.1-r1.ebuild
deleted file mode 100644
index cf30d8239685..000000000000
--- a/dev-libs/Ice/Ice-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 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-r1.ebuild,v 1.3 2011/11/14 11:22:34 flameeyes Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="ICE middleware C++ bindings"
-HOMEPAGE="http://www.zeroc.com/index.html"
-SRC_URI="http://www.zeroc.com/download/Ice/3.3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses 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*[cxx]
-	=dev-cpp/libmcpp-2.7.2"
-
-DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses sys-libs/readline )
-	test? ( >=dev-lang/python-2.4 )"
-
-S=${WORKDIR}/${P}/cpp
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	epatch "${FILESDIR}"/${P}-openssl.patch
-
-	MAKE_RULES="${S}/config/Make.rules"
-
-	#if use amd64; then
-	#	sed -i -e "s:^#LP64:LP64:g" "${MAKE_RULES}" \
-	#	|| die "Failed to set lib64 directory"
-	#fi
-
-	if ! use ncurses; then
-		sed -i -e "s#^USE_READLINE.*#USE_READLINE      ?= yes#g" \
-		"${MAKE_RULES}" || die "Failed to set no readline"
-	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() {
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	cp -dpR "${S}"/../slice "${D}"/usr/share/Ice
-}
-
-src_test() {
-	emake test || die "Test failed"
-}
diff --git a/dev-libs/Ice/Ice-3.3.1.ebuild b/dev-libs/Ice/Ice-3.3.1.ebuild
deleted file mode 100644
index 25d884ae86a6..000000000000
--- a/dev-libs/Ice/Ice-3.3.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 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.ebuild,v 1.3 2011/11/14 11:22:34 flameeyes Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="ICE middleware C++ bindings"
-HOMEPAGE="http://www.zeroc.com/index.html"
-SRC_URI="http://www.zeroc.com/download/Ice/3.3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="ncurses 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*[cxx]
-	=dev-cpp/libmcpp-2.7.2"
-
-DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses sys-libs/readline )
-	test? ( >=dev-lang/python-2.4 )"
-
-S=${WORKDIR}/${P}/cpp
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-
-	MAKE_RULES="${S}/config/Make.rules"
-
-	#if use amd64; then
-	#	sed -i -e "s:^#LP64:LP64:g" "${MAKE_RULES}" \
-	#	|| die "Failed to set lib64 directory"
-	#fi
-
-	if ! use ncurses; then
-		sed -i -e "s#^USE_READLINE.*#USE_READLINE      ?= yes#g" \
-		"${MAKE_RULES}" || die "Failed to set no readline"
-	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() {
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	cp -dpR "${S}"/../slice "${D}"/usr/share/Ice
-}
-
-src_test() {
-	emake test || die "Test failed"
-}
diff --git a/dev-libs/Ice/Ice-3.4.1.ebuild b/dev-libs/Ice/Ice-3.4.1.ebuild
deleted file mode 100644
index f9953656c992..000000000000
--- a/dev-libs/Ice/Ice-3.4.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.1.ebuild,v 1.5 2011/11/14 11:22:34 flameeyes Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby18"
-
-inherit 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.5
-	>=dev-libs/openssl-0.9.8o
-	>=sys-libs/db-4.8.30:4.8[cxx]
-	~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* )"
-
-# Maintainer notes:
-# - yes, we have to do the trickery with the move for the python functions
-#   since the build and test frameworks deduce various settings from the path
-#   and they can't be tricked by a symlink. And we also need
-#   SUPPORT_PYTHON_ABIS=1 otherwise we can't get pyc/pyo anymore the sane way
-#   with EAPI=2 which is needed since ruby-ng does not support EAPI=3.
-# TODO: php bindings
-# TODO: java bindings
-
-pkg_setup() {
-	if use python || use test; then
-		python_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-#	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.8"
-	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.8|" \
-		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"
-
-	if use python ; then
-		python_copy_sources py
-		mv py py.orig
-	fi
-
-	if use ruby ; then
-		SITERUBY="$(ruby18 -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
-		building() {
-			mv py-${PYTHON_ABI} py
-			emake -C py ${MAKE_RULES} || die "emake py failed (for py-${PYTHON_ABI})"
-			mv py py-${PYTHON_ABI}
-		}
-		python_execute_function building
-	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
-		installation() {
-			dodir $(python_get_sitedir)
-			mv py-${PYTHON_ABI} py
-			emake -C py ${MAKE_RULES} install_pythondir="\"${D}/$(python_get_sitedir)\"" install_libdir="\"${D}/$(python_get_sitedir)\"" install || die "emake py install failed (for py-${PYTHON_ABI})"
-			mv py py-${PYTHON_ABI}
-		}
-		python_execute_function installation
-
-		docinto py
-		dodoc py.orig/CHANGES py.orig/README
-
-		if use examples ; then
-			insinto /usr/share/doc/${PF}/examples-py
-			doins -r py.orig/demo/*
-		fi
-
-		cd "${D}/$(python_get_sitedir -f)"
-		PYTHON_MODULES=(*.py)
-		PYTHON_MODULES+=(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
-		testing() {
-			mv py-${PYTHON_ABI} py
-			emake -C py ${MAKE_RULES} test || die "emake py test failed (for py-${PYTHON_ABI})"
-			mv py py-${PYTHON_ABI}
-		}
-		python_execute_function testing
-	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 && python_mod_optimize "${PYTHON_MODULES[@]}"
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup "${PYTHON_MODULES[@]}"
-}
diff --git a/dev-libs/Ice/files/Ice-3.2.0-Makefile.patch b/dev-libs/Ice/files/Ice-3.2.0-Makefile.patch
deleted file mode 100644
index d7df955c196c..000000000000
--- a/dev-libs/Ice/files/Ice-3.2.0-Makefile.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- config/Make.rules.orig	2007-03-13 09:07:05.000000000 -0400
-+++ config/Make.rules	2007-03-13 09:07:13.000000000 -0400
-@@ -11,13 +11,13 @@
- # Select an installation base directory. The directory will be created
- # 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
-@@ -125,9 +125,10 @@
- install_bindir		= $(prefix)/bin
- 
- install_includedir	= $(prefix)/include
--install_slicedir	= $(prefix)/slice
--install_schemadir	= $(prefix)/schema
--install_docdir		= $(prefix)/doc
-+install_slicedir	= $(prefix)/share/Ice/slice
-+install_schemadir	= $(prefix)/share/Ice/schema
-+install_configdir	= $(prefix)/share/Ice/config
-+install_docdir		= $(prefix)/share/doc/Ice-$(VERSION)
- 
- INSTALL			= cp -fp
- INSTALL_PROGRAM		= ${INSTALL}
-@@ -179,18 +180,8 @@
- BZIP2_LIBS              = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2
- BZIP2_RPATH_LINK        = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir)))
- 
--ifneq ($(DB_HOME),)
--   DB_FLAGS             = -I$(DB_HOME)/include
--   DB_LIBS              = -L$(DB_HOME)/$(libsubdir) -ldb_cxx
--   DB_RPATH_LINK        = $(call rpathlink,$(DB_HOME)/$(libsubdir))
--else
--   ifeq ($(shell if [ -d /usr/include/db45 -a -d /usr/$(libsubdir)/db45 ] ; then echo yes; fi), yes)
--      DB_FLAGS          = -I/usr/include/db45
--      DB_LIBS           = -L/usr/$(libsubdir)/db45 -ldb_cxx
--   else
--      DB_LIBS           = -ldb_cxx
--   endif
--endif
-+DB_FLAGS          = -I/usr/include/db4.5
-+DB_LIBS           = -L/usr/$(libsubdir) -ldb_cxx-4.5
- 
- EXPAT_FLAGS             = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include)
- EXPAT_LIBS              = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat
---- Makefile.orig	2007-03-13 09:07:20.000000000 -0400
-+++ Makefile	2007-03-13 09:08:44.000000000 -0400
-@@ -11,15 +11,15 @@
- 
- include $(top_srcdir)/config/Make.rules
- 
--SUBDIRS		= config src include test demo slice doc
-+SUBDIRS		= config src include slice doc
- 
--INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_slicedir) $(install_docdir)
-+INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_slicedir) $(install_docdir) $(install_configdir)
- 
- install::
- 	@if test ! -d $(prefix) ; \
- 	then \
- 	    echo "Creating $(prefix)..." ; \
--	    $(call mkdir,$(prefix)) ; \
-+            mkdir -p $(prefix) ; \
- 	fi
- ifneq ($(embedded_runpath_prefix),)
- 	@if test -h $(embedded_runpath_prefix) ; \
-@@ -55,8 +55,8 @@
- 	then \
- 	    ( cd doc && $(MAKE) install ) || exit 1 ; \
- 	fi
--	$(call installdata,ICE_LICENSE,$(prefix))
--	$(call installdata,LICENSE,$(prefix))
-+	$(call installdata,ICE_LICENSE,$(install_docdir))
-+	$(call installdata,LICENSE,$(install_docdir))
- 
- clean::
- 	@if test -d doc ; \
-@@ -65,4 +65,5 @@
- 	fi
- 
- test::
-+	@( cd test && $(MAKE) ) || exit 1
- 	@python $(top_srcdir)/allTests.py
---- config/Makefile.orig	2007-03-13 10:05:05.000000000 -0400
-+++ config/Makefile	2007-03-13 10:05:43.000000000 -0400
-@@ -15,14 +15,9 @@
- 	echo ""
- 
- install::
--	@if test ! -d $(prefix)/config ; \
--	then \
--	    echo "Creating $(prefix)/config..." ; \
--	    $(call mkdir,$(prefix)/config) ; \
--	fi
--	$(call installdata,templates.xml,$(prefix)/config)
--	$(call installdata,convertssl.py,$(prefix)/config)
--	$(call installdata,upgradeicegrid.py,$(prefix)/config)
--	$(call installdata,upgradeicestorm.py,$(prefix)/config)
--	$(call installdata,icegrid-slice.3.1.ice.gz,$(prefix)/config)
-+	$(call installdata,templates.xml,$(install_configdir))
-+	$(call installdata,convertssl.py,$(install_configdir))
-+	$(call installdata,upgradeicegrid.py,$(install_configdir))
-+	$(call installdata,upgradeicestorm.py,$(install_configdir))
-+	$(call installdata,icegrid-slice.3.1.ice.gz,$(install_configdir))
- 
diff --git a/dev-libs/Ice/files/Ice-3.2.1-Makefile.patch b/dev-libs/Ice/files/Ice-3.2.1-Makefile.patch
deleted file mode 100644
index d7df955c196c..000000000000
--- a/dev-libs/Ice/files/Ice-3.2.1-Makefile.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- config/Make.rules.orig	2007-03-13 09:07:05.000000000 -0400
-+++ config/Make.rules	2007-03-13 09:07:13.000000000 -0400
-@@ -11,13 +11,13 @@
- # Select an installation base directory. The directory will be created
- # 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
-@@ -125,9 +125,10 @@
- install_bindir		= $(prefix)/bin
- 
- install_includedir	= $(prefix)/include
--install_slicedir	= $(prefix)/slice
--install_schemadir	= $(prefix)/schema
--install_docdir		= $(prefix)/doc
-+install_slicedir	= $(prefix)/share/Ice/slice
-+install_schemadir	= $(prefix)/share/Ice/schema
-+install_configdir	= $(prefix)/share/Ice/config
-+install_docdir		= $(prefix)/share/doc/Ice-$(VERSION)
- 
- INSTALL			= cp -fp
- INSTALL_PROGRAM		= ${INSTALL}
-@@ -179,18 +180,8 @@
- BZIP2_LIBS              = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2
- BZIP2_RPATH_LINK        = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir)))
- 
--ifneq ($(DB_HOME),)
--   DB_FLAGS             = -I$(DB_HOME)/include
--   DB_LIBS              = -L$(DB_HOME)/$(libsubdir) -ldb_cxx
--   DB_RPATH_LINK        = $(call rpathlink,$(DB_HOME)/$(libsubdir))
--else
--   ifeq ($(shell if [ -d /usr/include/db45 -a -d /usr/$(libsubdir)/db45 ] ; then echo yes; fi), yes)
--      DB_FLAGS          = -I/usr/include/db45
--      DB_LIBS           = -L/usr/$(libsubdir)/db45 -ldb_cxx
--   else
--      DB_LIBS           = -ldb_cxx
--   endif
--endif
-+DB_FLAGS          = -I/usr/include/db4.5
-+DB_LIBS           = -L/usr/$(libsubdir) -ldb_cxx-4.5
- 
- EXPAT_FLAGS             = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include)
- EXPAT_LIBS              = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat
---- Makefile.orig	2007-03-13 09:07:20.000000000 -0400
-+++ Makefile	2007-03-13 09:08:44.000000000 -0400
-@@ -11,15 +11,15 @@
- 
- include $(top_srcdir)/config/Make.rules
- 
--SUBDIRS		= config src include test demo slice doc
-+SUBDIRS		= config src include slice doc
- 
--INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_slicedir) $(install_docdir)
-+INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_slicedir) $(install_docdir) $(install_configdir)
- 
- install::
- 	@if test ! -d $(prefix) ; \
- 	then \
- 	    echo "Creating $(prefix)..." ; \
--	    $(call mkdir,$(prefix)) ; \
-+            mkdir -p $(prefix) ; \
- 	fi
- ifneq ($(embedded_runpath_prefix),)
- 	@if test -h $(embedded_runpath_prefix) ; \
-@@ -55,8 +55,8 @@
- 	then \
- 	    ( cd doc && $(MAKE) install ) || exit 1 ; \
- 	fi
--	$(call installdata,ICE_LICENSE,$(prefix))
--	$(call installdata,LICENSE,$(prefix))
-+	$(call installdata,ICE_LICENSE,$(install_docdir))
-+	$(call installdata,LICENSE,$(install_docdir))
- 
- clean::
- 	@if test -d doc ; \
-@@ -65,4 +65,5 @@
- 	fi
- 
- test::
-+	@( cd test && $(MAKE) ) || exit 1
- 	@python $(top_srcdir)/allTests.py
---- config/Makefile.orig	2007-03-13 10:05:05.000000000 -0400
-+++ config/Makefile	2007-03-13 10:05:43.000000000 -0400
-@@ -15,14 +15,9 @@
- 	echo ""
- 
- install::
--	@if test ! -d $(prefix)/config ; \
--	then \
--	    echo "Creating $(prefix)/config..." ; \
--	    $(call mkdir,$(prefix)/config) ; \
--	fi
--	$(call installdata,templates.xml,$(prefix)/config)
--	$(call installdata,convertssl.py,$(prefix)/config)
--	$(call installdata,upgradeicegrid.py,$(prefix)/config)
--	$(call installdata,upgradeicestorm.py,$(prefix)/config)
--	$(call installdata,icegrid-slice.3.1.ice.gz,$(prefix)/config)
-+	$(call installdata,templates.xml,$(install_configdir))
-+	$(call installdata,convertssl.py,$(install_configdir))
-+	$(call installdata,upgradeicegrid.py,$(install_configdir))
-+	$(call installdata,upgradeicestorm.py,$(install_configdir))
-+	$(call installdata,icegrid-slice.3.1.ice.gz,$(install_configdir))
- 
diff --git a/dev-libs/Ice/files/Ice-3.2.1-gcc43.patch b/dev-libs/Ice/files/Ice-3.2.1-gcc43.patch
deleted file mode 100644
index fc1488b1e2db..000000000000
--- a/dev-libs/Ice/files/Ice-3.2.1-gcc43.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-diff -ur Ice-3.2.1.orig/include/Ice/Outgoing.h Ice-3.2.1/include/Ice/Outgoing.h
---- Ice-3.2.1.orig/include/Ice/Outgoing.h	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/include/Ice/Outgoing.h	2008-02-22 15:24:56.000000000 +0100
-@@ -16,6 +16,7 @@
- #include <Ice/ReferenceF.h>
- #include <Ice/BasicStream.h>
- #include <Ice/Current.h>
-+#include <memory>
- 
- namespace Ice
- {
-diff -ur Ice-3.2.1.orig/src/FreezeScript/AssignVisitor.cpp Ice-3.2.1/src/FreezeScript/AssignVisitor.cpp
---- Ice-3.2.1.orig/src/FreezeScript/AssignVisitor.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/FreezeScript/AssignVisitor.cpp	2008-02-22 15:26:34.000000000 +0100
-@@ -9,6 +9,7 @@
- 
- #include <FreezeScript/AssignVisitor.h>
- #include <FreezeScript/Util.h>
-+#include <climits>
- 
- using namespace std;
- 
-diff -ur Ice-3.2.1.orig/src/FreezeScript/Data.cpp Ice-3.2.1/src/FreezeScript/Data.cpp
---- Ice-3.2.1.orig/src/FreezeScript/Data.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/FreezeScript/Data.cpp	2008-02-22 15:26:21.000000000 +0100
-@@ -12,6 +12,7 @@
- #include <FreezeScript/Util.h>
- #include <FreezeScript/Exception.h>
- #include <IceUtil/InputUtil.h>
-+#include <climits>
- 
- using namespace std;
- using namespace IceUtil;
-diff -ur Ice-3.2.1.orig/src/FreezeScript/DumpDescriptors.cpp Ice-3.2.1/src/FreezeScript/DumpDescriptors.cpp
---- Ice-3.2.1.orig/src/FreezeScript/DumpDescriptors.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/FreezeScript/DumpDescriptors.cpp	2008-02-22 15:26:26.000000000 +0100
-@@ -15,6 +15,7 @@
- #include <FreezeScript/Util.h>
- #include <db_cxx.h>
- #include <set>
-+#include <climits>
- 
- using namespace std;
- 
-diff -ur Ice-3.2.1.orig/src/FreezeScript/Transformer.cpp Ice-3.2.1/src/FreezeScript/Transformer.cpp
---- Ice-3.2.1.orig/src/FreezeScript/Transformer.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/FreezeScript/Transformer.cpp	2008-02-22 15:26:16.000000000 +0100
-@@ -19,6 +19,7 @@
- #include <Freeze/Initialize.h>
- #include <IceXML/Parser.h>
- #include <db_cxx.h>
-+#include <climits>
- 
- using namespace std;
- 
-diff -ur Ice-3.2.1.orig/src/Ice/ConnectionI.h Ice-3.2.1/src/Ice/ConnectionI.h
---- Ice-3.2.1.orig/src/Ice/ConnectionI.h	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/Ice/ConnectionI.h	2008-02-22 15:24:56.000000000 +0100
-@@ -26,6 +26,7 @@
- #include <Ice/TraceLevelsF.h>
- #include <Ice/OutgoingAsyncF.h>
- #include <Ice/EventHandler.h>
-+#include <memory>
- 
- namespace IceInternal
- {
-diff -ur Ice-3.2.1.orig/src/IceGrid/Activator.cpp Ice-3.2.1/src/IceGrid/Activator.cpp
---- Ice-3.2.1.orig/src/IceGrid/Activator.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/IceGrid/Activator.cpp	2008-02-22 15:27:13.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <climits>
- 
- #ifndef _WIN32
- #   include <sys/wait.h>
-diff -ur Ice-3.2.1.orig/src/IceGrid/PlatformInfo.cpp Ice-3.2.1/src/IceGrid/PlatformInfo.cpp
---- Ice-3.2.1.orig/src/IceGrid/PlatformInfo.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/IceGrid/PlatformInfo.cpp	2008-02-22 15:27:05.000000000 +0100
-@@ -17,6 +17,7 @@
- #include <IceGrid/TraceLevels.h>
- 
- #include <IcePatch2/Util.h>
-+#include <climits>
- 
- #if defined(_WIN32)
- #   include <direct.h> // For _getcwd
-diff -ur Ice-3.2.1.orig/src/IcePatch2/OS.cpp Ice-3.2.1/src/IcePatch2/OS.cpp
---- Ice-3.2.1.orig/src/IcePatch2/OS.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/IcePatch2/OS.cpp	2008-02-22 15:26:56.000000000 +0100
-@@ -10,6 +10,7 @@
- #include <IceUtil/DisableWarnings.h>
- #include <OS.h>
- #include <IceUtil/Unicode.h>
-+#include <climits>
- 
- #ifdef __BCPLUSPLUS__
- #  include <dir.h>
-diff -ur Ice-3.2.1.orig/src/IceUtil/ArgVector.cpp Ice-3.2.1/src/IceUtil/ArgVector.cpp
---- Ice-3.2.1.orig/src/IceUtil/ArgVector.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/IceUtil/ArgVector.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -9,6 +9,7 @@
- 
- #include <IceUtil/ArgVector.h>
- #include <IceUtil/DisableWarnings.h>
-+#include <cstring>
- 
- IceUtil::ArgVector::ArgVector(int argc, char *argv[])
- {
-diff -ur Ice-3.2.1.orig/src/IceUtil/MD5.cpp Ice-3.2.1/src/IceUtil/MD5.cpp
---- Ice-3.2.1.orig/src/IceUtil/MD5.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/IceUtil/MD5.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -9,6 +9,7 @@
- 
- #include <IceUtil/MD5.h>
- #include <IceUtil/MD5I.h>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -ur Ice-3.2.1.orig/src/IceUtil/OutputUtil.cpp Ice-3.2.1/src/IceUtil/OutputUtil.cpp
---- Ice-3.2.1.orig/src/IceUtil/OutputUtil.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/IceUtil/OutputUtil.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -8,6 +8,7 @@
- // **********************************************************************
- 
- #include <IceUtil/OutputUtil.h>
-+#include <cstring>
- 
- using namespace std;
- using namespace IceUtil;
-diff -ur Ice-3.2.1.orig/src/IceUtil/Random.cpp Ice-3.2.1/src/IceUtil/Random.cpp
---- Ice-3.2.1.orig/src/IceUtil/Random.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/IceUtil/Random.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -9,6 +9,7 @@
- 
- #include <IceUtil/Random.h>
- #include <IceUtil/StaticMutex.h>
-+#include <cstring>
- 
- #ifdef _WIN32
- #   include <Wincrypt.h>
-diff -ur Ice-3.2.1.orig/src/IceUtil/ThreadException.cpp Ice-3.2.1/src/IceUtil/ThreadException.cpp
---- Ice-3.2.1.orig/src/IceUtil/ThreadException.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/IceUtil/ThreadException.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -8,6 +8,7 @@
- // **********************************************************************
- 
- #include <IceUtil/ThreadException.h>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -ur Ice-3.2.1.orig/src/Slice/CPlusPlusUtil.cpp Ice-3.2.1/src/Slice/CPlusPlusUtil.cpp
---- Ice-3.2.1.orig/src/Slice/CPlusPlusUtil.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/Slice/CPlusPlusUtil.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -8,6 +8,7 @@
- // **********************************************************************
- 
- #include <Slice/CPlusPlusUtil.h>
-+#include <cstring>
- 
- using namespace std;
- using namespace Slice;
-diff -ur Ice-3.2.1.orig/src/Slice/DotNetNames.cpp Ice-3.2.1/src/Slice/DotNetNames.cpp
---- Ice-3.2.1.orig/src/Slice/DotNetNames.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/Slice/DotNetNames.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -9,6 +9,7 @@
- 
- #include <Slice/DotNetNames.h>
- #include <ctype.h>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -ur Ice-3.2.1.orig/src/Slice/Grammar.cpp Ice-3.2.1/src/Slice/Grammar.cpp
---- Ice-3.2.1.orig/src/Slice/Grammar.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/Slice/Grammar.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -165,6 +165,7 @@
- 
- #include <Slice/GrammarUtil.h>
- #include <IceUtil/UUID.h>
-+#include <cstring>
- 
- #ifdef _MSC_VER
- // I get these warnings from some bison versions:
-diff -ur Ice-3.2.1.orig/src/Slice/Grammar.y Ice-3.2.1/src/Slice/Grammar.y
---- Ice-3.2.1.orig/src/Slice/Grammar.y	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/Slice/Grammar.y	2008-02-22 15:24:56.000000000 +0100
-@@ -11,6 +11,7 @@
- 
- #include <Slice/GrammarUtil.h>
- #include <IceUtil/UUID.h>
-+#include <cstring>
- 
- #ifdef _MSC_VER
- // I get these warnings from some bison versions:
-diff -ur Ice-3.2.1.orig/src/Slice/Parser.cpp Ice-3.2.1/src/Slice/Parser.cpp
---- Ice-3.2.1.orig/src/Slice/Parser.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/Slice/Parser.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -10,6 +10,7 @@
- #include <IceUtil/Functional.h>
- #include <Slice/Parser.h>
- #include <Slice/GrammarUtil.h>
-+#include <cstring>
- #ifdef __BCPLUSPLUS__
- #  include <iterator>
- #endif
-diff -ur Ice-3.2.1.orig/src/Slice/Preprocessor.cpp Ice-3.2.1/src/Slice/Preprocessor.cpp
---- Ice-3.2.1.orig/src/Slice/Preprocessor.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/Slice/Preprocessor.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -11,6 +11,7 @@
- #include <IceUtil/StringUtil.h>
- #include <algorithm>
- #include <fstream>
-+#include <cstring>
- #include <sys/types.h>
- #include <sys/stat.h>
- 
-diff -ur Ice-3.2.1.orig/src/Slice/PythonUtil.cpp Ice-3.2.1/src/Slice/PythonUtil.cpp
---- Ice-3.2.1.orig/src/Slice/PythonUtil.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/Slice/PythonUtil.cpp	2008-02-22 15:25:32.000000000 +0100
-@@ -13,6 +13,7 @@
- #ifdef __BCPLUSPLUS__
- #  include <iterator>
- #endif
-+#include <climits>
- 
- using namespace std;
- using namespace Slice;
-diff -ur Ice-3.2.1.orig/src/slice2docbook/Gen.cpp Ice-3.2.1/src/slice2docbook/Gen.cpp
---- Ice-3.2.1.orig/src/slice2docbook/Gen.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/slice2docbook/Gen.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -10,6 +10,7 @@
- #include <IceUtil/DisableWarnings.h>
- #include <IceUtil/Functional.h>
- #include <Gen.h>
-+#include <cstring>
- 
- #ifdef __BCPLUSPLUS__
- #  include <iterator>
-diff -ur Ice-3.2.1.orig/src/slice2freeze/Main.cpp Ice-3.2.1/src/slice2freeze/Main.cpp
---- Ice-3.2.1.orig/src/slice2freeze/Main.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/slice2freeze/Main.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -12,6 +12,7 @@
- #include <Slice/Preprocessor.h>
- #include <Slice/CPlusPlusUtil.h>
- #include <IceUtil/OutputUtil.h>
-+#include <cstring>
- 
- using namespace std;
- using namespace IceUtil;
-diff -ur Ice-3.2.1.orig/src/slice2java/Gen.cpp Ice-3.2.1/src/slice2java/Gen.cpp
---- Ice-3.2.1.orig/src/slice2java/Gen.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/slice2java/Gen.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -15,6 +15,7 @@
- #include <IceUtil/Iterator.h>
- 
- #include <limits>
-+#include <cstring>
- 
- using namespace std;
- using namespace Slice;
-diff -ur Ice-3.2.1.orig/src/slice2py/Main.cpp Ice-3.2.1/src/slice2py/Main.cpp
---- Ice-3.2.1.orig/src/slice2py/Main.cpp	2008-02-22 15:24:43.000000000 +0100
-+++ Ice-3.2.1/src/slice2py/Main.cpp	2008-02-22 15:24:56.000000000 +0100
-@@ -13,6 +13,7 @@
- #include <Slice/PythonUtil.h>
- 
- #include <fstream>
-+#include <cstring>
- 
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/dev-libs/Ice/files/Ice-3.3.1-Makefile.patch b/dev-libs/Ice/files/Ice-3.3.1-Makefile.patch
deleted file mode 100644
index ceeaab4fd48e..000000000000
--- a/dev-libs/Ice/files/Ice-3.3.1-Makefile.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- config/Make.rules.orig	2008-05-21 13:39:46.000000000 -0400
-+++ config/Make.rules	2008-05-21 13:43:35.000000000 -0400
-@@ -11,13 +11,13 @@
- # Select an installation base directory. The directory will be created
- # 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
-@@ -144,10 +144,10 @@
- include	 $(top_srcdir)/config/Make.rules.$(UNAME)
- 
- install_includedir	:= $(prefix)/include
--install_docdir		:= $(prefix)/doc
-+install_docdir		:= $(prefix)/share/doc/Ice-$(VERSION)
- install_bindir	  	:= $(prefix)/$(binsubdir)
- install_libdir	  	:= $(prefix)/$(libsubdir)
--install_configdir 	:= $(prefix)/config
-+install_configdir 	:= $(prefix)/share/Ice/config
- 
- ifneq ($(embedded_runpath_prefix),)
-     runpath_libdir	:= $(embedded_runpath_prefix)/$(libsubdir)
-@@ -162,18 +162,8 @@
- BZIP2_LIBS              = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2
- BZIP2_RPATH_LINK        = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir)))
- 
--ifneq ($(DB_HOME),)
--   DB_FLAGS             = -I$(DB_HOME)/include
--   DB_LIBS              = -L$(DB_HOME)/$(libsubdir) -ldb_cxx
--   DB_RPATH_LINK        = $(call rpathlink,$(DB_HOME)/$(libsubdir))
--else
--   ifeq ($(shell if [ -d /usr/include/db46 -a -d /usr/$(libsubdir)/db46 ] ; then echo yes; fi), yes)
--      DB_FLAGS          = -I/usr/include/db46
--      DB_LIBS           = -L/usr/$(libsubdir)/db46 -ldb_cxx
--   else
--      DB_LIBS           = -ldb_cxx
--   endif
--endif
-+DB_FLAGS		= -I/usr/include/db4.6
-+DB_LIBS			= -L/usr/$(libsubdir) -ldb_cxx-4.6
- 
- EXPAT_FLAGS             = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include)
- EXPAT_LIBS              = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat
---- Makefile.orig	2008-05-21 13:42:32.000000000 -0400
-+++ Makefile	2008-05-21 13:42:50.000000000 -0400
-@@ -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 ; \
diff --git a/dev-libs/Ice/files/Ice-3.3.1-openssl.patch b/dev-libs/Ice/files/Ice-3.3.1-openssl.patch
deleted file mode 100644
index 28ba3babfccf..000000000000
--- a/dev-libs/Ice/files/Ice-3.3.1-openssl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur Ice-3.3.1-orig/cpp/src/IceSSL/Instance.cpp Ice-3.3.1/cpp/src/IceSSL/Instance.cpp
---- Ice-3.3.1-orig/cpp/src/IceSSL/Instance.cpp	2009-03-20 19:52:14.000000000 +0200
-+++ Ice-3.3.1/cpp/src/IceSSL/Instance.cpp	2010-06-04 16:02:16.779755389 +0300
-@@ -989,7 +989,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";