fixes bug 429648 (eix-update issue)

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

4 files changed, 230 insertions, 7 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index ccb8f8d9385b..6dff75c8a6e8 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,12 @@
 # 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.121 2012/08/26 14:32:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.122 2012/09/10 15:38:59 prometheanfire Exp $
+
+*puppet-2.7.18-r1 (10 Sep 2012)
+
+  10 Sep 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +puppet-2.7.18-r1.ebuild, +files/puppet-2.7.18-eix_fix.patch:
+  fixing for bug 429648
 
   26 Aug 2012; Raúl Porcel <armin76@gentoo.org> puppet-2.7.18.ebuild:
   sparc stable wrt #425112
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 775ee0c45379..9688812d87c0 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 50puppet-mode-gentoo.el 217 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a WHIRLPOOL 60d02a9b70d418cb453d08c17fbeb1133a6ddd924ba18565e30f7c655f5abeebf71af6f17797d3045483ae8775c905efdc11396f4f9829ab2c6b95fbafc2584f
+AUX puppet-2.7.18-eix_fix.patch 1370 SHA256 9414e985fe18c673256dbe5e654018de3d4f8c3c33765e873e1873da7d06a4d1 SHA512 7a5aa71c6ce987c95224c79be55a4b14b4c37aef3960e1aa34e96397564042192f30f8c9f935949768e33a7191ab3ae6335830c68e9bfb2d02c654dbfdbe1fd4 WHIRLPOOL e318b8f60d787bb7947598b91168b96c6d4886602f5f6b90db7336feac00fee61f0c8b3c4c60d0de25f7bc029172a8b10ab6ce1d2115df7755db4344ccd57a3a
 AUX puppet.init 916 SHA256 edad76953e36dab793010955cb4775242271c3e4a22a193ecf1ade4f0716d2bf SHA512 1528e2c9f8d145663f9dab37a5928049ae1063570048f372ceeec3892b3b9e30aa84849056d7799a4a6d292c8227f8132142e115d6019f64050f4989e6584df8 WHIRLPOOL 6295f9eceda2ad94c5e5c9beee5a7549b043c646e8884c01375ec089805a40b037a533a8ce4c04c8f9ccbab0688ac75adceda14e528854ebfcf2d3462e26757c
 AUX puppetmaster-2.7.6.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d WHIRLPOOL d0d14ac957978d59ee6b57b53d8d2e4f00a78ac2fc9d5c279457e326fcd08c30c3ad0f884f05580a4e80a00ba02af7496469eed96a91245b2bf3141494c56058
 AUX puppetmaster-2.7.6.init 867 SHA256 3fc62b4850ccd38517d9617671bef2a5d804147383744638de67c6f2289de28c SHA512 0b40c12458fcd15458c243f34d95d2c5d58b43d5f3ee4f215f44a47f73fcd60604cb7c9ca3e71f884ca4b6a23755b7d76a143641192d5959ca0eef9a8e59d4f4 WHIRLPOOL 3f4bdb3a10cbec6933ff88db0bfa3f01a5694faf4de7952f3b39372df00b5c8f96bd534bf53e07f42c791750909711c304541eb26df2691bda701259d6cc8e48
@@ -14,13 +15,24 @@ DIST puppet-2.7.18.gem 1920000 SHA256 147cd18ec39d2768bbc40f2735a84f770d9dde1b56
 EBUILD puppet-2.7.11.ebuild 4676 SHA256 445bb40a3399ed9c86824dcbf36bfeaaa9b085d25c5ab45d1a74a767b6d1a062 SHA512 cb958e6370ea3eb64f77067d1bb0658939235f90d6f8dda518324a90a529f2f2c2ad5c6caff2bdc2506b49bd01d11dbc9f0b9e9c041ec401a45c68f9d55d8af9 WHIRLPOOL 3d161737a66af8ec1da775d2a17906f81b22c567ca315bb2ccbcdab65e238db0976498212da5e82438327e08282582f77890fc78dab3b11aa03d7315969e6827
 EBUILD puppet-2.7.12.ebuild 4694 SHA256 6f4b7db303f90bbe711280bf89e9dba6621a0fa194256c436c46815404204100 SHA512 f095dd4052fde10a2724d88825cff9edf627f4945ffd92a9728e285d4b473af8c2e5c77e99d30cabd31598bc9f94d5ee7f6b02c20d914f796c9b3af1886bb3e2 WHIRLPOOL ee898578ae71f321811bc986558c40e91a79b82796134475aa85c74cace29feccae3f81a7c06a763abf4f6de629a9f1b12624218e98009a7af99b629c0195570
 EBUILD puppet-2.7.13.ebuild 4709 SHA256 a5868883dcd5ee74d969c6e084e4dc3121c52609a0890d209fc2a1edcd7efa43 SHA512 b1843b61d936bc7a0abb3f477b84fdc77e4ef0b5360e1eb829a8a53367800dc3eddce43137f5052cd69c62213a475bd23132913229150a9128f2ecf915c6b23f WHIRLPOOL 58e3362d8a4bff4836f016b9ee83e7d40d72482236d88d1144f4c3ff71e216d953e085186d4b8847aeb6ab0c7909fa6aee4d9f3d90fffbb4df3b5e612a128b87
+EBUILD puppet-2.7.18-r1.ebuild 4767 SHA256 8cb829eab6be83b561eae599443ade5e532d201c86cc4337853d7188b31ad060 SHA512 002cb2f4b9b4e27f027d3580974ff556dd29462217c707809fc23be0d84a630cda04cad32d0f7b32bf0801f9791a52ab10a05dff7e9ec1b8f87526b3532dda5d WHIRLPOOL b05417363af54c200b7f24eea183873c2dcc59c357119fb1a034347bc19116d7a72bae52842f153efd6e83ff96f06ea5c7db1447abed8cf5937626f521149364
 EBUILD puppet-2.7.18.ebuild 4712 SHA256 4172930670e5e1e40e2985824dd99247bf4c6befdc61e0865b3b4cef1317ceac SHA512 6b546e75814a9c8aef2944f89f802ca220c01db3dd970927ae4a12a13ac29e598e4bdb4930fbcf1b66022154959de25423ee2b4779931ae9f245300cc829ceb8 WHIRLPOOL df6770a6dbcd85add1b929ba369aee2ab8181adf2ac818d593c39dc36fcd899de717cf7517da0e09554efd0a5fbb14a0d69a1b587dc4d98bcc5b5d8366a7cf58
-MISC ChangeLog 19979 SHA256 ededc4a05b946116c6c7a844001f94e3b7ffa76d5bc179688ac11170391c15a8 SHA512 05711522cc28b8c9f36747989e33243d492dccd8ec9274bc873d07e054e186d0bd8a3415aca677e16b8040707849b3ac2e7cb8039a5e91f82e60e179bd76a5b7 WHIRLPOOL 39ebd4cf665a6c89451b689dc54f8e0bf403240d02a22e7dd647a47960d5284c9eee6579737f46b91faab825f65bc9e0e17ae05567ad9f4078296c047b9d34e1
+MISC ChangeLog 20165 SHA256 16778170a0efbb89fff4a5f0d165ac88ebd541548b5ebdf3adab56da902d979c SHA512 33aed615c85f9e53d9a10001fc8f0e4c0f93bc4b115f2c654440cabf5b0d2ca755a2b56c5af1ee505cd0cac58a628a570ca30367fab527294c72fafbb92ccf0f WHIRLPOOL e00e80570196fcd0ab4975d9dc080031d4e13aea8d31512828738064462a52845f352f49d6c08342334a42fe7a7feb265a5a48a26e4728c9e763c26dba51b9d2
 MISC metadata.xml 1129 SHA256 4e7dfa915273eb359790f38782099255c8e788794539b83205ed866b400d09cf SHA512 fac3d97686bf5b0c1b31d963c245426c029163ec07219ad60513b737093dd68d6157b6fc3c14fc14f92102eb1e871165ed7804c94b47626ad34aede6a681c5e3 WHIRLPOOL 29d03b67cc4bc4d6a27958d7d5ad017ed34e80fd88c38064eedb158eb63c2ad0241cab382517a824a36af6c81a699b12890632498ca31fa2fe8f1ffd15898e1c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlA6M2cACgkQuQc30/atMkChXwCbBZPxSn1nLVo+W2IpCZYzIDX/
-4DYAoJiMPTTsW2VplP2uo0L7AsKuHErU
-=+ztv
+iQIcBAEBCAAGBQJQTgmfAAoJECRx6z5ArFrDlY0P/jTafQG1JT/F7Um7SapfrP3P
+h48BlbHiLon1m8pT3XeZvRIsSSj786bsex7xUjUbFjLEitajomXXKfR9N7+gxHPN
+CMbiGOAeQ35Y61smBDoIsfJSCL7970ojUDfhjHexgwLXt1xkE93iuCfgcXRDTcs3
+OSk4XWZd5PS8B95Na6gAHd52SUt7aNPuP1XmP0paBe2uldZn2ZZb5FQJ3yHCBblu
+9ZNP34WhJ7dVa9XMy8oc3y7BQnxXARnoUC25k9IsV/0F6t9ZK5Pw+I2gpSiRIlzv
+eS6GPlYcbb5XkWRPMupF0ud53YU5CBWGEb8GHfjTN7gpAZJpEuqDyEzlu1W8MPif
+rXpnoPyoSH+UDqHN1GOP4eA8b9sWEk1Sx0GD/HNDR+KxkoFTpCDZpEyAuZa5QzDW
+iVNB+itg5B9bcJ5EKnc97a1L1oL3MfGqCRrSKn4qXY9q6C4Wn7DA9zbky2+OIvYb
+K6urLNNTahZ1CG8boa+X7KvfuNHTr849XDriydp0U4Gbx3bm2krXPqkTH+iF9Ek5
+Btbjr4Wxs/b1isTdTfCRtv1uo7hG/JXf9RLp3Zqxkzu/67U1a3VlleTiz3EyN44L
+M1AzlRQ9U0d4xWQSqeLU1y8+vHageizRdemILWH74ECyhkXymKdqXfmFggZGMPNk
+OmcaPazIj6NbALhIvU9D
+=cckY
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/files/puppet-2.7.18-eix_fix.patch b/app-admin/puppet/files/puppet-2.7.18-eix_fix.patch
new file mode 100644
index 000000000000..f0766a87b766
--- /dev/null
+++ b/app-admin/puppet/files/puppet-2.7.18-eix_fix.patch
@@ -0,0 +1,23 @@
+diff -Naur puppet-2.7.18.orig/lib/puppet/provider/package/portage.rb puppet-2.7.18/lib/puppet/provider/package/portage.rb
+--- puppet-2.7.18.orig/lib/puppet/provider/package/portage.rb	2012-08-26 03:32:53.646824966 -0400
++++ puppet-2.7.18/lib/puppet/provider/package/portage.rb	2012-08-26 03:37:25.333824967 -0400
+@@ -20,7 +20,8 @@
+     search_format = "<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] <homepage> <description>\n"
+ 
+     begin
+-      update_eix if !FileUtils.uptodate?("/var/cache/eix", %w{/usr/bin/eix /usr/portage/metadata/timestamp})
++      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
++      update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+ 
+       search_output = nil
+       Puppet::Util::Execution.withenv :LASTVERSION => version_format do
+@@ -81,7 +82,8 @@
+     search_value = package_name
+ 
+     begin
+-      update_eix if !FileUtils.uptodate?("/var/cache/eix", %w{/usr/bin/eix /usr/portage/metadata/timestamp})
++      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
++      update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+ 
+       search_output = nil
+       Puppet::Util::Execution.withenv :LASTVERSION => version_format do
diff --git a/app-admin/puppet/puppet-2.7.18-r1.ebuild b/app-admin/puppet/puppet-2.7.18-r1.ebuild
new file mode 100644
index 000000000000..0877b347f2b1
--- /dev/null
+++ b/app-admin/puppet/puppet-2.7.18-r1.ebuild
@@ -0,0 +1,182 @@
+# 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.18-r1.ebuild,v 1.1 2012/09/10 15:38:59 prometheanfire Exp $
+
+EAPI="4"
+# ruby19: dev-ruby/ruby-ldap has no ruby19
+#USE_RUBY="ruby18 ruby19 ree18"
+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 user
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/facter-1.5.6
+	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 )
+	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 )
+	selinux? ( sec-policy/selinux-puppet )"
+RDEPEND="${RDEPEND}
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	>=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+RUBY_PATCHES=(
+	"${P}-eix_fix.patch"
+)
+
+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
+	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_fakegem_install() {
+	${RUBY} install.rb --destdir="${D}" install
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newinitd "${FILESDIR}"/puppet.init puppet
+	doconfd conf/gentoo/conf.d/puppet
+
+	# Initial configuration files
+	insinto /etc/puppet
+	# Bug #338439
+	#doins conf/gentoo/puppet/*
+	doins conf/redhat/puppet.conf
+
+	# Location of log and data files
+	keepdir /var/{run,log}/puppet
+	fowners -R puppet:puppet /var/{run,log}/puppet
+
+	if use minimal ; then
+		rm "${ED}/usr/bin/puppetmasterd"
+		rm "${ED}/etc/puppet/auth.conf"
+	else
+		newinitd "${FILESDIR}"/puppetmaster-2.7.6.init puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster-2.7.6.confd puppetmaster
+
+		insinto /etc/puppet
+		doins conf/redhat/fileserver.conf
+
+		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/{run,log,lib}/puppet
+	fi
+
+	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
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+	docinto conf; dodoc conf/namespaceauth.conf
+}
+
+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
+}