diff options
3 files changed, 78 insertions, 1 deletions
diff --git a/app-admin/python-updater/ChangeLog b/app-admin/python-updater/ChangeLog index b8349b17a1a9..4d576665c052 100644 --- a/app-admin/python-updater/ChangeLog +++ b/app-admin/python-updater/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-admin/python-updater # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/ChangeLog,v 1.75 2012/03/02 22:08:06 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/ChangeLog,v 1.76 2012/03/03 18:05:31 marienz Exp $ + +*python-updater-0.10-r2 (03 Mar 2012) + + 03 Mar 2012; Marien Zwart <marienz@gentoo.org> + +files/python-updater-0.10-only-alias-sed-if-exists.patch, + +python-updater-0.10-r2.ebuild: + Fix regression from bug #370935 on non-prefix portages. Thanks to maksbotan + for reporting. 02 Mar 2012; Brent Baude <ranger@gentoo.org> python-updater-0.10.ebuild: Marking python-updater-0.10 ppc64 for bug 400861 diff --git a/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch b/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch new file mode 100644 index 000000000000..20051f51594d --- /dev/null +++ b/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch @@ -0,0 +1,23 @@ +Only alias sed to /usr/lib/portage/bin/ebuild-helpers/sed if the +latter exists (which should be the case on prefix portages, but not on +normal ones). Fixes fallout from bug #370935 on non-prefix portages. + +--- python-updater ++++ python-updater +@@ -488,8 +488,15 @@ + shift + done + ++# On a prefix portage we need to use sed from ebuild-helpers/ instead ++# of $PATH. On non-prefix portages ebuild-helpers/sed does not exist. ++# Prepending ebuild-helpers/ to $PATH uses too many tools from there. ++# So alias sed to ebuild-helpers/sed if it exists: + if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then +- alias sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed" ++ sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed" ++ if [[ -x "${sed}" ]]; then ++ alias sed="${sed}" ++ fi + fi + + if has_version "=dev-lang/python-2*"; then diff --git a/app-admin/python-updater/python-updater-0.10-r2.ebuild b/app-admin/python-updater/python-updater-0.10-r2.ebuild new file mode 100644 index 000000000000..399327d91b4a --- /dev/null +++ b/app-admin/python-updater/python-updater-0.10-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.10-r2.ebuild,v 1.1 2012/03/03 18:05:31 marienz Exp $ + +inherit eutils + +if [[ "${PV}" == "9999" ]]; then + inherit subversion +fi + +DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions" +HOMEPAGE="http://www.gentoo.org/proj/en/Python/" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" + ESVN_REPO_URI="https://gentoo-progress.googlecode.com/svn/projects/python-updater/trunk" +else + SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.bz2" +fi + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="" + +DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")" +RDEPEND="dev-lang/python + || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-expand-aliases.patch + epatch "${FILESDIR}"/${P}-only-alias-sed-if-exists.patch +} + +src_compile() { + if [[ "${PV}" == "9999" ]]; then + emake ${PN}.1 || die "Generation of man page failed" + fi +} + +src_install() { + dosbin ${PN} || die "dosbin failed" + doman ${PN}.1 || die "doman failed" + dodoc AUTHORS || die "dodoc failed" +} |