summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Orlitzky <mjo@gentoo.org>2016-10-12 09:07:42 -0400
committerMichael Orlitzky <mjo@gentoo.org>2016-10-12 09:50:51 -0400
commit36873496dfc4f29ccbee6742863fb56519739797 (patch)
tree0e258df8cbca8ff5e75cf6a8cb61b0fbba91a62a /app-laptop
parentsys-kernel/genkernel: require external newer firmware per bug #447100. (diff)
downloadgentoo-36873496dfc4f29ccbee6742863fb56519739797.tar.gz
gentoo-36873496dfc4f29ccbee6742863fb56519739797.tar.bz2
gentoo-36873496dfc4f29ccbee6742863fb56519739797.zip
app-laptop/tp_smapi: new revision that doesn't call pkg_pretend() directly.
Gentoo-Bug: 596622 Package-Manager: portage-2.3.0
Diffstat (limited to 'app-laptop')
-rw-r--r--app-laptop/tp_smapi/tp_smapi-0.42-r1.ebuild (renamed from app-laptop/tp_smapi/tp_smapi-0.42.ebuild)12
1 files 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
index ed4b4a57df4..8f671665c63 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() {