From b6c187955eaa3c3ff2a17fec9f2c291cd09c3049 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 10 Aug 2011 21:09:15 +0000 Subject: Version bump. Added patch to let Ice compile against >=sys-libs/db-5.0 (bug #376263) (Portage version: 2.2.0_alpha50/cvs/Linux x86_64) --- dev-libs/Ice/ChangeLog | 11 +- dev-libs/Ice/Ice-3.4.2.ebuild | 261 +++++++++++++++++++++++++++++++++ dev-libs/Ice/files/Ice-3.4.1-db5.patch | 16 ++ 3 files changed, 286 insertions(+), 2 deletions(-) create mode 100644 dev-libs/Ice/Ice-3.4.2.ebuild create mode 100644 dev-libs/Ice/files/Ice-3.4.1-db5.patch (limited to 'dev-libs') diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog index 96fa0746c2b2..28868fdcfe9a 100644 --- a/dev-libs/Ice/ChangeLog +++ b/dev-libs/Ice/ChangeLog @@ -1,6 +1,13 @@ # 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.6 2010/08/01 21:48:23 hwoarang Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.7 2011/08/10 21:09:15 polynomial-c Exp $ + +*Ice-3.4.2 (10 Aug 2011) + + 10 Aug 2011; Lars Wendler + +files/Ice-3.4.1-db5.patch, +Ice-3.4.2.ebuild: + non-maintainer commit: Version bump. Added patch to let Ice compile against + >=sys-libs/db-5.0 (bug #376263). 01 Aug 2010; Markos Chandras Ice-3.4.1.ebuild: Make libmcpp more flexible. Stable on amd64 wrt bug #328609 diff --git a/dev-libs/Ice/Ice-3.4.2.ebuild b/dev-libs/Ice/Ice-3.4.2.ebuild new file mode 100644 index 000000000000..2e3910d4ecf2 --- /dev/null +++ b/dev-libs/Ice/Ice-3.4.2.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.2.ebuild,v 1.1 2011/08/10 21:09:15 polynomial-c Exp $ + +EAPI="2" + +PYTHON_DEPEND="python? 2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" +RUBY_OPTIONAL="yes" +USE_RUBY="ruby18" + +inherit toolchain-funcs versionator python mono ruby-ng db-use + +DESCRIPTION="ICE middleware C++ library and generator tools" +HOMEPAGE="http://www.zeroc.com/" +SRC_URI="http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.tar.gz + doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.pdf.gz )" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="doc examples +ncurses mono python ruby test debug" + +RDEPEND=">=dev-libs/expat-2.0.1 + >=app-arch/bzip2-1.0.5 + >=dev-libs/openssl-0.9.8o + >=sys-libs/db-4.8.30[-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* )" + +# Maintainer notes: +# - yes, we have to do the trickery with the move for the python functions +# since the build and test frameworks deduce various settings from the path +# and they can't be tricked by a symlink. And we also need +# SUPPORT_PYTHON_ABIS=1 otherwise we can't get pyc/pyo anymore the sane way +# with EAPI=2 which is needed since ruby-ng does not support EAPI=3. +# TODO: php bindings +# TODO: java bindings + +pkg_setup() { + if use python || use test; then + python_pkg_setup + fi +} + +src_unpack() { + # prevent ruby-ng.eclass from messing with src_unpack + default +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.4.1-db5.patch + + 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$(db_includedir)" + 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-$(db_findver sys-libs/db)|" \ + cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed" + + if use python ; then + python_copy_sources py + mv py py.orig + fi + + if use ruby ; then + SITERUBY="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitedir"]')" + MAKE_RULES_RB="install_rubydir=\"${D}/${SITERUBY}\" + install_libdir=\"${D}/${SITERUBY}\"" + + # make it use ruby18 only + sed -i \ + -e 's|RUBY = ruby|\018|' \ + rb/config/Make.rules || die "sed failed" + fi + + MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${D}/usr/$(get_libdir)\" GAC_DIR=/usr/$(get_libdir)" + +} + +src_compile() { + if tc-is-cross-compiler ; then + export CXX="${CHOST}-g++" + fi + + emake -C cpp ${MAKE_RULES} || die "emake failed" + + if use doc ; then + emake -C cpp/doc || die "building docs failed" + fi + + if use python ; then + building() { + mv py-${PYTHON_ABI} py + emake -C py ${MAKE_RULES} || die "emake py failed (for py-${PYTHON_ABI})" + mv py py-${PYTHON_ABI} + } + python_execute_function building + fi + + if use ruby ; then + emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} || die "emake rb failed" + fi + + if use mono ; then + emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} || die "emake cs failed" + fi +} + +src_install() { + dodoc CHANGES README + + insinto /usr/share/${P} + doins -r slice + + emake -C cpp ${MAKE_RULES} install || die "emake install failed" + + docinto cpp + dodoc CHANGES README + + if use examples ; then + insinto /usr/share/doc/${PF}/examples-cpp + doins cpp/config/*.cfg + doins -r cpp/demo/* + fi + + if use doc ; then + dohtml -r cpp/doc/reference/* + dodoc "${WORKDIR}/${P}.pdf" + fi + + if use python ; then + installation() { + dodir $(python_get_sitedir) + mv py-${PYTHON_ABI} py + emake -C py ${MAKE_RULES} install_pythondir="\"${D}/$(python_get_sitedir)\"" install_libdir="\"${D}/$(python_get_sitedir)\"" install || die "emake py install failed (for py-${PYTHON_ABI})" + mv py py-${PYTHON_ABI} + } + python_execute_function installation + + docinto py + dodoc py.orig/CHANGES py.orig/README + + if use examples ; then + insinto /usr/share/doc/${PF}/examples-py + doins -r py.orig/demo/* + fi + + cd "${D}/$(python_get_sitedir -f)" + PYTHON_MODULES=(*.py) + PYTHON_MODULES+=(IceBox IceGrid IcePatch2 IceStorm) + cd "${S}" + fi + + if use ruby ; then + dodir "${SITERUBY}" + emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} install || die "emake rb install failed" + + docinto rb + dodoc rb/CHANGES rb/README + + if use examples ; then + insinto /usr/share/doc/${PF}/examples-rb + doins -r rb/demo/* + fi + fi + + if use mono ; then + emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} install || die "emake cs install failed" + + # TODO: anyone has an idea what those are for? + rm "${D}"/usr/bin/*.xml + + docinto cs + dodoc cs/CHANGES cs/README + + if use examples ; then + insinto /usr/share/doc/${PF}/examples-cs + doins -r cs/demo/* + fi + fi +} + +src_test() { + emake -C cpp ${MAKE_RULES} test || die "emake test failed" + + if use python ; then + testing() { + mv py-${PYTHON_ABI} py + emake -C py ${MAKE_RULES} test || die "emake py test failed (for py-${PYTHON_ABI})" + mv py py-${PYTHON_ABI} + } + python_execute_function testing + fi + + if use ruby ; then + emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} test || die "emake rb test failed" + fi + + if use mono ; then +# ewarn "Tests for C# are currently disabled." + emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} test || die "emake cs test failed" + fi +} + +pkg_postinst() { + use python && python_mod_optimize "${PYTHON_MODULES[@]}" +} + +pkg_postrm() { + use python && python_mod_cleanup "${PYTHON_MODULES[@]}" +} diff --git a/dev-libs/Ice/files/Ice-3.4.1-db5.patch b/dev-libs/Ice/files/Ice-3.4.1-db5.patch new file mode 100644 index 000000000000..44183ae997af --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.4.1-db5.patch @@ -0,0 +1,16 @@ +--- ./cpp/src/Freeze/MapI.cpp ++++ ./cpp/src/Freeze/MapI.cpp +@@ -1487,10 +1487,10 @@ Freeze::MapHelperI::size() const + + try + { +-#if DB_VERSION_MAJOR != 4 +-#error Freeze requires DB 4.x ++#if DB_VERSION_MAJOR < 4 ++#error Freeze requires DB 4.x or greater + #endif +-#if DB_VERSION_MINOR < 3 ++#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 3 + _db->stat(&s, 0); + #else + _db->stat(_connection->dbTxn(), &s, 0); \ No newline at end of file -- cgit v1.2.3-65-gdbad