init scripts were not renamed, but were in the ebuild (file the ebuild wanted didn't exist)

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 28 insertions, 23 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 5c3116d4d6a9..7727d685c954 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.138 2013/02/08 16:49:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.139 2013/02/09 01:00:03 prometheanfire Exp $
+
+  09 Feb 2013; Matthew Thode <prometheanfire@gentoo.org>
+  puppet-2.7.18-r1.ebuild, puppet-2.7.19-r1.ebuild, puppet-3.0.1-r1.ebuild:
+  init scripts were not renamed, but were in the ebuild (file the ebuild wanted
+  didn't exist)
 
 *puppet-3.0.1-r1 (08 Feb 2013)
 *puppet-2.7.19-r1 (08 Feb 2013)
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 78db2a7e0c41..255de0087387 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -16,24 +16,24 @@ DIST puppet-2.7.19.gem 1936384 SHA256 aaa225d83a8fe545a6bcd1b1b6c10373f9cec7c41e
 DIST puppet-3.0.1.tar.gz 1505102 SHA256 5e4d0cfdd6989faf4f6c5c76c0d3bcfa0364e380549be1a2f7c3abd22b0b562b SHA512 a55e7f30d867d72031d8d8ce5f55e1c7447f08227009164579e72974f4af158350ad568b5dee91e15cfd64c74d7df062bc2249244368bba96216ec8310f9d342 WHIRLPOOL a83716081ccabb590bb1cc86f0e666ae608914450abe722613fc9f4c2c94e9f25c657cf113f8145c73cceb4a1f5b79b851d3f084fd70dd19b245b2a3d3cf9688
 EBUILD puppet-2.7.18-r1.ebuild 4755 SHA256 a7ddaab1b997d2f71d8fb9285ba2b44ef8544440e5374d0419b43c67823bc73d SHA512 59ab02f592eec26d486020c56829adfff928a80561066967d48e479609a42ed58a598bbe60636e37aa92be3fbf92f465e6ba3c1a94a7e8fbd432d9fae273ccb7 WHIRLPOOL 985f64ef5fd2ff389133d360e61650a23ddc99c54423cdf05bcbd536a610ff23ee5d77d1d28518ead7803923c2537f2ec09915933bf4a9497b6654d436bdba55
 EBUILD puppet-2.7.18.ebuild 4712 SHA256 4172930670e5e1e40e2985824dd99247bf4c6befdc61e0865b3b4cef1317ceac SHA512 6b546e75814a9c8aef2944f89f802ca220c01db3dd970927ae4a12a13ac29e598e4bdb4930fbcf1b66022154959de25423ee2b4779931ae9f245300cc829ceb8 WHIRLPOOL df6770a6dbcd85add1b929ba369aee2ab8181adf2ac818d593c39dc36fcd899de717cf7517da0e09554efd0a5fbb14a0d69a1b587dc4d98bcc5b5d8366a7cf58
-EBUILD puppet-2.7.19-r1.ebuild 4826 SHA256 859a2e9570191340c2b5d7d459beca014ccb6e5c3c937640de65b407ca234be5 SHA512 e5f6252ea74795fa1d04272da63d85666fee0543ed27d027209b8eabb5360aeba1be2a36be4f4be62a29511498df748095008d68b5a2f87de073e7d45414091f WHIRLPOOL 7ac08ecdac144581860110e9f440974b9ff13a47cc6c01c82536c95268c593a5ccdd31e5f52f8004ee4538bdf0187e49630a97813c9c511ba2fa8ac3f2f42c96
-EBUILD puppet-3.0.1-r1.ebuild 4308 SHA256 121f1ae410a185fc067d597e2d2fa5b2d4fc0d6810fe6720147685788f7b7532 SHA512 3e2255ba3c247662d0c9e003c4627ce778b90fd2ff718343c7198131bae00667daa92e11ec696bfd516a619b14b6ec575711174df464feaec6d9024ef69e727b WHIRLPOOL ba4346d041b00075b865b4a8f250c12f8584a1cb2c87dceacf31c6e2841a102954e13f027ff284a91cb81e140095fa107d35254a1c08f30eb2d95c98837d4851
-MISC ChangeLog 22971 SHA256 342a8fa777c64e8866bfdaabe53a51551a529c907ed8a1c415eea7bbd9a296f0 SHA512 b58c78f079f12c76f8d5c65d4ae465ce573a2370f6149db7f6304f3d35b3b632ae95c0f69b6bcffcf2a236126ec73ac2c6609135823395e77dfdabc53288c969 WHIRLPOOL 16121dd2cc8b6ff368d39363fcc7520c4914f7566bc0dc3d32c0aeaf04671864604d14c393d1053fa6a8522bfcdf5970a297abd714637ac9b850b4862e7d17a7
+EBUILD puppet-2.7.19-r1.ebuild 4798 SHA256 b96d1888ece02d8016e1a9e393fdb0da9c6dc479c3adc71094f135d16a07a5e5 SHA512 cd1ef52b36782a5f49d7cbb2a0ad77681fb24f0bf299825f34292ec11ffc39ec2f7c265f43394fe52d05a0f89f1dc393d4c99cabbd6c6d89b0f63fb9cf94fd65 WHIRLPOOL 660b4973754e9c3fa9098d699d60ba9e929d9742433d8b7b32383ee7e52b28c0e8cf448255b18184e55c6e6c4844cf8d3d758f6f79b2e69f5bca091f37e7167f
+EBUILD puppet-3.0.1-r1.ebuild 4280 SHA256 1ba874392b6a1daae174b1cc37baccbb280ed2a9df9311ee1653ecb4a71fe461 SHA512 3b6c256eaa4d6cf547cedd76874345d083285f4f1e6ffea0fd5c523fd0e356a912540708edb41a209ceebb5064a85c2591010dbc92cb5bdab2159f0264fda251 WHIRLPOOL 0c889237e33a34e132cc1659554804739bc89798197f5965e70c1929e9c178443891a79cdb826ae67eb5af958982c5b9f13289705c32e54ddcdb3fc3f6f699ab
+MISC ChangeLog 23201 SHA256 d640ff4a9311e8a7b1c1c2dac1d98a2e81dc10f15f5c233b411af47d0f0da944 SHA512 b13ea6cb22502e5e66468860c4ef0f319702b81be8dc545fa12fd28ffb6940133eaa3288c6e49806a8c0574667b8b945f1bc08ecbf8d9b7c92e29a7b4b87f5aa WHIRLPOOL 2668ff95b2ec6db0030bcd241ba9b41c69f76b611eb030d8805af9904ee323e5c0303e04cf9f22d7258fcd91b8090083bd713f9c8a64d3b6a2a4645cd82287fa
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFSiHAAoJECRx6z5ArFrDkyYQALZBaF4trth6qmF3UDpUmPy9
-+Rt61uZWzblitHm1qYnpGoo9GuACnx3O9GOBYPjgPNILliPPum8JzyaHOdXg+OR8
-5iagttURAOF5xgaoiW2W9DNReYRdyUjrxWxchUCEtawACAYrAJKgKm/IeOexlfRB
-3qIW4xJFcuv/b+vjJekyfSrAEnYr9S4ogywMEeBiieP8fZYubxHRu8rpj9/vrWNe
-BIIMMCDD4gQXMS9XU7XiQjvHhQJ7vd8g8wgs8Q+G02xdyv1BBbTBMQhlsOyI30dH
-oPKdYkwJK/IWqJllC4hCC6hFfny1Zxr1VbFfwB8gjhv5ctmJ6mR9NPjIiVFQz6Su
-QKXUcL7FxP0KV+eCPKiv5iZ+T/BPXqZFIIYoKuhB1WrAFme0kikYYI8aUEOp+dfP
-h6+LrN8fskw7AjVKjFtUrQvPszFGBJrJJjlkYXtCWofuhZ0bsM67mbB4qhkjq3Fn
-gLxs7ZTpOUfSDOQ+qOR6qkpvdbnAYu7Bl5+jlHWyLk48DTQbbdZ53WoOgeX+lXti
-Bcbo4VVowqPSrwn6ufwJBLqIF5aHqyILPAzuqj2nsB3+V+O2d9B/vfCcl2rteqYx
-XpMHVy7Hh8oIlBxzeWEk+aTV5f0rB1zpHRKGJML199cKOzD//v/zskskM5Ru08Cv
-hqWk6nKolQq61pZDBGjd
-=5rCS
+iQIcBAEBCAAGBQJRFZuGAAoJECRx6z5ArFrD6i8P/jbAZaK+wBZoCap8wmFFX3JE
+y7V5Qb/oCZHrU9jErw5y06tWeaGCkR47XgjTAgc3SiVkof/6L/l1/I2WeOS716kO
+N4uRQ6grxz53/braWjiiAoKKaXfCPMGZD1JzjLjXo4vPOg+8iUbEn94+btb5Esa/
+/kcwhS62QMIm5jDmbJX0Xv7sOEjlgpMtU12Up4D7ceW8eYdIMc6jB4yfxvlye6BG
+MNRIyxGSi423xvBmdhmY3WvuY4Wt2Toub8yffnYaM2SiS1jWBXeQaPy/+Vk4g7r1
+kCWhfDurMZqhIHnr2XVijo91h38mwDPdA8E7Vs/IL2MNOdUzoKX24LS+HMZT3fk/
+aZMjtpXT/9Uip8ojkmD2t0+YJF+kknsgERQE7NvsQW/HLp2Q8oD1mgEWkwi/Qcz1
+GocEEQ0IwALlflC1oHAeobTczwIW0+0Huaz64Yt5c2lkbXNFjUjB1CKaW6GhN7SS
+jvUhmgma3AHcFNKpwUJLHorth4HwUJVJ1SOBCiCyCQ7SXHBiVh3ZkkEOzTfLbYh1
+hMpZkvIoH13GhLqyGD2+ZUYoE/IzpeLH7mhgydxhNQ6Uh4NXWvbg19B8J693kwt3
+keC9SbjF50AxgG8grFlxpDf3JfFr3KeJ6GAXMWThCtco0ZySEJ+58al86dq/49q3
+2W8bj+RQz4d/+ddEIQ3A
+=hJl5
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-2.7.19-r1.ebuild b/app-admin/puppet/puppet-2.7.19-r1.ebuild
index 475b0ec113a9..069547f369ec 100644
--- a/app-admin/puppet/puppet-2.7.19-r1.ebuild
+++ b/app-admin/puppet/puppet-2.7.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.19-r1.ebuild,v 1.1 2013/02/08 16:49:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.19-r1.ebuild,v 1.2 2013/02/09 01:00:03 prometheanfire Exp $
 
 EAPI="4"
 USE_RUBY="ruby18 ruby19"
@@ -87,7 +87,7 @@ each_fakegem_install() {
 all_ruby_install() {
 	all_fakegem_install
 
-	newinitd "${FILESDIR}"/puppet.init-r1-CVE-2012-6120 puppet
+	newinitd "${FILESDIR}"/puppet.init-r1 puppet
 	doconfd conf/gentoo/conf.d/puppet
 
 	# Initial configuration files
@@ -104,7 +104,7 @@ all_ruby_install() {
 		rm "${ED}/usr/bin/puppetmasterd"
 		rm "${ED}/etc/puppet/auth.conf"
 	else
-		newinitd "${FILESDIR}"/puppetmaster.init-CVE-2012-6120 puppetmaster
+		newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
 		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
 
 		insinto /etc/puppet
diff --git a/app-admin/puppet/puppet-3.0.1-r1.ebuild b/app-admin/puppet/puppet-3.0.1-r1.ebuild
index b452fbc0432e..76c66c318022 100644
--- a/app-admin/puppet/puppet-3.0.1-r1.ebuild
+++ b/app-admin/puppet/puppet-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.0.1-r1.ebuild,v 1.1 2013/02/08 16:49:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.0.1-r1.ebuild,v 1.2 2013/02/09 01:00:03 prometheanfire Exp $
 
 EAPI="4"
 
@@ -68,7 +68,7 @@ each_ruby_install() {
 }
 
 all_ruby_install() {
-	newinitd "${FILESDIR}"/puppet.init-r1-CVE-2012-6120 puppet
+	newinitd "${FILESDIR}"/puppet.init-r1 puppet
 
 	# Initial configuration files
 	insinto /etc/puppet
@@ -80,7 +80,7 @@ all_ruby_install() {
 	if use minimal ; then
 		rm "${ED}/etc/puppet/auth.conf"
 	else
-		newinitd "${FILESDIR}"/puppetmaster.init-CVE-2012-6120 puppetmaster
+		newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
 		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
 
 		insinto /etc/puppet