[gentoo-commits] proj/sci:fixing commit in: dev-python/omniorbpy/

["Justin Lecher" <jlec@gentoo.org>]

commit:     ee9883074d40ae698fa977d34ebd00be663a7723
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 10:56:30 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 10:56:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ee988307

dev-python/omniorbpy: Bump to EAPI=5 and distutils-r1.eclass

Package-Manager: portage-2.2.0_alpha179

---
 dev-python/omniorbpy/ChangeLog            |  6 ++-
 dev-python/omniorbpy/metadata.xml         |  2 +-
 dev-python/omniorbpy/omniorbpy-3.4.ebuild | 90 +++++++++----------------------
 3 files changed, 32 insertions(+), 66 deletions(-)

diff --git a/dev-python/omniorbpy/ChangeLog b/dev-python/omniorbpy/ChangeLog
index 945098f..1b9bddb 100644
--- a/dev-python/omniorbpy/ChangeLog
+++ b/dev-python/omniorbpy/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for dev-python/omniorbpy
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Jun 2013; Justin Lecher <jlec@gentoo.org> omniorbpy-3.4.ebuild,
+  metadata.xml:
+  Bump to EAPI=5 and distutils-r1.eclass
+
   24 Jun 2011; Justin Lecher <jlec@gentoo.org> omniorbpy-3.4.ebuild:
   Sort inherit and/or USE
 

diff --git a/dev-python/omniorbpy/metadata.xml b/dev-python/omniorbpy/metadata.xml
index d369d06..897aa2e 100644
--- a/dev-python/omniorbpy/metadata.xml
+++ b/dev-python/omniorbpy/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+  <herd>sci</herd>
 </pkgmetadata>

diff --git a/dev-python/omniorbpy/omniorbpy-3.4.ebuild b/dev-python/omniorbpy/omniorbpy-3.4.ebuild
index d78ffc6..c265e39 100644
--- a/dev-python/omniorbpy/omniorbpy-3.4.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-3.4.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI=5
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils multilib python
+inherit autotools-utils eutils multilib python-r1
 
 MY_P=${P/omniorb/omniORB}
-S=${WORKDIR}/${MY_P}
 
-DESCRIPTION="A robust high-performance CORBA ORB for Python."
+DESCRIPTION="A robust high-performance CORBA ORB for Python"
 HOMEPAGE="http://omniorb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.gz"
 
@@ -21,83 +19,47 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="ssl"
 
-DEPEND=">=net-misc/omniORB-4.1.3
+DEPEND="
+	>=net-misc/omniORB-4.1.3
 	ssl? ( dev-libs/openssl )"
 RDEPEND=${DEPEND}
 
-RESTRICT_PYTHON_ABIS="3.*"
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \
+	sed \
+		-e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \
 		-e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \
-		"${S}"/mk/beforeauto.mk.in
-	sed -i -e 's#^.*compileall[^\\]*#${EPREFIX}/bin/true;#' \
-		"${S}"/python/dir.mk \
+		-e "s/'prefix[\t ]*:= \/usr'/'prefix := \${DESTDIR}\/usr'/" \
+		-i "${S}"/mk/beforeauto.mk.in || die
+	sed \
+		-e 's#^.*compileall[^\\]*#${EPREFIX}/bin/true;#' \
+		-i "${S}"/python/dir.mk \
 		"${S}"/python/omniORB/dir.mk \
 		"${S}"/python/COS/dir.mk \
-		"${S}"/python/CosNaming/dir.mk
-	python_copy_sources
+		"${S}"/python/CosNaming/dir.mk || die
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	configuration() {
-		local myconf
-		use ssl && myconf="${MY_CONF} --with-openssl=${EPREFIX}/usr"
+	local myeconfargs=( --with-omniorb="${EPREFIX}/usr" )
 
-		PYTHON="$(PYTHON)" econf --with-omniorb="${EPREFIX}"/usr ${myconf}
-	}
-	python_execute_function -s configuration
+	use ssl && myconf+=( --with-openssl="${EPREFIX}/usr" )
+
+	python_foreach_impl autotools-utils_src_configure
 }
 
 src_compile() {
-	python_src_compile
+	python_foreach_impl autotools-utils_src_compile
 }
 
 src_install() {
-	installation() {
-		# 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
-
-		emake DESTDIR="${D}" install || die "install failed"
-
-		# bug #166738
-		mv "${ED}"$(python_get_sitedir)/PortableServer.py \
-			"${ED}"$(python_get_sitedir)/omniorbpy_PortableServer.py
+	python_foreach_impl autotools-utils_src_install
 
-		mv "${ED}"$(python_get_sitedir)/CORBA.py \
-			"${ED}"$(python_get_sitedir)/omniorbpy_CORBA.py
-
-		rm "${ED}"$(python_get_sitedir)/omniidl_be/__init__.py*
-
-		# fixed the file collision from bug #247851
-		rm "${ED}"$(python_get_sitedir)/__init__.py
-	}
-	python_execute_function -s installation
-
-	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
+	dohtml -r doc/omniORBpy
+	dodoc doc/omniORBpy.p*
+	dodoc doc/tex/*
 
 	insinto /usr/share/doc/${PF}/
 	doins -r examples || die
-
-}
-
-pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)
-}
-
-pkg_postrm() {
-	python_mod_cleanup
 }