summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2012-11-16 12:43:52 +0000
committerLars Wendler <polynomial-c@gentoo.org>2012-11-16 12:43:52 +0000
commit7d24dd3952d663d70d23db3d39b8031aa79ac368 (patch)
tree5ea8f2358f7b6b741ea36302605e8adb0dbd1d2b /dev-libs/Ice
parentstable ppc ppc64, bug #441318 (diff)
downloadhistorical-7d24dd3952d663d70d23db3d39b8031aa79ac368.tar.gz
historical-7d24dd3952d663d70d23db3d39b8031aa79ac368.tar.bz2
historical-7d24dd3952d663d70d23db3d39b8031aa79ac368.zip
Removed old versions
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'dev-libs/Ice')
-rw-r--r--dev-libs/Ice/ChangeLog9
-rw-r--r--dev-libs/Ice/Ice-3.2.0.ebuild65
-rw-r--r--dev-libs/Ice/Ice-3.2.1.ebuild68
-rw-r--r--dev-libs/Ice/Ice-3.3.1-r1.ebuild67
-rw-r--r--dev-libs/Ice/Ice-3.3.1.ebuild69
-rw-r--r--dev-libs/Ice/Ice-3.4.1.ebuild264
-rw-r--r--dev-libs/Ice/Manifest39
-rw-r--r--dev-libs/Ice/files/Ice-3.2.0-Makefile.patch113
-rw-r--r--dev-libs/Ice/files/Ice-3.2.1-Makefile.patch113
-rw-r--r--dev-libs/Ice/files/Ice-3.2.1-gcc43.patch275
-rw-r--r--dev-libs/Ice/files/Ice-3.3.1-Makefile.patch68
-rw-r--r--dev-libs/Ice/files/Ice-3.3.1-openssl.patch12
12 files changed, 23 insertions, 1139 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/Manifest b/dev-libs/Ice/Manifest
index c238da912e57..e68d96e92c1c 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -1,36 +1,27 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
-AUX Ice-3.2.0-Makefile.patch 4072 SHA256 78b8c20f7491749c7ff3806d6130110c4d7145ed3c17699792910b877783e1d1 SHA512 199d2a990e9b1d1c2483218d6073fb818d54e7b3228e7fa559718d0df88a098bb829ba30c14b6c926621fedb335d9c7eff633a23e8854f425acd69b537f56130 WHIRLPOOL 07cf4c86bd84f5c821486f6a4a4aad8cde0104104e2c69ce0035731d7114147b3942f37033c5dd011510c1c83ffc32358044ca1be559022e24ffdda8dacf6c0a
-AUX Ice-3.2.1-Makefile.patch 4072 SHA256 78b8c20f7491749c7ff3806d6130110c4d7145ed3c17699792910b877783e1d1 SHA512 199d2a990e9b1d1c2483218d6073fb818d54e7b3228e7fa559718d0df88a098bb829ba30c14b6c926621fedb335d9c7eff633a23e8854f425acd69b537f56130 WHIRLPOOL 07cf4c86bd84f5c821486f6a4a4aad8cde0104104e2c69ce0035731d7114147b3942f37033c5dd011510c1c83ffc32358044ca1be559022e24ffdda8dacf6c0a
-AUX Ice-3.2.1-gcc43.patch 10027 SHA256 b86df9b5fa6bc2c15b1479cbec33040fee67551fbf1086e0e697820d18f9b60c SHA512 09635de5f78298bd221e89eae4bf6a13016abe2c7f8b2423f0ff735e1c61582a2af1eb597152fb0315f7c50b23e5a900e044d9196abe87c87f46a8aaa6a6c48b WHIRLPOOL cfbc4803b20e0ac421339af117d2b79e00cbf0b5bcbe98c3f6f4b02594b9282fd2a97fd781f79bed72fbf535f0713d375c172538b38ad80d68d712adfbfa93ec
-AUX Ice-3.3.1-Makefile.patch 2494 SHA256 1fa17c02f5d32aa719995d283fc08bfe9b97b5cb4b7628e8463813f367aba525 SHA512 da9944396b9315cfa7e8b998a928732ab0619e7c4b5506ea820661912aba00821ba08a79bf2063ec511ce1708e980d1f088f36afc72e6f8592296e653517d709 WHIRLPOOL fec72ecc46c16c2712390b0ad061a12c0bd0ff895fdd3eae6fece56fc572eb02dc90e42f7c355ae0d3a8a161026a065dee2af9bb41503688ebb6ab5bae4342d3
-AUX Ice-3.3.1-openssl.patch 590 SHA256 0c010f9ea91d8feefbc101b1a2017930a5db0fd1fa50d5827a61a6d33da077b3 SHA512 342fd43e15626c3d816b41db387fbbfc5b5db6b6962f905f1e230ea587a8a4bd4a84d38f724c3fc614d3f9692e46613a97ba8f49b7a08d7325bd3b91027d1960 WHIRLPOOL 6af65a390db9d023b4643c747109aa7dd1efad065ec782d017057319beeea05b2db546219803f6c339c3b20dfa4467459128c7125370c6859ae753186a9db2ea
AUX Ice-3.4.1-db5.patch 468 SHA256 53d5c688e6ec716c33f427b0efdca0a9da4c5d5e5b2f260e72127a0543875a87 SHA512 99ca914c2a968571fe4e475640beee67f39bdb2bc90efec0ddda554ba9fe756b2e4ade06e006ee3011692b3bcd1bf730ae140c1f2fb550deab228d0af55b4198 WHIRLPOOL 5ff74b8ef97064542da3d6f10f9a5f95217c1382145fed9277f0d4f2e2306a086c6b48ff4872c442c174a12491462e4e5404aac2e8f17883784401bd8fd767a6
AUX Ice-3.4.2-gcc46.patch 275 SHA256 eb1d14656f19ee919441586682308210ec9877fc814a642a84ab56a818b5c737 SHA512 f36c3097c07cf7eb77b4b7eea88dec3fddc15987392bad55fe1cbd2965161eca8ebd2d7046a176d3e93187404dcb02794d6cbba3cec76a028b23e6125012ca9e WHIRLPOOL 4a58f09edde97121b5c1b29c25e2774253ec5aae9e3736b459bea034af1f07d84dc7c6d7805d13dc682188d23d94bcb4da284294c4f6864c5647366712719a69
-DIST Ice-3.2.0.tar.gz 2060037 SHA256 4698326e39342d2526c8780db996e47d35a09cdc6080be4329980ec5766ce81d SHA512 abd6b39cae937f2d8f0482809df8eb4751d1803da8f524e5fbd0e5e20413b2395608f60e344c6d0f5c2561b63e84e3b87e22b806473b5c65941a631c78ea909f WHIRLPOOL 59962e6479da33dc190438d1de8423a1c34cff4918f16a12a0ea98f11babace6a13b7b9a85bc384a727c30f15a9a7d14dfc7f4c383f5220fce6cc0c6d6e049c3
-DIST Ice-3.2.1.tar.gz 2090576 SHA256 bd24cfe0296d81e2b04ea8d97b32a4f13fdd949d0f038f4c7e0922b395075149 SHA512 a97e0ac6119978888fd2d809f0d33b55fb77e361fcc1c18bc222dda70640d054f6147fbf1a1828c3a4d2ae98510a717e52c717c7f054a898664826d2086ea086 WHIRLPOOL cfb518e54c149ca6cad0d3fe4a1967c09764612412fa1bccc7b7536cd0727a66253cd2f3046510c4705cf3ec35415dd3840e6b6981d6151e7a840b75584fb2d0
-DIST Ice-3.3.1.tar.gz 4455154 SHA256 7b90477303ea2668e8f2cc7bb4506e3a596699e092c4e622746ea42d8286abd0 SHA512 b354f8b35498ac2ab0ab0ca170e32bd6fb373d7be2f0185de4deca063b1e7a76966b849e06b9c2088abcb72efb37b3ea24bc9cb6a5671d1a33ddb5522e4bb295 WHIRLPOOL 03655f28af6ca90251b3c08636f1acca38181143345994327ae2da7da7c188ac9298a96eb449dc31601a2f2c4b1f1796eb18130af3cea989969d0028b34bd6b9
-DIST Ice-3.4.1.pdf.gz 5916874 SHA256 ce7b41769e22ec718d41a3e9eebbe92bee189e9bcab424c3551d2b765bde2e0f SHA512 34f7e586b779b915a52b3f65c88449abeef0b4839e24eb30d1db5d5bbc8b3fa7c377c3bd085632cff012b42a1483a2104ad8331f37f1a70eba880220a62dfd4f WHIRLPOOL f0dd4c75bb9f8d20ef089c43f922a23d9c6bedcaa8dce5a85b8d3a3f546c3d65b58b9ab359eb5578e1ded83f7ac6c6bd35078ecad43187688681adebd4d2719b
-DIST Ice-3.4.1.tar.gz 5263510 SHA256 83c76687ac2b1c16a7e51799668531ec794dc8bd81f0daec14765ad3c671b0e6 SHA512 d7be173826397d4d340fa72f03d29abe475f9e3281b5728dbf531960ba0763daf28de4ed4d61ca94ed72a1706a597258ced707b9356aa876a62d299b55039d58 WHIRLPOOL 3b25d2ccdf947f62f25d15c0f1cd65f4e54274da0f0d3ab06ea2f28a2b597a01bf4b4a0d0c37eb96a4be1fc48796f8d5326f52dba33f994c0edfa9b1b5768343
DIST Ice-3.4.2.pdf.gz 4232836 SHA256 6400efa65f879f964590759222dd46010bfeb3e430787a4d53e826a54cbc4067 SHA512 2ef70d27893e933ecbededfbf737b4033dd4d744c0577f4cf5efd132ca22f0d655378439ddda21254689d393f721ca41fa8ff80eb9691c03630b93cd1a6d81b7 WHIRLPOOL d19a04ddb8f0c0a26036c0163e413d9dacfc9a964ca04d33902c21627e6fed4cc7451a95bcb8327e3a7b56eceed8ae1250ce12a126f8a64903a608beeac82df8
DIST Ice-3.4.2.tar.gz 5485106 SHA256 dcf0484495b6df0849ec90a00e8204fe5fe1c0d3882bb438bf2c1d062f15c979 SHA512 4a69fbddf53112d36805dd276c9af5e221677ea45108553e1e7d580e18ba5a61b2444b8b44d5b2a88132cdebcba989a0dc212029ccbd8e17a2e70bcf50ebb6c8 WHIRLPOOL a79c0348d0454d802af85c72c249a9e162108b71391a77f7b0c9887f3d22974dd4729426308247af8aabda6babc0608691fbb622ac25a54820e8c20ca4e80ec7
-EBUILD Ice-3.2.0.ebuild 1601 SHA256 268e0043adff185dff04252df8a01415b4a7bb59c1347edd7782de16246efab2 SHA512 444c044692588309786dfa126ae5e3bc0047b05cae322506a9d6cb61221d47f21344e32d5a88f0d77de73b558321d02146d44f7c15b02b7651d5c825dc2601ba WHIRLPOOL cd946dba5535dd7aa4d85506440374d51fea1606c262f47bdc4ff471fd375b826121a91edc1cb446bb7daa810829c6868fd9a44f32e057c3e355bccd6e5660f9
-EBUILD Ice-3.2.1.ebuild 1650 SHA256 a96acbf9ef1778dac2ebf0730cbd31809ad0c2a8da32f1ebcbb9e04bdc45e6ab SHA512 45ab155947a24b069eda7cd5119b89a4e1a2905119f5183eb7b887faa81c89e9e7f032277eb8dec0bc99811c966d63ba9a9e572339548b29214c48d370038193 WHIRLPOOL ecafdd6a7962ba8f68625ed88de896b91bd36d1c20e0c1b977c7e2c9ffa8baef103c8a561d2234eed2c5d0d4d1c974d8e2345405db9a5e91077232da1aa64d23
-EBUILD Ice-3.3.1-r1.ebuild 1581 SHA256 bd6f330ad086a2836647649db25aaef7227fd95ddde7af07d7eb6606210326d9 SHA512 f1e96dadefc16f985b6f82a9c6685da6e251323e8decfb3d51770462943bb6895e8ccb5b0fa4fc0cfc81b820daf23661c6150b721fe65185f90b66e228ae7a68 WHIRLPOOL 44864589b831a54b9fb30a2ef5f1e1dbeb725c472624df393db62c1fd735c609386d382bebd060740b529629f7fabe33a246f0a574b22590be7c6c81f1669212
-EBUILD Ice-3.3.1.ebuild 1560 SHA256 6288b9b4ce08b89ef08c634c02c9bfa5fe3740e9fa0df016846fdc4d0b70cb6b SHA512 58fa03f7b273ca8e0cea4e46ef1d6c2f3be0dc6151c0d5dfb5b80d5ddc1f34e338dbf080b9609a2ba930bfd3fca702479c4759c772ee756b559415c4fe0002e7 WHIRLPOOL b9e387c6e08a03d4053cb5b5327babb8b8dd35c4701189d2016be56950d3fd0785250b43ca0a552cb27aed1a9599dfece69e72d43165924b255cb408510dae88
-EBUILD Ice-3.4.1.ebuild 6841 SHA256 cd7b720b77d980c681aa51176847a6c4d89c40c6852015c521735725938db2bd SHA512 19954497c11675420f6df60207a40b054e9872fabec21894ad7148a165bd6d1b227f9377e9d72ba72b22bf32472569a985da7e9daa12a7508890f5c108ff3ccc WHIRLPOOL aa2894b9dfebe3bc4240219cbe18119463c409c022db1ce2a495275b6119a2d504d3bdbab760d7781cf8320ee8af9b7c9195bb6855cbaefdd41b9362914ad66d
EBUILD Ice-3.4.2.ebuild 6839 SHA256 357e896fe4fd1e5f8c36422bc4c27118e19cca115b78d13cdc0d6aff4b471e00 SHA512 1a693845538879bdf562090e7e8682cc16efd54be6c47d918d7be8e59cf065e86548e0656d8567ca612bfc8c77d4ad3ca393e3592b1aa2656ae70169133ee50f WHIRLPOOL dd973e65cf50a3e0ecc5be62ff16e39ce7f6c9f35e16ff5af55234d9a24c3ecf7fa0e90f6ed4edc487036695d474c6cd67ea11c33c5f4fa6277f231807224faa
-MISC ChangeLog 9323 SHA256 752fbb79d4b94c2e8f5e65de464178ddde10c6c96f8f3c3cbc6b5649625c7c2b SHA512 354bb4ddfb0564f34a8104d81204ef732a2bf9ab8b7c28988cbeb96c945880fc0248590bb2798908b53b91d676aedc0b4e399828703aa532a40a67124d8319fa WHIRLPOOL 553b5e2862b0c2a9d8f7bae5c2418b537040b9a08dae6800195773d051d586e5996e3127b6dcc4eaa06f81481ee341052b4ee151c57d44955eda7416bbe02cf5
+MISC ChangeLog 9701 SHA256 2cfb2f1d02238d829dc19a4bebd489fbbc82bcf16fafa53aed39c9bc30a5ca3a SHA512 57795171cec63dc161fc700d834f11d453ba23e8d8a99fc47357d2642530b80d04edebd5c3cd8a56f4239c3441379465436df22763ed0b59ed5eb23c2ffafedc WHIRLPOOL 08634e5f391838b88fc895c7ac783dc739e3ac8cf18712406ce683885a18d129a2f5974f5a4b0cf93b149472210b8deabf8b118225470733136fe57a8277ccd0
MISC metadata.xml 339 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3 SHA512 a52d0a34b45483cbf16e870e458c31e002a62fbe4c18b7839964476696a8650c6db254392f8ff6166f4a434958eb2384cd3267f004c45726d75907983f494e60 WHIRLPOOL 8362526bb468b608b63bb17ea08ee20050904aeed1728efea1e48420fb2b5e820cedcedbecee0a37c0a2b061e0a06aa67ce6b18e148d4fbb785d528e6a80c2f3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCgAGBQJP9Yl7AAoJEOTDgjZ80txdfjUH/1qDUwVcLTQrvElA8TCbsV+9
-3JTkPWqtXFGoFeV4zX8ud70qCPRuEEgCl2XqLZY/mntpiDKM0YS1vZJuUSuMjR3v
-KS1ibMuqsw1a1rhprpvp2VV38JgRrMdDqFSNLZhdH+9fh9iTiSpGY842/izbHWLS
-0yb896OQWmiAOvYepPL5yFCaxLr1PIFCckSQm5P/Q5qXdiowAWE1C7GdUn91QzFP
-Y94sbp7IAePMnyN26jQDtjjbR6UVwghOx8V6HeR11ByTT95r9dxz1Qapi6iQK7wK
-7gKZqPB+EglvncoYndfcgvrhfuU024ewkfyehGpMib0XzU6v1hMJItGo9Hv0p48=
-=a1ft
+iQIcBAEBCAAGBQJQpjUGAAoJEPiazRVxLXTFWAoP+gIVybNbIJVBncEP6NWoYRyR
+/kApjTx1B26S8tbM2LNabNHzsQwJD6xye/mukC5lkmJuGa2z5GxAk0Aasi8XdLyJ
+LOJLijGP2cwliOK5xFAHRZSkL0N6RltzK0qaT6hUHUguRnHzItBDytg+OZTRoFRU
+iMlulVgO5eTGn6dqV58UmVkPqOqHXeK51Iu8unwK8L6DfrfjIv7zT4NQeb5IK0WJ
+fOnZo+qR6Z0HNGlKMq6qeBA2qKPDrFCOBCR7BKKGfZUMh3V/Mjyqeig7kAQIPc0w
+jc7eUECDiJdfHsxnP4kxvBlT7QS8wHEt4HyzEnpsPD5w6VHCF6aYb6nzkqfOj3Bm
+6qvfy845gU+7Rj9k9bLcXDgY1OBFWr8ZCbcwkqYz9q3puOdtTg46xX1rO9N4uPdo
+slB7t+BDgfM1xHdVIPNPYVCyxxFWJ/0RFxfNkHQtenMoYG62dPFMI1x8pQl6xUq/
+KUDy5+GN9+uB9X+FMWqSDo9qxKOEaPyVh5Im/v7Ni8syprujCMnfzRJbX3757KU/
+uHdyMXhJ410Gh7OREMPwGHKTGPr+ZnrlFMUxSiMQw8EisIm9AvjvBqzQFxVUiRn/
+6zbxDOkZgliTHQgUTwQajRv284GpMDa/L35BVscGe4f6XNpd4UIPtwDDIUCFR5k/
+rCLeP8XxOAutOLUV6ze9
+=akMb
-----END PGP SIGNATURE-----
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";