diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2015-08-03 20:18:38 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2015-08-03 20:18:38 +0000 |
| commit | 559260b4fbf9585eb4b1330611c040b990079e4b (patch) | |
| tree | f203091d97eec820dcb2308798455a0003d9fa50 /x11-misc | |
| parent | Version bump. Remove old. (diff) | |
| download | gentoo-2-559260b4fbf9585eb4b1330611c040b990079e4b.tar.gz gentoo-2-559260b4fbf9585eb4b1330611c040b990079e4b.tar.bz2 gentoo-2-559260b4fbf9585eb4b1330611c040b990079e4b.zip | |
x11-misc/zim: Fix license (bug #556334)
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/zim/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/zim/zim-0.61.ebuild | 4 | ||||
| -rw-r--r-- | x11-misc/zim/zim-0.62.ebuild | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/x11-misc/zim/ChangeLog b/x11-misc/zim/ChangeLog index bfbb71e54454..b618e23fa1fa 100644 --- a/x11-misc/zim/ChangeLog +++ b/x11-misc/zim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/zim # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.26 2015/04/08 17:27:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.27 2015/08/03 20:18:38 sping Exp $ + + 03 Aug 2015; Sebastian Pipping <sping@gentoo.org> zim-0.61.ebuild, + zim-0.62.ebuild: + Fix license according to README.txt (bug #556334) 08 Apr 2015; Michał Górny <mgorny@gentoo.org> zim-0.61.ebuild: Drop old Python implementations diff --git a/x11-misc/zim/zim-0.61.ebuild b/x11-misc/zim/zim-0.61.ebuild index 8e94960d16c3..85383235aa1d 100644 --- a/x11-misc/zim/zim-0.61.ebuild +++ b/x11-misc/zim/zim-0.61.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.61.ebuild,v 1.2 2015/04/08 17:27:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.61.ebuild,v 1.3 2015/08/03 20:18:38 sping Exp $ EAPI=5 @@ -14,7 +14,7 @@ DESCRIPTION="A desktop wiki" HOMEPAGE="http://zim-wiki.org/" SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="BSD GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" diff --git a/x11-misc/zim/zim-0.62.ebuild b/x11-misc/zim/zim-0.62.ebuild index 7ace0df20df1..56e2a996d7d9 100644 --- a/x11-misc/zim/zim-0.62.ebuild +++ b/x11-misc/zim/zim-0.62.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.62.ebuild,v 1.1 2014/10/04 08:35:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.62.ebuild,v 1.2 2015/08/03 20:18:38 sping Exp $ EAPI=5 @@ -14,7 +14,7 @@ DESCRIPTION="A desktop wiki" HOMEPAGE="http://zim-wiki.org/" SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="BSD GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" |