Fixed pidfile issue, bug #330269. Fixed doc and test handling, bug #329305.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

8 files changed, 72 insertions, 222 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 343ea5fb6197..f23bf022a7b8 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.64 2010/07/23 11:44:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.65 2010/08/01 01:12:11 matsuu Exp $
+
+*puppet-2.6.0-r1 (01 Aug 2010)
+
+  01 Aug 2010; MATSUU Takuto <matsuu@gentoo.org>
+  -files/puppet-0.24.6-eix.patch, -puppet-0.24.8-r1.ebuild,
+  -files/puppet-0.24.8-rc-update-show.patch, -puppet-0.25.3.ebuild,
+  +puppet-2.6.0-r1.ebuild, files/puppet.init, files/puppetmaster.init:
+  Fixed pidfile issue, bug #330269. Fixed doc and test handling, bug
+  #329305. Removed old versions.
 
   23 Jul 2010; Markus Meier <maekke@gentoo.org> puppet-0.25.5.ebuild:
   amd64 stable, bug #325129
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 0606b8c3f834..51ebf978adb4 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -2,30 +2,35 @@
 Hash: SHA1
 
 AUX 50puppet-mode-gentoo.el 217 RMD160 6ab7ace77c4e2da030c894f6b7f1a520e4950311 SHA1 7f6e97e1db4079bc45021360b0ada69c0482c008 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91
-AUX puppet-0.24.6-eix.patch 2228 RMD160 a2465eba3775cacb54d9e20f97efd6cbb3e91627 SHA1 17e828e676d6e8f6abd7b008ca250e69557b2ea9 SHA256 d822a12eaaa6eaf8316fe04fc6c9b654f0427e4d80fb6c5cd15ca2a7368bb754
-AUX puppet-0.24.8-rc-update-show.patch 961 RMD160 2fed961a81b4e5b7659db3c587b17e81ea463bc5 SHA1 832b1a2bd32e6efc0764fa82bf4ef9f705348df3 SHA256 94a32f3d969d00de29564f895426f8c7c9cdbe6b8962d051a4f28b02efa17449
 AUX puppet-0.25.4-r1-rrd.patch 7033 RMD160 49e5530e97a59428ec173f922d3772312806d954 SHA1 5497fe7abe4b0d9e56a48d48d49c7b1fd5741274 SHA256 c0dd90de8f01fdb2cc9a80d5ccf60a5fd386a5c890bfd9e4b9d36af735e86ff1
 AUX puppet-0.25.init 923 RMD160 2133414233baee5f12542618747a6ccc278e8df9 SHA1 a009d9d266a49ca8065dec62cb7828a5ae550a48 SHA256 e60dfe6639ef591b4e9795499b7abe872a4069212e8beac72a2b1e6541ca98df
-AUX puppet.init 922 RMD160 428dca973054f771b829bc24781b75ba5ccf3ef1 SHA1 bea4c5e97c2749be6874516beb71f501d3fbb1d3 SHA256 c355dfb24bb73ff21a750a73513518620cde2c63f0969074d81c60bb4e315425
+AUX puppet.init 916 RMD160 6fc57ee6e0daab1fdc23660deac947174f2e9da9 SHA1 00042571d62182afd22924447966600e961d9135 SHA256 edad76953e36dab793010955cb4775242271c3e4a22a193ecf1ade4f0716d2bf
 AUX puppetmaster-0.25.init 1006 RMD160 9b1878992fc0380cbacf7c1eada2e6a283749a26 SHA1 3dfa2be66706183518a03b7a7a52da66d4934d45 SHA256 6a2acb189cfe4541348fd16c4e48e6a2fd97f59cd36f314c32d9c7fd3fb00d2c
 AUX puppetmaster.confd 279 RMD160 64824fc2c88d9069b25d0548fac5981f1ff4fa6b SHA1 d521616310e7a27986c27138bd4d4382238d609a SHA256 6db68d9e093d3d231c8ad35968e8d276f68cdd7aec8577b3f7ac2998d1f91692
-AUX puppetmaster.init 1005 RMD160 eca4418abb7b6de674e7580f949b27f73b3c9b59 SHA1 3efa92e55e7f1df55d384b59b36704f6a0ee42d8 SHA256 c3a658b778d89084fa8a21b477c7caf77f59e82bb1bef8c8086afed533da5a3a
-DIST puppet-0.24.8.tgz 1099188 RMD160 edb187da9225c9faee9839a5d644b5c9c91f3d5f SHA1 a871aef6f3e8e060f5109bb022967066e32875be SHA256 9e9dcfdd26f96e0b0b4ca9bcfe6f473c679ff082a0cd7226c2058ae652d4fdc8
-DIST puppet-0.25.3.tar.gz 1424590 RMD160 2c313e798f2f9e6db947ff5efd857af70d102581 SHA1 33cfbf9aa8d42191b06592b071a124001c7adbd7 SHA256 a187019264c2b2d1cad6e103765f616f6e0afa7cc3fbad37fec318ab00e859fe
+AUX puppetmaster.init 984 RMD160 0f64b00f6b67fd4a7df0ed765fae096d7708abe0 SHA1 73c53119ac29591f1119637eb8818225bc32b95f SHA256 62f0abb0a386620be83586adaf34c1baff4719618d08495a7cbadaa21cc2d101
 DIST puppet-0.25.4.tar.gz 1424240 RMD160 67610414d6e5c41e9541eb7f392f391b94f1802e SHA1 290dcc20eb670b5b8e26d50301430e1333a037ab SHA256 c2dd640a31d1e57ad09929001f90247cd83908485f1f737abca352eb1866fbf3
 DIST puppet-0.25.5.tar.gz 1446756 RMD160 c9b934ef9135c5b0d5abe9b97a2491e52145abb7 SHA1 5d77345c35926efb57fedbb8fe97d9ad717701c8 SHA256 88038160a4a91790475012df10396e6292dcf39c0402ac42edf89f755fb9b105
 DIST puppet-2.6.0.gem 1482240 RMD160 4c4683ed5ec6647e766eb69d4df9cc89751bc56a SHA1 ae11e51c55433f006bd5a9bcbf0ec0a1308d71c3 SHA256 f186a08246d0ababbb99dda768dac9f986e397f455e646b125b69f452743564e
-EBUILD puppet-0.24.8-r1.ebuild 3628 RMD160 0899d628f3bf08b6db4a386680902d236a48f956 SHA1 fd01ce2d33e9055e706ff4665e9d3d41be98a05b SHA256 09d71b16ce2506306b7a22bcd8f258a5e92772bd4c713108d473ac49d96961e9
-EBUILD puppet-0.25.3.ebuild 3445 RMD160 d42c699e3dbaf5dddc268d51723f59223be76be4 SHA1 37e8cc242fd306afc0618575e5efe89ebc0e1076 SHA256 74614106c4dc2617f063c816c020567ea9e4007dd435e31371424a0ab10f95ca
 EBUILD puppet-0.25.4-r1.ebuild 3477 RMD160 bcf39391589e8fecf93dfb75a3d2b7445b6d7e7c SHA1 192038e8193a70a401021e5f0e911ae8d0d0b0d6 SHA256 cc49a02852b9f114a765a772469a06cebbd6b16c65f35f61a4711a16e224460f
 EBUILD puppet-0.25.5.ebuild 3472 RMD160 c7dc0bff141ea4c5d4fc17c0637fb1241f3a9dd9 SHA1 42d76995806a8e44451a1fa26b68a1ee4aa9c7a1 SHA256 b75cc10f22ed4b7250f6515da018b5de4a2d15b351a41b7b1779a9d56360eee7
+EBUILD puppet-2.6.0-r1.ebuild 3765 RMD160 40f6ce3b9ac71e5622dfe419dc06ea114870b6b7 SHA1 c567bbcdd32595f3d4e22e2152c0f2926864863a SHA256 e6e546645b91cfa490089159cbf25bbc67dd8898ababc6e24d9cba73b8c125d8
 EBUILD puppet-2.6.0.ebuild 3646 RMD160 efd987dc1fbfbff13fcfed5f94723cb3bd80948d SHA1 050eeb1ef5da5e0d47511e891033d45118c770f8 SHA256 29e6395c9478612ce4323588714f4f5490dfc7552fc2403133d20d11a1034bde
-MISC ChangeLog 11395 RMD160 a5a79f7ce300e95ca05026b2b4d781c83480871f SHA1 a60a95d38f6f1dfbe1da5f05172fa3bc20d8dc5a SHA256 91bcfdce5b8cb2158678e6384067076dc03446af27b20f2d9df5d7ee584faa01
+MISC ChangeLog 11778 RMD160 806c243a71ad7c1af6fb563ced4c32843e2f7009 SHA1 0aaa336e26e7b4f6c46a502c9fb8648a65212a47 SHA256 bb70c8b63a84bbb4fe62bd2b58a9a8ce0634375cf776c084c1577f60580f5b5f
 MISC metadata.xml 1104 RMD160 ad88e28f2133835ffd72b6e4621bd3e5d61ed4ff SHA1 aa694fb688719a7a1fa327bbc5f40c7326daee0c SHA256 24012dce9971f449f7b4bad4402b7d229a5bb4fb073ce363ecb2b01f21c4acd2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxJgLAACgkQkKaRLQcq0GJOFACfWI+OaRMOsKNKl79qzhPGIirM
-KTEAn2OP7EVnZuckvlKc2j/KtN9c6PCd
-=fTtG
+iQIcBAEBAgAGBQJMVMn3AAoJECaGw+YFKA1p+vEP/30UzoKVF77nqOVPF3zjDUyQ
+TpaUoYwWFp9/j8yE6eVHiLadkB7j25TZqBSg+HorNbKVnvMFocYV3QWYKNlNatW6
+ZUFHujnV18+xkkk9wlK32B815ZbwxizyJvKY7qjDhXvr4ChL28IjJanXNUkonBG2
+I8DkO2r//X8G8i04Pa0X6oq4BAx5yIt5Bxa/pubxL08cX+tdgmS6dcj21fMbO9iC
+ASWfgLqBf5vP49jx9kbq/xbBLWRKvIV4I7CDoq1uuxM9QznSIX9HGXvNz3WWhQE4
+BkRNJXDtAql7BVHOXPl7CwFvxSywXXhLkjNaxqpuW1Dge34nDKnU0PiakekpLUHx
+uY6U0DA/aIffNq7DEs/e1uuaB9dJDw5hU4Mr0iUkLcxm0KvSxnJX6ZS8hjFo9Xv+
+fZvfFPRvkJ1Pe/jrfTfMZ7IJPRUhjWGD5vxV6AdDAq3JqwAshGVv5avUUCnCZZaC
+RLq4mS0s8X93rbIwq1zwPgFTfCwGuqjn/VDlVUIBdqGGNEDf3MQhZ/GGQpxGWe+f
+wAdrVUmhp2t8t3cggmVA1GWK2suHBjpuwSCRiL0IC4hS1PlSVsYi2pfuuffUpwVz
+Cf7gzNEUihARgPBpvqKoWf6//+XOErvec9K/p+QSY3w3Cm7ipHudiX5k98TnQiGs
+yyVHO6Mq3eqOovH+5FWV
+=EK3I
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/files/puppet-0.24.6-eix.patch b/app-admin/puppet/files/puppet-0.24.6-eix.patch
deleted file mode 100644
index dcdc596e4152..000000000000
--- a/app-admin/puppet/files/puppet-0.24.6-eix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
-index ae7194f..5855441 100644
---- a/lib/puppet/provider/package/portage.rb
-+++ b/lib/puppet/provider/package/portage.rb
-@@ -12,7 +12,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
-     defaultfor :operatingsystem => :gentoo
- 
-     def self.instances
--        result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
-+        result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*-]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:\+[ilvs]|![fmpbstuid])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
-         result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
- 
-         search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}"
-@@ -69,7 +69,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
-     end
- 
-     def query
--        result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
-+        result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*-]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:\+[ilvs]|![fmpbstuid])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
-         result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
- 
-         search_field = package_name.count('/') > 0 ? "--category-name" : "--name"
diff --git a/app-admin/puppet/files/puppet-0.24.8-rc-update-show.patch b/app-admin/puppet/files/puppet-0.24.8-rc-update-show.patch
deleted file mode 100644
index d65a474e4e27..000000000000
--- a/app-admin/puppet/files/puppet-0.24.8-rc-update-show.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f888ceeeaf880e005d61387d01e7203f346c6974 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Benedikt=20B=C3=B6hm?= <bb@xnull.de>
-Date: Sun, 19 Apr 2009 13:17:47 +0200
-Subject: [PATCH] identify services with ambiguous suffixes correctly
-
----
- lib/puppet/provider/service/gentoo.rb |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/puppet/provider/service/gentoo.rb b/lib/puppet/provider/service/gentoo.rb
-index d62df1a..4d59d51 100644
---- a/lib/puppet/provider/service/gentoo.rb
-+++ b/lib/puppet/provider/service/gentoo.rb
-@@ -38,7 +38,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
-         return :false unless line
- 
-         # If it's enabled then it will print output showing service | runlevel
--        if output =~ /#{@resource[:name]}\s*\|\s*(boot|default)/
-+        if output =~ /^\s*#{@resource[:name]}\s*\|\s*(boot|default)/
-             return :true
-         else
-             return :false
--- 
-1.6.0.6
-
diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init
index 9aeebfd39595..5f15aeaa021e 100755
--- a/app-admin/puppet/files/puppet.init
+++ b/app-admin/puppet/files/puppet.init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -24,7 +24,7 @@ start() {
 
 	ebegin "Starting puppet"
 	start-stop-daemon --start --quiet \
-		--pidfile "${PUPPET_PID_DIR}/puppetd.pid" \
+		--pidfile "${PUPPET_PID_DIR}/agent.pid" \
 		--exec /usr/bin/puppetd -- ${options}
 	eend $? "Failed to start puppet"
 }
@@ -32,9 +32,9 @@ start() {
 stop() {
 	ebegin "Stopping puppet"
 	start-stop-daemon --stop --quiet \
-		--pidfile "${PUPPET_PID_DIR}/puppetd.pid"
+		--pidfile "${PUPPET_PID_DIR}/agent.pid"
 	local ret=$?
 	eend ${ret} "Failed to stop puppet"
-	rm -f "${PUPPET_PID_DIR}/puppetd.pid"
+	rm -f "${PUPPET_PID_DIR}/agent.pid"
 	return ${ret}
 }
diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init
index 56fcb1dca711..ba65c2113cad 100755
--- a/app-admin/puppet/files/puppetmaster.init
+++ b/app-admin/puppet/files/puppetmaster.init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -24,7 +24,7 @@ start() {
 
 	ebegin "Starting puppetmaster"
 	start-stop-daemon --start --quiet \
-		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid" \
+		--pidfile "${PUPPETMASTER_PID_DIR}/master.pid" \
 		--exec /usr/bin/puppetmasterd -- ${options}
 	eend $? "Failed to start puppetmaster"
 }
@@ -32,9 +32,9 @@ start() {
 stop() {
 	ebegin "Stopping puppetmaster"
 	start-stop-daemon --stop --quiet \
-		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
+		--pidfile "${PUPPETMASTER_PID_DIR}/master.pid"
 	local ret=$?
 	eend ${ret} "Failed to stop puppetmaster"
-	rm -f "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
+	rm -f "${PUPPETMASTER_PID_DIR}/master.pid"
 	return ${ret}
 }
diff --git a/app-admin/puppet/puppet-0.24.8-r1.ebuild b/app-admin/puppet/puppet-0.24.8-r1.ebuild
deleted file mode 100644
index 65b8788540fe..000000000000
--- a/app-admin/puppet/puppet-0.24.8-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.8-r1.ebuild,v 1.7 2009/11/16 20:18:49 hollow Exp $
-
-EAPI="2"
-inherit elisp-common eutils ruby
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://reductivelabs.com/projects/puppet"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="augeas emacs ldap rrdtool shadow vim-syntax"
-KEYWORDS="amd64 ppc sparc x86"
-
-DEPEND="dev-lang/ruby[ssl]
-	emacs? ( virtual/emacs )
-	>=dev-ruby/facter-1.5.0"
-RDEPEND="${DEPEND}
-	>=app-portage/eix-0.9.4
-	<app-portage/eix-0.18
-	augeas? ( dev-ruby/ruby-augeas )
-	ldap? ( dev-ruby/ruby-ldap )
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	shadow? ( dev-ruby/ruby-shadow )"
-#	|| (
-#		www-servers/webrick
-#		www-servers/mongrel
-#	)
-#	dev-ruby/diff-lcs
-#	dev-ruby/rails
-
-USE_RUBY="ruby18"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.24.6-eix.patch"
-	epatch "${FILESDIR}/${PN}-0.24.8-rc-update-show.patch"
-}
-
-src_compile() {
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	DESTDIR="${D}" ruby_einstall "$@" || die
-	DESTDIR="${D}" erubydoc
-
-	#
-	# bug #237071
-	#
-	#doinitd conf/gentoo/init.d/puppetmaster
-	newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
-	#doconfd conf/gentoo/conf.d/puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-	#doinitd conf/gentoo/init.d/puppet
-	newinitd "${FILESDIR}"/puppet.init puppet
-	doconfd conf/gentoo/conf.d/puppet
-
-	# Initial configuration files
-	keepdir /etc/puppet/manifests
-	insinto /etc/puppet
-	doins conf/gentoo/puppet/*
-
-	# Location of log and data files
-	keepdir /var/run/puppet
-	keepdir /var/log/puppet
-	keepdir /var/lib/puppet/ssl
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/{run,log,lib}/puppet
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
-		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/syntax; doins ext/vim/syntax/puppet.vim
-		insinto /usr/share/vim/vimfiles/ftdetect; doins	ext/vim/ftdetect/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 "${ROOT}/etc/puppet/puppetd.conf" -o \
-		-f "${ROOT}/etc/puppet/puppetmaster.conf" -o \
-		-f "${ROOT}/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
-}
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-0.25.3.ebuild b/app-admin/puppet/puppet-2.6.0-r1.ebuild
index ea7ae5faabf6..a62a438ef329 100644
--- a/app-admin/puppet/puppet-0.25.3.ebuild
+++ b/app-admin/puppet/puppet-2.6.0-r1.ebuild
@@ -1,32 +1,42 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.25.3.ebuild,v 1.2 2010/03/02 10:42:59 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.0-r1.ebuild,v 1.1 2010/08/01 01:12:12 matsuu Exp $
 
 EAPI="2"
-inherit elisp-common eutils ruby
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="unit"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
+
+inherit elisp-common eutils ruby-fakegem
 
-MY_P="${P/_}"
 DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://reductivelabs.com/projects/puppet"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://puppetlabs.com/"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="augeas emacs ldap rrdtool shadow vim-syntax"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+RESTRICT="test"
+
+ruby_add_rdepend ">=dev-ruby/facter-1.5.1"
+ruby_add_rdepend augeas dev-ruby/ruby-augeas
+ruby_add_rdepend ldap dev-ruby/ruby-ldap
+#ruby_add_rdepend rrdtool ">=net-analyzer/rrdtool-1.2.23[ruby]"
+ruby_add_rdepend shadow dev-ruby/ruby-shadow
 
-DEPEND="dev-lang/ruby[ssl]
+DEPEND="${DEPEND}
+	emacs? ( virtual/emacs )"
+RDEPEND="${RDEPEND}
 	emacs? ( virtual/emacs )
-	>=dev-ruby/facter-1.5.0"
-RDEPEND="${DEPEND}
-	>=app-portage/eix-0.18.0
-	augeas? ( dev-ruby/ruby-augeas )
-	ldap? ( dev-ruby/ruby-ldap )
 	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	shadow? ( dev-ruby/ruby-shadow )"
+	>=app-portage/eix-0.18.0"
 
-S="${WORKDIR}/${MY_P}"
-USE_RUBY="ruby18"
+for _ruby in ${USE_RUBY}; do
+	DEPEND="${DEPEND} ruby_targets_${_ruby}? ( $(ruby_implementation_depend $_ruby)[ssl] )"
+done
 
 SITEFILE="50${PN}-mode-gentoo.el"
 
@@ -35,19 +45,24 @@ pkg_setup() {
 	enewuser puppet -1 -1 /var/lib/puppet puppet
 }
 
-src_compile() {
+all_ruby_compile() {
+	all_fakegem_compile
+
 	if use emacs ; then
 		elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
 	fi
 }
 
-src_install() {
-	DESTDIR="${D}" ruby_einstall "$@" || die
-	DESTDIR="${D}" erubydoc || die
+each_fakegem_install() {
+	${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
 
-	newinitd "${FILESDIR}"/puppetmaster-0.25.init puppetmaster || die
+	newinitd "${FILESDIR}"/puppetmaster.init puppetmaster || die
 	doconfd conf/gentoo/conf.d/puppetmaster || die
-	newinitd "${FILESDIR}"/puppet-0.25.init puppet || die
+	newinitd "${FILESDIR}"/puppet.init puppet || die
 	doconfd conf/gentoo/conf.d/puppet || die
 
 	# Initial configuration files