commit: 36873496dfc4f29ccbee6742863fb56519739797
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 13:07:42 2016 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 13:50:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36873496
app-laptop/tp_smapi: new revision that doesn't call pkg_pretend() directly.
Gentoo-Bug: 596622
Package-Manager: portage-2.3.0
.../{tp_smapi-0.42.ebuild => tp_smapi-0.42-r1.ebuild} | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/app-laptop/tp_smapi/tp_smapi-0.42.ebuild
b/app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild
similarity index 85%
rename from app-laptop/tp_smapi/tp_smapi-0.42.ebuild
rename to app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild
index ed4b4a5..8f67166 100644
--- a/app-laptop/tp_smapi/tp_smapi-0.42.ebuild
+++ b/app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild
@@ -21,7 +21,11 @@ IUSE="hdaps"
DEPEND="sys-apps/dmidecode"
RDEPEND="${DEPEND}"
-pkg_pretend() {
+# This code is factored out of both pkg_pretend() and pkg_setup()
+# because the PMS states that ebuilds may not call phase functions
+# directly (see the "List of functions" section). This was bug #596616
+# and #596622.
+tp_smapi_pkg_pretend() {
linux-mod_pkg_setup
MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
@@ -43,9 +47,13 @@ pkg_pretend() {
fi
}
+pkg_pretend() {
+ tp_smapi_pkg_pretend
+}
+
pkg_setup() {
# run again as pkg_pretend is not var safe
- pkg_pretend
+ tp_smapi_pkg_pretend
}
src_compile() {
