Fix LICENSE, see COPYING, bug 446300.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

4 files changed, 28 insertions, 14 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index ff1a7de0dd21..4da071f1350e 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/oftpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.37 2012/07/29 17:53:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.38 2012/12/19 07:26:21 ulm Exp $
+
+  19 Dec 2012; Ulrich Müller <ulm@gentoo.org> oftpd-0.3.7-r3.ebuild,
+  oftpd-0.3.7-r7.ebuild:
+  Fix LICENSE, see COPYING, bug 446300.
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> oftpd-0.3.7-r7.ebuild:
   sh/sparc stable wrt #420965
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index 58ee8b24bba1..483fe9aabc7a 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX conf.d.oftpd 469 SHA256 d1bab71ab0942df8dcb2f88bb50a3c318fe97676d278ccf26d540fdc9c4e69ba SHA512 875b5dce34e79681aa2c697c051b0d1e1ec60853e1aabaf6b2b3854c8a5088947c0d30b7cf0b3ca4f045fe6b9b4832d57294fc92b97be52f1dd58435fe8cea39 WHIRLPOOL bd3af4587b7f39169627587be9c4bbdffe59525cbbc5f4dd75980dade6aa00adaa7b5e0d68da091d4c70d85b32820066e61fd62e379ee1029f2e8df3623f690e
 AUX conf.d.oftpd-r7 678 SHA256 0446272c764feb3055a1faee84a0690e172a38c7c0406ca7d23bfdee98e7f3e0 SHA512 36efb9e6fb4fb64dc0a55cb8db7d8b83fe40b6d98bf5c7c963587890548afec3eb63d1491c1d362855339c35333d92899450438bf71e5a1975c942270c9a24e3 WHIRLPOOL 4dbadf3b5299099f334c276e5367fc1134e7d706039f1d5fd56bd572290887dbfefcaa56d85cf4dd5ffaedcd21713e99da0a6b69bc2b2bee8feff50565656543
@@ -10,14 +10,24 @@ AUX oftpd-0.3.7-family.patch 550 SHA256 f97f380705c42a215b2f4f094cce9b9ea6d5778a
 AUX oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch 14107 SHA256 83101b57c00cebe9ed456d79697520f582fc427d18ecf84137c502709fef6bf3 SHA512 c752bdeb0227c036268e3840c3aac9a19e875b9fa37e4f6440211aed312c42836982ff7e8a8e97a1f12f172552f96b290fb17bb139ded5d75999d49270facfc8 WHIRLPOOL 5adb70106584df7b7930439fc41591cfbbd0fb82d02f73bc64416acf7a19db6000c127ef7d088b0f1668faa6490d83be4dfd0ca012bc789a5a7e4e573420d0eb
 DIST oftpd-0.3.6-ipv6rel2.patch.gz 12478 SHA256 b1165052e0169e1495b5009111f07ba56cb81ce34234b9578a9eb2862e76ac3d
 DIST oftpd-0.3.7.tar.gz 97364 SHA256 b135cd2bc6c54e03e5374845964eab73d5e567160c15bb4226c1c922b1e6d64e
-EBUILD oftpd-0.3.7-r3.ebuild 1042 SHA256 33677fd0c45af6bdf47cf873211a260483afa236432efe5c4f7fc717e89e9323 SHA512 36049abac6ffd8e2a3c1d02db34081847b3ae1657f55ba348913d8265a7c8df581019a2a73c3db7e2e900ab993aa5ac80322b87e238a01493af8b591718260d6 WHIRLPOOL 9beb672c33c18750bfa3a7aa52ec574da389ac2ce699a3033f07296553ae60841be4106882aed0debe8ff2cb9a4613bcc167114efa76a0d5cc18954398621b87
-EBUILD oftpd-0.3.7-r7.ebuild 1233 SHA256 d8032ec8c8b25bde6f89153d0a23fe5204001708fec630d9e04e92bb5537ea9d SHA512 da88b3d343a4596ee45bf717b16aab0cdf1c8495359bcb1c92b865299f0f1cc5eba07730e9e9e4c4525de469deb0d1b2043100bce8ad8a90516f4b3daedc629d WHIRLPOOL 9015b6e355194f28f44268efbe875000ec94165fdaf8310d51519c6ef8fc66f124876d55daef73b56f01a0bb9c510c728417bbf000abd0de5bcba10ab0d15097
-MISC ChangeLog 5833 SHA256 120332d0e69b072d6e2f2685127bd2e397950c63973cceaabbc8e7b39a699c3b SHA512 9f2a1bef82fea5b50c470e2f927ecd803464794dc4c6d8d8a2f58ae014a5b64fa6ae02e361103e6aa5cd790c84b38a7f9cdf89ba7021459614ecfd6d852e2ea3 WHIRLPOOL e2803b708a593e9dc8d790467f8fcaa4527e6c9d90af07f8a54fa557cde40c05930b5fe345944727dfe45199fc36c761887190860978d08ee98380d66d7990ba
+EBUILD oftpd-0.3.7-r3.ebuild 1042 SHA256 cac911605c2dc67b4b83a19f9d2c2120523a4a97ba920aa65131679668e9c607 SHA512 3cf8a19061231e339d5f9084e5a228b1fe4dff720b2c7ddb3a52d3620336b6bfb9485c43af61354b48e55f154a6ab7b3ccf014e9ab630af33406fa22a5ee1eeb WHIRLPOOL f2e8c8393ef08f0136a6a3b15ad97ba9d0f6d16411bdaf96df91004dd871351abc77e02d865c83a8f9f2ac0e345016543bec58cb22baf665789ec4249ad802b3
+EBUILD oftpd-0.3.7-r7.ebuild 1229 SHA256 bb94e7ceaf512a0ee72315e276bb3548e2b22ef36500cd924011b1653e872b77 SHA512 3e0a74358bb5af4ba7407dfe8f7f8044b39d1a0927d66af324b4335393a09b89ac27d4369cc900a64c2e67a7968af465e55ee3f6087a13a8841e46cfaa097a42 WHIRLPOOL 8338c6f36b7afa4e882f1d0fc465d87f10dcc0e2cddbc717225c6c2625257f8ef8d207dffb2c8dacec520a5defcbb1d69a98a966b867c2acee5d536225092694
+MISC ChangeLog 5965 SHA256 d836dfd2e93bfe011efd093975d71464327960481bb73ebfa5ba7222da7eb2b5 SHA512 9f96455f2901d3c6353eb93a813734a670dfc7f0185a54a6787be6e72378523b60c0580f4ac2de9a4de250ab2b5cb50cb0851ab37fa20df80b1fba36c1153473 WHIRLPOOL e85412d515df868cc9bdaa4b92113b0a32dc082a779ba709490e529957699f1630ccfe3b2f6d40f605f6b1f3d23634459a90f23c492b1ce439de8dba393544d9
 MISC metadata.xml 232 SHA256 540addc97838c8689eba36c8085ed5fcc19ff05a3ae749c62126f5e0ae91c7fe SHA512 0e28d468a4e1c247e3bf623868e12f915e18d36e119cbc67f9d784533b9fd1e0e919ecf944180d6e45f317c06f192c8f58da18bf3d83868dc2393b5399f23b36 WHIRLPOOL 323ee54fea9691ebebcb98c3e4bbd6dba38eea7bd9f60f5697ee5aecd394bfae4b160c0097b18c70dec8e1729cf691fd594140b27c171fff566dedfef3cd2cb9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAVeJ0ACgkQuQc30/atMkC05wCfYnWlFD3KO+eySVSFnI2FUgDz
-wrkAoJ6O0GOMYukdrWX7dtgsAcz2gKMD
-=AeSp
+iQIcBAEBCAAGBQJQ0WyVAAoJEDxpGckxwJCBlH4QAL4rVJiJXL3w910L3Qp4GR9e
+LNp87ekxYURv8Zji5z+E9RElqL8TDRwugQkTHRnpFgdDxrMFqrYqtkVekXKl8Y0I
+zRWI7hJyDLQTri0GGFcv+isM3Q7BENS5ig29m+Rj/Y44V+wzrAp3GVysQ2FG7lN1
+nXKuDUSH8db+2P/p//80PinGrY8JPb8j1BYTgDnMztJFgYwTwWDFLrAoRkznWbAt
+erIWFLgNSK6DZsx0bJRCJUyt1Kf25r2DHM0cM6AVs6hxMcRzF1Hc74fMwnngCAyF
+t47QnJUakosR2oCnuP8oKZMgIGAL/5tFl6YNmaqU7sdYYsvLWjLgJKr1XXmckY6J
+L0VBAl5vuV4DVbrrAmnG1ejPufzV1d0hO3mHYVdhkKz+KyVMtpj6YzVx62ICJoQG
+5l1bwWynAMo8PKhmtJzlnlPc8nRSPDNCAm0U3anhxekWEEhmn8m2CNNoUXUqtsjQ
+uctyPh5YcF5FzAcsYok/b1AITH0cJLlzu1UNIu6suD2zwDdaf2vjJwmKWvo9iB66
+HyijeX1MJ94FhX9H2ZY1Lmfs2xhmFK8moxrHsPFHzaUNM6BKiOAmnzx8TU9insZp
+Gq04WSGVV052w+edD5Nc9k2zoE4zpxUFwcPNEL8Aj2rths3Nh055q4jw+krLq6fr
+3pd5XkOFGCKITM5sAKix
+=04+J
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r3.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r3.ebuild
index 0c7a1a410591..da7cf2b29b05 100644
--- a/net-ftp/oftpd/oftpd-0.3.7-r3.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.7-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r3.ebuild,v 1.7 2009/05/29 13:23:35 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r3.ebuild,v 1.8 2012/12/19 07:26:21 ulm Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Secure, small, anonymous only ftpd"
 HOMEPAGE="http://www.time-travellers.org/oftpd"
 SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~ppc ppc64 sh sparc x86"
 IUSE=""
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild
index ee87acbebfd0..0e86d407e6ef 100644
--- a/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.7-r7.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/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild,v 1.7 2012/07/29 17:53:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r7.ebuild,v 1.8 2012/12/19 07:26:21 ulm Exp $
 
 EAPI=2
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.time-travellers.org/oftpd"
 SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz
 	ftp://ftp.deepspace6.net/pub/ds6/sources/${PN}/${PN}-0.3.6-ipv6rel2.patch.gz"
 
-LICENSE="as-is"
+LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 sh sparc x86"
 IUSE="ipv6"