From daaa2fbcd28d21eeed7fca90f86e3159efb34de6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Tue, 8 Jun 2010 08:25:34 +0000 Subject: [PATCH] Moved from dev-cpp to dev-libs. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 RepoMan-Options: --force --- dev-libs/Ice/ChangeLog | 189 ++++++++++++++ dev-libs/Ice/Ice-3.2.0.ebuild | 65 +++++ dev-libs/Ice/Ice-3.2.1.ebuild | 68 +++++ dev-libs/Ice/Ice-3.3.1-r1.ebuild | 67 +++++ dev-libs/Ice/Ice-3.3.1.ebuild | 69 +++++ dev-libs/Ice/Manifest | 14 + dev-libs/Ice/files/Ice-3.2.0-Makefile.patch | 113 ++++++++ dev-libs/Ice/files/Ice-3.2.1-Makefile.patch | 113 ++++++++ dev-libs/Ice/files/Ice-3.2.1-gcc43.patch | 275 ++++++++++++++++++++ dev-libs/Ice/files/Ice-3.3.1-Makefile.patch | 68 +++++ dev-libs/Ice/files/Ice-3.3.1-openssl.patch | 12 + dev-libs/Ice/metadata.xml | 11 + 12 files changed, 1064 insertions(+) create mode 100644 dev-libs/Ice/ChangeLog create mode 100644 dev-libs/Ice/Ice-3.2.0.ebuild create mode 100644 dev-libs/Ice/Ice-3.2.1.ebuild create mode 100644 dev-libs/Ice/Ice-3.3.1-r1.ebuild create mode 100644 dev-libs/Ice/Ice-3.3.1.ebuild create mode 100644 dev-libs/Ice/Manifest create mode 100644 dev-libs/Ice/files/Ice-3.2.0-Makefile.patch create mode 100644 dev-libs/Ice/files/Ice-3.2.1-Makefile.patch create mode 100644 dev-libs/Ice/files/Ice-3.2.1-gcc43.patch create mode 100644 dev-libs/Ice/files/Ice-3.3.1-Makefile.patch create mode 100644 dev-libs/Ice/files/Ice-3.3.1-openssl.patch create mode 100644 dev-libs/Ice/metadata.xml diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog new file mode 100644 index 000000000000..caa993e0ec5e --- /dev/null +++ b/dev-libs/Ice/ChangeLog @@ -0,0 +1,189 @@ +# ChangeLog for dev-libs/Ice +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.1 2010/06/08 08:25:34 dev-zero Exp $ + + 08 Jun 2010; Tiziano Müller +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, +metadata.xml: + Moved from dev-cpp to dev-libs. + + 04 Jun 2010; Dror Levin 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 +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 Ice-3.3.1.ebuild: + stable x86, bug 282359 + + 21 Jun 2009; Caleb Tennis -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 + +files/Ice-3.3.1-Makefile.patch, +Ice-3.3.1.ebuild: + Version bump + + 17 Dec 2008; Peter Alfredsen + +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 for the patch. + +*Ice-3.3.0-r1 (11 Nov 2008) + + 11 Nov 2008; Caleb Tennis +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 Ice-3.3.0.ebuild: + add ~amd64, bug #235186 + +*Ice-3.3.0 (21 May 2008) + + 21 May 2008; Caleb Tennis + +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 + +files/Ice-3.3.0_beta1-Makefile.patch, +Ice-3.3.0_beta1.ebuild: + Version bump, currently masked + + 25 Sep 2007; Christoph Mende Ice-3.2.1.ebuild: + Stable on amd64 wrt bug #192139 + + 25 Sep 2007; Caleb Tennis Ice-3.2.1.ebuild: + Fix quoting + + 16 Sep 2007; Christian Faulhammer Ice-3.2.1.ebuild: + stable x86, bug 192135 + +*Ice-3.2.1 (15 Aug 2007) + + 15 Aug 2007; Caleb Tennis + +files/Ice-3.2.1-Makefile.patch, +Ice-3.2.1.ebuild: + version bump + + 12 Aug 2007; Caleb Tennis Ice-3.2.0.ebuild: + Fix ncurses support from bug #175404 + + 24 Jul 2007; Caleb Tennis + -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 metadata.xml: + cpp-herd taking over + + 14 Jul 2007; Christian Heim 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 + +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 + +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 Ice-3.1.1.ebuild: + Add ~amd64, bug 142045 + +*Ice-3.1.1 (30 Oct 2006) + + 30 Oct 2006; Caleb Tennis + +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 + +files/ice-3.1.1-makefile.patch, +ice-3.1.1.ebuild: + version bump + + 05 Aug 2006; Chris White ice-3.1.0-r6.ebuild: + Fixed sys-libs/db dep atom for bug #142045. + + 03 Aug 2006; Caleb Tennis + +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 + +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 + +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 + +files/ice-3.1.0-makefile.patch, +ice-3.1.0.ebuild: + new version + + 01 May 2006; Chris White ice-3.0.1.ebuild: + Slotted depend for bug #131554. Thanks to Tiziano Muller for reporting. + + 25 Jan 2006; Caleb Tennis + +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 +ice-3.0.1.ebuild: + version bump + + 19 Jan 2006; Alexandre Buisse ice-3.0.0-r1.ebuild: + Fixed readline->ncurses USE flag move. + + 19 Jan 2006; Alexandre Buisse + 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 + +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 + +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. + diff --git a/dev-libs/Ice/Ice-3.2.0.ebuild b/dev-libs/Ice/Ice-3.2.0.ebuild new file mode 100644 index 000000000000..0ee973633ef4 --- /dev/null +++ b/dev-libs/Ice/Ice-3.2.0.ebuild @@ -0,0 +1,65 @@ +# 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 new file mode 100644 index 000000000000..d9337c8ea324 --- /dev/null +++ b/dev-libs/Ice/Ice-3.2.1.ebuild @@ -0,0 +1,68 @@ +# 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 new file mode 100644 index 000000000000..b7d8def7ae5a --- /dev/null +++ b/dev-libs/Ice/Ice-3.3.1-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.3.1-r1.ebuild,v 1.1 2010/06/08 08:25:34 dev-zero 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" +} diff --git a/dev-libs/Ice/Ice-3.3.1.ebuild b/dev-libs/Ice/Ice-3.3.1.ebuild new file mode 100644 index 000000000000..2f8ce84a1d7d --- /dev/null +++ b/dev-libs/Ice/Ice-3.3.1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.3.1.ebuild,v 1.1 2010/06/08 08:25:34 dev-zero 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" +} diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest new file mode 100644 index 000000000000..5ccb154120e7 --- /dev/null +++ b/dev-libs/Ice/Manifest @@ -0,0 +1,14 @@ +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 1601 RMD160 0565fdf7fcbea5fa165e10dd3eabd53c3fe078b8 SHA1 b3175229e32ee81712c75536650cc98eaa9cbeb9 SHA256 268e0043adff185dff04252df8a01415b4a7bb59c1347edd7782de16246efab2 +EBUILD Ice-3.2.1.ebuild 1650 RMD160 c75d19140759039b3d70199030dd438beb8a6ec2 SHA1 cd1813bcde751763fa33098e364b5b3470d8a697 SHA256 a96acbf9ef1778dac2ebf0730cbd31809ad0c2a8da32f1ebcbb9e04bdc45e6ab +EBUILD Ice-3.3.1-r1.ebuild 1583 RMD160 efc68597f4f8d4ac3a8b736709e16d8f46882716 SHA1 fe376e253609e919dc334fbc342f172ee4a9908c SHA256 7505eaa0e8dc36c1a3298a1e57c52f6bf82fbdda514411c6d83a9f5f705f24e4 +EBUILD Ice-3.3.1.ebuild 1562 RMD160 9385ec0615907af14caf37a9a69b78d3e172b8cd SHA1 4a874c1779529adccfa1960c660b586970366bf9 SHA256 091ff845f78d8795e4d0b3980df51efac6c4c8fca94404debbcdfe1a6938c086 +MISC ChangeLog 6664 RMD160 101aa3c4b73a01164616da7a08f3a73a18ab4c88 SHA1 fc7bc1aadb5a609f9c278be9408734792ee5d0bc SHA256 e1dbf9efcdaa6d4f7daefa667c5fb236d8e402191bf97e3f1da06d51d92f7999 +MISC metadata.xml 339 RMD160 f92a68fdab5aad40e9c173ebd1ed26b5963acf9f SHA1 3dfd85c450884b0fb534b7d54cfb6837dfa5c764 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3 diff --git a/dev-libs/Ice/files/Ice-3.2.0-Makefile.patch b/dev-libs/Ice/files/Ice-3.2.0-Makefile.patch new file mode 100644 index 000000000000..d7df955c196c --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.2.0-Makefile.patch @@ -0,0 +1,113 @@ +--- 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 new file mode 100644 index 000000000000..d7df955c196c --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.2.1-Makefile.patch @@ -0,0 +1,113 @@ +--- 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 new file mode 100644 index 000000000000..fc1488b1e2db --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.2.1-gcc43.patch @@ -0,0 +1,275 @@ +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 + #include + #include ++#include + + 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 + #include ++#include + + 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 + #include + #include ++#include + + 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 + #include + #include ++#include + + 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 + #include + #include ++#include + + 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 + #include + #include ++#include + + 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 + #include + #include ++#include + + #ifndef _WIN32 + # include +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 + + #include ++#include + + #if defined(_WIN32) + # include // 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 + #include + #include ++#include + + #ifdef __BCPLUSPLUS__ + # include +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 + #include ++#include + + 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 + #include ++#include + + 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 ++#include + + 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 + #include ++#include + + #ifdef _WIN32 + # include +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 ++#include + + 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 ++#include + + 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 + #include ++#include + + 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 + #include ++#include + + #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 + #include ++#include + + #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 + #include + #include ++#include + #ifdef __BCPLUSPLUS__ + # include + #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 + #include + #include ++#include + #include + #include + +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 + #endif ++#include + + 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 + #include + #include ++#include + + #ifdef __BCPLUSPLUS__ + # include +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 + #include + #include ++#include + + 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 + + #include ++#include + + 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 + + #include ++#include + + #include + #include diff --git a/dev-libs/Ice/files/Ice-3.3.1-Makefile.patch b/dev-libs/Ice/files/Ice-3.3.1-Makefile.patch new file mode 100644 index 000000000000..ceeaab4fd48e --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.3.1-Makefile.patch @@ -0,0 +1,68 @@ +--- 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 new file mode 100644 index 000000000000..28ba3babfccf --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.3.1-openssl.patch @@ -0,0 +1,12 @@ +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"; diff --git a/dev-libs/Ice/metadata.xml b/dev-libs/Ice/metadata.xml new file mode 100644 index 000000000000..8a5655080a27 --- /dev/null +++ b/dev-libs/Ice/metadata.xml @@ -0,0 +1,11 @@ + + + + cpp + + cpp@gentoo.org + + + Ice is a C++ middleware technology with bindings for other languages. + + -- 2.26.2