From 927765d9bc6d359f7dfe130a3c55c4721938e0ea Mon Sep 17 00:00:00 2001 From: Daniel Pielmeier Date: Mon, 28 Sep 2015 16:27:40 +0200 Subject: [PATCH] app-admin/conky: Version bump. Fixes bug 557500. Thanks to Aaron W. Swenson for the report. Package-Manager: portage-2.2.20.1 --- app-admin/conky/Manifest | 1 + app-admin/conky/conky-1.10.0.ebuild | 178 ++++++++++++++++++ .../conky/files/conky-1.10.0-cmake.patch | 11 ++ app-admin/conky/metadata.xml | 9 +- 4 files changed, 197 insertions(+), 2 deletions(-) create mode 100644 app-admin/conky/conky-1.10.0.ebuild create mode 100644 app-admin/conky/files/conky-1.10.0-cmake.patch diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index bf4df4e45b9d..e064cbf5c009 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1 +1,2 @@ +DIST conky-1.10.0.tar.gz 342584 SHA256 f392f3f91fcc37f04ff65d53957512e4d81b7b9b36394acb5ecaefe92623f8eb SHA512 08664c2c736c078848e4864f7a2df5ed536e683da6aa482cf003c675b03c274802cfd27127adb3d99145fe6c4103cc06046b40322383beafc4ca2e7e811b5caf WHIRLPOOL 03f8f80b483c8db09096a10a8d95b20372cbd5fb3e284b9bcd072c4ec1a2a4f76335eb5e8016a3e6793f295c143c71268e65fb5e50fdea0b3e6ce187830a6c46 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a diff --git a/app-admin/conky/conky-1.10.0.ebuild b/app-admin/conky/conky-1.10.0.ebuild new file mode 100644 index 000000000000..d6660ea8c7f0 --- /dev/null +++ b/app-admin/conky/conky-1.10.0.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools eutils libtool cmake-utils linux-info + +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="~amd64 ~ppc ~x86" +IUSE="apcupsd audacious cmus curl debug eve hddtemp ical iconv imlib iostats + ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax + ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar + weather-xoap webserver wifi X xmms2" + +DEPEND_COMMON=" + X? ( + imlib? ( media-libs/imlib2[X] ) + lua-cairo? ( + >=dev-lua/toluapp-1.0.93 + x11-libs/cairo[X] ) + lua-imlib? ( + >=dev-lua/toluapp-1.0.93 + media-libs/imlib2[X] ) + lua-rsvg? ( + >=dev-lua/toluapp-1.0.93 + gnome-base/librsvg ) + nvidia? ( media-video/nvidia-settings ) + truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) + x11-libs/libX11 + x11-libs/libXdamage + x11-libs/libXfixes + x11-libs/libXext + audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) + xmms2? ( media-sound/xmms2 ) + ) + cmus? ( media-sound/cmus ) + curl? ( net-misc/curl ) + eve? ( net-misc/curl dev-libs/libxml2 ) + ical? ( dev-libs/libical ) + iconv? ( virtual/libiconv ) + irc? ( net-libs/libircclient ) + mysql? ( >=virtual/mysql-5.0 ) + ncurses? ( sys-libs/ncurses:= ) + rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) + wifi? ( net-wireless/wireless-tools ) + weather-metar? ( net-misc/curl ) + weather-xoap? ( dev-libs/libxml2 net-misc/curl ) + webserver? ( net-libs/libmicrohttpd ) + >=dev-lang/lua-5.1.4-r8:0 + " +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} + " + +CONFIG_CHECK=IPV6 + +DOCS=( README TODO ChangeLog NEWS AUTHORS ) + +pkg_setup() { + use ipv6 && linux-info_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}/${P}-cmake.patch" + + # Allow user patches #478482 + # Only run autotools if user patched something + epatch_user && eautoreconf || elibtoolize +} + +src_configure() { + local mycmakeargs + + if use X; then + mycmakeargs="-DBUILD_X11=ON" + mycmakeargs="${mycmakeargs} -DOWN_WINDOW=ON" + mycmakeargs="${mycmakeargs} -DBUILD_XDAMAGE=ON" + mycmakeargs="${mycmakeargs} -DBUILD_XDBE=ON" + mycmakeargs="${mycmakeargs} $(cmake-utils_use_build truetype XFT)" + mycmakeargs="${mycmakeargs} $(cmake-utils_use_build imlib IMLIB2)" + mycmakeargs="${mycmakeargs} -DBUILD_XSHAPE=ON" + mycmakeargs="${mycmakeargs} -DBUILD_ARGB=ON" + mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-cairo LUA_CAIRO)" + mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-imlib LUA_IMLIB2)" + mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-rsvg LUA_RSVG)" + mycmakeargs="${mycmakeargs} $(cmake-utils_use_build nvidia)" + mycmakeargs="${mycmakeargs} $(cmake-utils_use_build audacious)" + mycmakeargs="${mycmakeargs} $(cmake-utils_use_build xmms2)" + else + mycmakeargs="-DBUILD_X11=OFF" + mycmakeargs="${mycmakeargs} -DBUILD_NVIDIA=OFF" + mycmakeargs="${mycmakeargs} -DBUILD_LUA_CAIRO=OFF" + mycmakeargs="${mycmakeargs} -DBUILD_LUA_IMLIB2=OFF" + mycmakeargs="${mycmakeargs} -DBUILD_LUA_RSVG=OFF" + mycmakeargs="${mycmakeargs} -DBUILD_AUDACIOUS=OFF" + mycmakeargs="${mycmakeargs} -DBUILD_XMMS2=OFF" + fi + + mycmakeargs="${mycmakeargs} + $(cmake-utils_use_build apcupsd) + $(cmake-utils_use_build debug) + $(cmake-utils_use_build cmus) + $(cmake-utils_use_build curl) + $(cmake-utils_use_build eve) + $(cmake-utils_use_build hddtemp) + $(cmake-utils_use_build iostats) + $(cmake-utils_use_build ical) + $(cmake-utils_use_build iconv) + $(cmake-utils_use_build ipv6) + $(cmake-utils_use_build irc) + $(cmake-utils_use_build math) + $(cmake-utils_use_build moc) + $(cmake-utils_use_build mpd) + $(cmake-utils_use_build mysql) + $(cmake-utils_use_build ncurses) + $(cmake-utils_use_build portmon PORT_MONITORS) + $(cmake-utils_use_build rss) + $(cmake-utils_use_build thinkpad IBM) + $(cmake-utils_use_build weather-metar WEATHER_METAR) + $(cmake-utils_use_build weather-xoap WEATHER_XOAP) + $(cmake-utils_use_build webserver HTTP) + $(cmake-utils_use_build wifi WLAN) + -DBUILD_BUILTIN_CONFIG=ON + -DBUILD_OLD_CONFIG=ON + -DBUILD_I18N=ON + -DMAINTAINER_MODE=ON + -DBUILD_AUDACIOUS_LEGACY=OFF + -DBUILD_BMPX=OFF + -DDOC_PATH=/usr/share/doc/${PF} + " + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_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 +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}." + elog "To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf" + elog "and edit it to your liking." + elog + elog "There are pretty html docs available at the conky homepage" + elog "or in ${ROOT%/}/usr/share/doc/${PF}/html." + elog + elog "Also see https://wiki.gentoo.org/wiki/Conky/HOWTO" + elog + fi +} diff --git a/app-admin/conky/files/conky-1.10.0-cmake.patch b/app-admin/conky/files/conky-1.10.0-cmake.patch new file mode 100644 index 000000000000..4f9d276a2e10 --- /dev/null +++ b/app-admin/conky/files/conky-1.10.0-cmake.patch @@ -0,0 +1,11 @@ +--- cmake/Docbook.cmake 2014-06-21 09:51:44.857916287 +0200 ++++ cmake/Docbook.cmake.new 2014-06-21 09:53:37.251924303 +0200 +@@ -72,7 +72,7 @@ + COMMAND ${APP_XSLTPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html + + COMMAND ${APP_DB2X_XSLTPROC} -s man ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml -o ${FIL}.mxml +- COMMAND ${APP_DB2X_MANXML} ${FIL}.mxml --output-dir ${CMAKE_CURRENT_SOURCE_DIR} ++ COMMAND ${APP_DB2X_MANXML} ${FIL}.mxml --encoding=UTF8 --output-dir ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND ${APP_XSLTPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html + COMMAND ${APP_MAN} -P '${APP_LESS} -is' ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.1 > ${CMAKE_SOURCE_DIR}/README + COMMAND ${APP_SED} -i "s/[[:cntrl:]]\\[[0-9]*m//g" ${CMAKE_SOURCE_DIR}/README diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml index 81d6ebe98f1b..3a6465d3d03e 100644 --- a/app-admin/conky/metadata.xml +++ b/app-admin/conky/metadata.xml @@ -17,11 +17,15 @@ enable support for sys-power/apcupsd enable monitoring of music played by media-sound/audacious + enable monitoring of music played by media-sound/cmus enable support for the eve-online skill monitor + enable support for events from iCalendar (RFC 5545) files using dev-libs/libical enable support for per-task I/O statistics + enable support for displaying everything from an irc channel using net-libs/libircclient 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 if you want Lua Cairo bindings + enable if you want Lua Imlib2 bindings + enable if you want Lua RSVG bindings 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 @@ -31,6 +35,7 @@ enable support for IBM/Lenovo notebooks enable support for metar weather service enable support for metar and xoap weather service + enable support to act as a webserver serving conkys output using net-libs/libmicrohttpd enable monitoring of music played by media-sound/xmms2 -- 2.26.2