From: Ulrich Müller <ulm@gentoo.org>
Date: Sun, 22 May 2016 20:21:28 +0000 (+0200)
Subject: app-editors/joe: Fix LICENSE.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=14358e0ba9778feadb15ea103e5aba33ec2983be;p=gentoo.git

app-editors/joe: Fix LICENSE.

License is GPL version 1 or later.
CC-BY-3.0 is for the go.jsf syntax file.

Package-Manager: portage-2.3.0_rc1
---

diff --git a/app-editors/joe/joe-3.7-r2.ebuild b/app-editors/joe/joe-3.7-r2.ebuild
index aa73a7750f0c..3d76cdc4761e 100644
--- a/app-editors/joe/joe-3.7-r2.ebuild
+++ b/app-editors/joe/joe-3.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
 HOMEPAGE="http://sourceforge.net/projects/joe-editor/"
 SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
-LICENSE="GPL-1"
+LICENSE="GPL-1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
diff --git a/app-editors/joe/joe-4.1.ebuild b/app-editors/joe/joe-4.1.ebuild
index 8328d68f3309..1bfca36756eb 100644
--- a/app-editors/joe/joe-4.1.ebuild
+++ b/app-editors/joe/joe-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
 HOMEPAGE="http://sourceforge.net/projects/joe-editor/"
 SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
-LICENSE="GPL-1"
+LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
diff --git a/app-editors/joe/joe-4.2.ebuild b/app-editors/joe/joe-4.2.ebuild
index cc41552c9a42..3d4b8c12b678 100644
--- a/app-editors/joe/joe-4.2.ebuild
+++ b/app-editors/joe/joe-4.2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
 HOMEPAGE="http://sourceforge.net/projects/joe-editor/"
 SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
-LICENSE="GPL-1"
+LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"