diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2007-09-25 12:50:31 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2007-09-25 12:50:31 +0000 |
| commit | 4a3ea06aaf47ed391110e4e3b5b7ef7d8bc4d3bc (patch) | |
| tree | 614e3889523481912f76c962d1d780fb4a66f52c /dev-python/IcePy | |
| parent | Version bump, bug #190206 (diff) | |
| download | gentoo-2-4a3ea06aaf47ed391110e4e3b5b7ef7d8bc4d3bc.tar.gz gentoo-2-4a3ea06aaf47ed391110e4e3b5b7ef7d8bc4d3bc.tar.bz2 gentoo-2-4a3ea06aaf47ed391110e4e3b5b7ef7d8bc4d3bc.zip | |
sed magic for amd64 multilib strict, and clean up MAKE_RULES a little bit, and try to quote all places needed
(Portage version: 2.1.3.9)
Diffstat (limited to 'dev-python/IcePy')
| -rw-r--r-- | dev-python/IcePy/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/IcePy/IcePy-3.2.1.ebuild | 24 |
2 files changed, 18 insertions, 12 deletions
diff --git a/dev-python/IcePy/ChangeLog b/dev-python/IcePy/ChangeLog index 422ffa5ecb6f..0238f6028fb9 100644 --- a/dev-python/IcePy/ChangeLog +++ b/dev-python/IcePy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/IcePy # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v 1.7 2007/09/16 20:01:43 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v 1.8 2007/09/25 12:50:31 caleb Exp $ + + 25 Sep 2007; Caleb Tennis <caleb@gentoo.org> IcePy-3.2.1.ebuild: + sed magic for amd64 multilib strict, and clean up MAKE_RULES a little bit, + and try to quote all places needed 16 Sep 2007; Christian Faulhammer <opfer@gentoo.org> IcePy-3.2.1.ebuild: stable x86, bug 192139 diff --git a/dev-python/IcePy/IcePy-3.2.1.ebuild b/dev-python/IcePy/IcePy-3.2.1.ebuild index f9d2e0f54e09..e7c02ec44535 100644 --- a/dev-python/IcePy/IcePy-3.2.1.ebuild +++ b/dev-python/IcePy/IcePy-3.2.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild,v 1.2 2007/09/16 20:01:43 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild,v 1.3 2007/09/25 12:50:31 caleb Exp $ -inherit eutils python +inherit eutils python multilib DESCRIPTION="ICE middleware C++ bindings" HOMEPAGE="http://www.zeroc.com/index.html" @@ -19,32 +19,34 @@ src_unpack() { unpack ${A} cd "${S}" + MAKE_RULES="${S}/config/Make.rules" + epatch ${FILESDIR}/icepy-${PV}-makefile.patch if use amd64; then - sed -i -e "s:^#LP64:LP64:g" ${S}/config/Make.rules \ - || die "Failed to set lib64 directory" + sed -i -e "s:^#LP64:LP64:g" "${MAKE_RULES}" || die "Failed to set lib64 directory" fi if ! use debug; then - sed -i -e "s:#OPTIMIZE:OPTIMIZE:" \ - ${S}/config/Make.rules || die "Failed to remove debug" + sed -i -e "s:#OPTIMIZE:OPTIMIZE:" "${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!" + "${MAKE_RULES}.Linux" || die "CXXFLAGS patching failed!" + + sed -i -e "s:/lib:/$(get_libdir):g" "${MAKE_RULES}" || die "multilib patch failed" } src_compile() { - cd ${S} - make || die "Died during make" + cd "${S}" + emake || die "Died during make" } src_install() { - make DESTDIR="${D}" install || die "Install Failed!" + emake DESTDIR="${D}" install || die "Install Failed!" } src_test() { - ICE_HOME=/usr/share/Ice make test || die "Test failed" + ICE_HOME=/usr/share/Ice emake test || die "Test failed" } |