diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2010-03-08 02:22:36 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2010-03-08 02:22:36 +0000 |
| commit | a0d47d7a2c87c64cf73f38c5a9d22042e037201e (patch) | |
| tree | ea6566749045c24e17b65ec5653844e018bd5ff7 /app-dicts/opendict | |
| parent | stable amd64, bug 306273 (diff) | |
| download | historical-a0d47d7a2c87c64cf73f38c5a9d22042e037201e.tar.gz historical-a0d47d7a2c87c64cf73f38c5a9d22042e037201e.tar.bz2 historical-a0d47d7a2c87c64cf73f38c5a9d22042e037201e.zip | |
More python fixes for bug #308351.
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
Diffstat (limited to 'app-dicts/opendict')
| -rw-r--r-- | app-dicts/opendict/ChangeLog | 5 | ||||
| -rw-r--r-- | app-dicts/opendict/Manifest | 12 | ||||
| -rw-r--r-- | app-dicts/opendict/opendict-0.6.3.ebuild | 10 |
3 files changed, 17 insertions, 10 deletions
diff --git a/app-dicts/opendict/ChangeLog b/app-dicts/opendict/ChangeLog index e9875c92d9fd..0a09f36eadec 100644 --- a/app-dicts/opendict/ChangeLog +++ b/app-dicts/opendict/ChangeLog @@ -1,6 +1,9 @@ # 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.19 2010/03/08 00:47:47 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/ChangeLog,v 1.20 2010/03/08 02:22:36 dirtyepic Exp $ + + 08 Mar 2010; Ryan Hill <dirtyepic@gentoo.org> opendict-0.6.3.ebuild: + More python fixes for bug #308351. 08 Mar 2010; Jonathan Callen <abcd@gentoo.org> opendict-0.6.3.ebuild: Move PYTHON_DEPEND before inherit(), so that the dep is actually added diff --git a/app-dicts/opendict/Manifest b/app-dicts/opendict/Manifest index 670f9c389a2e..6fb9b6e802ea 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 2100 RMD160 5dfd4476de172413f6c942d8127b263d28cbad8c SHA1 96516bcd6d3ce4f139072c2504fad42ec883ec98 SHA256 d45cf23255251f0263c93f8d21f5fc29f646280d3809206fadc17b63c37c78ef -MISC ChangeLog 2584 RMD160 9d49ef9bd75c9d13e42ec0805372158f67f876ea SHA1 756e2111b562323d9431d0804f347453ffba6be6 SHA256 0d11e28c3cf9eab428faa304e9f965ceba1158fbb67501b4d48f678f0444bb9a +EBUILD opendict-0.6.3.ebuild 2187 RMD160 ff98a69edd7f8fe6b08e03d7bf236c6928ee9db5 SHA1 eaac1a5d518afa4d9acb63b8926dbcd046272f0c SHA256 0da56900b424dfe2271f5d68a7e23ad645cbe59bfb5e4593cf5cdb3e777ced6a +MISC ChangeLog 2698 RMD160 e1b04a803ffe1e8a155841de6a24a474e0bf4f5e SHA1 74b5a2706792980192092326b69dbdec852f925e SHA256 a8642526389807581a42987b5c4f5dee11b35f9190d498586954dd6aa965808e MISC metadata.xml 162 RMD160 c039a69ee8efb8cbbbf4b67df25a6e8506ae2610 SHA1 ef137d109c76b893201870840b179f4c42c0f3ff SHA256 fab42f6a31209847529447a2bea2b9dd746521fe5d59d967470736120712f093 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkuUST4ACgkQOypDUo0oQOo6WwCcDsv8wsQ52QurPTYGmBnXxBk3 -IF8AoM7ya14XhtOgr9HmAJoSuRYgyTY6 -=6whe +iEYEARECAAYFAkuUYA4ACgkQiqiDRvmkBmIlBwCg5+/sIfBhsSWEzkoIP+qsPyge +7lYAoIHwsfRPh+g5uCWVeqy8j7e4y2BB +=7gJC -----END PGP SIGNATURE----- diff --git a/app-dicts/opendict/opendict-0.6.3.ebuild b/app-dicts/opendict/opendict-0.6.3.ebuild index 9ca137004d4d..a8dcd069cfe1 100644 --- a/app-dicts/opendict/opendict-0.6.3.ebuild +++ b/app-dicts/opendict/opendict-0.6.3.ebuild @@ -1,10 +1,9 @@ # 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.3 2010/03/08 00:47:47 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-dicts/opendict/opendict-0.6.3.ebuild,v 1.4 2010/03/08 02:22:36 dirtyepic Exp $ EAPI=2 - -PYTHON_DEPEND="2" +PYTHON_DEPEND=2 inherit eutils gnome2 python @@ -19,6 +18,10 @@ IUSE="" RDEPEND="dev-python/wxpython:2.8 dev-python/pyxml" +pkg_setup() { + python_set_active_version 2 +} + src_prepare() { sed -e "s:), '..')):), '../../../../..', 'share', 'opendict')):g" \ -i "${S}/lib/info.py" @@ -50,6 +53,7 @@ src_install() { insinto "${DHOME}/lib" doins -r "${S}"/lib/* exeinto "${DHOME}" + python_convert_shebangs 2 opendict.py doexe opendict.py dosym "${DHOME}/opendict.py" /usr/bin/opendict |