summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/conky')
-rw-r--r--app-admin/conky/Manifest6
-rw-r--r--app-admin/conky/conky-1.13.1.ebuild191
-rw-r--r--app-admin/conky/conky-1.19.8.ebuild (renamed from app-admin/conky/conky-1.17.0.ebuild)56
-rw-r--r--app-admin/conky/conky-1.20.2-r1.ebuild (renamed from app-admin/conky/conky-1.15.0.ebuild)82
-rw-r--r--app-admin/conky/conky-1.21.1.ebuild249
-rw-r--r--app-admin/conky/metadata.xml6
6 files changed, 352 insertions, 238 deletions
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 41af1c12f33e..f4447fe432c3 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,3 +1,3 @@
-DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe48275364c4d0c973da6467ea044303d75f94cc0b963c3b423a7ec61d8eff26da30c102c557ccd5a4e8cf984db4f6 SHA512 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516
-DIST conky-1.15.0.tar.gz 1800684 BLAKE2B e3b8c682e99be42cd28ed9507c346f16afefb525269c31bf9731169fa2c52bcaac4f523ecd0ec8c722fb4e269226254f8579876e68a2b27c3a3f5685dd50b423 SHA512 d317b0a141355ce56c9dce5ba6e4b9dbe73b05b9b0b85d93d491f6d6da4194c1aceefbbc7e1b10e5fc233a9732933949e273630845194f6c16dce34a77ee5841
-DIST conky-1.17.0.tar.gz 1699311 BLAKE2B 9aead9e1e9bf4bf61c1b3e09c6e319135ccce19c43740c1bb3c6142c936c2a045820078f4684ea037fc26a8b02343e11b5372f74258fdf2c5386459410498cc9 SHA512 4da55ba3835e8ff42747f2bc01c34a94b2819e08eb74ddb913fd34bf4b682d75331119745ee006d842d3d2142fc53eeada16afdf698a60f37b566f55896aa2db
+DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4
+DIST conky-1.20.2.tar.gz 1837320 BLAKE2B 41aaa384366ee9229ec4e7df97f37a8c62fff4dd864b3f8f8d3d40c57e87646ee8309c3d1fb68c7d7f8ed802c7ce49a57bbe0c01d32eaacfe84fddbd65b81007 SHA512 b516db38af5c20b101520356cd4f50d147869e7ed2bc84287e8a464e32bb306655edbac074da278d4732ee87f02c52d99cb4c117556e0d08f5be911a2a789618
+DIST conky-1.21.1.tar.gz 2146994 BLAKE2B 7c19813dad6a7a701cfedfba6d424d61bd5c960dc836c6aa6668031c7e096e214559177f0a8186fda1a770a956c301274d24d45a21c9d2d8faf62ce2f76610fd SHA512 4b7f243943a7d04942ee86dc6d5cdd75c6999a4ff0616efb5b00c47ad100a5b83dd4ca618764fc1ce97f0fc77118dabc87fa691fb1181fb54ab1b38d862f5229
diff --git a/app-admin/conky/conky-1.13.1.ebuild b/app-admin/conky/conky-1.13.1.ebuild
deleted file mode 100644
index 5cc04259da16..000000000000
--- a/app-admin/conky/conky-1.13.1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~arm64 ~ppc ppc64 ~riscv sparc x86"
-IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib
- intel-backlight 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 )
-
-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_INTEL_BACKLIGHT=$(usex intel-backlight)
- -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.17.0.ebuild b/app-admin/conky/conky-1.19.8.ebuild
index 2b68b5ac28bd..3c34a84c0eba 100644
--- a/app-admin/conky/conky-1.17.0.ebuild
+++ b/app-admin/conky/conky-1.19.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-LUA_COMPAT=( lua5-3 )
-PYTHON_COMPAT=( python{3_9,3_10,3_11} )
+LUA_COMPAT=( lua5-4 )
+PYTHON_COMPAT=( python3_{10,11,12} )
inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
@@ -14,35 +14,47 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3 BSD LGPL-2.1 MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~riscv sparc x86"
IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
- mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
- wayland webserver wifi X xinerama xmms2"
+ mysql ncurses nvidia +portmon pulseaudio rss systemd test thinkpad
+ truetype wayland webserver wifi X xinerama xmms2"
+RESTRICT="!test? ( test )"
+
+# Note: toluapp is bundled in conky since 1.11.2
+# Note: maintainer mode "-DMAINTAINER_MODE=yes" sets CMAKE_BUILD_TYPE Debug
+# which creates debug symbols and enables "-DBUILD_TESTS" which also
+# results in conky_core debug library getting installed
COMMON_DEPEND="
curl? ( net-misc/curl )
ical? ( dev-libs/libical:= )
iconv? ( virtual/libiconv )
- imlib? ( media-libs/imlib2[X] )
+ imlib? ( >=media-libs/imlib2-1.11.0[X] )
irc? ( net-libs/libircclient )
lua-cairo? ( x11-libs/cairo[X] )
- lua-imlib? ( media-libs/imlib2[X] )
+ lua-imlib? ( >=media-libs/imlib2-1.11.0[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-libs/libpulse )
- rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+ rss? (
+ dev-libs/libxml2
+ net-misc/curl
+ dev-libs/glib:2
+ )
systemd? ( sys-apps/systemd )
- truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ truetype? (
+ x11-libs/libXft
+ >=media-libs/freetype-2
+ )
wayland? (
dev-libs/wayland
- dev-libs/wayland-protocols
x11-libs/pango
)
wifi? ( net-wireless/wireless-tools )
- webserver? ( net-libs/libmicrohttpd )
+ webserver? ( net-libs/libmicrohttpd:= )
X? (
x11-libs/libX11
x11-libs/libXdamage
@@ -59,13 +71,15 @@ RDEPEND="
cmus? ( media-sound/cmus )
hddtemp? ( app-admin/hddtemp )
moc? ( media-sound/moc )
- extras? (
- app-editors/nano
- || ( app-editors/vim app-editors/gvim )
- )
"
DEPEND="
${COMMON_DEPEND}
+ test? (
+ dev-cpp/catch
+ )
+ wayland? (
+ dev-libs/wayland-protocols
+ )
"
BDEPEND="
doc? (
@@ -91,6 +105,7 @@ python_check_deps() {
}
REQUIRED_USE="
+ ${LUA_REQUIRED_USE}
imlib? ( X )
lua-cairo? ( X bundled-toluapp )
lua-imlib? ( X bundled-toluapp )
@@ -105,7 +120,7 @@ CONFIG_CHECK="~IPV6"
DOCS=( README.md AUTHORS )
DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
+DOC_CONTENTS="You can find sample configurations at /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 https://conky.cc/.
@@ -121,6 +136,10 @@ pkg_setup() {
}
src_prepare() {
+ # pin lua 5.4
+ sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \
+ cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
+
cmake_src_prepare
xdg_environment_reset
}
@@ -134,7 +153,9 @@ src_configure() {
-DBUILD_X11=yes
-DBUILD_XDAMAGE=yes
-DBUILD_XDBE=yes
+ -DBUILD_XFIXES=yes
-DBUILD_XSHAPE=yes
+ -DBUILD_XINPUT=yes
-DBUILD_MOUSE_EVENTS=yes
-DOWN_WINDOW=yes
)
@@ -177,6 +198,7 @@ src_configure() {
-DBUILD_PORT_MONITORS=$(usex portmon)
-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-DBUILD_RSS=$(usex rss)
+ -DBUILD_TESTS=$(usex test)
-DBUILD_WAYLAND=$(usex wayland)
-DBUILD_WLAN=$(usex wifi)
-DBUILD_XFT=$(usex truetype)
diff --git a/app-admin/conky/conky-1.15.0.ebuild b/app-admin/conky/conky-1.20.2-r1.ebuild
index 640060b9264d..f134905d992c 100644
--- a/app-admin/conky/conky-1.15.0.ebuild
+++ b/app-admin/conky/conky-1.20.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-LUA_COMPAT=( lua5-3 )
-PYTHON_COMPAT=( python{3_9,3_10,3_11} )
+LUA_COMPAT=( lua5-4 )
+PYTHON_COMPAT=( python3_{10,11,12} )
inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
@@ -16,33 +16,51 @@ LICENSE="GPL-3 BSD LGPL-2.1 MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
- intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
- mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
- webserver wifi X xinerama xmms2"
+ intel-backlight iostats irc lua-cairo lua-cairo-xlib lua-imlib lua-rsvg
+ math moc mpd mysql ncurses nvidia +portmon pulseaudio rss systemd test
+ thinkpad truetype wayland webserver wifi X xinerama xmms2"
+RESTRICT="!test? ( test )"
+
+# Note: toluapp is bundled in conky since 1.11.2
+# Note: maintainer mode "-DMAINTAINER_MODE=yes" sets CMAKE_BUILD_TYPE Debug
+# which creates debug symbols and enables "-DBUILD_TESTS" which also
+# results in conky_core debug library getting installed
COMMON_DEPEND="
curl? ( net-misc/curl )
ical? ( dev-libs/libical:= )
iconv? ( virtual/libiconv )
- imlib? ( media-libs/imlib2[X] )
+ imlib? ( >=media-libs/imlib2-1.11.0[X] )
irc? ( net-libs/libircclient )
- lua-cairo? ( x11-libs/cairo[X] )
- lua-imlib? ( media-libs/imlib2[X] )
+ lua-cairo? ( x11-libs/cairo[X?] )
+ lua-cairo-xlib? ( x11-libs/cairo[X] )
+ lua-imlib? ( >=media-libs/imlib2-1.11.0[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-libs/libpulse )
- rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+ rss? (
+ dev-libs/libxml2
+ dev-libs/glib:2
+ )
systemd? ( sys-apps/systemd )
- truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ truetype? (
+ x11-libs/libXft
+ >=media-libs/freetype-2
+ )
+ wayland? (
+ dev-libs/wayland
+ x11-libs/pango
+ )
wifi? ( net-wireless/wireless-tools )
- webserver? ( net-libs/libmicrohttpd )
+ webserver? ( net-libs/libmicrohttpd:= )
X? (
- x11-libs/libX11
x11-libs/libXdamage
x11-libs/libXfixes
x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libX11
)
xinerama? ( x11-libs/libXinerama )
xmms2? ( media-sound/xmms2 )
@@ -54,13 +72,15 @@ RDEPEND="
cmus? ( media-sound/cmus )
hddtemp? ( app-admin/hddtemp )
moc? ( media-sound/moc )
- extras? (
- app-editors/nano
- || ( app-editors/vim app-editors/gvim )
- )
"
DEPEND="
${COMMON_DEPEND}
+ test? (
+ dev-cpp/catch
+ )
+ wayland? (
+ dev-libs/wayland-protocols
+ )
"
BDEPEND="
doc? (
@@ -76,6 +96,7 @@ BDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
')
)
+ wayland? ( dev-util/wayland-scanner )
"
python_check_deps() {
@@ -85,11 +106,14 @@ python_check_deps() {
}
REQUIRED_USE="
+ ${LUA_REQUIRED_USE}
imlib? ( X )
- lua-cairo? ( X bundled-toluapp )
- lua-imlib? ( X bundled-toluapp )
- lua-rsvg? ( X bundled-toluapp )
+ lua-cairo? ( || ( X wayland ) bundled-toluapp )
+ lua-cairo-xlib? ( X bundled-toluapp )
+ lua-imlib? ( X bundled-toluapp )
+ lua-rsvg? ( || ( X wayland ) bundled-toluapp )
nvidia? ( X )
+ rss? ( curl )
truetype? ( X )
xinerama? ( X )
"
@@ -99,7 +123,7 @@ CONFIG_CHECK="~IPV6"
DOCS=( README.md AUTHORS )
DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
+DOC_CONTENTS="You can find sample configurations at /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 https://conky.cc/.
@@ -115,6 +139,10 @@ pkg_setup() {
}
src_prepare() {
+ # pin lua 5.4
+ sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \
+ cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
+
cmake_src_prepare
xdg_environment_reset
}
@@ -124,12 +152,15 @@ src_configure() {
if use X; then
mycmakeargs+=(
- -DBUILD_ARGB=yes
- -DBUILD_X11=yes
+ -DOWN_WINDOW=yes
-DBUILD_XDAMAGE=yes
+ -DBUILD_XFIXES=yes
+ -DBUILD_ARGB=yes
-DBUILD_XDBE=yes
-DBUILD_XSHAPE=yes
- -DOWN_WINDOW=yes
+ -DBUILD_XINPUT=yes
+ -DBUILD_MOUSE_EVENTS=yes
+ -DBUILD_X11=yes
)
else
mycmakeargs+=(
@@ -158,6 +189,7 @@ src_configure() {
-DBUILD_IRC=$(usex irc)
-DBUILD_JOURNAL=$(usex systemd)
-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+ -DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib)
-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-DBUILD_MATH=$(usex math)
@@ -170,6 +202,8 @@ src_configure() {
-DBUILD_PORT_MONITORS=$(usex portmon)
-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-DBUILD_RSS=$(usex rss)
+ -DBUILD_TESTS=$(usex test)
+ -DBUILD_WAYLAND=$(usex wayland)
-DBUILD_WLAN=$(usex wifi)
-DBUILD_XFT=$(usex truetype)
-DBUILD_XINERAMA=$(usex xinerama)
diff --git a/app-admin/conky/conky-1.21.1.ebuild b/app-admin/conky/conky-1.21.1.ebuild
new file mode 100644
index 000000000000..d76b4731f0d6
--- /dev/null
+++ b/app-admin/conky/conky-1.21.1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+PYTHON_COMPAT=( python3_{10,11,12} )
+
+inherit cmake linux-info lua-single python-any-r1 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 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus colour-name-map curl doc extras hddtemp ical
+ iconv imlib intel-backlight iostats irc lua-cairo lua-cairo-xlib
+ lua-imlib lua-rsvg math moc mpd mysql ncurses nvidia +portmon
+ pulseaudio rss systemd test thinkpad truetype wayland webserver wifi X
+ xinerama xmms2"
+RESTRICT="!test? ( test )"
+
+# Note: toluapp is bundled in conky since 1.11.2
+# Note: maintainer mode "-DMAINTAINER_MODE=yes" sets CMAKE_BUILD_TYPE Debug
+# which creates debug symbols and enables "-DBUILD_TESTS" which also
+# results in conky_core debug library getting installed
+
+COMMON_DEPEND="
+ curl? ( net-misc/curl )
+ ical? ( dev-libs/libical:= )
+ iconv? ( virtual/libiconv )
+ imlib? ( >=media-libs/imlib2-1.11.0[X] )
+ irc? ( net-libs/libircclient )
+ lua-cairo? ( x11-libs/cairo[X?] )
+ lua-cairo-xlib? ( x11-libs/cairo[X] )
+ lua-imlib? ( >=media-libs/imlib2-1.11.0[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-libs/libpulse )
+ rss? (
+ dev-libs/libxml2
+ dev-libs/glib:2
+ )
+ systemd? ( sys-apps/systemd )
+ truetype? (
+ x11-libs/libXft
+ >=media-libs/freetype-2
+ )
+ wayland? (
+ dev-libs/wayland
+ x11-libs/pango
+ )
+ wifi? ( net-wireless/wireless-tools )
+ webserver? ( net-libs/libmicrohttpd:= )
+ X? (
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libX11
+ )
+ xinerama? ( x11-libs/libXinerama )
+ xmms2? ( media-sound/xmms2 )
+ ${LUA_DEPS}
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ apcupsd? ( sys-power/apcupsd )
+ cmus? ( media-sound/cmus )
+ hddtemp? ( app-admin/hddtemp )
+ moc? ( media-sound/moc )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ test? (
+ dev-cpp/catch
+ )
+ wayland? (
+ dev-libs/wayland-protocols
+ )
+"
+BDEPEND="
+ colour-name-map? (
+ dev-util/gperf
+ )
+ doc? (
+ virtual/pandoc
+ $(python_gen_any_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ ')
+ )
+ extras? (
+ $(python_gen_any_dep '
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ ')
+ )
+ wayland? ( dev-util/wayland-scanner )
+"
+
+python_check_deps() {
+ use doc || use extras || return 0
+ python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+ python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+REQUIRED_USE="
+ ${LUA_REQUIRED_USE}
+ imlib? ( X )
+ lua-cairo? ( || ( X wayland ) bundled-toluapp )
+ lua-cairo-xlib? ( X bundled-toluapp )
+ lua-imlib? ( X bundled-toluapp )
+ lua-rsvg? ( || ( X wayland ) bundled-toluapp )
+ nvidia? ( X )
+ rss? ( curl )
+ truetype? ( X )
+ xinerama? ( X )
+"
+
+CONFIG_CHECK="~IPV6"
+
+DOCS=( README.md AUTHORS )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at /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 https://conky.cc/.
+
+Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ lua-single_pkg_setup
+ if use doc || use extras; then
+ python-any-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # pin lua 5.4
+ sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \
+ cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
+
+ cmake_src_prepare
+ xdg_environment_reset
+}
+
+src_configure() {
+ local mycmakeargs=()
+
+ if use X; then
+ mycmakeargs+=(
+ -DOWN_WINDOW=yes
+ -DBUILD_XDAMAGE=yes
+ -DBUILD_XFIXES=yes
+ -DBUILD_ARGB=yes
+ -DBUILD_XDBE=yes
+ -DBUILD_XSHAPE=yes
+ -DBUILD_XINPUT=yes
+ -DBUILD_MOUSE_EVENTS=yes
+ -DBUILD_X11=yes
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_X11=no
+ )
+ fi
+
+ mycmakeargs+=(
+ -DBUILD_APCUPSD=$(usex apcupsd)
+ -DBUILD_AUDACIOUS=no
+ -DBUILD_BUILTIN_CONFIG=yes
+ -DBUILD_CMUS=$(usex cmus)
+ -DBUILD_COLOUR_NAME_MAP=$(usex colour-name-map)
+ -DBUILD_CURL=$(usex curl)
+ -DBUILD_DOCS=$(usex doc)
+ -DBUILD_EXTRAS=$(usex extras)
+ -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_INTEL_BACKLIGHT=$(usex intel-backlight)
+ -DBUILD_IOSTATS=$(usex iostats)
+ -DBUILD_IPV6=yes
+ -DBUILD_IRC=$(usex irc)
+ -DBUILD_JOURNAL=$(usex systemd)
+ -DBUILD_LUA_CAIRO=$(usex lua-cairo)
+ -DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib)
+ -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_TESTS=$(usex test)
+ -DBUILD_WAYLAND=$(usex wayland)
+ -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
+ )
+
+ if use doc || use extras; then
+ mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use extras; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
+
+ insinto /usr/share/nano/
+ doins "${BUILD_DIR}"/extras/nano/conky.nanorc
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ xdg_pkg_postinst
+}
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 41e021e389b6..0a8b212cb2c9 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -7,7 +7,7 @@
</maintainer>
<upstream>
<maintainer>
- <email>brenden@rty.ca</email>
+ <email>brenden@brndn.io</email>
<name>Brenden Matthews</name>
</maintainer>
<remote-id type="sourceforge">conky</remote-id>
@@ -18,22 +18,22 @@
<flag name="apcupsd">Enable support for <pkg>sys-power/apcupsd</pkg></flag>
<flag name="bundled-toluapp">Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags</flag>
<flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag>
+ <flag name="colour-name-map">Include mappings of colour name</flag>
<flag name="extras">Enable syntax highlighting for <pkg>app-editors/nano</pkg>and app-editors/vim</flag>
<flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag>
<flag name="intel-backlight">Enable support for Intel backlight</flag>
<flag name="iostats">Enable support for per-task I/O statistics</flag>
<flag name="irc">Enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag>
<flag name="lua-cairo">Enable if you want Lua Cairo bindings</flag>
+ <flag name="lua-cairo-xlib">Enable support for Cairo and Xlib interoperability for Lua</flag>
<flag name="lua-imlib">Enable if you want Lua Imlib2 bindings</flag>
<flag name="lua-rsvg">Enable if you want Lua RSVG bindings</flag>
<flag name="math">Enable support for glibc's libm math library</flag>
<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="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>
<flag name="webserver">Enable support to act as a webserver serving conkys output using <pkg>net-libs/libmicrohttpd</pkg></flag>
<flag name="xmms2">Enable monitoring of music played by <pkg>media-sound/xmms2</pkg></flag>
</use>