diff -rN -u old-frugalware-current/extra/source/xapps/opera/FrugalBuild new-frugalware-current/extra/source/xapps/opera/FrugalBuild
--- old-frugalware-current/extra/source/xapps/opera/FrugalBuild	2006-03-04 01:17:38.000000000 +0100
+++ new-frugalware-current/extra/source/xapps/opera/FrugalBuild	2006-03-04 01:17:40.000000000 +0100
@@ -1,4 +1,4 @@
-# Last Modified: Sat, 18 Feb 2006 16:04:16 +0100
+# Last Modified: Sat, 04 Mar 2006 01:13:29 +0100
 # Compiling Time: ~0.01 SBU
 # Contributor: VMiklos <vmiklos@frugalware.org>
 # Maintainer: voroskoi <voroskoi@frugalware.org>
@@ -6,7 +6,7 @@
 pkgname=opera
 pkgver=8.52
 pkgextraver=-20060201.1-static-qt.i386-en
-pkgrel=2
+pkgrel=3
 pkgdesc="Opera web browser."
 url="http://www.opera.com/linux/"
 depends=('qt' 'gcc-lib' 'lesstif')
@@ -14,14 +14,14 @@
 archs=('i686')
 up2date="lynx -dump ftp://ftp.opera.com/pub/opera/linux/ |grep -wo opera.*[0-9][0-9][0-9] |sort -r | sed -ne 's|.*x/\(.*\)|\1|;s/\([0-9]\)/\1./;1 p'"
 source=(ftp://ftp.opera.com/pub/opera/linux/852/final/en/i386/static/opera-$pkgver$pkgextraver.tar.bz2 \
-	$pkgname.desktop)
+	install.sh.diff)
 sha1sums=('547dd2019213f240f7dc9e2f757c059731a35c59' \
-	'cd11a19295ff389988da3b9d96b89329621e1169')
-nobuild=1
+	  '6cf8e0d13b0d9c1cfdcca08c04f27b93ba3c5690')
+options=('nobuild')
 
 build()
 {
-	Fcd
+	Fpatchall
 	Fsed 'config_dir="/etc"' "config_dir=\"$Fdestdir/etc/\"" install.sh
 	Fsed '/usr/share/applnk' "$Fdestdir/usr/share/applnk" install.sh
 	Fsed '/usr/share/pixmaps' "$Fdestdir/usr/share/pixmaps" install.sh
@@ -34,8 +34,13 @@
 	Fsed '/opt/kde' "$Fdestdir/usr" install.sh
 	Fsed '\(str_localdirplugin=\).*$' '\1/usr/lib/opera/lib/opera/plugins' install.sh
 
-	Fmkdir /etc
+	# as /usr/share is not visible for the installer, let's install the
+	# desktop & icons to /usr/lib/opera/share, then we can move it to the right place
+	Fmkdir /etc /usr/share/pixmaps /usr/lib/opera/share/{applications,pixmaps/hicolor}
 	./install.sh --prefix="$Fdestdir"/usr/lib/opera
+	Fmv /usr/lib/opera/share/applications /usr/share/applications
+	Fmv /usr/lib/opera/share/pixmaps/hicolor /usr/share/pixmaps/hicolor
+	Frm /usr/share/pixmaps/hicolor
 	Fsed 'LD_PRELOAD="${OPERA_JAVA_DIR}/libawt.so"' \
 		'LD_PRELOAD="$LD_PRELOAD"\:"${OPERA_JAVA_DIR}/libawt.so"' \
 		$Fdestdir/usr/lib/opera/bin/opera
@@ -43,10 +48,7 @@
 	Fsed "$Fdestdir" "" $Fdestdir/usr/lib/opera/share/opera/java/opera.policy
 	Fmkdir /usr/share/pixmaps
 	Ffilerel images/opera.xpm /usr/share/pixmaps/
-	Ffile /usr/share/applications/opera.desktop
 	Fln ../lib/opera/bin/opera /usr/bin/opera
 	echo "Plugin Path=/usr/lib/opera/lib/opera/plugins" >> \
 		$Fdestdir/etc/opera6rc
 }
-
-# vim: ft=sh
diff -rN -u old-frugalware-current/extra/source/xapps/opera/install.sh.diff new-frugalware-current/extra/source/xapps/opera/install.sh.diff
--- old-frugalware-current/extra/source/xapps/opera/install.sh.diff	1970-01-01 01:00:00.000000000 +0100
+++ new-frugalware-current/extra/source/xapps/opera/install.sh.diff	2006-03-04 01:17:40.000000000 +0100
@@ -0,0 +1,29 @@
+--- opera.orig/install.sh	2006-03-04 00:59:20.000000000 +0100
++++ opera/install.sh	2006-03-04 01:05:55.000000000 +0100
+@@ -118,6 +118,8 @@
+ 	doc_dir="${prefix}/share/doc/opera"
+ 	share_dir="${prefix}/share/opera"
+ 	plugin_dir="${prefix}/lib/opera/plugins"
++	desktop_dir="${prefix}/share/applications"
++	icon_dir="${prefix}/share/pixmaps/hicolor"
+     fi
+ }
+ 
+@@ -1785,7 +1787,7 @@
+ {   # http://standards.freedesktop.org
+     if update-desktop-database --help >/dev/null 2>&1; then
+ 
+-	for ICON_DIR in ${XDG_DATA_DIRS}/icons/hicolor /usr/share/pixmaps/hicolor; do test -d ${ICON_DIR} && break; done
++	ICON_DIR=${icon_dir}
+ 
+ 	if   test ! -d ${ICON_DIR}; then echo "Could not find icon installation directory, icons not installed." >&2
+ 	elif test ! -w ${ICON_DIR}; then echo "Directory \"${ICON_DIR}\" not writable by user \"${USER}\", icons not installed." >&2
+@@ -1795,7 +1797,7 @@
+ 	    test -d ${ICON_DIR}/22x22/apps && test -w ${ICON_DIR}/22x22/apps && cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png
+ 	fi
+ 
+-	for SHORTCUT_DIR in ${XDG_DATA_HOME}/applications /usr/local/share/applications /usr/share/applications; do test -d ${SHORTCUT_DIR} && break; done
++	SHORTCUT_DIR=${desktop_dir}
+ 
+ 	if   test ! -d ${SHORTCUT_DIR}; then echo "Could not find shortcut installation directory, desktop entry not installed." >&2; return
+ 	elif test ! -w ${SHORTCUT_DIR}; then echo "Directory \"${SHORTCUT_DIR}\" not writable by user \"${USER}\", desktop entry not installed." >&2; return
diff -rN -u old-frugalware-current/extra/source/xapps/opera/opera.desktop new-frugalware-current/extra/source/xapps/opera/opera.desktop
--- old-frugalware-current/extra/source/xapps/opera/opera.desktop	2006-03-04 01:17:38.000000000 +0100
+++ new-frugalware-current/extra/source/xapps/opera/opera.desktop	1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Opera
-Comment=Web Browser
-Exec=opera
-Icon=opera.xpm
-Terminal=0
-Type=Application
-Categories=Application;Qt;Network;WebBrowser;