Fixed whitespace, gave RESTRICT some valid options, moved around some of the variables for clarity.

(Portage version: 2.1.2_rc3-r6)

3 files changed, 36 insertions, 31 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 0fc261ca1269..1a75aadb15b6 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.73 2006/12/19 00:04:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.74 2006/12/19 04:29:12 jer Exp $
+
+  19 Dec 2006; Jeroen Roovers <jer@gentoo.org> metadata.xml,
+  opera-9.10.ebuild:
+  Fixed whitespace, gave RESTRICT some valid options, moved around some of the
+  variables for clarity.
 
   19 Dec 2006; Jeroen Roovers <jer@gentoo.org> opera-9.10.ebuild:
   Start using the mirror system again, seems to work fine.
diff --git a/www-client/opera/metadata.xml b/www-client/opera/metadata.xml
index 4bed29d6042e..0be0e2768090 100644
--- a/www-client/opera/metadata.xml
+++ b/www-client/opera/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>axxo@gentoo.org</email>
-</maintainer>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>axxo@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-client/opera/opera-9.10.ebuild b/www-client/opera/opera-9.10.ebuild
index c92ecbde8877..7cb97c01d2d9 100644
--- a/www-client/opera/opera-9.10.ebuild
+++ b/www-client/opera/opera-9.10.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.10.ebuild,v 1.2 2006/12/19 00:04:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.10.ebuild,v 1.3 2006/12/19 04:29:12 jer Exp $
 
-GCONF_DEBUG="no"
 inherit eutils gnome2
 
+DESCRIPTION="Opera web browser."
+HOMEPAGE="http://www.opera.com"
+
+SLOT="0"
+LICENSE="OPERA-9.0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
 IUSE="qt-static spell gnome"
+RESTRICT="strip mirror"
 
 OPERALNG="en"
+OPERASUFF="521"
 OPERAVER="9.10-20061214"
 OPERAFTPDIR="910/final/${OPERALNG}"
-OPERASUFF="521"
-
-
-DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com"
 
 OPERA_URI="mirror://opera/linux/${OPERAFTPDIR}/"
 SRC_URI="
@@ -25,7 +28,6 @@ SRC_URI="
 	sparc? ( ${OPERA_URI}sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-${OPERALNG}.tar.bz2 )
 	ppc? ( ${OPERA_URI}ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-${OPERALNG}.tar.bz2 )"
 
-S=${WORKDIR}/${A/.tar.bz2/}-${OPERASUFF}
 DEPEND=">=sys-apps/sed-4
 	amd64? ( sys-apps/setarch )"
 
@@ -44,33 +46,31 @@ RDEPEND="|| ( ( x11-libs/libXrandr
 			)
 	>=media-libs/fontconfig-2.1.94-r1
 	amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
-	         !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
+			 !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
 	!amd64? ( media-libs/libexif
-	          spell? ( app-text/aspell )
-	          x86? ( !qt-static? ( =x11-libs/qt-3* ) )
+			  spell? ( app-text/aspell )
+			  x86? ( !qt-static? ( =x11-libs/qt-3* ) )
 			  media-libs/jpeg )"
 
-SLOT="0"
-LICENSE="OPERA-9.0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+S=${WORKDIR}/${A/.tar.bz2/}-${OPERASUFF}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch "${FILESDIR}/${PN}-9.00-install.patch"
 	sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
-	       -e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
-	       -e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \
-	       -e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-	       -e "s:/etc/X11:${D}/etc/X11:g" \
-	       -e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-	       -e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \
-	       -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		   -e 's:read str_answer:return 0:' \
-		   -e "s:/opt/kde:${D}/usr/kde:" \
-		   -e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-	       install.sh || die
+		-e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
+		-e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \
+		-e "s:/usr/share/icons:${D}/usr/share/icons:g" \
+		-e "s:/etc/X11:${D}/etc/X11:g" \
+		-e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
+		-e "s:/opt/gnome/share:${D}/opt/gnome/share:g" \
+		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
+		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
+		-e 's:read str_answer:return 0:' \
+		-e "s:/opt/kde:${D}/usr/kde:" \
+		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
+		install.sh || die
 }
 
 src_compile() {