From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ECAE5138334 for ; Sat, 9 Mar 2019 07:32:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1BD6E0833; Sat, 9 Mar 2019 07:32:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95C72E0833 for ; Sat, 9 Mar 2019 07:32:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B583335C94 for ; Sat, 9 Mar 2019 07:32:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F67D559 for ; Sat, 9 Mar 2019 07:32:40 +0000 (UTC) From: "Daniel Pielmeier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Daniel Pielmeier" Message-ID: <1552116751.6cd4ecbd35b4860a5703828e3fe23969eb9fc2ec.billie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/, app-admin/conky/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/conky/conky-1.10.8-r7.ebuild app-admin/conky/files/conky-1.10.8-portmon.patch X-VCS-Directories: app-admin/conky/files/ app-admin/conky/ X-VCS-Committer: billie X-VCS-Committer-Name: Daniel Pielmeier X-VCS-Revision: 6cd4ecbd35b4860a5703828e3fe23969eb9fc2ec X-VCS-Branch: master Date: Sat, 9 Mar 2019 07:32:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d41943ab-a0bd-4050-97d6-343476643620 X-Archives-Hash: 17c63823bf16eef5c151670860bd0ed9 commit: 6cd4ecbd35b4860a5703828e3fe23969eb9fc2ec Author: Daniel Pielmeier gentoo org> AuthorDate: Sat Mar 9 07:32:31 2019 +0000 Commit: Daniel Pielmeier gentoo org> CommitDate: Sat Mar 9 07:32:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cd4ecbd app-admin/conky: Revision bump to conky-1.10.8-r7. Fix library install path for portmon patch. Signed-off-by: Daniel Pielmeier gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-admin/conky/conky-1.10.8-r7.ebuild | 184 +++++++++++++++++++++++ app-admin/conky/files/conky-1.10.8-portmon.patch | 19 ++- 2 files changed, 196 insertions(+), 7 deletions(-) diff --git a/app-admin/conky/conky-1.10.8-r7.ebuild b/app-admin/conky/conky-1.10.8-r7.ebuild new file mode 100644 index 00000000000..e44e22636d2 --- /dev/null +++ b/app-admin/conky/conky-1.10.8-r7.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils linux-info readme.gentoo-r1 + +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 cmus curl eve 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 xmms2" + +COMMON_DEPEND=" + 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? ( x11-drivers/nvidia-drivers[tools,static-libs] ) + truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) + x11-libs/libX11 + x11-libs/libXdamage + x11-libs/libXinerama + x11-libs/libXfixes + x11-libs/libXext + 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? ( dev-db/mysql-connector-c ) + ncurses? ( sys-libs/ncurses:= ) + pulseaudio? ( media-sound/pulseaudio ) + rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) + systemd? ( sys-apps/systemd ) + wifi? ( net-wireless/wireless-tools ) + weather-metar? ( net-misc/curl ) + webserver? ( net-libs/libmicrohttpd ) + || ( dev-lang/lua:0 dev-lang/lua:5.1 ) +" +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} + app-text/docbook2X +" + +CONFIG_CHECK=~IPV6 + +DOCS=( README.md TODO ChangeLog NEWS AUTHORS ) + +PATCHES=( + "${FILESDIR}"/${P}-use-pkgconfig.patch + "${FILESDIR}"/${P}-libical-3.patch + "${FILESDIR}"/${P}-portmon.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. + +Also see https://wiki.gentoo.org/wiki/Conky/HOWTO" + +pkg_setup() { + use ipv6 && linux-info_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + 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_X11=ON + -DOWN_WINDOW=ON + -DBUILD_XDAMAGE=ON + -DBUILD_XINERAMA=ON + -DBUILD_XDBE=ON + -DBUILD_XFT=$(usex truetype) + -DBUILD_IMLIB2=$(usex imlib) + -DBUILD_XSHAPE=ON + -DBUILD_ARGB=ON + -DBUILD_LUA_CAIRO=$(usex lua-cairo) + -DBUILD_LUA_IMLIB2=$(usex lua-imlib) + -DBUILD_LUA_RSVG=$(usex lua-rsvg) + -DBUILD_NVIDIA=$(usex nvidia) + -DBUILD_XMMS2=$(usex xmms2) + ) + else + mycmakeargs=( + -DBUILD_X11=OFF + -DBUILD_NVIDIA=OFF + -DBUILD_LUA_CAIRO=OFF + -DBUILD_LUA_IMLIB2=OFF + -DBUILD_LUA_RSVG=OFF + -DBUILD_XMMS2=OFF + ) + fi + + mycmakeargs+=( + -DBUILD_APCUPSD=$(usex apcupsd) + -DBUILD_CMUS=$(usex cmus) + -DBUILD_CURL=$(usex curl) + -DBUILD_EVE=$(usex eve) + -DBUILD_HDDTEMP=$(usex hddtemp) + -DBUILD_IOSTATS=$(usex iostats) + -DBUILD_ICAL=$(usex ical) + -DBUILD_ICONV=$(usex iconv) + -DBUILD_IPV6=$(usex ipv6) + -DBUILD_IRC=$(usex irc) + -DBUILD_MATH=$(usex math) + -DBUILD_MOC=$(usex moc) + -DBUILD_MPD=$(usex mpd) + -DBUILD_MYSQL=$(usex mysql) + -DBUILD_NCURSES=$(usex ncurses) + -DBUILD_PORT_MONITORS=$(usex portmon) + -DBUILD_PULSEAUDIO=$(usex pulseaudio) + -DBUILD_RSS=$(usex rss) + -DBUILD_JOURNAL=$(usex systemd) + -DBUILD_IBM=$(usex thinkpad) + -DBUILD_HTTP=$(usex webserver) + -DBUILD_WEATHER_METAR=$(usex weather-metar) + -DBUILD_WLAN=$(usex wifi) + -DBUILD_BUILTIN_CONFIG=ON + -DBUILD_OLD_CONFIG=ON + -DBUILD_I18N=ON + -DMAINTAINER_MODE=ON + -DRELEASE=ON + -DBUILD_AUDACIOUS=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 + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/app-admin/conky/files/conky-1.10.8-portmon.patch b/app-admin/conky/files/conky-1.10.8-portmon.patch index b2f5b2b1c08..bce3853c2b0 100644 --- a/app-admin/conky/files/conky-1.10.8-portmon.patch +++ b/app-admin/conky/files/conky-1.10.8-portmon.patch @@ -1,15 +1,20 @@ ---- conky-1.10.8/src/CMakeLists.txt 2019-03-08 22:42:25.952357096 +0100 -+++ conky-1.10.8/src/CMakeLists.txt 2019-03-08 22:42:07.776357462 +0100 -@@ -223,3 +223,12 @@ - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib +--- conky-1.10.8/src/CMakeLists.txt 2019-03-09 08:24:26.315879386 +0100 ++++ conky-1.10.8/src/CMakeLists.txt 2019-03-09 08:24:38.555878656 +0100 +@@ -220,6 +220,15 @@ + install(TARGETS + conky + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/conky ++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/conky ) + +if(BUILD_PORT_MONITORS) + install(TARGETS + tcp-portmon + RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib64 -+ ARCHIVE DESTINATION lib64 ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}/conky ++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}/conky +) +endif(BUILD_PORT_MONITORS)