From: Christian Ruppert Date: Tue, 13 Apr 2010 14:02:48 +0000 (+0000) Subject: Improve python handling, bug 311789. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c47d5e9c496b083194b4597f44749c2301dd7ecb;p=gentoo.git Improve python handling, bug 311789. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/app-portage/portato/ChangeLog b/app-portage/portato/ChangeLog index c08989651d81..6db7f1f31e58 100644 --- a/app-portage/portato/ChangeLog +++ b/app-portage/portato/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-portage/portato # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/portato/ChangeLog,v 1.24 2010/04/10 14:47:04 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/portato/ChangeLog,v 1.25 2010/04/13 14:02:48 idl0r Exp $ + +*portato-0.13.1-r1 (13 Apr 2010) + + 13 Apr 2010; Christian Ruppert -portato-0.13.1.ebuild, + +portato-0.13.1-r1.ebuild: + Improve python handling, bug 311789. 10 Apr 2010; Christian Ruppert portato-0.13.1.ebuild: Apply patch by René 'Necoro' Neumann to fix diff --git a/app-portage/portato/Manifest b/app-portage/portato/Manifest index bb692a4bf059..55309f056307 100644 --- a/app-portage/portato/Manifest +++ b/app-portage/portato/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST portato-0.13.1.tar.gz 176583 RMD160 4871a7e9ad78f39509b1476e4960b92d18eec288 SHA1 5fb8668ffc77cf5eebdad2b05c678a18589991ce SHA256 401606a4c6dc8431606c295c86abc89cca36f05eac92f1dcc3035cca6c4b6d9c -EBUILD portato-0.13.1.ebuild 2690 RMD160 ed900ace50702a1e52fa8744b4ffa2a00446d7ff SHA1 7e5b0eabe54e892e2061e7737c40dd6c47aea16c SHA256 21f3ce13e2f0282da2585c5aabc42dfbc06a18c33947450df5f0a65ce2c3f553 -MISC ChangeLog 5170 RMD160 1d5a81fe28c33c4ed04e9f9ceb46b7be82a3e9a6 SHA1 1b7ac65a9df9e2b307ebd60a492ba337f10fced2 SHA256 1c045fc96723c42a8e8450f1ebe7cbab7699297fb3e8e42d2b9779d1c8abc7c6 +EBUILD portato-0.13.1-r1.ebuild 2775 RMD160 72e17447aa38b22cbbd27b320135ecac6a7a312f SHA1 9a6fa6ffdb66f35d21235c4dd159b95b83b51c7d SHA256 cc2f0e90c4282ff6e9696c7e4ac76ad4a77500e4cd860a9c75c2ab5df7df7b59 +MISC ChangeLog 5349 RMD160 c299d077bf38fc3ee4625c8fb581b302e900037b SHA1 960a7fa7c765ece9e38dc840e4d7b47de73f6f6b SHA256 588718fb2062242664bfc70efefd1e5cd3e60c4cc06f449d5760dd7958cca5f1 MISC metadata.xml 429 RMD160 ffb9fddcbd8d43ea6a9b7a28fc7a3f7261df94b2 SHA1 5c77c3fde203318107826294f8cf44430a2ee4ff SHA256 99ffbce3acec7cc0be80e27419ea46d0f33b388fda10ac169f554e7ebb741c27 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkvAj3IACgkQixe2jn+ufThxkgCffIGiTAHroubbJnQtrDjRBmRv -1ysAniUZ1vWpP+NOQq3r9/f6UxHpHb7c -=i/KL +iEYEARECAAYFAkvEeZMACgkQixe2jn+ufThAxQCdFiXgYnpoUo1UZjo9qLO4QBcR +1foAn0SzlnHlJaSTZG4uS4cENV3lWdr6 +=mng9 -----END PGP SIGNATURE----- diff --git a/app-portage/portato/portato-0.13.1.ebuild b/app-portage/portato/portato-0.13.1-r1.ebuild similarity index 70% rename from app-portage/portato/portato-0.13.1.ebuild rename to app-portage/portato/portato-0.13.1-r1.ebuild index 17fcb979fdd1..b0f8d9361ae5 100644 --- a/app-portage/portato/portato-0.13.1.ebuild +++ b/app-portage/portato/portato-0.13.1-r1.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/portato/portato-0.13.1.ebuild,v 1.3 2010/04/10 14:47:04 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/portato/portato-0.13.1-r1.ebuild,v 1.1 2010/04/13 14:02:48 idl0r Exp $ EAPI="2" -NEED_PYTHON="2.5" inherit python eutils distutils -DESCRIPTION="A GUI for Portage written in Python." +DESCRIPTION="A GUI for Portage written in Python" HOMEPAGE="http://necoro.eu/portato" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -18,24 +17,29 @@ IUSE="kde +libnotify nls userpriv sqlite" LANGS="ca de es_ES pl pt_BR tr" for X in $LANGS; do IUSE="${IUSE} linguas_${X}"; done -RDEPEND="app-portage/portage-utils - x11-libs/vte[python] - >=dev-lang/python-2.5[sqlite?,threads] - dev-python/pygtksourceview:2 - >=dev-python/pygtk-2.14.0 - dev-python/shm - >=sys-apps/portage-2.1.6 +COMMON_DEPEND="|| ( + dev-lang/python:2.7[sqlite?,threads] + dev-lang/python:2.6[sqlite?,threads] + dev-lang/python:2.5[sqlite?,threads] )" - !userpriv? ( - kde? ( kde-base/kdesu ) - !kde? ( || ( x11-misc/ktsuss x11-libs/gksu ) ) ) +RDEPEND="$COMMON_DEPEND + app-portage/portage-utils + x11-libs/vte[python] + dev-python/pygtksourceview:2 + >=dev-python/pygtk-2.14.0 + dev-python/shm + >=sys-apps/portage-2.1.6 - libnotify? ( dev-python/notify-python ) - nls? ( virtual/libintl )" + !userpriv? ( + kde? ( kde-base/kdesu ) + !kde? ( || ( x11-misc/ktsuss x11-libs/gksu ) ) + ) -# only needs gettext as build dependency -# python should be set as DEPEND in the python-eclass -DEPEND="nls? ( sys-devel/gettext )" + libnotify? ( dev-python/notify-python ) + nls? ( virtual/libintl )" + +DEPEND="$COMMON_DEPEND + nls? ( sys-devel/gettext )" CONFIG_DIR="etc/${PN}" DATA_DIR="usr/share/${PN}" @@ -44,6 +48,11 @@ PLUGIN_DIR="${DATA_DIR}/plugins" ICON_DIR="${DATA_DIR}/icons" TEMPLATE_DIR="${DATA_DIR}/templates" +pkg_setup() +{ + python_set_active_version 2 +} + src_configure () { sed -i -e "s;^\(VERSION\s*=\s*\).*;\1\"${PV}\";" \ @@ -74,6 +83,7 @@ src_install () distutils_src_install + python_convert_shebangs 2 portato.py newbin portato.py portato || die dodoc doc/* @@ -108,7 +118,7 @@ pkg_postrm () distutils_pkg_postrm python_mod_cleanup "/${PLUGIN_DIR}" - # try to remove the DATA_DIR, because it may still reside there, as it was tried - # to remove it before plugin stuff was purged + # try to remove the DATA_DIR, as it may still exist + # reason: it was tried to remove it before plugin stuff was purged rmdir "${ROOT}"${DATA_DIR} 2> /dev/null }