summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2004-11-23 15:46:36 +0000
committerAlastair Tse <liquidx@gentoo.org>2004-11-23 15:46:36 +0000
commit8e6b24f71a5745877972b6645ebfec478e32544f (patch)
treedfb20cf467bb620f7f06f8175feac33e9e1ebe18 /dev-python/omniorbpy
parentQA: missing "inherit eutils" (diff)
downloadgentoo-2-8e6b24f71a5745877972b6645ebfec478e32544f.tar.gz
gentoo-2-8e6b24f71a5745877972b6645ebfec478e32544f.tar.bz2
gentoo-2-8e6b24f71a5745877972b6645ebfec478e32544f.zip
changed install paths for CORBA.py and PortableServer.py will not collide with pyorbit. Most (if not all) programs specifiy which CORBA implementation to use anyway.
Diffstat (limited to 'dev-python/omniorbpy')
-rw-r--r--dev-python/omniorbpy/ChangeLog7
-rw-r--r--dev-python/omniorbpy/omniorbpy-2.5.ebuild28
2 files changed, 32 insertions, 3 deletions
diff --git a/dev-python/omniorbpy/ChangeLog b/dev-python/omniorbpy/ChangeLog
index 241128dbaea7..512311043d24 100644
--- a/dev-python/omniorbpy/ChangeLog
+++ b/dev-python/omniorbpy/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-python/omniorbpy
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/ChangeLog,v 1.5 2004/11/17 13:23:34 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/ChangeLog,v 1.6 2004/11/23 15:46:36 liquidx Exp $
+
+ 23 Nov 2004; Alastair Tse <liquidx@gentoo.org> omniorbpy-2.5.ebuild:
+ changed install paths for CORBA.py and PortableServer.py will not collide
+ with pyorbit. Most (if not all) programs specifiy which CORBA implementation
+ to use anyway.
*omniorbpy-2.5 (16 Nov 2004)
diff --git a/dev-python/omniorbpy/omniorbpy-2.5.ebuild b/dev-python/omniorbpy/omniorbpy-2.5.ebuild
index d03b4fdf7b70..9da5d2ae2cc2 100644
--- a/dev-python/omniorbpy/omniorbpy-2.5.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.5.ebuild,v 1.2 2004/11/17 21:21:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.5.ebuild,v 1.3 2004/11/23 15:46:36 liquidx Exp $
inherit eutils python
@@ -24,6 +24,13 @@ src_unpack() {
sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \
-e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \
${S}/mk/beforeauto.mk.in
+ sed -i -e 's#^.*compileall[^\\]*#/bin/true;#' \
+ ${S}/python/dir.mk \
+ ${S}/python/omniORB/dir.mk \
+ ${S}/python/COS/dir.mk \
+ ${S}/python/CosNaming/dir.mk \
+ ${S}/CosNaming__POA/dir.mk
+
cd ${S}
epatch ${DISTDIR}/omniORBpy-2.4-newstyleobjs02.patch
}
@@ -51,6 +58,7 @@ src_install() {
mv python/omniORB/dir.mk python/omniORB/dir.mk_orig
awk -v STR="ir\\\.idl" '{ if (/^[[:space:]]*$/) flag = 0; tmpstr = $0; if (gsub(STR, "", tmpstr)) flag = 1; if (flag) print "#" $0; else print $0; }' python/omniORB/dir.mk_orig > python/omniORB/dir.mk
+
mv python/dir.mk python/dir.mk_orig
awk -v STR="Naming\\\.idl" '{ if (/^[[:space:]]*$/) flag = 0; tmpstr = $0; if (gsub(STR, "", tmpstr)) flag = 1; if (flag) print "#" $0; else print $0; }' python/dir.mk_orig > python/dir.mk
@@ -62,6 +70,22 @@ src_install() {
dodoc doc/tex/* # .bib, .tex
dodir /usr/share/doc/${P}/examples
- cp -r examples/* ${D}/usr/share/doc/${P}/examples # doins doesn't do recursive
+ cp -r examples/* ${D}/usr/share/doc/${P}/examples
+
+ mv ${D}/usr/lib/python${PYVER}/site-packages/PortableServer.py \
+ ${D}/usr/lib/python${PYVER}/site-packages/omniorbpy_PortableServer.py
+
+ mv ${D}/usr/lib/python${PYVER}/site-packages/CORBA.py \
+ ${D}/usr/lib/python${PYVER}/site-packages/omniorbpy_CORBA.py
+
}
+pkg_postinst() {
+ python_version
+ python_mod_optimize ${ROOT}usr/lib/python${PYVER}/site-packages
+}
+
+pkg_postrm() {
+ python_version
+ python_mod_cleanup ${ROOT}usr/lib/python${PYVER}/site-packages
+} \ No newline at end of file