| 1 |
commit: 39e03b007525ff9c271b8bf2be84b4a3fe417a1c |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 30 16:22:55 2021 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 30 16:42:02 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39e03b00 |
| 7 |
|
| 8 |
app-portage/iwdevtools: prefix support, fix symlink, no abigail |
| 9 |
|
| 10 |
This ../../../ thankfully worked on non-prefix, but one .. too many. |
| 11 |
|
| 12 |
Remove abigail from test deps as the test is too specific |
| 13 |
and will typically be skipped. |
| 14 |
|
| 15 |
This -Deprefix is not to be confused with --prefix which is still |
| 16 |
${EPREFIX}/usr, intended to be exactly ${EPREFIX} and not used |
| 17 |
for installation paths. |
| 18 |
|
| 19 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 20 |
|
| 21 |
app-portage/iwdevtools/iwdevtools-0.3.1.ebuild | 2 +- |
| 22 |
app-portage/iwdevtools/iwdevtools-0.4.0.ebuild | 2 +- |
| 23 |
app-portage/iwdevtools/iwdevtools-9999.ebuild | 15 ++++++++------- |
| 24 |
3 files changed, 10 insertions(+), 9 deletions(-) |
| 25 |
|
| 26 |
diff --git a/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild |
| 27 |
index 7637b843925..a4a8c6a5377 100644 |
| 28 |
--- a/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild |
| 29 |
+++ b/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild |
| 30 |
@@ -33,7 +33,7 @@ pkg_postinst() { |
| 31 |
elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use" |
| 32 |
elog "the example bashrc directly by creating a symlink:" |
| 33 |
elog |
| 34 |
- elog " ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" |
| 35 |
+ elog " ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" |
| 36 |
elog |
| 37 |
elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools." |
| 38 |
fi |
| 39 |
|
| 40 |
diff --git a/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild |
| 41 |
index c8f5f248d61..1152e307b33 100644 |
| 42 |
--- a/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild |
| 43 |
+++ b/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild |
| 44 |
@@ -36,7 +36,7 @@ pkg_postinst() { |
| 45 |
elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use" |
| 46 |
elog "the example bashrc directly by creating a symlink:" |
| 47 |
elog |
| 48 |
- elog " ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" |
| 49 |
+ elog " ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" |
| 50 |
elog |
| 51 |
elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools." |
| 52 |
fi |
| 53 |
|
| 54 |
diff --git a/app-portage/iwdevtools/iwdevtools-9999.ebuild b/app-portage/iwdevtools/iwdevtools-9999.ebuild |
| 55 |
index 9352ae24fd7..0af26d4a314 100644 |
| 56 |
--- a/app-portage/iwdevtools/iwdevtools-9999.ebuild |
| 57 |
+++ b/app-portage/iwdevtools/iwdevtools-9999.ebuild |
| 58 |
@@ -22,14 +22,15 @@ RDEPEND=" |
| 59 |
sys-apps/file |
| 60 |
sys-apps/portage |
| 61 |
sys-apps/util-linux" |
| 62 |
-BDEPEND=" |
| 63 |
- test? ( |
| 64 |
- ${RDEPEND} |
| 65 |
- dev-util/libabigail |
| 66 |
- )" |
| 67 |
+BDEPEND="test? ( ${RDEPEND} )" |
| 68 |
|
| 69 |
src_configure() { |
| 70 |
- meson_src_configure -Ddocdir=${PF} $(meson_use test) |
| 71 |
+ local emesonargs=( |
| 72 |
+ -Ddocdir=${PF} |
| 73 |
+ -Deprefix="${EPREFIX}" |
| 74 |
+ $(meson_use test) |
| 75 |
+ ) |
| 76 |
+ meson_src_configure |
| 77 |
} |
| 78 |
|
| 79 |
pkg_postinst() { |
| 80 |
@@ -40,7 +41,7 @@ pkg_postinst() { |
| 81 |
elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use" |
| 82 |
elog "the example bashrc directly by creating a symlink:" |
| 83 |
elog |
| 84 |
- elog " ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" |
| 85 |
+ elog " ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" |
| 86 |
elog |
| 87 |
elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools." |
| 88 |
fi |
Archives