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

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 23 insertions, 174 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/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
 }