[Lunar-commits] <moonbase> gtk+-2: move NVIDIA install to post_install because nvidia-settings gtk app requires gtk+-2 installed.

[Zbigniew Luszpinski]

commit caac6c578d780895c20d56d9479bffbf5e39bdd4
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sun Nov 13 01:59:41 2011 +0100

    gtk+-2: move NVIDIA install to post_install because nvidia-settings gtk app requires gtk+-2 installed.
---
 graphics/gtk+-2/BUILD        |   20 +++++++-------------
 graphics/gtk+-2/POST_INSTALL |    7 +++++++
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/graphics/gtk+-2/BUILD b/graphics/gtk+-2/BUILD
index a532f74..b827dec 100644
--- a/graphics/gtk+-2/BUILD
+++ b/graphics/gtk+-2/BUILD
@@ -23,23 +23,17 @@
 
   OPTS+=" --with-gdktarget=x11"
 
-# remove the existing NVIDIA or NVIDIA-beta module to prevent the compiling failing
-  WITH_NV=0  &&
+# remove the existing NVIDIA or NVIDIA-beta module to prevent the installation failing
+  WITH_NV=""
   if module_installed NVIDIA; then
-      WITH_NV=1  &&
+      WITH_NV=NVIDIA
       lrm NVIDIA
-    elsif module_installed NVIDIA-beta; then
-      WITH_NV=2  &&
+  elif module_installed NVIDIA-beta; then
+      WITH_NV=NVIDIA-beta
       lrm NVIDIA-beta
   fi  &&
+  echo $WITH_NV >/tmp/WITH_NV &&
 
-  default_build  &&
-
-# restore the NVIDIA or NVIDIA-beta module, if it was previously installed
-  if [ $WITH_NV = 1 ]; then
-      lin NVIDIA
-    elsif [ $WITH_NV = 2 ]; then
-      lin NVIDIA-beta
-  fi
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/graphics/gtk+-2/POST_INSTALL b/graphics/gtk+-2/POST_INSTALL
new file mode 100644
index 0000000..f2621d4
--- /dev/null
+++ b/graphics/gtk+-2/POST_INSTALL
@@ -0,0 +1,7 @@
+# restore the NVIDIA or NVIDIA-beta module, if it was previously installed
+WITH_NV=`cat /tmp/WITH_NV`
+rm -f /tmp/WITH_NV
+  if [ -n "$WITH_NV" ]; then
+      lin $WITH_NV
+  fi
+unset WITH_NV