[patch] Fixed ebuild patch

portato-0.13.1.ebuild.diff (text/plain), 1.81 KB, created by René 'Necoro' Neumann on 2010-04-13 01:29:25 UTC

--- /usr/portage/app-portage/portato/portato-0.13.1.ebuild	2010-04-10 17:05:36.000000000 +0200
+++ portato-0.13.1.ebuild	2010-04-13 03:26:05.000000000 +0200
@@ -4,7 +4,6 @@
 
 EAPI="2"
 
-NEED_PYTHON="2.5"
 inherit python eutils distutils
 
 DESCRIPTION="A GUI for Portage written in Python."
@@ -18,9 +17,14 @@
 LANGS="ca de es_ES pl pt_BR tr"
 for X in $LANGS; do IUSE="${IUSE} linguas_${X}"; done
 
-RDEPEND="app-portage/portage-utils
+COMMON_DEPEND="|| (
+			dev-lang/python:2.7[sqlite?,threads]
+			dev-lang/python:2.6[sqlite?,threads]
+			dev-lang/python:2.5[sqlite?,threads] )"
+
+RDEPEND="$COMMON_DEPEND
+		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
@@ -33,9 +37,8 @@
 		libnotify? ( dev-python/notify-python )
 		nls? ( virtual/libintl )"
 
-# only needs gettext as build dependency
-# python should be set as DEPEND in the python-eclass
-DEPEND="nls? ( sys-devel/gettext )"
+DEPEND="$COMMON_DEPEND
+		nls? ( sys-devel/gettext )"
 
 CONFIG_DIR="etc/${PN}"
 DATA_DIR="usr/share/${PN}"
@@ -44,6 +47,11 @@
 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 +82,7 @@
 
 	distutils_src_install
 
+	python_convert_shebangs 2 portato.py
 	newbin portato.py portato || die
 	dodoc doc/*
 
@@ -108,7 +117,7 @@
 	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
 }