masking puppet 3.1 for removal and updating puppet for bug 481186

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

13 files changed, 41 insertions, 540 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 6a16c1de7a92..635d112337f4 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,18 @@
 # 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.162 2013/07/21 17:55:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.163 2013/08/15 15:43:32 prometheanfire Exp $
+
+*puppet-2.7.23 (15 Aug 2013)
+*puppet-3.2.4 (15 Aug 2013)
+
+  15 Aug 2013; Matthew Thode <prometheanfire@gentoo.org> +puppet-2.7.23.ebuild,
+  +puppet-3.2.4.ebuild, -files/50puppet-mode-gentoo.el,
+  -files/puppet-2.7.18-eix_fix.patch, -files/puppet.init-CVE-2012-6120,
+  -files/puppetmaster-2.7.6.confd, -files/puppetmaster-2.7.6.init,
+  -files/puppetmaster-2.7.6.init-CVE-2012-6120, -puppet-2.7.21-r1.ebuild,
+  -puppet-2.7.21.ebuild, -puppet-3.2.2.ebuild, -puppet-3.2.3.ebuild,
+  puppet-3.1.1-r3.ebuild:
+  masking puppet 3.1 for removal and updating puppet for bug 481186
 
   21 Jul 2013; Agostino Sarubbo <ago@gentoo.org> puppet-2.7.22.ebuild:
   Stable for sparc, wrt bug #473720
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 0a33782e6923..48d83a478b24 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,48 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX 50puppet-mode-gentoo.el 217 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a WHIRLPOOL 60d02a9b70d418cb453d08c17fbeb1133a6ddd924ba18565e30f7c655f5abeebf71af6f17797d3045483ae8775c905efdc11396f4f9829ab2c6b95fbafc2584f
-AUX puppet-2.7.18-eix_fix.patch 1370 SHA256 9414e985fe18c673256dbe5e654018de3d4f8c3c33765e873e1873da7d06a4d1 SHA512 7a5aa71c6ce987c95224c79be55a4b14b4c37aef3960e1aa34e96397564042192f30f8c9f935949768e33a7191ab3ae6335830c68e9bfb2d02c654dbfdbe1fd4 WHIRLPOOL e318b8f60d787bb7947598b91168b96c6d4886602f5f6b90db7336feac00fee61f0c8b3c4c60d0de25f7bc029172a8b10ab6ce1d2115df7755db4344ccd57a3a
 AUX puppet-openrc-status-fix.patch 709 SHA256 76d320e7a5f8922e3f438b3baf09fb7c86dcd70e821e364cee19fd5f33596a82 SHA512 2959646f3d2a5ceed41faff64debe2dae08ef524679ee1a117ce709a22284f055d40a7a28848a8e1cee0a2603a0a6ad417560714d4bc000b3288fe7a3a5e0d81 WHIRLPOOL 030d85bfef14d74e2ccabdf249fca657beaeba36d0dcd26cf706abf1ecdb81b79a4dd95063cf0781cb9006523cd1fa86a35ac2efd70821c1f3623bd2ea11ae77
 AUX puppet.init 916 SHA256 edad76953e36dab793010955cb4775242271c3e4a22a193ecf1ade4f0716d2bf SHA512 1528e2c9f8d145663f9dab37a5928049ae1063570048f372ceeec3892b3b9e30aa84849056d7799a4a6d292c8227f8132142e115d6019f64050f4989e6584df8 WHIRLPOOL 6295f9eceda2ad94c5e5c9beee5a7549b043c646e8884c01375ec089805a40b037a533a8ce4c04c8f9ccbab0688ac75adceda14e528854ebfcf2d3462e26757c
-AUX puppet.init-CVE-2012-6120 1027 SHA256 d2d9175d9c78490b2227a011227741fde27aeb3a9a099e2003b751b254ba3c95 SHA512 06d8b2fbf62d70d7722a36c28e1200e9f1e8d927e159a747c163cf617023ba772c4bf90b5e96577fdd66e227ed478c53c30d16e906e2b0b3251dd0ad01b4a3a4 WHIRLPOOL 77bc90a44f1151cb3ed346b905da13d9a02884bc821c27555c9e8f6b62ad669f023b3794898d271c01c72cfef25229a55ba91486aab219996806baf87590fa87
 AUX puppet.init-r1 609 SHA256 1ba2b2c08e056adcb261bce51acf47dba6200246f199f25cdf44c9c3bcd3c390 SHA512 b170b7e3ed943e6cb51745288862943bcd08a6680c0b40d1211295dffda698dc4da4596599ba4540b61c786c970ec1b8a5f03f15f249fe32169d0f558bc35923 WHIRLPOOL da5c9e8e309a162d1b04be0222edb252d39be8bc17772ed6ac16f2990ca64adec6e469dd2522e3078ae0cc1bc4c7f2383bc776ec1a05868515ce35bb845e9125
-AUX puppetmaster-2.7.6.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d WHIRLPOOL d0d14ac957978d59ee6b57b53d8d2e4f00a78ac2fc9d5c279457e326fcd08c30c3ad0f884f05580a4e80a00ba02af7496469eed96a91245b2bf3141494c56058
-AUX puppetmaster-2.7.6.init 867 SHA256 3fc62b4850ccd38517d9617671bef2a5d804147383744638de67c6f2289de28c SHA512 0b40c12458fcd15458c243f34d95d2c5d58b43d5f3ee4f215f44a47f73fcd60604cb7c9ca3e71f884ca4b6a23755b7d76a143641192d5959ca0eef9a8e59d4f4 WHIRLPOOL 3f4bdb3a10cbec6933ff88db0bfa3f01a5694faf4de7952f3b39372df00b5c8f96bd534bf53e07f42c791750909711c304541eb26df2691bda701259d6cc8e48
-AUX puppetmaster-2.7.6.init-CVE-2012-6120 1066 SHA256 4f71739cef2abcc9bb861b744af6c88898032b8a44b145aa2ca1bb7121502c57 SHA512 05268387980aad5a0299aeca114c7285377ca1f1a91af9008366d37d21c64830c5db1b8a19f176eeb8239d616c0499996c6d0082e29de81d3945d3009fb30a90 WHIRLPOOL 8c753fc6a8bba8ec7dad5e02021d8e97e24044c3a90bb0d51682ffd9bfa5c3de6e31fae3154573f4fc2c8f72b622148f51b5f846612868b39257a0becfdc1a44
 AUX puppetmaster.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d WHIRLPOOL d0d14ac957978d59ee6b57b53d8d2e4f00a78ac2fc9d5c279457e326fcd08c30c3ad0f884f05580a4e80a00ba02af7496469eed96a91245b2bf3141494c56058
 AUX puppetmaster.init 1089 SHA256 8e4ae53b115ec5379961af6e9f822b2d8cfa59241d7d62d3bb8f81600fcd98d9 SHA512 3cedb45ec1c9b29b6c4e8392aa610b866c99fb2204c70d5c149090478bc42ac9454091bdec5155358b662167964a61c82307243839f923f5b15eca9e28a360e6 WHIRLPOOL cb86be91131d65e6f6a54b330e82f551dadb46725b7c882ca0fae3a501adf68f0069204351c57e2b6d69f6704846c9f7ab1aa2c3162ffd9afa93cce386ca991e
 AUX puppetmaster.init-r1 920 SHA256 00a66031624de13e28b43c186765c36f02632a614b868192e6cf4e6f1f392830 SHA512 b0b08592464111791470b126fef0ba20863dbcb011752cccc7c24303544cbbaf12fefb37eb17ad88551ced4d5d6bf2a4f81fd93e84506411f7b8b51053d34e42 WHIRLPOOL 4027629f5d188ba1a96fb0796ff5a8c8c2887936f2f9a5a4fc41a719be9a48ad4c114b2918437e6b812f01bfcbf22e2b4617092bff84b2b76c107db4c5dfc29b
-DIST puppet-2.7.21-CVE-2013-3567.patch 185961 SHA256 33fe47facdd5b8c32e8fc870c70733a76fd6b1df7e9f320d1ba7de3b78aa835b SHA512 53f71e7dbd313d06a90af357f9b1cf4f9ef0f0b4f7b3da0fde2d4ba38394dbd1dbff9efc1a71bc999689efb0b1bc1489d9650e79ce3088039624eea6d222737a WHIRLPOOL 5daab2075a39556b7b34ed477ad6bd6e369eb7f7d5ddaa75e10f8fbb067e2b5aa0464fa64129bf97c94182b142d5874fa2ee5ccfa7a5f61ee9add1542f05c09a
-DIST puppet-2.7.21.gem 2031616 SHA256 a5eecdbe68cde5ebfd576a9af5ddb0c8c17dae224a7d0b3ec240ef54e6bd88a1 SHA512 638c188b945791fe86c1657343f9d7ec3ef7e86342c35e03dacfae4e99e63d8c09160dd1faf840f244b275e6a0aea3b969668debe9dc1b60cef68cb2513068b5 WHIRLPOOL a4bcb4181e57bda6aaf79fdd484903114e94dcf5196105203538d6d8a1bfefcd6db44f74cbef1c209b086d7b2bfab53d62069da1be034e6c35fe686fd00898bc
-DIST puppet-2.7.21.tar.gz 1998848 SHA256 c18b426457d023e87745f0a98b7dd257f8e94722b5b0d3cafb6048ef2499273f SHA512 ec5db3b829e146741ebbbde0e5f8128dd0f372dee1216bef8df36f5ac371332e1d0a37e0d6ff45a8e82ca762945060ce33cb9b65e835e243705e8c56ca0f3fc5 WHIRLPOOL 6576248721bdea18871004884c4191288b354bc56fa159ce51c3014a5bb798e00c90f390df73373f12dd227430394f47be1d4daceed27f8dc7356e037a725729
 DIST puppet-2.7.22.tar.gz 2023230 SHA256 bfd79c0aecdeea4e1a8573e9325fbcb48778603d908180e88897458f01fe06de SHA512 534f40d57e57d6b16fbac6e097cccc888e12cda648f9fa8fb74e4add9be49c1733d488d13375a712e9f160d8ccfb314d4f48ee7e604388cfd5456750a2627c94 WHIRLPOOL e5a7a773a5af2dd222c5726c3dbe3a622ed60c148dc0fc88fc7568ad3f1d422a08f49a6d5f5592b218418163526fc7effe48168309024232137919e11ac40a11
+DIST puppet-2.7.23.tar.gz 2025639 SHA256 73bc0d5a2334dc484148141a32274703b65b78bf87ca41f7e2da1c38518ba490 SHA512 d6173b596744b438a132a3772ed39195670d509481b5fbd30b098e8df3fceb31097369e6670587303b490f35842a39955d77ad500ab88535d43f08cc8d9dc86c WHIRLPOOL 65164214bc421b78359858258fa1e4242161ec406a20d73e5f44a5b14e74a6ed5973fcd4cd752a8817698aee8840ce67b92b12dfe487f964a736a68ae158ae80
 DIST puppet-3.1.1-CVE-2013-3567.patch 177845 SHA256 48b8998182a6d84fcf10847183feefb4b198b8421bd46d82fb8c45577bc0c5f7 SHA512 fe3e8ad8fecf374b9ebe67f38bc49980891121134fee560d7c2e5c43d8ccda772b4ec5b26f69c0928eb35804eb47fdb29654b065b997cc8f5c190fc3e2cca7f8 WHIRLPOOL bc93d1958b2c31d76a0f5b3fb0a33224e6304b72a0875e1ca3de0516212dccf44b760899ffbc29ed179be741560ff7b16516f5b7b65cd6f6a45414edd4eedda8
 DIST puppet-3.1.1.tar.gz 1587190 SHA256 4401f6388bb96b1301a107f247af6fa558127d78467bb5cef1a1e0ff66b4463d SHA512 48759776b68f83a125a0c703ecc9ad3efe34f10e6cfd9ddcd9e596ff082c9f40bdb7e0489bf7eb0bb0ce8bdb4ad0ae87049d2ad3133e839d0a5a6caa8419074e WHIRLPOOL d7152ba5397edadba9784f3c1800c8cf31ddd547691b35567ad52a42e82e741256326d2ee0bccec0642e82f533ffb74babcaddf3a0ee54361626b875cc618b2f
-DIST puppet-3.2.2.tar.gz 1784340 SHA256 c47745aa73912b2cb1a20b07e8741b8af37a920b9bc8dc8afb14b23d8df7d13d SHA512 e794aa7632a03ff4e6c9b96d577c0c17b096d95ecd840473c43ddba1ea403ecf76652cb99ca2976d3d932be3305d9413cb7c9ac3435ac9ecb118f2eaa2c2974a WHIRLPOOL 8873ff2e32b778e171d7910c6b84b12a23b9f952a565455fc2949c2359e8b65005b57987345a7719409fbb5e5a3393162d01b94ba337ce0538d656d76e9ee5bb
-DIST puppet-3.2.3.tar.gz 1782059 SHA256 6a19927d6126b9f6f40e94997c0896a618da8983178ca0e30264122b70edf819 SHA512 5f599a33322dcd96aaec78180ff6f5022fa6f536a5e37641fbae1e6b6d9fe2491d54021668aa9971b9951d526caa5215f89ceae2bcd4f0c9be31a1e6479aabb5 WHIRLPOOL 9fec0bb8375346187d07996d80d6b2315b7d5b9531cb5332ccf0d47da9abd81853fcf8ca2fc7d4357648a9cad32db42c861b513d2a73e5113489b56b58443a63
-EBUILD puppet-2.7.21-r1.ebuild 4973 SHA256 59c9f09d5020a8eb5969655ef7c9a4a63dbbc9dac2f5500fef7e32182ef48376 SHA512 4cd6aec2cd2efe0417be64bee36cf85df3dba7292bfd571d7522a9c01c46eb72d1051222f179e079039c9464664960c365c15b77c27aab7c9021ccf7c3022dad WHIRLPOOL fbce157e1f25d985f4d8d66afbbe04a151ed858184401f3077e47e32af5704b62f647326b24af47b11f06c017e4ed4a6944c15dff712486707d94134b154a57a
-EBUILD puppet-2.7.21.ebuild 4731 SHA256 bfe02b716ade3d16d07f1faed6f76b70e91f03a3c4bc75d80815a6963637af6c SHA512 6483b205b96b62ca29378b51bf188b6d0367b389ad4bac4afc5a5b86eb164764dee87da00e0027dbc17eb634ab938bc550b7b98019948cab14d9cbd4ccdb5e52 WHIRLPOOL c876e707366ec3d058db8ee696e3e3b781502b4f8b5da2c6416c1fa0979dd7a9ddcc3278c7dffdbc6c3ad3c8313b9f2036872461e1538595192192cdeb98a697
+DIST puppet-3.2.4.tar.gz 1786216 SHA256 8b38f4adee6237b8dd7b1956d90af97f2d0091245d6e30b708bbc8e333001358 SHA512 31a22cf926c6fe866e7ed1ca294dd78228bfb34b0465d44cc985dc6f737879710b5c27e1519f53c9fd9622320386950f290d774d709559b66be79e43dac1dd5e WHIRLPOOL 86bb44bd6ee5a4c31892e909a95fcea52ced289b891281bae5535dac891006d9c1a5d4613210a0ba550ab6428f206dcf9ab3fafb3c90297a64e8bad3c06509be
 EBUILD puppet-2.7.22.ebuild 4815 SHA256 673be32c365fbe6090011fab52b80e5cb0cb57b5481d801df64b6eb142a925f6 SHA512 33802be249210f542d31f8af97c0e5efd919968ecbe52c02a3fe487eaf7b6ac44feff4410ecb74dac12f9c37486917311d764685ad6e77aaa7419b261733346d WHIRLPOOL efd2874dd45226989406cc6d48e26005fa5470cff9393f0f495febd4a6d01870f447dcd713e5ca6fbb972c3781c539a4727d5856243b2a1a7029be70a4e043b4
-EBUILD puppet-3.1.1-r3.ebuild 4443 SHA256 bba3ad9dc41943d76a5b3bddb04066131e858927305323b012c5beb27f3e09ab SHA512 f957c2cf733d756d874513fa2bf70e2fc88bdf673c97a5b3ae357cbf45d89affa80722a4a47c4b87c813a344894f41abc33d9e7fb32c6841c99cf6ffea2d23d8 WHIRLPOOL fc256c9efc54992ae921f936116b0fddf10ee1d7bffa641a7334516a12664df4fac404b1377857a92266c5335ab6752c19576c1d0f897aa94e1c09482c177393
-EBUILD puppet-3.2.2.ebuild 4298 SHA256 79b49e2b1289c66c7e61d340ab20784efaf1f599f97a36eed7e2959d83050c7c SHA512 5ed817537c0abc99206093d9fa64d5754fed6f943e8dace152f12715d3a532d9cf86dc1d85256e4d72beeec0f257c0b5e28e2e82ca3579a18a95c250d08df943 WHIRLPOOL 495a24725914c1f22888d7cfae22b624772724c541090e756d3bf4d602ddcf249c871af84c4b96fd3e6a3b677e52c21e606b06874d4e886e710e83f9c78d415b
-EBUILD puppet-3.2.3.ebuild 4298 SHA256 1275c7e3bf89fa8edabcd4d629b5ea1203983ca1fbaab80b1d81e5bedd690b1f SHA512 bf0542cb9bcf500b4343e31a5a38fe2dfb3033f6c4215a21e2393fca1dea87f35b315f71ac895f60a7c28132a60663d5d785491c382d5e55325396683b360759 WHIRLPOOL ee90abe009340d495ebb79bf750db474bbeefd4a474c6ad011f95f8faaf6bc7c5cb04fad86c757706627fbffb81f4a55fb76ae301477123fef56b098a4d2d094
-MISC ChangeLog 26531 SHA256 61ef2554d45ed9dac588948365f7596ec01b074aad691cd8dd0b152fbb1c5a85 SHA512 46c626da047311d905e50f7fb41e7d5497410a14996ef0c8293c93c05b359bc46937efbb35e02efeb602c01c8bcc49afa44da810a808bb6fbc46d501a52adde1 WHIRLPOOL 9c6dc6473afa542540724f8469818a3e285ac9629450ead0418fb971d65a76645d353fec29b101a8992c5d5ff062556f181b60f2377875fab006899828f3ed25
+EBUILD puppet-2.7.23.ebuild 4831 SHA256 8caeb99408b469291669ea93e725ed028c97ab86a62535b8febce872d34b5eb4 SHA512 d065cdf246ec16e38e8015d7d234c57fa8462c2869afe4bb19453d17aca7391e6cb16be001a23c08661fd26b9bde414e7ad39d21e97417520872388e709fa6d7 WHIRLPOOL d07b889d64093f27523402b33777308f465182e4c5aa67396116698d24a79ac46c2b9acb0c7b51cc69c53a1c8ff876a77ed4ee91ac68e95f40cd62462e194d4a
+EBUILD puppet-3.1.1-r3.ebuild 4421 SHA256 d226968ec07f5c98cc04a4b516a187524245ff9b54fae1b75ff71e64f740f0ce SHA512 189dc2acfdc428893e4cde55c9f06cf0895a89fdb5c3a7862b8ada5058f508be32c6b568aa9a1ac4ee02ea575ba9b6f8d39cbe9280bbf4c74cb66c977189d641 WHIRLPOOL 8d679d6ba7660694d7ac836c77b91cab5fb73e38f5309acc664cf13400dcbc8a9141716cc2875d74a01835a7a1625632f676c8eb1d896462984e6e8263ee0ec5
+EBUILD puppet-3.2.4.ebuild 4298 SHA256 8f8383ebe30b91fbb13e60f1b5e9f7040a3820a4f03b13cbbb7ee3d4d06711ee SHA512 7f73fd64e22337bcd0f05c8ef695ff3f94211d57f7bbca1ce99b80e5deeed3890f09669599aa334d7ee73dfe570ab028d725d96d28e71a98a9703a1048d82bbf WHIRLPOOL c66d676982c2a2262c86c017b6b25af2d1a02a990a5f7259ecb398550e445a094c2bc8be0ee88b50eba21eb4fc756eed71649ff0d4dc058a0653e16c165087fb
+MISC ChangeLog 27113 SHA256 df4b5fe0a7ea6033f823e0cdb4de26db977d58f66343f72a3c92381548f307b6 SHA512 23bfb5e16dc8fe0779c62fb34c735cba0d0563117248dcfe5b20df4cd861033e3b7e5c21ec36b591d7dcd070ecb2a01150b1facf5fa081fe055dd51f254f89ce WHIRLPOOL 9749661529fab08f173b8f32e18d605929d194245ffd5d2cc99e4503440e29877d6396638544fcb88066567e37dfd62afcb6b0e577e9c2702eb1c4dc349a4a34
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR7CB+AAoJELp701BxlEWfswYQAMXu+voyakrDn40caR1fbqDg
-epd5zOHFGDzFzNt2kBT53WT1qGFcDa1pAc/HgNJJoupZ5AGYeEWHkyy0Sl9aXsB/
-4WdYF/frztV5B5M4Kd9IHbSqF9noDH5Rwj6RINyxeg68ICgL2uJMpcASUQVe4nYd
-/35JLkmVknBFNGu0G2UL0BDZzVnMrb+5+8c5iKFWU0wZHiHYUT7ycye9MQn510X1
-IP8HJoYJWZpUv+eo5RLbtrkz1ljoKUpxo/GW26S0+eCrd70S8gTNfYNp3Fp96VhN
-V5x9ShEAP7TKRKwzxJlCIxR8DwF/JkGDyQVS+j+xjiIUcld9V3muFIWGfrpLwQiD
-Nd2gm02sN0Ml/N5alQuAWRlLi1e7nNipcpXO0vT8JbvnLlmMM2PYxZWDboSPbH5D
-7RY+Oxa7X7cv93/ORv92jWFGLSW2PtiK/lOWmJ8I1Fm+2T0tb13iLV5SLOS1xPIs
-vcsumv9Apt/KFeWg6BbJU/ks5z4Bwp6PDIKAyn1G4DvBAYmAnqmVXoFym28xBSvk
-YDXLkskinKrSKO/UhyvfkyENywNq4hYBc2Wp/Zcu0yyY88aRoOwIZO4zTpwNDVkF
-pVLIybCzn5/QSgdZTTrNnDN4B1/1EPfaYHH8pzYV8/mQCc9FqE5GL16T06tw9KZq
-tsWFDMaPiTMhOjLikitw
-=oWmZ
+iQIcBAEBCAAGBQJSDPdrAAoJECRx6z5ArFrDtq8QAKXVNGxkaE2NWmsnWeUZhRT1
+ip/FLNIhMVtu0ZZ6Aj4BvftAtewqsVLa/FyLcKrbnCsGlFmUXWdaO59gsjwdZcuS
+FcV8x+MSzhljRLnMZx1JExVXioHyTOSPwSY4YMiZSFXY1F4HoM4fKjL2FHFtp8+6
+PRqFtGBpm1PiTpNvqFtG7C70aT+3xRFYimSbb0rcvyVa5AqZirQFDMqriLnHlQNj
+6R9Mmg0MFAlx2lgsCzoSf6PYtioKSeWJOIAUn9Oc17/VGBwdrCTqNeA+j9+tofvl
+00LhApeMsLBZSkru3UkKcttSJJ5Ydn8tNMvb8gvKLw74by7sW2vWLjCgNf//Uqku
+4yLf8jK8bOEG1kw/UeMptyjFnpYiVbs/+dv2lGawQDagKLR0vTobY4fdhyVAr1dk
+iBKf0fJyovxJDa958+lXzKyCmRFSWY7SD5FIOW5L3nD6DM0iO/FQtkCDzdrH0vJI
+DaVQSYOdpESmiTLRqeRHmUYkbpiuBeQKuWMDEf3p/93GKnITIHSRPMlEWqr719Lo
+bY5Fy9bq/jOhHztTqVbRpQQ+Fb8q2tqoPIBy9r64dA6J42gg/mr2GdwY86ahCb4p
+TNqS5i3w4m7GGavjeyrJxHglEVkD9tZGW5NAzXZiv+IV/jK8KKTO/h0T4Q5V339F
+KoRB+RO9/uWm833R/IPJ
+=aqoT
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/files/50puppet-mode-gentoo.el b/app-admin/puppet/files/50puppet-mode-gentoo.el
deleted file mode 100644
index 64c38ae5a31d..000000000000
--- a/app-admin/puppet/files/50puppet-mode-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; puppet-mode site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
-(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
diff --git a/app-admin/puppet/files/puppet-2.7.18-eix_fix.patch b/app-admin/puppet/files/puppet-2.7.18-eix_fix.patch
deleted file mode 100644
index f0766a87b766..000000000000
--- a/app-admin/puppet/files/puppet-2.7.18-eix_fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur puppet-2.7.18.orig/lib/puppet/provider/package/portage.rb puppet-2.7.18/lib/puppet/provider/package/portage.rb
---- puppet-2.7.18.orig/lib/puppet/provider/package/portage.rb	2012-08-26 03:32:53.646824966 -0400
-+++ puppet-2.7.18/lib/puppet/provider/package/portage.rb	2012-08-26 03:37:25.333824967 -0400
-@@ -20,7 +20,8 @@
-     search_format = "<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] <homepage> <description>\n"
- 
-     begin
--      update_eix if !FileUtils.uptodate?("/var/cache/eix", %w{/usr/bin/eix /usr/portage/metadata/timestamp})
-+      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
-+      update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
- 
-       search_output = nil
-       Puppet::Util::Execution.withenv :LASTVERSION => version_format do
-@@ -81,7 +82,8 @@
-     search_value = package_name
- 
-     begin
--      update_eix if !FileUtils.uptodate?("/var/cache/eix", %w{/usr/bin/eix /usr/portage/metadata/timestamp})
-+      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
-+      update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
- 
-       search_output = nil
-       Puppet::Util::Execution.withenv :LASTVERSION => version_format do
diff --git a/app-admin/puppet/files/puppet.init-CVE-2012-6120 b/app-admin/puppet/files/puppet.init-CVE-2012-6120
deleted file mode 100644
index ffa4b568c2f9..000000000000
--- a/app-admin/puppet/files/puppet.init-CVE-2012-6120
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PUPPET_LOG_DIR="/var/log/puppet"
-
-depend() {
-	need localmount net
-	use dns logger puppetmaster netmount nfsmount
-}
-
-checkconfig() {
-	if [ ! -d "${PUPPET_PID_DIR}" ] ; then
-		eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
-		return 1
-	fi
-    checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
-
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	local options=""
-	[ -n "${PUPPET_EXTRA_OPTS}" ] && options="${options} ${PUPPET_EXTRA_OPTS}"
-
-	ebegin "Starting puppet"
-	start-stop-daemon --start --quiet \
-		--pidfile "${PUPPET_PID_DIR}/agent.pid" \
-		--exec /usr/bin/puppetd -- ${options}
-	eend $? "Failed to start puppet"
-}
-
-stop() {
-	ebegin "Stopping puppet"
-	start-stop-daemon --stop --quiet \
-		--pidfile "${PUPPET_PID_DIR}/agent.pid"
-	local ret=$?
-	eend ${ret} "Failed to stop puppet"
-	rm -f "${PUPPET_PID_DIR}/agent.pid"
-	return ${ret}
-}
diff --git a/app-admin/puppet/files/puppetmaster-2.7.6.confd b/app-admin/puppet/files/puppetmaster-2.7.6.confd
deleted file mode 100644
index afecf479a6a1..000000000000
--- a/app-admin/puppet/files/puppetmaster-2.7.6.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-# Location of PID files
-PUPPETMASTER_PID_DIR="/var/run/puppet"
-
-# Where to log general messages to.
-# Specify syslog to send log messages to the system log.
-#PUPPETMASTER_LOG="syslog"
-
-# You may specify other parameters to the puppetmaster here
-#PUPPETMASTER_EXTRA_OPTS="--noca"
-
-# You may specify an alternate port on which puppetmaster should listen.
-# Default is: 8140
-#PUPPETMASTER_PORT="8140"
-
-# To start multiple servers:
-# # cp /etc/conf.d/puppetmaster /etc/conf.d/puppetmaster.master_8141
-# # ln -s puppetmaster /etc/init.d/puppetmaster.master_8141
-# # ${EDITOR} /etc/conf.d/puppetmaster.master_8141 (set 8141 to PUPPETMASTER_PORT)
diff --git a/app-admin/puppet/files/puppetmaster-2.7.6.init b/app-admin/puppet/files/puppetmaster-2.7.6.init
deleted file mode 100644
index 0fb0669ef224..000000000000
--- a/app-admin/puppet/files/puppetmaster-2.7.6.init
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "puppetmaster" ] ; then
-	PUPPETMASTER_PID="master"
-else
-	PUPPETMASTER_PID="${SVCNAME#*.}"
-fi
-pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
-
-command_args="--pidfile ${pidfile}"
-if [ -n "${PUPPETMASTER_PORT}" ] ; then
-	command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
-fi
-command_args="${command_args} ${PUPPETMASTER_EXTRA_OPTS}"
-
-command="/usr/bin/puppetmasterd"
-extra_started_commands="reload"
-
-depend() {
-	need localmount net
-	use dns logger slapd netmount nfsmount
-}
-
-start_pre() {
-	checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $? "Failed to stop ${SVCNAME}"
-}
diff --git a/app-admin/puppet/files/puppetmaster-2.7.6.init-CVE-2012-6120 b/app-admin/puppet/files/puppetmaster-2.7.6.init-CVE-2012-6120
deleted file mode 100644
index 046b2aa976a0..000000000000
--- a/app-admin/puppet/files/puppetmaster-2.7.6.init-CVE-2012-6120
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "puppetmaster" ] ; then
-	PUPPETMASTER_PID="master"
-else
-	PUPPETMASTER_PID="${SVCNAME#*.}"
-fi
-pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
-PUPPET_LOG_DIR="/var/log/puppet"
-
-command_args="--pidfile ${pidfile}"
-if [ -n "${PUPPETMASTER_PORT}" ] ; then
-	command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
-fi
-command_args="${command_args} ${PUPPETMASTER_EXTRA_OPTS}"
-
-command="/usr/bin/puppetmasterd"
-extra_started_commands="reload"
-
-depend() {
-	need localmount net
-	use dns logger slapd netmount nfsmount
-}
-
-start_pre() {
-	checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
-    checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
-    checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $? "Failed to stop ${SVCNAME}"
-}
diff --git a/app-admin/puppet/puppet-2.7.21-r1.ebuild b/app-admin/puppet/puppet-2.7.21-r1.ebuild
deleted file mode 100644
index 07775bb6142f..000000000000
--- a/app-admin/puppet/puppet-2.7.21-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# 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.21-r1.ebuild,v 1.1 2013/06/18 17:32:57 prometheanfire Exp $
-
-EAPI="4"
-USE_RUBY="ruby18 ruby19"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
-
-inherit elisp-common xemacs-elisp-common eutils ruby-fakegem user
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz
-		https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/puppet-2.7.21-CVE-2013-3567.patch"
-
-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"
-
-ruby_add_rdepend "
-	>=dev-ruby/facter-1.5.6
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite3? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl"
-#	couchdb? ( dev-ruby/couchrest )
-#	mongrel? ( www-servers/mongrel )
-#	rack? ( >=dev-ruby/rack-1 )
-#	rails? (
-#		dev-ruby/rails
-#		>=dev-ruby/activerecord-2.1
-#	)
-#	stomp? ( dev-ruby/stomp )
-
-DEPEND="${DEPEND}
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )
-	selinux? ( sec-policy/selinux-puppet )"
-RDEPEND="${RDEPEND}
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	>=app-portage/eix-0.18.0"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-RUBY_PATCHES=( "${DISTDIR}/puppet-2.7.21-CVE-2013-3567.patch" )
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el
-	fi
-
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
-}
-
-each_fakegem_install() {
-	${RUBY} install.rb --destdir="${D}" install
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newinitd "${FILESDIR}"/puppet.init-r1 puppet
-	doconfd conf/gentoo/conf.d/puppet
-
-	# Initial configuration files
-	insinto /etc/puppet
-	# Bug #338439
-	#doins conf/gentoo/puppet/*
-	doins conf/redhat/puppet.conf
-
-	# Location of log and data files
-	keepdir /var/{run,log}/puppet
-	fowners -R puppet:puppet /var/{run,log}/puppet
-
-	if use minimal ; then
-		rm "${ED}/usr/bin/puppetmasterd"
-		rm "${ED}/etc/puppet/auth.conf"
-	else
-		newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
-		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-		insinto /etc/puppet
-		doins conf/redhat/fileserver.conf
-
-		keepdir /etc/puppet/manifests
-		keepdir /etc/puppet/modules
-
-		keepdir /var/lib/puppet/ssl
-		keepdir /var/lib/puppet/facts
-		keepdir /var/lib/puppet/files
-		fowners -R puppet:puppet /var/{run,log,lib}/puppet
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-	docinto conf; dodoc conf/namespaceauth.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Puppet uses eix to get information about currently installed packages,"
-	elog "so please keep the eix metadata cache updated so puppet is able to properly"
-	elog "handle package installations."
-	elog
-	elog "Currently puppet only supports adding and removing services to the default"
-	elog "runlevel, if you want to add/remove a service from another runlevel you may"
-	elog "do so using symlinking."
-	elog
-
-	if [ \
-		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
-	] ; then
-		elog
-		elog "Please remove deprecated config files."
-		elog "	/etc/puppet/puppetca.conf"
-		elog "	/etc/puppet/puppetd.conf"
-		elog "	/etc/puppet/puppetmasterd.conf"
-		elog
-	fi
-
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-2.7.21.ebuild b/app-admin/puppet/puppet-2.7.23.ebuild
index 3643ca8f81c3..e3f52995a148 100644
--- a/app-admin/puppet/puppet-2.7.21.ebuild
+++ b/app-admin/puppet/puppet-2.7.23.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.21.ebuild,v 1.6 2013/03/17 16:02:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.23.ebuild,v 1.1 2013/08/15 15:43:32 prometheanfire Exp $
 
 EAPI="4"
 USE_RUBY="ruby18 ruby19"
@@ -13,11 +13,12 @@ inherit elisp-common xemacs-elisp-common eutils ruby-fakegem user
 
 DESCRIPTION="A system automation and configuration management software"
 HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
 
 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"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/facter-1.5.6
@@ -55,6 +56,8 @@ RDEPEND="${RDEPEND}
 
 SITEFILE="50${PN}-mode-gentoo.el"
 
+RUBY_PATCHES=(  )
+
 pkg_setup() {
 	enewgroup puppet
 	enewuser puppet -1 -1 /var/lib/puppet puppet
diff --git a/app-admin/puppet/puppet-3.1.1-r3.ebuild b/app-admin/puppet/puppet-3.1.1-r3.ebuild
index 82da8619a740..020a457d499f 100644
--- a/app-admin/puppet/puppet-3.1.1-r3.ebuild
+++ b/app-admin/puppet/puppet-3.1.1-r3.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.1.1-r3.ebuild,v 1.1 2013/06/18 17:32:57 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.1.1-r3.ebuild,v 1.2 2013/08/15 15:43:32 prometheanfire Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS=""
 IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
 
 ruby_add_rdepend "
diff --git a/app-admin/puppet/puppet-3.2.3.ebuild b/app-admin/puppet/puppet-3.2.3.ebuild
deleted file mode 100644
index 1b49e5857e67..000000000000
--- a/app-admin/puppet/puppet-3.2.3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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.2.3.ebuild,v 1.1 2013/07/16 14:35:30 prometheanfire Exp $
-
-EAPI="4"
-
-USE_RUBY="ruby18 ruby19"
-
-inherit elisp-common xemacs-elisp-common eutils user ruby-ng versionator
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/facter-1.6.2
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite3? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl"
-
-DEPEND="${DEPEND}
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )"
-RDEPEND="${RDEPEND}
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-RUBY_PATCHES=( "${FILESDIR}/puppet-openrc-status-fix.patch" )
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_compile() {
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el
-	fi
-
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
-}
-
-each_ruby_install() {
-	${RUBY} install.rb --destdir="${D}" install || die
-}
-
-all_ruby_install() {
-	newinitd "${FILESDIR}"/puppet.init-r1 puppet
-
-	# Initial configuration files
-	insinto /etc/puppet
-
-	# Location of log and data files
-	keepdir /var/log/puppet
-	fowners -R puppet:puppet /var/log/puppet
-
-	if use minimal ; then
-		rm "${ED}/etc/puppet/auth.conf"
-	else
-		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
-		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-		insinto /etc/puppet
-
-		keepdir /etc/puppet/manifests
-		keepdir /etc/puppet/modules
-
-		keepdir /var/lib/puppet/ssl
-		keepdir /var/lib/puppet/facts
-		keepdir /var/lib/puppet/files
-		fowners -R puppet:puppet /var/lib/puppet
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Puppet uses eix to get information about currently installed packages,"
-	elog "so please keep the eix metadata cache updated so puppet is able to properly"
-	elog "handle package installations."
-	elog
-	elog "Currently puppet only supports adding and removing services to the default"
-	elog "runlevel, if you want to add/remove a service from another runlevel you may"
-	elog "do so using symlinking."
-	elog
-
-	if [ \
-		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
-	] ; then
-		elog
-		elog "Please remove deprecated config files."
-		elog "	/etc/puppet/puppetca.conf"
-		elog "	/etc/puppet/puppetd.conf"
-		elog "	/etc/puppet/puppetmasterd.conf"
-		elog
-	fi
-
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
-		elog
-		elog "If you're upgrading from 2.x then we strongly suggest you to read:"
-		elog "http://docs.puppetlabs.com/guides/upgrading.html"
-		elog
-	fi
-
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-3.2.2.ebuild b/app-admin/puppet/puppet-3.2.4.ebuild
index 8667c5c2df40..50c984ebb040 100644
--- a/app-admin/puppet/puppet-3.2.2.ebuild
+++ b/app-admin/puppet/puppet-3.2.4.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.2.2.ebuild,v 1.1 2013/06/18 17:32:57 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.2.4.ebuild,v 1.1 2013/08/15 15:43:32 prometheanfire Exp $
 
 EAPI="4"