fixed bug #375969#c22

Package-Manager: portage-2.1.10.11/cvs/Linux i686

diff --git a/media-sound/google-musicmanager/ChangeLog b/media-sound/google-musicmanager/ChangeLog
index 49856d21c2cf488aea9e831e329c019e059df50e..040051de744f982be80dc1acb59ade53a87fbead 100644 (file)
--- a/media-sound/google-musicmanager/ChangeLog
+++ b/media-sound/google-musicmanager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/google-musicmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/ChangeLog,v 1.1 2011/09/28 07:36:44 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/ChangeLog,v 1.2 2011/10/04 15:10:52 ottxor Exp $
+
+  04 Oct 2011; Christoph Junghans <ottxor@gentoo.org>
+  google-musicmanager-1.0.18.6104_beta.ebuild:
+  Avoid automagic usage of deb2targz (bug #384147, #375969#c22)
 
   28 Sep 2011; Christoph Junghans <ottxor@gentoo.org>
   +google-musicmanager-1.0.18.6104_beta.ebuild, +metadata.xml:

diff --git a/media-sound/google-musicmanager/Manifest b/media-sound/google-musicmanager/Manifest
index 78316dd273fe40a3fa7dd552543213cf21af9366..54bcbd597591f907e0357a0eb3e0efb33fe4df7f 100644 (file)
--- a/media-sound/google-musicmanager/Manifest
+++ b/media-sound/google-musicmanager/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
 
 DIST google-musicmanager-beta_1.0.18.6104-r0_amd64.deb 3005488 RMD160 c1dcf31da53b204c84cd950c2181a13073a64d4d SHA1 170659a8177cd6487554029d219802da51b3d732 SHA256 5a7d7e590d3deed589042222b8dca97326cbb789bccec396daaadd12cf62ae02
 DIST google-musicmanager-beta_1.0.18.6104-r0_i386.deb 2991982 RMD160 3d83549d2c49d584bf5d7068c1217add9a440527 SHA1 fb85e78ff259a7335cf5e1c449335150f4d06fdc SHA256 d17222dc6d037cff1ffcc6f1fe2f7fb4adff8de07ea7cba108ac82bd0f565995
-EBUILD google-musicmanager-1.0.18.6104_beta.ebuild 2136 RMD160 095a067735092465f0267accba83a0331f78aaef SHA1 c932a661db3b0411b0693c82c8682cc19513c8a5 SHA256 7c08c389a7b0ce76a7046b5d28318117b3e2d09a91ead89687b3b72d2ac0c02e
-MISC ChangeLog 1426 RMD160 62e8c1ec8d8a51bf66aeb39986b593c7551f4c47 SHA1 bbcc523f39bc9792f065ea27dc77347ca9efb6f6 SHA256 c2a5628003a2e1217884867b2c598fff8de7fbb9ddc147db6ae173d723a0c9f8
+EBUILD google-musicmanager-1.0.18.6104_beta.ebuild 2264 RMD160 3cadfdd60ca6758e748dab28de6bbf1fc7549bc9 SHA1 b4b2fed3cb31d0233510ba036b408403af7fed41 SHA256 26d4bbbde893ba96df5ac6b343f62149419dc7b3a374a69e0b225c9694ded4be
+MISC ChangeLog 1592 RMD160 628cdd09c7bc82d23bce89e43882f0671e40578a SHA1 db06b98b968dd4120d5c5be32aeb0335fe4864a4 SHA256 64ce3b2c2e882c05cf9678cbdfb81bc5a224804c43a44f8bb02d276ce86776d0
 MISC metadata.xml 361 RMD160 9f55bd4df3d0f91a2e351b5ba72546cf4037ec3b SHA1 b73b0ba14247c5d15d1d2055196dc965e5969ee1 SHA256 cab9cc39433d14d7c4b76ee859ebbee49f446db2cba1c96eac99664802433ec0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOgs6RAAoJEOeBhlrCAAWGjvEH/3r7QBULn3ibk+jL1Cq8m53w
-sRXEUJHsNU7C6h7hmbeY1ps+aZWPeIaA2gmm8iq2TGaHEOrtNbuOV1FXG4SPWdy8
-SD8yvJaLgOHG13H3OMMbrjEdKKKhE8J1/n7/nyh24jT6VAGpyeWCsaOh2V+c3JiQ
-3fYqJd05ah5Aab8Yke19lnSx0uMMgrppgru/90d314Vagwx70gN2/QB8E2C/WuYu
-OSP3Q4QvNU48G+RwgTlyQJrrczXZLbpf5EiQRjuq4EchY6pkQlCfQKgmCXkZfznL
-HYO309DOfan1Aeq8r1PHu5wwNVlPBiTaGrYsnQziDEQcrR5biNaNdMZOVLNgv20=
-=BIuk
+iQEcBAEBAgAGBQJOiyICAAoJEOeBhlrCAAWGBIYH/AxHMWW35iJ3jkuEE3twzeec
+hCOk7hweXhkp1nVbvy90B62fLNnSPARA+8ZYLHnwZjYODgCF2UaQmV6Tf1STCH7E
+yyTJsLYrjcu6Sd2+ox0WcxTNcEu4TjWzZ1IwWrjTqgXTVIWeDNQoM7IX0tEx3tb2
+AGuU9kVYO9lHqLFMxnjuAKGZtADfETNQz7HcyxtkJqEFDuza+SyDi+wOszRbUIna
+T+ksnK59nT0Jf3QGAbz0vyCc9Ixv5X8LhJICspUux+rWOaIDH8QITuuxJOSupO1a
+g+sCKA7xNhizsz83T1p0vYsfK02AR7V/1KA3fqC96CsbCzf9aig+5+2TI8S+SGo=
+=8Fj+
 -----END PGP SIGNATURE-----

diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.18.6104_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.18.6104_beta.ebuild
index 62110bba77e0eb4a0646cc7212fdfb61b501ae7b..1855dad224da96c546b7873c867c05a4e72eee5e 100644 (file)
--- a/media-sound/google-musicmanager/google-musicmanager-1.0.18.6104_beta.ebuild
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.18.6104_beta.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/media-sound/google-musicmanager/google-musicmanager-1.0.18.6104_beta.ebuild,v 1.1 2011/09/28 07:36:44 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/google-musicmanager-1.0.18.6104_beta.ebuild,v 1.2 2011/10/04 15:10:52 ottxor Exp $
 
 EAPI=4
 
@@ -59,7 +59,10 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-       unpack ${A} ./data.tar.lzma
+       # Avoid automagic usage of deb2targz (bug #384147, #375969#c22)
+       echo ">>> Unpacking ${A} to ${PWD}"
+       ar x "${DISTDIR}/${A}" || die
+       unpack ./data.tar.lzma
 }
 
 src_install() {