From: Michael Orlitzky <mjo@gentoo.org>
Date: Wed, 12 Oct 2016 13:07:42 +0000 (-0400)
Subject: app-laptop/tp_smapi: new revision that doesn't call pkg_pretend() directly.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=36873496dfc4f29ccbee6742863fb56519739797;p=gentoo.git

app-laptop/tp_smapi: new revision that doesn't call pkg_pretend() directly.

Gentoo-Bug: 596622

Package-Manager: portage-2.3.0
---

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 ed4b4a57df4d..8f671665c63f 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() {