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