Avoid automagic usage of deb2targz and remove blocker. Bug 383027.

Package-Manager: portage-2.2.0_alpha57_p7/cvs/Linux x86_64

5 files changed, 62 insertions, 20 deletions

diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog
index 85c35402ef60..a82896866cde 100644
--- a/www-client/google-chrome/ChangeLog
+++ b/www-client/google-chrome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/google-chrome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.18 2011/09/15 07:02:47 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.19 2011/09/15 23:05:25 floppym Exp $
+
+  15 Sep 2011; Mike Gilbert <floppym@gentoo.org>
+  google-chrome-13.0.782.220_p99552.ebuild,
+  google-chrome-14.0.835.163_beta101024.ebuild,
+  google-chrome-15.0.874.12_alpha100838.ebuild:
+  Avoid automagic usage of deb2targz and remove blocker. Bug 383027.
 
   15 Sep 2011; Mike Gilbert <floppym@gentoo.org>
   google-chrome-13.0.782.220_p99552.ebuild,
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 456f1b6c5942..d39e2edf3c74 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -7,15 +7,15 @@ DIST google-chrome-stable_13.0.782.220-r99552_amd64.deb 26017710 RMD160 c99b6709
 DIST google-chrome-stable_13.0.782.220-r99552_i386.deb 25647850 RMD160 c47eb276444803f7cb781229b32c1e7de22bfedb SHA1 77935026608cf12ebf735a306ef001d3596b520e SHA256 584204aa1dfa5b6625e7da7bdd2c250647fd4bddf877a41fd1f44b40a9e882df
 DIST google-chrome-unstable_15.0.874.12-r100838_amd64.deb 24583124 RMD160 3b1d73e4e50fb498ec7a5a6ec3db4ffd0e26816b SHA1 74b10d3191fa27064159e4fe3e043171d72b25a7 SHA256 700e58ffc2f6799a8f9db613bbefaa46b390f7ced423f71d7e7b510805d2b13e
 DIST google-chrome-unstable_15.0.874.12-r100838_i386.deb 28725194 RMD160 b9a51d40c96b56c3c22e68183e4dfa35264f0776 SHA1 2c7ac9598fd34f5ec130b829002e1445688019cb SHA256 aa61d961890c103a639ce9669bb66269458338592adbbbd502a4c5ccb2159eca
-EBUILD google-chrome-13.0.782.220_p99552.ebuild 3688 RMD160 d6d8ccd2217df8ec514ff08a72e4460b9d99da27 SHA1 4dba3957e01dc2d687aab0481ae3fa44123c7d56 SHA256 8a12571ba7ddfa63d48729f053336488cedbd0113a2eaefd63123ce0d8378aa4
-EBUILD google-chrome-14.0.835.163_beta101024.ebuild 3744 RMD160 711e501c9cb3c15ab59320cbc23df6bd1fdccb5a SHA1 b368c7c532e37ac7c9e4c310c36dd253e6abb636 SHA256 e6e0fcef1bdc51f356eae402cba8122e11f1d3b15e881878efc69030fab23675
-EBUILD google-chrome-15.0.874.12_alpha100838.ebuild 3749 RMD160 004ab359d3b6eacf502789b7f395de34fac17d48 SHA1 66befae94fa80068fb380119b0d6eeca9ef45fce SHA256 f0d031c581a2406241adcdc475043eca8fbc712f48c45cb4c41170316e6f7c0a
-MISC ChangeLog 4191 RMD160 977a82e085ba51927d5f279cd11e28e5765b7f23 SHA1 1725fc4b2c0ce5fb40d0c1acef80e87c664f030e SHA256 85b6709b8abf456935c57a775a5cf922609c38ffc35a3732a0d4b82ecf6d1201
+EBUILD google-chrome-13.0.782.220_p99552.ebuild 3892 RMD160 45d271cdfcdb54f1b78bc5f59cd70f72120178dd SHA1 62fc11a8adb493f75c90b05d10f9b1fc736eaa8d SHA256 042e9776b1c40de56910b2fdabf7d42c356ec8cdc988d5c528cd76ed8d83cc23
+EBUILD google-chrome-14.0.835.163_beta101024.ebuild 3948 RMD160 3af322ea09e5dc6826e54c5cbe6d5adc7745adb4 SHA1 45adddc7bb7f4b3d359ff462dcb8804a26980ba2 SHA256 b00e85ef2c82d357a98450a47bac08a3e342608251d1374db7ad1624dfe21063
+EBUILD google-chrome-15.0.874.12_alpha100838.ebuild 3953 RMD160 24ba54d7fe7e3e4c833c7bed7634533a6f1701f8 SHA1 eb3b2d007761382d9802151f91cdda565ce7858f SHA256 4f110e7f5c948b7c9a200414ac87753f76fac2d30ed40753d5f5df38575496dc
+MISC ChangeLog 4450 RMD160 5b416881fce65752879e04ca6f1a0a29669d6c2a SHA1 47e29c6e1a04b08e0add87e0ee54335d9177b688 SHA256 1d04d0de027a70e6f933a98eca57f70262afb7bb2ef1863db04538a4cca2f83f
 MISC metadata.xml 510 RMD160 89172b66e00991d4e6ce045bcbb66d14145ac02a SHA1 f81450697c759948d8c8583aa1b6a095eb71bd05 SHA256 da7aab160a14cadf0b87a04ac7a92e4d90d86e51035ca3c3f96e1ffb3cbb1e83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5xoxwACgkQC77qH+pIQ6Q/JAD/b9GyJxAxyuyoLPG4KZnShZwW
-/smaumfxkkCZGgVw+MwBAI1/jpQOi3vvpVVZPQ4bmdB6kDcQr0G9nZ/CcbfyFBbq
-=bamN
+iF4EAREIAAYFAk5yhMEACgkQC77qH+pIQ6Rj5gD/Q62bJVeYsP5tWuxIPWg2lz5/
+OR69zjbssUfYJ3i7ZgUA/2Wo2YplUmImJoSdfztth2mD+auhgVknlPpvHHSEwMlP
+=kIHM
 -----END PGP SIGNATURE-----
diff --git a/www-client/google-chrome/google-chrome-13.0.782.220_p99552.ebuild b/www-client/google-chrome/google-chrome-13.0.782.220_p99552.ebuild
index 7d175ac55551..a20b1d40c7a3 100644
--- a/www-client/google-chrome/google-chrome-13.0.782.220_p99552.ebuild
+++ b/www-client/google-chrome/google-chrome-13.0.782.220_p99552.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-13.0.782.220_p99552.ebuild,v 1.2 2011/09/15 06:58:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-13.0.782.220_p99552.ebuild,v 1.3 2011/09/15 23:05:25 floppym Exp $
 
 EAPI="4"
 
@@ -28,7 +28,6 @@ for lang in ${LANGS}; do
 	    IUSE+=" linguas_${lang}"
 done
 
-DEPEND="!!app-arch/deb2targz"
 RDEPEND="app-arch/bzip2
 	app-misc/ca-certificates
 	media-libs/alsa-lib
@@ -70,9 +69,22 @@ chromium_lang() {
 	fi
 }
 
+chrome_unpack() {
+	local x
+	for x in "${@}"; do
+		if [[ ${x} == *.deb ]]; then
+			# Avoid automagic usage of deb2targz.
+			echo ">>> Unpacking ${x} to ${PWD}"
+			ar x "${DISTDIR}/${x}" || die
+		else
+			unpack "${x}"
+		fi
+	done
+}
+
 src_unpack() {
-	default
-	unpack ./data.tar.lzma || die
+	chrome_unpack ${A}
+	unpack ./data.tar.lzma
 }
 
 src_prepare() {
diff --git a/www-client/google-chrome/google-chrome-14.0.835.163_beta101024.ebuild b/www-client/google-chrome/google-chrome-14.0.835.163_beta101024.ebuild
index 28d471e70dfa..0445f1ad6934 100644
--- a/www-client/google-chrome/google-chrome-14.0.835.163_beta101024.ebuild
+++ b/www-client/google-chrome/google-chrome-14.0.835.163_beta101024.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-14.0.835.163_beta101024.ebuild,v 1.2 2011/09/15 06:58:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-14.0.835.163_beta101024.ebuild,v 1.3 2011/09/15 23:05:25 floppym Exp $
 
 EAPI="4"
 
@@ -28,7 +28,6 @@ for lang in ${LANGS}; do
 	    IUSE+=" linguas_${lang}"
 done
 
-DEPEND="!!app-arch/deb2targz"
 RDEPEND="app-arch/bzip2
 	app-misc/ca-certificates
 	media-libs/alsa-lib
@@ -70,9 +69,22 @@ chromium_lang() {
 	fi
 }
 
+chrome_unpack() {
+	local x
+	for x in "${@}"; do
+		if [[ ${x} == *.deb ]]; then
+			# Avoid automagic usage of deb2targz.
+			echo ">>> Unpacking ${x} to ${PWD}"
+			ar x "${DISTDIR}/${x}" || die
+		else
+			unpack "${x}"
+		fi
+	done
+}
+
 src_unpack() {
-	default
-	unpack ./data.tar.lzma || die
+	chrome_unpack ${A}
+	unpack ./data.tar.lzma
 }
 
 src_prepare() {
diff --git a/www-client/google-chrome/google-chrome-15.0.874.12_alpha100838.ebuild b/www-client/google-chrome/google-chrome-15.0.874.12_alpha100838.ebuild
index d0c5a5376714..6e5e80aee912 100644
--- a/www-client/google-chrome/google-chrome-15.0.874.12_alpha100838.ebuild
+++ b/www-client/google-chrome/google-chrome-15.0.874.12_alpha100838.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-15.0.874.12_alpha100838.ebuild,v 1.2 2011/09/15 06:58:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-15.0.874.12_alpha100838.ebuild,v 1.3 2011/09/15 23:05:25 floppym Exp $
 
 EAPI="4"
 
@@ -28,7 +28,6 @@ for lang in ${LANGS}; do
 	    IUSE+=" linguas_${lang}"
 done
 
-DEPEND="!!app-arch/deb2targz"
 RDEPEND="app-arch/bzip2
 	app-misc/ca-certificates
 	media-libs/alsa-lib
@@ -70,9 +69,22 @@ chromium_lang() {
 	fi
 }
 
+chrome_unpack() {
+	local x
+	for x in "${@}"; do
+		if [[ ${x} == *.deb ]]; then
+			# Avoid automagic usage of deb2targz.
+			echo ">>> Unpacking ${x} to ${PWD}"
+			ar x "${DISTDIR}/${x}" || die
+		else
+			unpack "${x}"
+		fi
+	done
+}
+
 src_unpack() {
-	default
-	unpack ./data.tar.lzma || die
+	chrome_unpack ${A}
+	unpack ./data.tar.lzma
 }
 
 src_prepare() {