summaryrefslogtreecommitdiff
path: root/app-admin/conky
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/conky')
-rw-r--r--app-admin/conky/Manifest4
-rw-r--r--app-admin/conky/conky-1.12.1-r1.ebuild194
-rw-r--r--app-admin/conky/conky-1.12.1.ebuild4
-rw-r--r--app-admin/conky/files/conky-1.12.1-network-speed.patch36
4 files changed, 237 insertions, 1 deletions
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index e8745dd0f23f..057e33fa9cdb 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,7 +1,9 @@
AUX conky-1.11.6-fpermissive.patch 1397 BLAKE2B 8200932639a6e0366d2c1426747d7de3939f21791c3a252cbe67f336555a9dc98e050114c5298e4d8b62e5b40f4a7a4bec82e1d38746f5a8bba5dba5295bd8c4 SHA512 e8063b7c567aa3aeae8ceab26895b124b865fe2815101d46593359d52f8ca9e830b6caaf2506e86550620df58230c507fb51f643bd0f61d92c232904f483b605
AUX conky-1.11.6-ipv6.patch 503 BLAKE2B 896cfc76a858981438cecf83db5b2b4fe32d7d6a0749524ac4c4d8dba3fd124a0b7de5d89329280b5c50e9de6cc4e182c23c2813575be6fceb97615e2acda4ca SHA512 3ea5247723676812a07d9ecc129d63cc75e51626a23c202da50bd3172403a24b93f6cbcc5c5e743a9acfe87b6d087ba510381c6157e1995b54d28a6dadbcf08a
+AUX conky-1.12.1-network-speed.patch 1439 BLAKE2B f736c986528f9a205d325170b7f1c83653304249be7a2742dbb9d50ca4b58a02fe59796c4c3a39001716ce0c44ed107f51c2db8933bc644472b2f45d607c88af SHA512 f1768dbda3698699bfd7473fed7dbe7ab57e53dc7b3599edcbad0105d140673b1111752eaeb7e83b3e42c7684316a788ac3b1f27c6c71b8f7560a02f1ecec8bc
DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
DIST conky-1.12.1.tar.gz 2404597 BLAKE2B 9e751844db9d1c90990b1e7dd5d9731330244f6ee772a7403e3520636f2ac930ccf3219e65da970d63396512cf843d4f8137854781fdf3c797fe910a8edb872d SHA512 897c6b83528809aa2e33e15b9ad6644d8cf36f4cff93f014811754f982c13180001b972b2b145b607de8d865c2af9a425ab50246065f537e14be75da5631593a
EBUILD conky-1.11.6-r2.ebuild 4790 BLAKE2B c72c8455185a0125cf63262d97b7fcbf95fb7469eda6bd64a6a436d3b99128ed77987d6e9be6c456c07ea31f2f4b959e545e5a4e501947912ce4e63cf0109f65 SHA512 70dabc73ad704df62433683df9ae7b8ec38abf4dca63a76f7f32a580b1cbff3d02c1dbbb14486dbcd60b9780226a9625948843c0eadefda3581e429fcc54adf4
-EBUILD conky-1.12.1.ebuild 4713 BLAKE2B 935332c40b024b6df71ac99880c13553057c9df4bd8201363cf931d05e51873c1d01ea3b9622fb2bd59e9e7019a5c3353a12db78dedf58497424478b17613474 SHA512 67fabdf98833dc4f24134ec00f8c05693fd74f255c2678ab0d43d6e6fff5845b10e173e4cf67da7c1362d9e3e0d1fd2943ca8ef168329193cb9313f753ed973f
+EBUILD conky-1.12.1-r1.ebuild 4805 BLAKE2B 12cfdc1dda0d7c07be89885575e6dc4420974e6064dc261e6bc5931702b86eda1643a59ad28380c233d29c401ce61b808f1dafe7c3c70f133c7f258d16610aa8 SHA512 fb146d44e6b4797cda838806aa2b2d53eb680dbbd8299b6c8fa661cb86266708f230bfc244de9f3a43df6b351c38d4db7df6f4e06f8534e45c527d12912ed578
+EBUILD conky-1.12.1.ebuild 4765 BLAKE2B 43356e0443e15efa136e42c7851ba1cbd658515669992ac8552f285a9e727edd4a7b26c74749fb9e33b5c9f874676ed14a9bfdeac573f20601ee206faeb61043 SHA512 128ec3bab07555b6552c288d28ab2f02b84dafb24c568b7e3bdc7d8e176d1417831be7d25cbf64239dd71034ee13e4a38839af4779ef890d81f523856233b6f4
MISC metadata.xml 2395 BLAKE2B 1bfdb9319bfa35d0e29edca04bf9f8fe7acba3d6cb9910fba7f632ff35a642cbdfd34cf0e18047eaa851808551f0c91614cbf814609de0c4b6d5cf656909d264 SHA512 4471b583a8fda5692eb18412ab579c1bcc37aff56009fa024ca257862df8ba93f788d3f001d7b9b74307e327f9deac27a2674f6ef48f8273940c2ea88d575813
diff --git a/app-admin/conky/conky-1.12.1-r1.ebuild b/app-admin/conky/conky-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..d07d5d164cff
--- /dev/null
+++ b/app-admin/conky/conky-1.12.1-r1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake linux-info lua-single readme.gentoo-r1 xdg
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
+ ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
+ ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
+ vim-syntax weather-metar webserver wifi X xinerama xmms2"
+
+COMMON_DEPEND="
+ cmus? ( media-sound/cmus )
+ curl? ( net-misc/curl )
+ ical? ( dev-libs/libical:= )
+ iconv? ( virtual/libiconv )
+ imlib? ( media-libs/imlib2[X] )
+ irc? ( net-libs/libircclient )
+ lua-cairo? ( x11-libs/cairo[X] )
+ lua-imlib? ( media-libs/imlib2[X] )
+ lua-rsvg? ( gnome-base/librsvg )
+ mysql? ( dev-db/mysql-connector-c )
+ ncurses? ( sys-libs/ncurses:= )
+ nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+ pulseaudio? ( media-sound/pulseaudio )
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+ systemd? ( sys-apps/systemd )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ wifi? ( net-wireless/wireless-tools )
+ weather-metar? ( net-misc/curl )
+ webserver? ( net-libs/libmicrohttpd )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXext
+ )
+ xinerama? ( x11-libs/libXinerama )
+ xmms2? ( media-sound/xmms2 )
+ ${LUA_DEPS}
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ 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="
+ ${COMMON_DEPEND}
+ doc? ( app-text/docbook2X dev-libs/libxslt )
+"
+
+REQUIRED_USE="
+ imlib? ( X )
+ lua-cairo? ( X bundled-toluapp )
+ lua-imlib? ( X bundled-toluapp )
+ lua-rsvg? ( X bundled-toluapp )
+ nvidia? ( X )
+ truetype? ( X )
+ xinerama? ( X )
+"
+
+CONFIG_CHECK="~IPV6"
+
+DOCS=( README.md AUTHORS )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.11.6-ipv6.patch
+ "${FILESDIR}"/${P}-network-speed.patch
+)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT}/usr/share/doc/${PF}/html when built with USE=doc.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+ use ipv6 && linux-info_pkg_setup
+
+ lua-single_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ xdg_environment_reset
+
+ sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+ cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs
+
+ if use X; then
+ mycmakeargs=(
+ -DBUILD_ARGB=yes
+ -DBUILD_X11=yes
+ -DBUILD_XDAMAGE=yes
+ -DBUILD_XDBE=yes
+ -DBUILD_XSHAPE=yes
+ -DOWN_WINDOW=yes
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=no
+ )
+ fi
+
+ mycmakeargs+=(
+ -DBUILD_APCUPSD=$(usex apcupsd)
+ -DBUILD_AUDACIOUS=no
+ -DBUILD_BUILTIN_CONFIG=yes
+ -DBUILD_CMUS=$(usex cmus)
+ -DBUILD_CURL=$(usex curl)
+ -DBUILD_DOCS=$(usex doc)
+ -DBUILD_HDDTEMP=$(usex hddtemp)
+ -DBUILD_HTTP=$(usex webserver)
+ -DBUILD_I18N=yes
+ -DBUILD_IBM=$(usex thinkpad)
+ -DBUILD_ICAL=$(usex ical)
+ -DBUILD_ICONV=$(usex iconv)
+ -DBUILD_IMLIB2=$(usex imlib)
+ -DBUILD_IOSTATS=$(usex iostats)
+ -DBUILD_IPV6=$(usex ipv6)
+ -DBUILD_IRC=$(usex irc)
+ -DBUILD_JOURNAL=$(usex systemd)
+ -DBUILD_LUA_CAIRO=$(usex lua-cairo)
+ -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+ -DBUILD_LUA_RSVG=$(usex lua-rsvg)
+ -DBUILD_MATH=$(usex math)
+ -DBUILD_MOC=$(usex moc)
+ -DBUILD_MPD=$(usex mpd)
+ -DBUILD_MYSQL=$(usex mysql)
+ -DBUILD_NCURSES=$(usex ncurses)
+ -DBUILD_NVIDIA=$(usex nvidia)
+ -DBUILD_OLD_CONFIG=yes
+ -DBUILD_PORT_MONITORS=$(usex portmon)
+ -DBUILD_PULSEAUDIO=$(usex pulseaudio)
+ -DBUILD_RSS=$(usex rss)
+ -DBUILD_WEATHER_METAR=$(usex weather-metar)
+ -DBUILD_WLAN=$(usex wifi)
+ -DBUILD_XFT=$(usex truetype)
+ -DBUILD_XINERAMA=$(usex xinerama)
+ -DBUILD_XMMS2=$(usex xmms2)
+ -DDOC_PATH=/usr/share/doc/${PF}
+ -DMAINTAINER_MODE=no
+ -DRELEASE=yes
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ 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
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ xdg_pkg_postinst
+}
diff --git a/app-admin/conky/conky-1.12.1.ebuild b/app-admin/conky/conky-1.12.1.ebuild
index 4534b4f27330..9b3c67b51034 100644
--- a/app-admin/conky/conky-1.12.1.ebuild
+++ b/app-admin/conky/conky-1.12.1.ebuild
@@ -76,6 +76,10 @@ CONFIG_CHECK="~IPV6"
DOCS=( README.md AUTHORS )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.11.6-ipv6.patch
+)
+
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf
diff --git a/app-admin/conky/files/conky-1.12.1-network-speed.patch b/app-admin/conky/files/conky-1.12.1-network-speed.patch
new file mode 100644
index 000000000000..46a7615c589a
--- /dev/null
+++ b/app-admin/conky/files/conky-1.12.1-network-speed.patch
@@ -0,0 +1,36 @@
+From 415c730133476d6652f479242b0638496b5f673b Mon Sep 17 00:00:00 2001
+From: Steven Xu <stevenxxiu@gmail.com>
+Date: Tue, 23 Mar 2021 20:12:52 +1100
+Subject: [PATCH] fix: update `update last_update_time` earlier, so the network
+ speed is correctly displayed, otherwise the speed shown is much lower than
+ the actual speed (resolves #863)
+
+---
+ src/conky.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/conky.cc b/src/conky.cc
+index b116b2bed..af5602c5b 100644
+--- a/src/conky.cc
++++ b/src/conky.cc
+@@ -766,6 +766,12 @@ static void generate_text() {
+ * some info.mem entries */
+ update_stuff();
+
++ /* Update `last_update_time` before `generate_text_internal()`, as the latter
++ * calls `evaluate()` -> `update_net_stats()`, which needs `last_update_time`
++ * to be set correctly. If this is not done, than the network speed being
++ * shown will be much lower than the actual speed.*/
++ last_update_time = current_update_time;
++
+ /* populate the text buffer; generate_text_internal() iterates through
+ * global_root_object (an instance of the text_object struct) and calls
+ * any callbacks that were set on startup by construct_text_object(). */
+@@ -822,7 +828,6 @@ static void generate_text() {
+ if (next_update_time < time || next_update_time > time + ui) {
+ next_update_time = time - fmod(time, ui) + ui;
+ }
+- last_update_time = current_update_time;
+ total_updates++;
+ }
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-01 12:44:25 +0000