diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-04-08 01:35:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-04-08 01:35:06 +0000 |
| commit | cd962f396f8674d79ff9e03a991571e3d3b2b8a2 (patch) | |
| tree | a39a46f64f2657bb58f2e0e6105724fdaa8515f5 /app-text | |
| parent | Add a comment on where to find the patches. (diff) | |
| download | historical-cd962f396f8674d79ff9e03a991571e3d3b2b8a2.tar.gz historical-cd962f396f8674d79ff9e03a991571e3d3b2b8a2.tar.bz2 historical-cd962f396f8674d79ff9e03a991571e3d3b2b8a2.zip | |
Bug #362473 - Hardcode python2.7 as active version.
Package-Manager: portage-2.2.0_alpha29_p9/cvs/Linux i686
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/calibre/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/calibre/Manifest | 10 | ||||
| -rw-r--r-- | app-text/calibre/calibre-0.7.52.ebuild | 14 |
3 files changed, 19 insertions, 10 deletions
diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog index 5f789c252f35..415dc3d267bd 100644 --- a/app-text/calibre/ChangeLog +++ b/app-text/calibre/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/calibre # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.139 2011/03/26 18:47:37 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.140 2011/04/08 01:35:06 zmedico Exp $ + + 08 Apr 2011; Zac Medico <zmedico@gentoo.org> calibre-0.7.52.ebuild: + Bug #362473 - Hardcode python2.7 as active version. *calibre-0.7.52 (26 Mar 2011) diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index a983d343ec1c..0bb3e5339dc9 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -4,13 +4,13 @@ Hash: SHA1 DIST calibre-0.7.49.tar.gz 26323031 RMD160 8a69dda2c2c8b09112fe24bb1f868733a8038693 SHA1 03f8007aa52b0411ddcd3a60e37aed65f2512b86 SHA256 dba7025b76b3ad653dff2b79d407987c196ecb733d5545041eda9710eaa04e5f DIST calibre-0.7.52.tar.gz 27439729 RMD160 919313f08c0ae34aacae9d3229cc7455b5bebbfe SHA1 3735027953c031e3e25add123b9af8292748cd77 SHA256 7652beca7c4ed0dadd9490448265efd1b19e723054e3950909ac2f1550c11090 EBUILD calibre-0.7.49.ebuild 6080 RMD160 d23cdaf2e5fb15fe37b0c06a97ca8703565800c9 SHA1 1bd1fea7aeba3253dd35b72032edb2da8a20c609 SHA256 758533558228a27bdf695d67aaa4bf1c08b29f5c10d4ee5f555b5729f71efbfb -EBUILD calibre-0.7.52.ebuild 6080 RMD160 08c867a7c4a0c4f09dd68cdd2e318745724a5256 SHA1 6b38879656042ffc96efc20678beedcdccd36c7c SHA256 62e291cb3409da4fdf0c3bb3a91777bc217e463d9f219167b2bf4dca9aa41fa5 -MISC ChangeLog 22052 RMD160 741034c59c667e5cdd2771f324c7c899ca5c57fb SHA1 0777f41498b046339d46baa33c2b84d25f07b792 SHA256 3b750a47c5729d34d2d35f0d3532c394cbd4bad6f63d5c7354ca54a7c7434c6b +EBUILD calibre-0.7.52.ebuild 6268 RMD160 524d8cd66bb7ff59b2df32e35bc29de1693cc41e SHA1 2d202054518df2525138db2336f1d02b1a409251 SHA256 fffc99710a010aa76f7e38255a60704db729b920b4280674752d1c9d62a94d32 +MISC ChangeLog 22177 RMD160 e956b0c5097b7932315c4ed77def5542e9970006 SHA1 0b4ad88253404534a73fc5a637f815662958ac6f SHA256 13b18e31d3b45d2b6560cfebe793eff6dd523eb7c7b7785114ad6bd0dd4ed9c9 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2ON2AACgkQ/ejvha5XGaNs+gCfTMTUK+aUW1W2hcjnYNxvUspW -Jc8AoOIcCO+v3iTFoJCtiMe6JKJHKJNS -=C6bN +iEYEARECAAYFAk2eZkMACgkQ/ejvha5XGaOTsgCfTrh5J2qzjSPU0yGKb/asbmZE +OkQAoNf9dsATzKYyxNZF74TTuYOXA2TA +=lUEm -----END PGP SIGNATURE----- diff --git a/app-text/calibre/calibre-0.7.52.ebuild b/app-text/calibre/calibre-0.7.52.ebuild index 3f523c895b97..2348a6030630 100644 --- a/app-text/calibre/calibre-0.7.52.ebuild +++ b/app-text/calibre/calibre-0.7.52.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.52.ebuild,v 1.1 2011/03/26 18:47:37 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.52.ebuild,v 1.2 2011/04/08 01:35:06 zmedico Exp $ EAPI=3 PYTHON_DEPEND=2:2.7 @@ -50,7 +50,9 @@ DEPEND="$SHARED_DEPEND S=$WORKDIR/$PN pkg_setup() { - python_set_active_version 2 + [[ -z $(get_libdir) ]] && \ + die "get_libdir returned an empty string" + python_set_active_version 2.7 } src_prepare() { @@ -178,12 +180,16 @@ src_install() { rm -r "${D}"etc/bash_completion.d find "${D}"etc -type d -empty -delete - python_convert_shebangs -r 2 "$D" + python_convert_shebangs -r $(python_get_version) "$D" } pkg_postinst() { fdo-mime_desktop_database_update fdo-mime_mime_database_update - distutils_pkg_postinst + python_mod_optimize "$ROOT"usr/$(get_libdir)/$PN bash-completion_pkg_postinst } + +pkg_postrm() { + python_mod_cleanup "$ROOT"usr/$(get_libdir)/$PN +} |