commit opera-developer 32.0.1933.0-2

.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = opera-developer
 	pkgdesc = A fast and secure web browser and Internet suite - developer stream
 	pkgver = 32.0.1933.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.opera.com/browser/
 	install = opera.install
 	arch = x86_64
@@ -15,8 +15,12 @@ pkgbase = opera-developer
 	depends = libxss
 	depends = libxtst
 	depends = desktop-file-utils
-	optdepends = ffmpeg: HTML5 H264 and mp3 playback
 	options = !strip
+	backup = etc/opera-developer/default
+	source = opera
+	source = default
+	sha256sums = 508512464e24126fddfb2c41a1e2e86624bdb0c0748084b6a922573b6cf6b9c5
+	sha256sums = c3c7e5ae35d897b0cca91c07d55cdca4ea30b3c1ba89d428807454a6257bd1be
 	source_x86_64 = http://get.geo.opera.com/pub/opera-developer/32.0.1933.0/linux/opera-developer_32.0.1933.0_amd64.deb
 	sha256sums_x86_64 = 36e153c3778ab543ea0b0921534f42dd689aaadd1fe0aac43d5e5fcb832a8a58
 	source_i686 = http://get.geo.opera.com/pub/opera-developer/32.0.1933.0/linux/opera-developer_32.0.1933.0_i386.deb

PKGBUILD

@@ -2,23 +2,35 @@
 
 pkgname=opera-developer
 pkgver=32.0.1933.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A fast and secure web browser and Internet suite - developer stream'
 arch=('x86_64' 'i686')
 url='http://www.opera.com/browser/'
 license=('custom:opera')
 depends=('alsa-lib' 'nss' 'gtk2' 'gconf' 'libnotify' 'libxss' 'libxtst' 'desktop-file-utils')
-optdepends=('ffmpeg: HTML5 H264 and mp3 playback')
 install=opera.install
 options=(!strip)
+backup=("etc/${pkgname}/default")
+source=('opera'
+	'default')
 source_x86_64=("http://get.geo.opera.com/pub/${pkgname}/${pkgver}/linux/${pkgname}_${pkgver}_amd64.deb")
 source_i686=("http://get.geo.opera.com/pub/${pkgname}/${pkgver}/linux/${pkgname}_${pkgver}_i386.deb")
+sha256sums=('508512464e24126fddfb2c41a1e2e86624bdb0c0748084b6a922573b6cf6b9c5'
+	'c3c7e5ae35d897b0cca91c07d55cdca4ea30b3c1ba89d428807454a6257bd1be')
 sha256sums_x86_64=('36e153c3778ab543ea0b0921534f42dd689aaadd1fe0aac43d5e5fcb832a8a58')
 sha256sums_i686=('be60c87212307a06d7628761b9bb16e15c2bc7d711957467b4c55e2f7f868b32')
 # alternative download
 #source=("ftp://ftp.opera.com/pub/${pkgname}/${pkgver}/linux/${pkgname}_${pkgver}_amd64.deb")
 #source=("http://deb.opera.com/${pkgname}/pool/non-free/o/${pkgname}/${pkgname}_${pkgver}_amd64.deb")
 
+prepare() {
+	cd ${srcdir}/
+
+	sed -i -e "s/%pkgname%/${pkgname}/g" \
+		-e "s/%operabin%/${pkgname}\/${pkgname}/g" \
+		opera default
+}
+
 package() {
 	cd ${srcdir}/
 
@@ -26,15 +38,26 @@ package() {
 	# so extract the inner tarball to ${pkgdir}
 	tar xJf data.tar.xz -C "${pkgdir}/"
 
-	# create ffmpeg compatibility symlinks if necessary
-	for LIBAV in $(strings "${pkgdir}/usr/lib/${CARCH/i686/i386}-linux-gnu/${pkgname}/${pkgname}" | egrep 'libav[[:alpha:]]+.so'); do
-		[ -s "/usr/lib/${LIBAV}" ] && continue
-
-		install -d -m0755 "${pkgdir}/usr/lib/${CARCH/i686/i386}-linux-gnu/${pkgname}/lib/"
-		ln -s ../../../$(basename "${LIBAV%.*}") "${pkgdir}/usr/lib/${CARCH/i686/i386}-linux-gnu/${pkgname}/lib/${LIBAV}"
-	done
+	# 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
 
 	# set suid bit for Opera sandbox
-	chmod 4755 "${pkgdir}/usr/lib/${CARCH/i686/i386}-linux-gnu/${pkgname}/opera_sandbox"
+	chmod 4755 "${pkgdir}/usr/lib/${pkgname}/opera_sandbox"
+
+	# install default options
+	install -Dm644 "default" "${pkgdir}/etc/${pkgname}/default"
+
+	# install opera wrapper
+	rm "${pkgdir}/usr/bin/${pkgname}"
+	install -Dm755 "opera" "${pkgdir}/usr/bin/${pkgname}"
+
+	# license
+	install -Dm644 \
+		"${pkgdir}/usr/share/doc/${pkgname}/copyright" \
+		"${pkgdir}/usr/share/licenses/${pkgname}/copyright"
 }
 

default

@@ -0,0 +1,4 @@
+# Default settings for %pkgname%. This file is sourced by /usr/bin/%pkgname%
+
+# Options to pass to %opera%
+OPERA_FLAGS=""

opera

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Allow users to override command-line options
+# Based on Gentoo's chromium package (and by extension, Debian's)
+if [[ -f /etc/%pkgname%/default ]]; then
+	. /etc/%pkgname%/default
+fi
+
+# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
+# default CHROMIUM_FLAGS (from /etc/chromium/default)
+OPERA_FLAGS=${OPERA_USER_FLAGS:-$OPERA_FLAGS}
+
+exec /usr/lib/%operabin% $OPERA_FLAGS "$@"