Append GPL-2 in all ebuilds to cover the initscript license, bug 425870

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

5 files changed, 18 insertions, 14 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 46558de5a8d4..5565e8b8b14a 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.129 2012/11/06 22:45:32 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.130 2012/11/06 22:55:56 tampakrap Exp $
+
+  06 Nov 2012; Theo Chatzimichos <tampakrap@gentoo.org> puppet-2.7.11.ebuild,
+  puppet-2.7.12.ebuild, puppet-2.7.13.ebuild:
+  Append GPL-2 in all ebuilds to cover the initscript license, bug 425870
 
   06 Nov 2012; Theo Chatzimichos <tampakrap@gentoo.org> puppet-3.0.1.ebuild:
   vim-syntax is split to puppet-syntax, bug 417085
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index d7a3371a46cf..16633ebd483e 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -15,19 +15,19 @@ DIST puppet-2.7.13.gem 1876992 SHA256 1e91ee9eed15d2ca4aba691299d1bde61de310cbce
 DIST puppet-2.7.18.gem 1920000 SHA256 147cd18ec39d2768bbc40f2735a84f770d9dde1b5679ba21f37edd6f7db19089 SHA512 e51c09baf2eee908f3b4ad1d90c252eb0eca3a1eb550522d0b612db919de305b724a13fdcc7abac51da31291b4a703b2478d2fc9ebfc5aa995ad677aabc42c83 WHIRLPOOL 9f2f4d30acfddd78f0d57ab0a58f400d6c1218e6f5e6541a5f224b9243f5ef5c2dee64bde5a69dff16df42242fa3f44ee226b4aa411a249fc8acafdd1ae17bf3
 DIST puppet-2.7.19.gem 1936384 SHA256 aaa225d83a8fe545a6bcd1b1b6c10373f9cec7c41e38caf56bd0d956892cf2f3 SHA512 3d003c22663226996aa6422d18af446768bd81b67e76e8d1aedf18430bb85df73c3695de9d49340e51f948f661f4c6e24bc83d9d428c9f10634219e01fd641b6 WHIRLPOOL 0ffd63338cc55c13f6bb49bf1487f3b890be04a5ce83939848bace35dd51ff4b01b93ddde146197888455cc65cf8fb4228056c749c7802cd471d9b43dcca5c8c
 DIST puppet-3.0.1.tar.gz 1505102 SHA256 5e4d0cfdd6989faf4f6c5c76c0d3bcfa0364e380549be1a2f7c3abd22b0b562b SHA512 a55e7f30d867d72031d8d8ce5f55e1c7447f08227009164579e72974f4af158350ad568b5dee91e15cfd64c74d7df062bc2249244368bba96216ec8310f9d342 WHIRLPOOL a83716081ccabb590bb1cc86f0e666ae608914450abe722613fc9f4c2c94e9f25c657cf113f8145c73cceb4a1f5b79b851d3f084fd70dd19b245b2a3d3cf9688
-EBUILD puppet-2.7.11.ebuild 4676 SHA256 445bb40a3399ed9c86824dcbf36bfeaaa9b085d25c5ab45d1a74a767b6d1a062 SHA512 cb958e6370ea3eb64f77067d1bb0658939235f90d6f8dda518324a90a529f2f2c2ad5c6caff2bdc2506b49bd01d11dbc9f0b9e9c041ec401a45c68f9d55d8af9 WHIRLPOOL 3d161737a66af8ec1da775d2a17906f81b22c567ca315bb2ccbcdab65e238db0976498212da5e82438327e08282582f77890fc78dab3b11aa03d7315969e6827
-EBUILD puppet-2.7.12.ebuild 4694 SHA256 6f4b7db303f90bbe711280bf89e9dba6621a0fa194256c436c46815404204100 SHA512 f095dd4052fde10a2724d88825cff9edf627f4945ffd92a9728e285d4b473af8c2e5c77e99d30cabd31598bc9f94d5ee7f6b02c20d914f796c9b3af1886bb3e2 WHIRLPOOL ee898578ae71f321811bc986558c40e91a79b82796134475aa85c74cace29feccae3f81a7c06a763abf4f6de629a9f1b12624218e98009a7af99b629c0195570
-EBUILD puppet-2.7.13.ebuild 4709 SHA256 a5868883dcd5ee74d969c6e084e4dc3121c52609a0890d209fc2a1edcd7efa43 SHA512 b1843b61d936bc7a0abb3f477b84fdc77e4ef0b5360e1eb829a8a53367800dc3eddce43137f5052cd69c62213a475bd23132913229150a9128f2ecf915c6b23f WHIRLPOOL 58e3362d8a4bff4836f016b9ee83e7d40d72482236d88d1144f4c3ff71e216d953e085186d4b8847aeb6ab0c7909fa6aee4d9f3d90fffbb4df3b5e612a128b87
+EBUILD puppet-2.7.11.ebuild 4683 SHA256 c3ed42be6c33544a232ba46e48df83d4a099ff9621a94bc34802b018237d3a93 SHA512 e757b0d17d112706bb0de17b5aca64ca008d6ca6d4b3942ffa6347c7aada4ffa4b86c92897c2550e67d5467bae4eadc56583c67480829badb8a0a43e170fb9c1 WHIRLPOOL eaebb8c8e4501cbe594ff131d97515c9e14ffb92c18d7c7f3b79b8bfe8956ac8baf9a9081504244119224fa3b28c7067a38964637577cf931811cb2c31146199
+EBUILD puppet-2.7.12.ebuild 4700 SHA256 a0429e067cf60675c9944e08ea0701796167bdbf508f4409b6cb0160e537ed13 SHA512 bd89ece767daca2d7bb0faccef82d753087113e48e096147b564adf6b68ffc76bd92414f51096b648f9b1ea85e7d71c2b60f2b6f5849ba6083cdf212fa096b9e WHIRLPOOL e72e11616389708976f710c52ed7fcbedc3440b168ad4709c540b21fd17e71160bc7456ffe545956b2b135678f7b31e452e8b16e23c055d9b68a1da0dc7c5292
+EBUILD puppet-2.7.13.ebuild 4715 SHA256 2d4b9b8ba1236c30fb6b736d4d10bb801e04260163cb7729937ba3cdc090b795 SHA512 35511f701fd0a586e68dd00ada75a1e370bdf1c64616d900c5c3faff73022926765f57b2b51018a6c8db23269415f08e1ce6844e94a6d25a10085452cd150b22 WHIRLPOOL 873b14a0ba3255817b72ee7cacef979acbee3804a639b8613590795685c7eeef4052215c8d9705bbfca857d300474eb2e3d1ffa60ae2e3ca975ea87e2df0426f
 EBUILD puppet-2.7.18-r1.ebuild 4691 SHA256 75da411e4d9819658aaa11467b9fd9c26ddb4ade1632b9fafd43519186a795f0 SHA512 b6c033a9146688b9ccbfe103d11fbd1d363540bfc571908c827c6310080512c42bd558822fa410cfcc037aec24fcb2c2e029ddf25a0a1c3d65d621f8d633239e WHIRLPOOL 2e1fb89f4650ac06a116b45c4848df9155375070154baaf1272e41a3782aa080206aac8ed1d676b8b0eea39849a4761c4072a79c04a705a873c459d107d60ead
 EBUILD puppet-2.7.18.ebuild 4712 SHA256 4172930670e5e1e40e2985824dd99247bf4c6befdc61e0865b3b4cef1317ceac SHA512 6b546e75814a9c8aef2944f89f802ca220c01db3dd970927ae4a12a13ac29e598e4bdb4930fbcf1b66022154959de25423ee2b4779931ae9f245300cc829ceb8 WHIRLPOOL df6770a6dbcd85add1b929ba369aee2ab8181adf2ac818d593c39dc36fcd899de717cf7517da0e09554efd0a5fbb14a0d69a1b587dc4d98bcc5b5d8366a7cf58
 EBUILD puppet-2.7.19.ebuild 4786 SHA256 82e95311da20cdc6574abcd1ba32940298d9b4f6b19cfb05782b49f44f69da08 SHA512 fe1d08ac519ae203add0ad2cb1494b04abd1e1d840f8387403d71161484ef03095783e16a30086fe61062341733e082dbfd3956fe66ab91210068d5cd5651e18 WHIRLPOOL ccf5d07362645b6481703a2587f29579d37ef6d80e602396b21788937cf57a09d4680e049658e96e964c463d15390a966b3e321057a12127001a6efbb729ded5
 EBUILD puppet-3.0.1.ebuild 4298 SHA256 88700961a556b7bc251caaabb9b46342e18e0e20f02b7a324e284309070ec115 SHA512 e61376cabe6e99fdebae032009b0f61a500f326e770ecce8ecd0f8bffa68b9518e6ac0c61259c8b83369c901dc4050a5bf07be1e2d61c3c8ac370ea967464688 WHIRLPOOL d6ef70dae469ee6d58c44686f2fd1b991be7bdb026a43cf392ffba620b04a652c0e568429a70a10b986fa82a622a4ef510768bfa79c884121567f5bcca778a05
-MISC ChangeLog 21315 SHA256 ed9e8a1bb43d9187dd172aa81813e82edc55096ff9d3349fd50b3c2845e97c3d SHA512 3c5b54dc92934db86a7c9ec72f698ea0d91ad8e2dae00a983f513b9f6e42a7be841f62ca03ef613a6cd3ec97c5d480639ee0068b84c4f3a811d46087fc462e60 WHIRLPOOL 67338d44d8d2ad9839ffee2a8f7357b1c8e28f0e2c598d81bd853f4322e2d6dfedd97ba1058e9d5810e6af2945c225cf4b63937b1561701f639797c7d62bb8a4
+MISC ChangeLog 21514 SHA256 1450d81bf80ff8316c5dd0917469e45fd637fafe3d92bfbfc698b802d9437d0c SHA512 7c8ae5747a01c277bda351c5b00f52f42bb3bb58ba6f51774f30025a44bbb9c48c132299dfe0ea095a8aa3ef808903a9ba4085d44a7d1698fa98857f4df5e234 WHIRLPOOL 59c7320d73fdeb80e273462273a98a1e0cdede0b926180c9c9116491388200c15c82cbe81ec804985d0e6bd4b9f5835ae6b0606cc08d030aff166f3c735911d4
 MISC metadata.xml 1171 SHA256 6ab490dd6057a5e66df92b959cbdc20292a6db3966512af8e26a57672f5331e2 SHA512 a9993f649770c28bc2e09d1e779ad31a89ed280ec2168d3f489a13a7b756f77f8fac92f0139d534182a2f97bc74a4772a5ec75f8aaf27e41fa6b3accb97a0be7 WHIRLPOOL 7a0b45535327479cc77d8310658aba051dbba53bd3a4729990e18c2da138424a383bd4688a16e83b972d2646861b7d37328434f3deeafddeb314a5a806798f0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCZkyMACgkQjDdoMVfcAHj37gCg6RJ5BqUHuPR1GcmAOZZKVMZA
-FX8AoLmzU39KGwuTybUY+RsUXx3os/RD
-=XTYo
+iEYEAREIAAYFAlCZlZQACgkQjDdoMVfcAHiiKwCdHzkq/ELZI4NHCFiO2MrgSwwg
+MpIAniqzuQqx9/h7yxx17BhrOi2B/ubY
+=mq2I
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-2.7.11.ebuild b/app-admin/puppet/puppet-2.7.11.ebuild
index fcc9bacd7278..8a86e41e2a42 100644
--- a/app-admin/puppet/puppet-2.7.11.ebuild
+++ b/app-admin/puppet/puppet-2.7.11.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/app-admin/puppet/puppet-2.7.11.ebuild,v 1.9 2012/08/16 03:48:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.11.ebuild,v 1.10 2012/11/06 22:55:56 tampakrap Exp $
 
 EAPI="4"
 # ruby19: dev-ruby/ruby-ldap has no ruby19
@@ -15,7 +15,7 @@ inherit elisp-common xemacs-elisp-common eutils ruby-fakegem user
 DESCRIPTION="A system automation and configuration management software"
 HOMEPAGE="http://puppetlabs.com/"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
 IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
 KEYWORDS="amd64 hppa ppc sparc x86"
diff --git a/app-admin/puppet/puppet-2.7.12.ebuild b/app-admin/puppet/puppet-2.7.12.ebuild
index b3a44f8d9c4b..47ce5df3f8db 100644
--- a/app-admin/puppet/puppet-2.7.12.ebuild
+++ b/app-admin/puppet/puppet-2.7.12.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/app-admin/puppet/puppet-2.7.12.ebuild,v 1.5 2012/08/16 03:48:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.12.ebuild,v 1.6 2012/11/06 22:55:56 tampakrap Exp $
 
 EAPI="4"
 # ruby19: dev-ruby/ruby-ldap has no ruby19
@@ -15,7 +15,7 @@ inherit elisp-common xemacs-elisp-common eutils ruby-fakegem user
 DESCRIPTION="A system automation and configuration management software"
 HOMEPAGE="http://puppetlabs.com/"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
 IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
diff --git a/app-admin/puppet/puppet-2.7.13.ebuild b/app-admin/puppet/puppet-2.7.13.ebuild
index 611702fcfa5f..70ac2dc68813 100644
--- a/app-admin/puppet/puppet-2.7.13.ebuild
+++ b/app-admin/puppet/puppet-2.7.13.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/app-admin/puppet/puppet-2.7.13.ebuild,v 1.11 2012/08/16 03:48:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.13.ebuild,v 1.12 2012/11/06 22:55:56 tampakrap Exp $
 
 EAPI="4"
 # ruby19: dev-ruby/ruby-ldap has no ruby19
@@ -16,7 +16,7 @@ inherit elisp-common xemacs-elisp-common eutils ruby-fakegem user
 DESCRIPTION="A system automation and configuration management software"
 HOMEPAGE="http://puppetlabs.com/"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
 IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
 KEYWORDS="amd64 hppa ppc sparc x86"