diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2012-12-04 20:58:54 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2012-12-04 20:58:54 +0000 |
| commit | 4b5d5554ceb0a5851d76ae257ff7677662f3bd1b (patch) | |
| tree | 4b1892f6d349f0ac34d6370441f68c3bba63e58e /app-admin | |
| parent | Support gtk2 and gtk3 builds in the same ebuild. gtk2 is always on and gtk3 i... (diff) | |
| download | historical-4b5d5554ceb0a5851d76ae257ff7677662f3bd1b.tar.gz historical-4b5d5554ceb0a5851d76ae257ff7677662f3bd1b.tar.bz2 historical-4b5d5554ceb0a5851d76ae257ff7677662f3bd1b.zip | |
Revert previous commit as per bug #445926.
Package-Manager: portage-2.1.11.31/cvs/Linux i686
Manifest-Sign-Key: 0x215AD14D
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/conky/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/conky/Manifest | 14 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.9.0-r1.ebuild | 4 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.9.0.ebuild | 4 | ||||
| -rw-r--r-- | app-admin/conky/metadata.xml | 2 |
5 files changed, 17 insertions, 13 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 97e18ab6323d..6a8b0dffc1ad 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/conky # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.192 2012/11/30 15:28:51 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.193 2012/12/04 20:58:53 billie Exp $ + + 04 Dec 2012; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0.ebuild, + conky-1.9.0-r1.ebuild, metadata.xml: + Revert previous commit as per bug #445926. 30 Nov 2012; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0.ebuild, conky-1.9.0-r1.ebuild, metadata.xml: diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index f99d58974b2a..a65e879f2f01 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -13,14 +13,14 @@ AUX conky-1.8.1-xmms2.patch 1190 SHA256 1b64047f04239dbf24b3171fcd8d5c950e9f8aa6 AUX conky-1.9.0-lines-fix.patch 1067 SHA256 9a406f382092632e458d368b5fff81217258729df19098836f7f9ace0130b316 SHA512 555a7234933e6967cdf7ee003e46b089f29819891551205ab7d3008037f8c8771473ced3ed3da1009e2041e9d34beb6edca25fb1017f043a824611d439094e0e WHIRLPOOL 64d88b5b94e435cd0473d18fceaa1358dcea1e1d2c5c2de93588351c0e08f6fe3461e4a1d8b470533f1d8fb80c99ec078825d4b7803f7042be5bee74a540791d AUX conky-1.9.0-ncurses.patch 939 SHA256 76a777bab29009c2053b61e9e5904aea131c93d5f026acc161048374f75e72f6 SHA512 0a0737bec67eb241dee4029907d9f3e5bc8d49c8239fbdda5cbfa2b7b0aa50fb2ac9bf3397ccecd94768a176fc6c3ec0e18d67391d9285aff9658ba234202d4e WHIRLPOOL 0893db6ffbc2b37c58b2de8e34e4288640a1d3a5e3a754bd39faec141a7e94e49c83011f5eb58c86afe838fff1b77a661ff63a61f6780f9ca5e5b24f50463014 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a -EBUILD conky-1.9.0-r1.ebuild 3870 SHA256 886864381c2619ae928d6a9e986fd33e20984cba1ca12f9b870fe857093bb917 SHA512 9aee19976d5de709c9fcb8b29982180d30f9b4bd99b252bb5392a53088712002ebfdd8551265ad2fecd142a8f88e1694d831d0a6f7bc2d31dff0d80f02b7dbe3 WHIRLPOOL 2ae61923ea2cdd48b9ab9637c589e82dc5075e0533701f08dcaba6e20c4fec9c7988f4e5f8f03ed1ed43a78c026877751d4db9b0c46b8e6ea74c85011756b77a -EBUILD conky-1.9.0.ebuild 3826 SHA256 6b66544c873c08d7ba46ba002d300bdba13bdcc77364946e848cbd7bde947afa SHA512 c426845ce349cbda753e205cd794839a7c31d0df40877c37eab9d8fcf1614997ee5af49ee04691c1b4537b91870d634ffa4d1e710ee7f660254eb7e95ea8c375 WHIRLPOOL 019dada5c28a6db23bda3d5366beed58206c8b16d64c1b467879b2f15ccf1145ddce25a4a3d67b4378c38b4fa6f51c96521e4d1d3538fed157918a3b93365076 -MISC ChangeLog 29447 SHA256 a541e5772c2b940c02413abec283392d13723a86cf994edcbee619a71c889086 SHA512 1171d3cbd139130e82954f699a703b2ea3f1fede44d5819cb6034c683e6b5be133208023d03e6c7397198455d886875e7333dd7c40bc5aec9e531c2e53058d6c WHIRLPOOL 9ed71fa4cadf69953d392b7f95381da7874a57b9eac26523a8e3bb1f1bc6b45af9da2e857b420b4e9cd9eb3dc08a5e15885e7b90c51338a09fb257e4d2d5b80d -MISC metadata.xml 2034 SHA256 d2d72283377236de4c93e30ba4e5ea2746b5ddf1bac04c09b0e60976910aaa00 SHA512 d2a240ebde0ba574d039ba9f1871e0d0ab3402b8311818301d1b6567085350dc11d17094fd4117899d07a7b7c70bae871fe235b405f46fc2e2ee8a6a526655a0 WHIRLPOOL 8f71be23f197bb44bd5ead557bb96bd74f3047e1c765a02fa036db86c7bc7243ebed78e991e39e4220599d2db808a5991b507b230f5ba6ea544c5b342ffc4075 +EBUILD conky-1.9.0-r1.ebuild 3864 SHA256 0589d293d0645b6c788bef6c93993449c7f7f229d5908b279129ed4b08aaccd2 SHA512 45a17772ffa657a8cbfa4468cf8708e6facb1fbcc55f91f43ce47cd08408aae37d33731d14ff0bc51315b0481c7bf11c7816941799664008882bfb01ef131a09 WHIRLPOOL e4695085e0b0f4199669e988d38a4221f75d2223f15fc786826752cf47e2014e411ff574d61899a707d466c43fd48ea83a983ba255aae53da3dd8f6cb72eaf98 +EBUILD conky-1.9.0.ebuild 3821 SHA256 b1ca4897544da14150977cdb2585556aeafbc962f6eae25389722ccc70185af6 SHA512 8e337924be4c4b939a8b976f91db9877a609704d09261cffec38a60b3136ca42f23a20702ff49c491f95da87f0aad341380a08160623f1c6fcd88463c356be40 WHIRLPOOL 51d9f19c1c558dcb49fccb3eb1b130d84cf360d97b278fb7e5b10388df26e7b89e5ad7ceac8614dcc1e8ef34fc7bff69ed075fd8815b126a3a8c8fd7db4d25d2 +MISC ChangeLog 29604 SHA256 dfddc66665c5a1f289f67f8dc97f887c96c67b8442fa2fa1e8c5bbeb2b839be5 SHA512 ad7635d32dfc4830523cd0cc8a873c893343eca4961f468269f99c96ed44f86903814d3e8503d9b26c81ce3d9f8d817551716b429b2d493e0828f7fdc7425ca4 WHIRLPOOL d1d470920b69fec531b53aae7222beb7eaffae7ab2f7cf2914c89c5de83843777bab107583455b58a97c8a11bcecf97567179e532ae0ca44c3e60ada0fdf24c7 +MISC metadata.xml 2035 SHA256 7629c0d86a74d086f1b9934919881b5ee82c285e94d58d4a802694633ea11302 SHA512 546dafceed03c1148cdd4003021112306b636124f0f4ee13950d4a1b5bb8a7ff56256e6acf131e08e4573195e987810d562b2c202ba9c3022097a52e47c1f325 WHIRLPOOL 3e2eebfc6456a2e3d4658076ba8a02c84ff7a967768330e6df866589886b10dceccdaf8ff4d6863a2a61f676cb09d60ab8d7f5e57e1ae895b890f12de009dc23 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlC40LQACgkQlcuUeyFa0U3YbACfUg+hoxEObi4HTzSrtgG7jKkt -YzIAoLtMEj3Zcd3leklAN7wYvnFZlTsb -=NKM1 +iEYEAREIAAYFAlC+ZA4ACgkQlcuUeyFa0U3++gCfTNX5SZXJp7s+dxOXZusdkUJx +RjcAnjTsMRGozZS4WKuukX75nSr5dBxu +=38YO -----END PGP SIGNATURE----- diff --git a/app-admin/conky/conky-1.9.0-r1.ebuild b/app-admin/conky/conky-1.9.0-r1.ebuild index 658d1b70b30a..f27e2d74b83e 100644 --- a/app-admin/conky/conky-1.9.0-r1.ebuild +++ b/app-admin/conky/conky-1.9.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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-r1.ebuild,v 1.6 2012/11/30 15:28:51 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r1.ebuild,v 1.7 2012/12/04 20:58:53 billie Exp $ EAPI=4 @@ -26,7 +26,7 @@ DEPEND_COMMON=" >=dev-lua/toluapp-1.0.93 >=dev-lang/lua-5.1.4-r8 media-libs/imlib2 ) - nvidia? ( x11-drivers/nvidia-drivers[tools] ) + nvidia? ( media-video/nvidia-settings ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage diff --git a/app-admin/conky/conky-1.9.0.ebuild b/app-admin/conky/conky-1.9.0.ebuild index 05b062b3d2c1..0172d03929f5 100644 --- a/app-admin/conky/conky-1.9.0.ebuild +++ b/app-admin/conky/conky-1.9.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.ebuild,v 1.9 2012/11/30 15:28:51 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0.ebuild,v 1.10 2012/12/04 20:58:53 billie Exp $ EAPI=4 @@ -26,7 +26,7 @@ DEPEND_COMMON=" >=dev-lua/toluapp-1.0.93 >=dev-lang/lua-5.1.4-r8 media-libs/imlib2 ) - nvidia? ( x11-drivers/nvidia-drivers[tools] ) + nvidia? ( media-video/nvidia-settings ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml index e33c22b67ce9..5df39140ebaa 100644 --- a/app-admin/conky/metadata.xml +++ b/app-admin/conky/metadata.xml @@ -23,7 +23,7 @@ <flag name='moc'>enable monitoring of music played by <pkg>media-sound/moc</pkg></flag> <flag name='mpd'>enable monitoring of music controlled by <pkg>media-sound/mpd</pkg></flag> <flag name='nano-syntax'>enable syntax highlighting for <pkg>app-editors/nano</pkg></flag> - <flag name='nvidia'>enable reading of nvidia card temperature sensors via <pkg>x11-drivers/nvidia-drivers</pkg></flag> + <flag name='nvidia'>enable reading of nvidia card temperature sensors via <pkg>media-video/nvidia-settings</pkg></flag> <flag name='portmon'>enable support for tcp (ip4) port monitoring</flag> <flag name='thinkpad'>enable support for IBM/Lenovo notebooks</flag> <flag name='weather-metar'>enable support for metar weather service</flag> |