Version bumped.

Package-Manager: portage-2.1.3.19

11 files changed, 284 insertions, 233 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 90ea29ea1db4..a25bad81639c 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/puppet
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.8 2007/12/08 00:39:30 matsuu Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.9 2008/01/07 14:46:41 matsuu Exp $
+
+*puppet-0.24.1 (07 Jan 2008)
+
+  07 Jan 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/puppet-0.24.1-gentoo.patch, -puppet-0.22.4-r1.ebuild,
+  -puppet-0.23.0-r1.ebuild, -puppet-0.23.2.ebuild, +puppet-0.24.1.ebuild:
+  Version bumped.
+  Removed old versions.
 
 *puppet-0.23.2-r1 (08 Dec 2007)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 796b0b5d4429..2e987ecb2584 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,42 +6,31 @@ AUX puppet-0.23.2-gentoo.patch 7957 RMD160 cecf241522ad4400a942762e327496f0f8834
 MD5 5b7207e6d3ae4e668c9e1b725b8ebe57 files/puppet-0.23.2-gentoo.patch 7957
 RMD160 cecf241522ad4400a942762e327496f0f8834a7f files/puppet-0.23.2-gentoo.patch 7957
 SHA256 4449467bd7b145bc42a019609c36afdfc8b1f6f35c60f59191d01475be165575 files/puppet-0.23.2-gentoo.patch 7957
-DIST puppet-0.22.4.tgz 642077 RMD160 c836292dc112e52d32bfdcd68d74799135e9c2e9 SHA1 afc6e64dcbfab251dd433c6e0de5015cbe0a37ec SHA256 7b26b50711c89ca1e1c12967a363c6f0bc6c04ddcd741358f74c107d04352042
-DIST puppet-0.23.0.tgz 670293 RMD160 7f8cb3152f9fe8587b3fc8a09710dbcbfbb3a001 SHA1 6b1d813877c3e105dea35a045d276520baf91623 SHA256 cd6959815e08ebc5e24cc49acefa4d4c5f4b277a0e75498d0ec48a4229c8ee4a
+AUX puppet-0.24.1-gentoo.patch 5898 RMD160 ad378ccb4e99f488b1a0b0a2e5f240b85fe577f3 SHA1 32abbc5b3fa07ba10a217623f12f13b3531ecff5 SHA256 0dd2837574e9007c3cf8900f94d8f3a8550dab94d13209077c2fe9729c9d3c67
+MD5 2ce1cb4e71e485c9ff8a42e479daf53a files/puppet-0.24.1-gentoo.patch 5898
+RMD160 ad378ccb4e99f488b1a0b0a2e5f240b85fe577f3 files/puppet-0.24.1-gentoo.patch 5898
+SHA256 0dd2837574e9007c3cf8900f94d8f3a8550dab94d13209077c2fe9729c9d3c67 files/puppet-0.24.1-gentoo.patch 5898
 DIST puppet-0.23.2.tgz 698593 RMD160 bbc88da5a15ac65c05c103b123680515aadec6b5 SHA1 682e97473a80ebc29ea1c75966b26a1a3e95618d SHA256 eb80e4d4adeb174c2ec5198f73d581f9a77cb07a2cae15114b9b11b13021bfa8
-EBUILD puppet-0.22.4-r1.ebuild 2126 RMD160 e8863db63b828a4f4973b8e1697165357a967c48 SHA1 fbd16bd185581bb8339568216d635b831cc41765 SHA256 5579e27aa463f791538b0436c21052b34873c3a5a52444b42ccdd35519fe66e6
-MD5 342e1fb5484a9e88bbede6385a939304 puppet-0.22.4-r1.ebuild 2126
-RMD160 e8863db63b828a4f4973b8e1697165357a967c48 puppet-0.22.4-r1.ebuild 2126
-SHA256 5579e27aa463f791538b0436c21052b34873c3a5a52444b42ccdd35519fe66e6 puppet-0.22.4-r1.ebuild 2126
-EBUILD puppet-0.23.0-r1.ebuild 2126 RMD160 7745178427933be95ce49acb8cd96b46950024e3 SHA1 0d9eb60a2f1c689ca1106a27ef85527f5e8df66f SHA256 16d790c48ce344b57adaffd86c92bb12025588a588443e7371040d095adab050
-MD5 5567e431500e68f1928172ab7263a39c puppet-0.23.0-r1.ebuild 2126
-RMD160 7745178427933be95ce49acb8cd96b46950024e3 puppet-0.23.0-r1.ebuild 2126
-SHA256 16d790c48ce344b57adaffd86c92bb12025588a588443e7371040d095adab050 puppet-0.23.0-r1.ebuild 2126
+DIST puppet-0.24.1.tgz 678506 RMD160 7d52e6659a1acc4251a8fc4fc5ea37df2961f2c2 SHA1 0f9e128f9dbe3cac3a641017cfeb30c77cb1a208 SHA256 5ed1dc3da91124f3c1e701c9727ee7bb7747e8abcc612bc47c808015a0f3bba6
 EBUILD puppet-0.23.2-r1.ebuild 3082 RMD160 bc582501288f923a3d43bdbe8b07ee4ded92ad9e SHA1 473af40fd990bbf71ec0225e68b4558c971552ec SHA256 63b4f07cd206e2393b87de7d8255fb066140eea1e05f5ccd527eac8a22c2c5e0
 MD5 ff2d8188c1f44c4e15deae879ab7e689 puppet-0.23.2-r1.ebuild 3082
 RMD160 bc582501288f923a3d43bdbe8b07ee4ded92ad9e puppet-0.23.2-r1.ebuild 3082
 SHA256 63b4f07cd206e2393b87de7d8255fb066140eea1e05f5ccd527eac8a22c2c5e0 puppet-0.23.2-r1.ebuild 3082
-EBUILD puppet-0.23.2.ebuild 2123 RMD160 daa8aa65920b3883dc8826c1ca3a2db23e889a44 SHA1 fd3bb8f9e69fadbcd551b1e7b94e1c3e6abb9788 SHA256 142124090c49304c56f96ab5dedc5d2a32c05cd7127ef291c83ca6355d82bced
-MD5 a733ae667108027d6107c9e7961179b4 puppet-0.23.2.ebuild 2123
-RMD160 daa8aa65920b3883dc8826c1ca3a2db23e889a44 puppet-0.23.2.ebuild 2123
-SHA256 142124090c49304c56f96ab5dedc5d2a32c05cd7127ef291c83ca6355d82bced puppet-0.23.2.ebuild 2123
-MISC ChangeLog 1669 RMD160 337eeee980b1db6b0834896d02d58e1cf68d2505 SHA1 fc9c937530ac23bb8418b4e01390da71ef984b98 SHA256 09878f7641a61fbe6b1201318a1722e7221eb18217f32df599ce5ac204e4aa12
-MD5 39188ba2d0f2b9e4fa4b805eb108f85f ChangeLog 1669
-RMD160 337eeee980b1db6b0834896d02d58e1cf68d2505 ChangeLog 1669
-SHA256 09878f7641a61fbe6b1201318a1722e7221eb18217f32df599ce5ac204e4aa12 ChangeLog 1669
+EBUILD puppet-0.24.1.ebuild 3079 RMD160 385daf6b86d81a2c0e34bfc687a97f4136cb4c4b SHA1 13533a39c8caf820b579c270995af182434e4799 SHA256 617adb372a7d70da52373b521ab77a8cace375019f66935400fe4d9240796b6c
+MD5 1597155b1a6356675c8b1ce63e316471 puppet-0.24.1.ebuild 3079
+RMD160 385daf6b86d81a2c0e34bfc687a97f4136cb4c4b puppet-0.24.1.ebuild 3079
+SHA256 617adb372a7d70da52373b521ab77a8cace375019f66935400fe4d9240796b6c puppet-0.24.1.ebuild 3079
+MISC ChangeLog 1928 RMD160 bf9927cea9d59258b550ad0e86a8feb4652b9d16 SHA1 ce54cfb857e5d7ce5e5a4d9e42fb6f3d4860518a SHA256 114f78e4587fc99e9a70e57ed75eaa679ddd610b31fc0ac0373a36583bf2e4d4
+MD5 e528956392d297196dcaf1649654e7b2 ChangeLog 1928
+RMD160 bf9927cea9d59258b550ad0e86a8feb4652b9d16 ChangeLog 1928
+SHA256 114f78e4587fc99e9a70e57ed75eaa679ddd610b31fc0ac0373a36583bf2e4d4 ChangeLog 1928
 MISC metadata.xml 222 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 SHA1 a5d1e2317ae207bbd664aebe986687948fdd984a SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337
 MD5 ae35aecf3e681586ace5f8c15866aed7 metadata.xml 222
 RMD160 23efe87c16ebc9fbeb91e894ab372cc3bb66bc49 metadata.xml 222
 SHA256 38ef3457fd14e6872985f0e100fde79d0b8a9dbc4fc39ceef780c8c5abc5f337 metadata.xml 222
-MD5 44ee770e070e650776b6dd60b5ee38f7 files/digest-puppet-0.22.4-r1 232
-RMD160 da7ee7b9728b02c1438b41e2f4cddcb9268c490c files/digest-puppet-0.22.4-r1 232
-SHA256 291b7f3624b465ed0818063ee5325d2e36705378a8cf4a57df29ed61fa9fbf47 files/digest-puppet-0.22.4-r1 232
-MD5 23433fe16df59f09e423e32b60ca857e files/digest-puppet-0.23.0-r1 232
-RMD160 20af2939354a7f7f6fca8b92070dd4595bc9cc45 files/digest-puppet-0.23.0-r1 232
-SHA256 96f88ca6c85887706c8a69283a370ace42bfeac2ec885407236e3430175480ec files/digest-puppet-0.23.0-r1 232
-MD5 8d3ce2aa236c35931e0d65b3641d3dfd files/digest-puppet-0.23.2 232
-RMD160 641fdfd4bcca5365c1bf8c3148cbef6b6b738e57 files/digest-puppet-0.23.2 232
-SHA256 342704b7fc0d7ee7c4a319c096ffc4f4fc98a590686f9bc7baca444bcfa2d547 files/digest-puppet-0.23.2 232
 MD5 8d3ce2aa236c35931e0d65b3641d3dfd files/digest-puppet-0.23.2-r1 232
 RMD160 641fdfd4bcca5365c1bf8c3148cbef6b6b738e57 files/digest-puppet-0.23.2-r1 232
 SHA256 342704b7fc0d7ee7c4a319c096ffc4f4fc98a590686f9bc7baca444bcfa2d547 files/digest-puppet-0.23.2-r1 232
+MD5 f33c0a2a56f03809f75dd81019a9e890 files/digest-puppet-0.24.1 232
+RMD160 de55e55c03da21ab39601ffa3646679fa5eed63b files/digest-puppet-0.24.1 232
+SHA256 6a03c1936d6292607b273cb013521f3634f60351c856c6a08ae5359de2c9b231 files/digest-puppet-0.24.1 232
diff --git a/app-admin/puppet/files/digest-puppet-0.22.4-r1 b/app-admin/puppet/files/digest-puppet-0.22.4-r1
deleted file mode 100644
index 681135e45b00..000000000000
--- a/app-admin/puppet/files/digest-puppet-0.22.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9bb853104f2616c7f2c8fa4e2f39b537 puppet-0.22.4.tgz 642077
-RMD160 c836292dc112e52d32bfdcd68d74799135e9c2e9 puppet-0.22.4.tgz 642077
-SHA256 7b26b50711c89ca1e1c12967a363c6f0bc6c04ddcd741358f74c107d04352042 puppet-0.22.4.tgz 642077
diff --git a/app-admin/puppet/files/digest-puppet-0.23.0-r1 b/app-admin/puppet/files/digest-puppet-0.23.0-r1
deleted file mode 100644
index 25992bc96a0e..000000000000
--- a/app-admin/puppet/files/digest-puppet-0.23.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c43342d7d24f1fe881ec97b59e7ea02d puppet-0.23.0.tgz 670293
-RMD160 7f8cb3152f9fe8587b3fc8a09710dbcbfbb3a001 puppet-0.23.0.tgz 670293
-SHA256 cd6959815e08ebc5e24cc49acefa4d4c5f4b277a0e75498d0ec48a4229c8ee4a puppet-0.23.0.tgz 670293
diff --git a/app-admin/puppet/files/digest-puppet-0.23.2 b/app-admin/puppet/files/digest-puppet-0.23.2
deleted file mode 100644
index 7334275c7a3d..000000000000
--- a/app-admin/puppet/files/digest-puppet-0.23.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 496373ce2a7affbb639f85bcff38da0b puppet-0.23.2.tgz 698593
-RMD160 bbc88da5a15ac65c05c103b123680515aadec6b5 puppet-0.23.2.tgz 698593
-SHA256 eb80e4d4adeb174c2ec5198f73d581f9a77cb07a2cae15114b9b11b13021bfa8 puppet-0.23.2.tgz 698593
diff --git a/app-admin/puppet/files/digest-puppet-0.24.1 b/app-admin/puppet/files/digest-puppet-0.24.1
new file mode 100644
index 000000000000..01b8de0e4696
--- /dev/null
+++ b/app-admin/puppet/files/digest-puppet-0.24.1
@@ -0,0 +1,3 @@
+MD5 74111be5615714ac980473e8d24b52db puppet-0.24.1.tgz 678506
+RMD160 7d52e6659a1acc4251a8fc4fc5ea37df2961f2c2 puppet-0.24.1.tgz 678506
+SHA256 5ed1dc3da91124f3c1e701c9727ee7bb7747e8abcc612bc47c808015a0f3bba6 puppet-0.24.1.tgz 678506
diff --git a/app-admin/puppet/files/puppet-0.24.1-gentoo.patch b/app-admin/puppet/files/puppet-0.24.1-gentoo.patch
new file mode 100644
index 000000000000..fba9ca2f0d13
--- /dev/null
+++ b/app-admin/puppet/files/puppet-0.24.1-gentoo.patch
@@ -0,0 +1,144 @@
+diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppet.conf puppet-0.24.1/conf/gentoo/puppet/puppet.conf
+--- puppet-0.24.1.orig/conf/gentoo/puppet/puppet.conf	1970-01-01 09:00:00.000000000 +0900
++++ puppet-0.24.1/conf/gentoo/puppet/puppet.conf	2008-01-07 23:24:05.000000000 +0900
+@@ -0,0 +1,29 @@
++[main]
++    # Where Puppet stores dynamic and growing data.
++    # The default value is '/var/puppet'.
++    vardir = /var/lib/puppet
++
++    # The Puppet log directory.
++    # The default value is '$vardir/log'.
++    logdir = /var/log/puppet
++
++    # Where Puppet PID files are kept.
++    # The default value is '$vardir/run'.
++    rundir = /var/run/puppet
++
++    # Where SSL certificates are kept.
++    # The default value is '$confdir/ssl'.
++    ssldir = $vardir/ssl
++
++[puppetd]
++    # The file in which puppetd stores a list of the classes
++    # associated with the retrieved configuratiion.  Can be loaded in
++    # the separate ``puppet`` executable using the ``--loadclasses``
++    # option.
++    # The default value is '$confdir/classes.txt'.
++    classfile = $vardir/classes.txt
++
++    # Where puppetd caches the local configuration.  An
++    # extension indicating the cache format is added automatically.
++    # The default value is '$confdir/localconfig'.
++    localconfig = $vardir/localconfig
+diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppetca.conf puppet-0.24.1/conf/gentoo/puppet/puppetca.conf
+--- puppet-0.24.1.orig/conf/gentoo/puppet/puppetca.conf	2007-11-01 04:44:27.000000000 +0900
++++ puppet-0.24.1/conf/gentoo/puppet/puppetca.conf	1970-01-01 09:00:00.000000000 +0900
+@@ -1,29 +0,0 @@
+-[puppet]
+-    # Where Puppet stores dynamic and growing data.
+-    # The default value is '/var/puppet'.
+-    vardir = /var/lib/puppet
+-
+-    # The Puppet log directory.
+-    # The default value is '$vardir/log'.
+-    logdir = /var/log/puppet
+-
+-    # Where Puppet PID files are kept.
+-    # The default value is '$vardir/run'.
+-    rundir = /var/run/puppet
+-
+-    # Where SSL certificates are kept.
+-    # The default value is '$confdir/ssl'.
+-    ssldir = $vardir/ssl
+-
+-[puppetd]
+-    # The file in which puppetd stores a list of the classes
+-    # associated with the retrieved configuratiion.  Can be loaded in
+-    # the separate ``puppet`` executable using the ``--loadclasses``
+-    # option.
+-    # The default value is '$confdir/classes.txt'.
+-    classfile = $vardir/classes.txt
+-
+-    # Where puppetd caches the local configuration.  An
+-    # extension indicating the cache format is added automatically.
+-    # The default value is '$confdir/localconfig'.
+-    localconfig = $vardir/localconfig
+diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppetd.conf puppet-0.24.1/conf/gentoo/puppet/puppetd.conf
+--- puppet-0.24.1.orig/conf/gentoo/puppet/puppetd.conf	2007-11-01 04:44:27.000000000 +0900
++++ puppet-0.24.1/conf/gentoo/puppet/puppetd.conf	1970-01-01 09:00:00.000000000 +0900
+@@ -1,29 +0,0 @@
+-[puppet]
+-    # Where Puppet stores dynamic and growing data.
+-    # The default value is '/var/puppet'.
+-    vardir = /var/lib/puppet
+-
+-    # The Puppet log directory.
+-    # The default value is '$vardir/log'.
+-    logdir = /var/log/puppet
+-
+-    # Where Puppet PID files are kept.
+-    # The default value is '$vardir/run'.
+-    rundir = /var/run/puppet
+-
+-    # Where SSL certificates are kept.
+-    # The default value is '$confdir/ssl'.
+-    ssldir = $vardir/ssl
+-
+-[puppetd]
+-    # The file in which puppetd stores a list of the classes
+-    # associated with the retrieved configuratiion.  Can be loaded in
+-    # the separate ``puppet`` executable using the ``--loadclasses``
+-    # option.
+-    # The default value is '$confdir/classes.txt'.
+-    classfile = $vardir/classes.txt
+-
+-    # Where puppetd caches the local configuration.  An
+-    # extension indicating the cache format is added automatically.
+-    # The default value is '$confdir/localconfig'.
+-    localconfig = $vardir/localconfig
+diff -Naur puppet-0.24.1.orig/conf/gentoo/puppet/puppetmasterd.conf puppet-0.24.1/conf/gentoo/puppet/puppetmasterd.conf
+--- puppet-0.24.1.orig/conf/gentoo/puppet/puppetmasterd.conf	2007-11-01 04:44:27.000000000 +0900
++++ puppet-0.24.1/conf/gentoo/puppet/puppetmasterd.conf	1970-01-01 09:00:00.000000000 +0900
+@@ -1,29 +0,0 @@
+-[puppet]
+-    # Where Puppet stores dynamic and growing data.
+-    # The default value is '/var/puppet'.
+-    vardir = /var/lib/puppet
+-
+-    # The Puppet log directory.
+-    # The default value is '$vardir/log'.
+-    logdir = /var/log/puppet
+-
+-    # Where Puppet PID files are kept.
+-    # The default value is '$vardir/run'.
+-    rundir = /var/run/puppet
+-
+-    # Where SSL certificates are kept.
+-    # The default value is '$confdir/ssl'.
+-    ssldir = $vardir/ssl
+-
+-[puppetd]
+-    # The file in which puppetd stores a list of the classes
+-    # associated with the retrieved configuratiion.  Can be loaded in
+-    # the separate ``puppet`` executable using the ``--loadclasses``
+-    # option.
+-    # The default value is '$confdir/classes.txt'.
+-    classfile = $vardir/classes.txt
+-
+-    # Where puppetd caches the local configuration.  An
+-    # extension indicating the cache format is added automatically.
+-    # The default value is '$confdir/localconfig'.
+-    localconfig = $vardir/localconfig
+diff -Naur puppet-0.24.1.orig/lib/puppet/provider/service/gentoo.rb puppet-0.24.1/lib/puppet/provider/service/gentoo.rb
+--- puppet-0.24.1.orig/lib/puppet/provider/service/gentoo.rb	2007-11-01 04:44:27.000000000 +0900
++++ puppet-0.24.1/lib/puppet/provider/service/gentoo.rb	2008-01-07 23:24:10.000000000 +0900
+@@ -29,7 +29,7 @@
+         return :false unless line
+ 
+         # If it's enabled then it will print output showing service | runlevel
+-        if output =~ /#{@resource[:name]}\s*|\s*default/
++        if output =~ /#{@resource[:name]}\s*\|\s*default/
+             return :true
+         else
+             return :false
diff --git a/app-admin/puppet/puppet-0.22.4-r1.ebuild b/app-admin/puppet/puppet-0.22.4-r1.ebuild
deleted file mode 100644
index 393e71eba7ab..000000000000
--- a/app-admin/puppet/puppet-0.22.4-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.22.4-r1.ebuild,v 1.1 2007/08/06 17:48:41 nakano Exp $
-
-inherit eutils ruby
-
-DESCRIPTION="A system automation and configuration management software"
-LICENSE="GPL-2"
-HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
-RDEPEND=">=dev-ruby/facter-1.3.5 >=app-portage/eix-0.9.4"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-
-USE_RUBY="ruby18"
-
-pkg_setup() {
-	built_with_use virtual/ruby ipv6 || \
-		die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run"
-
-	enewgroup puppet || die "Problem creating group puppet"
-	enewuser puppet -1 -1 /var/lib/puppet puppet || die "Problem creating user puppet"
-}
-
-src_compile() {
-	DESTDIR=${D} ruby_econf || die
-	DESTDIR=${D} ruby_emake "$@" || die
-}
-
-src_install() {
-	DESTDIR=${D} ruby_einstall "$@" || die
-	DESTDIR=${D} erubydoc
-
-	# Installation of init scripts and configuration
-	doinitd ${S}/conf/gentoo/init.d/puppetmaster
-	doconfd ${S}/conf/gentoo/conf.d/puppetmaster
-	doinitd ${S}/conf/gentoo/init.d/puppet
-	doconfd ${S}/conf/gentoo/conf.d/puppet
-
-	# Initial configuration files
-	dodir /etc/puppet/manifests
-	insinto /etc/puppet
-	doins ${S}/conf/gentoo/puppet/*
-
-	# Location of log and data files
-	dodir /var/log/puppet
-	dodir /var/lib/puppet
-	dodir /var/lib/puppet/ssl
-	keepdir /var/run/puppet
-	keepdir /var/lib/puppet/ssl
-	chown puppet ${D}/var/run/puppet
-}
-
-pkg_postinst() {
-	ewarn "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could cause puppet to hang"
-	ewarn "while installing packages."
-	ewarn
-	ewarn "Puppet uses eix to get information about currently installed	packages, so please keep the eix"
-	ewarn "metadata cache updated so puppet is able to properly handle package installations."
-	ewarn
-	ewarn "Currently puppet only supports adding and removing services to the default runlevel, if you"
-	ewarn "want to add/remove a service from another runlevel you may do so using symlinking."
-}
diff --git a/app-admin/puppet/puppet-0.23.0-r1.ebuild b/app-admin/puppet/puppet-0.23.0-r1.ebuild
deleted file mode 100644
index 0312d8ebac21..000000000000
--- a/app-admin/puppet/puppet-0.23.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.23.0-r1.ebuild,v 1.1 2007/08/06 17:48:41 nakano Exp $
-
-inherit eutils ruby
-
-DESCRIPTION="A system automation and configuration management software"
-LICENSE="GPL-2"
-HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
-RDEPEND=">=dev-ruby/facter-1.3.5 >=app-portage/eix-0.9.4"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-
-USE_RUBY="ruby18"
-
-pkg_setup() {
-	built_with_use virtual/ruby ipv6 || \
-		die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run"
-
-	enewgroup puppet || die "Problem creating group puppet"
-	enewuser puppet -1 -1 /var/lib/puppet puppet || die "Problem creating user puppet"
-}
-
-src_compile() {
-	DESTDIR=${D} ruby_econf || die
-	DESTDIR=${D} ruby_emake "$@" || die
-}
-
-src_install() {
-	DESTDIR=${D} ruby_einstall "$@" || die
-	DESTDIR=${D} erubydoc
-
-	# Installation of init scripts and configuration
-	doinitd ${S}/conf/gentoo/init.d/puppetmaster
-	doconfd ${S}/conf/gentoo/conf.d/puppetmaster
-	doinitd ${S}/conf/gentoo/init.d/puppet
-	doconfd ${S}/conf/gentoo/conf.d/puppet
-
-	# Initial configuration files
-	dodir /etc/puppet/manifests
-	insinto /etc/puppet
-	doins ${S}/conf/gentoo/puppet/*
-
-	# Location of log and data files
-	dodir /var/log/puppet
-	dodir /var/lib/puppet
-	dodir /var/lib/puppet/ssl
-	keepdir /var/run/puppet
-	keepdir /var/lib/puppet/ssl
-	chown puppet ${D}/var/run/puppet
-}
-
-pkg_postinst() {
-	ewarn "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could cause puppet to hang"
-	ewarn "while installing packages."
-	ewarn
-	ewarn "Puppet uses eix to get information about currently installed	packages, so please keep the eix"
-	ewarn "metadata cache updated so puppet is able to properly handle package installations."
-	ewarn
-	ewarn "Currently puppet only supports adding and removing services to the default runlevel, if you"
-	ewarn "want to add/remove a service from another runlevel you may do so using symlinking."
-}
diff --git a/app-admin/puppet/puppet-0.23.2.ebuild b/app-admin/puppet/puppet-0.23.2.ebuild
deleted file mode 100644
index e1c5338b900a..000000000000
--- a/app-admin/puppet/puppet-0.23.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.23.2.ebuild,v 1.1 2007/08/07 21:09:43 nakano Exp $
-
-inherit eutils ruby
-
-DESCRIPTION="A system automation and configuration management software"
-LICENSE="GPL-2"
-HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
-SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
-RDEPEND=">=dev-ruby/facter-1.3.5 >=app-portage/eix-0.9.4"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86 ~amd64"
-
-USE_RUBY="ruby18"
-
-pkg_setup() {
-	built_with_use virtual/ruby ipv6 || \
-		die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run"
-
-	enewgroup puppet || die "Problem creating group puppet"
-	enewuser puppet -1 -1 /var/lib/puppet puppet || die "Problem creating user puppet"
-}
-
-src_compile() {
-	DESTDIR=${D} ruby_econf || die
-	DESTDIR=${D} ruby_emake "$@" || die
-}
-
-src_install() {
-	DESTDIR=${D} ruby_einstall "$@" || die
-	DESTDIR=${D} erubydoc
-
-	# Installation of init scripts and configuration
-	doinitd ${S}/conf/gentoo/init.d/puppetmaster
-	doconfd ${S}/conf/gentoo/conf.d/puppetmaster
-	doinitd ${S}/conf/gentoo/init.d/puppet
-	doconfd ${S}/conf/gentoo/conf.d/puppet
-
-	# Initial configuration files
-	dodir /etc/puppet/manifests
-	insinto /etc/puppet
-	doins ${S}/conf/gentoo/puppet/*
-
-	# Location of log and data files
-	dodir /var/log/puppet
-	dodir /var/lib/puppet
-	dodir /var/lib/puppet/ssl
-	keepdir /var/run/puppet
-	keepdir /var/lib/puppet/ssl
-	chown puppet ${D}/var/run/puppet
-}
-
-pkg_postinst() {
-	ewarn "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could cause puppet to hang"
-	ewarn "while installing packages."
-	ewarn
-	ewarn "Puppet uses eix to get information about currently installed	packages, so please keep the eix"
-	ewarn "metadata cache updated so puppet is able to properly handle package installations."
-	ewarn
-	ewarn "Currently puppet only supports adding and removing services to the default runlevel, if you"
-	ewarn "want to add/remove a service from another runlevel you may do so using symlinking."
-}
diff --git a/app-admin/puppet/puppet-0.24.1.ebuild b/app-admin/puppet/puppet-0.24.1.ebuild
new file mode 100644
index 000000000000..8dc0af61b3fd
--- /dev/null
+++ b/app-admin/puppet/puppet-0.24.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.24.1.ebuild,v 1.1 2008/01/07 14:46:41 matsuu Exp $
+
+inherit elisp-common eutils ruby
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://reductivelabs.com/projects/puppet/index.html"
+SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="emacs"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+	>=dev-ruby/facter-1.3.5
+	>=app-portage/eix-0.9.4"
+
+USE_RUBY="ruby18"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	built_with_use virtual/ruby ipv6 || \
+		die "Ruby must be built with ipv6 support, otherwise puppet will not be able to run"
+
+	enewgroup puppet || die "Problem creating group puppet"
+	enewuser puppet -1 -1 /var/lib/puppet puppet || die "Problem creating user puppet"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gentoo.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
+
+	# Installation of init scripts and configuration
+	doinitd conf/gentoo/init.d/puppetmaster
+	doconfd conf/gentoo/conf.d/puppetmaster
+	doinitd conf/gentoo/init.d/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
+	insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/*.vim
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto $(dirname ${f})
+		dodoc ${f}
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Puppet uses eix to get information about currently installed	packages,"
+	elog "so please keep the eix metadata cache updated so puppet is able to properly"
+	elog "handle package installations."
+	elog
+	elog "Currently puppet only supports adding and removing services to the default"
+	elog "runlevel, if you want to add/remove a service from another runlevel you may"
+	elog "do so using symlinking."
+	elog
+
+	if [ \
+		-f "${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
+}