diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-12-11 17:43:13 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-12-11 17:43:13 +0000 |
| commit | 7f2ad1fbc48194becdb4f0166484b41df9f8ca44 (patch) | |
| tree | 511d151f0b8c970f57a59468cb960bad8fc5736f | |
| parent | Remove obsolete versions. (diff) | |
| download | gentoo-2-7f2ad1fbc48194becdb4f0166484b41df9f8ca44.tar.gz gentoo-2-7f2ad1fbc48194becdb4f0166484b41df9f8ca44.tar.bz2 gentoo-2-7f2ad1fbc48194becdb4f0166484b41df9f8ca44.zip | |
Use python_convert_shebangs() instead of manually calling sed.
(Portage version: 15035-svn/cvs/Linux x86_64)
| -rw-r--r-- | sys-apps/portage/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.1.7.13.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.2_rc58.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 090e6fdf7ae6..0be5883179bd 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.657 2009/12/10 06:17:27 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.658 2009/12/11 17:43:13 arfrever Exp $ + + 11 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + portage-2.1.7.13.ebuild, portage-2.2_rc58.ebuild: + Use python_convert_shebangs() instead of manually calling sed. *portage-2.2_rc58 (10 Dec 2009) diff --git a/sys-apps/portage/portage-2.1.7.13.ebuild b/sys-apps/portage/portage-2.1.7.13.ebuild index 929566792ee5..8293beb7fd27 100644 --- a/sys-apps/portage/portage-2.1.7.13.ebuild +++ b/sys-apps/portage/portage-2.1.7.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.13.ebuild,v 1.1 2009/12/10 06:17:27 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.13.ebuild,v 1.2 2009/12/11 17:43:13 arfrever Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -87,7 +87,7 @@ src_prepare() { die "Failed to patch portage.VERSION" if use python3; then - sed -e '1s/\(^#!.*\)python\(.*$\)/\1python3\2/' -i $(find -perm /111 -type f) || die "Conversion of shebangs failed" + python_convert_shebangs -r 3 . fi } diff --git a/sys-apps/portage/portage-2.2_rc58.ebuild b/sys-apps/portage/portage-2.2_rc58.ebuild index 37e01cca7666..5df834ccdb16 100644 --- a/sys-apps/portage/portage-2.2_rc58.ebuild +++ b/sys-apps/portage/portage-2.2_rc58.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc58.ebuild,v 1.1 2009/12/10 06:17:27 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc58.ebuild,v 1.2 2009/12/11 17:43:13 arfrever Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -88,7 +88,7 @@ src_prepare() { die "Failed to patch portage.VERSION" if use python3; then - sed -e '1s/\(^#!.*\)python\(.*$\)/\1python3\2/' -i $(find -perm /111 -type f) || die "Conversion of shebangs failed" + python_convert_shebangs -r 3 . fi } |