--- omniorbpy-3.0.ebuild.orig	2007-02-13 21:20:09.000000000 +0000
+++ omniorbpy-3.0.ebuild	2007-02-13 21:20:04.000000000 +0000
@@ -68,23 +68,24 @@
 	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
+	dodir /usr/share/doc/${PF}/examples
+	cp -r examples/* ${D}/usr/share/doc/${PF}/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
+	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 ${ROOT}usr/lib/python${PYVER}/site-packages
+	python_mod_optimize ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages
 }
 
 pkg_postrm() {
 	python_version
-	python_mod_cleanup ${ROOT}usr/lib/python${PYVER}/site-packages
+	python_mod_cleanup ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages
 }