Fix bug #477726. Thanks to Marckus J. for the report.

Package-Manager: portage-2.1.12.2/cvs/Linux i686
Manifest-Sign-Key: 0x215AD14D

3 files changed, 13 insertions, 10 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index b222fa305d94..7704ddc479b0 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.208 2013/03/23 16:48:21 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.209 2013/07/24 16:43:03 billie Exp $
+
+  24 Jul 2013; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0-r2.ebuild:
+  Fix bug #477726. Thanks to Marckus J. for the report.
 
   23 Mar 2013; Daniel Pielmeier <billie@gentoo.org> metadata.xml:
   Remove proxy-maintainers. They are not required if the user in metadata is
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 375a8eccddb5..d4b6e35d1edc 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -6,13 +6,13 @@ AUX conky-1.9.0-lines-fix.patch 1067 SHA256 9a406f382092632e458d368b5fff81217258
 AUX conky-1.9.0-ncurses.patch 939 SHA256 76a777bab29009c2053b61e9e5904aea131c93d5f026acc161048374f75e72f6 SHA512 0a0737bec67eb241dee4029907d9f3e5bc8d49c8239fbdda5cbfa2b7b0aa50fb2ac9bf3397ccecd94768a176fc6c3ec0e18d67391d9285aff9658ba234202d4e WHIRLPOOL 0893db6ffbc2b37c58b2de8e34e4288640a1d3a5e3a754bd39faec141a7e94e49c83011f5eb58c86afe838fff1b77a661ff63a61f6780f9ca5e5b24f50463014
 AUX conky-1.9.0-update-when-message-count-decreases.patch 2723 SHA256 d47df08331ff381eacfb9729f76135f7e556b51a4d8e2005df789f604b2fed38 SHA512 f4867a37d3874a3b6248d33c176f2178fa1171a16c61789895c4c10419ce28bc766d712ebba9ca7eade2c352331f43466e440f3c787ab879e66d4a60177b6264 WHIRLPOOL ab4fc736098bd6577e75a3670bfd0d39ad9a453fe3fce41716e4c6ed9d6f56f9b22ab2d0589253d9aad4dfe158c1c465588876e15a820c02d9cfdca9a11e68d9
 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a
-EBUILD conky-1.9.0-r2.ebuild 3924 SHA256 b74253a89d705a00890c6cb592b2c6c31bd8cc81bc3d1a1c7bc6854b31e67d1b SHA512 c318fee911623909f4c32becd296e1af35b25652e5adcd9bac2dc28281a2411ddd336d7e0ec80aada39bc2355e158fe4d93d6ff4245546a6182eac5c5254a3fb WHIRLPOOL 99752889bd96186070a8e5a76c8908f09e64d989503f7e88b05dd324eca1b41a819e8eb93741c0b12b72d5cdccd20869ca719b8f569df2fe68b0ca4bb818b7b2
-MISC ChangeLog 31610 SHA256 a09290e657d9ed93e1c28ed88e1ea159740e97d0cae81b74dcd6d60f951de32e SHA512 4a12efee5b6577b4635ce14a88b585e974602df257110c2182b0bf8520a0c2944125edf7404d3f4c55ef80875b08ff01a7ea34a42b532ae46353dbf847eea171 WHIRLPOOL af01e9966ba8e5eec57262b72381f55a09dfde02f50d112f38edd9d95f248d6ecefe48a64c864a4eb7748aa1cd024c7f685781e703d7d48d6e0cdba20c77ad5d
+EBUILD conky-1.9.0-r2.ebuild 3867 SHA256 42abf9ba98d417e5f82f05713a2de8fed3704a40e73e40ff6ccb3a075022713d SHA512 e6bd8fa668ae196c9d146f4d564df835441c950c581ad0f892dc75eb08ddcfe37856210b8666299d00f689a519d31163c994789b9f958cc28b10eb715d4b7a35 WHIRLPOOL 4494ec84cf29eb3e7b68d65b9a86a27101f282190a7e9d8544dfae76a812eba3d3cd24eff19196a8e67d66d5dc2ff1b3ea16a2db777ccb0eee04026e7066ba8f
+MISC ChangeLog 31742 SHA256 349168724108b72c73be8dfefed05f67910a80616bab0a94aeaf865847b1c628 SHA512 b3950b0d86cd76230d1c37f884a000f1ba7943c73caf232d29c5ab7049cb0726f5056df10a8bcc21ab5c6753b0239620b586b8440e5ce7519e6b424234afc50d WHIRLPOOL a39b7c0bb0e99b7268f281a3dfbc7bc843965019bfae64649259e0c644066465c5fba4e80ff22df7a375e322fbc7697eb739a91dc7baaffdaacf414233a27d5d
 MISC metadata.xml 2065 SHA256 697fdf5628f91d6a489add4bb77b4cf926ac72feb3cf09de0f733e842e7d2a67 SHA512 33ec0b8e3e9098671f2e733115a1e97931757ecb7932814de2e4ba7dfd4e45b15e2eda48a10d0ed97becb27bd45d40ed09f3deb70a09314e3167d665f90bf9ae WHIRLPOOL 58ac38f69259e8d4ea3e41c3f1221537cdabc20e144048065198b1c8044ffd85ad5398346007aad1c46747a6073023a40e04eeebd37cdb006d84d959cc3e246d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlFN3NYACgkQlcuUeyFa0U2BkACdFhvLi4mUW+6tUMyrjHfUjl8j
-+48AoPUdffxUJjWriA/Dnh+ZJXXotnDi
-=JPq3
+iEYEAREIAAYFAlHwBB0ACgkQlcuUeyFa0U1mCgCgi63CnNWv5fXOf+Rp4Vuspugl
+c/8AnR6Sk2C614PACch0M1/58cgVtv+H
+=PHL/
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.9.0-r2.ebuild b/app-admin/conky/conky-1.9.0-r2.ebuild
index dc958c1a9111..9e6abea20349 100644
--- a/app-admin/conky/conky-1.9.0-r2.ebuild
+++ b/app-admin/conky/conky-1.9.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r2.ebuild,v 1.7 2013/02/12 20:21:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r2.ebuild,v 1.8 2013/07/24 16:43:03 billie Exp $
 
 EAPI=5
 
@@ -105,7 +105,7 @@ src_configure() {
 src_install() {
 	default
 
-	dohtml doc/{config_settings.html,docs.html,lua.html,variables.html}
+	dohtml doc/*.html
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/ftdetect
@@ -123,7 +123,7 @@ src_install() {
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}."
+		elog "You can find sample configurations at ${ROOT%/}/etc/conky."
 		elog "To customize, copy to ~/.conkyrc and edit it to your liking."
 		elog
 		elog "There are pretty html docs available at the conky homepage"