Change sqlite3 USE flag to sqlite for bug 548644.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 396 insertions, 5 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 51fdecc15326..6ce494783355 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.225 2015/07/11 07:52:38 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.226 2015/07/11 07:55:51 graaff Exp $
+
+*puppet-3.8.1-r1 (11 Jul 2015)
+*puppet-3.7.4-r2 (11 Jul 2015)
+
+  11 Jul 2015; Hans de Graaff <graaff@gentoo.org> +puppet-3.7.4-r2.ebuild,
+  +puppet-3.8.1-r1.ebuild:
+  Change sqlite3 USE flag to sqlite for bug 548644.
 
 *puppet-3.7.3-r1 (11 Jul 2015)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 247cc84a3f0b..83c7c6b464db 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -19,16 +19,18 @@ DIST puppet-4.1.0.tar.gz 2532579 SHA256 a168ac45a7b25932dfc78bd5da3efe41363e239c
 EBUILD puppet-3.7.3-r1.ebuild 5184 SHA256 192206cdc83aff5ed668799474a7fbecd62796efcf01ea38ee54fdd8bc5a74de SHA512 3b42d51a089545cd627fa1ac3b07334a5d8ad992989fdb12ad61757282bd1d013aa6852789c7f8fe87db3890782cee123a1d09c9a036edb127bb08578f012232 WHIRLPOOL 99f50da1115836299de7e0885e72f310c69dca3f02ba0705bebc0f57de2c1e5661c6f6f82d0a795c275ff27507a3394ff1e73eb993b17324055bf2e70529b4d6
 EBUILD puppet-3.7.3.ebuild 5182 SHA256 885696503736055d53dfbec01960f0c00394adf19ad26250494db12d607dbabc SHA512 d871f9e71f8d1e076264fd1c979794cb161004c14283f744156cbaf5f53269459f63979eccb19eb47f7d37a0d010070ccf7e8d593b656d4fb21ca98e29b28eec WHIRLPOOL 396fa39d6e224682caab38622f6ebcb5a4f93b9d65380b1bfb949635ef9a4ce7acb4c28ded7c7b0367e9882038911dfaa3439698b9b6ec107e96baaf3ed5f738
 EBUILD puppet-3.7.4-r1.ebuild 5256 SHA256 bdc74c4d96466e71794a330a17d9f5cee040cf0a099a0599a6393ba638552300 SHA512 82cbc7dd7723223a4fbaf168614af0f33f29266e858529216a1acae33645a8e527eacb258c7607b813ba1f9007e9f9485d95c7e1c99a6d8d96cea74304068410 WHIRLPOOL 7f64e36b93816152f93a4058b0e22bdbd3141c309f91dffd3fa41a9250bf2716c1ed1cedffec1ccae4f4247d95b93418523ee4cc8df44cb52e166770cfdee2a8
+EBUILD puppet-3.7.4-r2.ebuild 5246 SHA256 8c1b4e0d69c71c8d0de390a0a3c5192354e9ffb4f7d2ae164d87fd782886279c SHA512 fec69920ceadd6c66cd5d91f6565e4205d427013f1e30311e5d97e8b32dac331ed03a794559cc3e9d2f1d1e1dd298c76bc503bbfc2ecb2792d3503e85e5e25a8 WHIRLPOOL e4d415156f00efbb6ce8868f0a3b3744da0fec5f8a1cdc5b6a8a8d28545af315031158097d2d9d0b598b29e58f9863075bd166c9006e77fb110fa9acbe566651
 EBUILD puppet-3.7.4.ebuild 5246 SHA256 718252136edfc4d8bd4908fb8362dedd34250735a5a4ad3fa83e390ec7d1d177 SHA512 bfc2acde117d3b20ae285cdc5053884d3fd44c14ed817b22aba336b244be4f5d6e1bf8843cd367c52c6664af1524f201b1c607999de487df0e2d513c276fc824 WHIRLPOOL 3a0d4300ede47be728b30d0c4e87ae1cfa75f5146ad5675b5e38f5b6295e8431e1bbb34a07cd0a26ef908cfea91f383f5d7cb94a6cd58395b2b693cd45e7ed84
+EBUILD puppet-3.8.1-r1.ebuild 5221 SHA256 5943c19eb5bb5db2c02a25b08d34d017e00e83785e84dfe95439817b0d5a23dc SHA512 ede1726941acff9abf7c799b44b577be6b3651fcee931eb6c092775e0b88c944456a0b97829f2a04675193c259e9de9d17ccb9d5cda0f246686493b232d67445 WHIRLPOOL fdca27d4ee2d5b7076fb03b6ed42128b9fd7892802d882ad0d24a964827932f275dd9d8603fe57eeb1d603a4c2124b31e4a46d9355f9c93f407f059d7c892186
 EBUILD puppet-3.8.1.ebuild 5220 SHA256 bac4e86395d269e8876c7a24c3f86ac3f92f896c86e73642499f4af4a91c0650 SHA512 14b9a578a20367ee19cab68afeaeacbbe9fada069eccb475f4a0b1391440fa42dc44edb673487f840246141e60e67ea182bf91fb69a7b7b26a13cc4160f91fa0 WHIRLPOOL 1bc3ace1a361cf0a9efecb15196660850d0ad99f9b0a56e33a418ec06b050ee0bd90e9a09450155b8547226847d57150d3e5d55141bfba777fc7363514f60d4c
 EBUILD puppet-4.0.0-r2.ebuild 4484 SHA256 8b87ea61ca4b11a33e587364b82f6146bf1fba68bae9686fd41553d82939845f SHA512 b86ed3d3cead398c5677ee78aeae2581bcb2a773dcad8306ef7314bf1424779337727b7195a3fab6da39de64b6adc2bf18039f58b2684a1e470ba0eae119a201 WHIRLPOOL 25fe2bd9ea079a0153134f1f6dcc5c49533a04efd7f86c473412e57908fbb80ee2a4fae5d30925193e3e2704eb0ed4c83e442bd55c15059ca270d90306c88d0c
 EBUILD puppet-4.1.0.ebuild 4481 SHA256 93f731db802583371f05a30ee0d38eb38d7c460ca2aa4469eef9302c7c1f3557 SHA512 bcef899e43af8f2b01547fb330c42cdf70af20b6d4c7593d6d11d62028e36a5587e89802300db6ee8363b0f780a21cdf01dc5657e32038f2218372f1d44a5a92 WHIRLPOOL a9576c8d726d6bf421301817713a0549ff3307eaaa0c504fd505f9874812369717b61d68b543f4561cd1ed78b30431f3194747915cc2b4d90ee4d889ae8675ad
-MISC ChangeLog 36160 SHA256 4af0994ab131fa761eb31101fad5469fe98453146b8808d81c7225fae5919736 SHA512 083dbd4c98c1c6d2acb98e4ebd6028556b434b01ebcb9277d16b4c46ae5d6b9843c52704f0cb3cad4e52fb7130e46ce6719736d8ae83ab9cccbb122382cc8861 WHIRLPOOL 82ddd6c2212f085cf504a341c7d78782b283176f652fe1a7d33beba1376bbd7bc6a0099620f694522bb7876574dff394170a059a3407c213edaab3fbca24245c
+MISC ChangeLog 36378 SHA256 846e06591872c7a80862b0fd577a210cbb04c12d0f0edfece60670f5d994f09e SHA512 c5643838a956abfc1e2ab60370b531f946fbacb177ac07c2d6ff7da0118c7440ff3e3b0e96470e7f46f6fc9c88d58645bb8ce7418f6517d62297c69aec809b3d WHIRLPOOL 0376c39ae0c4cf85f80c9e6163c8621298b0895ca5d9046c5a2b9e2619e624897b1ebb52842d12090cc8097b0355cfdbc6ab5408071d96c4a36168ce6b92f46d
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWgy0cACgkQiIP6VqMIqNc5XgEAg5izTHyyUu3wFxCRHYRleDeR
-o/bFIZzZ+tHcJeiK3UIA/2zyEE2qZBvFucnpfJgYd/G50MDcHD5wNbZ2P8tcxd+N
-=RNRB
+iF4EAREIAAYFAlWgzAgACgkQiIP6VqMIqNejtgD/WR3ZP9KgKA5Y5SK04M+hwfdx
+BelysdTFZAJZRdi+3msA/312d18/0ssRu8p88Ho20tAhXBwd2ultOpc2f4a2aTgp
+=AfDh
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-3.7.4-r2.ebuild b/app-admin/puppet/puppet-3.7.4-r2.ebuild
new file mode 100644
index 000000000000..ebdd2a116b64
--- /dev/null
+++ b/app-admin/puppet/puppet-3.7.4-r2.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.7.4-r2.ebuild,v 1.1 2015/07/11 07:55:51 graaff Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
+	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
+	dev-ruby/json
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha:0.10 )"
+
+DEPEND="${DEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )"
+RDEPEND="${RDEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=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_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# Avoid Rails specs to avoid this dependency and because they
+	# currently fail against Rails 4.1.
+	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
+	rm -r spec/unit/rails || die
+	rm spec/unit/parser/collector_spec.rb || die
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+all_ruby_compile() {
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	#${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	#systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	newinitd "${FILESDIR}"/puppet.init-r1 puppet
+
+	# Initial configuration files
+	insinto /etc/puppet
+
+	# Location of log and data files
+	keepdir /var/log/puppet
+	fowners -R puppet:puppet /var/log/puppet
+
+	if use minimal ; then
+		rm "${ED}/etc/puppet/auth.conf"
+	else
+		insinto /usr/lib/systemd/system
+		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
+		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+		insinto /etc/puppet
+
+		keepdir /etc/puppet/manifests
+		keepdir /etc/puppet/modules
+
+		keepdir /var/lib/puppet/ssl
+		keepdir /var/lib/puppet/facts
+		keepdir /var/lib/puppet/files
+		fowners -R puppet:puppet /var/lib/puppet
+		fperms 0750 /var/lib/puppet
+	fi
+	fperms 0750 /etc/puppet
+	fowners :puppet /etc/puppet
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# 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 "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	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
+
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
+		elog
+		elog "If you're upgrading from 2.x then we strongly suggest you to read:"
+		elog "http://docs.puppetlabs.com/guides/upgrading.html"
+		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-3.8.1-r1.ebuild b/app-admin/puppet/puppet-3.8.1-r1.ebuild
new file mode 100644
index 000000000000..d4397c6b73cb
--- /dev/null
+++ b/app-admin/puppet/puppet-3.8.1-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.8.1-r1.ebuild,v 1.1 2015/07/11 07:55:51 graaff Exp $
+
+EAPI="5"
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	>=dev-ruby/rgen-0.7.0
+	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
+	dev-ruby/json
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+DEPEND="${DEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )"
+RDEPEND="${RDEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=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_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# Avoid Rails specs to avoid this dependency and because they
+	# currently fail against Rails 4.1.
+	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
+	rm -r spec/unit/rails || die
+	rm spec/unit/parser/collector_spec.rb || die
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+all_ruby_compile() {
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	#${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	#systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	newinitd "${FILESDIR}"/puppet.init-r1 puppet
+
+	# Initial configuration files
+	insinto /etc/puppet
+
+	# Location of log and data files
+	keepdir /var/log/puppet
+	fowners -R puppet:puppet /var/log/puppet
+
+	if use minimal ; then
+		rm "${ED}/etc/puppet/auth.conf"
+	else
+		insinto /usr/lib/systemd/system
+		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
+		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+		insinto /etc/puppet
+
+		keepdir /etc/puppet/manifests
+		keepdir /etc/puppet/modules
+
+		keepdir /var/lib/puppet/ssl
+		keepdir /var/lib/puppet/facts
+		keepdir /var/lib/puppet/files
+		fowners -R puppet:puppet /var/lib/puppet
+		fperms 0750 /var/lib/puppet
+	fi
+	fperms 0750 /etc/puppet
+	fowners :puppet /etc/puppet
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# 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 "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	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
+
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
+		elog
+		elog "If you're upgrading from 2.x then we strongly suggest you to read:"
+		elog "http://docs.puppetlabs.com/guides/upgrading.html"
+		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
+}