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 B870F138334 for ; Mon, 9 Jul 2018 10:58:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92420E08C4; Mon, 9 Jul 2018 10:58:39 +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 4CA34E08C4 for ; Mon, 9 Jul 2018 10:58:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 2AB76335C0C for ; Mon, 9 Jul 2018 10:58:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A694353 for ; Mon, 9 Jul 2018 10:58:34 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1531133907.91c0efc19c4cc6b6f0e80024c8ee34485454bdcb.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/gptfdisk/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild X-VCS-Directories: sys-apps/gptfdisk/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 91c0efc19c4cc6b6f0e80024c8ee34485454bdcb X-VCS-Branch: master Date: Mon, 9 Jul 2018 10:58:34 +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-Archives-Salt: bf540883-7a5b-47a8-8adc-b1b107651b17 X-Archives-Hash: 2bbb38eb3ef776f0eceb439cdd09b10f commit: 91c0efc19c4cc6b6f0e80024c8ee34485454bdcb Author: Lars Wendler gentoo org> AuthorDate: Mon Jul 9 10:58:12 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Jul 9 10:58:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c0efc1 sys-apps/gptfdisk: Really fix static dependencies this time. Closes: https://bugs.gentoo.org/660772 Package-Manager: Portage-2.3.41, Repoman-2.3.9 sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild | 16 ++++++++++------ sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild | 17 ++++++++++------- sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild | 17 ++++++++++------- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild index eb179a7f709..ebca9efb473 100644 --- a/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild @@ -14,13 +14,17 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="kernel_linux ncurses static" -LIB_DEPEND=" - dev-libs/popt[static-libs(+)] - ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) - kernel_linux? ( sys-apps/util-linux[static-libs(+)] )" # libuuid -RDEPEND="!static? ( ${LIB_DEPEND//,static-libs(+)} )" +RDEPEND="!static? ( + dev-libs/popt + ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) + kernel_linux? ( sys-apps/util-linux ) + )" DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) + static? ( + dev-libs/popt[static-libs(+)] + ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) + kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) + ) virtual/pkgconfig" src_prepare() { diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild index be7e5b330c5..86abd970105 100644 --- a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild @@ -15,15 +15,18 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-l IUSE="kernel_linux ncurses static" # libuuid from util-linux is required. -LIB_DEPEND=" - dev-libs/popt[static-libs(+)] - ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) - kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) -" -RDEPEND="!static? ( ${LIB_DEPEND//,static-libs(+)} )" +RDEPEND="!static? ( + dev-libs/popt + ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) + kernel_linux? ( sys-apps/util-linux ) + )" DEPEND=" ${RDEPEND} - static? ( ${LIB_DEPEND} ) + static? ( + dev-libs/popt[static-libs(+)] + ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) + kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) + ) virtual/pkgconfig " diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild index 0883fdb858e..ba13b2306d7 100644 --- a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild +++ b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild @@ -15,15 +15,18 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-l IUSE="kernel_linux ncurses static" # libuuid from util-linux is required. -LIB_DEPEND=" - dev-libs/popt[static-libs(+)] - ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) - kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) -" -RDEPEND="!static? ( ${LIB_DEPEND//,static-libs(+)} )" +RDEPEND="!static? ( + dev-libs/popt + ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] ) + kernel_linux? ( sys-apps/util-linux ) + )" DEPEND=" ${RDEPEND} - static? ( ${LIB_DEPEND} ) + static? ( + dev-libs/popt[static-libs(+)] + ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] ) + kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) + ) virtual/pkgconfig "