Fix LICENSE, bugs 446590 and 426102.

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

4 files changed, 31 insertions, 17 deletions

diff --git a/net-nds/portmap/ChangeLog b/net-nds/portmap/ChangeLog
index 78037748b939..f29112726596 100644
--- a/net-nds/portmap/ChangeLog
+++ b/net-nds/portmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/portmap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.50 2012/06/01 04:05:38 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/ChangeLog,v 1.51 2012/12/09 12:34:07 ulm Exp $
+
+  09 Dec 2012; Ulrich Müller <ulm@gentoo.org> portmap-6.0.ebuild,
+  portmap-9999.ebuild:
+  Fix LICENSE, bugs 446590 and 426102.
 
   01 Jun 2012; Zac Medico <zmedico@gentoo.org> portmap-6.0.ebuild,
   portmap-9999.ebuild:
diff --git a/net-nds/portmap/Manifest b/net-nds/portmap/Manifest
index f7eb715da59d..29412a75e726 100644
--- a/net-nds/portmap/Manifest
+++ b/net-nds/portmap/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX portmap-6.0-tcpd.patch 341 RMD160 39b2b6f154122b5396c194ba68ed16f34799bff0 SHA1 ec7703b84fa88004f3bbdce00d112df6897ea42a SHA256 2534aca162edac7ab976474263bebcd7cbd36348d0c593fd822eb84b8ef8dccb
-AUX portmap.confd 146 RMD160 1a8a5f2bfdef1ed1dc5347efb650a7ca6754d9d9 SHA1 e02a445f1d5df3b389044f98bed6bd30e84e6285 SHA256 f4e4bd0ce350ed236cfbe369101b8429f2108a174253daffe783353b416f0120
-AUX portmap.rc6 1289 RMD160 a3ae050d041c9a1e6dd1c582eaabeb2ffff3a772 SHA1 fddfa8768392953aa9878a48b90789dd4e7d203c SHA256 98af7347dcbe583b37bb1917a28a9a365239486ff42ced80faa54d94d1a006f5
-DIST portmap-6.0.tgz 22251 RMD160 2faf525f2b56e49c5b81a247c256b6c8e91aab72 SHA1 8133aaf1bdb0d0ba0b2d26e116e1e0397a3f027b SHA256 02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de
-EBUILD portmap-6.0.ebuild 1277 RMD160 750d1c884de11708507e1e8cff0e1784d04c32e5 SHA1 01f54c0654dbf06ec7cc98bf5e24fba1d0fba6e8 SHA256 d218290e3f310013d80fc61be1ba426f40ca2fa19e454bb11a950b3bafcfac30
-EBUILD portmap-9999.ebuild 959 RMD160 5e61809a5d46d9a434b890ac7d41dc63c6afc955 SHA1 d66cdd899ead0ff75f2b2a0f1fdc79999e7f6d14 SHA256 054f8b64a97ffa1864ae94fe12626849a983ccca88b46815ec544ff760d47c0f
-MISC ChangeLog 6560 RMD160 a5250e5a0f99e072f3aea123219e8a52a6598391 SHA1 677f4e9206c42199c1f42b497ece9f62b0ec0c67 SHA256 78b2e876710f629bc9a53a78ac4510b18b417e4bc5d8ab85d3ec8262d88d31f0
-MISC metadata.xml 184 RMD160 e04454ac0ce1332b55442f66f80c5b0a1f378d1b SHA1 8b1d8587e1a69023464beadc22574662e5c839b3 SHA256 07152ec8272b393b26f92d7ff6a9a74b0eda6624ab35367ba7670f881c3519d7
+AUX portmap-6.0-tcpd.patch 341 SHA256 2534aca162edac7ab976474263bebcd7cbd36348d0c593fd822eb84b8ef8dccb SHA512 95788f1adb385d4f06681e7197b4160771c2d27afab1f031ea894ee12f655f787ed47407c5debea9c360ab2410185d75496ca0b1ad31d827f46dd82ebe832a20 WHIRLPOOL dd8ce3779990d8794ed46c2fd3e41dd34f6fa4f4b65a533111272daeef57eb2699b683c35744f7a22bcc0e942175892bc767baa1ee4cc0904f9748413f19dad8
+AUX portmap.confd 146 SHA256 f4e4bd0ce350ed236cfbe369101b8429f2108a174253daffe783353b416f0120 SHA512 2558dfc74c08f7844cb2388bd98f34afe935b3c395571f3d55838e818ff437aa936ebb42c7b4aa82f4872e0f7ef6b5d23b42439462bd769cb8eef56a2852619c WHIRLPOOL 15566030dd1c46697ebaa707c6b6004c158c6689f515df683a3483e47047a984c7dcfa889eca3d8bd8be4c65038cf6e4b3e844346d808bf0f5c4faf8d26ca137
+AUX portmap.rc6 1289 SHA256 98af7347dcbe583b37bb1917a28a9a365239486ff42ced80faa54d94d1a006f5 SHA512 111f81888a1f56b604ded3e5edb2c4e4f0799bff602c180565f298c2deeb7673747e79e177e565e0df6e5639cdd77aad3bf058de9e0fee190c585dfe9717f7ae WHIRLPOOL 2a30a5cd1d4bf57bec89439981c73d3033d04dfd1a061757ff2978cbaa891fd031e88847a9be3a576c839a09d5a99f79afbda428738bbb032dab2562fd40ec3e
+DIST portmap-6.0.tgz 22251 SHA256 02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de SHA512 cbcbcff34d7f8c82b8e89464467c313a170d3d1756ae47faab1e90bc01fac8c3b6ff8bc8c35bfe32d9e584aafa8248eb37841d1a54f70db6b54ab54ad7e23665 WHIRLPOOL c9fa81fb02e26fa677cab06f2eb02e365d7408e337514cac384e65f9774a37cde6fd0ef49335cb9af65f0be70a440d4bf63b650cb50f9d5064a43abffa7d517b
+EBUILD portmap-6.0.ebuild 1306 SHA256 b96223e7cf683dce2fb51fa6f8c021aaec7fa9ba2cbb62b7ae76a20106dddc21 SHA512 9baf68a85a8321689a17e0136bd6d2a29b0c64021bf5fbbf056d369031a3bf1ff71fab8546cbf051babef454672782243f2a3e86e76d2c427d0ec99e642d5ce4 WHIRLPOOL 97f60996bd7645b08dec1d0e9d112af3deeaf74ed62ea08976af2c69069b495527322acb65c0b45626df17addf4d350f1dadb96b76bad40a38e7ceb228ea1966
+EBUILD portmap-9999.ebuild 988 SHA256 c33b6810ca2ba03e4fc3bfba57b718b18c401847d08670033d34eb8bed93261e SHA512 fd4f2275c463e55b1dd4b617cd76c0d41940d3a8eccc876b15ab295e0648b416b47f8235af4f178cd51b55e2e58daf8c5f4639758ececfa8d668d2ae41a34a14 WHIRLPOOL 773a6cc991a96ffa4233c05883a55b7e04b10e096d05f4c1c20b18ce080b15f6ef4373e980561bbbd1724767ec65cc1646a36c74df5f98e35715c66113be266c
+MISC ChangeLog 6686 SHA256 a6de899bb836fbbb67d77ab3cb24c7ab84d553a44fb130ad44c2aca12e4fa41d SHA512 b9c3c976acedba1874f17193fc7ad88650703129da983963def4b29cecc97f441967acb55f646326b4b4c72cea39d995b4c58337a7393a24754baa51cc9c91c4 WHIRLPOOL d92e4fc5821c07f01e7cc646b400cf89b33826396b67f05ffc92d5f62ecac0f8596813ed76b0de175e90c602ac4ee54fdba20fef696d84e7773e422b4fed5f80
+MISC metadata.xml 184 SHA256 07152ec8272b393b26f92d7ff6a9a74b0eda6624ab35367ba7670f881c3519d7 SHA512 4eeba756fd9f426745c488dbedead8e2bc5a46432d3f9343c6c0d97627c8d6cfbf3b0295ebc0767f9c724c92a13d4dddb8b0bc1655dee8e07cd9ff8541a02335 WHIRLPOOL a9d32f8b5c5e9d3e55a983966eea98f75ee361a1a15f36d4fd39412787a1554903c48c11b07f0476f39eeb48574316243bd2ac29d62606a34a3d69881f0b7e1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/IP5gACgkQ/ejvha5XGaOOIgCg6r7pypRjmwiyU/NDkW9sSXp2
-5D8AoOX5YL8w4xTvPcmx0A+4oRopszpT
-=1v00
+iQIcBAEBCAAGBQJQxIWeAAoJEDxpGckxwJCBRtcQAL9ueh7N0qekJFRsj8VMLzZf
+X1rTeUN6E2gosuuRrgFPGtKrcCqkvJ42F561Z0PhVkHWVrD/rUeUMOpwYPKwSLVb
+DQfqbtQUZrv/576xD/jf2oBO1W/PSQANSEa1fEHBkXeH4hkZ0TpqCntAli3i3IER
+i6YjdUs02I8SNlBkL7KxsagSp1Kals/QQLKU8V8okrsIGjkAG7FQC+1PYHhMK8z1
+89DelTMlXRGGMnrJYZ60aihgCIUYaHkUpKgcolyQDXcDcJ3Soj7WdRtomJIP363y
+jU3sxXC71+d1j3hwNV9Ab5eMjpg5cbfVP4VFluy38pKinYSt+1pJyiupEfuaGzYZ
+3vdWgMLj758O2F0rPI7TRdbsjHvNhb+89BvMKb6+zQhPkj06RRvaFe48+0pMhH8Z
+Kwb2rpIjZ+1oymOkMtJJqlkpkGbpmA8aYo6o0kK7E7zD0l4mzkoCIcTDWsdSci2i
+9Q5VOmPOQIE9bleo3Jq+OkPAHOi812azy/h3YN2RMuWo+imPbl8szrcVUiy88NNC
+9MtvO2rsVdxxIrjnV3/fcSxKViy5H0BObJl59bShhG5fmrnPerW9W7z7DpDpkNfN
+4zrIqjZOU/qL9ggcgG0ARppuaCWOuP9NGe//TjO6eEvAMznpcBEKEtq5c1pXHxys
+oi/RBdnaiYmrIniGq537
+=xEXf
 -----END PGP SIGNATURE-----
diff --git a/net-nds/portmap/portmap-6.0.ebuild b/net-nds/portmap/portmap-6.0.ebuild
index c22774bb854b..c93b7f1b1010 100644
--- a/net-nds/portmap/portmap-6.0.ebuild
+++ b/net-nds/portmap/portmap-6.0.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-nds/portmap/portmap-6.0.ebuild,v 1.16 2012/06/01 04:05:38 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-6.0.ebuild,v 1.17 2012/12/09 12:34:07 ulm Exp $
 
 inherit eutils toolchain-funcs user
 
@@ -8,7 +8,7 @@ DESCRIPTION="daemon for implementing remote procedure calls between computer pro
 HOMEPAGE="http://neil.brown.name/portmap/"
 SRC_URI="http://neil.brown.name/portmap/${P}.tgz"
 
-LICENSE="as-is"
+LICENSE="BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="selinux tcpd"
diff --git a/net-nds/portmap/portmap-9999.ebuild b/net-nds/portmap/portmap-9999.ebuild
index ec7788b30388..08987bc21d32 100644
--- a/net-nds/portmap/portmap-9999.ebuild
+++ b/net-nds/portmap/portmap-9999.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-nds/portmap/portmap-9999.ebuild,v 1.4 2012/06/01 04:05:38 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/portmap/portmap-9999.ebuild,v 1.5 2012/12/09 12:34:07 ulm Exp $
 
 EGIT_REPO_URI="git://neil.brown.name/portmap"
 inherit toolchain-funcs user git-2
@@ -9,7 +9,7 @@ DESCRIPTION="Netkit - portmapper"
 HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
 SRC_URI=""
 
-LICENSE="as-is"
+LICENSE="BSD GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS=""
 IUSE="selinux tcpd"