summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-06-19 15:34:04 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-06-19 15:34:04 +0000
commit0c036a543a046e085855d1c44518b104e394e129 (patch)
tree9d6cca7e7d95b704e6e0d4aabb23ae01bc741d8e /net-misc/omniORB
parentDelete call to deprecated python_version(). Simplify src_test(). (diff)
downloadgentoo-2-0c036a543a046e085855d1c44518b104e394e129.tar.gz
gentoo-2-0c036a543a046e085855d1c44518b104e394e129.tar.bz2
gentoo-2-0c036a543a046e085855d1c44518b104e394e129.zip
Backport fixes for deprecation warnings from omniORB-4.1.4-r1.
(Portage version: HEAD/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/omniORB')
-rw-r--r--net-misc/omniORB/ChangeLog6
-rw-r--r--net-misc/omniORB/omniORB-4.1.4.ebuild12
2 files changed, 10 insertions, 8 deletions
diff --git a/net-misc/omniORB/ChangeLog b/net-misc/omniORB/ChangeLog
index 9a32e5a809b9..3d7a780643c4 100644
--- a/net-misc/omniORB/ChangeLog
+++ b/net-misc/omniORB/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/omniORB
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.64 2010/06/09 19:00:56 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.65 2010/06/19 15:34:04 arfrever Exp $
+
+ 19 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ omniORB-4.1.4.ebuild:
+ Backport fixes for deprecation warnings from omniORB-4.1.4-r1.
09 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
omniORB-4.1.4-r1.ebuild:
diff --git a/net-misc/omniORB/omniORB-4.1.4.ebuild b/net-misc/omniORB/omniORB-4.1.4.ebuild
index 9c83202eff8d..830050efcf34 100644
--- a/net-misc/omniORB/omniORB-4.1.4.ebuild
+++ b/net-misc/omniORB/omniORB-4.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4.ebuild,v 1.10 2009/12/15 19:19:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4.ebuild,v 1.11 2010/06/19 15:34:04 arfrever Exp $
EAPI="2"
@@ -34,8 +34,7 @@ src_configure() {
use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
- python_version
- PYTHON=/usr/bin/python${PYVER} ECONF_SOURCE=".." econf ${MY_CONF}
+ PYTHON="$(PYTHON -a)" ECONF_SOURCE=".." econf ${MY_CONF}
}
src_compile() {
@@ -79,10 +78,9 @@ src_install () {
pkg_postinst() {
elog "Since 4.1.2, the omniORB init script has been renamed to omniNames for clarity."
- python_mod_optimize "/usr/$(get_libdir)/python${PYVER}/site-packages/omniidl"
- python_mod_optimize "/usr/$(get_libdir)/python${PYVER}/site-packages/omniidl_be"
+ python_mod_optimize $(python_get_sitedir)/{omniidl,omniidl_be}
}
pkg_postrm() {
- python_mod_cleanup
+ python_mod_cleanup $(python_get_sitedir)/{omniidl,omniidl_be}
}