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 CEC7C1580B1 for ; Mon, 30 Aug 2021 16:42:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33272E07A7; Mon, 30 Aug 2021 16:42:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 1071AE07A7 for ; Mon, 30 Aug 2021 16:42:25 +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 065C533BE18 for ; Mon, 30 Aug 2021 16:42:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 158D039 for ; Mon, 30 Aug 2021 16:42:23 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1630341722.39e03b007525ff9c271b8bf2be84b4a3fe417a1c.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/iwdevtools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/iwdevtools/iwdevtools-0.3.1.ebuild app-portage/iwdevtools/iwdevtools-0.4.0.ebuild app-portage/iwdevtools/iwdevtools-9999.ebuild X-VCS-Directories: app-portage/iwdevtools/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 39e03b007525ff9c271b8bf2be84b4a3fe417a1c X-VCS-Branch: master Date: Mon, 30 Aug 2021 16:42:23 +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: 1d17f93a-925f-406b-bcfc-265c9876d77e X-Archives-Hash: 61eb5955b25ebca03da1a05b44a25670 commit: 39e03b007525ff9c271b8bf2be84b4a3fe417a1c Author: Ionen Wolkens gentoo org> AuthorDate: Mon Aug 30 16:22:55 2021 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Aug 30 16:42:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e03b00 app-portage/iwdevtools: prefix support, fix symlink, no abigail This ../../../ thankfully worked on non-prefix, but one .. too many. Remove abigail from test deps as the test is too specific and will typically be skipped. This -Deprefix is not to be confused with --prefix which is still ${EPREFIX}/usr, intended to be exactly ${EPREFIX} and not used for installation paths. Signed-off-by: Ionen Wolkens gentoo.org> app-portage/iwdevtools/iwdevtools-0.3.1.ebuild | 2 +- app-portage/iwdevtools/iwdevtools-0.4.0.ebuild | 2 +- app-portage/iwdevtools/iwdevtools-9999.ebuild | 15 ++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild index 7637b843925..a4a8c6a5377 100644 --- a/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild +++ b/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild @@ -33,7 +33,7 @@ pkg_postinst() { elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use" elog "the example bashrc directly by creating a symlink:" elog - elog " ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" + elog " ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" elog elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools." fi diff --git a/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild index c8f5f248d61..1152e307b33 100644 --- a/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild +++ b/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild @@ -36,7 +36,7 @@ pkg_postinst() { elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use" elog "the example bashrc directly by creating a symlink:" elog - elog " ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" + elog " ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" elog elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools." fi diff --git a/app-portage/iwdevtools/iwdevtools-9999.ebuild b/app-portage/iwdevtools/iwdevtools-9999.ebuild index 9352ae24fd7..0af26d4a314 100644 --- a/app-portage/iwdevtools/iwdevtools-9999.ebuild +++ b/app-portage/iwdevtools/iwdevtools-9999.ebuild @@ -22,14 +22,15 @@ RDEPEND=" sys-apps/file sys-apps/portage sys-apps/util-linux" -BDEPEND=" - test? ( - ${RDEPEND} - dev-util/libabigail - )" +BDEPEND="test? ( ${RDEPEND} )" src_configure() { - meson_src_configure -Ddocdir=${PF} $(meson_use test) + local emesonargs=( + -Ddocdir=${PF} + -Deprefix="${EPREFIX}" + $(meson_use test) + ) + meson_src_configure } pkg_postinst() { @@ -40,7 +41,7 @@ pkg_postinst() { elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use" elog "the example bashrc directly by creating a symlink:" elog - elog " ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" + elog " ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" elog elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools." fi