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 7A9C71580B3 for ; Sat, 4 Sep 2021 15:25:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2D9BE0822; Sat, 4 Sep 2021 15:25:11 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3ED32E0831 for ; Sat, 4 Sep 2021 15:25:11 +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 28F9C335D4F for ; Sat, 4 Sep 2021 15:25:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 93F84A3 for ; Sat, 4 Sep 2021 15:25:08 +0000 (UTC) From: "Jakov Smolić" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" Message-ID: <1630769065.2d576da91b9313fa2737f96a341225078528dba4.jsmolic@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/pkgconf/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/pkgconf/metadata.xml dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild dev-util/pkgconf/pkgconf-1.7.4.ebuild dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild dev-util/pkgconf/pkgconf-1.8.0.ebuild dev-util/pkgconf/pkgconf-9999.ebuild X-VCS-Directories: dev-util/pkgconf/ X-VCS-Committer: jsmolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: 2d576da91b9313fa2737f96a341225078528dba4 X-VCS-Branch: master Date: Sat, 4 Sep 2021 15:25:08 +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: 83bafa05-ca8b-47f1-8471-8c69846cd453 X-Archives-Hash: 460735941043f564fb9bfe95d7e93edf commit: 2d576da91b9313fa2737f96a341225078528dba4 Author: Jakov Smolić gentoo org> AuthorDate: Sat Sep 4 07:12:04 2021 +0000 Commit: Jakov Smolić gentoo org> CommitDate: Sat Sep 4 15:24:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d576da9 dev-util/pkgconf: Remove pkg-config USE flag Signed-off-by: Jakov Smolić gentoo.org> dev-util/pkgconf/metadata.xml | 3 --- ...kgconf-1.7.4.ebuild => pkgconf-1.7.4-r1.ebuild} | 23 +++++++--------------- ...kgconf-1.8.0.ebuild => pkgconf-1.8.0-r1.ebuild} | 23 +++++++--------------- dev-util/pkgconf/pkgconf-9999.ebuild | 23 +++++++--------------- 4 files changed, 21 insertions(+), 51 deletions(-) diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml index 894f008349f..e6cdc1e75d6 100644 --- a/dev-util/pkgconf/metadata.xml +++ b/dev-util/pkgconf/metadata.xml @@ -15,9 +15,6 @@ SONAME version of libpkgconf - - Install as a replacement for dev-util/pkgconfig - pkgconf/pkgconf diff --git a/dev-util/pkgconf/pkgconf-1.7.4.ebuild b/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild similarity index 73% rename from dev-util/pkgconf/pkgconf-1.7.4.ebuild rename to dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild index edfc4c30bd4..b174cb7572a 100644 --- a/dev-util/pkgconf/pkgconf-1.7.4.ebuild +++ b/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf" LICENSE="ISC" SLOT="0/3" -IUSE="+pkg-config test" +IUSE="test" # tests require 'kyua' RESTRICT="!test? ( test )" @@ -30,7 +30,7 @@ BDEPEND=" ) " RDEPEND=" - pkg-config? ( !dev-util/pkgconfig ) + !dev-util/pkgconfig " MULTILIB_CHOST_TOOLS=( @@ -41,11 +41,9 @@ src_prepare() { default [[ ${PV} == "9999" ]] && eautoreconf - if use pkg-config; then - MULTILIB_CHOST_TOOLS+=( - /usr/bin/pkg-config$(get_exeext) - ) - fi + MULTILIB_CHOST_TOOLS+=( + /usr/bin/pkg-config$(get_exeext) + ) } multilib_src_configure() { @@ -66,15 +64,8 @@ multilib_src_test() { multilib_src_install() { default - if use pkg-config; then - dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) - dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 - else - rm "${ED}"/usr/share/aclocal/pkg.m4 || die - rmdir "${ED}"/usr/share/aclocal || die - rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die - rmdir "${ED}"/usr/share/man/man7 || die - fi + dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) + dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 } multilib_src_install_all() { diff --git a/dev-util/pkgconf/pkgconf-1.8.0.ebuild b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild similarity index 74% rename from dev-util/pkgconf/pkgconf-1.8.0.ebuild rename to dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild index 29fd8c66589..2e564e60bf9 100644 --- a/dev-util/pkgconf/pkgconf-1.8.0.ebuild +++ b/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf" LICENSE="ISC" SLOT="0/3" -IUSE="+pkg-config test" +IUSE="test" # tests require 'kyua' RESTRICT="!test? ( test )" @@ -30,7 +30,7 @@ BDEPEND=" ) " RDEPEND=" - pkg-config? ( !dev-util/pkgconfig ) + !dev-util/pkgconfig " MULTILIB_CHOST_TOOLS=( @@ -41,11 +41,9 @@ src_prepare() { default [[ ${PV} == "9999" ]] && eautoreconf - if use pkg-config; then - MULTILIB_CHOST_TOOLS+=( - /usr/bin/pkg-config$(get_exeext) - ) - fi + MULTILIB_CHOST_TOOLS+=( + /usr/bin/pkg-config$(get_exeext) + ) } multilib_src_configure() { @@ -66,15 +64,8 @@ multilib_src_test() { multilib_src_install() { default - if use pkg-config; then - dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) - dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 - else - rm "${ED}"/usr/share/aclocal/pkg.m4 || die - rmdir "${ED}"/usr/share/aclocal || die - rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die - rmdir "${ED}"/usr/share/man/man7 || die - fi + dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) + dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 } multilib_src_install_all() { diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild index 463b0b7e231..8ac703ecfd4 100644 --- a/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/dev-util/pkgconf/pkgconf-9999.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf" LICENSE="ISC" SLOT="0/3" -IUSE="+pkg-config test" +IUSE="test" # tests require 'kyua' RESTRICT="!test? ( test )" @@ -30,7 +30,7 @@ BDEPEND=" ) " RDEPEND=" - pkg-config? ( !dev-util/pkgconfig ) + !dev-util/pkgconfig " MULTILIB_CHOST_TOOLS=( @@ -41,11 +41,9 @@ src_prepare() { default [[ ${PV} == "9999" ]] && eautoreconf - if use pkg-config; then - MULTILIB_CHOST_TOOLS+=( - /usr/bin/pkg-config$(get_exeext) - ) - fi + MULTILIB_CHOST_TOOLS+=( + /usr/bin/pkg-config$(get_exeext) + ) } multilib_src_configure() { @@ -66,15 +64,8 @@ multilib_src_test() { multilib_src_install() { default - if use pkg-config; then - dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) - dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 - else - rm "${ED}"/usr/share/aclocal/pkg.m4 || die - rmdir "${ED}"/usr/share/aclocal || die - rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die - rmdir "${ED}"/usr/share/man/man7 || die - fi + dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) + dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 } multilib_src_install_all() {