Python ABI fixes

(Portage version: 2.2_rc67/git/Linux x86_64)
 (Signed Manifest commit)

3 files changed, 53 insertions, 52 deletions

diff --git a/dev-python/omniorbpy/ChangeLog b/dev-python/omniorbpy/ChangeLog
index eb6be5264..f1d4e58ab 100644
--- a/dev-python/omniorbpy/ChangeLog
+++ b/dev-python/omniorbpy/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Jun 2010; Justin Lecher <jlec@gentoo.org> omniorbpy-3.4.ebuild:
+  Python ABI fixes
+
   23 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   omniorbpy-3.4.ebuild:
   QA fixes: removed ~ia64 keyword, bad dependencies
diff --git a/dev-python/omniorbpy/Manifest b/dev-python/omniorbpy/Manifest
index 1fb76c647..e88b50ded 100644
--- a/dev-python/omniorbpy/Manifest
+++ b/dev-python/omniorbpy/Manifest
@@ -2,23 +2,13 @@
 Hash: SHA1
 
 DIST omniORBpy-3.4.tar.gz 721891 RMD160 5b389a31907510800ef0913e2e3855038e6a4cf9 SHA1 e598bd25289d0a2a09da4c7241513202c8b9adb4 SHA256 c786676f5d76082bbe6a4031aed1a08b45345d75c0b5aacc4cdc26b69fb9c782
-EBUILD omniorbpy-3.4.ebuild 2794 RMD160 38e61e04232378ee0fbc486f763a32f82202ea3e SHA1 f65bc63eb0ccb771a801ebb02dee22898319363e SHA256 926b8826c0d350befe4ec04dddd6a59da64158d264f3704d30872b0f9c304132
-MISC ChangeLog 466 RMD160 ca963a9239290b6ed89c75b03cc5f870119bee9f SHA1 12449eda0fd45bed53851c8ed7886a8ced3b55e4 SHA256 fc08bd15ac11650f84961492d5daead85e51e88ee427f8a3a2f3e91d44771db0
+EBUILD omniorbpy-3.4.ebuild 2761 RMD160 1eab58c3e0a76d4ddd5940bf911bd1fffcdbb057 SHA1 5bc27e80b8eb35fdfe8ee0eada6451d070bbc7eb SHA256 bbdfb8d67793d468029ce06cd844fec0f43e1b2199365be5f75b04235b5b1b60
+MISC ChangeLog 555 RMD160 a6892f538d24a1d49f91edd4f7b105a671161f3b SHA1 f16cf7b13186bc519258af22e1673aea6a85601a SHA256 cab0702222aed4cebdec2b64c8f89231fb577a7658f30f3b8de0f845042e3e96
 MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMIlfpAAoJENwGBM22xffelXkP/RozjHqeptGQwblfBD0SUtTC
-a8A5uv2CVr1B4Ex2meJzXczwXTEj9rm3K6/un/0JeeYi7luJFqMzyj7t6MncrQX0
-1L3oRSiEU48IT2J+yFE2erAb//Nu1nLWzc1dotc3MW5JH0sF/NI0U4RbffbqIJ1+
-a1v/ckrKnE3LSeK67+3bfPLv9IxJ9b/dirhkyQDqOEqlOYiJ1WxoOqurszScmiT5
-zGEf02QlIzUMVgzHWy3iApBB6Vh085chNCbDFY6iYAN519aGr9RF449pcMAv3E87
-eoYxbLQEYcRG9JRDqXnjr+o+i7it8IUMK9TL+nGR4koE2wtbsZ7w/wXG+xrtxIUQ
-JsBgXGQ3Y2ql34ap0GL2E/SLjRsqqy4HMfmArbnqh9w/EHuQRSG+EUI1w+Q3Pn9N
-7us6xck9EcSvrzv6mCtyAGlynNL+3bauIJQ7RHda3N2mJnGgEv6T+KsBA0BpjhNc
-sM+PHedvNrGr/SPGmO8IPTHBwFk7YyFPoHLNv0EOhlUin26cwi16laTkTuaevzRb
-9y6ba7j5OAs+jQ8U/PIVURciMQiF5f7qj+HqOkDP7tYi8+/QdO+Tn92B/G1TCpbo
-qqQH2p2D74qVxW7unal41ji3pmE94mA+6Fnh58iLXNwrJa39okRVo0aJUBgGtmU+
-XunWzR4CaFCiol3+ZSaE
-=EC19
+iEYEARECAAYFAkwl0M0ACgkQgAnW8HDreRaVBACgrLhleVcJyUsi2Y5PEk6Q3Dyi
+9IAAn04SH3Pu28ZaVA/+xwK5dURJ2NdL
+=TipB
 -----END PGP SIGNATURE-----
diff --git a/dev-python/omniorbpy/omniorbpy-3.4.ebuild b/dev-python/omniorbpy/omniorbpy-3.4.ebuild
index 70709ac8a..f903ffd5a 100644
--- a/dev-python/omniorbpy/omniorbpy-3.4.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-3.4.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
 
 inherit eutils python multilib
 
@@ -22,72 +25,77 @@ DEPEND=">=net-misc/omniORB-4.1.3
 	ssl? ( dev-libs/openssl )"
 RDEPEND=${DEPEND}
 
+RESTRICT_PYTHON_ABIS="3.*"
+
 src_prepare() {
 	sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \
 		-e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \
 		"${S}"/mk/beforeauto.mk.in
-	sed -i -e 's#^.*compileall[^\\]*#/bin/true;#' \
+	sed -i -e 's#^.*compileall[^\\]*#${EPREFIX}/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/CosNaming/dir.mk
+	python_copy_sources
 }
 
 src_configure() {
-	MY_CONF=""
-
-	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
+	configuration() {
+		local myconf
+		use ssl && myconf="${MY_CONF} --with-openssl=${EPREFIX}/usr"
 
-	python_version
-	MY_PY="/usr/bin/python${PYVER}"
+		PYTHON="$(PYTHON)" econf --with-omniorb="${EPREFIX}"/usr ${myconf}
+	}
+	python_execute_function -s configuration
+}
 
-	PYTHON="${MY_PY}" econf --with-omniorb=/usr ${MY_CONF}
+src_compile() {
+	python_src_compile
 }
 
 src_install() {
-	python_need_rebuild
+	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..
 
-	# make files are crap!
-	sed -i -e "s/'prefix[\t ]*:= \/usr'/'prefix := \${DESTDIR}\/usr'/" \
-		mk/beforeauto.mk
+		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
 
-	# won't work without these really very ugly hack...
-	# maybe someone can do better..
+		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
 
-	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
+		emake DESTDIR="${D}" install || die "install failed"
 
-	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
+		# bug #166738
+		mv "${ED}"$(python_get_sitedir)/PortableServer.py \
+			"${ED}"$(python_get_sitedir)/omniorbpy_PortableServer.py
 
-	make DESTDIR="${D}" install || die "install failed"
+		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
 
-	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*
+	insinto /usr/share/doc/${PF}/
+	doins -r examples || die
 
-	# fixed the file collision from bug #247851
-	rm "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/__init__.py
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_optimize $(python_get_sitedir)
 }
 
 pkg_postrm() {