From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QrG1l-0005P5-5I for garchives@archives.gentoo.org; Wed, 10 Aug 2011 21:09:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F00C21C14D; Wed, 10 Aug 2011 21:09:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C6C5221C14D for ; Wed, 10 Aug 2011 21:09:17 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F27F91B4012 for ; Wed, 10 Aug 2011 21:09:16 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2245) id C04012004C; Wed, 10 Aug 2011 21:09:15 +0000 (UTC) From: "Lars Wendler (polynomial-c)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, polynomial-c@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/Ice: ChangeLog Ice-3.4.2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog Ice-3.4.2.ebuild X-VCS-Directories: dev-libs/Ice X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler Content-Type: text/plain; charset=utf8 Message-Id: <20110810210915.C04012004C@flycatcher.gentoo.org> Date: Wed, 10 Aug 2011 21:09:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 5d2a23d95984727e0585cc615628bdae polynomial-c 11/08/10 21:09:15 Modified: ChangeLog Added: Ice-3.4.2.ebuild Log: Version bump. Added patch to let Ice compile against >=3Dsys-libs/db-5.= 0 (bug #376263) =20 (Portage version: 2.2.0_alpha50/cvs/Linux x86_64) Revision Changes Path 1.7 dev-libs/Ice/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Chang= eLog?rev=3D1.7&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Chang= eLog?rev=3D1.7&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Chang= eLog?r1=3D1.6&r2=3D1.7 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ChangeLog 1 Aug 2010 21:48:23 -0000 1.6 +++ ChangeLog 10 Aug 2011 21:09:15 -0000 1.7 @@ -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 ag= ainst + >=3Dsys-libs/db-5.0 (bug #376263). =20 01 Aug 2010; Markos Chandras Ice-3.4.1.ebuild: Make libmcpp more flexible. Stable on amd64 wrt bug #328609 1.1 dev-libs/Ice/Ice-3.4.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3= .4.2.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/Ice/Ice-3= .4.2.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: Ice-3.4.2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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 20= 11/08/10 21:09:15 polynomial-c Exp $ EAPI=3D"2" PYTHON_DEPEND=3D"python? 2" SUPPORT_PYTHON_ABIS=3D"1" RESTRICT_PYTHON_ABIS=3D"3.*" RUBY_OPTIONAL=3D"yes" USE_RUBY=3D"ruby18" inherit toolchain-funcs versionator python mono ruby-ng db-use DESCRIPTION=3D"ICE middleware C++ library and generator tools" HOMEPAGE=3D"http://www.zeroc.com/" SRC_URI=3D"http://www.zeroc.com/download/Ice/$(get_version_component_rang= e 1-2)/${P}.tar.gz doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1= -2)/${P}.pdf.gz )" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~arm ~x86" IUSE=3D"doc examples +ncurses mono python ruby test debug" RDEPEND=3D">=3Ddev-libs/expat-2.0.1 >=3Dapp-arch/bzip2-1.0.5 >=3Ddev-libs/openssl-0.9.8o >=3Dsys-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=3D"${RDEPEND} ncurses? ( sys-libs/ncurses sys-libs/readline ) test? ( =3Ddev-lang/python-2* )" # Maintainer notes: # - yes, we have to do the trickery with the move for the python function= s # 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=3D1 otherwise we can't get pyc/pyo anymore the sa= ne way # with EAPI=3D2 which is needed since ruby-ng does not support EAPI=3D3= . # 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:]]*\):=3D|\1?=3D|' \ -e 's|\(install_configdir[[:space:]]*\):=3D|\1?=3D|' \ cpp/config/Make.rules || die "sed failed" sed -i \ -e 's|\(install_pythondir[[:space:]]*\):=3D|\1?=3D|' \ -e 's|\(install_rubydir[[:space:]]*\):=3D|\1?=3D|' \ -e 's|\(install_libdir[[:space:]]*\):=3D|\1?=3D|' \ {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=3D"prefix=3D\"${D}/usr\" install_docdir=3D\"${D}/usr/share/doc/${PF}\" install_configdir=3D\"${D}/usr/share/Ice-${PV}/config\" embedded_runpath_prefix=3D\"\" LP64=3Dyes" use ncurses && OPTIONS=3D"${MAKE_RULES} USE_READLINE=3Dyes" || MAKE_RULE= S=3D"${MAKE_RULES} USE_READLINE=3Dno" use debug && OPTIONS"${MAKE_RULES} OPTIMIZE=3Dno" || MAKE_RULES=3D"${MAK= E_RULES} OPTIMIZE=3Dyes" MAKE_RULES=3D"${MAKE_RULES} DB_FLAGS=3D-I$(db_includedir)" sed -i \ -e "s|c++|$(tc-getCXX)|" \ -e "s|\(CFLAGS[[:space:]]*=3D\)|\1 ${CFLAGS}|" \ -e "s|\(CXXFLAGS[[:space:]]*=3D\)|\1 ${CXXFLAGS}|" \ -e "s|\(LDFLAGS[[:space:]]*=3D\)|\1 ${LDFLAGS}|" \ -e "s|\(DB_LIBS[[:space:]]*=3D\) \-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=3D"$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitedir"]')" MAKE_RULES_RB=3D"install_rubydir=3D\"${D}/${SITERUBY}\" install_libdir=3D\"${D}/${SITERUBY}\"" # make it use ruby18 only sed -i \ -e 's|RUBY =3D ruby|\018|' \ rb/config/Make.rules || die "sed failed" fi MAKE_RULES_CS=3D"GACINSTALL=3Dyes GAC_ROOT=3D\"${D}/usr/$(get_libdir)\" = GAC_DIR=3D/usr/$(get_libdir)" } src_compile() { if tc-is-cross-compiler ; then export CXX=3D"${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=3D"\"${D}/$(python_get_sit= edir)\"" install_libdir=3D"\"${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=3D(*.py) PYTHON_MODULES+=3D(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 ins= tall 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 ins= tall 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 f= ailed" 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 f= ailed" fi } pkg_postinst() { use python && python_mod_optimize "${PYTHON_MODULES[@]}" } pkg_postrm() { use python && python_mod_cleanup "${PYTHON_MODULES[@]}" }