From db8c0cc458e8ccbfc214f02633d45bed06764072 Mon Sep 17 00:00:00 2001 From: Caleb Tennis Date: Tue, 25 Sep 2007 12:50:31 +0000 Subject: sed magic for amd64 multilib strict, and clean up MAKE_RULES a little bit, and try to quote all places needed Package-Manager: portage-2.1.3.9 --- dev-python/IcePy/ChangeLog | 6 +++++- dev-python/IcePy/IcePy-3.2.1.ebuild | 24 +++++++++++++----------- dev-python/IcePy/Manifest | 26 ++++++++------------------ 3 files changed, 26 insertions(+), 30 deletions(-) (limited to 'dev-python') 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 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 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" } diff --git a/dev-python/IcePy/Manifest b/dev-python/IcePy/Manifest index b713dfcc6368..79c33defd6f3 100644 --- a/dev-python/IcePy/Manifest +++ b/dev-python/IcePy/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX icepy-3.2.0-makefile.patch 3415 RMD160 7d9b91288e683674a2962cd67c2954a3310b08eb SHA1 5065133e20109bd467fc6fc58721465b9cb66529 SHA256 13698cc682fa0e16b6e677fd7145980be108f82b6ef29d87cc7ad222847ad330 MD5 d9118c877307f87b3541ca1d07ff5228 files/icepy-3.2.0-makefile.patch 3415 RMD160 7d9b91288e683674a2962cd67c2954a3310b08eb files/icepy-3.2.0-makefile.patch 3415 @@ -15,14 +12,14 @@ EBUILD IcePy-3.2.0.ebuild 1151 RMD160 fe858d36818f6f4020593bf68410243d3314f2d3 S MD5 60df1e225f24c918cb854dca39e00604 IcePy-3.2.0.ebuild 1151 RMD160 fe858d36818f6f4020593bf68410243d3314f2d3 IcePy-3.2.0.ebuild 1151 SHA256 e1aa3713db97462b86f42e39428fdc97b58dcb7fc2b12266c48d7fbda0b27520 IcePy-3.2.0.ebuild 1151 -EBUILD IcePy-3.2.1.ebuild 1151 RMD160 0d46d0200370c576dd052821647f11c60b9cc5d1 SHA1 64862cb5542d1d8c21e7182a9bdf1275975fc48a SHA256 42a865bf64ff43c8183f13f783d134d13c8348730498b5b65ca25f4d0e44c0f0 -MD5 a0774f86450e3fc9776b6903324bde0f IcePy-3.2.1.ebuild 1151 -RMD160 0d46d0200370c576dd052821647f11c60b9cc5d1 IcePy-3.2.1.ebuild 1151 -SHA256 42a865bf64ff43c8183f13f783d134d13c8348730498b5b65ca25f4d0e44c0f0 IcePy-3.2.1.ebuild 1151 -MISC ChangeLog 1228 RMD160 df0e549619c7febeb244420f25bb6c5b561a9ac3 SHA1 0123b2375d00dac5b062cde49489ded2cde7c222 SHA256 842b33a4c68cb4f4810b31dc486fcfdccaf1164f3ddba4658a3dea2e458ba547 -MD5 5dd3b2b240411a60078d3d2a406ed86f ChangeLog 1228 -RMD160 df0e549619c7febeb244420f25bb6c5b561a9ac3 ChangeLog 1228 -SHA256 842b33a4c68cb4f4810b31dc486fcfdccaf1164f3ddba4658a3dea2e458ba547 ChangeLog 1228 +EBUILD IcePy-3.2.1.ebuild 1259 RMD160 01d75426495fb77a9a7ed2584dc3a77193a9ac7c SHA1 3861d45a1678fc320fb854f7de18115a23b1888e SHA256 e55be57ed2d62831cfd0f0c73092a72db325ea90b4e4e7e89f60aa786e4bd480 +MD5 a87e124fb4e7331c1371b59ae86f84dd IcePy-3.2.1.ebuild 1259 +RMD160 01d75426495fb77a9a7ed2584dc3a77193a9ac7c IcePy-3.2.1.ebuild 1259 +SHA256 e55be57ed2d62831cfd0f0c73092a72db325ea90b4e4e7e89f60aa786e4bd480 IcePy-3.2.1.ebuild 1259 +MISC ChangeLog 1410 RMD160 fdab89c77d868a08ed4e041757e919c059b62f6b SHA1 94d74bbf46a1b38f7e1b0dd2bc1ed1c56ae2909b SHA256 2cfc25ceeaa543d42890259515d9f4b115e55279274c0bcc8aa4bf85e6e0d196 +MD5 804ddbe980093a43507fdfc90162b8e9 ChangeLog 1410 +RMD160 fdab89c77d868a08ed4e041757e919c059b62f6b ChangeLog 1410 +SHA256 2cfc25ceeaa543d42890259515d9f4b115e55279274c0bcc8aa4bf85e6e0d196 ChangeLog 1410 MISC metadata.xml 392 RMD160 ffd09293bbbb76e88cfb4754677479a4d89ce9d4 SHA1 4150acf383b5db8b739e18674c0fa82e9be32091 SHA256 5f3b5405e94149e750f7912de7a4924b4ab4fe5745d12603006684cc1b33cf23 MD5 18c99f8118456d8c3a89e1bd1726e4eb metadata.xml 392 RMD160 ffd09293bbbb76e88cfb4754677479a4d89ce9d4 metadata.xml 392 @@ -33,10 +30,3 @@ SHA256 fb7c095df26b5425fff590ffc027db357ac119555cb3915ced8e5db6248f12cc files/di MD5 f52ee6dbf29973f99044fb572e8ffcf0 files/digest-IcePy-3.2.1 235 RMD160 d7dfbc96466bd7370a107933b3bedce34de47c9a files/digest-IcePy-3.2.1 235 SHA256 10d8880f75b21709d7f86fbd860601f737d9d1704d2dc25d501b0a59e6b68fd4 files/digest-IcePy-3.2.1 235 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.7 (GNU/Linux) - -iD8DBQFG7YutNQqtfCuFneMRAlfKAJ4zIYbaY9hKYz8go+lrjD4b+GDorQCgmuIl -mf3mNsvVkxLTSsjqnswHL1E= -=Egcj ------END PGP SIGNATURE----- -- cgit v1.2.3-65-gdbad