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 3B6EB13835A for ; Wed, 11 Nov 2020 17:55:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C72FE0BC7; Wed, 11 Nov 2020 17:55:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 04DB0E0BC7 for ; Wed, 11 Nov 2020 17:55:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8F1B233D3C2 for ; Wed, 11 Nov 2020 17:55:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5A4A439 for ; Wed, 11 Nov 2020 17:55:04 +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: <1605117237.245264380b9d157f9ccda038f75e722458908402.billie@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/conky/conky-1.11.6-r2.ebuild X-VCS-Directories: app-admin/conky/ X-VCS-Committer: billie X-VCS-Committer-Name: Daniel Pielmeier X-VCS-Revision: 245264380b9d157f9ccda038f75e722458908402 X-VCS-Branch: master Date: Wed, 11 Nov 2020 17:55:04 +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: 801384e9-ec7b-45c9-9b0b-0bd27d9bf04c X-Archives-Hash: f863f3caa08bbbc5eb4fa068ea7f9520 commit: 245264380b9d157f9ccda038f75e722458908402 Author: Daniel Pielmeier gentoo org> AuthorDate: Wed Nov 11 17:53:57 2020 +0000 Commit: Daniel Pielmeier gentoo org> CommitDate: Wed Nov 11 17:53:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24526438 app-admin/conky: Small style changes. Switch to usex yes/no for build options. Sort dependencies, required use. Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Daniel Pielmeier gentoo.org> app-admin/conky/conky-1.11.6-r2.ebuild | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/app-admin/conky/conky-1.11.6-r2.ebuild b/app-admin/conky/conky-1.11.6-r2.ebuild index 47ca37afd95..fb7f8a7087d 100644 --- a/app-admin/conky/conky-1.11.6-r2.ebuild +++ b/app-admin/conky/conky-1.11.6-r2.ebuild @@ -20,12 +20,6 @@ IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats vim-syntax weather-metar webserver wifi X xinerama xmms2" COMMON_DEPEND=" - X? ( - x11-libs/libX11 - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libXext - ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) @@ -45,6 +39,12 @@ COMMON_DEPEND=" wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) + X? ( + x11-libs/libX11 + x11-libs/libXdamage + x11-libs/libXfixes + x11-libs/libXext + ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) ${LUA_DEPS} @@ -64,11 +64,11 @@ DEPEND=" REQUIRED_USE=" imlib? ( X ) - nvidia? ( X ) - truetype? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) + nvidia? ( X ) + truetype? ( X ) xinerama? ( X ) " @@ -110,29 +110,29 @@ src_configure() { if use X; then mycmakeargs=( - -DBUILD_ARGB=ON - -DBUILD_X11=ON - -DBUILD_XDAMAGE=ON - -DBUILD_XDBE=ON - -DBUILD_XSHAPE=ON - -DOWN_WINDOW=ON + -DBUILD_ARGB=yes + -DBUILD_X11=yes + -DBUILD_XDAMAGE=yes + -DBUILD_XDBE=yes + -DBUILD_XSHAPE=yes + -DOWN_WINDOW=yes ) else mycmakeargs=( - -DBUILD_X11=OFF + -DBUILD_X11=no ) fi mycmakeargs+=( -DBUILD_APCUPSD=$(usex apcupsd) - -DBUILD_AUDACIOUS=OFF - -DBUILD_BUILTIN_CONFIG=ON + -DBUILD_AUDACIOUS=no + -DBUILD_BUILTIN_CONFIG=yes -DBUILD_CMUS=$(usex cmus) -DBUILD_CURL=$(usex curl) -DBUILD_DOCS=$(usex doc) -DBUILD_HDDTEMP=$(usex hddtemp) -DBUILD_HTTP=$(usex webserver) - -DBUILD_I18N=ON + -DBUILD_I18N=yes -DBUILD_IBM=$(usex thinkpad) -DBUILD_ICAL=$(usex ical) -DBUILD_ICONV=$(usex iconv) @@ -150,7 +150,7 @@ src_configure() { -DBUILD_MYSQL=$(usex mysql) -DBUILD_NCURSES=$(usex ncurses) -DBUILD_NVIDIA=$(usex nvidia) - -DBUILD_OLD_CONFIG=ON + -DBUILD_OLD_CONFIG=yes -DBUILD_PORT_MONITORS=$(usex portmon) -DBUILD_PULSEAUDIO=$(usex pulseaudio) -DBUILD_RSS=$(usex rss) @@ -160,8 +160,8 @@ src_configure() { -DBUILD_XINERAMA=$(usex xinerama) -DBUILD_XMMS2=$(usex xmms2) -DDOC_PATH=/usr/share/doc/${PF} - -DMAINTAINER_MODE=OFF - -DRELEASE=ON + -DMAINTAINER_MODE=no + -DRELEASE=yes ) cmake_src_configure