http://my.opera.com/desktopteam/blog/2012/06/08/12-release-candidate-euro-2012-edition

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 27 insertions, 8 deletions

diff --git a/www-client/opera-next/ChangeLog b/www-client/opera-next/ChangeLog
index b4134de766d5..2ed2107a626b 100644
--- a/www-client/opera-next/ChangeLog
+++ b/www-client/opera-next/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/opera-next
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.96 2012/06/08 03:53:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/ChangeLog,v 1.97 2012/06/08 12:20:47 jer Exp $
+
+*opera-next-12.00.1450 (08 Jun 2012)
+
+  08 Jun 2012; Jeroen Roovers <jer@gentoo.org> -opera-next-12.00.1438.ebuild,
+  -opera-next-12.00.1439.ebuild, +opera-next-12.00.1450.ebuild:
+  http://my.opera.com/desktopteam/blog/2012/06/08/12-release-candidate-euro-201
+  2-edition
 
 *opera-next-12.00.1448 (08 Jun 2012)
 
diff --git a/www-client/opera-next/opera-next-12.00.1438.ebuild b/www-client/opera-next/opera-next-12.00.1450.ebuild
index ee589be346bd..dcd4e53a9217 100644
--- a/www-client/opera-next/opera-next-12.00.1438.ebuild
+++ b/www-client/opera-next/opera-next-12.00.1450.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1438.ebuild,v 1.1 2012/05/30 14:39:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1450.ebuild,v 1.1 2012/06/08 12:20:47 jer Exp $
 
 EAPI="4"
 
@@ -12,12 +12,12 @@ HOMEPAGE="http://www.opera.com/"
 SLOT="0"
 LICENSE="OPERA-11 LGPL-2 LGPL-3"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
+IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer multilib"
 
 O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
 O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
 
-O_D="4958_${O_V}-${O_B}"
+O_D="next_${O_V}-${O_B}"
 O_P="${PN}-${O_V}-${O_B}"
 O_U="http://snapshot.opera.com/unix/"
 
@@ -136,6 +136,9 @@ src_prepare() {
 	if ! use gstreamer; then
 		rm -r lib/${PN}/gstreamer || die
 	fi
+	if use amd64 && ! use multilib; then
+		rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
+	fi
 
 	# Unzip the man pages before sedding
 	gunzip share/man/man1/* || die
diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 6cc67e601df4..07526d7ffb8e 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.712 2012/06/08 03:48:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.713 2012/06/08 12:15:58 jer Exp $
+
+*opera-12.00.1450 (08 Jun 2012)
+
+  08 Jun 2012; Jeroen Roovers <jer@gentoo.org> +opera-12.00.1450.ebuild:
+  http://my.opera.com/desktopteam/blog/2012/06/08/12-release-candidate-euro-201
+  2-edition
 
 *opera-12.00.1448 (08 Jun 2012)
 
diff --git a/www-client/opera-next/opera-next-12.00.1439.ebuild b/www-client/opera/opera-12.00.1450.ebuild
index 720472da47f4..bb7218225059 100644
--- a/www-client/opera-next/opera-next-12.00.1439.ebuild
+++ b/www-client/opera/opera-12.00.1450.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.00.1439.ebuild,v 1.1 2012/05/31 14:41:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.00.1450.ebuild,v 1.1 2012/06/08 12:15:58 jer Exp $
 
 EAPI="4"
 
@@ -12,12 +12,12 @@ HOMEPAGE="http://www.opera.com/"
 SLOT="0"
 LICENSE="OPERA-11 LGPL-2 LGPL-3"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
+IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer multilib"
 
 O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
 O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
 
-O_D="6024_${O_V}-${O_B}"
+O_D="rc2_${O_V}-${O_B}"
 O_P="${PN}-${O_V}-${O_B}"
 O_U="http://snapshot.opera.com/unix/"
 
@@ -136,6 +136,9 @@ src_prepare() {
 	if ! use gstreamer; then
 		rm -r lib/${PN}/gstreamer || die
 	fi
+	if use amd64 && ! use multilib; then
+		rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
+	fi
 
 	# Unzip the man pages before sedding
 	gunzip share/man/man1/* || die