Use python_convert_shebangs() instead of manually calling sed.

Package-Manager: portage-15035-svn/cvs/Linux x86_64

4 files changed, 12 insertions, 8 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/Manifest b/sys-apps/portage/Manifest
index 8bb263f1fedd..2e7c743fde9e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -19,12 +19,12 @@ EBUILD portage-2.1.6.13.ebuild 10249 RMD160 5b09a3d3eda1bebec6634d8735697bda8289
 EBUILD portage-2.1.6.7.ebuild 8901 RMD160 5c40ca328a0e24bcc3b04a3c611c09f2f8248c23 SHA1 118de80c813cbd187ba33266b4bac32e43d7e46d SHA256 7478716e9c0d8e2c8deec1f5c6f47ba684b1a7efe3e5f3b9c544f28122fea300
 EBUILD portage-2.1.7.10.ebuild 8490 RMD160 e2bfbcb126955278302028ef45b8941531a727fc SHA1 bd83c5847d9e452a5e1b1ba894a70b7bf19fcb28 SHA256 5a8fe55de76e2ffc0e8e59a06fe437922e152936b3283d8a021d9210871e9d94
 EBUILD portage-2.1.7.11.ebuild 8490 RMD160 47938d7108a39b6aff3eae656ed0f6bf19bb97d4 SHA1 0307bc5e545b4c6bf5e426e4eccab18916d8decf SHA256 a9f519ed2cf4ffffde408a530f844976d61ddb0a5b1289b9909178216e76d1f2
-EBUILD portage-2.1.7.13.ebuild 8671 RMD160 d3b9340db57fc3025bb401e861458e521129a386 SHA1 b060388a84b2e330d58ed266c38ef7e611289db2 SHA256 d26ba15bdc9e7503a62e4ff39dc200ac5a88a54774ba863febe1fbe648acd6f0
+EBUILD portage-2.1.7.13.ebuild 8586 RMD160 eccb8048536da6908be0a5723b5af956fc384040 SHA1 9c1a18ac6e4ecab49eaa6d005c275840635d627a SHA256 923bdcbd94be6d1978095c87f015fe140e1ce779bdd50085daa90063fc85c7a7
 EBUILD portage-2.1.7.9.ebuild 8489 RMD160 f7a83ff60699a4c1db57cd15801328e3207a7e8d SHA1 b5bb65bdcc6f29162f1f797c5f686d3db860f380 SHA256 d5bd4325af9bf5cd5b5296877b430dadc6f409405f4da6c6e06ff8060b93fa7b
 EBUILD portage-2.2_rc33.ebuild 10657 RMD160 cbec6b53aee00d355c8965cb967d557467705dda SHA1 91b4acc0c25014324eb0cb4c8117a8e3a47b1103 SHA256 7ac2424fea034a979caa48bc5c2596cf0a6511271b4f81b8e9c26f2aee80e4b7
 EBUILD portage-2.2_rc54.ebuild 10221 RMD160 64f43af05c05bc19ebcc0b9694bda9acaebb017d SHA1 889aae0c3c92f74cfb272565452835e166d8b270 SHA256 5b29062cbe9884e6b164a03fe274a308fc41560563fbc1862f44368116f3e289
 EBUILD portage-2.2_rc55.ebuild 10221 RMD160 d07416d8f1fbf4e74cd0706aa072f391b673ce1e SHA1 762cb6fdac7cb060df7acd58e4dd1466afffc89d SHA256 2257680c6f0ef62f872cc3a2b9828907d2d2c253dce31f86f2acf025b633e5ad
 EBUILD portage-2.2_rc56.ebuild 10221 RMD160 4739e90234472e5c2d2c645933625524cf8dd218 SHA1 4d8945e300f007e2bbcfc5a991ef4a1fcf9ce058 SHA256 b13ea8434f42e7a4c79e645703964c2200429d460515aa473e44e8b273ec4b62
-EBUILD portage-2.2_rc58.ebuild 10402 RMD160 dc4e86f42b7f1feec532cac4a138aeef55dcbf7c SHA1 05fae6ff198acb2e4357eb9d0b9a8ba9ad0da747 SHA256 45b56da91b336f506c7168f682392eddcc36d120183f5ce1ee2f2572973e1804
-MISC ChangeLog 52189 RMD160 6b3395b2c0bf93bd60d8d0a879efc36deb304d43 SHA1 78b6f40b15abc23013792525c58f91dd95c1cd1b SHA256 35bc7068db6919419feed3f08fb92ed97d4dc9342de0a37ae268a49a1e6c4252
+EBUILD portage-2.2_rc58.ebuild 10317 RMD160 ff032896877856741ac00c373bff592a28b8f5eb SHA1 f0d4394bfa02c4556e0181aabf041822c3166dfc SHA256 4280ba20eecaac075c57a1c56ab14cbf3fd206b86a55e97cd42348501f0eefcd
+MISC ChangeLog 52381 RMD160 3b9d51ad8b6cda015f302614c854de98d01f3b15 SHA1 3092c7f3f23a978ca21c37314e326e1cecf46169 SHA256 01e8f2103ecc3b0de56a67ef3bee2b93c5332a8ef65dcd568af53b75b75410dc
 MISC metadata.xml 436 RMD160 ac90cc20b6b1e04e386ee758372fa8d9261046ec SHA1 01ec015d6e3a341353400be991c61347fd1f9142 SHA256 cf021b3830c7b854696e5b46b5b802156555e2cd5618ff27826a6a2f8f57a1c0
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
 }