[Lunar-commits] <moonbase> wine_gecko: bump & fix

[Paul Bredbury]

commit b54462c3550594033f13346326656f22819ad49c
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Fri Jan 14 12:35:56 2011 +0700

    wine_gecko: bump & fix
---
 virtual/wine_gecko/BUILD     |    9 ++++-----
 virtual/wine_gecko/DEPENDS   |    2 +-
 virtual/wine_gecko/DETAILS   |   21 ++++++++++++---------
 virtual/wine_gecko/PRE_BUILD |    4 ++--
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/virtual/wine_gecko/BUILD b/virtual/wine_gecko/BUILD
index 4dac206..2bb3fb7 100644
--- a/virtual/wine_gecko/BUILD
+++ b/virtual/wine_gecko/BUILD
@@ -1,11 +1,10 @@
 (
 
-  if [ ! -f /usr/share/wine/gecko ] ; then
-    mkdir -p /usr/share/wine/gecko
-  fi &&
+  prepare_install  &&
 
-  prepare_install &&
+  mkdir -p /usr/share/wine/gecko  &&
 
-  cp -R wine_gecko/* /usr/share/wine/gecko/
+  # The cab is not meant to be uncompressed
+  install -m644 $SOURCE_CACHE/$SOURCE /usr/share/wine/gecko/
 
 ) > $C_FIFO 2>&1
diff --git a/virtual/wine_gecko/DEPENDS b/virtual/wine_gecko/DEPENDS
index 11fd928..2edd697 100644
--- a/virtual/wine_gecko/DEPENDS
+++ b/virtual/wine_gecko/DEPENDS
@@ -1 +1 @@
-depends cabextract
+depends wine
diff --git a/virtual/wine_gecko/DETAILS b/virtual/wine_gecko/DETAILS
index beb91ac..e0cff22 100644
--- a/virtual/wine_gecko/DETAILS
+++ b/virtual/wine_gecko/DETAILS
@@ -1,17 +1,20 @@
           MODULE=wine_gecko
-         VERSION=1.0.0-x86
+         VERSION=1.1.0-x86
           SOURCE=$MODULE-$VERSION.cab
-   SOURCE_URL[0]=$SFORGE_URL/wine/
-      SOURCE_VFY=sha1:afa22c52bca4ca77dcb9edb3c9936eb23793de01
+      SOURCE_URL=$SFORGE_URL/wine
+      SOURCE_VFY=sha1:1b6c637207b6f032ae8a52841db9659433482714
         WEB_SITE=http://wiki.winehq.org/Gecko
          ENTERED=20091125
-         UPDATED=20091125
+         UPDATED=20110112
            SHORT="Mozilla's Gecko Layout Engine"
 
 cat << EOF
-Wine implements its own version of Internet Explorer. The implementation is 
-based on a custom version of Mozilla's Gecko Layout Engine. When your 
-application tries to display a web page, it loads Wine's custom Gecko from the
-file wine_gecko-1.0.0-x86.cab (at least in the latest version of Wine; older 
-versions of Wine use older versions of Gecko).
+Wine implements its own version of Internet Explorer. The
+implementation is based on a custom version of Mozilla's Gecko Layout
+Engine. When your application tries to display a web page, it loads
+Wine's custom Gecko from the file wine_gecko-1.1.0-x86.cab (at least in
+the latest version of Wine; older versions of Wine use older versions
+of Gecko).
+
+After installing this, wine will not prompt you to download gecko.
 EOF
diff --git a/virtual/wine_gecko/PRE_BUILD b/virtual/wine_gecko/PRE_BUILD
index 1043a0b..b172b7d 100644
--- a/virtual/wine_gecko/PRE_BUILD
+++ b/virtual/wine_gecko/PRE_BUILD
@@ -1,3 +1,3 @@
+validate_source_dir $SOURCE_DIRECTORY  &&
 mk_source_dir $SOURCE_DIRECTORY  &&
-cd $SOURCE_DIRECTORY  &&
-cabextract $SOURCE_CACHE/$SOURCE
+cd $SOURCE_DIRECTORY