Updated license to apache 2.0, closes #49889

4 files changed, 21 insertions, 17 deletions

diff --git a/dev-java/ant/ChangeLog b/dev-java/ant/ChangeLog
index e541cfa06252..89a6e4605ac4 100644
--- a/dev-java/ant/ChangeLog
+++ b/dev-java/ant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.61 2004/05/09 22:12:27 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ChangeLog,v 1.62 2004/05/16 18:49:02 zx Exp $
+
+  16 May 2004; Chris Aniszczyk <zx@gentoo.org> ant-1.6.1-r1.ebuild,
+  ant-1.6.1.ebuild:
+  Updated license to Apache 2.0
 
   09 May 2004; Jason Wever <weeve@gentoo.org> ant-1.6.1-r1.ebuild:
   Added ~sparc keyword, helps resolve bug #50407.
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index c9e9249df8ea..144d626a1599 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,10 +1,10 @@
-MD5 6420d5779f11784593cfa16e9accaf22 ChangeLog 10611
-MD5 46066831d2b15aafda5823bf4d3cf6ea ant-1.5.3-r5.ebuild 2951
-MD5 ade7fc67ddc73e6f2fa30a40f26593a1 ant-1.5.4-r1.ebuild 3019
-MD5 28a3ced06105438991775cd1ff70c334 ant-1.6.0-r2.ebuild 1614
-MD5 164302f627c933c0280b7b467cd7e6eb ant-1.6.0-r3.ebuild 1601
-MD5 cdbb552805dec0906019a5ade09cde3f ant-1.6.1-r1.ebuild 2157
-MD5 6dc1aaa118d8134e9cfbb485732df4b5 ant-1.6.1.ebuild 2145
+MD5 8ae9c234a0a532bfe9e855b004aa3d1c ChangeLog 10728
+MD5 826342baf52e84c57e06c4fa24699192 ant-1.5.3-r5.ebuild 2950
+MD5 94160347fa3414efc22df58c67f79481 ant-1.5.4-r1.ebuild 3018
+MD5 8e5703520a3de58309193da8a2e94cc4 ant-1.6.0-r2.ebuild 1613
+MD5 88e96ef421df31f6e7b82a453b18e869 ant-1.6.0-r3.ebuild 1600
+MD5 06844024eabadd2814228c18f6a214ad ant-1.6.1-r1.ebuild 2153
+MD5 b7af60f61a6b61b9e6c7a8971c46f4e7 ant-1.6.1.ebuild 2142
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 9796e31a633d28a00242c76325bb85b4 files/20ant 26
 MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
@@ -16,8 +16,8 @@ MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1 74
 MD5 742e94a3c64e9b5cddc7ce7863d1afac files/digest-ant-1.6.1-r1 74
 MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
 MD5 9cb067e9b0997856af50e7e117263596 files/1.5.3/1_6_backport-jdk142.patch.gz 916
-MD5 4233391fc580c36c78c9f2bc2057327f files/1.5.3/ant 2208
-MD5 e285a4a8da9b4f50a458433377f9b130 files/1.5.4/ant 2272
-MD5 5841a69d6263fda47a60334730e1e0c0 files/1.6.0-r2/ant 2441
-MD5 e0201a69f756a0c3c1f982ff9e29eaa4 files/1.6.0-r3/ant 2441
-MD5 f23c30dd83f31a015c2bdff2c2438bce files/1.6.1/ant 2489
+MD5 c2ce37282a033b7a00993e622c685a9e files/1.5.3/ant 2207
+MD5 64e1d4bf5327dd353f61bc8b53c8ff5e files/1.5.4/ant 2271
+MD5 d3c75fa274bd1f48314029ca53b2c01e files/1.6.0-r2/ant 2440
+MD5 de2a686ad048c6b78da419b0aa7aa857 files/1.6.0-r3/ant 2440
+MD5 13961f80056a915d1ea994e8e11abe75 files/1.6.1/ant 2488
diff --git a/dev-java/ant/ant-1.6.1-r1.ebuild b/dev-java/ant/ant-1.6.1-r1.ebuild
index 795d13a0a9d9..84abcbb74fce 100644
--- a/dev-java/ant/ant-1.6.1-r1.ebuild
+++ b/dev-java/ant/ant-1.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.1-r1.ebuild,v 1.7 2004/05/09 22:12:27 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.1-r1.ebuild,v 1.8 2004/05/16 18:49:02 zx Exp $
 
 inherit java-pkg eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration
 HOMEPAGE="http://ant.apache.org/"
 SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-src.tar.bz2"
 
-LICENSE="Apache-1.1"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~sparc"
 IUSE="doc"
diff --git a/dev-java/ant/ant-1.6.1.ebuild b/dev-java/ant/ant-1.6.1.ebuild
index 4c80f8700b7a..f1bfadfcb13d 100644
--- a/dev-java/ant/ant-1.6.1.ebuild
+++ b/dev-java/ant/ant-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.1.ebuild,v 1.7 2004/05/04 21:07:00 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.6.1.ebuild,v 1.8 2004/05/16 18:49:02 zx Exp $
 
 inherit java-pkg eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration
 HOMEPAGE="http://ant.apache.org/"
 SRC_URI="mirror://apache/ant/source/apache-${PN}-${PV}-src.tar.bz2"
 
-LICENSE="Apache-1.1"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE="doc"