Version bumped, bug #388449.

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

7 files changed, 356 insertions, 280 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 26c1af40e200..361a40e0df24 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.88 2011/10/12 16:56:49 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.89 2011/10/26 23:31:28 matsuu Exp $
+
+*puppet-2.7.6 (26 Oct 2011)
+*puppet-2.6.12 (26 Oct 2011)
+
+  26 Oct 2011; MATSUU Takuto <matsuu@gentoo.org>
+  -files/puppet-0.25.4-r1-rrd.patch, -files/puppet-0.25.init,
+  -files/puppetmaster-0.25.init, +puppet-2.6.12.ebuild, +puppet-2.7.6.ebuild:
+  Version bumped, bug #388449.
 
   12 Oct 2011; MATSUU Takuto <matsuu@gentoo.org> -puppet-0.25.5.ebuild,
   -puppet-2.6.9.ebuild, -puppet-2.6.10.ebuild, -puppet-2.7.4.ebuild:
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 5d55a51fe47f..4b97128d9c83 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -2,32 +2,33 @@
 Hash: SHA1
 
 AUX 50puppet-mode-gentoo.el 217 RMD160 6ab7ace77c4e2da030c894f6b7f1a520e4950311 SHA1 7f6e97e1db4079bc45021360b0ada69c0482c008 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91
-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 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 984 RMD160 0f64b00f6b67fd4a7df0ed765fae096d7708abe0 SHA1 73c53119ac29591f1119637eb8818225bc32b95f SHA256 62f0abb0a386620be83586adaf34c1baff4719618d08495a7cbadaa21cc2d101
 DIST puppet-2.6.11.gem 1545728 RMD160 ee9672ace49bcc8d08ebec61428feefe8f0c9dd5 SHA1 ed55d1338b774c8ca1201092aefedeb68160cc04 SHA256 ce86eba1c2804d9459aa4f461b04cba3bfc78fe7e488244c34a7cd2dd200746e
+DIST puppet-2.6.12.gem 1530880 RMD160 283875f708d07e1b8acbf8cbe8fb6e1f1a67b5bf SHA1 75e6978b13a88b3498e3f79f467a19802ec83672 SHA256 d4dbfb48c42e73fd22d1f3605d6794756f7cd0873e57b3ffde00d81e5ccfa732
 DIST puppet-2.7.5.gem 1732608 RMD160 a29be8c85c498c99158be743127383ca718e7eea SHA1 db1b63bf1d1ac63d2be76103f636d3d1c5788b1c SHA256 24e476e414b278e55b27f7690d5eb6ec3b667d9dae39f65400d5a576b6752eb5
+DIST puppet-2.7.6.gem 1738240 RMD160 16dba3d477624ee04f8a433ade15555a28d0a919 SHA1 650e7c6f0560f7bd4e4c520737a6844e50cd0df3 SHA256 566d28f471cb65ffe278c1d6ec69147441db5f811b94d44527e9211915ed4bcd
 EBUILD puppet-2.6.11.ebuild 4815 RMD160 cfc50ec483ffd9cd708ca3c023febae36a469759 SHA1 b3f2a90a12271458cb8ceebfe76de59e80a28d4e SHA256 dbb4e5c10546a0658c37ffba41cea42ada147c119e6074f778e862665a17db79
+EBUILD puppet-2.6.12.ebuild 4816 RMD160 bc79979a6b5eeac2d049c42e116fae3d2ec58d81 SHA1 6393dffffb21451654036a8b3897b8300466e003 SHA256 41fd32856da6dcb5f5dab6dee942004c9296a7ebcdf02d44b6463423b1973eb8
 EBUILD puppet-2.7.5.ebuild 4697 RMD160 7e23c01e0b8cdfa6b13308a07257f8e81f4ff48f SHA1 5518c234663329247fb08075feb05f18cc585ef1 SHA256 28cbf52905bd5e981477e90c4c3fefcf0fe5137b98f109c96f55381bbc5fda68
-MISC ChangeLog 15235 RMD160 b72430ef203370d0d6b77920bedd684c6ae36371 SHA1 7a6f93c3e4cce5e4d8675ade1832d2bb70160ed0 SHA256 73033aee3cdb0fa6fd1ec64020d572e5e66e928a978e79d16028f4b30a55c1ad
+EBUILD puppet-2.7.6.ebuild 4697 RMD160 0eb1181bd129adbd10cee0d03ddbe68e10a7bb70 SHA1 3d77f9240c8423bf0519fc04417f8bb427aef66e SHA256 f5c34dfab6614dae1d270cb63883f89998972bf17eeaf037c3bd2bce483b4296
+MISC ChangeLog 15514 RMD160 ffc14194342c390622a3f15589ac544c7852de73 SHA1 1375f13f799588ab03bba069a8bb705104c869a4 SHA256 c327d2dae76ae37dc69a2669a53e7e623a34253e0328bbf03cd4bd4688dc7711
 MISC metadata.xml 1129 RMD160 64eb4cc09f22194da11da3c4e01441d846d1e9eb SHA1 bd76204117d9000ea1b3704054dbac3945a09026 SHA256 4e7dfa915273eb359790f38782099255c8e788794539b83205ed866b400d09cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOlcbaAAoJECaGw+YFKA1pX4cP/3xbTrdMvjpzlIukYklxs0Si
-f2oFyLZFvuVYfTjiR8sQQhSDRY8i7ZqBHy1J3NL5Es2yc0Rm6/UH+SZJpPlbTeGE
-34Sl+082NW56hm209/eKA03HC0lYbqiIgwj59TPFiM1VfTd9r8nwJQVaSFLo8GxZ
-aWx5jHkbVzuSoYBqdgHysMRBJDChpnB8vpifmTwvfeVf2d8tmsm78jfQtbNn2QcD
-l1fXKYYAv8gSf7t+ZjVPPLMu0EWKIRH2oFO/KoBZOzilNL3IUPQRrEuiUgA33TqU
-aPFsICqsdGJPSoUk3PGXF0R7E8gOeJSm9EMa27TuI4GUy0bsxsmCWVpMFf8fi9XJ
-D76+1oI5sVdGzLGjPn564DhoUEVxAJQyvfBKql5lAbYwyWsIqZhQ/7kIqNRUlfMh
-07wp9OAvXCqwGIzor/5I3uQcESKhmxWrkQWFnDJB9eBcvi9XrMB+ZFBNat7nvliP
-AOF/e0w/8JKT7Da+1BIesEQPkX6HjgPfuGV2dYPLIsjCpbBRPnHbcycGgcjqntBC
-XQ6pFeojz5GtdO1Mawn87BHZup1lLBS/L2mzG6iP+dXIfj25nvX2ikksQqWI4q/y
-L62WEJjktLku2wOZ5UsycqMYfUs8R+nOUDbXJLPmxUFephpxYnGSNFrJKVa98evh
-t4qs1J0TDxz3BYReRj+Y
-=AML2
+iQIcBAEBAgAGBQJOqJhZAAoJECaGw+YFKA1piUQP/3n9oTx8k/dB0j9v75ykUBmK
+e22ShxuKH3ua14h8N542QwqEOA/aXhU9KhkciwZSRQmFNnBxeJgd744aUIdTZwtq
+C14bYY2hL6qBBKS2pXAvOvEjdwCiJ1p2aQMm/s6wyw5PDwo08CyoKS1TqFLCUpJ+
+TPTmoLABl+oZAGMhpIK+Vcio2diSDDwJYPWZzumNI6hufGTmhck0TCSxUrQyPMM+
+1vy3t/2jVAj/m8OtwTLpW3hPpGgAD8DEp0lw07gKk8tWOx4xAa8cPpw/1d8MWPX1
+4mtgQZJ79rxE29mbubvV/3eulQgLXQ6rfyg82jJe5faVi0HExy5/2wMmxUqW69I2
+pvvsitLI5Ybr1qPd5zlTFVNo/EmBZIN3Rg1X/yygr9GAaYDUc6jmwQ7m2WiU0YzI
+uEKTSfs9tzn+MV7e7REbAY6PYTC97FBdgZMfJ3RS7jJLW6VrajymPsX2wkVHAfp/
+5903aDSYG8ZnLByczhfxjoglUdHlqIGvN5IOFzdOVxzWderfPT23FDtp0FmeMX8G
+AaeLrqrRCEhgbLx4zKiU1BQqJYYLk0SjCjyOuzVtfUVMzdEHSsH+CJjfEy3DwzFZ
+a8MYyXcUBmmG5JJ4b6j/s1oHRdsPaOxRlL6GDDENacpUMY6zyCEDY7pYWyKsFhfG
+npMsG3Mk8UYCHHcZxsTd
+=v973
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/files/puppet-0.25.4-r1-rrd.patch b/app-admin/puppet/files/puppet-0.25.4-r1-rrd.patch
deleted file mode 100644
index 23d17af0d727..000000000000
--- a/app-admin/puppet/files/puppet-0.25.4-r1-rrd.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff -Naur puppet-0.25.4.orig//lib/puppet/feature/base.rb puppet-0.25.4//lib/puppet/feature/base.rb
---- puppet-0.25.4.orig//lib/puppet/feature/base.rb	2010-01-28 12:48:33.000000000 +0900
-+++ puppet-0.25.4//lib/puppet/feature/base.rb	2010-02-28 11:36:28.000000000 +0900
-@@ -27,7 +27,7 @@
- Puppet.features.add(:augeas, :libs => ["augeas"])
- 
- # We have RRD available
--Puppet.features.add(:rrd, :libs => ["RRDtool"])
-+Puppet.features.add(:rrd, :libs => ["RRD"])
- 
- # We have OpenSSL
- Puppet.features.add(:openssl, :libs => ["openssl"])
-diff -Naur puppet-0.25.4.orig//lib/puppet/reports/rrdgraph.rb puppet-0.25.4//lib/puppet/reports/rrdgraph.rb
---- puppet-0.25.4.orig//lib/puppet/reports/rrdgraph.rb	2010-01-28 12:48:34.000000000 +0900
-+++ puppet-0.25.4//lib/puppet/reports/rrdgraph.rb	2010-02-28 11:35:34.000000000 +0900
-@@ -1,12 +1,13 @@
- Puppet::Reports.register_report(:rrdgraph) do
-     desc "Graph all available data about hosts using the RRD library.  You
-         must have the Ruby RRDtool library installed to use this report, which
--        you can get from `the RubyRRDTool RubyForge page`_.  This package may also
--        be available as ``ruby-rrd`` or ``rrdtool-ruby`` in your distribution's package
-+        is bundled in RRDtool, which you can get from  `the RRDTool homepage`_.  
-+        This package may also be available as ``librrd-ruby``, ``ruby-rrd`` or 
-+        ``rrdtool-ruby`` in your distribution's package
-         management system.  The library and/or package will both require the binary
-         ``rrdtool`` package from your distribution to be installed.
- 
--        .. _the RubyRRDTool RubyForge page: http://rubyforge.org/projects/rubyrrdtool/
-+        .. _the RRDTool homepage: http://oss.oetiker.ch/rrdtool/download.en.html
- 
-         This report will create, manage, and graph RRD database files for each
-         of the metrics generated during transactions, and it will create a
-diff -Naur puppet-0.25.4.orig//lib/puppet/util/metric.rb puppet-0.25.4//lib/puppet/util/metric.rb
---- puppet-0.25.4.orig//lib/puppet/util/metric.rb	2010-01-28 12:48:34.000000000 +0900
-+++ puppet-0.25.4//lib/puppet/util/metric.rb	2010-03-02 20:19:40.000000000 +0900
-@@ -31,7 +31,6 @@
- 
-         start ||= Time.now.to_i - 5
- 
--        @rrd = RRDtool.new(self.path)
-         args = []
- 
-         values.each { |value|
-@@ -42,14 +41,17 @@
-         args.push "RRA:AVERAGE:0.5:1:300"
- 
-         begin
--            @rrd.create( Puppet[:rrdinterval].to_i, start, args)
-+        RRD.create(self.path,
-+                "--start", start.to_s,
-+                "--step", Puppet[:rrdinterval].to_i,
-+                *args)
-         rescue => detail
-             raise "Could not create RRD file %s: %s" % [path,detail]
-         end
-     end
- 
-     def dump
--        puts @rrd.info
-+        puts RRD.info(self.path)
-     end
- 
-     def graph(range = nil)
-@@ -84,12 +86,12 @@
-             if range
-                 args.push("--start",range[0],"--end",range[1])
-             else
--                args.push("--start", Time.now.to_i - time, "--end", Time.now.to_i)
-+                args.push("--start", (Time.now.to_i - time).to_s, "--end", Time.now.to_i.to_s)
-             end
- 
-             begin
--                #Puppet.warning "args = #{args}"
--                RRDtool.graph( args )
-+                #Puppet.warning "args = #{args.join("|")}"
-+                RRD.graph( * args )
-             rescue => detail
-                 Puppet.err "Failed to graph %s: %s" % [self.name,detail]
-             end
-@@ -122,7 +124,6 @@
-             self.create(time - 5)
-         end
- 
--        @rrd ||= RRDtool.new(self.path)
- 
-         # XXX this is not terribly error-resistant
-         args = [time]
-@@ -135,7 +136,9 @@
-         arg = args.join(":")
-         template = temps.join(":")
-         begin
--            @rrd.update( template, [ arg ] )
-+            RRD.update(self.path, 
-+                "--template", template, 
-+                arg )
-             #system("rrdtool updatev %s '%s'" % [self.path, arg])
-         rescue => detail
-             raise Puppet::Error, "Failed to update %s: %s" % [self.name,detail]
-diff -Naur puppet-0.25.4.orig//spec/unit/util/metric.rb puppet-0.25.4//spec/unit/util/metric.rb
---- puppet-0.25.4.orig//spec/unit/util/metric.rb	2010-01-28 12:48:34.000000000 +0900
-+++ puppet-0.25.4//spec/unit/util/metric.rb	2010-02-28 11:35:34.000000000 +0900
-@@ -7,6 +7,13 @@
- describe Puppet::Util::Metric do
-     before do
-         @metric = Puppet::Util::Metric.new("foo")
-+        #if we don't retrive it before the test the :rrddir test will
-+        #fail at after
-+        @basedir = @metric.basedir
-+    end
-+
-+    after do
-+        FileUtils.rm_rf(@basedir) if File.directory?(@basedir)
-     end
- 
-     it "should be aliased to Puppet::Metric" do
-@@ -84,12 +91,46 @@
-         @metric[:foo].should be_nil
-     end
- 
--    # LAK: I'm not taking the time to develop these tests right now.
--    # I expect they should actually be extracted into a separate class
--    # anyway.
--    it "should be able to graph metrics using RRDTool"
--
--    it "should be able to create a new RRDTool database"
--
--    it "should be able to store metrics into an RRDTool database"
-+    it "should be able to graph metrics using RRDTool" do
-+        ensure_rrd_folder
-+        populate_metric
-+        @metric.graph
-+    end
-+
-+    it "should be able to create a new RRDTool database" do
-+        ensure_rrd_folder
-+        add_random_values_to_metric
-+        @metric.create
-+        File.exist?(@metric.path).should == true
-+    end
-+
-+    it "should be able to store metrics into an RRDTool database" do
-+        ensure_rrd_folder
-+        populate_metric
-+        File.exist?(@metric.path).should == true
-+    end
-+
-+    def ensure_rrd_folder()
-+        #in normal runs puppet does this for us (not sure where)
-+        FileUtils.mkdir_p(@basedir) unless File.directory?(@basedir)
-+    end
-+
-+    def populate_metric()
-+        time = Time.now.to_i
-+        time -= 100 * 1800
-+        200.times {
-+            @metric = Puppet::Util::Metric.new("foo")
-+            add_random_values_to_metric
-+            @metric.store(time)
-+            time += 1800
-+        }
-+    end
-+
-+    def add_random_values_to_metric()
-+        @metric.values.clear
-+        random_params = { :data1 => 10, :data2 => 30, :data3 => 100 }
-+        random_params.each { | label, maxvalue |
-+            @metric.newvalue(label, rand(maxvalue))
-+    }
-+    end
- end
-diff -Naur puppet-0.25.4.orig//test/util/metrics.rb puppet-0.25.4//test/util/metrics.rb
---- puppet-0.25.4.orig//test/util/metrics.rb	2010-01-28 12:48:34.000000000 +0900
-+++ puppet-0.25.4//test/util/metrics.rb	2010-02-28 11:35:34.000000000 +0900
-@@ -53,6 +53,8 @@
-         report = Puppet::Transaction::Report.new
-         time = Time.now.to_i
-         start = time
-+        #in normal runs puppet does this for us (not sure where)
-+        Dir.mkdir(Puppet[:rrddir]) unless File.directory?(Puppet[:rrddir])
-         10.times {
-             rundata(report, time)
-             time += 300
diff --git a/app-admin/puppet/files/puppet-0.25.init b/app-admin/puppet/files/puppet-0.25.init
deleted file mode 100755
index 2a11820351de..000000000000
--- a/app-admin/puppet/files/puppet-0.25.init
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount net
-	use dns logger puppetmaster netmount nfsmount
-}
-
-checkconfig() {
-	if [ ! -d "${PUPPET_PID_DIR}" ] ; then
-		eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	local options=""
-	[ -n "${PUPPET_EXTRA_OPTS}" ] && options="${options} ${PUPPET_EXTRA_OPTS}"
-
-	ebegin "Starting puppet"
-	start-stop-daemon --start --quiet \
-		--pidfile "${PUPPET_PID_DIR}/puppetd.pid" \
-		--exec /usr/sbin/puppetd -- ${options}
-	eend $? "Failed to start puppet"
-}
-
-stop() {
-	ebegin "Stopping puppet"
-	start-stop-daemon --stop --quiet \
-		--pidfile "${PUPPET_PID_DIR}/puppetd.pid"
-	local ret=$?
-	eend ${ret} "Failed to stop puppet"
-	rm -f "${PUPPET_PID_DIR}/puppetd.pid"
-	return ${ret}
-}
diff --git a/app-admin/puppet/files/puppetmaster-0.25.init b/app-admin/puppet/files/puppetmaster-0.25.init
deleted file mode 100755
index a543e99405a2..000000000000
--- a/app-admin/puppet/files/puppetmaster-0.25.init
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount net
-	use dns logger slapd netmount nfsmount
-}
-
-checkconfig() {
-	if [ ! -d "${PUPPETMASTER_PID_DIR}" ] ; then
-		eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory"
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	local options=""
-	[ -n "${PUPPETMASTER_EXTRA_OPTS}" ] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
-
-	ebegin "Starting puppetmaster"
-	start-stop-daemon --start --quiet \
-		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid" \
-		--exec /usr/sbin/puppetmasterd -- ${options}
-	eend $? "Failed to start puppetmaster"
-}
-
-stop() {
-	ebegin "Stopping puppetmaster"
-	start-stop-daemon --stop --quiet \
-		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
-	local ret=$?
-	eend ${ret} "Failed to stop puppetmaster"
-	rm -f "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
-	return ${ret}
-}
diff --git a/app-admin/puppet/puppet-2.6.12.ebuild b/app-admin/puppet/puppet-2.6.12.ebuild
new file mode 100644
index 000000000000..d3dd0eec6335
--- /dev/null
+++ b/app-admin/puppet/puppet-2.6.12.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.12.ebuild,v 1.1 2011/10/26 23:31:28 matsuu Exp $
+
+EAPI="3"
+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
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/facter-1.5.1
+	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-ruby )
+	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 )"
+RDEPEND="${RDEPEND}
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? ( sys-libs/libselinux[ruby] )
+	>=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 || die "elisp-compile failed"
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs || die
+		cp ext/emacs/* ext/xemacs/ || die
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el || die "xemacs-elisp-compile failed"
+	fi
+}
+
+each_fakegem_install() {
+	${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newinitd "${FILESDIR}"/puppetmaster.init puppetmaster || die
+	doconfd conf/gentoo/conf.d/puppetmaster || die
+	newinitd "${FILESDIR}"/puppet.init puppet || die
+	doconfd conf/gentoo/conf.d/puppet || die
+
+	# Initial configuration files
+	keepdir /etc/puppet/manifests || die
+	keepdir /etc/puppet/modules || die
+	insinto /etc/puppet
+
+	# Bug #338439
+	#doins conf/gentoo/puppet/* || die
+	doins conf/redhat/*.conf || die
+	doins conf/auth.conf || die
+
+	# Location of log and data files
+	keepdir /var/run/puppet || die
+	keepdir /var/log/puppet || die
+	keepdir /var/lib/puppet/ssl || die
+	keepdir /var/lib/puppet/facts || die
+	keepdir /var/lib/puppet/files || die
+	fowners -R puppet:puppet /var/{run,log,lib}/puppet || die
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* || die "xemacs-elisp-install failed"
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim || die
+		insinto /usr/share/vim/vimfiles/ftplugin; doins ext/vim/ftplugin/puppet.vim || die
+		insinto /usr/share/vim/vimfiles/indent; doins ext/vim/indent/puppet.vim || die
+		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}" || die
+	done
+	docinto conf; dodoc conf/namespaceauth.conf || die
+}
+
+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.6.ebuild b/app-admin/puppet/puppet-2.7.6.ebuild
new file mode 100644
index 000000000000..19b060fbedca
--- /dev/null
+++ b/app-admin/puppet/puppet-2.7.6.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.6.ebuild,v 1.1 2011/10/26 23:31:28 matsuu Exp $
+
+EAPI="3"
+# 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
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/facter-1.5.1
+	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-ruby )
+	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 )"
+RDEPEND="${RDEPEND}
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? ( sys-libs/libselinux[ruby] )
+	>=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 || die "elisp-compile failed"
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs || die
+		cp ext/emacs/* ext/xemacs/ || die
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el || die "xemacs-elisp-compile failed"
+	fi
+}
+
+each_fakegem_install() {
+	${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newinitd "${FILESDIR}"/puppetmaster.init puppetmaster || die
+	doconfd conf/gentoo/conf.d/puppetmaster || die
+	newinitd "${FILESDIR}"/puppet.init puppet || die
+	doconfd conf/gentoo/conf.d/puppet || die
+
+	# Initial configuration files
+	keepdir /etc/puppet/manifests || die
+	keepdir /etc/puppet/modules || die
+	insinto /etc/puppet
+
+	# Bug #338439
+	#doins conf/gentoo/puppet/* || die
+	doins conf/redhat/*.conf || die
+	doins conf/auth.conf || die
+
+	# Location of log and data files
+	keepdir /var/run/puppet || die
+	keepdir /var/log/puppet || die
+	keepdir /var/lib/puppet/ssl || die
+	keepdir /var/lib/puppet/facts || die
+	keepdir /var/lib/puppet/files || die
+	fowners -R puppet:puppet /var/{run,log,lib}/puppet || die
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* || die "xemacs-elisp-install failed"
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim || die
+		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}" || die
+	done
+	docinto conf; dodoc conf/namespaceauth.conf || die
+}
+
+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
+}