network/opera: Updated for version 11.50.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

5 files changed, 78 insertions, 35 deletions

diff --git a/network/opera/README b/network/opera/README
index bde3599daa..37afc8785d 100644
--- a/network/opera/README
+++ b/network/opera/README
@@ -1 +1 @@
-Opera is a lightweight and free multiplatform web browser.
+Opera is a fast and secure web browser and Internet suite.
diff --git a/network/opera/fixup_libdir.diff b/network/opera/fixup_libdir.diff
index 1f9b4e7c92..54e3734e40 100644
--- a/network/opera/fixup_libdir.diff
+++ b/network/opera/fixup_libdir.diff
@@ -1,8 +1,48 @@
-diff -Nur opera.orig//usr/bin/opera opera/usr/bin/opera
---- opera.orig//usr/bin/opera	2010-06-30 06:40:32.000000000 -0500
-+++ opera/usr/bin/opera	2010-07-02 01:47:52.640586985 -0500
-@@ -1,3 +1,3 @@
+diff -Nur opera-11.50-1074.x86_64.linux.orig/install opera-11.50-1074.x86_64.linux/install
+--- opera-11.50-1074.x86_64.linux.orig/install	2011-06-27 07:01:11.000000000 -0500
++++ opera-11.50-1074.x86_64.linux/install	2011-07-06 01:12:20.290465769 -0500
+@@ -8,16 +8,16 @@
+ 	then
+ 		"$@" GX - bin/uninstall-opera@@{SUFFIX}
+ 	fi
+-	"$@" NF 7f5617779c8a0c3ab3aed07274b85274 lib/opera@@{SUFFIX}/gstreamer/plugins/libgstoperamatroska.so
+-	"$@" NF 2873abacfe8fa4f8dc210175dbf8b71c lib/opera@@{SUFFIX}/gstreamer/plugins/libgstoperavp8.so
+-	"$@" NF f04788b0e63090d706ee55587580d8e0 lib/opera@@{SUFFIX}/liboperagtk.so
+-	"$@" NF 8c898c575c72634806c5086a63a5960f lib/opera@@{SUFFIX}/liboperakde4.so
+-	"$@" NX a83538e9fea0ef7f6e341ba75d357234 lib/opera@@{SUFFIX}/opera@@{SUFFIX}
+-	"$@" NX 3122e86518173f1795e022cf22e99a6a lib/opera@@{SUFFIX}/operaplugincleaner
+-	"$@" NX bc7331102ef434f19e5a275de153af66 lib/opera@@{SUFFIX}/operapluginwrapper
+-	"$@" NX b76cbde97922472317d1eb8cc79086cf lib/opera@@{SUFFIX}/operapluginwrapper-ia32-linux
+-	"$@" NX 23e36e618845efd96bc466261f9278fe lib/opera@@{SUFFIX}/operapluginwrapper-native
+-	"$@" NF 0a8389b127c477aa2c55ee5d234473ca lib/opera@@{SUFFIX}/plugins/README
++	"$@" NF 7f5617779c8a0c3ab3aed07274b85274 lib64/opera@@{SUFFIX}/gstreamer/plugins/libgstoperamatroska.so
++	"$@" NF 2873abacfe8fa4f8dc210175dbf8b71c lib64/opera@@{SUFFIX}/gstreamer/plugins/libgstoperavp8.so
++	"$@" NF f04788b0e63090d706ee55587580d8e0 lib64/opera@@{SUFFIX}/liboperagtk.so
++	"$@" NF 8c898c575c72634806c5086a63a5960f lib64/opera@@{SUFFIX}/liboperakde4.so
++	"$@" NX a83538e9fea0ef7f6e341ba75d357234 lib64/opera@@{SUFFIX}/opera@@{SUFFIX}
++	"$@" NX 3122e86518173f1795e022cf22e99a6a lib64/opera@@{SUFFIX}/operaplugincleaner
++	"$@" NX bc7331102ef434f19e5a275de153af66 lib64/opera@@{SUFFIX}/operapluginwrapper
++	"$@" NX b76cbde97922472317d1eb8cc79086cf lib64/opera@@{SUFFIX}/operapluginwrapper-ia32-linux
++	"$@" NX 23e36e618845efd96bc466261f9278fe lib64/opera@@{SUFFIX}/operapluginwrapper-native
++	"$@" NF 0a8389b127c477aa2c55ee5d234473ca lib64/opera@@{SUFFIX}/plugins/README
+ 	"$@" PF 7391965010108b488c3bc526c8c7015c share/applications/opera@@{SUFFIX}-browser.desktop
+ 	"$@" PF e78f45e2dc8098046f2a19e268031058 share/applications/opera@@{SUFFIX}-widget-installer.desktop
+ 	"$@" PF 4d84c2febef83fd835ebf0d9f1f5d7df share/applications/opera@@{SUFFIX}-widget-manager.desktop
+@@ -873,7 +873,7 @@
  #!/bin/sh
- export OPERA_DIR=${OPERA_DIR:-/usr/share/opera}
--exec /usr/lib/opera/opera "$@"
-+exec /usr/lib64/opera/opera "$@"
+ export OPERA_DIR=${OPERA_DIR:-@@{PREFIX}/share/opera@@{SUFFIX}}
+ export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-$HOME/.opera@@{SUFFIX}}
+-exec @@{PREFIX}/lib/opera@@{SUFFIX}/opera@@{SUFFIX} "$@"
++exec @@{PREFIX}/lib64/opera@@{SUFFIX}/opera@@{SUFFIX} "$@"
+ EOF_generate_file
+ 			;;
+ 		opera-widget-manager)
+diff -Nur opera-11.50-1074.x86_64.linux.orig/opera opera-11.50-1074.x86_64.linux/opera
+--- opera-11.50-1074.x86_64.linux.orig/opera	2011-06-27 07:01:11.000000000 -0500
++++ opera-11.50-1074.x86_64.linux/opera	2011-07-06 01:11:55.216735389 -0500
+@@ -1,4 +1,4 @@
+ #!/bin/sh
+ export OPERA_DIR=${OPERA_DIR:-"${0%/*}"/share/opera}
+ export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${0%/*}"/profile}
+-exec "${0%/*}"/lib/opera/opera "$@"
++exec "${0%/*}"/lib64/opera/opera "$@"
diff --git a/network/opera/opera.SlackBuild b/network/opera/opera.SlackBuild
index 477f6859e6..eee1eab45e 100644
--- a/network/opera/opera.SlackBuild
+++ b/network/opera/opera.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for opera
 
 # Copyright 2006  Martin Lefebvre <dadexter@gmail.com>
-# Copyright 2008,2009,2010  Robby Workman, Northport, Alabama, USA
+# Copyright 2008-2011  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Maintained by markus reichelt <slackbuilds@mareichelt.de> 0xCCEEF115
+# Now maintained by vvoody <vvoodywang@gmail.com>
 
 PRGNAM=opera
-VERSION=11.11
-REVNO=2109
-BUILD=${BUILD:-2}
+VERSION=11.50
+REVNO=1074
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -57,19 +57,22 @@ fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $PKG
-rm -rf $PRGNAM-${VERSION}-${REVNO}.${ARCH}
-rpm2cpio < $CWD/$PRGNAM-${VERSION}-${REVNO}.${ARCH}.rpm | cpio -imdv
+cd $TMP
+rm -rf $PRGNAM-${VERSION}-${REVNO}.${ARCH}.linux
+tar xf $CWD/$PRGNAM-${VERSION}-${REVNO}.${ARCH}.linux.tar.xz
+cd $PRGNAM-${VERSION}-${REVNO}.${ARCH}.linux
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-[ "$LIBDIRSUFFIX" = "64" ] && patch -p1 < $CWD/fixup_libdir.diff
-[ "$LIBDIRSUFFIX" = "64" ] && mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
-
-# Fix the package type reported by the build
-# Thanks to Ruarí Ødegaard <ruario@opera.com> for the tip
-sed "s,^\(Package\ Type=\)rpm$,\1tar," -i $PKG/usr/share/opera/package-id.ini
+if [ "$LIBDIRSUFFIX" = "64" ]; then
+  patch -p1 < $CWD/fixup_libdir.diff
+  mv lib lib64
+fi
 
+./install \
+  --prefix /usr \
+  --repackage $PKG/usr
+  
 mv $PKG/usr/share/man $PKG/usr
 
 mv $PKG/usr/share/doc $PKG/usr
diff --git a/network/opera/opera.info b/network/opera/opera.info
index 17ad93e316..7cfaa9d43f 100644
--- a/network/opera/opera.info
+++ b/network/opera/opera.info
@@ -1,10 +1,10 @@
 PRGNAM="opera"
-VERSION="11.11"
+VERSION="11.50"
 HOMEPAGE="http://www.opera.com"
-DOWNLOAD="ftp://ftp.opera.com/pub/opera/linux/1111/opera-11.11-2109.i386.rpm"
-MD5SUM="e9551d10fa682b788658c0059eb42547"
-DOWNLOAD_x86_64="ftp://ftp.opera.com/pub/opera/linux/1111/opera-11.11-2109.x86_64.rpm"
-MD5SUM_x86_64="50012dbed6846c01040082e568c73acd"
-MAINTAINER="markus reichelt"
-EMAIL="slackbuilds@mareichelt.de"
+DOWNLOAD="ftp://ftp.opera.com/pub/opera/linux/1150/opera-11.50-1074.i386.linux.tar.xz"
+MD5SUM="942ea1193c2d6a4e0714acb99a227e27"
+DOWNLOAD_x86_64="ftp://ftp.opera.com/pub/opera/linux/1150/opera-11.50-1074.x86_64.linux.tar.xz"
+MD5SUM_x86_64="40c06ac3d7cf3289b446499728a725a5"
+MAINTAINER="vvoody"
+EMAIL="vvoodywang@gmail.com"
 APPROVED="rworkman"
diff --git a/network/opera/slack-desc b/network/opera/slack-desc
index 5a7661cebe..ada6ded608 100644
--- a/network/opera/slack-desc
+++ b/network/opera/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
      |-----handy-ruler--------------------------------------------------------|
-opera: opera (Opera Web Browser)
-opera:
-opera: Opera is a lightweight, free, multiplatform, and
-opera: standards-compliant web browser.
-opera:
-opera:
+opera: opera (Fast and secure web browser and Internet suite)
 opera:
+opera: Opera is a small, fast, customizable, powerful, and user-friendly web
+opera: browser, as well as an Internet suite, including an email client, an
+opera: IRC client, web developer tools (Opera Dragonfly), and a personal web
+opera: server (Opera Unite).
 opera:
+opera: http://www.opera.com/browser/
 opera:
 opera:
 opera: