commit: 984a9dac7dbc2516494ca35c9a620dcf390bfd90
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 5 17:40:01 2020 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> 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 <billie <AT> 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
