5 files changed, 41 insertions, 64 deletions
diff --git a/network/opera/doinst.sh b/network/opera/doinst.sh
index 0ddf6e223b..08d7e7e957 100644
--- a/network/opera/doinst.sh
+++ b/network/opera/doinst.sh
@@ -11,8 +11,8 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/opera6rc.new
-config etc/opera6rc.fixed.new
+config etc/operaprefs_default.ini.new
+config etc/operaprefs_fixed.ini.new
 
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
diff --git a/network/opera/opera.SlackBuild b/network/opera/opera.SlackBuild
index 1a66809ee1..d4d712fa3d 100644
--- a/network/opera/opera.SlackBuild
+++ b/network/opera/opera.SlackBuild
@@ -24,8 +24,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=opera
-VERSION=9.64
-ARCH=i386	# Leave this alone 
+VERSION=10.10
+ARCH=${ARCH:-i386}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -34,40 +34,39 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# If you want Chinese in Opera to not be fugly, set this to "YES",
-# otherwise leave it be.
-# This can be specified on the command line when calling the build script:
-#   CHINESE_FIX=YES ./opera.SlackBuild
-# Note that this makes Opera use wqy-zenhei as the default font
-# for Chinese AND Japanese
-CHINESE_FIX=${CHINESE_FIX:-NO}
+set -eu
 
-# Don't bother this - it's for easier manipulation and sed'ing later
-TOPDIR=$(tar tf $CWD/$PRGNAM-${VERSION}.gcc4-shared-qt3.${ARCH}.tar.bz2 |head -1)
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  ARCH=i386
+  LIBDIRSUFFIX=""
+fi
 
-set -e
+# Don't bother this - it's for easier manipulation and sed'ing later
+TOPDIR=$(tar tf $CWD/$PRGNAM-${VERSION}.gcc4-qt4.${ARCH}.tar.bz2 |head -1)
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP 
 rm -rf $TOPDIR
-tar xvf $CWD/$PRGNAM-${VERSION}.gcc4-shared-qt3.${ARCH}.tar.bz2
+tar xvf $CWD/$PRGNAM-${VERSION}.gcc4-qt4.${ARCH}.tar.bz2
 cd $TOPDIR
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 # No, the --DESTDIR isn't documented.  In fact, the presence of OPERADESTDIR
 # at the top of install.sh is damn misleading.  I shouldn't have to actually
-# read the install script to figure out DESTDIR - the --help should show it.
+# read the install script to figure out DESTDIR: the --help should show it.
 # --rworkman
 ./install.sh \
   --prefix=/usr \
-  --exec_prefix=/usr/lib/opera-$VERSION \
+  --exec_prefix=/usr/lib${LIBDIRSUFFIX}/opera \
   --sharedir=/usr/share/opera \
   --wrapperdir=/usr/bin \
   --mandir=/usr/man \
   --docdir=/usr/doc/opera-$VERSION \
-  --plugindir=/usr/lib/mozilla/plugins \
+  --plugindir=/usr/lib${LIBDIRSUFFIX}/mozilla/plugins \
   --DESTDIR=$PKG
 
 # Fix a potential security issue (minor, but still) with a hardcoded path to
@@ -76,17 +75,23 @@ chmod -R u+w,go+r-w,a-s .
 # recreates the directory and does some unknown havoc.  It may very well be
 # completely safe and unexploitable and I'm just being Chicken Little here,
 # but it's easy enough to fix and I'd rather be safe than sorry.  --rworkman
-sed -i "s|$TMP/$TOPDIR|/usr/bin/|g" $PKG/usr/bin/opera
+sed -i "s%$TMP/$TOPDIR\$0%\$PWD/\${0#./}%g" $PKG/usr/bin/opera
+
+#  /usr/bin/opera doesn't look in the right places for 64bit java. Fix it.
+if [ "$ARCH" = "x86_64" ]; then
+sed -i -e "/PREFIXES=\"/,/\/opt\"/ s:/usr/lib:/usr/lib64:" \
+       -e "s:i386:amd64:" $PKG/usr/bin/opera
+fi
 
 # Include config files
 mv etc $PKG
-mv $PKG/etc/opera6rc $PKG/etc/opera6rc.new
-mv $PKG/etc/opera6rc.fixed $PKG/etc/opera6rc.fixed.new
+mv $PKG/etc/operaprefs_default.ini $PKG/etc/operaprefs_default.ini.new
+mv $PKG/etc/operaprefs_fixed.ini $PKG/etc/operaprefs_fixed.ini.new
 
 # Add an opera.desktop file and link the icon to /usr/share/pixmaps
 mv usr/share/icons usr/share/pixmaps $PKG/usr/share
 mkdir -p $PKG/usr/share/applications
-install -m 0644 $CWD/opera.desktop $PKG/usr/share/applications
+cat $CWD/opera.desktop > $PKG/usr/share/applications/opera.desktop
 
 # Add a copy of the build script to the docs
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -103,10 +108,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-
-# Patch for Chinese font handling
-if [ "$CHINESE_FIX" = "YES" ]; then
-  patch -p0 < $CWD/opera_chinese_font_fix.diff
-fi
-
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/opera/opera.info b/network/opera/opera.info
index 3fbbaa4ee8..cdfff79c99 100644
--- a/network/opera/opera.info
+++ b/network/opera/opera.info
@@ -1,8 +1,10 @@
 PRGNAM="opera"
-VERSION="9.64"
+VERSION="10.10"
 HOMEPAGE="http://www.opera.com"
-DOWNLOAD="ftp://ftp.opera.com/pub/opera/linux/964/final/en/i386/shared/opera-9.64.gcc4-shared-qt3.i386.tar.bz2"
-MD5SUM="75089899df632484b62f75b23412fb90"
+DOWNLOAD="http://ftp.ussg.iu.edu/opera/linux/1010/final/en/i386/opera-10.10.gcc4-qt4.i386.tar.bz2"
+MD5SUM="b22f377a7a85df3f7a3831fcd2a4b2e4"
+DOWNLOAD_x86_64="http://ftp.ussg.iu.edu/opera/linux/1010/final/en/x86_64/opera-10.10.gcc4-qt4.x86_64.tar.bz2"
+MD5SUM_x86_64="bedd94ab5a663d8e4b694da4772471b4"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"
diff --git a/network/opera/opera_chinese_font_fix.diff b/network/opera/opera_chinese_font_fix.diff
deleted file mode 100644
index dc4b3331e5..0000000000
--- a/network/opera/opera_chinese_font_fix.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- usr/share/opera/ini/font.ini.bak	2008-06-30 11:55:03.000000000 -0700
-+++ usr/share/opera/ini/font.ini	2008-07-24 12:45:29.000000000 -0700
-@@ -7,7 +7,7 @@
- 
- ; One can disable xft or core fonts if necessary
- ;engine:xft=blacklist
--;engine:x11=blacklist
-+engine:x11=blacklist
- 
- ; Foundries that are generally known to have bad implementations
- ;foundry:urw|abiword|ultimo=bad
-@@ -30,9 +30,9 @@
- foundry:bitstream=excellent
- 
- ; Known fonts that solves specific problems
--family:mincho|gothic=japanese good try-first
--family:kochi*=japanese good try-first
--family:song|song ti|fangsong*=chinese-s try-first
-+family:WenQuanYi*=japanese excellent try-first
-+family:WenQuanYi*=chinese-s excellent try-first
-+family:WenQuanYi*=chinese-t excellent try-first
- family:baekmuk*=korean good try-first
- 
- ; Fonts that we know should not be used for displaying text
diff --git a/network/opera/slack-desc b/network/opera/slack-desc
index e6c66a1a08..45b76c67af 100644
--- a/network/opera/slack-desc
+++ b/network/opera/slack-desc
@@ -10,10 +10,10 @@ opera: opera (Opera Web Browser)
 opera: 
 opera: Opera is a lightweight, free, multiplatform, and
 opera: standards-compliant web browser.
-opera: 
-opera: 
-opera: 
-opera: 
-opera: 
-opera: 
-opera: 
+opera:
+opera:
+opera:
+opera:
+opera:
+opera:
+opera: