Replace license X11 by MIT, bug 298556.

Package-Manager: portage-2.2_rc62/cvs/Linux i686

5 files changed, 29 insertions, 15 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index d4f1c8909824..645f605323cd 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/curl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.151 2009/11/05 04:39:55 dragonheart Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.152 2010/02/11 17:08:45 ulm Exp $
+
+  11 Feb 2010; Ulrich Mueller <ulm@gentoo.org> curl-7.19.4.ebuild,
+  curl-7.19.6.ebuild, curl-7.19.7.ebuild:
+  Replace license X11 by MIT, bug 298556.
 
 *curl-7.19.7 (05 Nov 2009)
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 18b90d9c63b2..1d22a80bf2bd 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX curl-7.17.0-strip-ldflags.patch 796 RMD160 1bcb5af41c63b0afb7758e3c4c8f9bea5e52c29c SHA1 c63330a3505adb684dd2f1cfa89eae5159cb9cc6 SHA256 f3892c3d2a16f96319fd11cb516f66b5df0ece18ca8271cf3b9c1f286e9b5d73
 AUX curl-7.19.7-test241.patch 483 RMD160 3b9262cbde57b12ca89dcc358fa1be2a1cc6c477 SHA1 63739ae2625d1d858676fc7638322d3c677be2b8 SHA256 e06c33750b5337b2700445a073b96d0ab817584fffbf24ac386668cd5e98d450
 DIST curl-7.19.4.tar.bz2 2296879 RMD160 91f46c421e0f23f268640d39f45a74621e951245 SHA1 6b8cb206990cd68d8653cea16a47bd0febd5c50d SHA256 fb3436280dedbc8f8141d3841a5964c4491dd6457bc5b7123854aed0b794be86
 DIST curl-7.19.6.tar.bz2 2347791 RMD160 7627d78ec681a513972be0cb5473b26805f44d83 SHA1 b7cb98c7a6577de7073d0b0c23eecdb8ed993e8e SHA256 ea88f48c8415f7d3af482e4d241277b2bdbfaffaf285e8001c88c1376cbc1021
 DIST curl-7.19.7.tar.bz2 2355121 RMD160 b170b24af3a6d3fc3357e90fc7ae5ef34d722fb4 SHA1 c306ebf0f65fb90df3c9c9a12fb04fb77cc29e2c SHA256 1a15f94ae3401e3bd6208ce64155c2577815019824bceae7fd3221a12bc54a70
-EBUILD curl-7.19.4.ebuild 3315 RMD160 f2753cdecfc1494ec2c83a994921b32cfdf90538 SHA1 b5920f7e09a7b797ce6fdaac17063aec6a9aad78 SHA256 24fcbde1edacb233bff9b3feabef780b91109a963df35f3cdb0d53fc8e7e82ec
-EBUILD curl-7.19.6.ebuild 3311 RMD160 3296abb65dfb432cf83cab0e05ba3a9de53770fc SHA1 e3df88a4254d6ae53d6df6eaf60a9e86dac2566b SHA256 f0dbb7f9c3113b5108713bef6365e8094471242f1a5cd37fd7da5679a0bfe586
-EBUILD curl-7.19.7.ebuild 3007 RMD160 5b9f314068a0846e203aafcd9a45cc04963e17b8 SHA1 246aaaedb5a49362b1a21ab28693faf220c3fd41 SHA256 8e9d224cc0f13f5061fb92e6f0aec4863b25aae37954178238266940cf6c12c3
-MISC ChangeLog 25785 RMD160 5ba25e56e44e864747b3824dac3799561c3fb8ca SHA1 d380ae520b9ef8afc1c15ed1b331597a2cbe9482 SHA256 79c4d3ee32c78ef12f156ebc3d637b6760a37f67b0237b2d00d0b2a1f7738da2
+EBUILD curl-7.19.4.ebuild 3304 RMD160 b8ba30525eb2dcd73f6bb657f6137c2d9731f94f SHA1 30802e046bc76314cf8a9deb7d7c9d19366f0a74 SHA256 461f60d7d663ddd0e4220d800b8d79266921d9ed6a9627f3842ed321beaa7863
+EBUILD curl-7.19.6.ebuild 3304 RMD160 2c14d844edb46fa3cb60de2b393bd87b8c48f0b5 SHA1 f4e7af1c290b8cd1be78ceed33853e69fe5149b0 SHA256 40f6347005f10691b1bb091d7e6f0062620c46921832b5329a613216b602ad46
+EBUILD curl-7.19.7.ebuild 2995 RMD160 474a66a21278b34e13d4bce9cc7ce85f1d8f7cb8 SHA1 dcc2a70aa356104e4ca99973a9fa786bf18295b6 SHA256 cb76ac97a2aeffb505fe7620dbdee05fd5a582c7c1a520e373c6069cfb97c77d
+MISC ChangeLog 25929 RMD160 c65d82f92cdac1bb5ec2ceb81f95eebe92f0cdda SHA1 b98e4511eeb4c1325862559810f885f960d8fdb2 SHA256 83e0d850828ee31ad5a023bbb6c085a8b88b0ae2f8775894100e736004b258ba
 MISC metadata.xml 564 RMD160 fbc71d245e583491775c6c934312e428539a5596 SHA1 b752c747556474e320c0361136580f3975924326 SHA256 66e6a91e67ff9bc0669b755e0a5d1256e69a4389eef6593b9cdd9aa3a406e3f4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt0ObsACgkQOeoy/oIi7uwkQACdGv4sR+2VI8Dl6fJMD4tV58CF
+ta0AoLdPOiztOCPPUspxSDAbaasnfgfn
+=RtUK
+-----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.19.4.ebuild b/net-misc/curl/curl-7.19.4.ebuild
index 3292dbe327bc..df8c5ec32913 100644
--- a/net-misc/curl/curl-7.19.4.ebuild
+++ b/net-misc/curl/curl-7.19.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.19.4.ebuild,v 1.5 2009/03/04 20:00:22 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.19.4.ebuild,v 1.6 2010/02/11 17:08:45 ulm Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com"
 #SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"
 SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 
-LICENSE="MIT X11"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 #IUSE="ssl ipv6 ldap ares gnutls nss idn kerberos test"
diff --git a/net-misc/curl/curl-7.19.6.ebuild b/net-misc/curl/curl-7.19.6.ebuild
index 4134674c9491..aa4aab12954d 100644
--- a/net-misc/curl/curl-7.19.6.ebuild
+++ b/net-misc/curl/curl-7.19.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.19.6.ebuild,v 1.8 2009/09/13 12:36:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.19.6.ebuild,v 1.9 2010/02/11 17:08:45 ulm Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com"
 #SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"
 SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 
-LICENSE="MIT X11"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 #IUSE="ssl ipv6 ldap ares gnutls nss idn kerberos test"
diff --git a/net-misc/curl/curl-7.19.7.ebuild b/net-misc/curl/curl-7.19.7.ebuild
index dc5976635be9..0b1c2ec53622 100644
--- a/net-misc/curl/curl-7.19.7.ebuild
+++ b/net-misc/curl/curl-7.19.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.19.7.ebuild,v 1.1 2009/11/05 04:39:55 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.19.7.ebuild,v 1.2 2010/02/11 17:08:45 ulm Exp $
 
 # NOTE: If you bump this ebuild, make sure you bump dev-python/pycurl!
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://curl.haxx.se/ http://curl.planetmirror.com"
 #SRC_URI="http://curl.planetmirror.com/download/${P}.tar.bz2"
 SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
 
-LICENSE="MIT X11"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="openssl ipv6 ldap ares gnutls libssh2 nss idn kerberos test"