diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
commit | 09351e78166b5e864197c4456ebae3f89dd0bed9 (patch) | |
tree | 41a96399f56ed3aa399006871bfce4430db84aa2 /app-admin/conky | |
parent | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff) |
gentoo resync : 22.01.2019
Diffstat (limited to 'app-admin/conky')
-rw-r--r-- | app-admin/conky/Manifest | 4 | ||||
-rw-r--r-- | app-admin/conky/conky-1.10.8-r4.ebuild | 4 | ||||
-rw-r--r-- | app-admin/conky/conky-1.10.8-r5.ebuild (renamed from app-admin/conky/conky-1.10.8-r3.ebuild) | 43 |
3 files changed, 16 insertions, 35 deletions
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index d29e0d536a61..e8ed53db6175 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -3,6 +3,6 @@ AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a EBUILD conky-1.10.8-r1.ebuild 5148 BLAKE2B bb6889a8179156c0b53afc5650d7a12ccd9822ce71996301a77f093a835a78d9c7798fb5f3dd8d8e6263c1a1c7a2f1b1b84a3cfc932c2f7028a5973c7a536956 SHA512 94e69572ab007c4fe2b1289b2b6073031c7975ea7c0339ec34326d74a185858acb9677621f69043fe51caa79bb9b5df005b319d100bf05257c6126e654fa2bc6 -EBUILD conky-1.10.8-r3.ebuild 5175 BLAKE2B beabef522d97c4a2bf565824f2d58ee4cec4ded348789142fac8c20dcb2e266bdd70da896b48c36a9c9a93347ed527d691ae7be2c8d18b1969614e99f2b7712a SHA512 d8a054c323877a249502ca41661336e04ce8a2dae4dfaabf092d4b2e6a37ee763e3dc730c75365ce562d3f843f790c5e8654ae732c5b56e1e499f81ca2851b29 -EBUILD conky-1.10.8-r4.ebuild 4727 BLAKE2B c2e8bdd83c6a811595b7f5210d45a3e003f18b75a3b42558154897f945539538e2ccead510cda94378cd322a056be49dbf7f4f0d3b19c21d5f63292efe81a56b SHA512 eec2f0d04eff1ca91c4f8766d4be1b7784966c22d50ab3cf562ed636fbf29e643fdc9902647bdf1aedcf50f28aa694b31734c1c18e9353d9451c44a0c856524d +EBUILD conky-1.10.8-r4.ebuild 4723 BLAKE2B 93de51c63f3370998e3bb2f9904555108a07a2bd191631c4c52b191ec37acb2fd767a1bdcb7831af2b1a89965a29dfadf8588683f3fc8c7830f78271f002db99 SHA512 47692933de7e683ad3a7007ce01ce3497c0b204ca7773b4531dcd2ee41ef95d587a2f2cb7bd6c4f4128851283bf5536a05dd91f815ef7ce95b0b5a6c6a575ccf +EBUILD conky-1.10.8-r5.ebuild 4723 BLAKE2B f8cec52cb3d048a9ee66e3a73a938697fa6e15309d1a6e3750e95978c4d47e5574c384089e703688ebafbb86b6e20c855893be67db834de2ee63862c07451b9b SHA512 c94c6cc8f40c9e4ea59ad14b11a41a1c95d2ed817774ea6ccf2e72979b16d12ec5c570dc95de8fec98ad00fbd10e1e569aedc82806f38ecdea8208cf914dc98e MISC metadata.xml 2524 BLAKE2B c86460a6b065874ba17b35f4aba4240424a71bddf0d6648555d936259a2e9ef46ae373bcfc91a5382edd79e830945baef6c54eff52ed88a7f6648254c447675b SHA512 7f9aa6dcd65d7e4a9e1829cb273329b08cadec8820afb65de5e9fb189981b7084384e759909365adad36ea587161c6eb5a193363cc1a95e0aef65434ab827d55 diff --git a/app-admin/conky/conky-1.10.8-r4.ebuild b/app-admin/conky/conky-1.10.8-r4.ebuild index a2bc7d317c41..44866c4ce035 100644 --- a/app-admin/conky/conky-1.10.8-r4.ebuild +++ b/app-admin/conky/conky-1.10.8-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-3 BSD LGPL-2.1 MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +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 diff --git a/app-admin/conky/conky-1.10.8-r3.ebuild b/app-admin/conky/conky-1.10.8-r5.ebuild index 55ef2440069d..aded0ff23a49 100644 --- a/app-admin/conky/conky-1.10.8-r3.ebuild +++ b/app-admin/conky/conky-1.10.8-r5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-utils linux-info readme.gentoo-r1 @@ -12,10 +12,10 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-3 BSD LGPL-2.1 MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc +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 weather-xoap webserver wifi X xmms2" + weather-metar webserver wifi X xmms2" COMMON_DEPEND=" X? ( @@ -30,7 +30,6 @@ COMMON_DEPEND=" x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext - audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) @@ -46,10 +45,9 @@ COMMON_DEPEND=" systemd? ( sys-apps/systemd ) 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=" ${COMMON_DEPEND} apcupsd? ( sys-power/apcupsd ) @@ -57,11 +55,11 @@ RDEPEND=" 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 @@ -73,12 +71,12 @@ PATCHES=( ) DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}. +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. +or in ${ROOT}/usr/share/doc/${PF}/html. Also see https://wiki.gentoo.org/wiki/Conky/HOWTO" @@ -111,7 +109,6 @@ src_configure() { -DBUILD_LUA_IMLIB2=$(usex lua-imlib) -DBUILD_LUA_RSVG=$(usex lua-rsvg) -DBUILD_NVIDIA=$(usex nvidia) - -DBUILD_AUDACIOUS=$(usex audacious) -DBUILD_XMMS2=$(usex xmms2) ) else @@ -121,28 +118,10 @@ src_configure() { -DBUILD_LUA_CAIRO=OFF -DBUILD_LUA_IMLIB2=OFF -DBUILD_LUA_RSVG=OFF - -DBUILD_AUDACIOUS=OFF -DBUILD_XMMS2=OFF ) fi - if use weather-xoap; then - mycmakeargs+=( - -DBUILD_WEATHER_XOAP=ON - -DBUILD_WEATHER_METAR=ON - ) - elif use weather-metar; then - mycmakeargs+=( - -DBUILD_WEATHER_METAR=ON - -DBUILD_WEATHER_XOAP=$(usex weather-xoap) - ) - else - mycmakeargs+=( - -DBUILD_WEATHER_XOAP=OFF - -DBUILD_WEATHER_METAR=OFF - ) - fi - mycmakeargs+=( -DBUILD_APCUPSD=$(usex apcupsd) -DBUILD_CMUS=$(usex cmus) @@ -165,12 +144,14 @@ src_configure() { -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=OFF + -DBUILD_OLD_CONFIG=ON -DBUILD_I18N=ON -DMAINTAINER_MODE=ON -DRELEASE=ON + -DBUILD_AUDACIOUS=OFF -DBUILD_BMPX=OFF -DDOC_PATH=/usr/share/doc/${PF} ) |