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 5A773138359 for ; Wed, 5 Aug 2020 17:40:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E50BE075F; Wed, 5 Aug 2020 17:40:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 47962E075F for ; Wed, 5 Aug 2020 17:40:37 +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 E3D2A34F443 for ; Wed, 5 Aug 2020 17:40:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68C479C for ; Wed, 5 Aug 2020 17:40:19 +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: <1596649201.984a9dac7dbc2516494ca35c9a620dcf390bfd90.billie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/conky/Manifest app-admin/conky/conky-1.10.8-r9.ebuild app-admin/conky/conky-1.11.5.ebuild app-admin/conky/conky-1.11.6.ebuild X-VCS-Directories: app-admin/conky/ X-VCS-Committer: billie X-VCS-Committer-Name: Daniel Pielmeier X-VCS-Revision: 984a9dac7dbc2516494ca35c9a620dcf390bfd90 X-VCS-Branch: master Date: Wed, 5 Aug 2020 17:40:19 +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: b5b6a4a3-6b36-4283-89b3-8ea4d4ed4f5f X-Archives-Hash: 8070490164e64270265eae89cb7886e3 commit: 984a9dac7dbc2516494ca35c9a620dcf390bfd90 Author: Daniel Pielmeier gentoo org> AuthorDate: Wed Aug 5 17:40:01 2020 +0000 Commit: Daniel Pielmeier gentoo org> CommitDate: Wed Aug 5 17:40:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=984a9dac app-admin/conky: Version bump to conky-1.11.6. Switch from cmake-utils to cmake eclass. Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Daniel Pielmeier gentoo.org> app-admin/conky/Manifest | 1 + app-admin/conky/conky-1.10.8-r9.ebuild | 8 ++++---- app-admin/conky/conky-1.11.5.ebuild | 10 +++++----- app-admin/conky/{conky-1.11.5.ebuild => conky-1.11.6.ebuild} | 10 +++++----- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index 3014b5102be..927fdccfdb0 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,2 +1,3 @@ DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a DIST conky-1.11.5.tar.gz 2400965 BLAKE2B 06b6817ed3cb4bb638b5fa7f9a5f8544c9d274560dbef2bc8f8c10ed681b83d0ab27988f60bed70cd0c13cd4947a2bd9b70ad66c38dbb6f516f5d57165ef5765 SHA512 71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be +DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a diff --git a/app-admin/conky/conky-1.10.8-r9.ebuild b/app-admin/conky/conky-1.10.8-r9.ebuild index ce6929a5495..647b0da5a8b 100644 --- a/app-admin/conky/conky-1.10.8-r9.ebuild +++ b/app-admin/conky/conky-1.10.8-r9.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils linux-info readme.gentoo-r1 +inherit cmake linux-info readme.gentoo-r1 DESCRIPTION="An advanced, highly configurable system monitor for X" HOMEPAGE="https://github.com/brndnmtthws/conky" @@ -87,7 +87,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \ cmake/ConkyPlatformChecks.cmake || die @@ -158,11 +158,11 @@ src_configure() { -DDOC_PATH=/usr/share/doc/${PF} ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install if use vim-syntax; then insinto /usr/share/vim/vimfiles/ftdetect diff --git a/app-admin/conky/conky-1.11.5.ebuild b/app-admin/conky/conky-1.11.5.ebuild index a52ce080d2f..fcd0a663770 100644 --- a/app-admin/conky/conky-1.11.5.ebuild +++ b/app-admin/conky/conky-1.11.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils linux-info readme.gentoo-r1 xdg +inherit cmake linux-info readme.gentoo-r1 xdg DESCRIPTION="An advanced, highly configurable system monitor for X" HOMEPAGE="https://github.com/brndnmtthws/conky" @@ -88,7 +88,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare xdg_environment_reset @@ -155,11 +155,11 @@ src_configure() { -DRELEASE=ON ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install if use vim-syntax; then insinto /usr/share/vim/vimfiles/ftdetect diff --git a/app-admin/conky/conky-1.11.5.ebuild b/app-admin/conky/conky-1.11.6.ebuild similarity index 96% copy from app-admin/conky/conky-1.11.5.ebuild copy to app-admin/conky/conky-1.11.6.ebuild index a52ce080d2f..fcd0a663770 100644 --- a/app-admin/conky/conky-1.11.5.ebuild +++ b/app-admin/conky/conky-1.11.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils linux-info readme.gentoo-r1 xdg +inherit cmake linux-info readme.gentoo-r1 xdg DESCRIPTION="An advanced, highly configurable system monitor for X" HOMEPAGE="https://github.com/brndnmtthws/conky" @@ -88,7 +88,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare xdg_environment_reset @@ -155,11 +155,11 @@ src_configure() { -DRELEASE=ON ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install if use vim-syntax; then insinto /usr/share/vim/vimfiles/ftdetect