Version bumped, bug #384859.

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

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 4108724ab582fd3a81e0d034358d8b99d5345b7f..cf936c27b3a26afa9c8a6143ebbbe3152a60ed2d 100644 (file)
--- 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.79 2011/09/19 21:54:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.80 2011/09/29 12:28:01 matsuu Exp $
+
+*puppet-2.7.4 (29 Sep 2011)
+*puppet-2.6.10 (29 Sep 2011)
+
+  29 Sep 2011; MATSUU Takuto <matsuu@gentoo.org> -puppet-2.6.7.ebuild,
+  -puppet-2.6.8.ebuild, +puppet-2.6.10.ebuild, -puppet-2.7.1.ebuild,
+  -puppet-2.7.3.ebuild, +puppet-2.7.4.ebuild:
+  Version bumped, bug #384859. Removed old versions.
 
   19 Sep 2011; Markus Meier <maekke@gentoo.org> puppet-2.6.9.ebuild:
   x86 stable, bug #380529

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 33b724ef270acc453eaece27d2680e153c6d3bf5..e4bbea7e776717841f5eb4b287b95b4285946c46 100644 (file)
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
@@ -9,25 +9,29 @@ AUX puppetmaster-0.25.init 1006 RMD160 9b1878992fc0380cbacf7c1eada2e6a283749a26
 AUX puppetmaster.confd 279 RMD160 64824fc2c88d9069b25d0548fac5981f1ff4fa6b SHA1 d521616310e7a27986c27138bd4d4382238d609a SHA256 6db68d9e093d3d231c8ad35968e8d276f68cdd7aec8577b3f7ac2998d1f91692
 AUX puppetmaster.init 984 RMD160 0f64b00f6b67fd4a7df0ed765fae096d7708abe0 SHA1 73c53119ac29591f1119637eb8818225bc32b95f SHA256 62f0abb0a386620be83586adaf34c1baff4719618d08495a7cbadaa21cc2d101
 DIST puppet-0.25.5.tar.gz 1446756 RMD160 c9b934ef9135c5b0d5abe9b97a2491e52145abb7 SHA1 5d77345c35926efb57fedbb8fe97d9ad717701c8 SHA256 88038160a4a91790475012df10396e6292dcf39c0402ac42edf89f755fb9b105
-DIST puppet-2.6.7.gem 1529856 RMD160 f4d2508e5d75361c4294eee3629d3a75676f41bd SHA1 cd49ae8f853c74b8767332f8c4b30631f9f98580 SHA256 9f5f85f1e4e87f9f8812c1a83a6246b223d3e8dd9bc9050750d5d19f35769518
-DIST puppet-2.6.8.gem 1547776 RMD160 856756bcf4578f8e9e00520951cd088be65b8337 SHA1 0943bbdcf41b041dcd0b96b2e58f134fed4efd1f SHA256 da268118d5a289cb5b16523896152ced6aad99a75c9f7b2eb57e9dedc0995751
+DIST puppet-2.6.10.gem 1546752 RMD160 06cd2b24b6aeb282eacf809a792132dc8ab33455 SHA1 a2878c09b0acefc60cb9821eebf9c7a55bbee10b SHA256 231f6b2859e7adae598b1791c0a47fc5d466fbd5c92479fbe7660ef236729983
 DIST puppet-2.6.9.gem 1546240 RMD160 4ebee3a195c8b28d654973fea1c1b948c78aeae4 SHA1 90b884c02f6d14d8ced9d4bbf36f5f64cf6374a2 SHA256 f83f709ad87e88483736c4117366a4451a19159a6b68425e6c2953d44ceb706b
-DIST puppet-2.7.1.gem 1674752 RMD160 c3e651eb894d87bbd91e7c8177f2b70c99e0f793 SHA1 5f8a877b9e8cf3ca94f2ca4276ab7a0512571059 SHA256 470bda7c136e827e4c68bb89bc391cb3fa20a747aaee3b28eb3fbea7fe014ee2
-DIST puppet-2.7.3.gem 1711104 RMD160 a6a0b7d6da7a0fc9d28a999ee8bd72369d7cadd0 SHA1 daf4f33c499d1386b7fa0afa9d06d0c78ca7b5d1 SHA256 33aaab202476331e753d38e2d578fbe90fd419cd265e3996c296fc865c181b62
+DIST puppet-2.7.4.gem 1734144 RMD160 8bae9520c36718556ecd8c646c1aee8c7a76986a SHA1 204cb93f778781d338d90c08b444917ba03daa3e SHA256 d090cb358d43266e80493fa280813eec4c0a50c133abba581fb29b336737b406
 EBUILD puppet-0.25.5.ebuild 3469 RMD160 ca5579a820b9e66cd4a55418a0937a1ba7460a2a SHA1 7cb8b09e16b598351986d6e14d6e8a97652ba441 SHA256 e36d5c99627572ed2c51b9f6da2dc1d7a2ff3806c186d30b6ba2a10106315407
-EBUILD puppet-2.6.7.ebuild 4013 RMD160 1148c22cdfc7803a0c6397bbdd04003b82fdc519 SHA1 8f9d4e13d496d09d3d264c9b1d6188abccc261e4 SHA256 6dd7eb80edf4919f0bca3819213ae8c5a4884f3bc97d3be38d87497c2cadd2fc
-EBUILD puppet-2.6.8.ebuild 4013 RMD160 b922f7e5917986d93a639d250137b79e7d65e486 SHA1 a64748d29a3fb5f3663b781ba9cc3a1fb0f85c81 SHA256 e50c66250ba02db3e295b4c67bf85e47443b7787c3dad9e82ad46526e48d5ea0
+EBUILD puppet-2.6.10.ebuild 4816 RMD160 c36997f27c94f25fc59fc4b07ec30a1568508039 SHA1 63dabace63be9978055b3ab79b2bee50ef174281 SHA256 e21954fca5347dbcbdd18f3fda1b167cd0ba7052abb6f583ae1ae5a32530a0af
 EBUILD puppet-2.6.9.ebuild 4813 RMD160 4d143ddeec62f49193cf70a5d4ab723dbd92b68b SHA1 f9af15f7706a2e9ead171b42f98bd663a92897eb SHA256 d039074bb0658d83173f689a6794b9f9d3adf3c792078fc19326316f9bddf75e
-EBUILD puppet-2.7.1.ebuild 4697 RMD160 e78600238b5df07806f9dfe78ccfd07e38060c48 SHA1 2c308a54653438c6201e5a2a7599ab47334d5e0a SHA256 f87ad7a2734cfe229c179599179ab8c8b3b9ec9f4f11fb1f7082281256db5bb9
-EBUILD puppet-2.7.3.ebuild 4697 RMD160 42b68e23c2a09611e65a34dd4bdd3014954cfca4 SHA1 451b58df770af47b31bfa08da8286522fef24f15 SHA256 d0e3dc68870e4014ecb7535eb0a54b93e12d37eae6411df5efaef8846895be9a
-MISC ChangeLog 13949 RMD160 2f3c71d30428ffd1f0b44defb56efd99b76638ea SHA1 2fffbc4187afd34a9429defa49a1b81f1a060159 SHA256 7ed33c8dfaf21766db835e7095178d8d13dabfa2a86ba6ef4c7566ab2e3033c2
+EBUILD puppet-2.7.4.ebuild 4697 RMD160 ccf0b60c48da20ed6aac53f149f64586a62f52ec SHA1 6dc3aec37f07abd87c63ab53400aeced7a2c0fe0 SHA256 0a44c92da21d31906e0fe698ee84a4690e0477bc8161e0d60f63c32a74050f21
+MISC ChangeLog 14247 RMD160 58b2d966bba3312af21a3ee7c9e03b0ad2ec6968 SHA1 764754c65da22b876d8dc9f2d40d4bd5ca3109a8 SHA256 339ea253ca666b49a3e7d53599877ce65362ae7dc7eb3f10a49f493466681864
 MISC metadata.xml 1129 RMD160 64eb4cc09f22194da11da3c4e01441d846d1e9eb SHA1 bd76204117d9000ea1b3704054dbac3945a09026 SHA256 4e7dfa915273eb359790f38782099255c8e788794539b83205ed866b400d09cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk589RMACgkQfXuS5UK5QB2vAwP9Fw5lNL6iDlSz/4yTcBOEApeu
-nqYOBybLYd+N3T6pBCaG/IxxLSg3LeqbmemiO2FCPbRylO5bumVlAPf6bykVNBma
-227e4dYl5ugkF+9XI3RqQRbA3oRNH4NaB1trJ8tO3GmGmJPBWMMhYhxVpACOnejV
-/djI6boLaPjOCDJW6jk=
-=L9Fh
+iQIcBAEBAgAGBQJOhGRWAAoJECaGw+YFKA1puP0P/2Vpk52EzAQignbPPhNzOz0o
+ZHaOVjSIlHSrDa1Ax9l68QXrZS+TyjotHTK5nqggI3dTL+uFg7sVJ14YnpXDUdHo
+JobJHsAzk+13Et5c6wKIfL4uJlrrYdCTYOMKJ6E2l2HmatuG1ETlEPWnui/ZoXaq
+Nq88b1VZHmZ6j/rtegKYfAsw9Eczv3gpklAIxOWjnY1knijj/5MaRCwXGeASo5yw
+uxcu8EYpsJAloYo0UdazaOJvcsw6+LosVM9AVb5xsYWn4vEq98tmUuZhKFDrwV3X
+T5HgWlBo5zMWXjfPMXwZXT22U4UP4g1vbzTYcY7Kt7MZpra5XNPHxDoObsH46jzO
+LdFS26nDn2Ho+Yt4LLE8zmrW9sxY5U81sRn9Lf1XZ3pcl8ucLinIabbIxirwR38C
+0Xiq7pAuKkqXs2qRuKNib8eKGTXJzPUh2Pgu5+9zP5TLD5Z8cKYycPa3xe8IPa7R
+FhwsJgBvIxckp0ftymi2AmSLktw2MNDNS/ec41UYmPRSfp6ZIXJDSuBFuaxLyJHr
+vOkTVZhB783esPqZMK5DpLzUnNNobnvSlCZf8G3zfj2IrFGUEViNe4SR7ulHy47Y
+Cmes9l4ACQtemxo4ofXYe0HjzGVHih2OCkS462jAgio8NiccMD6moxlNf/thraBC
+gXTcwkxtNeIfkmRE++pW
+=dpp7
 -----END PGP SIGNATURE-----

diff --git a/app-admin/puppet/puppet-2.7.3.ebuild b/app-admin/puppet/puppet-2.6.10.ebuild
similarity index 93%
rename from app-admin/puppet/puppet-2.7.3.ebuild
rename to app-admin/puppet/puppet-2.6.10.ebuild
index eb9b9630ba8af9d42988113cc585148163ee6c66..17d2b393c7b5e412619c83df9de76dc2db699717 100644 (file)
--- a/app-admin/puppet/puppet-2.7.3.ebuild
+++ b/app-admin/puppet/puppet-2.6.10.ebuild
@@ -1,9 +1,8 @@
 # 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.3.ebuild,v 1.1 2011/08/24 17:03:06 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.10.ebuild,v 1.1 2011/09/29 12:28:01 matsuu Exp $
 
 EAPI="3"
-# ruby19: dev-ruby/ruby-ldap has no ruby19
 USE_RUBY="ruby18"
 
 RUBY_FAKEGEM_TASK_DOC=""
@@ -15,7 +14,7 @@ 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"
+LICENSE="GPL-2"
 SLOT="0"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
@@ -117,6 +116,8 @@ all_ruby_install() {
 
        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
 

diff --git a/app-admin/puppet/puppet-2.6.7.ebuild b/app-admin/puppet/puppet-2.6.7.ebuild
deleted file mode 100644 (file)
index 6a97d18..0000000
--- a/app-admin/puppet/puppet-2.6.7.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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.7.ebuild,v 1.1 2011/04/11 15:04:16 matsuu Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
-
-inherit 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"
-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 )"
-RDEPEND="${RDEPEND}
-       emacs? ( virtual/emacs )
-       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
-}
-
-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 ldap ; then
-               insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die
-       fi
-
-       if use vim-syntax ; then
-               insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die
-               insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/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 "${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-2.6.8.ebuild b/app-admin/puppet/puppet-2.6.8.ebuild
deleted file mode 100644 (file)
index d8153f6..0000000
--- a/app-admin/puppet/puppet-2.6.8.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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.8.ebuild,v 1.1 2011/04/29 07:06:14 matsuu Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
-
-inherit 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"
-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 )"
-RDEPEND="${RDEPEND}
-       emacs? ( virtual/emacs )
-       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
-}
-
-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 ldap ; then
-               insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die
-       fi
-
-       if use vim-syntax ; then
-               insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die
-               insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/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 "${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-2.7.1.ebuild b/app-admin/puppet/puppet-2.7.4.ebuild
similarity index 97%
rename from app-admin/puppet/puppet-2.7.1.ebuild
rename to app-admin/puppet/puppet-2.7.4.ebuild
index 7ba9cebe5622cbe6edda534e429ecca6b1498730..e762b7d127e4ca92322fc6b6ec60bd5628744879 100644 (file)
--- a/app-admin/puppet/puppet-2.7.1.ebuild
+++ b/app-admin/puppet/puppet-2.7.4.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2011/06/29 17:44:07 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.4.ebuild,v 1.1 2011/09/29 12:28:01 matsuu Exp $
 
 EAPI="3"
 # ruby19: dev-ruby/ruby-ldap has no ruby19