Version bumped. Fixed emacs and xemacs related issue, bug #406053. Added ruby19 and ree18 to USE_RUBY.

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

4 files changed, 40 insertions, 183 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index b110e56829e7..c879c1b80cb2 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.103 2012/03/03 20:26:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.104 2012/03/14 16:33:33 matsuu Exp $
+
+*puppet-2.7.12 (14 Mar 2012)
+
+  14 Mar 2012; MATSUU Takuto <matsuu@gentoo.org> -puppet-2.6.12.ebuild,
+  -puppet-2.7.9.ebuild, +puppet-2.7.12.ebuild:
+  Version bumped. Fixed emacs and xemacs related issue, bug #406053. Added
+  ruby19 and ree18 to USE_RUBY. Removed old versions.
 
   03 Mar 2012; Raúl Porcel <armin76@gentoo.org> puppet-2.7.11.ebuild:
   sparc stable wrt #403963
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 3b33a3520a66..b5aa68feda49 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -7,18 +7,26 @@ AUX puppetmaster-2.7.6.confd 640 RMD160 6117e911ecc9be8c5eaa5df7562b6c9c56bc28aa
 AUX puppetmaster-2.7.6.init 867 RMD160 3dcf630b8f758a5a6075bd412c7174d182609235 SHA1 85b8e2aadc95658701a89e7aa8b44eef4b272fd0 SHA256 3fc62b4850ccd38517d9617671bef2a5d804147383744638de67c6f2289de28c
 AUX puppetmaster.confd 279 RMD160 64824fc2c88d9069b25d0548fac5981f1ff4fa6b SHA1 d521616310e7a27986c27138bd4d4382238d609a SHA256 6db68d9e093d3d231c8ad35968e8d276f68cdd7aec8577b3f7ac2998d1f91692
 AUX puppetmaster.init 984 RMD160 0f64b00f6b67fd4a7df0ed765fae096d7708abe0 SHA1 73c53119ac29591f1119637eb8818225bc32b95f SHA256 62f0abb0a386620be83586adaf34c1baff4719618d08495a7cbadaa21cc2d101
-DIST puppet-2.6.12.gem 1530880 RMD160 283875f708d07e1b8acbf8cbe8fb6e1f1a67b5bf SHA1 75e6978b13a88b3498e3f79f467a19802ec83672 SHA256 d4dbfb48c42e73fd22d1f3605d6794756f7cd0873e57b3ffde00d81e5ccfa732
 DIST puppet-2.7.11.gem 1846272 RMD160 2ef1c5276b70acb2ad37dce6d34ee9647ea0c62b SHA1 588e3ee89eaa6babd98dc207a1e0b517be28f59c SHA256 d58c0ad7ee05364d3431fefd2894690eed3364362d759b0b2627c44f71c955d6
-DIST puppet-2.7.9.gem 1802240 RMD160 69fac8fbc4a59a11c93e7bcb555f6cede2b81b75 SHA1 c061982ea2d20e26acb1b9e6cb53e153897eab78 SHA256 0828132d6421670f1cf40ed7c1a298f764b3c6f54b1ab081242edbe08c93fa46
-EBUILD puppet-2.6.12.ebuild 4811 RMD160 535ceff9dfcc36f6ab2fdf8e18a7a5ee434748ce SHA1 64f16fc5ab0129ba871b77b8a78b224bd71e72eb SHA256 0ab06f8b307100f3682b7edc737c6bb89f4f46fdc657dc1f21a248087132756b
+DIST puppet-2.7.12.gem 1876480 RMD160 91fad29bfcdf3944aa84cd54347c928d728ccc91 SHA1 ef1afaeec34f921c055826f33b39dc88cbb52c01 SHA256 2c96c6cba32b1b413faee8a0d96b1f33be08aca99d165ea689f06a7dc1a2bc1f
 EBUILD puppet-2.7.11.ebuild 4603 RMD160 6031cdb3689fad70fc3e45073e358360d022c1b3 SHA1 8c253f12341b378f2e98e328a42487369c7c17ae SHA256 121c1057e2ff1ba20dd2deae47ae5f87cfca075cd2e59b8172f02af8f9e7554e
-EBUILD puppet-2.7.9.ebuild 4606 RMD160 a09a1b73bfd47c2379015cbe0121c343dda3eece SHA1 7f11203f9605df4352b1d7879ea14057cebc4bbb SHA256 c48813dd7bd1acc3ff9479cbfd9fdf4c42fe884a041187e5db539ee051d68a8d
-MISC ChangeLog 17546 RMD160 dd276798cdd83036602411b0a6bfd9f086df0d95 SHA1 23664d9eddf7322217bb16d389bb54572d96a125 SHA256 24f9c6334197f14a8a9a0e7ddcd5cee574256d4a3a2891c0515b2c785d23efa6
+EBUILD puppet-2.7.12.ebuild 4890 RMD160 5320feaa0754538997aabcc7223679142f2790c1 SHA1 d6497f94a15254c8960cb060e6023d23b00a6864 SHA256 b1c2ca9cfa6b35a2d0c6129242eb9aafdf0a3da1962684c75aa34e57dfcca2d3
+MISC ChangeLog 17824 RMD160 924046e68d1880511fb6ff7fd1939b8ceba31573 SHA1 b6ea0f56c6f9f63b329b642541aa4315a25b9a31 SHA256 9e1358abbfddee4c341da97d1c38e89e0ed43fa0a281b976706d6bdda1480f40
 MISC metadata.xml 1129 RMD160 64eb4cc09f22194da11da3c4e01441d846d1e9eb SHA1 bd76204117d9000ea1b3704054dbac3945a09026 SHA256 4e7dfa915273eb359790f38782099255c8e788794539b83205ed866b400d09cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9SfmAACgkQuQc30/atMkCoKACgr3bzDyggpLBiOtL5xBJmNfSu
-AuUAmwbvYPW4+Mf2RAJcg/FiHDX6ZaDp
-=LEVp
+iQIcBAEBAgAGBQJPYMhjAAoJECaGw+YFKA1pEGMP/1E/FB/9AwYQ7ChRFKr4kPDm
+eyL/s5XP7Ja63usVGDYmOYoBUEb586O+jAntN46j+kdvse7QPElpe8TM5Mfv9y5/
+nlnwc6kq6T/7Xl1SKXYpKYQ472CAjk29tz/t4KR9LtceDfUkT+0ovoHCpiZLNHIT
+8cCYyaKRujP904eQXqD8y9xNLYGnmsODtM/LxUjdSJXQlGg7fcy6B6AWO2Or3Ox5
+7RH3LxjPL2HY/kvi7C72uC4nQA7uIc3fwGjWEadoGF6bVo2k20N0C1JCj5XWwhbm
+WzM8Ku0EkqoOWcSqZRZBPWu0khl0q3+HAEeuuvHLR9u2o9Cf3WhKuFNbXEayw+pl
+SpRZQPBt8M0R92bd9Y+SNEMPuh6DCEArRi6Yt0zMC0jAns6WUfYQG2rY2UGg8tSL
+ypB1tTLqDHy/U6C7Ss5+rHDTOPIvBOd1s8s8o2rs8zQet9i65x0L+5ZMN4aRYWb0
+1xq1cKU5zdbCpAxFuJov0gz7rcmWn3/LOWaM5Lqj9InWNCiE+iHjrlk78YTv9rw5
+blXKy2vp8UMYqZlpE1C9CtSGcc7ZsieRJ4tGRdpv66nyHBoNZDfTYjKfljAKklfl
+tQBqZX4B8O1+7AWEKxLu3PCMq7H4VnYTeG+S6T2S6TkGC/aj2v3J11+LMsNTb52P
+3CZgJvc/pgJu35KfVG+K
+=ZOKT
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-2.6.12.ebuild b/app-admin/puppet/puppet-2.6.12.ebuild
deleted file mode 100644
index 6b4f6c8b4cd0..000000000000
--- a/app-admin/puppet/puppet-2.6.12.ebuild
+++ /dev/null
@@ -1,165 +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.12.ebuild,v 1.6 2011/11/06 13:21:43 ranger 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.9.ebuild b/app-admin/puppet/puppet-2.7.12.ebuild
index 78044402e6bd..9395f0c6d2b5 100644
--- a/app-admin/puppet/puppet-2.7.9.ebuild
+++ b/app-admin/puppet/puppet-2.7.12.ebuild
@@ -1,16 +1,21 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.9.ebuild,v 1.1 2011/12/15 16:15:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.12.ebuild,v 1.1 2012/03/14 16:33:33 matsuu Exp $
 
 EAPI="4"
 # ruby19: dev-ruby/ruby-ldap has no ruby19
-USE_RUBY="ruby18"
+USE_RUBY="ruby18 ruby19 ree18"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
 
-inherit elisp-common xemacs-elisp-common eutils ruby-fakegem
+# bug #406053
+inherit elisp-common
+EMACS_SITELISP="${SITELISP}"
+inherit xemacs-elisp-common
+XEMACS_SITELISP="${SITELISP}"
+inherit eutils ruby-fakegem
 
 DESCRIPTION="A system automation and configuration management software"
 HOMEPAGE="http://puppetlabs.com/"
@@ -111,11 +116,13 @@ all_ruby_install() {
 	fi
 
 	if use emacs ; then
+		SITELISP="${EMACS_SITELISP}"
 		elisp-install ${PN} ext/emacs/puppet-mode.el*
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
 	if use xemacs ; then
+		SITELISP="${XEMACS_SITELISP}"
 		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
 		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
@@ -163,11 +170,11 @@ pkg_postinst() {
 		elog
 	fi
 
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
+	use emacs && SITELISP="${EMACS_SITELISP}" elisp-site-regen
+	use xemacs && SITELISP="${XEMACS_SITELISP}" xemacs-elisp-site-regen
 }
 
 pkg_postrm() {
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
+	use emacs && SITELISP="${EMACS_SITELISP}" elisp-site-regen
+	use xemacs && SITELISP="${XEMACS_SITELISP}" xemacs-elisp-site-regen
 }