summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2012-07-04 19:14:42 +0000
committerJory Pratt <anarchy@gentoo.org>2012-07-04 19:14:42 +0000
commiteb3266f012f06e18346956ad51cb49c5a5db1680 (patch)
treee575ea5d81db8b879eeb29d0e2379e4876dd2b48 /mail-client/thunderbird
parentversion bump (diff)
downloadgentoo-2-eb3266f012f06e18346956ad51cb49c5a5db1680.tar.gz
gentoo-2-eb3266f012f06e18346956ad51cb49c5a5db1680.tar.bz2
gentoo-2-eb3266f012f06e18346956ad51cb49c5a5db1680.zip
Fix licensing issues on >=thunderbird-10.0
(Portage version: 2.1.11.4/cvs/Linux x86_64)
Diffstat (limited to 'mail-client/thunderbird')
-rw-r--r--mail-client/thunderbird/ChangeLog6
-rw-r--r--mail-client/thunderbird/thunderbird-10.0.4.ebuild4
-rw-r--r--mail-client/thunderbird/thunderbird-10.0.5.ebuild4
-rw-r--r--mail-client/thunderbird/thunderbird-13.0.ebuild4
4 files changed, 11 insertions, 7 deletions
diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 9dc9e61c1eb5..fc15243b6f9c 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mail-client/thunderbird
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.154 2012/07/02 13:37:50 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.155 2012/07/04 19:14:42 anarchy Exp $
+
+ 04 Jul 2012; Jory A. Pratt <anarchy@gentoo.org> thunderbird-10.0.4.ebuild,
+ thunderbird-10.0.5.ebuild, thunderbird-13.0.ebuild:
+ Fix license on >=thunderbird-10.*
02 Jul 2012; Jory A. Pratt <anarchy@gentoo.org> thunderbird-13.0.ebuild:
Update license on thunderbird-13 to MPL-2.0
diff --git a/mail-client/thunderbird/thunderbird-10.0.4.ebuild b/mail-client/thunderbird/thunderbird-10.0.4.ebuild
index a9019d416c98..febb69a78b4d 100644
--- a/mail-client/thunderbird/thunderbird-10.0.4.ebuild
+++ b/mail-client/thunderbird/thunderbird-10.0.4.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/mail-client/thunderbird/thunderbird-10.0.4.ebuild,v 1.5 2012/05/24 22:06:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.4.ebuild,v 1.6 2012/07/04 19:14:42 anarchy Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -32,7 +32,7 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm"
PATCH="thunderbird-10.0-patches-0.1"
diff --git a/mail-client/thunderbird/thunderbird-10.0.5.ebuild b/mail-client/thunderbird/thunderbird-10.0.5.ebuild
index 3dfb069eea28..b545e7cdd35f 100644
--- a/mail-client/thunderbird/thunderbird-10.0.5.ebuild
+++ b/mail-client/thunderbird/thunderbird-10.0.5.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/mail-client/thunderbird/thunderbird-10.0.5.ebuild,v 1.4 2012/06/19 05:03:48 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-10.0.5.ebuild,v 1.5 2012/07/04 19:14:42 anarchy Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -32,7 +32,7 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm"
PATCH="thunderbird-10.0-patches-0.1"
diff --git a/mail-client/thunderbird/thunderbird-13.0.ebuild b/mail-client/thunderbird/thunderbird-13.0.ebuild
index 3351177053f3..ac7ae7b497d6 100644
--- a/mail-client/thunderbird/thunderbird-13.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-13.0.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/mail-client/thunderbird/thunderbird-13.0.ebuild,v 1.5 2012/07/02 13:37:50 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-13.0.ebuild,v 1.6 2012/07/04 19:14:42 anarchy Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -32,7 +32,7 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
SLOT="0"
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
IUSE="bindist gconf +crashreporter +crypt +ipc +jit +lightning +minimal mozdom +webm"
PATCH="thunderbird-13.0-patches-0.1"