Backport fixes for deprecation warnings from omniORB-4.1.4-r1.

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/net-misc/omniORB/ChangeLog b/net-misc/omniORB/ChangeLog
index 9a32e5a809b94f617b6597ca0909b2f25bd06105..3d7a780643c40ef318ba279d4bc6353f154545cb 100644 (file)
--- 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/Manifest b/net-misc/omniORB/Manifest
index 7329cea7d003e72b9b751cfe67140920c663def4..4895f790998aeb70506282f05df0188471b1f0b4 100644 (file)
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -2,6 +2,6 @@ AUX ldflags.patch 452 RMD160 b6ae2124dbb412a61e31cc82048065ccec058258 SHA1 b7b08
 AUX omniNames 677 RMD160 7c75795fa9b4808069060728a0404d6ed1138f78 SHA1 7e5f343aaac339cd84eccb70c17b06b86604d436 SHA256 8ea4e77213e91d62dd5d46eaa883f4e235d0cc6778511c3b5ccd006703ee95ed
 DIST omniORB-4.1.4.tar.gz 3093814 RMD160 b84131230c59b1cef8f714ff1545e44f6779ade1 SHA1 7150d999bcef10c6c3cb24725386497c3f338aa1 SHA256 84fb9790c25d6e46248c9773747e393b429573190da2150850d4a49debda4e8e
 EBUILD omniORB-4.1.4-r1.ebuild 2417 RMD160 e298413933360f35f435250942ec704a637f5d51 SHA1 e5763aa28b4adecdb84171fa2654f083a7877fed SHA256 cab10b702a6bacc9e94484874769d26cffe605473fac86807b78836ce080d765
-EBUILD omniORB-4.1.4.ebuild 2313 RMD160 11c9a2f3c6d2f205733b842b6cf9009edb2b121b SHA1 9ceadf76321a1e58fba8deb3f8f62de9bf3d7211 SHA256 ab08dd66c9647940bcef4a2d569cf88b2867c7b16cbf8089b02527b8f16a5629
-MISC ChangeLog 10125 RMD160 95874f0aaf19df87defbe0e385e00918c2f962e9 SHA1 4588216e341e6fe68d631b5b54ca3dc17c3bd1cf SHA256 48e194107928e235dae3aaee50265d4481fe10262485fd5814dc879d2aa998a1
+EBUILD omniORB-4.1.4.ebuild 2235 RMD160 47f7def47d1471a3f1f9c518c31d09c208d583f5 SHA1 f7eac82b5109e9b211356deed86d6addfaab1fda SHA256 d9fe0d28039d6fccd8ba2036ed71c87e233a0da6a9798b28936a9a9fa8182cab
+MISC ChangeLog 10286 RMD160 7b5f381757bd575558696ad75bd4ce20ebe9963a SHA1 fef701b989ec1a7630178791c0a86ff5e18b69c5 SHA256 9c766abcb39e36d712efa63056ca07395a58f7024b0eb57af44bc1664d18123e
 MISC metadata.xml 225 RMD160 106c8f5ff0028efc2beb2d1d065d08e3de1941e3 SHA1 39b11879fb0385ec1afee3995b2d04ba5489f867 SHA256 f27264dffc823378b544553a8bde8fa711cdbd8f06750cc02a4714705e2c81a0

diff --git a/net-misc/omniORB/omniORB-4.1.4.ebuild b/net-misc/omniORB/omniORB-4.1.4.ebuild
index 9c83202eff8dc6c9179ef4386a1c290ac31db2ee..830050efcf34b22f858ea20e98c2042f8df29b01 100644 (file)
--- 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}
 }