diff options
author | Pacho Ramos <pacho@gentoo.org> | 2010-12-08 20:52:52 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2010-12-08 20:52:52 +0000 |
commit | 9fac75d5313879b4022233b9e40852a5bcd8bada (patch) | |
tree | e1aa66dab801776f16fedbd1ee15b47ffcc8d626 /x11-misc | |
parent | Needs gnome-panel with bonobo support (with Serkan Kaba permission, bug #3481... (diff) | |
download | historical-9fac75d5313879b4022233b9e40852a5bcd8bada.tar.gz historical-9fac75d5313879b4022233b9e40852a5bcd8bada.tar.bz2 historical-9fac75d5313879b4022233b9e40852a5bcd8bada.zip |
Improve python handling (bug #317003), thanks a lot to Arfrever Frehtes Taifersar Arahesis for this help. Remove old
Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/alacarte/ChangeLog | 7 | ||||
-rw-r--r-- | x11-misc/alacarte/Manifest | 16 | ||||
-rw-r--r-- | x11-misc/alacarte/alacarte-0.12.1.ebuild | 50 | ||||
-rw-r--r-- | x11-misc/alacarte/alacarte-0.13.2.ebuild | 21 |
4 files changed, 33 insertions, 61 deletions
diff --git a/x11-misc/alacarte/ChangeLog b/x11-misc/alacarte/ChangeLog index f0da168c62c5..aa62e3e6dd8f 100644 --- a/x11-misc/alacarte/ChangeLog +++ b/x11-misc/alacarte/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/alacarte # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.101 2010/10/09 10:33:17 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.102 2010/12/08 20:52:52 pacho Exp $ + + 08 Dec 2010; Pacho Ramos <pacho@gentoo.org> -alacarte-0.12.1.ebuild, + alacarte-0.13.2.ebuild: + Improve python handling (bug #317003), thanks a lot to Arfrever Frehtes + Taifersar Arahesis for this help. 09 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> alacarte-0.12.4.ebuild: diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest index 533954af8673..017547b6bb93 100644 --- a/x11-misc/alacarte/Manifest +++ b/x11-misc/alacarte/Manifest @@ -1,9 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX alacarte-0.11.5-python-2.6.patch 448 RMD160 db11ef6e261fa0b72af5eeb02a810834288898fb SHA1 e7c0dfed53e4ef4ce06342dea5c8b675b516a703 SHA256 ea7a0b5962de081766809268ce226bd6b606e15d76110b32157af6f3a0c1affa -DIST alacarte-0.12.1.tar.bz2 181165 RMD160 4fe59d1c6df2cdc8f22d901d9a3ce125bc9dc27d SHA1 7407dcb4cd000e0991b12c53113615771fc385a7 SHA256 1991b715431e792976644cc49c90b44dd010245b6c54312b67e0587bcb741d19 DIST alacarte-0.12.4.tar.bz2 189318 RMD160 e0bbef89f1603c2de2ed60d6de087c3407f06040 SHA1 a44b3c3bba625c570d3ef7f451f912e537fccedb SHA256 f5bccd47d96b22ee73cf537d86bb90cb7b7e0f70ac68253fe512540e5bf64823 DIST alacarte-0.13.2.tar.bz2 193746 RMD160 97924d34e9d460267b6118a01488b635551a8aaa SHA1 6eb6a0f308be0da84ead38fbfae0b247743f6038 SHA256 9fa36e5181b1eea947b184cb0f79d796b25cc5a5f122819a1ac2ff01bc7ee4ed -EBUILD alacarte-0.12.1.ebuild 1143 RMD160 b691d492785cf5b06129f3c5ad75b9902c40532c SHA1 37ec70df6314fdf7501030c406df06f289068190 SHA256 626b09a546708d23dfc5e339e1f5441ca03494b8ad65bb83d66eed5f60747163 EBUILD alacarte-0.12.4.ebuild 1128 RMD160 cacfd28fe8d9ca46e47477b59d4fafcb2bed0a42 SHA1 7ddb3a811d99c5ab67cd93dc1c1b4a8badc0c728 SHA256 aab6741a97942d0395a09d178fe3dc56f7d9ea2310900cebdb4e39a07f452a07 -EBUILD alacarte-0.13.2.ebuild 1129 RMD160 5cadb78e1a1d40a13c0de6406497e2a130581371 SHA1 0c9d21718792f532260928d39b887f0f37e80766 SHA256 046a9f0902c67b82d29dea5d41a77d76734b6b2cecb01eeacfb553b2baeefb92 -MISC ChangeLog 12519 RMD160 b204e1bb2174d242730521aba9b2363d61ea37b4 SHA1 807ceab6f644ba0a47c025700374c1208cd51ebf SHA256 f425c6ff9d9ede66e0d99e1d8d42df9c644820ee3b2b1f5eea726513d5370def +EBUILD alacarte-0.13.2.ebuild 1194 RMD160 9db0e173af4a3aa1335d31c9b837b2e8f34c1696 SHA1 7cf1d64e72dcb5ac30740b2e953c5481e0ab2b6e SHA256 51e79e96c97ba62e1688b28dd20fbac2f44fa623665fba8a380d6cfd5290045c +MISC ChangeLog 12723 RMD160 9ac7592779b49008dbaf2328d2594100a05c2685 SHA1 31c0db80456d8b8d622d8efc5ae3537b6cc5597c SHA256 6127c04e697135b919886ddeb46532ed8ada06786f3c29fca10b9960accde536 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAkz/8CoACgkQCaWpQKGI+9QIxQCfeDR7iJERE05GsOngSaOwjh9x +CqYAn3nV/pZn+e1px3kyUMyM81FHwHDT +=du2C +-----END PGP SIGNATURE----- diff --git a/x11-misc/alacarte/alacarte-0.12.1.ebuild b/x11-misc/alacarte/alacarte-0.12.1.ebuild deleted file mode 100644 index d504bc90b268..000000000000 --- a/x11-misc/alacarte/alacarte-0.12.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.12.1.ebuild,v 1.9 2010/07/19 23:48:35 jer Exp $ - -EAPI="2" -GCONF_DEBUG="no" - -inherit gnome2 python - -DESCRIPTION="Simple GNOME menu editor" -HOMEPAGE="http://www.realistanew.com/projects/alacarte" - -LICENSE="GPL-2" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="" -SLOT=0 - -common_depends=">=dev-lang/python-2.4 - >=dev-python/pygobject-2.15.1 - >=dev-python/pygtk-2.13 - >=gnome-base/gnome-menus-2.22.2[python]" - -RDEPEND="${common_depends} - >=gnome-base/gnome-panel-2.16" - -DEPEND="${common_depends} - sys-devel/gettext - >=dev-util/intltool-0.40.0 - >=dev-util/pkgconfig-0.19" - -DOCS="AUTHORS ChangeLog NEWS README" - -src_prepare() { - gnome2_src_prepare - - # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile -} - -pkg_postinst() { - gnome2_pkg_postinst - python_need_rebuild - python_mod_optimize $(python_get_sitedir)/Alacarte -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/Alacarte -} diff --git a/x11-misc/alacarte/alacarte-0.13.2.ebuild b/x11-misc/alacarte/alacarte-0.13.2.ebuild index 237c418068e9..6184f462b1f1 100644 --- a/x11-misc/alacarte/alacarte-0.13.2.ebuild +++ b/x11-misc/alacarte/alacarte-0.13.2.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.13.2.ebuild,v 1.1 2010/09/16 20:41:29 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.13.2.ebuild,v 1.2 2010/12/08 20:52:52 pacho Exp $ -EAPI="2" +EAPI="3" GCONF_DEBUG="no" +PYTHON_DEPEND="2" inherit gnome2 python @@ -15,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="" SLOT=0 -common_depends=">=dev-lang/python-2.4 +common_depends=" >=dev-python/pygobject-2.15.1 >=dev-python/pygtk-2.13 >=gnome-base/gnome-menus-2.27.92[python]" @@ -28,7 +29,11 @@ DEPEND="${common_depends} >=dev-util/intltool-0.40.0 >=dev-util/pkgconfig-0.19" -DOCS="AUTHORS ChangeLog NEWS README" +pkg_setup() { + DOCS="AUTHORS ChangeLog NEWS README" + python_set_active_version 2 + python_pkg_setup +} src_prepare() { gnome2_src_prepare @@ -38,13 +43,17 @@ src_prepare() { ln -s $(type -P true) py-compile } +src_configure() { + PYTHON="$(PYTHON -a)" gnome2_src_configure +} + pkg_postinst() { gnome2_pkg_postinst python_need_rebuild - python_mod_optimize $(python_get_sitedir)/Alacarte + python_mod_optimize Alacarte } pkg_postrm() { gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/Alacarte + python_mod_cleanup Alacarte } |