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.

3 files changed, 45 insertions, 6 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/Manifest b/dev-python/omniorbpy/Manifest
index 30ceac543f4c..d36e153ee153 100644
--- a/dev-python/omniorbpy/Manifest
+++ b/dev-python/omniorbpy/Manifest
@@ -1,8 +1,18 @@
-MD5 73319fe5689f23d6f18107a96d34dca0 ChangeLog 1759
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 77e28a89fb565caf3a9dd0042674a2aa ChangeLog 2003
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 565271fe1549872a13d79d6235b34b30 omniorbpy-2.5.ebuild 2157
 MD5 37ff3880f19ef44811a6ca93e49dec1a omniorbpy-2.3.ebuild 2060
 MD5 6e01a95c6f11714345a1657e1ec070ee omniorbpy-2.4.ebuild 2033
-MD5 8fe97fa28de50ac6eb2a16622687c0a2 files/digest-omniorbpy-2.5 143
+MD5 9066c2edded438c2eb07b4456533fd64 omniorbpy-2.5.ebuild 2778
 MD5 83c93e6e67ee905f02269466a4f296fd files/digest-omniorbpy-2.3 65
 MD5 af7d67adb7657fe0cbf30d2f773cac25 files/digest-omniorbpy-2.4 65
+MD5 8fe97fa28de50ac6eb2a16622687c0a2 files/digest-omniorbpy-2.5 143
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBo1t3Rkyva5PS18kRAt2pAJ9mrrJBFFpotH5OYrNcfwuumWETKwCfTbh4
+5JiKz6pWmKi+ZvMqiWrMua0=
+=CHuC
+-----END PGP SIGNATURE-----
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