[arch-commits] Commit in opera/repos (extra-i686 extra-i686/PKGBUILD)

[daniel at archlinux.org]

    Date: Wednesday, October 8, 2008 @ 07:55:28
  Author: daniel
Revision: 14567

Merged revisions 9972-14566 via svnmerge from 
svn+ssh://daniel@svn.archlinux.org/home/svn-packages/opera/trunk

........
  r14565 | daniel | 2008-10-08 13:48:38 +0200 (Wed, 08 Oct 2008) | 1 line
  
  upgpkg: opera 9.60-1
........

Modified:
  opera/repos/extra-i686/	(properties)
  opera/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)


Property changes on: opera/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /opera/trunk:1-9971
   + /opera/trunk:1-14566

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-08 11:49:27 UTC (rev 14566)
+++ extra-i686/PKGBUILD	2008-10-08 11:55:28 UTC (rev 14567)
@@ -3,28 +3,28 @@
 # Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=opera
-pkgver=9.52
+pkgver=9.60
 pkgrel=1
 pkgdesc="The Opera web browser"
 url="http://www.opera.com/"
-depends=('qt3')
+depends=('qt')
 license=('custom:opera')
 arch=('i686' 'x86_64')
-source=(http://ftp.opera.com/pub/opera/linux/${pkgver/./}/final/en/i386/shared/opera-${pkgver}-2091.gcc4-shared-qt3.i386.tar.bz2 opera.desktop opera_logo48.png)
-md5sums=('f070d798975f8cea0ccfdb6b25e53c47'
+source=(http://ftp.opera.com/pub/opera/linux/${pkgver/./}/final/en/i386/opera-${pkgver}.gcc4-qt4.i386.tar.bz2 opera.desktop opera_logo48.png)
+md5sums=('7d822ed370700e4d246b7ff26ac3ea9c'
 	'f99bef1a9200abe5a5cda78665cddc84'
         'a270c65b8d4f8e2e76439f417ea44265')
 
-[ "$CARCH" = "x86_64" ] && source=(http://ftp.opera.com/pub/opera/linux/${pkgver/./}/final/en/x86_64/opera-${pkgver}-2091.gcc4-shared-qt3.x86_64.tar.bz2 opera.desktop opera_logo48.png)
-[ "$CARCH" = "x86_64" ] && md5sums=('37c2c629cf851e3df867f2befc8ed542' 
-	'f99bef1a9200abe5a5cda78665cddc84'
-	'a270c65b8d4f8e2e76439f417ea44265')
-
+[ "$CARCH" = "x86_64" ] && depends=('qt3')
+[ "$CARCH" = "x86_64" ] && source=(http://ftp.opera.com/pub/opera/linux/${pkgver/./}/final/en/x86_64/opera-${pkgver}.gcc4-shared-qt3.x86_64.tar.bz2 opera.desktop opera_logo48.png)
+[ "$CARCH" = "x86_64" ] &&  md5sums=('e86833e3da8effefc65e657691fd4588'
+         'f99bef1a9200abe5a5cda78665cddc84'
+         'a270c65b8d4f8e2e76439f417ea44265')
 build() {
 if [ "$CARCH" = "x86_64" ]; then
-       cd ${startdir}/src/opera-${pkgver}-2091.gcc4-shared-qt3.x86_64
+       cd ${startdir}/src/opera-${pkgver}-2444.gcc4-shared-qt3.x86_64
        sed 's|/usr/X11R6/lib/mozilla/plugins=1|/usr/lib/mozilla/plugins=1|' -i usr/share/opera/ini/pluginpath.ini || return 1
-  else cd ${startdir}/src/opera-${pkgver}-2091.gcc4-shared-qt3.i386
+  else cd ${startdir}/src/opera-${pkgver}-2444.gcc4-qt4.i386
        sed 's|/usr/X11R6/lib/mozilla/plugins=1|/usr/lib/mozilla/plugins=1|' -i usr/share/opera/ini/pluginpath.ini || return 1
 fi
    ./install.sh DESTDIR=${startdir}/pkg