Cleanup due #22900

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

7 files changed, 20 insertions, 724 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 7eeb19a8eb79..f8426f6f111f 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,11 @@
 # 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.135 2012/12/31 16:16:32 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.136 2013/02/03 12:01:03 pacho Exp $
+
+  03 Feb 2013; Pacho Ramos <pacho@gentoo.org> -puppet-2.7.11.ebuild,
+  -puppet-2.7.12.ebuild, -puppet-2.7.13.ebuild, -puppet-2.7.18-r1.ebuild,
+  metadata.xml:
+  Cleanup due #22900
 
   31 Dec 2012; Agostino Sarubbo <ago@gentoo.org> puppet-3.0.1.ebuild:
   Add ~ppc, wrt bug #449184
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index f0569108e2b6..bdc47f3af69d 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.init 916 SHA256 edad76953e36dab793010955cb4775242271c3e4a22a193ecf1ade4f0716d2bf SHA512 1528e2c9f8d145663f9dab37a5928049ae1063570048f372ceeec3892b3b9e30aa84849056d7799a4a6d292c8227f8132142e115d6019f64050f4989e6584df8 WHIRLPOOL 6295f9eceda2ad94c5e5c9beee5a7549b043c646e8884c01375ec089805a40b037a533a8ce4c04c8f9ccbab0688ac75adceda14e528854ebfcf2d3462e26757c
@@ -6,18 +9,18 @@ AUX puppetmaster-2.7.6.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7ea
 AUX puppetmaster-2.7.6.init 867 SHA256 3fc62b4850ccd38517d9617671bef2a5d804147383744638de67c6f2289de28c SHA512 0b40c12458fcd15458c243f34d95d2c5d58b43d5f3ee4f215f44a47f73fcd60604cb7c9ca3e71f884ca4b6a23755b7d76a143641192d5959ca0eef9a8e59d4f4 WHIRLPOOL 3f4bdb3a10cbec6933ff88db0bfa3f01a5694faf4de7952f3b39372df00b5c8f96bd534bf53e07f42c791750909711c304541eb26df2691bda701259d6cc8e48
 AUX puppetmaster.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d WHIRLPOOL d0d14ac957978d59ee6b57b53d8d2e4f00a78ac2fc9d5c279457e326fcd08c30c3ad0f884f05580a4e80a00ba02af7496469eed96a91245b2bf3141494c56058
 AUX puppetmaster.init 900 SHA256 603fcd104aeed9b2f3d8e6915f3117c955dcf7f6d242a1a93e0250ab3e4be938 SHA512 d3c2125d1ff183bf0164f785790047f8e535dd6d5c03da459c5df9994624d82a327c6c453e5a793a07d232129c77153c2c5ab80d9f9e364bddbef79f2d326f4f WHIRLPOOL 260050dddb654859a9d9b2b70f800fb7de71c5ef2afd6d78b5a870199b97eca8b01761d2b1d5ad73217b2acd5c448e0e66e9de6faa835465add82749d3724047
-DIST puppet-2.7.11.gem 1846272 SHA256 d58c0ad7ee05364d3431fefd2894690eed3364362d759b0b2627c44f71c955d6 SHA512 a04b09399746c22dc820393aa1ba0c62fcf52d6a9ccc81f0f60f6079eba0cec1cf97d1d848eddd19ac58e5a68f4e6fd61aff7a035ba227e69e08bbd0c0cc0ac0 WHIRLPOOL a69811a1d95406789e611c82f881069358c9d49145371286907957844bc167e72b1f736493f81beea50b88fcde0d7c1807ac32cec6736e5fecfe29aa23ef4cd8
-DIST puppet-2.7.12.gem 1876480 SHA256 2c96c6cba32b1b413faee8a0d96b1f33be08aca99d165ea689f06a7dc1a2bc1f SHA512 bb56fc099c6cb1db93b74c346077775f44807283b34cef4b61dab4511395beeaf516f034b55b379e4618331431512a4535d44717f668e2e64f402c07a6e57927 WHIRLPOOL fed5d8e56f1b962ce270e651ab1030933c1068d8c6386da05755bbd9907ec30317d6f799bd12e598606212a14c6a509605e88d5b02517ceb6fff3c76af3f87d4
-DIST puppet-2.7.13.gem 1876992 SHA256 1e91ee9eed15d2ca4aba691299d1bde61de310cbcee0f1a557f9d47ffd2e0bd8 SHA512 d780985bb143da3361b64cecef6f7ab45ce23e221d2aaa4523dae2076cc6039ddd01293359054d6dcf9c60cd7d904d7edf190a724e11fb449fc25ebd3c586859 WHIRLPOOL 351c0ade55534f4773c282f324753e475ba416c135727e2bb51f14b145fb037a03a9f885f78be2792e316046c997ee0e4e2f507172079791d868b699e0c52ec5
 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 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 4267 SHA256 0a8747247037b39246bc6cb04dd3967f88496c14eef1dc75881851ea6408063a SHA512 96b62727e98d295e26c064514fa36bdf23233d43216749d018bc6c89a2a959b297a927ba4c3aff0c6a7622fffade68d48f965304edcc1a7ffd984294d3354e88 WHIRLPOOL a49af3290c4c6f15b05afced34d62db05be816c4172e6683ebf60d8ced68e5e0e94d0a487d2be064a9ef3f155f560595bae21c8a04b7ad57eb05f325a5e72151
-MISC ChangeLog 22206 SHA256 93c7991af791ceb4ca79a94e807ccbeb2eb3b69d2d911e7d116e3d1aa3ddd740 SHA512 ace7e8e46092a82177ff782de3d258aeee3c127c9fea43215e4eb34ccb217cde44c07ec5cb59920075eda01d63bbbc52b41da1e434f36ee54442ed183d3d50bc WHIRLPOOL 92852702c6bf74cbd511a7afde2b566949601d2e10b2b50be4cf653bb4917045418810f5f87a026fc4b1671b8e4d00b97ba337ca5e18ff6211ae4a5741cfde2b
-MISC metadata.xml 1171 SHA256 6ab490dd6057a5e66df92b959cbdc20292a6db3966512af8e26a57672f5331e2 SHA512 a9993f649770c28bc2e09d1e779ad31a89ed280ec2168d3f489a13a7b756f77f8fac92f0139d534182a2f97bc74a4772a5ec75f8aaf27e41fa6b3accb97a0be7 WHIRLPOOL 7a0b45535327479cc77d8310658aba051dbba53bd3a4729990e18c2da138424a383bd4688a16e83b972d2646861b7d37328434f3deeafddeb314a5a806798f0d
+MISC ChangeLog 22389 SHA256 4b3809c3b2a4c24da28334873800b41bbbfbbdf34ba2f096b442d6b0f3724e8a SHA512 2c3561d9ac0103ef2d710ebaa65fb7ab629d2aab765c9aefabcd9ba7c419c4bac79c6078a0f26c485a1105170964a7dd6538b61569cdc06358e6c2c4a72ac0f7 WHIRLPOOL 953854f7b2a14684b075b18a1264bf98c720dcfd99b16afda186735fd51cb94428bc97c7159501c9433512006cb915b22f9b8da01379c6084178d194912bb399
+MISC metadata.xml 1181 SHA256 3567775a4f9246059b647223f2d88240cc67764b69b1a828042079d4f3253eb4 SHA512 1222be0622442d3c5716d86a1fe18f57f1f9ca503e727879e69899b85ed897198bee123dfecdb827324eabec04910992952c50a0d7a80f388547e76e74d5f88d WHIRLPOOL 4bf59b4ca5c141d2ef3fbfca9dc492645ada5f1a4134830d70a3480d2004b8fb661ecbe528e195a4d34e816c569e70ba972854aa09121a2fdb0babd7ff8bd682
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEOUYEACgkQCaWpQKGI+9SfhgCdFm/TMPAq65+8g5tjcUX9PzAa
+cvgAn04bLW0ilFDpJcZah6+1JXI5ElVs
+=0e0D
+-----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml
index 580588af5e75..ffb433275ed2 100644
--- a/app-admin/puppet/metadata.xml
+++ b/app-admin/puppet/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>matsuu@gentoo.org</email>
+	<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<herd>sysadmin</herd>
 	<herd>ruby</herd>
diff --git a/app-admin/puppet/puppet-2.7.11.ebuild b/app-admin/puppet/puppet-2.7.11.ebuild
deleted file mode 100644
index 8a86e41e2a42..000000000000
--- a/app-admin/puppet/puppet-2.7.11.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# 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.10 2012/11/06 22:55:56 tampakrap Exp $
-
-EAPI="4"
-# ruby19: dev-ruby/ruby-ldap has no ruby19
-USE_RUBY="ruby18"
-
-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/"
-
-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}
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )
-	selinux? ( sec-policy/selinux-puppet )"
-RDEPEND="${RDEPEND}
-	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"
-
-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 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-2.7.6.init puppetmaster
-		newconfd "${FILESDIR}"/puppetmaster-2.7.6.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.12.ebuild b/app-admin/puppet/puppet-2.7.12.ebuild
deleted file mode 100644
index 47ce5df3f8db..000000000000
--- a/app-admin/puppet/puppet-2.7.12.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# 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.6 2012/11/06 22:55:56 tampakrap Exp $
-
-EAPI="4"
-# ruby19: dev-ruby/ruby-ldap has no ruby19
-USE_RUBY="ruby18 ruby19 ree18"
-
-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/"
-
-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}
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )
-	selinux? ( sec-policy/selinux-puppet )"
-RDEPEND="${RDEPEND}
-	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"
-
-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 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-2.7.6.init puppetmaster
-		newconfd "${FILESDIR}"/puppetmaster-2.7.6.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.13.ebuild b/app-admin/puppet/puppet-2.7.13.ebuild
deleted file mode 100644
index 70ac2dc68813..000000000000
--- a/app-admin/puppet/puppet-2.7.13.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# 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.12 2012/11/06 22:55:56 tampakrap Exp $
-
-EAPI="4"
-# ruby19: dev-ruby/ruby-ldap has no ruby19
-#USE_RUBY="ruby18 ruby19 ree18"
-USE_RUBY="ruby18"
-
-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/"
-
-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}
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )
-	selinux? ( sec-policy/selinux-puppet )"
-RDEPEND="${RDEPEND}
-	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"
-
-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 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-2.7.6.init puppetmaster
-		newconfd "${FILESDIR}"/puppetmaster-2.7.6.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.18-r1.ebuild b/app-admin/puppet/puppet-2.7.18-r1.ebuild
deleted file mode 100644
index c54d208ee67c..000000000000
--- a/app-admin/puppet/puppet-2.7.18-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# 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.18-r1.ebuild,v 1.2 2012/11/06 10:04:44 graaff 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/"
-
-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}
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )
-	selinux? ( sec-policy/selinux-puppet )"
-RDEPEND="${RDEPEND}
-	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=(
-	"${P}-eix_fix.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 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-2.7.6.init puppetmaster
-		newconfd "${FILESDIR}"/puppetmaster-2.7.6.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
-}