[arch-commits] Commit in opera/trunk (PKGBUILD)

[Ike Devolder]

    Date: Tuesday, August 4, 2015 @ 17:19:17
  Author: idevolder
Revision: 137937

opera :: 31.0.1889.99

Modified:
  opera/trunk/PKGBUILD

----------+
 PKGBUILD |   58 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-04 14:12:10 UTC (rev 137936)
+++ PKGBUILD	2015-08-04 15:19:17 UTC (rev 137937)
@@ -10,58 +10,60 @@
 # Contributor: eworm
 
 pkgname=opera
-pkgver=30.0.1835.125
+pkgver=31.0.1889.99
 pkgrel=1
-pkgdesc="A fast and secure web browser and Internet suite."
+pkgdesc="A fast and secure web browser"
 url="http://www.opera.com/"
 install=${pkgname}.install
 options=(!strip !zipman)
 license=('custom:opera')
 backup=("etc/$pkgname/default")
-depends=('gtk2' 'desktop-file-utils' 'shared-mime-info' 'libxtst' 'gconf' 'libxss' 'gcc-libs' 'alsa-lib' 'nss' 'freetype2' 'ttf-font')
+depends=('gtk2' 'desktop-file-utils' 'shared-mime-info' 'libxtst' 'gconf' 'libxss' 'alsa-lib' 'nss' 'ttf-font')
 optdepends=(
-	'curl: opera crash reporter and autoupdate checker'
-	'ffmpeg: playback of proprietary formats'
+    'curl: opera crash reporter and autoupdate checker'
+    'libnotify: native desktop notifications'
 )
 arch=('x86_64')
 source_x86_64=(
-	#"http://deb.opera.com/opera/pool/non-free/o/${pkgname}-stable/${pkgname}-stable_${pkgver}_amd64.deb"
-	"http://get.geo.opera.com/pub/${pkgname}/desktop/${pkgver}/linux/${pkgname}-stable_${pkgver}_amd64.deb"
+    "http://get.geo.opera.com/pub/${pkgname}/desktop/${pkgver}/linux/${pkgname}-stable_${pkgver}_amd64.deb"
 )
 source=(
-	"opera"
-	"default"
+    "opera"
+    "default"
 )
 sha256sums=('508512464e24126fddfb2c41a1e2e86624bdb0c0748084b6a922573b6cf6b9c5'
             '4913d97dec0ddc99d1e089b029b9123c2c86b7c88d631c4d1111b119b09da027')
-sha256sums_x86_64=('762d1bfb8575c66d9528ebe77dd83c264c59598b9f972143f8c8d18aa9195a45')
+sha256sums_x86_64=('51dc961957cd1b7169c6922f5433feee2320300f7c52f96bf349fa478b2b9745')
 
 prepare() {
-	sed -e "s/%pkgname%/$pkgname/g" -i "$srcdir/opera"
-	sed -e "s/%operabin%/x86_64-linux-gnu\/$pkgname\/$pkgname/g" \
-		-i "$srcdir/opera"
+    sed -e "s/%pkgname%/$pkgname/g" -i "$srcdir/opera"
+    sed -e "s/%operabin%/$pkgname\/$pkgname/g" \
+        -i "$srcdir/opera"
 }
 
 package() {
-	tar -xf data.tar.xz --exclude=usr/share/{lintian,menu} -C "$pkgdir/"
+    tar -xf data.tar.xz --exclude=usr/share/{lintian,menu} -C "$pkgdir/"
 
-	# suid opera_sandbox
-	chmod 4755 "$pkgdir/usr/lib/x86_64-linux-gnu/$pkgname/opera_sandbox"
+    # get rid of the extra subfolder {i386,x86_64}-linux-gnu
+    (
+        cd "$pkgdir/usr/lib/"*-linux-gnu/
+        mv "$pkgname" ../
+    )
+    rm -rf "$pkgdir/usr/lib/"*-linux-gnu
 
-	# install default options
-	install -Dm644 "$srcdir/default" "$pkgdir/etc/$pkgname/default"
+    # suid opera_sandbox / can be removed with linux > 3.16 (we still have lts)
+    chmod 4755 "$pkgdir/usr/lib/$pkgname/opera_sandbox"
 
-	# install opera wrapper
-	rm "$pkgdir/usr/bin/$pkgname"
-	install -Dm755 "$srcdir/opera" "$pkgdir/usr/bin/$pkgname"
+    # install default options
+    install -Dm644 "$srcdir/default" "$pkgdir/etc/$pkgname/default"
 
-	# license
-	install -Dm644 \
-		"$pkgdir/usr/lib/x86_64-linux-gnu/$pkgname/opera_autoupdate.licenses" \
-		"$pkgdir/usr/share/licenses/$pkgname/opera_autoupdate.licenses"
+    # install opera wrapper
+    rm "$pkgdir/usr/bin/$pkgname"
+    install -Dm755 "$srcdir/opera" "$pkgdir/usr/bin/$pkgname"
 
-	install -Dm644 \
-		"$pkgdir/usr/share/doc/${pkgname}-stable/copyright" \
-		"$pkgdir/usr/share/licenses/$pkgname/copyright"
+    # license
+    install -Dm644 \
+        "$pkgdir/usr/share/doc/${pkgname}-stable/copyright" \
+        "$pkgdir/usr/share/licenses/$pkgname/copyright"
 }