Add RESTRICT="fetch bindist" on Solaris, since it is no longer open source.

Update message in pkg_nofetch().

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 38 insertions, 33 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index b3d9d1ca5e3e..7c7fb02593de 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.264 2012/01/06 00:04:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.265 2012/01/15 22:10:58 ulm Exp $
+
+  15 Jan 2012; Ulrich Müller <ulm@gentoo.org> openmotif-2.3.2-r2.ebuild,
+  openmotif-2.3.3.ebuild, openmotif-2.3.3-r1.ebuild:
+  Add RESTRICT="fetch bindist" on Solaris, since it is no longer open source.
+  Update message in pkg_nofetch().
 
 *openmotif-2.3.3-r1 (06 Jan 2012)
 
diff --git a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
index 2ac52e09f8d8..1b14a7dbe5c5 100644
--- a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.20 2011/12/19 08:43:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.21 2012/01/15 22:10:58 ulm Exp $
 
 EAPI=3
 
@@ -18,9 +18,8 @@ IUSE="doc examples jpeg png static-libs unicode xft"
 RESTRICT="!kernel_linux? (
 	!kernel_FreeBSD? (
 	!kernel_Darwin? (
-	!kernel_SunOS? (
 		fetch bindist
-	) ) ) )"
+	) ) )"
 
 RDEPEND="x11-libs/libXmu
 	x11-libs/libXp
@@ -37,13 +36,14 @@ RDEPEND="${RDEPEND}
 pkg_nofetch() {
 	local line
 	while read line; do einfo "${line}"; done <<-EOF
-	From the Open Motif license: "This software is subject to an open
-	license. It may only be used on, with or for operating systems which
-	are themselves open source systems. You must contact The Open Group
-	for a license allowing distribution and sublicensing of this software
-	on, with, or for operating systems which are not open source programs."
-
-	If you have got such a license, you may download the file:
+	From the Open Motif license: "The rights granted under this license are
+	limited solely to distribution and sublicensing of the contribution(s)
+	on, with, or for operating systems which are themselves open source
+	programs. Contact The Open Group for a license allowing distribution and
+	sublicensing of the original program on, with, or for operating systems
+	which are not open source programs."
+
+	If above conditions are fulfilled, you may download the file:
 	${SRC_URI}
 	and place it in ${DISTDIR}.
 	EOF
diff --git a/x11-libs/openmotif/openmotif-2.3.3-r1.ebuild b/x11-libs/openmotif/openmotif-2.3.3-r1.ebuild
index 163bf2f13c3a..724efc9fa82b 100644
--- a/x11-libs/openmotif/openmotif-2.3.3-r1.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.3-r1.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/x11-libs/openmotif/openmotif-2.3.3-r1.ebuild,v 1.3 2012/01/06 00:04:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3-r1.ebuild,v 1.4 2012/01/15 22:10:58 ulm Exp $
 
 EAPI=4
 
@@ -18,9 +18,8 @@ IUSE="doc examples jpeg png static-libs unicode xft"
 RESTRICT="!kernel_linux? (
 	!kernel_FreeBSD? (
 	!kernel_Darwin? (
-	!kernel_SunOS? (
 		fetch bindist
-	) ) ) )"
+	) ) )"
 
 RDEPEND="x11-libs/libXmu
 	x11-libs/libXp
@@ -38,13 +37,14 @@ RDEPEND="${RDEPEND}
 pkg_nofetch() {
 	local line
 	while read line; do einfo "${line}"; done <<-EOF
-	From the Open Motif license: "This software is subject to an open
-	license. It may only be used on, with or for operating systems which
-	are themselves open source systems. You must contact The Open Group
-	for a license allowing distribution and sublicensing of this software
-	on, with, or for operating systems which are not open source programs."
-
-	If you have got such a license, you may download the file:
+	From the Open Motif license: "The rights granted under this license are
+	limited solely to distribution and sublicensing of the contribution(s)
+	on, with, or for operating systems which are themselves open source
+	programs. Contact The Open Group for a license allowing distribution and
+	sublicensing of the original program on, with, or for operating systems
+	which are not open source programs."
+
+	If above conditions are fulfilled, you may download the file:
 	${SRC_URI}
 	and place it in ${DISTDIR}.
 	EOF
diff --git a/x11-libs/openmotif/openmotif-2.3.3.ebuild b/x11-libs/openmotif/openmotif-2.3.3.ebuild
index bbaaed5338d5..e9e0ed83a96b 100644
--- a/x11-libs/openmotif/openmotif-2.3.3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3.ebuild,v 1.18 2011/12/19 08:43:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3.ebuild,v 1.19 2012/01/15 22:10:58 ulm Exp $
 
 EAPI=3
 
@@ -18,9 +18,8 @@ IUSE="doc examples jpeg png static-libs unicode xft"
 RESTRICT="!kernel_linux? (
 	!kernel_FreeBSD? (
 	!kernel_Darwin? (
-	!kernel_SunOS? (
 		fetch bindist
-	) ) ) )"
+	) ) )"
 
 RDEPEND="x11-libs/libXmu
 	x11-libs/libXp
@@ -37,13 +36,14 @@ RDEPEND="${RDEPEND}
 pkg_nofetch() {
 	local line
 	while read line; do einfo "${line}"; done <<-EOF
-	From the Open Motif license: "This software is subject to an open
-	license. It may only be used on, with or for operating systems which
-	are themselves open source systems. You must contact The Open Group
-	for a license allowing distribution and sublicensing of this software
-	on, with, or for operating systems which are not open source programs."
-
-	If you have got such a license, you may download the file:
+	From the Open Motif license: "The rights granted under this license are
+	limited solely to distribution and sublicensing of the contribution(s)
+	on, with, or for operating systems which are themselves open source
+	programs. Contact The Open Group for a license allowing distribution and
+	sublicensing of the original program on, with, or for operating systems
+	which are not open source programs."
+
+	If above conditions are fulfilled, you may download the file:
 	${SRC_URI}
 	and place it in ${DISTDIR}.
 	EOF