version bump. also fix ssl useflag typo (#82820). fixed hardcoding of python version in 2.3 (#89794)

(Portage version: 2.0.51.19)

6 files changed, 123 insertions, 20 deletions

diff --git a/dev-python/omniorbpy/ChangeLog b/dev-python/omniorbpy/ChangeLog
index 3ea85ff29943..a77eadec0f0b 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.7 2004/12/30 22:41:50 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/ChangeLog,v 1.8 2005/04/20 15:31:18 liquidx Exp $
+
+*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
diff --git a/dev-python/omniorbpy/Manifest b/dev-python/omniorbpy/Manifest
index 117ad4c6be3a..3b8fcdbe2189 100644
--- a/dev-python/omniorbpy/Manifest
+++ b/dev-python/omniorbpy/Manifest
@@ -1,8 +1,10 @@
-MD5 6e01a95c6f11714345a1657e1ec070ee omniorbpy-2.4.ebuild 2033
-MD5 37ff3880f19ef44811a6ca93e49dec1a omniorbpy-2.3.ebuild 2060
 MD5 bec3d9fb5748adbaa09c13360e38649d ChangeLog 2112
-MD5 9066c2edded438c2eb07b4456533fd64 omniorbpy-2.5.ebuild 2778
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 8fe97fa28de50ac6eb2a16622687c0a2 files/digest-omniorbpy-2.5 143
-MD5 af7d67adb7657fe0cbf30d2f773cac25 files/digest-omniorbpy-2.4 65
+MD5 91290db30580d6c84b6befe5c2b09f56 omniorbpy-2.3.ebuild 1945
+MD5 6e01a95c6f11714345a1657e1ec070ee omniorbpy-2.4.ebuild 2033
+MD5 9922ee0eb89e0ebec5ec62a5beef630d omniorbpy-2.5.ebuild 2770
+MD5 4fe971cd48e3ed9f6fb70189f272a1af omniorbpy-2.6.ebuild 2794
 MD5 83c93e6e67ee905f02269466a4f296fd files/digest-omniorbpy-2.3 65
+MD5 af7d67adb7657fe0cbf30d2f773cac25 files/digest-omniorbpy-2.4 65
+MD5 8fe97fa28de50ac6eb2a16622687c0a2 files/digest-omniorbpy-2.5 143
+MD5 5a4a58b66c4fa989a62d00605eec2d25 files/digest-omniorbpy-2.6 143
diff --git a/dev-python/omniorbpy/files/digest-omniorbpy-2.6 b/dev-python/omniorbpy/files/digest-omniorbpy-2.6
new file mode 100644
index 000000000000..79332ccc14d6
--- /dev/null
+++ b/dev-python/omniorbpy/files/digest-omniorbpy-2.6
@@ -0,0 +1,2 @@
+MD5 1dda91c3b0c1cc422a2c7096c719295f omniORBpy-2.6.tar.gz 641486
+MD5 67cc285c80e0cc01ea9966238042dee2 omniORBpy-2.4-newstyleobjs02.patch 28493
diff --git a/dev-python/omniorbpy/omniorbpy-2.3.ebuild b/dev-python/omniorbpy/omniorbpy-2.3.ebuild
index 47738e3ce996..dad99133e9ec 100644
--- a/dev-python/omniorbpy/omniorbpy-2.3.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-2.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.3 2004/11/17 13:23:34 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.3.ebuild,v 1.4 2005/04/20 15:31:18 liquidx Exp $
+
+inherit python
 
 MY_P=${P/omniorb/omniORB}
 S=${WORKDIR}/${MY_P}
@@ -22,11 +24,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/python2.2
-	# 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
 }
diff --git a/dev-python/omniorbpy/omniorbpy-2.5.ebuild b/dev-python/omniorbpy/omniorbpy-2.5.ebuild
index 9da5d2ae2cc2..3335287dd1fc 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
+# Copyright 1999-2005 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.3 2004/11/23 15:46:36 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.5.ebuild,v 1.4 2005/04/20 15:31:18 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="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE="ssl"
 
 DEPEND=">=net-misc/omniORB-4.0.5
@@ -36,14 +36,14 @@ src_unpack() {
 }
 
 src_compile() {
-	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
+	use ssl && 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 \
-		${MYCONF} || die "./configure failed"
+		${MY_CONF} || die "./configure failed"
 
 	emake || die " make failed"
 }
diff --git a/dev-python/omniorbpy/omniorbpy-2.6.ebuild b/dev-python/omniorbpy/omniorbpy-2.6.ebuild
new file mode 100644
index 000000000000..88a5b9ff17c1
--- /dev/null
+++ b/dev-python/omniorbpy/omniorbpy-2.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.6.ebuild,v 1.1 2005/04/20 15:31:18 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 http://www-lce.eng.cam.ac.uk/~acnt2/code/omniORBpy-2.4-newstyleobjs02.patch"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="ssl"
+
+DEPEND=">=net-misc/omniORB-4.0.6
+	ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	unpack ${A}
+	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() {
+	MY_CONF=""
+
+	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
+
+	python_version
+	MY_PY=/usr/bin/python${PYVER}
+
+	PYTHON=${MY_PY} econf \
+		--with-omniorb=/usr \
+		${MY_CONF} || die "./configure failed"
+
+	emake || die " make failed"
+}
+
+src_install() {
+	# make files are crap!
+	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 " install failed"
+
+	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
+
+	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