fixes for bug #376741 and bug #377249#c1

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

diff --git a/www-plugins/google-talkplugin/ChangeLog b/www-plugins/google-talkplugin/ChangeLog
index e926e56a249f31c58f25bcc8af019e7c84b01224..cbecc939c0c3c3851bc624a013e484c4852995c8 100644 (file)
--- a/www-plugins/google-talkplugin/ChangeLog
+++ b/www-plugins/google-talkplugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/google-talkplugin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.12 2011/07/29 16:58:08 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/ChangeLog,v 1.13 2011/08/03 17:00:51 ottxor Exp $
+
+  03 Aug 2011; Christoph Junghans <ottxor@gentoo.org>
+  google-talkplugin-2.1.7.0.ebuild:
+  fixes bug #376741 and bug #377249#c1
 
   29 Jul 2011; Christoph Junghans <ottxor@gentoo.org>
   google-talkplugin-2.1.7.0.ebuild:

diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index 67ed39134ece921691bcb8826b53d1855c3a605b..7e8c0f9d5e003e8749d13d9dacd2bdaaa0e3b169 100644 (file)
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -6,17 +6,17 @@ DIST google-talkplugin_1.8.0.0-1_i386.deb 6304798 RMD160 7dfc10989f4ffed819f40b1
 DIST google-talkplugin_2.1.7.0-1_amd64.deb 7725788 RMD160 0a4a9489c3b67d5b0d108efb1d9da0e33525a40a SHA1 ffe93e503690b3c11e5749c961388567823cab88 SHA256 42a70d6cff75b0730e9cafa6a412b593329c2cd8dd9fcf161f807e6b99f08cb7
 DIST google-talkplugin_2.1.7.0-1_i386.deb 6710628 RMD160 93ad1b6f150b64f04e814b4026326837371116b1 SHA1 8755d35cee0995c4fe11df75f1c5bd3029799624 SHA256 807de17e32c306e67a5186f1d809022dd8141f654d4d5de335559537077d83f4
 EBUILD google-talkplugin-1.8.0.0.ebuild 3403 RMD160 ce25948087a2f734a8008df2a4638ab980317c9d SHA1 be60e2083e33a572c98e1f8fa35e4c3deb9f898f SHA256 5014209cc7c768a6839b3057a5da5fcdf795c8e0d1a293bb5dd7bf78902405c5
-EBUILD google-talkplugin-2.1.7.0.ebuild 3222 RMD160 2a9383dd37bcd94e3178beefdeb1501e03740e01 SHA1 3284065f65c11ef54efae4c1864feac03b099576 SHA256 459a2458a4e27b3515e0d775ed9fb846f889cac442b43f53cc4b930c991f646a
-MISC ChangeLog 1964 RMD160 b346aa0d57b23276741e3b41e6312497491ca20a SHA1 8bb03e068347d95b27afd39954236962f13aec1b SHA256 d9073b213a85d67a0c66918064c331800ee6ee29198f2deea5d8d16eec8a2289
+EBUILD google-talkplugin-2.1.7.0.ebuild 3069 RMD160 07ccce62a1cdd6775c44d4f39eea865059004da5 SHA1 0dc54eeee9aff5194270a34effe5834bbc4454fc SHA256 6767a3a04c90cdc2276d3a28c0aa1a6463220c46c89fdf6abc207c7d9bf86497
+MISC ChangeLog 2094 RMD160 072307c612804126d2bceab4b5e22b0b6174f0ef SHA1 48ef721e9814ee8129c58b8d30c0bf0b47d5a6a0 SHA256 a77061c4b140daa2f605da7b5e2729fec9c4ab31aa4a7c9c4ed516517de7bf26
 MISC metadata.xml 354 RMD160 996efb09eaf3af50035bac0fcf12768640f0c0c9 SHA1 ff3d2e6ce2eae43016888c2cd548b2a6962ddab1 SHA256 d7d1330a39cf9ec3f0e53a8a5b1b6a0a259367edb897c3fec76ca07223a0dce2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOMuanAAoJEOeBhlrCAAWGfbQH/2HThB9NOmCp+t129eJyZ3jJ
-euTxeT5Lwjpg/6Nk6/eFUb2+OtS4YUUkEA3dhZqjnEGeCvuJ3AOcQPoI0DAZIC5w
-c31EC3lWZluWlbxRMxhXLa9D42ufy8Dju3dy/hX5/0dg/AL8gfOQetQpIj64VZSM
-k8jP+LJ7qZz91XCi51anNXNPCzL3RYi4UFTVkI5eWF8ULk1tz1tk4nCNTNnsxrJ8
-ZtSCo3X6jjsXdqfhawVeLWvg2Pw/sMJooyThcFlqPg37wwc7cTbT1n1RMiPGCAjJ
-cdQKbbrzV3fMPAFPX2qbBoT3NU8SWBeowpaWTpzNntnnnxnAnZV/XGfWK/KCQUY=
-=t1Bz
+iQEcBAEBAgAGBQJOOX7MAAoJEOeBhlrCAAWGT4kIAIOial1dbT6yYCWbe5b04Z6C
+cZnCmVqFi2VEiYKODBipZbLprc6BnoS5Wvc5U0kc+JqnVAC970bI59ASjKnPovBW
++fRDOKmCtR+L3VybaeaZeAX+ITTk5oknrJMkzBbUMXtz1miUleFRvJuIQe/0ihcD
+iWI8SueZX98VmLaAbXC8BtIyOPslaErxo7IYSgcXJ2zkkKwK09EJ5tQOplIGVL1S
+d+A2HH1Kb6OyMtdCsvc3xSPSc3tUqAc0wgnr2J7SHbd7mjAw79TOqkHbfSX8EmVU
+dTs4/wy1+MHO3PVb5fDl31BRpYQPGU67FtTNXj3tLCTxG25sbf1cQFZtpYDBGDc=
+=k/YM
 -----END PGP SIGNATURE-----

diff --git a/www-plugins/google-talkplugin/google-talkplugin-2.1.7.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-2.1.7.0.ebuild
index 7502d6bfbdcbcbe378adada6f36aaf164cef9844..81fb5f7f8ae61785b1ccd9cd771a918d90ce90d4 100644 (file)
--- a/www-plugins/google-talkplugin/google-talkplugin-2.1.7.0.ebuild
+++ b/www-plugins/google-talkplugin/google-talkplugin-2.1.7.0.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-plugins/google-talkplugin/google-talkplugin-2.1.7.0.ebuild,v 1.3 2011/07/29 16:58:08 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/google-talkplugin/google-talkplugin-2.1.7.0.ebuild,v 1.4 2011/08/03 17:00:51 ottxor Exp $
 
 EAPI=4
 
@@ -72,7 +72,7 @@ QA_EXECSTACK="${INSTALL_BASE#/}/GoogleTalkPlugin"
 
 QA_TEXTRELS="${INSTALL_BASE#/}/libnpg*.so"
 
-QA_DT_HASH="${INSTALL_BASE#/}/libnpg*.so
+QA_DT_HASH="${INSTALL_BASE#/}/libnpg.*so
        ${INSTALL_BASE#/}/GoogleTalkPlugin"
 
 S="${WORKDIR}"
@@ -85,14 +85,15 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-       unpack ${A} ./data.tar.gz ./usr/share/doc/google-talkplugin/changelog.Debian.gz
+       unpack ${A} ./data.tar.gz
 }
 
 src_install() {
        #workaround for bug #376741
-       [[ -f ./usr/share/doc/google-talkplugin/changelog.Debian ]] && \
-               dodoc ./usr/share/doc/google-talkplugin/changelog.Debian
-       [[ -f ${WORKDIR}/changelog.Debian ]] && dodoc "${WORKDIR}/changelog.Debian"
+       cd usr/share/doc/google-talkplugin || die
+       unpack ./changelog.Debian.gz
+       dodoc changelog.Debian
+       cd -
 
        exeinto "${INSTALL_BASE}"
        doexe "${INSTALL_BASE#/}"/GoogleTalkPlugin