Drop use of deprecated python.eclass functions.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

3 files changed, 28 insertions, 22 deletions

diff --git a/app-dicts/opendict/ChangeLog b/app-dicts/opendict/ChangeLog
index 5c14d0b5a7a2..f3b27a593274 100644
--- a/app-dicts/opendict/ChangeLog
+++ b/app-dicts/opendict/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-dicts/opendict
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/ChangeLog,v 1.17 2009/11/23 00:22:01 dirtyepic Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/ChangeLog,v 1.18 2010/03/06 04:26:28 dirtyepic Exp $
+
+  06 Mar 2010; Ryan Hill <dirtyepic@gentoo.org> opendict-0.6.3.ebuild:
+  Drop use of deprecated python.eclass functions.
 
 *opendict-0.6.3 (23 Nov 2009)
 
diff --git a/app-dicts/opendict/Manifest b/app-dicts/opendict/Manifest
index 8073449183c9..c1543876de25 100644
--- a/app-dicts/opendict/Manifest
+++ b/app-dicts/opendict/Manifest
@@ -5,13 +5,13 @@ AUX opendict-0.6.1-desktop.patch 698 RMD160 b8d1e56e702097ac71d4e92d7edcb8c6d47e
 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.3.ebuild 2077 RMD160 4f18d3e644dd44ddef6a5d9adeb075488090b644 SHA1 a5ce7d197b4fe39f9d4c8c703f185b142897bd70 SHA256 59a63b881fff2131c375165f0245c3767f36544d1cc119cbf5b954d92fd674aa
-MISC ChangeLog 2321 RMD160 ae6020c3fb2b77c115d31dcdd84e744e23b31ecf SHA1 81453d84a629cc85f327b171996f670e5bcfeae3 SHA256 d4d0dcefb3064e9b469f6c100173ad5e88f1d2ed26fabbcfab0b85e606ca8996
+EBUILD opendict-0.6.3.ebuild 2105 RMD160 6be029d9080bf26b81803637b62f21cd3db9bf40 SHA1 4aa91559f43fb2257af8f614c4aae84f24eaa9e0 SHA256 663a466a6c1458383d0ecb5a78a7ea1b59e3f3d6229e46d9fa25900c2f195d63
+MISC ChangeLog 2443 RMD160 a434e19388c5e0a11ff5307d1555bd6879c96f94 SHA1 d857286d61695ada310a7e1d3740d3f8aca5089b SHA256 044d3c34608175f5e779d86c24f359eec62dcbcc0bf125620d8a6c5955458081
 MISC metadata.xml 162 RMD160 c039a69ee8efb8cbbbf4b67df25a6e8506ae2610 SHA1 ef137d109c76b893201870840b179f4c42c0f3ff SHA256 fab42f6a31209847529447a2bea2b9dd746521fe5d59d967470736120712f093
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAksJ1gkACgkQiqiDRvmkBmKUqwCgoDSPHZcgYSjH6d/sQ5klXcU6
-zMQAnixR9hyI9H3v66DnNxgaFYdyRMCO
-=OOQF
+iEYEARECAAYFAkuR2hEACgkQiqiDRvmkBmI12wCeN0hWLcGRwc+RogJod/enNyZf
+LCkAnjiGAbazRhp1haahl095hTvdTQ3v
+=9sog
 -----END PGP SIGNATURE-----
diff --git a/app-dicts/opendict/opendict-0.6.3.ebuild b/app-dicts/opendict/opendict-0.6.3.ebuild
index ac8ad7e7ea5c..1f8b338e132e 100644
--- a/app-dicts/opendict/opendict-0.6.3.ebuild
+++ b/app-dicts/opendict/opendict-0.6.3.ebuild
@@ -1,10 +1,10 @@
-# 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/app-dicts/opendict/opendict-0.6.3.ebuild,v 1.1 2009/11/23 00:22:01 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/opendict-0.6.3.ebuild,v 1.2 2010/03/06 04:26:28 dirtyepic Exp $
 
 EAPI=2
 
-inherit eutils python gnome2
+inherit eutils gnome2 python
 
 DESCRIPTION="OpenDict is a free cross-platform dictionary program."
 HOMEPAGE="http://opendict.sourceforge.net/"
@@ -14,27 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=virtual/python-2.3
-	dev-python/wxpython:2.8
+RDEPEND="dev-python/wxpython:2.8
 	dev-python/pyxml"
 
+PYTHON_DEPEND="2"
+
 src_prepare() {
-	#epatch "${FILESDIR}/${PN}-0.6.1-desktop.patch"
 	sed -e "s:), '..')):), '../../../../..', 'share', 'opendict')):g" \
 		-i "${S}/lib/info.py"
 }
 
 src_configure() {
-	:
+	# override gnome2_src_configure
+	default
 }
 
 src_compile() {
+	# evil makefile
 	:
 }
 
 src_install() {
-	python_version
-	DHOME="/usr/lib/python${PYVER}/site-packages/opendict"
+	# makefile is broken, do it manually
 
 	dodir /usr/share/${PN}/dictionaries/plugins # global dictionary plugins folder
 
@@ -42,12 +43,12 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins "${S}"/copying.html
 
-	insinto "${DHOME}/lib"
-	doins -r "${S}"/lib/*
-
 	insinto /usr/share/${PN}/pixmaps
 	doins "${S}"/pixmaps/*
 
+	DHOME="$(python_get_sitedir)/opendict"
+	insinto "${DHOME}/lib"
+	doins -r "${S}"/lib/*
 	exeinto "${DHOME}"
 	doexe opendict.py
 
@@ -69,16 +70,18 @@ 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
 
+	echo
 	elog "If you want system-wide plugins, unzip them into"
 	elog "${ROOT}usr/share/${PN}/dictionaries/plugins"
+	elog
 	elog "Some are available from http://opendict.sourceforge.net/?cid=3"
+	echo
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(python_get_sitedir)/opendict
 	gnome2_icon_cache_update
 }