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

Package-Manager: portage-2.1.2_rc3-r6

4 files changed, 48 insertions, 43 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/Manifest b/www-client/opera/Manifest
index e0021af3bed4..a546ea7a069b 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -22,18 +22,18 @@ EBUILD opera-9.02.ebuild 4422 RMD160 3dbe155752c9c84b1587c0b9c35bac6c79cf2327 SH
 MD5 2daa85ec5e1989bf32ea1107205e5739 opera-9.02.ebuild 4422
 RMD160 3dbe155752c9c84b1587c0b9c35bac6c79cf2327 opera-9.02.ebuild 4422
 SHA256 798f2472de8d4e37bfb5567e855f9824afbb0875c755f9c7bfc2c917a1397625 opera-9.02.ebuild 4422
-EBUILD opera-9.10.ebuild 4388 RMD160 b3864696f06b3d32624a0e0de0163c4bad8d2884 SHA1 7069f0bf77f8514206bcd9b04200c8adafd57f29 SHA256 fd83b85476f63147771704f020eefac50ee9126f56b6cd66cbbb13a04518fbe9
-MD5 ba35f26b87187844669890263e1712ee opera-9.10.ebuild 4388
-RMD160 b3864696f06b3d32624a0e0de0163c4bad8d2884 opera-9.10.ebuild 4388
-SHA256 fd83b85476f63147771704f020eefac50ee9126f56b6cd66cbbb13a04518fbe9 opera-9.10.ebuild 4388
-MISC ChangeLog 23957 RMD160 d176578b07c5c0fda04451cf7c3c85f073a7b9d7 SHA1 37dc566842ba0edd6c1a79167c179f60a9aac797 SHA256 0a762ee67b3af65a27b11039547b6661ee710903666a27bf744150e8578c9351
-MD5 2d0717befa029546a726e487ba3b76b0 ChangeLog 23957
-RMD160 d176578b07c5c0fda04451cf7c3c85f073a7b9d7 ChangeLog 23957
-SHA256 0a762ee67b3af65a27b11039547b6661ee710903666a27bf744150e8578c9351 ChangeLog 23957
-MISC metadata.xml 220 RMD160 7ff7ad4c6e8d172bcfc712cdea261e851838129c SHA1 0718289f296f6229a8833cf44f48cc0f683b682b SHA256 4e10c895f4654efa60587dd3c2febe6c18471fbf752cde4a12fbe884b3cfa287
-MD5 db97f8b4a8ea79d4f2660a1fdb6d4a01 metadata.xml 220
-RMD160 7ff7ad4c6e8d172bcfc712cdea261e851838129c metadata.xml 220
-SHA256 4e10c895f4654efa60587dd3c2febe6c18471fbf752cde4a12fbe884b3cfa287 metadata.xml 220
+EBUILD opera-9.10.ebuild 4314 RMD160 de4a97417b7d92cd8ae16ad2ed776fd5f0305612 SHA1 1e1cdfc0d834b368da41671cec7af09b66d8dd59 SHA256 0d3a41b938c73e433090eebd9ba7dc685a449cb85d4f03c887d841eeb9d0b123
+MD5 728acc84950fff8d9d9ba51e12cc64d4 opera-9.10.ebuild 4314
+RMD160 de4a97417b7d92cd8ae16ad2ed776fd5f0305612 opera-9.10.ebuild 4314
+SHA256 0d3a41b938c73e433090eebd9ba7dc685a449cb85d4f03c887d841eeb9d0b123 opera-9.10.ebuild 4314
+MISC ChangeLog 24144 RMD160 4ad71a9e0ccb0fddc458c05e2a1b5bda17738907 SHA1 3cc412a459492cfbe418eb0e290c74777534b02a SHA256 03ba676c42e55d165428144c5c7a2ae6a3394fe3e93d45f9d9bbbefdf4ef80e9
+MD5 9eaa1dfe656fa897be252aacc793c877 ChangeLog 24144
+RMD160 4ad71a9e0ccb0fddc458c05e2a1b5bda17738907 ChangeLog 24144
+SHA256 03ba676c42e55d165428144c5c7a2ae6a3394fe3e93d45f9d9bbbefdf4ef80e9 ChangeLog 24144
+MISC metadata.xml 223 RMD160 939fb16ae5348524415f190da340711220830e52 SHA1 923a284f84b5269c5cb2c33be39ce9cf45a75d4c SHA256 fe608da37ea708ebd4e3c59323b17bfd9db0616e8336a073ee7164a7e32ff3c0
+MD5 499106b72cb44a66b70484a5b8ec972b metadata.xml 223
+RMD160 939fb16ae5348524415f190da340711220830e52 metadata.xml 223
+SHA256 fe608da37ea708ebd4e3c59323b17bfd9db0616e8336a073ee7164a7e32ff3c0 metadata.xml 223
 MD5 026ea2aa29249ec90c1bd872d293e1be files/digest-opera-9.02 1300
 RMD160 2156528b181af48f9709a334ed66d7ddf97dffc4 files/digest-opera-9.02 1300
 SHA256 8bd88818fae0401031093e01667641b33ca99b429ead8f911017fff6f6f604e6 files/digest-opera-9.02 1300
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() {