From ed40676841e317a2aafa04c4c804bb6043864740 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 26 Feb 2016 23:50:05 +0000 Subject: repo cleanup...drop old ebuilds, drop ebuilds already in portage tree --- app-admin/conky/Manifest | 15 --- app-admin/conky/conky-1.8.1-r6.ebuild | 134 -------------------- app-admin/conky/conky-1.9.0.ebuild | 136 --------------------- app-admin/conky/files/conky-1.8.1-acpitemp.patch | 81 ------------ .../conky/files/conky-1.8.1-battery-time.patch | 11 -- .../conky/files/conky-1.8.1-curl-headers.patch | 24 ---- app-admin/conky/files/conky-1.8.1-lua-5.2.patch | 26 ---- .../conky/files/conky-1.8.1-maxinterfaces.patch | 41 ------- app-admin/conky/files/conky-1.8.1-nvidia-x.patch | 33 ----- .../conky/files/conky-1.8.1-secunia-SA43225.patch | 72 ----------- .../conky/files/conky-1.8.1-utf8-scroll.patch | 104 ---------------- app-admin/conky/files/conky-1.8.1-xmms2.patch | 36 ------ app-admin/conky/files/conky-1.9.0-ncurses.patch | 31 ----- app-admin/conky/metadata.xml | 33 ----- 14 files changed, 777 deletions(-) delete mode 100644 app-admin/conky/Manifest delete mode 100644 app-admin/conky/conky-1.8.1-r6.ebuild delete mode 100644 app-admin/conky/conky-1.9.0.ebuild delete mode 100644 app-admin/conky/files/conky-1.8.1-acpitemp.patch delete mode 100644 app-admin/conky/files/conky-1.8.1-battery-time.patch delete mode 100644 app-admin/conky/files/conky-1.8.1-curl-headers.patch delete mode 100644 app-admin/conky/files/conky-1.8.1-lua-5.2.patch delete mode 100644 app-admin/conky/files/conky-1.8.1-maxinterfaces.patch delete mode 100644 app-admin/conky/files/conky-1.8.1-nvidia-x.patch delete mode 100644 app-admin/conky/files/conky-1.8.1-secunia-SA43225.patch delete mode 100644 app-admin/conky/files/conky-1.8.1-utf8-scroll.patch delete mode 100644 app-admin/conky/files/conky-1.8.1-xmms2.patch delete mode 100644 app-admin/conky/files/conky-1.9.0-ncurses.patch delete mode 100644 app-admin/conky/metadata.xml (limited to 'app-admin/conky') diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest deleted file mode 100644 index 5b5b8a29..00000000 --- a/app-admin/conky/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -AUX conky-1.8.1-acpitemp.patch 2415 SHA256 57815044cd972139171b76e75267792821c783e03537eb6cf7ba8105c46cdf8d SHA512 8c376fe44e72c7bd8526bd51a4ec6a85919e4bfb1189fc2e0b15172ca5a76c6e5c6ece56f186b8da8e720bc5769b2c36fff76367c7c7a587648ad837b7085f1b WHIRLPOOL 849aa8f18b2ab021b0ffcf52cca544f5464f61df0745018bae4ddf938005ef477bc4aa702d2c335e190e353e0897fd2636c95f595202b76b7752d652f2da4f0a -AUX conky-1.8.1-battery-time.patch 655 SHA256 d47e966e61a212048a8c752f1885e567a6b2c497da508dee8be64b205a5a422d SHA512 951ab73eca1a1ca059c127e001c556fed4dec6d9b6b63365d6826be7105b6ac87f2a36b6799aa313dd8a3519d3aea0ff7a6aa8ef46bc36cf6de7ccb7248854e5 WHIRLPOOL f6139a92d78e383dd9a006d40b96272a82165db9d94da90f729db1d65ae0bca39b62b9391c514ef23cb078007d0ccdfece3e89cde73506804c67222e75baf7b0 -AUX conky-1.8.1-curl-headers.patch 494 SHA256 53ff30aa933163a1feb646720ea21b4727d515e33521ac53e77b8bd9d0473eba SHA512 1b78d0c34b86ff75179ead6413487f827ad1ed3627cc6694bc0fd49b214ef4c9d3c05c4dcb8cf3cb4615ab25086e25d3d0f25a897daa410286df41ec38af682c WHIRLPOOL d8acd19f59063a75205b2901fe7e47a7233f73e18263132fe607208c5a6dec5cdcbba215dd7089477ae1d5a6d7d153afd54b78bed69184129a1d556d5505d779 -AUX conky-1.8.1-lua-5.2.patch 731 SHA256 a52fe3067c927340a6f1c485f566db9496684bd89b781e1a320b8a02f115c98f SHA512 facbc8bfb4c7458f06eda35c99443deb09fbea9d9b93ff7dc37d1e159ed27051f081e71ffc937ea33f893c3ccbc2580e05d879e7118f68ba4de819dd820adda2 WHIRLPOOL 1ca7a363fc589af282bfb7767ce1954e7ce7799073b62f06165b2054e9019a7b82423efa9cbce8c548d659d6c9ca26abc6668caf6b3abef9fe80faee32f93f23 -AUX conky-1.8.1-maxinterfaces.patch 1605 SHA256 34f1e53fb145fb252e1f91bcd60803870f12e4e0b31d691accc4cd83dda970ad SHA512 1423d11ae6ce1f601f2bc1f0df2e4ed7b32d17d63d5c15b4ff618bdc3a441b6161b4b9fb12aa8bb6a722b4707830999a1cf221f47ff4e3ac6567b4201aaf794b WHIRLPOOL 15a068a617818af171d60cebc89fab13f7c71c3f2ad7d25df01820bea3c4a2e1bb325eefa427b0ae40d6672651252bfbaa97c9f68248172dbe354262e0cad3c2 -AUX conky-1.8.1-nvidia-x.patch 883 SHA256 290ffdf4094167715bf11b86ee2cf73574a3af32ffb50fa09517d89c56bc0853 SHA512 5dc5e22a0d2b8fca8dd4be929cb2b1c7812ed8461e749dfc05e2d9fc7247d218154cfbb93b358f7080dada6b9b8e7fee25c0a71c9b0ec3ea4cc33fceab830020 WHIRLPOOL c10f56f67d56e0ac9282caee93fcbba982d709e65b0e9f35932037a21d430e3a3f5d9ef7d56368ea74135a158e10a6beef2c2a867d15664cc91852e12ea2795a -AUX conky-1.8.1-secunia-SA43225.patch 1620 SHA256 61c2d204796f51d0d51cd62e9a37a9f4f318e8fe8f955278ef86b64d5b2ff99f SHA512 fde4d36d14ee7f8bb39104c23d336153b09436c8824676e4b003b1d46d2d7af00997839802745e03f5980f001c94c191805bcffe9f81485e71e2b782f7ae3086 WHIRLPOOL e2ad91607d10894227d5e33f3a0ea7d9fa82a72511c91295c1d9e1c668d942b1e53ee05322b7e3c4da5341793fcd6ff8deb9d4a9f75cb35ff3f2f874cd34aae2 -AUX conky-1.8.1-utf8-scroll.patch 2814 SHA256 ee622cda243c7265915c858b264fc4750a329f5c7e9a29323421a777291acfb7 SHA512 a88c49e83b360949d6450f1fbee22dc6648586f5469f6256581db7c55ba8efc35c01756fa241bfc13df0b44390d36ef72e4250d18a8743d62089e2f57f9f8fbd WHIRLPOOL 951e9b9083033a4d247bfeee12ee4f3da30ae53015c7b8095d587fb544e720c627b951ccee5da418c719a05c9a55b560d6bcb56cdfa5daaa6f50cee1a828327e -AUX conky-1.8.1-xmms2.patch 1190 SHA256 1b64047f04239dbf24b3171fcd8d5c950e9f8aa6af5e94cd4836cd14c70e2bdc SHA512 ec7f526a3b3fed3a80b1f998bbf2f1d48931caa209605767283da8440551c950a6f8bf7efcca6fde51f085b3eb5abb1a357dee6b2b32c4537edf9fae5fd0d1d5 WHIRLPOOL 904226a6749f7516c46a75e36b83218b27018b328196086d5a9624d726a5b9d31c87dfa8df9b60f013be64487cb6bbf5291014b1d350681d7412932b29bddc42 -AUX conky-1.9.0-ncurses.patch 939 SHA256 76a777bab29009c2053b61e9e5904aea131c93d5f026acc161048374f75e72f6 SHA512 0a0737bec67eb241dee4029907d9f3e5bc8d49c8239fbdda5cbfa2b7b0aa50fb2ac9bf3397ccecd94768a176fc6c3ec0e18d67391d9285aff9658ba234202d4e WHIRLPOOL 0893db6ffbc2b37c58b2de8e34e4288640a1d3a5e3a754bd39faec141a7e94e49c83011f5eb58c86afe838fff1b77a661ff63a61f6780f9ca5e5b24f50463014 -DIST conky-1.8.1.tar.bz2 612481 SHA256 f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43 SHA512 cd863c1d4bb28e18073ec540aec2e9286767d38d21699dc74b9c0e66d3e4ccddf43e4d99fd0da9fe1cd67e29faf64312a910e0e9e4e86ef60705aa1c2184c50d WHIRLPOOL f19e454a7082f0a5aeec9cd40e134991b9d07a7e4d71c9be452092d6d625bbc310530914b54cecba2b3e971bf459e26a28501f6b458b1e6e983e7460ae72a257 -DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a -EBUILD conky-1.8.1-r6.ebuild 4199 SHA256 35030ad941820c637159ed3015679f9b9aa628f490d3808d6524bff716621f3d SHA512 3417074b21d24d7522793b40ae7990a890dbb303d7c8ded575ca8328757808dc5a58fe0fd7166dce509b84e4653eb6fbee0abbbad73e8edb35926e669d183bb5 WHIRLPOOL 47f58224e4f95d1f147793a4fda939f852893fcd0dcab4a4cb63accfa6e018b28468fced134fbaef034cbe18aea69efb8dc53ec98f2f9764e98647feff735ff7 -EBUILD conky-1.9.0.ebuild 3935 SHA256 111816db2ff78ec1f624609a6876bf55446f9e28df1ab49844f6d6ae876f5f75 SHA512 aba504bb791117ff922223b4bef7afe566b0f350b293975f40aa537151f58f6abc819ddccba671b3dff5ebb38803d81b08d5d914c338cac327cd8abccf4a1aeb WHIRLPOOL 3782b4de800ceaecf9f530217ae96b4790941289a81d032071c960edbe3289810306040f571e3af51d15bb711613af28fa00a56d788c0034f2636f1b23d1fe28 -MISC metadata.xml 2035 SHA256 7629c0d86a74d086f1b9934919881b5ee82c285e94d58d4a802694633ea11302 SHA512 546dafceed03c1148cdd4003021112306b636124f0f4ee13950d4a1b5bb8a7ff56256e6acf131e08e4573195e987810d562b2c202ba9c3022097a52e47c1f325 WHIRLPOOL 3e2eebfc6456a2e3d4658076ba8a02c84ff7a967768330e6df866589886b10dceccdaf8ff4d6863a2a61f676cb09d60ab8d7f5e57e1ae895b890f12de009dc23 diff --git a/app-admin/conky/conky-1.8.1-r6.ebuild b/app-admin/conky/conky-1.8.1-r6.ebuild deleted file mode 100644 index 761bd6eb..00000000 --- a/app-admin/conky/conky-1.8.1-r6.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# 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.8.1-r6.ebuild,v 1.8 2012/05/03 18:02:22 jdhore Exp $ - -EAPI=2 - -inherit autotools eutils - -DESCRIPTION="An advanced, highly configurable system monitor for X" -HOMEPAGE="http://conky.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3 BSD LGPL-2.1 MIT" -SLOT="0" -KEYWORDS="alpha amd64 ppc ppc64 sparc x86" -IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X xmms2" - -DEPEND_COMMON=" - X? ( - imlib? ( media-libs/imlib2 ) - lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) - lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 ) - nvidia? ( media-video/nvidia-settings ) - truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXext - audacious? ( >=media-sound/audacious-1.5 dev-libs/glib ) - xmms2? ( media-sound/xmms2 ) - ) - curl? ( net-misc/curl ) - eve? ( net-misc/curl dev-libs/libxml2 ) - portmon? ( dev-libs/glib ) - lua? ( >=dev-lang/lua-5.1 ) - ncurses? ( sys-libs/ncurses ) - rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib ) - wifi? ( net-wireless/wireless-tools ) - weather-metar? ( net-misc/curl ) - weather-xoap? ( dev-libs/libxml2 net-misc/curl ) - virtual/libiconv - " -RDEPEND=" - ${DEPEND_COMMON} - apcupsd? ( sys-power/apcupsd ) - hddtemp? ( app-admin/hddtemp ) - moc? ( media-sound/moc ) - nano-syntax? ( app-editors/nano ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - " -DEPEND=" - ${DEPEND_COMMON} - virtual/pkgconfig - " - -src_prepare() { - epatch "${FILESDIR}/${P}-nvidia-x.patch" \ - "${FILESDIR}/${P}-xmms2.patch" \ - "${FILESDIR}/${P}-secunia-SA43225.patch" \ - "${FILESDIR}/${P}-acpitemp.patch" \ - "${FILESDIR}/${P}-curl-headers.patch" \ - "${FILESDIR}/${P}-maxinterfaces.patch" \ - "${FILESDIR}/${P}-utf8-scroll.patch" \ - "${FILESDIR}/${P}-battery-time.patch" \ - "${FILESDIR}/${P}-lua-5.2.patch" - eautoreconf -} - -src_configure() { - local myconf - - if use X; then - myconf="--enable-x11 --enable-double-buffer --enable-xdamage" - myconf="${myconf} --enable-argb --enable-own-window" - myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)" - myconf="${myconf} $(use_enable lua-imlib lua-imlib2)" - myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)" - myconf="${myconf} $(use_enable audacious) $(use_enable xmms2)" - else - myconf="--disable-x11 --disable-own-window --disable-argb" - myconf="${myconf} --disable-lua-cairo --disable-nvidia --disable-xft" - myconf="${myconf} --disable-audacious --disable-xmms2" - fi - - econf \ - ${myconf} \ - $(use_enable apcupsd) \ - $(use_enable curl) \ - $(use_enable debug) \ - $(use_enable eve) \ - $(use_enable hddtemp) \ - $(use_enable iostats) \ - $(use_enable lua) \ - $(use_enable thinkpad ibm) \ - $(use_enable math) \ - $(use_enable moc) \ - $(use_enable mpd) \ - $(use_enable ncurses) \ - $(use_enable portmon) \ - $(use_enable rss) \ - $(use_enable weather-metar) \ - $(use_enable weather-xoap) \ - $(use_enable wifi wlan) -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ChangeLog AUTHORS TODO || die - dohtml doc/docs.html doc/config_settings.html doc/variables.html || die - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/ftdetect - doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die - - insinto /usr/share/vim/vimfiles/syntax - doins "${S}"/extras/vim/syntax/conkyrc.vim || die - fi - - if use nano-syntax; then - insinto /usr/share/nano/ - doins "${S}"/extras/nano/conky.nanorc || die - fi -} - -pkg_postinst() { - elog "You can find a sample configuration file at ${ROOT%/}/etc/conky/conky.conf." - elog "To customize, copy it to ~/.conkyrc and edit it to your liking." - elog - elog "For more info on Conky's features please look at the Changelog in" - elog "${ROOT%/}/usr/share/doc/${PF}. There are also pretty html docs available" - elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html." - elog - elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml" - elog -} diff --git a/app-admin/conky/conky-1.9.0.ebuild b/app-admin/conky/conky-1.9.0.ebuild deleted file mode 100644 index 56d0eb4d..00000000 --- a/app-admin/conky/conky-1.9.0.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# 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.3 2012/08/12 12:02:35 ago Exp $ - -EAPI=4 - -inherit eutils - -MY_P="conky-1.9.0" -MY_V="1.9.0" -MY_PN="conky" - -DESCRIPTION="An advanced, highly configurable system monitor for X" -HOMEPAGE="http://conky.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-3 BSD LGPL-2.1 MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="apcupsd -audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X xmms2" - -DEPEND_COMMON=" - X? ( - imlib? ( media-libs/imlib2 ) - lua-cairo? ( - >=dev-lua/toluapp-1.0.93 - >=dev-lang/lua-5.1.4-r8 - x11-libs/cairo[X] ) - lua-imlib? ( - >=dev-lua/toluapp-1.0.93 - >=dev-lang/lua-5.1.4-r8 - media-libs/imlib2 ) - nvidia? ( media-video/nvidia-settings ) - truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXext - audacious? ( >=media-sound/audacious-1.5 dev-libs/glib ) - xmms2? ( media-sound/xmms2 ) - ) - curl? ( net-misc/curl ) - eve? ( net-misc/curl dev-libs/libxml2 ) - portmon? ( dev-libs/glib ) - lua? ( >=dev-lang/lua-5.1.4-r8 ) - ncurses? ( sys-libs/ncurses ) - rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib ) - wifi? ( net-wireless/wireless-tools ) - weather-metar? ( net-misc/curl ) - weather-xoap? ( dev-libs/libxml2 net-misc/curl ) - virtual/libiconv - " -RDEPEND=" - ${DEPEND_COMMON} - apcupsd? ( sys-power/apcupsd ) - hddtemp? ( app-admin/hddtemp ) - moc? ( media-sound/moc ) - nano-syntax? ( app-editors/nano ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) - " -DEPEND=" - ${DEPEND_COMMON} - virtual/pkgconfig - " - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch" \ - "${FILESDIR}/${MY_P}-ncurses.patch" -} - -src_configure() { - local myconf - - if use X; then - myconf="--enable-x11 --enable-double-buffer --enable-xdamage" - myconf="${myconf} --enable-argb --enable-own-window" - myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)" - myconf="${myconf} $(use_enable lua-imlib lua-imlib2)" - myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)" - myconf="${myconf} $(use_enable audacious) $(use_enable xmms2)" - else - myconf="--disable-x11 --disable-own-window --disable-argb" - myconf="${myconf} --disable-lua-cairo --disable-nvidia --disable-xft" - myconf="${myconf} --disable-audacious --disable-xmms2" - fi - - econf \ - ${myconf} \ - $(use_enable apcupsd) \ - $(use_enable curl) \ - $(use_enable debug) \ - $(use_enable eve) \ - $(use_enable hddtemp) \ - $(use_enable iostats) \ - $(use_enable lua) \ - $(use_enable thinkpad ibm) \ - $(use_enable math) \ - $(use_enable moc) \ - $(use_enable mpd) \ - $(use_enable ncurses) \ - $(use_enable portmon) \ - $(use_enable rss) \ - $(use_enable weather-metar) \ - $(use_enable weather-xoap) \ - $(use_enable wifi wlan) -} - -src_install() { - default - - dohtml doc/{config_settings.html,docs.html,lua.html,variables.html} - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/ftdetect - doins "${S}"/extras/vim/ftdetect/conkyrc.vim - - insinto /usr/share/vim/vimfiles/syntax - doins "${S}"/extras/vim/syntax/conkyrc.vim - fi - - if use nano-syntax; then - insinto /usr/share/nano/ - doins "${S}"/extras/nano/conky.nanorc - fi -} - -pkg_postinst() { - elog "You can find a sample configuration file at ${ROOT%/}/etc/conky/conky.conf." - elog "To customize, copy it to ~/.conkyrc and edit it to your liking." - elog - elog "For more info on Conky's features please look at the Changelog in" - elog "${ROOT%/}/usr/share/doc/${PF}. There are also pretty html docs available" - elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html." - elog - elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml" - elog -} diff --git a/app-admin/conky/files/conky-1.8.1-acpitemp.patch b/app-admin/conky/files/conky-1.8.1-acpitemp.patch deleted file mode 100644 index 9632b99e..00000000 --- a/app-admin/conky/files/conky-1.8.1-acpitemp.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 1b90218c339467770254aba03e3f0a3acc4af4b0 Mon Sep 17 00:00:00 2001 -From: Nikolas Garofil -Date: Wed, 10 Nov 2010 18:22:22 +0100 -Subject: [PATCH] Let $acpitemp use /sys instead of /proc - -From the 2.6.36 changelog (http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.36): -Mark the ACPI thermal procfs I/F deprecated, because /sys/class/thermal/ is already available and has been working for years w/o any problem. -The ACPI thermal procfs I/F will be removed in 2.6.37 ---- - src/linux.cc | 26 ++++++++++++-------------- - 1 files changed, 12 insertions(+), 14 deletions(-) - -diff --git a/src/linux.cc b/src/linux.cc -index ae97f48..bfb0063 100644 ---- a/src/linux.c -+++ b/src/linux.c -@@ -1449,26 +1449,20 @@ critical (S5): 73 C - passive: 73 C: tc1=4 tc2=3 tsp=40 devices=0xcdf6e6c0 - */ - --#define ACPI_THERMAL_DIR "/proc/acpi/thermal_zone/" --#define ACPI_THERMAL_FORMAT "/proc/acpi/thermal_zone/%s/temperature" -+#define ACPI_THERMAL_ZONE_DEFAULT "thermal_zone0" -+#define ACPI_THERMAL_FORMAT "/sys/class/thermal/%s/temp" - - int open_acpi_temperature(const char *name) - { - char path[256]; -- char buf[256]; - int fd; - - if (name == NULL || strcmp(name, "*") == 0) { -- static int rep = 0; -- -- if (!get_first_file_in_a_directory(ACPI_THERMAL_DIR, buf, &rep)) { -- return -1; -- } -- name = buf; -+ snprintf(path, 255, ACPI_THERMAL_FORMAT, ACPI_THERMAL_ZONE_DEFAULT); -+ } else { -+ snprintf(path, 255, ACPI_THERMAL_FORMAT, name); - } - -- snprintf(path, 255, ACPI_THERMAL_FORMAT, name); -- - fd = open(path, O_RDONLY); - if (fd < 0) { - NORM_ERR("can't open '%s': %s", path, strerror(errno)); -@@ -1480,6 +1474,9 @@ int open_acpi_temperature(const char *name) - static double last_acpi_temp; - static double last_acpi_temp_time; - -+//the maximum length of the string inside a ACPI_THERMAL_FORMAT file including the ending 0 -+#define MAXTHERMZONELEN 6 -+ - double get_acpi_temperature(int fd) - { - if (fd <= 0) { -@@ -1497,15 +1494,16 @@ double get_acpi_temperature(int fd) - - /* read */ - { -- char buf[256]; -+ char buf[MAXTHERMZONELEN]; - int n; - -- n = read(fd, buf, 255); -+ n = read(fd, buf, MAXTHERMZONELEN-1); - if (n < 0) { - NORM_ERR("can't read fd %d: %s", fd, strerror(errno)); - } else { - buf[n] = '\0'; -- sscanf(buf, "temperature: %lf", &last_acpi_temp); -+ sscanf(buf, "%lf", &last_acpi_temp); -+ last_acpi_temp /= 1000; - } - } - --- -1.7.0.4 - diff --git a/app-admin/conky/files/conky-1.8.1-battery-time.patch b/app-admin/conky/files/conky-1.8.1-battery-time.patch deleted file mode 100644 index 66e37958..00000000 --- a/app-admin/conky/files/conky-1.8.1-battery-time.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/linux.c.old 2012-01-12 08:18:58.525502553 -0500 -+++ b/src/linux.c 2012-01-12 08:19:29.786069277 -0500 -@@ -1671,6 +1671,8 @@ void get_battery_stuff(char *buffer, uns - the tradition! */ - else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0) - sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate); -+ else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0) -+ sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate); - else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0) - sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity); - else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0) diff --git a/app-admin/conky/files/conky-1.8.1-curl-headers.patch b/app-admin/conky/files/conky-1.8.1-curl-headers.patch deleted file mode 100644 index 5de2de14..00000000 --- a/app-admin/conky/files/conky-1.8.1-curl-headers.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c -index 10e73a6..9bea299 100644 ---- a/src/ccurl_thread.c -+++ b/src/ccurl_thread.c -@@ -33,7 +33,6 @@ - #endif /* DEBUG */ - - #include --#include - #include - - /* -diff --git a/src/eve.c b/src/eve.c -index dc07264..f62a5f6 100644 ---- a/src/eve.c -+++ b/src/eve.c -@@ -37,7 +37,6 @@ - #include - - #include --#include - #include - - #include diff --git a/app-admin/conky/files/conky-1.8.1-lua-5.2.patch b/app-admin/conky/files/conky-1.8.1-lua-5.2.patch deleted file mode 100644 index 956b0397..00000000 --- a/app-admin/conky/files/conky-1.8.1-lua-5.2.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 83bf5e3f853918583e519fbba455a79242be9c7c Mon Sep 17 00:00:00 2001 -From: Brenden Matthews -Date: Wed, 7 Mar 2012 11:11:12 -0800 -Subject: [PATCH] Build fix for Lua >=5.2. - -See Gentoo bug at https://bugs.gentoo.org/show_bug.cgi?id=407089. ---- - src/llua.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/llua.c b/src/llua.c -index 8f1df3c..383c279 100644 ---- a/src/llua.c -+++ b/src/llua.c -@@ -92,7 +92,7 @@ void llua_init(void) - const char *libs = PACKAGE_LIBDIR"/lib?.so;"; - char *old_path, *new_path; - if (lua_L) return; -- lua_L = lua_open(); -+ lua_L = luaL_newstate(); - - /* add our library path to the lua package.cpath global var */ - luaL_openlibs(lua_L); --- -1.7.0.4 - diff --git a/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch b/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch deleted file mode 100644 index 6f2097e1..00000000 --- a/app-admin/conky/files/conky-1.8.1-maxinterfaces.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f6aac5981e70118dc28b3c7a1fe6065955fe3dcb Mon Sep 17 00:00:00 2001 -From: Pavel Labath -Date: Tue, 25 Oct 2011 18:53:09 +0200 -Subject: [PATCH] Increase MAX_NET_INTERFACES to 64 - -also change a magic constant in net_stat.h to reflect the fact that it depends on -MAX_NET_INTERFACES. For more info, see sf.net #2872682 and gentoo bug #384505 ---- - configure.ac.in | 2 +- - src/net_stat.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac.in b/configure.ac.in -index 0f00237..d52d998 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -802,7 +802,7 @@ AC_DEFINE(CONFIG_FILE, "$HOME/.conkyrc", [Configfile of the user]) - AC_DEFINE(MAX_SPECIALS_DEFAULT, 512, [Default maximum number of special things, e.g. fonts, offsets, aligns, etc.]) - AC_DEFINE(MAX_USER_TEXT_DEFAULT, 16384, [Default maximum size of config TEXT buffer, i.e. below TEXT line.]) - AC_DEFINE(DEFAULT_TEXT_BUFFER_SIZE, 256, [Default size used for temporary, static text buffers]) --AC_DEFINE(MAX_NET_INTERFACES, 16, [Maximum number of network devices]) -+AC_DEFINE(MAX_NET_INTERFACES, 64, [Maximum number of network devices]) - - dnl - dnl Some functions -diff --git a/src/net_stat.h b/src/net_stat.h -index 463e7db..6f5533c 100644 ---- a/src/net_stat.h -+++ b/src/net_stat.h -@@ -41,7 +41,7 @@ struct net_stat { - double recv_speed, trans_speed; - struct sockaddr addr; - #if defined(__linux__) -- char addrs[273]; -+ char addrs[17 * MAX_NET_INTERFACES + 1]; - #endif /* __linux__ */ - double net_rec[15], net_trans[15]; - // wireless extensions --- -1.7.0.4 - diff --git a/app-admin/conky/files/conky-1.8.1-nvidia-x.patch b/app-admin/conky/files/conky-1.8.1-nvidia-x.patch deleted file mode 100644 index b56cee5f..00000000 --- a/app-admin/conky/files/conky-1.8.1-nvidia-x.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b72004787038371098a745c9358e8e1552d945d5 Mon Sep 17 00:00:00 2001 -From: Brenden Matthews -Date: Wed, 6 Oct 2010 11:49:27 -0700 -Subject: [PATCH] Bulid fix for nvidia support. - -See http://bugs.gentoo.org/show_bug.cgi?id=339971 for details. ---- - src/nvidia.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/src/nvidia.c b/src/nvidia.c -index 8a6423e..5f378d8 100644 ---- a/src/nvidia.c -+++ b/src/nvidia.c -@@ -32,6 +32,7 @@ - #include "logging.h" - #include "nvidia.h" - #include "temphelper.h" -+#include "x11.h" - #include - - const int nvidia_query_to_attr[] = {NV_CTRL_GPU_CORE_TEMPERATURE, -@@ -145,5 +146,6 @@ void set_nvidia_display(const char *disp) - if ((nvdisplay = XOpenDisplay(disp)) == NULL) { - CRIT_ERR(NULL, NULL, "can't open nvidia display: %s", XDisplayName(disp)); - } -- } -+ } - } -+ --- -1.7.0.4 - diff --git a/app-admin/conky/files/conky-1.8.1-secunia-SA43225.patch b/app-admin/conky/files/conky-1.8.1-secunia-SA43225.patch deleted file mode 100644 index 81272bd3..00000000 --- a/app-admin/conky/files/conky-1.8.1-secunia-SA43225.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- src/eve.c 2011-02-12 13:26:34.636269667 +0100 -+++ src/eve.c 2011-02-12 13:26:48.242936334 +0100 -@@ -254,19 +254,6 @@ - } - } - --static int file_exists(const char *filename) --{ -- struct stat fi; -- -- if ((stat(filename, &fi)) == 0) { -- if (fi.st_size > 0) -- return 1; -- else -- return 0; -- } else -- return 0; --} -- - static void writeSkilltree(char *content, const char *filename) - { - FILE *fp = fopen(filename, "w"); -@@ -283,13 +270,12 @@ - xmlDocPtr doc = 0; - xmlNodePtr root = 0; - -- if (!file_exists(file)) { -- skilltree = getXmlFromAPI(NULL, NULL, NULL, EVEURL_SKILLTREE); -- writeSkilltree(skilltree, file); -- free(skilltree); -- } -+ skilltree = getXmlFromAPI(NULL, NULL, NULL, EVEURL_SKILLTREE); -+ writeSkilltree(skilltree, file); -+ free(skilltree); - - doc = xmlReadFile(file, NULL, 0); -+ unlink(file); - if (!doc) - return NULL; - -@@ -340,7 +326,7 @@ - static char *eve(char *userid, char *apikey, char *charid) - { - Character *chr = NULL; -- const char *skillfile = "/tmp/.cesf"; -+ char skillfile[] = "/tmp/.cesfXXXXXX"; - int i = 0; - char *output = 0; - char *timel = 0; -@@ -348,6 +334,7 @@ - char *content = 0; - time_t now = 0; - char *error = 0; -+ int tmp_fd, old_umask; - - - for (i = 0; i < MAXCHARS; i++) { -@@ -400,6 +387,14 @@ - - output = (char *)malloc(200 * sizeof(char)); - timel = formatTime(&chr->ends); -+ old_umask = umask(0066); -+ tmp_fd = mkstemp(skillfile); -+ umask(old_umask); -+ if (tmp_fd == -1) { -+ error = strdup("Cannot create temporary file"); -+ return error; -+ } -+ close(tmp_fd); - skill = getSkillname(skillfile, chr->skill); - - chr->skillname = strdup(skill); diff --git a/app-admin/conky/files/conky-1.8.1-utf8-scroll.patch b/app-admin/conky/files/conky-1.8.1-utf8-scroll.patch deleted file mode 100644 index 8b9e1e8f..00000000 --- a/app-admin/conky/files/conky-1.8.1-utf8-scroll.patch +++ /dev/null @@ -1,104 +0,0 @@ -From b1f6a30bcce020b3c377434137de9856a09b899a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -Date: Fri, 11 Nov 2011 11:27:43 +0100 -Subject: [PATCH] Make scroll UTF-8 aware. Fixes bug #3134941. - ---- - src/scroll.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 42 insertions(+), 2 deletions(-) - -diff --git a/src/scroll.c b/src/scroll.c -index f78f807..738db0d 100644 ---- a/src/scroll.c -+++ b/src/scroll.c -@@ -34,12 +34,33 @@ - - struct scroll_data { - char *text; -+ unsigned int show_orig; - unsigned int show; - unsigned int step; - unsigned int start; - long resetcolor; - }; - -+int utf8_charlen(char c) { -+ unsigned char uc = (unsigned char) c; -+ int len = 0; -+ -+ if ((uc & 0x80) == 0) -+ return 1; -+ -+ while ((uc & 0x80) != 0) { -+ ++len; -+ uc <<= 1; -+ } -+ -+ return (len > 0 && len <= 4) ? len : -1; -+} -+ -+int is_utf8_char_tail(char c) { -+ unsigned char uc = (unsigned char) c; -+ return (uc & 0xc0) == 0x80; -+} -+ - void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_crash) - { - struct scroll_data *sd; -@@ -60,15 +81,18 @@ void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_cr - sd->step = 1; - } - sd->text = malloc(strlen(arg + n1) + sd->show + 1); -+ // sd->show value may change when there are UTF-8 chars to be shown, so -+ // save its origin value -+ sd->show_orig = sd->show; - - if (strlen(arg) > sd->show) { - for(n2 = 0; (unsigned int) n2 < sd->show; n2++) { -- sd->text[n2] = ' '; -+ sd->text[n2] = ' '; - } - sd->text[n2] = 0; - } - else -- sd->text[0] = 0; -+ sd->text[0] = 0; - - strcat(sd->text, arg + n1); - sd->start = 0; -@@ -82,9 +106,13 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor - { - struct scroll_data *sd = obj->data.opaque; - unsigned int j, colorchanges = 0, frontcolorchanges = 0, visibcolorchanges = 0, strend; -+ int charlen = 0; -+ unsigned int utf8lenfix = 0; - char *pwithcolors; - char buf[max_user_text]; - -+ sd->show = sd->show_orig; -+ - if (!sd) - return; - -@@ -109,6 +137,18 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor - while(*(buf + sd->start) == SPECIAL_CHAR) { - sd->start++; - } -+ //skip parts of UTF-8 character which messes up display -+ while(is_utf8_char_tail(*(buf + sd->start))) { -+ sd->start++; -+ } -+ //extend length to be shown for wide characters -+ j = 0; -+ while(j < sd->show + visibcolorchanges + utf8lenfix) { -+ charlen = utf8_charlen(*(buf + sd->start + j)); -+ utf8lenfix += (charlen > 1 ? charlen - 1 : 0); -+ j += charlen; -+ } -+ sd->show = sd->show_orig + utf8lenfix; - //place all chars that should be visible in p, including colorchanges - for(j=0; j < sd->show + visibcolorchanges; j++) { - p[j] = *(buf + sd->start + j); --- -1.7.8.rc1 - diff --git a/app-admin/conky/files/conky-1.8.1-xmms2.patch b/app-admin/conky/files/conky-1.8.1-xmms2.patch deleted file mode 100644 index a1b03d45..00000000 --- a/app-admin/conky/files/conky-1.8.1-xmms2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8dd9b91bb2751abccc02b53cefd0ab8f0e3b957d Mon Sep 17 00:00:00 2001 -From: Brenden Matthews -Date: Thu, 14 Oct 2010 16:51:53 -0700 -Subject: [PATCH] Build fix for XMMS2. - -This resolves bug 3085691, see: -https://sourceforge.net/tracker/index.php?func=detail&aid=3085691&group_id=143975&atid=757308 ---- - src/xmms2.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/xmms2.c b/src/xmms2.c -index 521bffa..94f13f9 100644 ---- a/src/xmms2.c -+++ b/src/xmms2.c -@@ -223,7 +223,7 @@ int handle_playback_state_change(xmmsv_t *value, void *p) - break; - case XMMS_PLAYBACK_STATUS_STOP: - strncpy(ptr->xmms2.status, "Stopped", text_buffer_size - 1); -- ptr->xmms2.elapsed = ptr->xmms2.progress = ptr->xmms2.percent = 0; -+ ptr->xmms2.elapsed = ptr->xmms2.progress = 0; - break; - default: - strncpy(ptr->xmms2.status, "Unknown", text_buffer_size - 1); -@@ -232,7 +232,7 @@ int handle_playback_state_change(xmmsv_t *value, void *p) - return TRUE; - } - --int handle_playlist_loaded(xmmsv_t *value, void *p) -+int handle_playlist_loaded(xmmsv_t *value, void *p) - { - struct information *ptr = p; - const char *c, *errbuf; --- -1.7.0.4 - diff --git a/app-admin/conky/files/conky-1.9.0-ncurses.patch b/app-admin/conky/files/conky-1.9.0-ncurses.patch deleted file mode 100644 index 91043ed4..00000000 --- a/app-admin/conky/files/conky-1.9.0-ncurses.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fd9462da5ed12369fc6a72e42ebc45c6707403fb Mon Sep 17 00:00:00 2001 -From: Pavel Labath -Date: Fri, 13 Jul 2012 13:41:09 +0200 -Subject: [PATCH] Fix "conky failes to build with --disable-ncurses" (sf.net #3541329) - ---- - src/conky.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/conky.c b/src/conky.c -index c5b4bed..17fe1a7 100644 ---- a/src/conky.c -+++ b/src/conky.c -@@ -885,12 +885,12 @@ void generate_text_internal(char *p, int p_max_size, - OBJ(cpu) { - if (cur->cpu_usage) { - if (obj->data.i > info.cpu_count) { -- static bool warned = false; -+ static int warned = 0; - if(!warned) { - NORM_ERR("obj->data.i %i info.cpu_count %i", - obj->data.i, info.cpu_count); - NORM_ERR("attempting to use more CPUs than you have!"); -- warned = true; -+ warned = 1; - } - } else { - percent_print(p, p_max_size, --- -1.7.0.4 - diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml deleted file mode 100644 index 5df39140..00000000 --- a/app-admin/conky/metadata.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - billie@gentoo.org - Daniel Pielmeier - - - brenden@rty.ca - Brenden Matthews - Upstream author - - Conky is a system monitor that sits in the corner of your desktop. It is a fork of Torsmo that is actually maintained. - - enable support for sys-power/apcupsd - enable monitoring of music played by media-sound/audacious - enable support for the eve-online skill monitor - enable support for per-task I/O statistics - enable if you want Lua scripting support - enable if you want Lua Cairo bindings for Conky (also enables lua support) - enable if you want Lua Imlib2 bindings for Conky (also enables lua and imlib support) - enable support for glibc's libm math library - enable monitoring of music played by media-sound/moc - enable monitoring of music controlled by media-sound/mpd - enable syntax highlighting for app-editors/nano - enable reading of nvidia card temperature sensors via media-video/nvidia-settings - enable support for tcp (ip4) port monitoring - enable support for IBM/Lenovo notebooks - enable support for metar weather service - enable support for metar and xoap weather service - enable monitoring of music played by media-sound/xmms2 - - -- cgit v1.2.3