8 files changed, 49 insertions, 80 deletions
diff --git a/dev-python/omniorbpy/ChangeLog b/dev-python/omniorbpy/ChangeLog
index cd0ae52c8168..241128dbaea7 100644
--- a/dev-python/omniorbpy/ChangeLog
+++ b/dev-python/omniorbpy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2004/10/04 21:50:29 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/ChangeLog,v 1.5 2004/11/17 13:23:34 liquidx Exp $
+
+*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)
 
diff --git a/dev-python/omniorbpy/Manifest b/dev-python/omniorbpy/Manifest
index bac8758b026d..c811cd32d83a 100644
--- a/dev-python/omniorbpy/Manifest
+++ b/dev-python/omniorbpy/Manifest
@@ -1,10 +1,8 @@
+MD5 525f3c234d89a44a3d8793dd048cd81a ChangeLog 1758
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 d404e9437c53394a1352d2edea5b1cd0 omniorbpy-2.3.ebuild 2058
 MD5 6e01a95c6f11714345a1657e1ec070ee omniorbpy-2.4.ebuild 2033
-MD5 50ae983cde7540b80514d241467b22ce omniorbpy-2.0.ebuild 2020
-MD5 1278b1bf46b7e364b96a7df0022de07b omniorbpy-2.2.ebuild 2021
-MD5 15c16e4c2ab2b0a151e20b712f02a822 ChangeLog 1487
-MD5 bdd9ab1e64ff3f2636f52d4a6955e124 omniorbpy-2.3.ebuild 2032
-MD5 3b2f7d612501c7be35937d732281147a files/digest-omniorbpy-2.0 65
-MD5 af7d67adb7657fe0cbf30d2f773cac25 files/digest-omniorbpy-2.4 65
-MD5 e5b594489f3bb0ca7f36138194697abe files/digest-omniorbpy-2.2 65
+MD5 2c742bbb06767b92c045ca6ee4b3fa5c omniorbpy-2.5.ebuild 2156
 MD5 83c93e6e67ee905f02269466a4f296fd files/digest-omniorbpy-2.3 65
+MD5 af7d67adb7657fe0cbf30d2f773cac25 files/digest-omniorbpy-2.4 65
+MD5 8fe97fa28de50ac6eb2a16622687c0a2 files/digest-omniorbpy-2.5 143
diff --git a/dev-python/omniorbpy/files/digest-omniorbpy-2.0 b/dev-python/omniorbpy/files/digest-omniorbpy-2.0
deleted file mode 100644
index c22533053db8..000000000000
--- a/dev-python/omniorbpy/files/digest-omniorbpy-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ebe2ac26322feee11a4ab3ddb055992f omniORBpy-2.0.tar.gz 620528
diff --git a/dev-python/omniorbpy/files/digest-omniorbpy-2.2 b/dev-python/omniorbpy/files/digest-omniorbpy-2.2
deleted file mode 100644
index d087e0eafa7e..000000000000
--- a/dev-python/omniorbpy/files/digest-omniorbpy-2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a8645d5dde54f56eb16b38fe3cb53454 omniORBpy-2.2.tar.gz 644327
diff --git a/dev-python/omniorbpy/files/digest-omniorbpy-2.5 b/dev-python/omniorbpy/files/digest-omniorbpy-2.5
new file mode 100644
index 000000000000..2c0558cf1d96
--- /dev/null
+++ b/dev-python/omniorbpy/files/digest-omniorbpy-2.5
@@ -0,0 +1,2 @@
+MD5 10a3e12d2030302d027fdb3da25bce13 omniORBpy-2.5.tar.gz 634706
+MD5 67cc285c80e0cc01ea9966238042dee2 omniORBpy-2.4-newstyleobjs02.patch 28493
diff --git a/dev-python/omniorbpy/omniorbpy-2.2.ebuild b/dev-python/omniorbpy/omniorbpy-2.2.ebuild
deleted file mode 100644
index ab269fe44f18..000000000000
--- a/dev-python/omniorbpy/omniorbpy-2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.2.ebuild,v 1.1 2004/07/17 00:40:43 kloeri Exp $
-
-MY_P=${P/omniorb/omniORB}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="This is omniORBpy 2, a robust high-performance CORBA ORB for Python."
-HOMEPAGE="http://omniorb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="ssl"
-
-DEPEND=">=net-misc/omniORB-4.0.2
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	MY_CONF="--host=${CHOST} --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man --with-omniorb=/usr"
-
-	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
-
-	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
-}
-
-src_install() {
-	# make files are crap!
-	mv mk/beforeauto.mk mk/beforeauto.mk_orig
-	sed s/'prefix[\t ]*:= \/usr'/'prefix := \${DESTDIR}\/usr'/ mk/beforeauto.mk_orig > mk/beforeauto.mk
-	# 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
-	make DESTDIR=${D} install || die
-
-	dodoc COPYING.LIB README README.Python
-	dohtml doc/omniORBpy
-	dodoc doc/omniORBpy.p* # ps,pdf
-	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
-}
-
diff --git a/dev-python/omniorbpy/omniorbpy-2.3.ebuild b/dev-python/omniorbpy/omniorbpy-2.3.ebuild
index c48c5c03cc55..47738e3ce996 100644
--- a/dev-python/omniorbpy/omniorbpy-2.3.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-2.3.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.3.ebuild,v 1.2 2004/07/17 09:50:03 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.3.ebuild,v 1.3 2004/11/17 13:23:34 liquidx Exp $
 
 MY_P=${P/omniorb/omniORB}
 S=${WORKDIR}/${MY_P}
@@ -11,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 ~ppc"
 IUSE="ssl"
 
 DEPEND=">=net-misc/omniORB-4.0.3
@@ -22,7 +22,8 @@ src_compile() {
 
 	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
 
-	MY_PY=/usr/bin/python`python -c "import sys; print sys.version[:3]"`
+	#MY_PY=/usr/bin/python`python -c "import sys; print sys.version[:3]"`
+	MY_PY=/usr/bin/python2.2
 	# install modules for python which is default python interpreter in
 	# the system
 
diff --git a/dev-python/omniorbpy/omniorbpy-2.0.ebuild b/dev-python/omniorbpy/omniorbpy-2.5.ebuild
index 496b07a51e9b..e44b760191ed 100644
--- a/dev-python/omniorbpy/omniorbpy-2.0.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-2.5.ebuild
@@ -1,45 +1,60 @@
 # 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.0.ebuild,v 1.1 2004/07/17 00:40:43 kloeri 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
 
 MY_P=${P/omniorb/omniORB}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="This is omniORBpy 2, a robust high-performance CORBA ORB for Python."
 HOMEPAGE="http://omniorb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.gz http://www-lce.eng.cam.ac.uk/~acnt2/code/omniORBpy-2.4-newstyleobjs02.patch"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="ssl"
 
-DEPEND="=net-misc/omniORB-4.0.0
+DEPEND=">=net-misc/omniORB-4.0.5
 	ssl? ( dev-libs/openssl )"
 
-src_compile() {
-	MY_CONF="--host=${CHOST} --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man --with-omniorb=/usr"
+src_unpack() {
+	unpack ${A}
+	sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \
+		-e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \
+		${S}/mk/beforeauto.mk.in
+	cd ${S}
+	epatch ${DISTDIR}/omniORBpy-2.4-newstyleobjs02.patch
+}
 
+src_compile() {
 	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
 
-	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_version
+	MY_PY=/usr/bin/python$PYVER
 
-	PYTHON=${MY_PY} ./configure ${MY_CONF} || die "./configure failed"
-	emake || die
+	PYTHON=${MY_PY} econf \
+		--with-omniorb=/usr \
+		${MYCONF} || die "./configure failed"
+
+	emake || die " make failed"
 }
 
 src_install() {
 	# make files are crap!
-	mv mk/beforeauto.mk mk/beforeauto.mk_orig
-	sed s/'prefix[\t ]*:= \/usr'/'prefix := \${DESTDIR}\/usr'/ mk/beforeauto.mk_orig > mk/beforeauto.mk
-	# won't work without these really very ugly hack... maybe someone can do better..
+	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..
+
 	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
-	make DESTDIR=${D} install || die
+
+	make DESTDIR=${D} install || die " install failed"
 
 	dodoc COPYING.LIB README README.Python
 	dohtml doc/omniORBpy