Version bump, bug #214308. Also fix file collision with omniORB - bug #166738.

(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo-r1-perfctr x86_64)

3 files changed, 102 insertions, 2 deletions

diff --git a/dev-python/omniorbpy/ChangeLog b/dev-python/omniorbpy/ChangeLog
index 9d7b72b19977..4ad66918450f 100644
--- a/dev-python/omniorbpy/ChangeLog
+++ b/dev-python/omniorbpy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/omniorbpy
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/ChangeLog,v 1.17 2008/10/27 10:04:39 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/ChangeLog,v 1.18 2008/11/01 22:45:29 caster Exp $
+
+*omniorbpy-3.3 (01 Nov 2008)
+
+  01 Nov 2008; Vlastimil Babka <caster@gentoo.org> omniorbpy-3.0.ebuild,
+  +omniorbpy-3.3.ebuild:
+  Version bump, bug #214308. Also fix file collision with omniORB - bug
+  #166738.
 
   27 Oct 2008; Ali Polatel <hawking@gentoo.org> omniorbpy-2.5.ebuild,
   omniorbpy-2.6.ebuild, omniorbpy-2.7.ebuild, omniorbpy-3.0.ebuild:
diff --git a/dev-python/omniorbpy/omniorbpy-3.0.ebuild b/dev-python/omniorbpy/omniorbpy-3.0.ebuild
index 19c1b23dcac9..83a7b52ecbbb 100644
--- a/dev-python/omniorbpy/omniorbpy-3.0.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-3.0.ebuild,v 1.4 2008/10/27 10:04:39 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-3.0.ebuild,v 1.5 2008/11/01 22:45:29 caster Exp $
 
 inherit eutils python multilib
 
@@ -80,6 +80,7 @@ src_install() {
 	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/CORBA.py \
 		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/omniorbpy_CORBA.py
 
+	rm "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/omniidl_be/__init__.py*
 }
 
 pkg_postinst() {
diff --git a/dev-python/omniorbpy/omniorbpy-3.3.ebuild b/dev-python/omniorbpy/omniorbpy-3.3.ebuild
new file mode 100644
index 000000000000..6977aef4305d
--- /dev/null
+++ b/dev-python/omniorbpy/omniorbpy-3.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-3.3.ebuild,v 1.1 2008/11/01 22:45:29 caster Exp $
+
+inherit eutils python multilib
+
+MY_P=${P/omniorb/omniORB}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="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="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="ssl"
+
+DEPEND=">=net-misc/omniORB-4.1.3
+	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
+}
+
+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}
+
+	emake || die "make failed"
+}
+
+src_install() {
+	python_need_rebuild
+
+	# 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.txt README.Python || die
+	dohtml -r doc/omniORBpy || die
+	dodoc doc/omniORBpy.p* || die # ps,pdf
+	dodoc doc/tex/* || die # .bib, .tex
+
+	dodir /usr/share/doc/${P}/examples
+	cp -r examples/* "${D}"/usr/share/doc/${P}/examples
+
+	# bug #166738
+	python_version
+	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/PortableServer.py \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/omniorbpy_PortableServer.py
+
+	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/CORBA.py \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/omniorbpy_CORBA.py
+
+	rm "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/omniidl_be/__init__.py*
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}