In the latest license, distribution is specifically allowed, so remove RESTRICT=mirror. Also, use share/opera/defaults/license.txt for symlinks from the locale directories instead of using usr/share/doc/opera (bug #315473).

(Portage version: 2.1.9.22/cvs/Linux i686)

6 files changed, 27 insertions, 13 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 857e3b90983b..040455422d0e 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.558 2010/10/21 15:54:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.559 2010/10/27 04:52:50 jer Exp $
+
+  27 Oct 2010; Jeroen Roovers <jer@gentoo.org> opera-10.63.ebuild,
+  opera-10.70_pre9053.ebuild, opera-10.70_pre9067.ebuild,
+  opera-10.70_pre9071.ebuild, opera-11.00_pre1029.ebuild:
+  In the latest license, distribution is specifically allowed, so remove
+  RESTRICT=mirror. Also, use share/opera/defaults/license.txt for symlinks
+  from the locale directories instead of using usr/share/doc/opera (bug
+  #315473).
 
 *opera-11.00_pre1029 (21 Oct 2010)
 
diff --git a/www-client/opera/opera-10.63.ebuild b/www-client/opera/opera-10.63.ebuild
index 16977b3dae2b..c9e9204d40ed 100644
--- a/www-client/opera/opera-10.63.ebuild
+++ b/www-client/opera/opera-10.63.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.63.ebuild,v 1.4 2010/10/15 02:03:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.63.ebuild,v 1.5 2010/10/27 04:52:50 jer Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE="elibc_FreeBSD gtk kde +gstreamer"
 
-RESTRICT="mirror test"
+RESTRICT="test"
 
 O_V="${PV}-6450"
 O_P="${PN}-${O_V}"
diff --git a/www-client/opera/opera-10.70_pre9053.ebuild b/www-client/opera/opera-10.70_pre9053.ebuild
index 7e339f3a6e84..f5c2fd1326d3 100644
--- a/www-client/opera/opera-10.70_pre9053.ebuild
+++ b/www-client/opera/opera-10.70_pre9053.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.70_pre9053.ebuild,v 1.1 2010/09/27 16:33:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.70_pre9053.ebuild,v 1.2 2010/10/27 04:52:50 jer Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="elibc_FreeBSD gtk kde +gstreamer"
 
-RESTRICT="mirror test"
+RESTRICT="test"
 
 O_PWD="bird"
 O_V="${PV/_pre/-}"
diff --git a/www-client/opera/opera-10.70_pre9067.ebuild b/www-client/opera/opera-10.70_pre9067.ebuild
index 0f784a055f43..554a226e1c85 100644
--- a/www-client/opera/opera-10.70_pre9067.ebuild
+++ b/www-client/opera/opera-10.70_pre9067.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.70_pre9067.ebuild,v 1.1 2010/10/11 10:37:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.70_pre9067.ebuild,v 1.2 2010/10/27 04:52:50 jer Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="elibc_FreeBSD gtk kde +gstreamer"
 
-RESTRICT="mirror test"
+RESTRICT="test"
 
 O_PWD="zen"
 O_V="${PV/_pre/-}"
diff --git a/www-client/opera/opera-10.70_pre9071.ebuild b/www-client/opera/opera-10.70_pre9071.ebuild
index 7dcb2b604cb2..1e0319e21cf6 100644
--- a/www-client/opera/opera-10.70_pre9071.ebuild
+++ b/www-client/opera/opera-10.70_pre9071.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.70_pre9071.ebuild,v 1.1 2010/10/15 15:15:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.70_pre9071.ebuild,v 1.2 2010/10/27 04:52:50 jer Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="elibc_FreeBSD gtk kde +gstreamer"
 
-RESTRICT="mirror test"
+RESTRICT="test"
 
 O_PWD="This-Is-Not-Yet-11.00-So-No-Extentions-Yet"
 O_V="${PV/_pre/-}"
diff --git a/www-client/opera/opera-11.00_pre1029.ebuild b/www-client/opera/opera-11.00_pre1029.ebuild
index f3559bb31702..e711bc3c51e1 100644
--- a/www-client/opera/opera-11.00_pre1029.ebuild
+++ b/www-client/opera/opera-11.00_pre1029.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.00_pre1029.ebuild,v 1.1 2010/10/21 15:54:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.00_pre1029.ebuild,v 1.2 2010/10/27 04:52:50 jer Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="elibc_FreeBSD gtk kde +gstreamer"
 
-RESTRICT="mirror test"
+RESTRICT="test"
 
 O_PWD="alpha1-with-extensions"
 O_V="${PV/_pre/-}"
@@ -103,8 +103,14 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Remove "license directory" (bug #315473)
-	rm -rf share/doc/opera
+	# Remove doc directory but keep the LICENSE under another name (bug #315473)
+	mv share/doc/opera/LICENSE share/opera/defaults/license.txt
+	rm -rf share/doc
+	for license in share/opera/locale/*/license.txt; do
+		rm -v "${license}"
+		ln -svn /usr/share/opera/defaults/license.txt "${license}" \
+			|| die "mv license"
+	done
 
 	# Remove package directory
 	rm -rf share/opera/package