Backport fixes for deprecation warnings from opendict-0.6.3.

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

diff --git a/app-dicts/opendict/ChangeLog b/app-dicts/opendict/ChangeLog
index 0a09f36eadec9d1d47cbc3a73f506e3cb24c8ee8..9bc9fe7d226b2f3c568d646b5683cb1059bbd009 100644 (file)
--- a/app-dicts/opendict/ChangeLog
+++ b/app-dicts/opendict/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/opendict
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/ChangeLog,v 1.20 2010/03/08 02:22:36 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/ChangeLog,v 1.21 2010/05/31 16:13:33 arfrever Exp $
+
+  31 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  opendict-0.6.1.ebuild:
+  Backport fixes for deprecation warnings from opendict-0.6.3.
 
   08 Mar 2010; Ryan Hill <dirtyepic@gentoo.org> opendict-0.6.3.ebuild:
   More python fixes for bug #308351.

diff --git a/app-dicts/opendict/Manifest b/app-dicts/opendict/Manifest
index 6fb9b6e802eacd753235613b35d8fde1d2bfb386..c2b87aa3b2b09521a7a9d7d1d9a643da7802ff30 100644 (file)
--- a/app-dicts/opendict/Manifest
+++ b/app-dicts/opendict/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX opendict-0.6.1-desktop.patch 698 RMD160 b8d1e56e702097ac71d4e92d7edcb8c6d47e5df1 SHA1 1e1dcea77a25db2b3e05e4c2959718d5bfa02fac SHA256 289ba5286d3bd51d99b01761818f69ff61ff1f413cdd4bf298e72efd784fe4af
 DIST OpenDict-0.6.1.tar.gz 125534 RMD160 cf4a324c0be17e6f811f3ba4b42ec76dcc459dc4 SHA1 6a2f5c2f687973a85e66462cbec5fc0cf44ad2b8 SHA256 4ad993a98ed57ce78604060bff32a39fd0862a28d0d072795c46d50cfc215f1b
 DIST opendict-0.6.3.tar.gz 132515 RMD160 76c18452e09f4990114e7920cfe502aa632873bd SHA1 fca2857fe9a764d7b5b07ebd6eb069494e6b3768 SHA256 dad7723512768aeae65fead0f06a3c973b161a86658b94a66c4945beb12f45dc
-EBUILD opendict-0.6.1.ebuild 2314 RMD160 71976bdaa8a4e275b90fafc1ff1da591be5a7b6a SHA1 c38b8ad5bde06d2fb084934efe82cdf03e3be16b SHA256 89d4e22d1f477442a1e8e6c6d27a349c03d4ac45e767568897069d4495e31fcb
+EBUILD opendict-0.6.1.ebuild 2283 RMD160 70c00b1965af653ea0e549d2ee338850fa66a71a SHA1 d80fb5873219f8967d1f57d9a2e1d5c2b0472e96 SHA256 5d9f6eb8192670a865ddafbf89dad638b612cbb1370e526867265d8b2f7d7352
 EBUILD opendict-0.6.3.ebuild 2187 RMD160 ff98a69edd7f8fe6b08e03d7bf236c6928ee9db5 SHA1 eaac1a5d518afa4d9acb63b8926dbcd046272f0c SHA256 0da56900b424dfe2271f5d68a7e23ad645cbe59bfb5e4593cf5cdb3e777ced6a
-MISC ChangeLog 2698 RMD160 e1b04a803ffe1e8a155841de6a24a474e0bf4f5e SHA1 74b5a2706792980192092326b69dbdec852f925e SHA256 a8642526389807581a42987b5c4f5dee11b35f9190d498586954dd6aa965808e
+MISC ChangeLog 2859 RMD160 bf068faf510db7a7099f91be8ad86d5cd2991987 SHA1 7c80fed3c5eb03ca4e65765d2da7a75577fa110b SHA256 1c19fdbecf570316cac2cc6b6e3a16f1b8324f615577a91ad3edb2e232924fe2
 MISC metadata.xml 162 RMD160 c039a69ee8efb8cbbbf4b67df25a6e8506ae2610 SHA1 ef137d109c76b893201870840b179f4c42c0f3ff SHA256 fab42f6a31209847529447a2bea2b9dd746521fe5d59d967470736120712f093
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkuUYA4ACgkQiqiDRvmkBmIlBwCg5+/sIfBhsSWEzkoIP+qsPyge
-7lYAoIHwsfRPh+g5uCWVeqy8j7e4y2BB
-=7gJC
------END PGP SIGNATURE-----

diff --git a/app-dicts/opendict/opendict-0.6.1.ebuild b/app-dicts/opendict/opendict-0.6.1.ebuild
index 1d5637ea5cffd28445e4c0f81e3518d5e392eb1c..5f9abd552358ada0b7fca78b31911aee5cd663e3 100644 (file)
--- a/app-dicts/opendict/opendict-0.6.1.ebuild
+++ b/app-dicts/opendict/opendict-0.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/opendict-0.6.1.ebuild,v 1.7 2008/05/29 15:33:19 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/opendict-0.6.1.ebuild,v 1.8 2010/05/31 16:13:33 arfrever Exp $
 
 inherit eutils python gnome2
 
@@ -30,9 +30,7 @@ src_compile() {
 }
 
 src_install() {
-       python_version
-       DHOME="/usr/lib/python${PYVER}/site-packages/opendict"
-
+       DHOME="$(python_get_sitedir)/opendict"
        #dodir /usr/share/locale/lt/LC_MESSAGES
 
        dodir /usr/share/${PN}
@@ -71,8 +69,7 @@ src_install() {
 }
 
 pkg_postinst() {
-       python_mod_optimize \
-               /usr/$(get_libdir)/python${PYVER}/site-packages/opendict
+       python_mod_optimize $(python_get_sitedir)/opendict
        gnome2_icon_cache_update
 
        elog "If you want system-wide plugins, unzip them into"
@@ -81,6 +78,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-       python_mod_cleanup
+       python_mod_cleanup $(python_get_sitedir)/opendict
        gnome2_icon_cache_update
 }