+++ /dev/null
-# ChangeLog for dev-cpp/Ice
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/ChangeLog,v 1.23 2010/06/04 13:11:43 spatz Exp $
-
- 04 Jun 2010; Dror Levin <spatz@gentoo.org> Ice-3.3.1-r1.ebuild:
- Move patches to src_prepare, fixes repoman QA warnings.
-
-*Ice-3.3.1-r1 (04 Jun 2010)
-
- 04 Jun 2010; Dror Levin <spatz@gentoo.org> +Ice-3.3.1-r1.ebuild,
- +files/Ice-3.3.1-openssl.patch:
- Add patch for openssl-1.0.0 compatibility, bug 312023. Thanks to Philip
- Kovacs.
-
- 19 Nov 2009; Christian Faulhammer <fauli@gentoo.org> Ice-3.3.1.ebuild:
- stable x86, bug 282359
-
- 21 Jun 2009; Caleb Tennis <caleb@gentoo.org> -Ice-3.3.0.ebuild,
- -Ice-3.3.0-r1.ebuild, -files/Ice-3.3.0-Makefile.patch,
- -files/Ice-3.3.0-p1.patch, -files/Ice-3.3.0-p3.patch,
- -files/Ice-3.3.0-p4.patch, -files/Ice-3.3.0-p5.patch,
- -files/Ice-3.3.0-p6.patch, -files/Ice-3.3.0-p7.patch,
- -files/Ice-3.3.0-p8.patch:
- Remove old ebuild version
-
-*Ice-3.3.1 (28 Mar 2009)
-
- 28 Mar 2009; Caleb Tennis <caleb@gentoo.org>
- +files/Ice-3.3.1-Makefile.patch, +Ice-3.3.1.ebuild:
- Version bump
-
- 17 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
- +files/Ice-3.2.1-gcc43.patch, Ice-3.2.1.ebuild:
- Fix bug 227475. Thanks to bonsaikitten, aka DrEevil, aka Evil Compile
- Person for reporting and Daniel Beßler <daniel@orgizm.net> for the patch.
-
-*Ice-3.3.0-r1 (11 Nov 2008)
-
- 11 Nov 2008; Caleb Tennis <caleb@gentoo.org> +files/Ice-3.3.0-p1.patch,
- +files/Ice-3.3.0-p3.patch, +files/Ice-3.3.0-p4.patch,
- +files/Ice-3.3.0-p5.patch, +files/Ice-3.3.0-p6.patch,
- +files/Ice-3.3.0-p7.patch, +files/Ice-3.3.0-p8.patch,
- +Ice-3.3.0-r1.ebuild:
- rev bump with upstream patchsets since 3.3.0 release
-
- 23 Aug 2008; Markus Meier <maekke@gentoo.org> Ice-3.3.0.ebuild:
- add ~amd64, bug #235186
-
-*Ice-3.3.0 (21 May 2008)
-
- 21 May 2008; Caleb Tennis <caleb@gentoo.org>
- +files/Ice-3.3.0-Makefile.patch, -files/Ice-3.3.0_beta1-Makefile.patch,
- -Ice-3.3.0_beta1.ebuild, +Ice-3.3.0.ebuild:
- version bump
-
-*Ice-3.3.0_beta1 (23 Apr 2008)
-
- 23 Apr 2008; Caleb Tennis <caleb@gentoo.org>
- +files/Ice-3.3.0_beta1-Makefile.patch, +Ice-3.3.0_beta1.ebuild:
- Version bump, currently masked
-
- 25 Sep 2007; Christoph Mende <angelos@gentoo.org> Ice-3.2.1.ebuild:
- Stable on amd64 wrt bug #192139
-
- 25 Sep 2007; Caleb Tennis <caleb@gentoo.org> Ice-3.2.1.ebuild:
- Fix quoting
-
- 16 Sep 2007; Christian Faulhammer <opfer@gentoo.org> Ice-3.2.1.ebuild:
- stable x86, bug 192135
-
-*Ice-3.2.1 (15 Aug 2007)
-
- 15 Aug 2007; Caleb Tennis <caleb@gentoo.org>
- +files/Ice-3.2.1-Makefile.patch, +Ice-3.2.1.ebuild:
- version bump
-
- 12 Aug 2007; Caleb Tennis <caleb@gentoo.org> Ice-3.2.0.ebuild:
- Fix ncurses support from bug #175404
-
- 24 Jul 2007; Caleb Tennis <caleb@gentoo.org>
- -files/Ice-3.1.1-Makefile.patch, -files/ice-makefile-speedup.patch,
- -Ice-3.1.1.ebuild:
- remove old version
-
- 15 Jul 2007; Tiziano Müller <dev-zero@gentoo.org> metadata.xml:
- cpp-herd taking over
-
- 14 Jul 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
- Assigning dev-cpp/Ice to m-needed, as chriswhite has been retired (#56211).
-
-*Ice-3.2.0 (13 Mar 2007)
-
- 13 Mar 2007; Caleb Tennis <caleb@gentoo.org>
- +files/Ice-3.2.0-Makefile.patch, -files/Ice-3.2.0_beta1-Makefile.patch,
- -Ice-3.2.0_beta1.ebuild, +Ice-3.2.0.ebuild:
- Version bump
-
-*Ice-3.2.0_beta1 (28 Feb 2007)
-
- 28 Feb 2007; Caleb Tennis <caleb@gentoo.org>
- +files/Ice-3.2.0_beta1-Makefile.patch, +Ice-3.2.0_beta1.ebuild:
- Bump to new beta version, package masked because it relies on db-4.5
-
- 03 Feb 2007; Steve Dibb <beandog@gentoo.org> Ice-3.1.1.ebuild:
- Add ~amd64, bug 142045
-
-*Ice-3.1.1 (30 Oct 2006)
-
- 30 Oct 2006; Caleb Tennis <caleb@gentoo.org>
- +files/Ice-3.1.1-Makefile.patch, +files/ice-makefile-speedup.patch,
- +metadata.xml, +Ice-3.1.1.ebuild:
- Move dev-cpp/ice to dev-cpp/Ice
-
-*ice-3.1.1 (16 Oct 2006)
-
- 16 Oct 2006; Caleb Tennis <caleb@gentoo.org>
- +files/ice-3.1.1-makefile.patch, +ice-3.1.1.ebuild:
- version bump
-
- 05 Aug 2006; Chris White <chriswhite@gentoo.org> ice-3.1.0-r6.ebuild:
- Fixed sys-libs/db dep atom for bug #142045.
-
- 03 Aug 2006; Caleb Tennis <caleb@gentoo.org>
- +files/ice-3.1-patches/ice-makefile-speedup.patch, ice-3.1.0-r6.ebuild:
- Remove building of test and demos during normal compilation. Speeds things
- up tremendously
-
-*ice-3.1.0-r6 (31 Jul 2006)
-
- 31 Jul 2006; Caleb Tennis <caleb@gentoo.org>
- +files/ice-3.1-patches/Gen.cpp, +files/ice-3.1-patches/ice310-3.patch,
- +files/ice-3.1-patches/patch.icegrid.txt,
- +files/ice-3.1-patches/patch.icegrid-5.txt,
- +files/ice-3.1-patches/patch.slice2cpp.txt, +ice-3.1.0-r6.ebuild:
- This adds the first 6 patches that have been released since Ice 3.1.0 was
- released. I bumped it to -r6 to signify this
-
-*ice-3.1.0-r1 (14 Jul 2006)
-
- 14 Jul 2006; Caleb Tennis <caleb@gentoo.org>
- +files/ice-3.1-patches/GCCountMap.h, +files/ice-3.1-patches/GCShared.h,
- +files/ice-3.1-patches/ObjectF.h, +ice-3.1.0-r1.ebuild:
- Revbump to include the first patch release
-
-*ice-3.1.0 (13 Jul 2006)
-
- 13 Jul 2006; Caleb Tennis <caleb@gentoo.org>
- +files/ice-3.1.0-makefile.patch, +ice-3.1.0.ebuild:
- new version
-
- 01 May 2006; Chris White <chriswhite@gentoo.org> ice-3.0.1.ebuild:
- Slotted depend for bug #131554. Thanks to Tiziano Muller for reporting.
-
- 25 Jan 2006; Caleb Tennis <caleb@gentoo.org>
- +files/ice-3.0.1-makefile.patch, +ice-3.0.1.ebuild:
- fix makefile patch
-
-*ice-3.0.1 (25 Jan 2006)
-
- 25 Jan 2006; Caleb Tennis <caleb@gentoo.org> +ice-3.0.1.ebuild:
- version bump
-
- 19 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org> ice-3.0.0-r1.ebuild:
- Fixed readline->ncurses USE flag move.
-
- 19 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
- files/ice-3.0.0-makefile.patch, ice-3.0.0-r1.ebuild:
- Changed readline USE in ncurses and added debug, moved the
- -I/usr/include/db4.3 in the makefile patch.
-
-*ice-3.0.0-r1 (19 Jan 2006)
-
- 19 Jan 2006; Caleb Tennis <caleb@gentoo.org>
- +files/ice-3.0.0-makefile.patch, +metadata.xml, +ice-3.0.0-r1.ebuild:
- Moved package from dev-libs/cpp and bumped with new rev
-
-*ice-3.0.0 (18 Jan 2006)
-
- 18 Jan 2006; Chris White <chriswhite@gentoo.org>
- +files/ice-3.0.0-makefile.patch, +metadata.xml, +ice-3.0.0.ebuild:
- Initial import into the tree. Masked because of sys-libs/db depend.
-
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/Ice-3.2.0.ebuild,v 1.2 2007/08/13 09:03:55 caleb Exp $
-
-inherit eutils
-
-DESCRIPTION="ICE middleware C++ bindings"
-HOMEPAGE="http://www.zeroc.com/index.html"
-SRC_URI="http://www.zeroc.com/download/Ice/3.2/${P}.tar.gz"
-
-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"
-}
+++ /dev/null
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/Ice-3.2.1.ebuild,v 1.5 2008/12/17 21:58:29 loki_val 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"
-}
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/Ice-3.3.1-r1.ebuild,v 1.2 2010/06/04 13:11:43 spatz 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*[-nocxx]
- =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"
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/Ice-3.3.1.ebuild,v 1.2 2009/11/19 14:32:54 fauli 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*[-nocxx]
- =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"
-}
+++ /dev/null
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX Ice-3.2.0-Makefile.patch 4072 RMD160 40098fa6142aba0f08b72d1ab2f50426d3c0e1ed SHA1 2e63175980d2b1ee420a37a36e9b8c570285967b SHA256 78b8c20f7491749c7ff3806d6130110c4d7145ed3c17699792910b877783e1d1
-AUX Ice-3.2.1-Makefile.patch 4072 RMD160 40098fa6142aba0f08b72d1ab2f50426d3c0e1ed SHA1 2e63175980d2b1ee420a37a36e9b8c570285967b SHA256 78b8c20f7491749c7ff3806d6130110c4d7145ed3c17699792910b877783e1d1
-AUX Ice-3.2.1-gcc43.patch 10027 RMD160 0f0e44eae6eee673628094c7f924e2128f38814c SHA1 31a60a37e50f4d440589e6278f7f29839df5ecf7 SHA256 b86df9b5fa6bc2c15b1479cbec33040fee67551fbf1086e0e697820d18f9b60c
-AUX Ice-3.3.1-Makefile.patch 2494 RMD160 e9872d64c716d21865ca6282293e95325d5a6363 SHA1 5dda2d42446647aa2b6411acb0213b759f6deaea SHA256 1fa17c02f5d32aa719995d283fc08bfe9b97b5cb4b7628e8463813f367aba525
-AUX Ice-3.3.1-openssl.patch 590 RMD160 655eabb89994bf8a9baf02386e415a674a67318b SHA1 a050423f4b6ad3bf46d0037772c0d3aa79b98c86 SHA256 0c010f9ea91d8feefbc101b1a2017930a5db0fd1fa50d5827a61a6d33da077b3
-DIST Ice-3.2.0.tar.gz 2060037 RMD160 b11fc5718f4c86b349bf0ddc15d7cf402720a013 SHA1 e3b91f14f280a2df78ec5bfed2d9c7e97890ea51 SHA256 4698326e39342d2526c8780db996e47d35a09cdc6080be4329980ec5766ce81d
-DIST Ice-3.2.1.tar.gz 2090576 RMD160 c3394486ba13e94c2491b0dc48dc19c3e7565ecd SHA1 69fc7dbdff81d7d9300b57f6e495914f3c9e5c19 SHA256 bd24cfe0296d81e2b04ea8d97b32a4f13fdd949d0f038f4c7e0922b395075149
-DIST Ice-3.3.1.tar.gz 4455154 RMD160 d64d52c35640cebe1145e62f57618473d17cbeb5 SHA1 08d0f32bdb7d909b4a531d45cccfa97bdde649aa SHA256 7b90477303ea2668e8f2cc7bb4506e3a596699e092c4e622746ea42d8286abd0
-EBUILD Ice-3.2.0.ebuild 1597 RMD160 592d5fad927ded4bbef30b6f6a0ad57d2d430357 SHA1 d02550c064d88063f35fe5d54869c60ae9c06393 SHA256 f2e8c96032a6b39095ef67c9fb82b40ee465b584861dfa307d34c45dc1f853f0
-EBUILD Ice-3.2.1.ebuild 1649 RMD160 bbc3e8ff9eed455dffb0b9a0280e56062b289f29 SHA1 551f237707c0f331b306c8341a047365d6fb882c SHA256 246fe46cce54d0e6ed91b2143ffa1a5507b01781fef6411beb9346e81c6fdef7
-EBUILD Ice-3.3.1-r1.ebuild 1579 RMD160 8e919ebc2aaad5b9894a9749fbb6928e15982260 SHA1 0b0c7980a0ac3a79eca2f69fabfc91f54dedcba7 SHA256 b8f833e32297bfee335615d50d6a093839c03cb3d2ea0bbece3fa87d2a53cd0b
-EBUILD Ice-3.3.1.ebuild 1558 RMD160 4f901b790c935c6bda67c93fd9eaedabe8f3cc66 SHA1 c25068ab07a4976b00434b20cf545e610562661a SHA256 ea923ce6a0d97347b63c9bf4b134b2a65840641ce8359fd1706007ee18b05a44
-MISC ChangeLog 6309 RMD160 bfd5112dfddbeb0d9ae7086c29216d9856299d12 SHA1 3c3578cddc63dc210214bc62d87547d66ed60902 SHA256 241132b60f1ce7337554581f099305d3e8a5f7098d49358410504539e43ad5dd
-MISC metadata.xml 339 RMD160 f92a68fdab5aad40e9c173ebd1ed26b5963acf9f SHA1 3dfd85c450884b0fb534b7d54cfb6837dfa5c764 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQEcBAEBCgAGBQJMCPuVAAoJEAWF714uGAc6GK4H/jj+BHaXLtwzioqmu0LDW+kL
-JjxpfRGJR3OZJo1bsw/YO1V3cVDqOkesmj7/MHYXOXSjh6Lp9tA2dvAShooQbh3z
-4xFtuGR8d0SoT28cxK7NRfNgEy//fZnOxcAtHbud/nacXdBaz7U5YQ8BMRPxzTvl
-k5/+clOgb/BJIYC8hqhCMRd1zmt/QwtHsc5CW87b4aUiYTGpOvkJf0Mama5vtCCQ
-tVTzAnh2KLzDKqD+iwDR3JzF9wGHuqbUTAi9gcnopC72e+dAj1h3bsviSyaqxuAy
-Y3/WDVi8QjFxg+z8hXcGvtzmnOgNPXE5OqvFlAVpN8jdwgJPXrrYg4Dq3DW4tqA=
-=DLIO
------END PGP SIGNATURE-----
+++ /dev/null
---- 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))
-
+++ /dev/null
---- 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))
-
+++ /dev/null
-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>
+++ /dev/null
---- 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 ; \
+++ /dev/null
-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";
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>cpp</herd>
- <maintainer>
- <email>cpp@gentoo.org</email>
- </maintainer>
- <longdescription lang="en">
- Ice is a C++ middleware technology with bindings for other languages.
- </longdescription>
-</pkgmetadata>
projects / gentoo.git / commitdiff