fixing bug 547378

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

8 files changed, 48 insertions, 972 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 1b52c3f90b8e..9dd4987161b4 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.215 2015/04/26 17:21:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.216 2015/04/28 20:02:57 prometheanfire Exp $
+
+*puppet-4.0.0-r1 (28 Apr 2015)
+
+  28 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +puppet-4.0.0-r1.ebuild, -puppet-2.7.24.ebuild, -puppet-2.7.25.ebuild,
+  -puppet-3.6.2.ebuild, -puppet-3.7.1.ebuild, -puppet-3.7.2.ebuild,
+  -puppet-4.0.0.ebuild:
+  fixing bug 547378
 
   26 Apr 2015; Pacho Ramos <pacho@gentoo.org> puppet-3.7.3.ebuild:
   ppc stable wrt bug #536168
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index fc05432919d6..75c26be4b67c 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -9,30 +9,30 @@ AUX puppetmaster.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4e
 AUX puppetmaster.init 1089 SHA256 8e4ae53b115ec5379961af6e9f822b2d8cfa59241d7d62d3bb8f81600fcd98d9 SHA512 3cedb45ec1c9b29b6c4e8392aa610b866c99fb2204c70d5c149090478bc42ac9454091bdec5155358b662167964a61c82307243839f923f5b15eca9e28a360e6 WHIRLPOOL cb86be91131d65e6f6a54b330e82f551dadb46725b7c882ca0fae3a501adf68f0069204351c57e2b6d69f6704846c9f7ab1aa2c3162ffd9afa93cce386ca991e
 AUX puppetmaster.init-r1 920 SHA256 00a66031624de13e28b43c186765c36f02632a614b868192e6cf4e6f1f392830 SHA512 b0b08592464111791470b126fef0ba20863dbcb011752cccc7c24303544cbbaf12fefb37eb17ad88551ced4d5d6bf2a4f81fd93e84506411f7b8b51053d34e42 WHIRLPOOL 4027629f5d188ba1a96fb0796ff5a8c8c2887936f2f9a5a4fc41a719be9a48ad4c114b2918437e6b812f01bfcbf22e2b4617092bff84b2b76c107db4c5dfc29b
 AUX tmpfiles.d 39 SHA256 bc0c1f0aa01e1df559fa6e0b8bb686a8fc83b1272bcf4f6671fbb2a9b48aaa6f SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1 WHIRLPOOL 5dc356a6ae94e262cb0a0bdbc120351bce40e81ac79e6a5122c6eff3022ddfd53724f9230c7553dcbd4648f640c4a912baf300ea5b2cb22fa7100b33de4f4909
-DIST puppet-2.7.24.tar.gz 2007979 SHA256 4f3109815502d86f0e13c12f899a17d2ff2a1a326afa2acab0c355bd649814ee SHA512 e8fbb2794bc5d16de145af97e588fd1fe469a2a1bd2719632f0e79545246dabde80d2432beea26805f34ee9876cf39f9ea9fa27fb4ef69f77915fbe47a739c0f WHIRLPOOL d6c61d9265472b979aba4156d783ba00f621863c9eb33572e38cf89a2162d833d12b4fe19bb571311f83336190236498e229faf1d90ecdde8a2eca5c5ac4c0c5
-DIST puppet-2.7.25.tar.gz 2020161 SHA256 daf6eb2e05cab13f40c520ca6777038f052082ace7d69708ec7fd97ab53cb13c SHA512 232a9a1184ba715024de136ff326e301d5ffc90a638b4d45fe4121648a7bc08379f20d53a052d1f6978c14d8e4d8722e2a5fa7c4e06afde8f3ec6d37edf7005f WHIRLPOOL 6da3f9f34d25a80e7e21b3cffcaa8db6d8ac67908a0b494200b54eb1eb061f1d3edbf1315881417c2e2a2c145895354befc9fe8344f223fa0c15a3c764a1b30c
 DIST puppet-3.4.1.tar.gz 1949373 SHA256 e6a929699a83c2bc1d1661674172ba7e92b6fb4235fa594cc2f3219925504b93 SHA512 0bbdd35387d4f1693023d2fe45d089453386d7bfb279365cf019081641298034b8cd84398567b7ce1868ec02406a51a53afc6842059442467e474bb26838d80b WHIRLPOOL 1a5d88f40d69c692a443dece46e282ce8a0415daa56ca1f62391d9d8a9d2f1da77a799605deda384b6c2f7760a7e0046a0c457216b8f350308b5c30d9b40f990
-DIST puppet-3.6.2.tar.gz 2252186 SHA256 9114c63108c58e39db84937cb8f7e1add3dcbaa08fd730f631de6a7f64a3c360 SHA512 a1bed4023f880e271f3f35900e158bb7fffa39ac5fde3f8f3a9c4ae416b85bf6e3cce76fd22a3778afcbe218cb7a3fe3137be16cd04eb3dfb4ea72f614276ac6 WHIRLPOOL 5f92b9a853c59706a57b6d0c4ffcd22f2d2d1b923e47f6f1e8dca8241d9ec329f95005e1eb8685eaf35f925c6c70afe17b19208da398402108f1cad31dbb2ab7
-DIST puppet-3.7.1.tar.gz 2586237 SHA256 46951c96560fb39bd717b6f4502199772617021f9574fedef00bdd04afb750a2 SHA512 dbb9994764d0da2eceafda3ca9d08fd3cd0f8c4e22980bc54f92c6232d4ef9f5af28fd792c1dc88f1a26363c16430cab67967c54cc3921892fdfb46022a32887 WHIRLPOOL df2cf03baf5ca656c7a7ac36ab9de0c100e0c2f59a897a014ef9d7057a73835541deeaf7db6e1ba8bce56d4292f82ff82e25ee935fbc174e928ea8bfb419d576
-DIST puppet-3.7.2.tar.gz 2592103 SHA256 f762c43da42c4b164afe70046ef65de88a389d718e37c79a1e92f4aa4ff571c5 SHA512 c513b5bccbe1e8bbaab49cc67956c4119dd13708d3a5d425221ab53db8fc22076f3f6dc56e9901ab109b4607f8a4c859e84f307d97fe17c675ea1d6b94d08b80 WHIRLPOOL 29131c40ba4f99fa99342653b1ff92cd1460043d58f3c31db7ab12fe3bca495f0277004478f02140780cb3b333f74169a61e6dedd9f138540170ac9ab8bacfb4
 DIST puppet-3.7.3.tar.gz 2594007 SHA256 4a3bd7ddb51072c3dd898a8de158cde204a2d8fd0b84e8ac806b84c074348637 SHA512 74baae5525090ac6213cc8ef27ad74cde5372ac08f8d5c11ed2a4bd2f6ed2b9940fa141ddb705328785611cbd0d32d70a40f1b44dbc9b167e11f0ad1051efc8b WHIRLPOOL 7ff9909c6bfb4d83caf8fbfcac11dff27c3a7583a68336040d404745bf35f4676933b6494d2c65c1f87fc9de5928ac9ae79f81e0b0a356088c0be5d8526ad42a
 DIST puppet-3.7.4.tar.gz 2600191 SHA256 957c09ab253f76e624809766999da6d872f79b3a64b54b8c66bdd8907c291745 SHA512 868a80df0e07b68f0de2fe31dcc55ab1f9da160d66e151298ecb11c17382c13939a88f2925e387a14d2713be5375c2606f26ff52c11dd214874d71f17b3c0617 WHIRLPOOL d5dfb53a062532427ed32acb834517d8eaeba9f53e85bccb79de93f5f947e7d4df472b40c0bed91703b8977ac99c9764944290627815dc60430a8cfe2098519b
 DIST puppet-4.0.0.tar.gz 2801435 SHA256 4bfc6e7ae1a4d2b46fe06781fc0e6183c2a82eaa3c578060059dbed1f5d02fc8 SHA512 2faa8599aa461e4b10b2351208f3466db233ad0c49b955d18b85c3ecd4ed3bced733fdf68cc5d18ef41aa1a030da24348f7679984120d9ff403eeeed293c6526 WHIRLPOOL dd9696e6ac995d89aa3d1fd2aab8ffde4c89cce2e1c82e2c43d77668082e66ad3d5f875c16e0443e7827d4b4bc94f0171d7434b6ce428f4a01007c3aef67bd7b
-EBUILD puppet-2.7.24.ebuild 4815 SHA256 66de35f8814b34b8d18028a5839201dffdac8ac4c02176e8f16ed24225891af1 SHA512 c397b20af829dd18ae18a164cf5193dd1e11ad38a9e89a4c3a2d0ebfae35b5c8f6bc32986283ac7d176e5c6afb2c9d6ae828da03b9b58f1166f893aad204236e WHIRLPOOL 4f48075454b2b3839e1de633cb7d6a9177e5020f9c027c32a19a5908a98bc6c3a01db4f0becc02f20b8131f01b6aab3cba3264a86ba1e622bd8099d9c8fa03cb
-EBUILD puppet-2.7.25.ebuild 4819 SHA256 ba838c6700e3105b9e67481c5830e073c6aa2bfbb1a48ab5dfc09b3104066bba SHA512 b0d40b138770738806a00fbf77a98ba1694aed6d31f5a455eac34567b5c84111f61b489145bc06d175cc01e1f1104a2d8a0992678ea11f87403551250854b671 WHIRLPOOL df15d476fed6770f4bada4b48dfa6e9f7f8af5d0af2d12662da07eb25d046200fd9c022b1715352de28c5821b3fb7c4e110908c35d0e9c1426720d8171830395
 EBUILD puppet-3.4.1.ebuild 4252 SHA256 9315ffda620a873edc07dc0dd72fa7e41dcb8f769c9cd6b43f734c45fe479224 SHA512 c1bd57514fb26815f3d3a76ee526dfe5ce2217134e9be8db7863ffa600660e2fea3dfd354c40e0e5ed7da356d60ac54328f20a67b1802270bbbb4e557b7b6dc8 WHIRLPOOL c39cf66e177f31d3e4ca69b36c7036092e51a74c48d6efb4f5e9f40376a8d5dd8cdaa9868d8bcef7b312bb62614134d0bc557cc5cc9214e0e71ff3825f164b82
-EBUILD puppet-3.6.2.ebuild 5196 SHA256 79653dc00b55644b39afd668a91401769c9e0cfba9315fd2493801e10d62c673 SHA512 a6287df50dc25e62b68a6fd0d183777518c6942bde696d7d3c9f364445f6342f33519beab4d464871b644f1fd14ef097d928575cbeff875abab6f11bd2a0d8dd WHIRLPOOL e720c7d54af31df29960fc373c928d5122f8191c291d064bbe5fc8696c97adb0732c6b70c0f0139385498b199dc2ac91abec24965039cacea210eb416382ec6e
-EBUILD puppet-3.7.1.ebuild 5196 SHA256 58e27a9fd0b07416cd8d12b6d5874475470cdea517c64b7e3d7aed50bb38b1ca SHA512 f5f4e5da6d90930ba505b0c28e600b1c57692325024ffb6c733b2b1337296d4c22e0bc72c04499d8d2ce87d6eb66ae608a2178d2c1c491b427f88652108ff199 WHIRLPOOL 8cc77c1fef0aa9f75fb12a19e812cdcab730600f581b8bc3c985d0a398a0abb19b8d6bc5f4f0d8671feeefc01f4705aa987f242eecef152a517fc2a4c03da9f2
-EBUILD puppet-3.7.2.ebuild 5196 SHA256 bbd942e9798a6ca4562ca19d7b748d0b39602384bdd3f673aadb1eb957515d52 SHA512 c3a52993f3d1c3a51ce9acae93f9680247033f68b05052ff8add6ad560a0c12714c2f129caf95227f86c0925b7c0ea53efb06d1ed8948fc280f55a82bb22fe50 WHIRLPOOL bd2af499319e03410d6f56e34be33ae3635de476b09f96188eb6a6fbb85ef5f6c775516996ceac5daf29775908d17903806b1bf286d1ad47d2f7401bd7f86af8
 EBUILD puppet-3.7.3.ebuild 5182 SHA256 885696503736055d53dfbec01960f0c00394adf19ad26250494db12d607dbabc SHA512 d871f9e71f8d1e076264fd1c979794cb161004c14283f744156cbaf5f53269459f63979eccb19eb47f7d37a0d010070ccf7e8d593b656d4fb21ca98e29b28eec WHIRLPOOL 396fa39d6e224682caab38622f6ebcb5a4f93b9d65380b1bfb949635ef9a4ce7acb4c28ded7c7b0367e9882038911dfaa3439698b9b6ec107e96baaf3ed5f738
 EBUILD puppet-3.7.4.ebuild 5246 SHA256 718252136edfc4d8bd4908fb8362dedd34250735a5a4ad3fa83e390ec7d1d177 SHA512 bfc2acde117d3b20ae285cdc5053884d3fd44c14ed817b22aba336b244be4f5d6e1bf8843cd367c52c6664af1524f201b1c607999de487df0e2d513c276fc824 WHIRLPOOL 3a0d4300ede47be728b30d0c4e87ae1cfa75f5146ad5675b5e38f5b6295e8431e1bbb34a07cd0a26ef908cfea91f383f5d7cb94a6cd58395b2b693cd45e7ed84
-EBUILD puppet-4.0.0.ebuild 4806 SHA256 9bdec4f5725e82b777b19d0b9988a244f4edc210d7bde58cd5e011ed1d282430 SHA512 7438677d432a2ec799983be6e5afedeec4e6e04e67e782289f60ad647e5d7e0cbbc991eb435d38302e03ea44c6b7d8146eb70aada61b8e0f52c86afbc0bf015e WHIRLPOOL d33544a2b7e80e01ec59160bd414ed68806365048dc5f9c1ce08be696801e7a272ed27a495aa7ff6fb5e708018fdebae929faee539c689e66fc8080ff46cc891
-MISC ChangeLog 34661 SHA256 db1def485feb0279ce940e3796bdad6526037fc2ecff65671f3f94dca4dc9496 SHA512 0ea26a255e7bfb7a54c9b342a9a09796ddab0c4c6c91220da6af38280ff53419b3e59ce7c46ed898c97aead187ea75ac689c0b4c2c501a958313260a3c8b6535 WHIRLPOOL ba8b4ad17e7d5aae5a1db1bd927f071459fd1d41b2d0cf477372eaf578ae34d65bb1482777140dc554642ee07d689e5e274aa9792ee33e41aeed57e0d0e99f17
+EBUILD puppet-4.0.0-r1.ebuild 4902 SHA256 48767c048e78cff7855d2ea0ff9d94b8432ec4d7ac226bc082ea64cb17052271 SHA512 752d41ecedfa992ea345a62c74e21d3801e453b1a35b7209c38d84c2d20c45730d45d85425ba35c96305e5e31575d70b9fef2c42f7b8e382c37f6a60ef8095bf WHIRLPOOL 5bf388624b8ff4ef0b23ae49e5557512b7ded0d4a8d172cc31fb2664ddd7ba09cbcd2f3ffba37b8e65b599211ab4763ff91d1b0f3cd1b09a4583e3b43034cd9a
+MISC ChangeLog 34945 SHA256 343ba4e315fbf7458cb3660f7956682f3b3319a84acccdabd17872e53479ceb3 SHA512 97d7b1cc112196091cdfd73b9f7e288932bfbd8ebe270389d3e8c46b41a30ca5ac589097f4d476d660a83cbcc5985cba5790f11f0f88a0e407f34396dbc525df WHIRLPOOL af55d00580c69477029b368afb5816c910c208af99ee1940416da5c2266c33add140019e0a48390f9f7547c9ce408073b8691951c666c2fcdf2c9e195c27c0c0
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlU9HqEACgkQCaWpQKGI+9RhJACfbIcKhfSpM2ay3Cm7TUVJK9uu
-HdAAnRkrJLswxauABKKIGftjUvAmCXIt
-=ZJk+
+iQIcBAEBCAAGBQJVP+eIAAoJEGSje+quGaToAJoP/1alqpTG4JeL2nhK2nta/uX8
+N/vs0+ZdWqHxf9LQHyIyBpMvp/PShPqB1+0BB9cDgz8mWpKnDnHmWtYrCfPsB09T
+m140pZTYDnUaz1X8U7FnotpAoWyE0InzQ9recrait3MrzcTjLotaf/3JjPBC2jGB
+JQTSpojz+PkOhh66Uz368+fOhkOs116nZ0hKZV9Y/YJk9zTw278Af7hyq93nOheJ
+IBN47haJSrZ3tnZf5Fbr2GfcbcMaqnHWEGm5b6biERE7itL/r4LUGvnJQI0Y0vCW
+S3RreiXkFRmZjdPxfLu8I7Te7cRLGECynaiTyQyUbsG5drBHd76eRZB385KiC4yZ
+bYGfOoVTfJoBCOjOW4TSr/IpCFR7Kie1wYYXnsg7MikzHjCNActV4thZ/F1wic+b
+VGoqTOOcffyVCnzKIHqNtyp0D+8Q9TszIqwk6u4iMBsCyD1ddRKBpBfuOJw0Lj/x
+jJnK4JzH8exr4zyhmWxyNWbALEmnKWU6F4nIsPoO1v20+pb1K9iE310n903zAmWl
+ajvofDq6b05pR4LGQhzNveefHV1P18XNZUjxyECcWIK7zMSOvIr93I1gAw48SyIt
+zr03SUeVnLDTv3LznceQkgB/IgdG9IYdRAy0AcBN+MtIIJJtOIh3BAlf4OL+o5U4
+3Ljc0PHlvVEZ+VcEKKC2
+=lBUs
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-2.7.24.ebuild b/app-admin/puppet/puppet-2.7.24.ebuild
deleted file mode 100644
index 5fd78daa8af1..000000000000
--- a/app-admin/puppet/puppet-2.7.24.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.24.ebuild,v 1.7 2015/04/16 17:54:50 prometheanfire Exp $
-
-EAPI="5"
-USE_RUBY="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://downloads.puppetlabs.com/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"
-
-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=(  )
-
-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.25.ebuild b/app-admin/puppet/puppet-2.7.25.ebuild
deleted file mode 100644
index d2944aa47956..000000000000
--- a/app-admin/puppet/puppet-2.7.25.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.25.ebuild,v 1.3 2015/04/16 17:54:50 prometheanfire Exp $
-
-EAPI="5"
-USE_RUBY="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://downloads.puppetlabs.com/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"
-
-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=(  )
-
-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-3.6.2.ebuild b/app-admin/puppet/puppet-3.6.2.ebuild
deleted file mode 100644
index 7e08cd77e3b8..000000000000
--- a/app-admin/puppet/puppet-3.6.2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.6.2.ebuild,v 1.5 2015/04/16 17:54:50 prometheanfire Exp $
-
-EAPI="5"
-
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
-	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
-	dev-ruby/json
-	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"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# Avoid Rails specs to avoid this dependency and because they
-	# currently fail against Rails 4.1.
-	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
-	rm -r spec/unit/rails || die
-	rm spec/unit/parser/collector_spec.rb || die
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-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() {
-	each_fakegem_install
-	#${RUBY} install.rb --destdir="${D}" install || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	#systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	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
-		insinto /usr/lib/systemd/system
-		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
-		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
-		fperms 0750 /var/lib/puppet
-	fi
-	fperms 0750 /etc/puppet
-	fowners :puppet /etc/puppet
-
-	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 "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	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.7.1.ebuild b/app-admin/puppet/puppet-3.7.1.ebuild
deleted file mode 100644
index 2a56ce7078a7..000000000000
--- a/app-admin/puppet/puppet-3.7.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.7.1.ebuild,v 1.3 2015/04/16 17:54:50 prometheanfire Exp $
-
-EAPI="5"
-
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
-	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
-	dev-ruby/json
-	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"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# Avoid Rails specs to avoid this dependency and because they
-	# currently fail against Rails 4.1.
-	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
-	rm -r spec/unit/rails || die
-	rm spec/unit/parser/collector_spec.rb || die
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-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() {
-	each_fakegem_install
-	#${RUBY} install.rb --destdir="${D}" install || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	#systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	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
-		insinto /usr/lib/systemd/system
-		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
-		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
-		fperms 0750 /var/lib/puppet
-	fi
-	fperms 0750 /etc/puppet
-	fowners :puppet /etc/puppet
-
-	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 "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	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.7.2.ebuild b/app-admin/puppet/puppet-3.7.2.ebuild
deleted file mode 100644
index 6895b44e9f46..000000000000
--- a/app-admin/puppet/puppet-3.7.2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.7.2.ebuild,v 1.3 2015/04/16 17:54:50 prometheanfire Exp $
-
-EAPI="5"
-
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
-	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
-	dev-ruby/json
-	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"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# Avoid Rails specs to avoid this dependency and because they
-	# currently fail against Rails 4.1.
-	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
-	rm -r spec/unit/rails || die
-	rm spec/unit/parser/collector_spec.rb || die
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-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() {
-	each_fakegem_install
-	#${RUBY} install.rb --destdir="${D}" install || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	#systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	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
-		insinto /usr/lib/systemd/system
-		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
-		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
-		fperms 0750 /var/lib/puppet
-	fi
-	fperms 0750 /etc/puppet
-	fowners :puppet /etc/puppet
-
-	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 "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	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-4.0.0.ebuild b/app-admin/puppet/puppet-4.0.0-r1.ebuild
index d086b9b49808..fb0453c0f935 100644
--- a/app-admin/puppet/puppet-4.0.0.ebuild
+++ b/app-admin/puppet/puppet-4.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.0.0.ebuild,v 1.1 2015/04/16 17:54:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.0.0-r1.ebuild,v 1.1 2015/04/28 20:02:57 prometheanfire Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs"
 
 ruby_add_rdepend "
 	dev-ruby/hiera
@@ -94,34 +94,25 @@ 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
-		insinto /usr/lib/systemd/system
-		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
-		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
-		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
+	newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
 
-		insinto /etc/puppet
+	keepdir /etc/puppetlabs/puppet/modules
+	keepdir /etc/puppetlabs/puppet/manifests
 
-		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
+	fperms 0750 /var/lib/puppet
 
-		keepdir /var/lib/puppet/ssl
-		keepdir /var/lib/puppet/facts
-		keepdir /var/lib/puppet/files
-		fowners -R puppet:puppet /var/lib/puppet
-		fperms 0750 /var/lib/puppet
-	fi
-	fperms 0750 /etc/puppet
-	fowners :puppet /etc/puppet
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/modules
+	fperms 0750 /etc/puppetlabs/puppet/manifests
+	fowners -R :puppet /etc/puppetlabs
 
 	if use emacs ; then
 		elisp-install ${PN} ext/emacs/puppet-mode.el*
@@ -171,6 +162,12 @@ pkg_postinst() {
 		elog "http://docs.puppetlabs.com/guides/upgrading.html"
 		elog
 	fi
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
+		elog
+		elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
+		elog "/etc/puppetlabs/puppet"
+		elog
+	fi
 
 	use emacs && elisp-site-regen
 	use xemacs && xemacs-elisp-site-regen