Restore previous ebuild.

Package-Manager: portage-2.1-r1

3 files changed, 25 insertions, 22 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 7e7fb7bf8bfc..6113dcbccb57 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
 # 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.49 2006/06/30 18:56:57 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.50 2006/07/01 12:05:45 carlo Exp $
+
+  01 Jul 2006; Carsten Lohrke <carlo@gentoo.org> opera-9.00.ebuild:
+  Restore previous ebuild.
 
   30 Jun 2006; Carsten Lohrke <carlo@gentoo.org>
   files/opera-9.00-install.patch, opera-9.00.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 891c04f6fec4..71d8bc6392a1 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -50,18 +50,18 @@ EBUILD opera-8.54.ebuild 4737 RMD160 7e5575f39eb741e9cd8b340b45e1c35295aeeba8 SH
 MD5 6add0566d3e8d5d140e4de7d9055ba36 opera-8.54.ebuild 4737
 RMD160 7e5575f39eb741e9cd8b340b45e1c35295aeeba8 opera-8.54.ebuild 4737
 SHA256 21c11036ed1695cfbfd47dbd9e582278d676316763e0935eb621d04f039cf212 opera-8.54.ebuild 4737
-EBUILD opera-9.00.ebuild 4471 RMD160 1d6038588166425a218472905777db72cc06d3a5 SHA1 7042f70d7e60070edc7204048efb8dea7f7709b8 SHA256 832c4a2cc44c3f0e07aa4c4dfb1870e3df6933e2ace840d60648fb6b7305c11d
-MD5 041034b9b76d9265a32454daf6c8c9df opera-9.00.ebuild 4471
-RMD160 1d6038588166425a218472905777db72cc06d3a5 opera-9.00.ebuild 4471
-SHA256 832c4a2cc44c3f0e07aa4c4dfb1870e3df6933e2ace840d60648fb6b7305c11d opera-9.00.ebuild 4471
+EBUILD opera-9.00.ebuild 4404 RMD160 c966029472384fec5380bf6f69b3cb12676ed703 SHA1 7867d04b8a60ecf5993cf6c3b8d7fd68fcaa43f0 SHA256 a7a4d4e37fa04d041a83b16e40e43bdcd0b047d6d3ef27a3fccc5fc3e99cea08
+MD5 746d8da26487443a3ba45369dc9a359e opera-9.00.ebuild 4404
+RMD160 c966029472384fec5380bf6f69b3cb12676ed703 opera-9.00.ebuild 4404
+SHA256 a7a4d4e37fa04d041a83b16e40e43bdcd0b047d6d3ef27a3fccc5fc3e99cea08 opera-9.00.ebuild 4404
 EBUILD opera-9.00_pre2.ebuild 4473 RMD160 d89318a2ac522236c713c6b1936b74246e78d969 SHA1 7892f26b73931a1505c55ae613b63e508c5ff5b8 SHA256 e5d532c1d696ddadc6675493e27bc7eaa7da8bf9fc5b8f19010163ad9966052f
 MD5 03b82ef0cfbd1748b5610562c6f3e32e opera-9.00_pre2.ebuild 4473
 RMD160 d89318a2ac522236c713c6b1936b74246e78d969 opera-9.00_pre2.ebuild 4473
 SHA256 e5d532c1d696ddadc6675493e27bc7eaa7da8bf9fc5b8f19010163ad9966052f opera-9.00_pre2.ebuild 4473
-MISC ChangeLog 21010 RMD160 984c6259b181fe7a8dbbbf63f9195e256f5424ad SHA1 59fa072b693804724683140e14441a984ac6be51 SHA256 3ddab3f58f191cfcb7435d41b157013b77f6f53329095d49696290efdad43784
-MD5 e16fba83be29840d8533628615c42990 ChangeLog 21010
-RMD160 984c6259b181fe7a8dbbbf63f9195e256f5424ad ChangeLog 21010
-SHA256 3ddab3f58f191cfcb7435d41b157013b77f6f53329095d49696290efdad43784 ChangeLog 21010
+MISC ChangeLog 21106 RMD160 8233d2251972711383ed4125dad962cbb7a6f799 SHA1 e1c95caf38530b1d4f72e29854a7aaaa8e7c94d3 SHA256 45a086ae7e43500014b57874731565da388b8e182e8e43763fcd849b8ee5758f
+MD5 90af5200b48fd06a03270bfd8a0ccf99 ChangeLog 21106
+RMD160 8233d2251972711383ed4125dad962cbb7a6f799 ChangeLog 21106
+SHA256 45a086ae7e43500014b57874731565da388b8e182e8e43763fcd849b8ee5758f ChangeLog 21106
 MISC metadata.xml 220 RMD160 7ff7ad4c6e8d172bcfc712cdea261e851838129c SHA1 0718289f296f6229a8833cf44f48cc0f683b682b SHA256 4e10c895f4654efa60587dd3c2febe6c18471fbf752cde4a12fbe884b3cfa287
 MD5 db97f8b4a8ea79d4f2660a1fdb6d4a01 metadata.xml 220
 RMD160 7ff7ad4c6e8d172bcfc712cdea261e851838129c metadata.xml 220
diff --git a/www-client/opera/opera-9.00.ebuild b/www-client/opera/opera-9.00.ebuild
index a18d83e9d79d..b6c3d65cbd7b 100644
--- a/www-client/opera/opera-9.00.ebuild
+++ b/www-client/opera/opera-9.00.ebuild
@@ -1,31 +1,31 @@
 # 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.00.ebuild,v 1.2 2006/06/30 18:56:57 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.00.ebuild,v 1.3 2006/07/01 12:05:45 carlo Exp $
 
+GCONF_DEBUG="no"
 inherit eutils gnome2
 
 IUSE="qt-static spell gnome"
 
+OPERALNG="en"
 OPERAVER="9.0-20060616"
-OPERAFTPDIR="900/final/en"
-OPERASUFF="en"
+OPERAFTPDIR="900/final/${OPERALNG}"
+OPERASUFF="344"
 
-S="${WORKDIR}/${A/.tar.bz2/}-344"
 
 DESCRIPTION="Opera web browser."
 HOMEPAGE="http://www.opera.com"
 
-# that's an ugly workaround for the broken src_uri syntax
 OPERA_URI="mirror://opera/linux/${OPERAFTPDIR}/"
 SRC_URI="
-	x86? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-${OPERASUFF}.tar.bz2 ) )
-	x86? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-${OPERASUFF}.tar.bz2 ) )
-	amd64? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-${OPERASUFF}.tar.bz2 ) )
-	amd64? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-${OPERASUFF}.tar.bz2 ) )
-	sparc? ( ${OPERA_URI}sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-${OPERASUFF}.tar.bz2 )
-	ppc? ( ${OPERA_URI}ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-${OPERASUFF}.tar.bz2 )"
-
-# Dependencies may be augmented later (see below).
+	x86? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}.tar.bz2 ) )
+	x86? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-${OPERALNG}.tar.bz2 ) )
+	amd64? ( qt-static? ( ${OPERA_URI}i386/static/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}.tar.bz2 ) )
+	amd64? ( !qt-static? ( ${OPERA_URI}i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-${OPERALNG}.tar.bz2 ) )
+	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 )"