python_mod_optimize is ROOT aware. Fixed python_mod_cleanup. Fixed multilib. Quoting.

(Portage version: 2.1.5.2)

5 files changed, 79 insertions, 74 deletions

diff --git a/dev-python/omniorbpy/ChangeLog b/dev-python/omniorbpy/ChangeLog
index c80d774d256c..afe16a02b853 100644
--- a/dev-python/omniorbpy/ChangeLog
+++ b/dev-python/omniorbpy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/omniorbpy
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/ChangeLog,v 1.15 2007/02/02 23:31:52 kloeri Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/ChangeLog,v 1.16 2008/05/29 16:22:55 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org> omniorbpy-2.5.ebuild,
+  omniorbpy-2.6.ebuild, omniorbpy-2.7.ebuild, omniorbpy-3.0.ebuild:
+  python_mod_optimize is ROOT aware. Fixed python_mod_cleanup. Fixed
+  multilib. Quoting.
 
 *omniorbpy-3.0 (02 Feb 2007)
 
diff --git a/dev-python/omniorbpy/omniorbpy-2.5.ebuild b/dev-python/omniorbpy/omniorbpy-2.5.ebuild
index 898c855d7ef9..d47049d5bbf5 100644
--- a/dev-python/omniorbpy/omniorbpy-2.5.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-2.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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-2.5.ebuild,v 1.9 2006/07/16 14:39:48 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.5.ebuild,v 1.10 2008/05/29 16:22:55 hawking Exp $
 
-inherit eutils python
+inherit eutils python multilib
 
 MY_P=${P/omniorb/omniORB}
 S=${WORKDIR}/${MY_P}
@@ -23,13 +23,13 @@ src_unpack() {
 	unpack ${A}
 	sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \
 		-e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \
-		${S}/mk/beforeauto.mk.in
+		"${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
+		"${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() {
@@ -59,7 +59,7 @@ src_install() {
 	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"
+	make DESTDIR="${D}" install || die " install failed"
 
 	dodoc COPYING.LIB README README.Python
 	dohtml doc/omniORBpy
@@ -67,22 +67,22 @@ src_install() {
 	dodoc doc/tex/* # .bib, .tex
 
 	dodir /usr/share/doc/${P}/examples
-	cp -r examples/* ${D}/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
+	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/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/CORBA.py \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/omniorbpy_CORBA.py
 
 }
 
 pkg_postinst() {
 	python_version
-	python_mod_optimize ${ROOT}usr/lib/python${PYVER}/site-packages
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
 }
 
 pkg_postrm() {
-	python_version
-	python_mod_cleanup ${ROOT}usr/lib/python${PYVER}/site-packages
+	python_mod_cleanup
 }
diff --git a/dev-python/omniorbpy/omniorbpy-2.6.ebuild b/dev-python/omniorbpy/omniorbpy-2.6.ebuild
index 1ee75a65063f..f0e8d20d6805 100644
--- a/dev-python/omniorbpy/omniorbpy-2.6.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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-2.6.ebuild,v 1.7 2007/06/26 01:59:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.6.ebuild,v 1.8 2008/05/29 16:22:55 hawking Exp $
 
-inherit eutils python
+inherit eutils python multilib
 
 MY_P=${P/omniorb/omniORB}
 S=${WORKDIR}/${MY_P}
@@ -23,13 +23,13 @@ src_unpack() {
 	unpack ${A}
 	sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \
 		-e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \
-		${S}/mk/beforeauto.mk.in
+		"${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
+		"${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() {
@@ -61,7 +61,7 @@ src_install() {
 	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"
+	make DESTDIR="${D}" install || die " install failed"
 
 	dodoc COPYING.LIB README README.Python
 	dohtml doc/omniORBpy
@@ -69,22 +69,22 @@ src_install() {
 	dodoc doc/tex/* # .bib, .tex
 
 	dodir /usr/share/doc/${P}/examples
-	cp -r examples/* ${D}/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
+	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/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/CORBA.py \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/omniorbpy_CORBA.py
 
 }
 
 pkg_postinst() {
 	python_version
-	python_mod_optimize ${ROOT}usr/lib/python${PYVER}/site-packages
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
 }
 
 pkg_postrm() {
-	python_version
-	python_mod_cleanup ${ROOT}usr/lib/python${PYVER}/site-packages
+	python_mod_cleanup
 }
diff --git a/dev-python/omniorbpy/omniorbpy-2.7.ebuild b/dev-python/omniorbpy/omniorbpy-2.7.ebuild
index 07e4e4ed2cc4..0af020c5841d 100644
--- a/dev-python/omniorbpy/omniorbpy-2.7.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-2.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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-2.7.ebuild,v 1.3 2007/06/26 01:59:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.7.ebuild,v 1.4 2008/05/29 16:22:55 hawking Exp $
 
-inherit eutils python
+inherit eutils python multilib
 
 MY_P=${P/omniorb/omniORB}
 S=${WORKDIR}/${MY_P}
@@ -23,13 +23,13 @@ src_unpack() {
 	unpack ${A}
 	sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \
 		-e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \
-		${S}/mk/beforeauto.mk.in
+		"${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
+		"${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() {
@@ -61,7 +61,7 @@ src_install() {
 	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"
+	make DESTDIR="${D}" install || die " install failed"
 
 	dodoc COPYING.LIB README README.Python
 	dohtml doc/omniORBpy
@@ -69,22 +69,22 @@ src_install() {
 	dodoc doc/tex/* # .bib, .tex
 
 	dodir /usr/share/doc/${P}/examples
-	cp -r examples/* ${D}/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
+	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/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/CORBA.py \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/omniorbpy_CORBA.py
 
 }
 
 pkg_postinst() {
 	python_version
-	python_mod_optimize ${ROOT}usr/lib/python${PYVER}/site-packages
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
 }
 
 pkg_postrm() {
-	python_version
-	python_mod_cleanup ${ROOT}usr/lib/python${PYVER}/site-packages
+	python_mod_cleanup
 }
diff --git a/dev-python/omniorbpy/omniorbpy-3.0.ebuild b/dev-python/omniorbpy/omniorbpy-3.0.ebuild
index 411b6ab798f4..462a2fcd9646 100644
--- a/dev-python/omniorbpy/omniorbpy-3.0.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.2 2007/06/26 01:59:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-3.0.ebuild,v 1.3 2008/05/29 16:22:55 hawking Exp $
 
-inherit eutils python
+inherit eutils python multilib
 
 MY_P=${P/omniorb/omniORB}
 S=${WORKDIR}/${MY_P}
@@ -23,13 +23,13 @@ src_unpack() {
 	unpack ${A}
 	sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \
 		-e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \
-		${S}/mk/beforeauto.mk.in
+		"${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
+		"${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() {
@@ -61,7 +61,7 @@ src_install() {
 	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"
+	make DESTDIR="${D}" install || die " install failed"
 
 	dodoc COPYING.LIB README README.Python
 	dohtml doc/omniORBpy
@@ -69,22 +69,22 @@ src_install() {
 	dodoc doc/tex/* # .bib, .tex
 
 	dodir /usr/share/doc/${P}/examples
-	cp -r examples/* ${D}/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
+	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/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/CORBA.py \
+		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/omniorbpy_CORBA.py
 
 }
 
 pkg_postinst() {
 	python_version
-	python_mod_optimize ${ROOT}usr/lib/python${PYVER}/site-packages
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
 }
 
 pkg_postrm() {
-	python_version
-	python_mod_cleanup ${ROOT}usr/lib/python${PYVER}/site-packages
+	python_mod_cleanup
 }