| 1 |
commit: 36873496dfc4f29ccbee6742863fb56519739797 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 12 13:07:42 2016 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 12 13:50:51 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36873496 |
| 7 |
|
| 8 |
app-laptop/tp_smapi: new revision that doesn't call pkg_pretend() directly. |
| 9 |
|
| 10 |
Gentoo-Bug: 596622 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
|
| 14 |
.../{tp_smapi-0.42.ebuild => tp_smapi-0.42-r1.ebuild} | 12 ++++++++++-- |
| 15 |
1 file changed, 10 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-laptop/tp_smapi/tp_smapi-0.42.ebuild b/app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild |
| 18 |
similarity index 85% |
| 19 |
rename from app-laptop/tp_smapi/tp_smapi-0.42.ebuild |
| 20 |
rename to app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild |
| 21 |
index ed4b4a5..8f67166 100644 |
| 22 |
--- a/app-laptop/tp_smapi/tp_smapi-0.42.ebuild |
| 23 |
+++ b/app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild |
| 24 |
@@ -21,7 +21,11 @@ IUSE="hdaps" |
| 25 |
DEPEND="sys-apps/dmidecode" |
| 26 |
RDEPEND="${DEPEND}" |
| 27 |
|
| 28 |
-pkg_pretend() { |
| 29 |
+# This code is factored out of both pkg_pretend() and pkg_setup() |
| 30 |
+# because the PMS states that ebuilds may not call phase functions |
| 31 |
+# directly (see the "List of functions" section). This was bug #596616 |
| 32 |
+# and #596622. |
| 33 |
+tp_smapi_pkg_pretend() { |
| 34 |
linux-mod_pkg_setup |
| 35 |
|
| 36 |
MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)" |
| 37 |
@@ -43,9 +47,13 @@ pkg_pretend() { |
| 38 |
fi |
| 39 |
} |
| 40 |
|
| 41 |
+pkg_pretend() { |
| 42 |
+ tp_smapi_pkg_pretend |
| 43 |
+} |
| 44 |
+ |
| 45 |
pkg_setup() { |
| 46 |
# run again as pkg_pretend is not var safe |
| 47 |
- pkg_pretend |
| 48 |
+ tp_smapi_pkg_pretend |
| 49 |
} |
| 50 |
|
| 51 |
src_compile() { |
Archives