summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Pielmeier <billie@gentoo.org>2020-08-05 19:40:01 +0200
committerDaniel Pielmeier <billie@gentoo.org>2020-08-05 19:40:01 +0200
commit984a9dac7dbc2516494ca35c9a620dcf390bfd90 (patch)
tree1e3b5d36486bddcaa6f8283d285530feff2a7e36
parentapp-crypt/certbot-nginx: 1.7.0 bump (diff)
downloadgentoo-984a9dac7dbc2516494ca35c9a620dcf390bfd90.tar.gz
gentoo-984a9dac7dbc2516494ca35c9a620dcf390bfd90.tar.bz2
gentoo-984a9dac7dbc2516494ca35c9a620dcf390bfd90.zip
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@gentoo.org>
-rw-r--r--app-admin/conky/Manifest1
-rw-r--r--app-admin/conky/conky-1.10.8-r9.ebuild8
-rw-r--r--app-admin/conky/conky-1.11.5.ebuild10
-rw-r--r--app-admin/conky/conky-1.11.6.ebuild184
4 files changed, 194 insertions, 9 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.6.ebuild b/app-admin/conky/conky-1.11.6.ebuild
new file mode 100644
index 00000000000..fcd0a663770
--- /dev/null
+++ b/app-admin/conky/conky-1.11.6.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info 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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus curl doc 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? (
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ x11-libs/libXfixes
+ x11-libs/libXext
+ )
+ 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 )
+ xmms2? ( media-sound/xmms2 )
+ || ( dev-lang/lua:5.3 dev-lang/lua:5.2 )
+"
+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 )
+ nvidia? ( X )
+ truetype? ( X )
+ lua-cairo? ( X bundled-toluapp )
+ lua-imlib? ( X bundled-toluapp )
+ lua-rsvg? ( X bundled-toluapp )
+"
+
+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
+}
+
+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=ON
+ -DBUILD_X11=ON
+ -DBUILD_XDAMAGE=ON
+ -DBUILD_XDBE=ON
+ -DBUILD_XINERAMA=ON
+ -DBUILD_XSHAPE=ON
+ -DOWN_WINDOW=ON
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=OFF
+ )
+ fi
+
+ mycmakeargs+=(
+ -DBUILD_APCUPSD=$(usex apcupsd)
+ -DBUILD_AUDACIOUS=OFF
+ -DBUILD_BUILTIN_CONFIG=ON
+ -DBUILD_CMUS=$(usex cmus)
+ -DBUILD_CURL=$(usex curl)
+ -DBUILD_DOCS=$(usex doc)
+ -DBUILD_HDDTEMP=$(usex hddtemp)
+ -DBUILD_HTTP=$(usex webserver)
+ -DBUILD_I18N=ON
+ -DBUILD_IBM=$(usex thinkpad)
+ -DBUILD_ICAL=$(usex ical)
+ -DBUILD_ICONV=$(usex iconv)
+ -DBUILD_IMLIB2=$(usex imlib)
+ -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=ON
+ -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_XMMS2=$(usex xmms2)
+ -DDOC_PATH=/usr/share/doc/${PF}
+ -DMAINTAINER_MODE=OFF
+ -DRELEASE=ON
+ )
+
+ 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
+}