summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-12-02 08:33:38 +0000
committerUlrich Müller <ulm@gentoo.org>2012-12-02 08:33:38 +0000
commitcc0b91b7d3ff79528e7fd38d3c25ab86c09abc8a (patch)
tree045e9f3725b59e2c2876bfde414adda31692b05d
parentUpdate LICENSE, this is identical with the Apache-1.1 license, bug 444848. (diff)
downloadgentoo-2-cc0b91b7d3ff79528e7fd38d3c25ab86c09abc8a.tar.gz
gentoo-2-cc0b91b7d3ff79528e7fd38d3c25ab86c09abc8a.tar.bz2
gentoo-2-cc0b91b7d3ff79528e7fd38d3c25ab86c09abc8a.zip
Update LICENSE, this is identical with the Apache-1.1 license, bug 444848.
(Portage version: 2.1.11.32/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)
-rw-r--r--dev-java/ognl/ChangeLog6
-rw-r--r--dev-java/ognl/ognl-2.6.9-r1.ebuild6
-rw-r--r--dev-java/ognl/ognl-2.6.9-r2.ebuild4
3 files changed, 10 insertions, 6 deletions
diff --git a/dev-java/ognl/ChangeLog b/dev-java/ognl/ChangeLog
index 89a368c08c30..a850514d31ab 100644
--- a/dev-java/ognl/ChangeLog
+++ b/dev-java/ognl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/ognl
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ChangeLog,v 1.9 2012/09/27 18:57:27 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ChangeLog,v 1.10 2012/12/02 08:33:38 ulm Exp $
+
+ 02 Dec 2012; Ulrich Müller <ulm@gentoo.org> ognl-2.6.9-r1.ebuild,
+ ognl-2.6.9-r2.ebuild:
+ Update LICENSE, this is identical with the Apache-1.1 license, bug 444848.
*ognl-2.6.9-r2 (27 Sep 2012)
diff --git a/dev-java/ognl/ognl-2.6.9-r1.ebuild b/dev-java/ognl/ognl-2.6.9-r1.ebuild
index 187d7c604a11..c7b20602079e 100644
--- a/dev-java/ognl/ognl-2.6.9-r1.ebuild
+++ b/dev-java/ognl/ognl-2.6.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ognl-2.6.9-r1.ebuild,v 1.1 2007/03/19 02:33:54 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ognl-2.6.9-r1.ebuild,v 1.2 2012/12/02 08:33:38 ulm Exp $
JAVA_PKG_IUSE="doc source"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.ognl.org/"
SRC_URI="http://www.ognl.org/${PV}/${P}-dist.zip
https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
-LICENSE="OpenSymphony-1.1"
+LICENSE="Apache-1.1"
SLOT="2.6"
KEYWORDS="~x86 ~amd64"
diff --git a/dev-java/ognl/ognl-2.6.9-r2.ebuild b/dev-java/ognl/ognl-2.6.9-r2.ebuild
index 92f9b422a3d9..27781743ae17 100644
--- a/dev-java/ognl/ognl-2.6.9-r2.ebuild
+++ b/dev-java/ognl/ognl-2.6.9-r2.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/dev-java/ognl/ognl-2.6.9-r2.ebuild,v 1.1 2012/09/27 18:57:27 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ognl-2.6.9-r2.ebuild,v 1.2 2012/12/02 08:33:38 ulm Exp $
EAPI="4"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.ognl.org/"
SRC_URI="http://www.ognl.org/${PV}/${P}-dist.zip
https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
-LICENSE="OpenSymphony-1.1"
+LICENSE="Apache-1.1"
SLOT="2.6"
KEYWORDS="~amd64 ~x86"
IUSE=""