[Lunar-commits] <moonbase> opera, opera-static: Properly fixed, enjoy!

[Stefan Wold]

commit b24e341851da27f3a29f90976a2f3b6cd34fa442
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Thu Jun 12 19:30:07 2008 +0200

    opera, opera-static: Properly fixed, enjoy!
    * Once again opera will detect plugins in /opt/lunar/plugins (yes flash-9 works)
    * Install pixmap for those who love fancy icons ;)
    * Added x86_64 version of opera
    * opera-static is the only version built for QT4
---
 web/opera-static/BUILD   |   19 +++++++++++++------
 web/opera-static/DETAILS |   13 +++++++------
 web/opera/BUILD          |   23 +++++++++++++++--------
 web/opera/DETAILS        |   13 +++++++------
 web/opera/DETAILS.x86_64 |   20 ++++++++++++++++++++
 5 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/web/opera-static/BUILD b/web/opera-static/BUILD
index 5d7d9dd..e99f709 100644
--- a/web/opera-static/BUILD
+++ b/web/opera-static/BUILD
@@ -1,15 +1,22 @@
 (
+  cat >> usr/share/opera/ini/pluginpath.ini << EOF
 
-  prepare_install &&
-  echo "n" | ./install.sh -s &&
+; Lunar plugin directory
+/opt/lunar/plugins=1
+EOF
+
+  # Disable internal md5check
+  sedit '/md5check Manifest.md5/d' install.sh &&
 
-  cp -f man/opera.1 /usr/share/man/man1 &&
+  prepare_install &&
+  ./install.sh --prefix=/usr &&
+  install -m 644 usr/share/pixmaps/opera.xpm /usr/share/pixmaps/ &&
 
   if [ ! -f /etc/opera6rc ]; then
-    install -m 644 config/opera6rc /etc
-  fi
+    install -m 644 etc/opera6rc /etc
+  fi &&
   if [ ! -f /etc/opera6rc.fixed ]; then
-    install -m 644 config/opera6rc.fixed /etc
+    install -m 644 etc/opera6rc.fixed /etc
   fi
 
 ) > $C_FIFO 2>&1
diff --git a/web/opera-static/DETAILS b/web/opera-static/DETAILS
index 8f85443..4646c05 100644
--- a/web/opera-static/DETAILS
+++ b/web/opera-static/DETAILS
@@ -1,17 +1,18 @@
           MODULE=opera-static
+      SUBVERSION=2042
          VERSION=9.50
-      SUBVERSION=gcc4-static-qt3.i386
-          SOURCE=opera-$VERSION.$SUBVERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/opera-$VERSION-2042.$SUBVERSION
-      SOURCE_URL=http://ftp.heanet.ie/pub/opera/linux/950/final/en/i386/static
-      SOURCE_VFY=sha1:830d549fdb04416491f451f3703ada8d38b40efe
+          SOURCE=opera-$VERSION.gcc4-qt4.i386.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/opera-$VERSION-$SUBVERSION.gcc4-qt4.i386
+      SOURCE_URL=http://ftp.heanet.ie/pub/opera/linux/${VERSION//\./}/final/en/i386/
+      SOURCE_VFY=sha1:b5f2c14707dc754ba889f88f3382cacbb4b048ff
         WEB_SITE=http://www.opera.com
       MAINTAINER=ratler at lunar-linux.org
          LICENSE="proprietary"
          ENTERED=20051002
          UPDATED=20080612
            SHORT="The most full-featured Internet browser on the market"
-         ARCHIVE=off
+GARBAGE=off
+ARCHIVE=off
 
 cat << EOF
 Opera includes pop-up blocking, tabbed browsing, integrated searches,
diff --git a/web/opera/BUILD b/web/opera/BUILD
index de1ea84..12c69f1 100644
--- a/web/opera/BUILD
+++ b/web/opera/BUILD
@@ -1,16 +1,23 @@
 (
+  cat >> usr/share/opera/ini/pluginpath.ini << EOF
 
-  prepare_install  &&
-  
-  echo "n" | ./install.sh -s  &&
+; Lunar plugin directory
+/opt/lunar/plugins=1
+EOF
 
-  cp -f man/opera.1 /usr/share/man/man1  &&
+  # Disable internal md5check
+  sedit '/md5check Manifest.md5/d' install.sh &&
+
+  prepare_install &&
+
+  ./install.sh --prefix=/usr &&
+  install -m 644 usr/share/pixmaps/opera.xpm /usr/share/pixmaps/ &&
 
   if [ ! -f /etc/opera6rc ]; then
-    install -m 644 config/opera6rc /etc
-  fi
+    install -m 644 etc/opera6rc /etc
+  fi &&
   if [ ! -f /etc/opera6rc.fixed ]; then
-    install -m 644 config/opera6rc.fixed /etc
+    install -m 644 etc/opera6rc.fixed /etc
   fi
-  
+
 ) > $C_FIFO 2>&1
diff --git a/web/opera/DETAILS b/web/opera/DETAILS
index 9fa9c2e..98dbf93 100644
--- a/web/opera/DETAILS
+++ b/web/opera/DETAILS
@@ -1,17 +1,18 @@
           MODULE=opera
+      SUBVERSION=2042
          VERSION=9.50
-      SUBVERSION=gcc4-shared-qt3.i386
-          SOURCE=$MODULE-$VERSION.$SUBVERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION-2042.$SUBVERSION
-      SOURCE_URL=http://ftp.heanet.ie/pub/opera/linux/950/final/en/i386/shared
+          SOURCE=$MODULE-$VERSION.gcc4-shared-qt3.i386.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION-$SUBVERSION.gcc4-shared-qt3.i386
+      SOURCE_URL=http://ftp.heanet.ie/pub/opera/linux/${VERSION//\./}/final/en/i386/shared/
       SOURCE_VFY=sha1:964b9c6f81396679638d90f22d1db9a1b55fcfe8
         WEB_SITE=http://www.opera.com
       MAINTAINER=ratler at lunar-linux.org
          LICENSE="proprietary"
          ENTERED=20051002
-         UPDATED=20080610
+         UPDATED=20080612
            SHORT="The most full-featured Internet browser on the market"
-         ARCHIVE=off
+GARBAGE=off
+ARCHIVE=off
 
 cat << EOF
 Opera includes pop-up blocking, tabbed browsing, integrated searches,
diff --git a/web/opera/DETAILS.x86_64 b/web/opera/DETAILS.x86_64
new file mode 100644
index 0000000..5fa5627
--- /dev/null
+++ b/web/opera/DETAILS.x86_64
@@ -0,0 +1,20 @@
+          MODULE=opera
+      SUBVERSION=2042
+         VERSION=9.50
+          SOURCE=$MODULE-$VERSION-$SUBVERSION.gcc4-shared-qt3.x86_64.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/opera-$VERSION-$SUBVERSION.gcc4-shared-qt3.x86_64
+      SOURCE_URL=http://ftp.heanet.ie/pub/opera/linux/${VERSION//\./}/final/en/x86_64/
+      SOURCE_VFY=sha1:b5e0cc366bf3711c98770bd5378ba5cd3ebad998
+        WEB_SITE=http://www.opera.com/
+      MAINTAINER=ratler at lunar-linux.org
+         LICENSE="proprietary"
+         ENTERED=20080612
+         UPDATED=20080612
+           SHORT="The most full-featured Internet browser on the market."
+GARBAGE=off
+ARCHIVE=off
+
+cat << EOF
+Opera includes pop-up blocking, tabbed browsing, integrated searches,
+E-mail, RSS Newsfeeds and IRC chat.
+EOF