| 1 |
caleb 07/09/25 12:50:32 |
| 2 |
|
| 3 |
Modified: IcePy-3.2.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
sed magic for amd64 multilib strict, and clean up MAKE_RULES a little bit, and try to quote all places needed |
| 6 |
(Portage version: 2.1.3.9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 dev-python/IcePy/IcePy-3.2.1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: IcePy-3.2.1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- IcePy-3.2.1.ebuild 16 Sep 2007 20:01:43 -0000 1.2 |
| 22 |
+++ IcePy-3.2.1.ebuild 25 Sep 2007 12:50:31 -0000 1.3 |
| 23 |
@@ -1,8 +1,8 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild,v 1.2 2007/09/16 20:01:43 opfer Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild,v 1.3 2007/09/25 12:50:31 caleb Exp $ |
| 28 |
|
| 29 |
-inherit eutils python |
| 30 |
+inherit eutils python multilib |
| 31 |
|
| 32 |
DESCRIPTION="ICE middleware C++ bindings" |
| 33 |
HOMEPAGE="http://www.zeroc.com/index.html" |
| 34 |
@@ -19,32 +19,34 @@ |
| 35 |
unpack ${A} |
| 36 |
cd "${S}" |
| 37 |
|
| 38 |
+ MAKE_RULES="${S}/config/Make.rules" |
| 39 |
+ |
| 40 |
epatch ${FILESDIR}/icepy-${PV}-makefile.patch |
| 41 |
|
| 42 |
if use amd64; then |
| 43 |
- sed -i -e "s:^#LP64:LP64:g" ${S}/config/Make.rules \ |
| 44 |
- || die "Failed to set lib64 directory" |
| 45 |
+ sed -i -e "s:^#LP64:LP64:g" "${MAKE_RULES}" || die "Failed to set lib64 directory" |
| 46 |
fi |
| 47 |
|
| 48 |
if ! use debug; then |
| 49 |
- sed -i -e "s:#OPTIMIZE:OPTIMIZE:" \ |
| 50 |
- ${S}/config/Make.rules || die "Failed to remove debug" |
| 51 |
+ sed -i -e "s:#OPTIMIZE:OPTIMIZE:" "${MAKE_RULES}" || die "Failed to remove debug" |
| 52 |
fi |
| 53 |
|
| 54 |
sed -i -e \ |
| 55 |
"s:.*CXXFLAGS[^\+]*\=\s:CXXFLAGS = ${CXXFLAGS} :g" \ |
| 56 |
- ${S}/config/Make.rules.Linux || die "CXXFLAGS patching failed!" |
| 57 |
+ "${MAKE_RULES}.Linux" || die "CXXFLAGS patching failed!" |
| 58 |
+ |
| 59 |
+ sed -i -e "s:/lib:/$(get_libdir):g" "${MAKE_RULES}" || die "multilib patch failed" |
| 60 |
} |
| 61 |
|
| 62 |
src_compile() { |
| 63 |
- cd ${S} |
| 64 |
- make || die "Died during make" |
| 65 |
+ cd "${S}" |
| 66 |
+ emake || die "Died during make" |
| 67 |
} |
| 68 |
|
| 69 |
src_install() { |
| 70 |
- make DESTDIR="${D}" install || die "Install Failed!" |
| 71 |
+ emake DESTDIR="${D}" install || die "Install Failed!" |
| 72 |
} |
| 73 |
|
| 74 |
src_test() { |
| 75 |
- ICE_HOME=/usr/share/Ice make test || die "Test failed" |
| 76 |
+ ICE_HOME=/usr/share/Ice emake test || die "Test failed" |
| 77 |
} |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.8 dev-python/IcePy/ChangeLog |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/ChangeLog?rev=1.8&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/ChangeLog?rev=1.8&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/ChangeLog?r1=1.7&r2=1.8 |
| 86 |
|
| 87 |
Index: ChangeLog |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v |
| 90 |
retrieving revision 1.7 |
| 91 |
retrieving revision 1.8 |
| 92 |
diff -u -r1.7 -r1.8 |
| 93 |
--- ChangeLog 16 Sep 2007 20:01:43 -0000 1.7 |
| 94 |
+++ ChangeLog 25 Sep 2007 12:50:31 -0000 1.8 |
| 95 |
@@ -1,6 +1,10 @@ |
| 96 |
# ChangeLog for dev-python/IcePy |
| 97 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v 1.7 2007/09/16 20:01:43 opfer Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v 1.8 2007/09/25 12:50:31 caleb Exp $ |
| 100 |
+ |
| 101 |
+ 25 Sep 2007; Caleb Tennis <caleb@g.o> IcePy-3.2.1.ebuild: |
| 102 |
+ sed magic for amd64 multilib strict, and clean up MAKE_RULES a little bit, |
| 103 |
+ and try to quote all places needed |
| 104 |
|
| 105 |
16 Sep 2007; Christian Faulhammer <opfer@g.o> IcePy-3.2.1.ebuild: |
| 106 |
stable x86, bug 192139 |
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
-- |
| 111 |
gentoo-commits@g.o mailing list |
Archives