4 files changed, 28 insertions, 93 deletions

diff --git a/dev-python/omniorbpy/ChangeLog b/dev-python/omniorbpy/ChangeLog
index a783a632b54c..a8ec8fc5b4d4 100644
--- a/dev-python/omniorbpy/ChangeLog
+++ b/dev-python/omniorbpy/ChangeLog
@@ -1,56 +1,17 @@
-# ChangeLog for dev-python/omniorbpy
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/ChangeLog,v 1.10 2005/08/07 13:35:02 hansmi Exp $
-
-  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> omniorbpy-2.5.ebuild:
-  Stable on ppc.
-
-  24 Apr 2005; Simon Stelling <blubb@gentoo.org> omniorbpy-2.5.ebuild:
-  stable on amd64
-
-*omniorbpy-2.6 (20 Apr 2005)
-
-  20 Apr 2005; Alastair Tse <liquidx@gentoo.org> omniorbpy-2.3.ebuild,
-  omniorbpy-2.5.ebuild, +omniorbpy-2.6.ebuild:
-  version bump. also fix ssl useflag typo (#82820). fixed hardcoding of python
-  version in 2.3 (#89794)
-
-  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  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)
-
-  16 Nov 2004; Alastair Tse <liquidx@gentoo.org>
-  +files/omniorbpy-2.4-newstyleobj.patch, -omniorbpy-2.0.ebuild,
-  -omniorbpy-2.2.ebuild, omniorbpy-2.3.ebuild, +omniorbpy-2.5.ebuild:
-  add newstyle python class support patch. version bump
-
-*omniorbpy-2.4 (04 Oct 2004)
-
-  04 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> +omniorbpy-2.4.ebuild:
-  Version bump.
-
-  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
-  Fixed ChangeLog header.
-
-  17 Jul 2004; David Holm <dholm@gentoo.org> omniorbpy-2.3.ebuild:
-  Added to ~ppc.
+# 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.1 2004/07/17 00:40:43 kloeri Exp $
 
 *omniorbpy-2.2 (17 Jul 2004)
 
-  17 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
+  17 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +omniorbpy-2.0.ebuild, +omniorbpy-2.2.ebuild, +omniorbpy-2.3.ebuild:
   Rename to omniorbpy.
 
   10 May 2004; Travis Tilley <lv@gentoo.org> omniORBpy-2.3.ebuild:
   added ~amd64 keyword
 
-  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> omniORBpy-2.0.ebuild,
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> omniORBpy-2.0.ebuild,
   omniORBpy-2.2.ebuild, omniORBpy-2.3.ebuild:
   Remove default S.
 
@@ -60,7 +21,7 @@
 
 *omniORBpy-2.3 (15 Dec 2003)
 
-  15 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> omniORBpy-2.3.ebuild:
+  15 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> omniORBpy-2.3.ebuild:
   Version bump.
 
 *omniORBpy-2.2 (03 Oct 2003)
diff --git a/dev-python/omniorbpy/Manifest b/dev-python/omniorbpy/Manifest
index 9bcefcc53a47..d036053a703b 100644
--- a/dev-python/omniorbpy/Manifest
+++ b/dev-python/omniorbpy/Manifest
@@ -1,10 +1,8 @@
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 c1a6c8c4b69ffd89440791152d802fea ChangeLog 2550
-MD5 64781b6a3d18dd9a189d47d224a66e14 omniorbpy-2.3.ebuild 1944
-MD5 b5f2d648cc4992146a66e11e0863a644 omniorbpy-2.5.ebuild 2766
-MD5 6e01a95c6f11714345a1657e1ec070ee omniorbpy-2.4.ebuild 2033
-MD5 9ddb3486aa7623c204d4a5e6cd400629 omniorbpy-2.6.ebuild 2794
-MD5 af7d67adb7657fe0cbf30d2f773cac25 files/digest-omniorbpy-2.4 65
+MD5 b8d2146de791b88b8288d98dfc2a2102 omniorbpy-2.0.ebuild 2023
+MD5 505f41a1393c5c42db89f314d3394109 omniorbpy-2.2.ebuild 2023
+MD5 3b8ba7d0f1da3dfb13373918c62772e8 ChangeLog 1012
+MD5 abe6c5b1dc3d5982769ed7dce55da462 omniorbpy-2.3.ebuild 2030
+MD5 3b2f7d612501c7be35937d732281147a files/digest-omniorbpy-2.0 65
+MD5 e5b594489f3bb0ca7f36138194697abe files/digest-omniorbpy-2.2 65
 MD5 83c93e6e67ee905f02269466a4f296fd files/digest-omniorbpy-2.3 65
-MD5 5a4a58b66c4fa989a62d00605eec2d25 files/digest-omniorbpy-2.6 143
-MD5 8fe97fa28de50ac6eb2a16622687c0a2 files/digest-omniorbpy-2.5 143
diff --git a/dev-python/omniorbpy/omniorbpy-2.3.ebuild b/dev-python/omniorbpy/omniorbpy-2.3.ebuild
index 97746ebae008..d0b2c2f0e643 100644
--- a/dev-python/omniorbpy/omniorbpy-2.3.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-2.3.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.3.ebuild,v 1.5 2005/04/20 22:36:48 mr_bones_ Exp $
-
-inherit python
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.3.ebuild,v 1.1 2004/07/17 00:40:43 kloeri Exp $
 
 MY_P=${P/omniorb/omniORB}
 S=${WORKDIR}/${MY_P}
@@ -13,7 +11,7 @@ SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ~amd64 ~ppc"
+KEYWORDS="~x86 ~amd64"
 IUSE="ssl"
 
 DEPEND=">=net-misc/omniORB-4.0.3
@@ -24,8 +22,10 @@ src_compile() {
 
 	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
 
-	python_version
-	MY_PY=/usr/bin/python${PYVER}
+	MY_PY=/usr/bin/python`python -c "import sys; print sys.version[:3]"`
+	# install modules for python which is default python interpreter in
+	# the system
+
 	PYTHON=${MY_PY} ./configure ${MY_CONF} || die "./configure failed"
 	emake || die
 }
diff --git a/dev-python/omniorbpy/omniorbpy-2.5.ebuild b/dev-python/omniorbpy/omniorbpy-2.5.ebuild
index dcdccfa849c7..e44b760191ed 100644
--- a/dev-python/omniorbpy/omniorbpy-2.5.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.7 2005/08/07 13:35:02 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.5.ebuild,v 1.1 2004/11/17 13:23:34 liquidx Exp $
 
 inherit eutils python
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.gz http://www-lce.eng.cam.ac.u
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="ssl"
 
 DEPEND=">=net-misc/omniORB-4.0.5
@@ -24,26 +24,19 @@ 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
 }
 
 src_compile() {
-	use ssl && MY_CONF="--with-openssl=/usr"
+	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
 
 	python_version
-	MY_PY=/usr/bin/python${PYVER}
+	MY_PY=/usr/bin/python$PYVER
 
 	PYTHON=${MY_PY} econf \
 		--with-omniorb=/usr \
-		${MY_CONF} || die "./configure failed"
+		${MYCONF} || die "./configure failed"
 
 	emake || die " make failed"
 }
@@ -53,12 +46,11 @@ src_install() {
 	sed -i -e "s/'prefix[\t ]*:= \/usr'/'prefix := \${DESTDIR}\/usr'/" \
 		mk/beforeauto.mk
 
-	# won't work without these really very ugly hack...
-	# maybe someone can do better..
+	# won't work without these really very ugly hack... 
+    # maybe someone can do better..
 
 	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
 
@@ -70,22 +62,6 @@ src_install() {
 	dodoc doc/tex/* # .bib, .tex
 
 	dodir /usr/share/doc/${P}/examples
-	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
-
+	cp -r examples/* ${D}/usr/share/doc/${P}/examples # doins doesn't do recursive
 }
 
-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
-}