--- portage/www-client/opera/opera-8.51.ebuild	2005-11-23 17:36:01.000000000 +0100
+++ local/www-client/opera/opera-8.51.20051114.ebuild	2005-11-23 22:04:26.000000000 +0100
@@ -1,31 +1,33 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.51.ebuild,v 1.4 2005/11/23 16:33:57 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-8.51.ebuild,v 1.3 2005/11/22 23:19:43 metalgod Exp $
 
-inherit eutils
-
-IUSE="static spell qt kde"
-
-OPERAVER="8.51-20051114"
-OPERAFTPDIR="851/final/en"
-
-S=${WORKDIR}/${A/.tar.bz2/}
+inherit eutils versionator
 
 DESCRIPTION="Opera web browser."
 HOMEPAGE="http://www.opera.com/linux/"
+RESTRICT="nomirror"
+
+# Using versionator:
+MY_PV="${PN}-$(replace_version_separator 2 -)"
+MY_URI="mirror://opera/linux/$(get_major_version)$(get_version_component_range 2)/final/en/"
+MY_EXT="en.tar.bz2"
 
-# that's an ugly workaround for the broken src_uri syntax
-OPERA_URI="mirror://opera/linux/${OPERAFTPDIR}/"
 SRC_URI="
-	x86? ( static? ( ${OPERA_URI}i386/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	x86? ( !static? ( ${OPERA_URI}i386/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	amd64? ( static? ( ${OPERA_URI}i386/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	amd64? ( !static? ( ${OPERA_URI}i386/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	sparc? ( ${OPERA_URI}sparc/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )
-	ppc? ( ${OPERA_URI}ppc/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )"
+	x86? ( static? ( ${MY_URI}i386/${MY_PV}.1-static-qt.i386-${MY_EXT} ) )
+	x86? ( !static? ( ${MY_URI}i386/${MY_PV}.5-shared-qt.i386-${MY_EXT} ) )
+	amd64? ( static? ( ${MY_URI}i386/${MY_PV}.1-static-qt.i386-${MY_EXT} ) )
+	amd64? ( !static? ( ${MY_URI}i386/${MY_PV}.5-shared-qt.i386-${MY_EXT} ) )
+	sparc? ( ${MY_URI}sparc/${MY_PV}.1-static-qt.sparc-${MY_EXT} )
+	ppc? ( ${MY_URI}ppc/${MY_PV}.1-static-qt.ppc-${MY_EXT} )"
 
-#	sparc? ( !static? ( ${OPERA_URI}/sparc/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )
-#	ppc? ( !static? ( ${OPERA_URI}/ppc-linux/en/${PN}-${OPERAVER}.3-shared-qt.ppc-en.tar.bz2 ) )
+#	sparc? ( !static? ( ${MY_URI}/sparc/${MY_PV}.2-shared-qt.sparc-${MY_EXT} ) )
+#	ppc? ( !static? ( ${MY_URI}/ppc/en/${MY_PV}.3-shared-qt.ppc-${MY_EXT} ) )
+
+LICENSE="OPERA-8.50"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="static spell qt kde"
 
 # Dependencies may be augmented later (see below).
 DEPEND=">=sys-apps/sed-4
@@ -41,9 +43,7 @@
 	          x86? ( !static? ( =x11-libs/qt-3* ) )
 	          media-libs/jpeg )"
 
-SLOT="0"
-LICENSE="OPERA-8.50"
-KEYWORDS="amd64 ~ppc sparc x86"
+S=${WORKDIR}/${A/.tar.bz2/}
 
 src_unpack() {
 	unpack ${A}
@@ -102,9 +102,9 @@
 	# enable spellcheck
 	if use spell; then
 		if use static; then
-			DIR=$OPERAVER.1
+			DIR=$MY_PV.1
 		else
-			use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5
+			use sparc && DIR=$MY_PV.2 || DIR=$MY_PV.5
 		fi
 		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
 	fi