diff options
Diffstat (limited to 'app-admin/conky')
| -rw-r--r-- | app-admin/conky/Manifest | 2 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.10.8-r4.ebuild (renamed from app-admin/conky/conky-1.10.8-r2.ebuild) | 51 |
2 files changed, 15 insertions, 38 deletions
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index e462d3a15648..f14e01773faf 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-r2.ebuild 5191 BLAKE2B 445b7242fa320a6c3b97b56f509903f2541ec2921ea80d18a7562f80ac055f074703dafdb3ee9ad6a5713a475f5d43ea7962de0c2c77e15d153b2af823a77f2a SHA512 799f8d1d097058cc1783ed13843a9795485f8a9462ecd4686579904a2c4461e2f149c07071e56f2ae6b5cdc0985f3117028801c2ebfea79e8534606e6c9a2c84 EBUILD conky-1.10.8-r3.ebuild 5175 BLAKE2B beabef522d97c4a2bf565824f2d58ee4cec4ded348789142fac8c20dcb2e266bdd70da896b48c36a9c9a93347ed527d691ae7be2c8d18b1969614e99f2b7712a SHA512 d8a054c323877a249502ca41661336e04ce8a2dae4dfaabf092d4b2e6a37ee763e3dc730c75365ce562d3f843f790c5e8654ae732c5b56e1e499f81ca2851b29 +EBUILD conky-1.10.8-r4.ebuild 4838 BLAKE2B fc223ec31a18119c8a1ca53dc5199ea8ac243fa0be83b42d71a84244707fd696287679f2423d5639c712a5428b2e7465bfd3f73621126471237964d4667f77df SHA512 ca508786932793bfc9c4e9bc02f2425b77c2813093f83fae7421f3e625a8c26c6e363cd1e5dbc8b9ddbc64cb704f3939c5f173012136986119ceea16499b0b43 MISC metadata.xml 2524 BLAKE2B c86460a6b065874ba17b35f4aba4240424a71bddf0d6648555d936259a2e9ef46ae373bcfc91a5382edd79e830945baef6c54eff52ed88a7f6648254c447675b SHA512 7f9aa6dcd65d7e4a9e1829cb273329b08cadec8820afb65de5e9fb189981b7084384e759909365adad36ea587161c6eb5a193363cc1a95e0aef65434ab827d55 diff --git a/app-admin/conky/conky-1.10.8-r2.ebuild b/app-admin/conky/conky-1.10.8-r4.ebuild index f89d75399a90..b6d120f7b1cc 100644 --- a/app-admin/conky/conky-1.10.8-r2.ebuild +++ b/app-admin/conky/conky-1.10.8-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,20 +15,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" IUSE="apcupsd audacious 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" -DEPEND_COMMON=" +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 ) + 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 @@ -45,29 +39,28 @@ DEPEND_COMMON=" ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) - mysql? ( >=virtual/mysql-5.0 ) + 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 ) - weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 - " +" RDEPEND=" - ${DEPEND_COMMON} + ${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=" - ${DEPEND_COMMON} + ${COMMON_DEPEND} app-text/docbook2X - " +" CONFIG_CHECK=~IPV6 @@ -132,23 +125,6 @@ src_configure() { ) 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) @@ -171,9 +147,10 @@ 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 |