Fix bug 425862 - Add GPL-2 as license to cover init script

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2EDD52403B68AF47

5 files changed, 33 insertions, 29 deletions

diff --git a/app-admin/conserver/ChangeLog b/app-admin/conserver/ChangeLog
index 133e2f42fc31..96b569e539ee 100644
--- a/app-admin/conserver/ChangeLog
+++ b/app-admin/conserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/conserver
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/ChangeLog,v 1.81 2012/08/17 21:25:42 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/ChangeLog,v 1.82 2014/05/30 13:05:18 swift Exp $
+
+  30 May 2014; Sven Vermeulen <swift@gentoo.org> conserver-8.1.16-r1.ebuild,
+  conserver-8.1.16.ebuild, conserver-8.1.18.ebuild:
+  Fix bug 425862 - Add GPL-2 as license to cover init script
 
   17 Aug 2012; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Remove myself from maintainers
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index b5a8158340f2..c34f3de0e560 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -9,25 +9,25 @@ AUX conserver.pam-include.1 210 SHA256 facea91616049551f44655a7f8a270c61dd571e86
 AUX conserver.pam-pambase 194 SHA256 7b1f7770c8781453907b2785c54b1043c8e66202437479c4d9664b71a0bac816 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9 WHIRLPOOL ad118856b14aae65730dc224882d442314b6620df51fae55b000ab74afb744f2f99e47d009c8733e18269915ac0f02e5cdc1bd2a3e0b67f8527ef9b39bbe99d4
 DIST conserver-8.1.16.tar.gz 311373 SHA256 43dc9d81bc23d76a0ec01acd1f54f5c276b715feeb8f52bb33b5c81f325a46d8 SHA512 a1cee166d68836d348fc16118d4d27f1538e6a4de244a689327590a674534d8931558b9cb258f07e6559a0004f2e7709c15c9a296fa708601a5ec4c994d33eee WHIRLPOOL 325f053a2a36a4b0f577c4bfe8fce8a1e3d9f03a7be33ee19419146f1e770454368fc8a24543bca4ba6b1f2ecc4ebf05b1c062f8f52a59e723031c21dc5a42d0
 DIST conserver-8.1.18.tar.gz 323247 SHA256 3c73cebf732419c41c7c860032e41d83c1f152fe3115a30dc9851820b7864e14 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f WHIRLPOOL e12e54f2af25ef696ecf61818da0dd8cd09c23ca03e0fbb8445ee8eca5dc4ec2dbb25e88a68ac4a51c49b89838bf875ac65ac0e59d49337f36aa3929aa02dc81
-EBUILD conserver-8.1.16-r1.ebuild 2234 SHA256 050e3b2dda044a7de98cd7aa10fb2e06d77aeb5fbc654a59ac320bf0cfa0dace SHA512 efda63d6113ab75128c768f797734bc9e970d90bf4e95d9ca55d1715032182abb4bde9ef2b2944cf4be4e998b798be681b78954307d1146a09575fa4ef0fda24 WHIRLPOOL b7a19cf71da8a0b2be00aec4b4a1de8cb8da3b0d9c91c07a545ba139149736b0a57a7e8be7c94d9aaad6b329d32cdec889c7f451ad5021ea1e8ed35ecbf24368
-EBUILD conserver-8.1.16.ebuild 2158 SHA256 4522e779427552168c80371e72f0f7fd15560cde11035f0affeba3cf3d01fb56 SHA512 a72db295df0ef903f41a88245db918310121eadf35a368fe4caeaf8ae3cf69745636613318a266b32108c1631f250f1382e851427831d3d245a221d0f6fe56bb WHIRLPOOL 0fce773c9fd5b934cdf8b7e0fb0f4456f0ca7ea6022e92ed67af07c2023afce8a65a64111a9ac67e88d7c2817f639c0ff9d6f1d2d0d3ea21238d1109f16d2bf7
-EBUILD conserver-8.1.18.ebuild 2343 SHA256 2beab1ef9a30c90c3caab11a91f388c61d6084d864e30922ed10ce456fd0c8d9 SHA512 ae9702c336cb621dd366f35cd192afec09770cfb5809e2516b40d150d33a499bfdb55d9d69267061cfc8de66e9de88ac79f9180a8c00c46f0d8f176758ded87d WHIRLPOOL 092ace99f6683df07db66e829a57f8546cdb8f7bdceecae9b0575c139e0ab8fd68cbded57d86c4479f6d30c71cce27215b8c9a954c91d767357b23ff3852d1d5
-MISC ChangeLog 11680 SHA256 bd39595144678e30f4d28a60338b9125a4bb680ded3bc894ecf164221d3aaff1 SHA512 045786eb8c7905c1869dea5c0c899d5cb314fe5291c1c06d517316bef8d5d62bb3fcc8bbd779d705e7c848e5c6d6e326553722801daf76b9bedac3f53f22f59a WHIRLPOOL da6c8da9712dd9063ae8b47ef649f87ac783d4bb2751e8389dca27c935d8ea7041e6cb7728839ad9a26c36b3bb4ee1ea08f7d873d0d67f7af1708c75b1436447
+EBUILD conserver-8.1.16-r1.ebuild 2239 SHA256 531815617d1d42d99e428ef0edb4993339683b8584147ee6c1e817994713f0df SHA512 4f7311c6c274b36c10d1bb74ec8ba4dc13bf1ce63fb3a18f39e61e18f173bcd4e1e4319eaab2ffbe9acf0905f8a0b032b52ced5d73ed241b9092b510a4bf4de5 WHIRLPOOL 779e673697ebf59b38a3eea7da9aeb86e09b324343433f55b1f50a8e75df5a4d2eaa1d61c3ca4365d7201f13e67dbcfa684419938494064177626cfeb08838e5
+EBUILD conserver-8.1.16.ebuild 2165 SHA256 771daae241f511e9434aa0be7f17b5d4f9320612696e362ba49ecb8cab641b7d SHA512 e85c2534c9b08725386982aa07f4585b3aca53ee86a0d9fdb1a7a2daeab19f71c3b3cbb796b6d952d2f93d2a12463aec5580cdbcc8f4188cdae3e044d69bef68 WHIRLPOOL 1d6296460046e34fafb073bb297ea64bc1aafcfbeecc65930fda2bc1231dd0b9c310505c2d7f15ae9746d76f55f07a11b5d527db0c82ecc0552681dd8c718a86
+EBUILD conserver-8.1.18.ebuild 2347 SHA256 ee9005a4d7f1a06ae85626990829d45a17a0acc0da06de6e9aaefdeaa1c21582 SHA512 d1fe461e7df72238740f2994c2244cf3564cfe9020835d4d679ac4047ffc87bb08ebd71351346d88128d93fe780d497741125e23380ad145255b93c827ed272b WHIRLPOOL 9a1e8e02e18ec19d79599342ad7ec8d7d031a1bbb362fff1f6447e3ee198a842d1d5292463688cf49422c0dc9e9e1849b6051501b36bcb9ce09c309880df6ca1
+MISC ChangeLog 11868 SHA256 381cd06322b313b2f9a8d5c8bc127f42f9c35a0b11855bd09bfe102ea92fcd08 SHA512 476bf144b5ca345c2e6d86cdf027e152572b4231ff35fe3754744d1ad7739d03c2b9b8b474e5e1b15bf25266bbf73da4e014cabf3ad04f3dd7b1d533899c5b90 WHIRLPOOL 2cb6a66424905cb15ca0db00f0f5b8d702bcc2868e50f4b5e81db860f842df8a5dc9749e14ee1b02d20296353af643f26fe7b9b9c941704466c47bcd56f97ae7
 MISC metadata.xml 1131 SHA256 7cce96deb69c27bbe02d633a2df7113c2150f5aacad5746b288b3b710e157c9b SHA512 af3272767059cb1a897f13b97d912918fba4f60491d34c6f590a9ce3fd4ef2683b13a455a89b84a1f2237f0c14aaea48c8226f4134fbc205c9ee894a48923692 WHIRLPOOL 385cdb38f2968f765e6c0b2b723e046cb6bd34b1a5bca527442e924356cc37ac553312499b6c42da8d45d735ae2891839a80edd5566fc72a363ef9b765e8b1a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQLrbcAAoJEPqDWhW0r/LCViMP/AwtR3vnJdYeQzKzCdTUs0jt
-rO1H8FIt8wNf0YHiUU+MjU0KXhsI5j6DDz5XyT+Y5gzeiUaX9Dt/a7oi65DvghID
-LQsPGZ8+lXOKnYGdyDGtr/6Hu1IByODEnkeAFS2PfWjcLmMu0PfAvKEXPmnZplFb
-ZtOhcDJVQ9gJV+jHA91O31Bh0fvYH2Xs4ePcg7/MfJbuATxPDI66tbZtF3LLJIJi
-RBxofu+AVdnvTGOEXOw2PVz2Pn1D5C2EBsAwReyb0BAg9iBzH8oSz1EFCOapSVUz
-Q+ila/BYt8eFL4AZ/hg3rjDEYKgWSFA9wUBqoePy/uoPm4KiNYEiEQpKjHTvZqyG
-xMGb9zvV1cgfOKZd4q72CbeVknOvubcv9xxHfdQ/wo5jCzAhV3sNe/qGRQ/eZ6vK
-X+/a5JJsSyJlFcWUWcOfBark9JWBKFPA6TWL5AkioMhdk3UGSDrvSVDsFpe73J5g
-GxxmPclRPw6qXjks1YORyvo96x6u2uLnRfDoqlLfBZvZd5HnbhTUlP2wDepeEi+F
-0ngnanP99nWbTq4ThLNKUCKFtnkQtYaYqphNCg71N8NGuC4N9v1lZeZsufcxNr8K
-7HY9/pzQjah/mAVR04019ygPR+cn569gVc1bY28sD2pT7SHACMpUKKimaonoj4yG
-f2c1FCcwq0YA30k2kIPz
-=Yto3
+iQIcBAEBCAAGBQJTiIHzAAoJEC7dUkA7aK9HOFMP/2H3L0mY2z3aNqt9WC8q7ff5
+e4jLnPZynt30ugAPh8+p2l5Ghc/9DG9si1H5fYTZgkH4HU8XuNany9Nub8b8Av9x
+CHZF+6DWYxF6N/bjXny+1tpPXMhUg+TPVuBW2bStvGIdcbSz9D0zAg8OSLMIFKP/
+bFoitkWj92anWa9wZPoT2ofEBKuEILFA9Fszyw8IbG+/dL6Qr/XSfOGvSYow/GLE
+yNzeOPBtoTQKUCS+DaDdNy6QlyYpUEYyXfNKlIaicAyC953XWuvIQoMqxa4ISNQv
+3UrFTidArmMfJyc8+XLPQLCYATJ74ylHnNGSZCF8JoIVgWLdfZv9p5E2kuXNFiiR
+x63VFjXK0+5FaPDhnD0rTh48iAwI/K0MK5FdjlcUCe4xr+ey66aBKK7PnYL4ed+N
+ubywVgOOnGbk5O+I1kV9FqZDDFXGLgmmUHUWw05A0mylqAq9IHMtbOY4cNB+/LqI
+SJhujcByE+Lz8Qt82cLoTeBYUkQag3LojjEf91wGpxeQwpufYEh0ebfDHtaUu96G
+MlTTrk9dySD/mZTysg/dvXFk5WJ6LN2+1rTV4Vlsfyrzh5ja5b58s19eDdW3vFe6
+v+TyvdJUwzoIs+Oz8A66p99TBIsp22lSfbb3W/gSWAgelmotOREx0kEHG4yuJpUd
+8+p/BvpXZabfbRDi84k1
+=L3pt
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conserver/conserver-8.1.16-r1.ebuild b/app-admin/conserver/conserver-8.1.16-r1.ebuild
index f58ac6b974d8..fddd4f573471 100644
--- a/app-admin/conserver/conserver-8.1.16-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.16-r1.ebuild,v 1.6 2009/02/23 14:57:29 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.16-r1.ebuild,v 1.7 2014/05/30 13:05:18 swift Exp $
 
 inherit ssl-cert eutils pam
 
@@ -8,7 +8,7 @@ DESCRIPTION="Serial Console Manager"
 HOMEPAGE="http://www.conserver.com/"
 SRC_URI="ftp://ftp.conserver.com/conserver/${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="pam ssl tcpd debug"
diff --git a/app-admin/conserver/conserver-8.1.16.ebuild b/app-admin/conserver/conserver-8.1.16.ebuild
index e71e4ea1b0b2..0921b2e73683 100644
--- a/app-admin/conserver/conserver-8.1.16.ebuild
+++ b/app-admin/conserver/conserver-8.1.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.16.ebuild,v 1.5 2007/12/27 14:22:19 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.16.ebuild,v 1.6 2014/05/30 13:05:18 swift Exp $
 
 inherit ssl-cert eutils pam
 
@@ -8,7 +8,7 @@ DESCRIPTION="Serial Console Manager"
 HOMEPAGE="http://www.conserver.com/"
 SRC_URI="ftp://ftp.conserver.com/conserver/${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="pam ssl tcpd debug"
diff --git a/app-admin/conserver/conserver-8.1.18.ebuild b/app-admin/conserver/conserver-8.1.18.ebuild
index 3efcb59341e7..60d31ebd608a 100644
--- a/app-admin/conserver/conserver-8.1.18.ebuild
+++ b/app-admin/conserver/conserver-8.1.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.18.ebuild,v 1.5 2012/03/31 11:59:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conserver/conserver-8.1.18.ebuild,v 1.6 2014/05/30 13:05:18 swift Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Serial Console Manager"
 HOMEPAGE="http://www.conserver.com/"
 SRC_URI="http://www.conserver.com/${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="kerberos pam ssl tcpd debug"