From: Pacho Ramos <pacho@gentoo.org>
Date: Wed, 26 May 2010 11:15:15 +0000 (+0000)
Subject: stable amd64, bug 306195
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4015bcf520b715d6c0934cd66a819fde4c24fe77;p=gentoo.git

stable amd64, bug 306195
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 38df104153b9..86ebe2e2abe1 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.58 2010/05/19 00:12:32 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.59 2010/05/26 11:15:15 pacho Exp $
+
+  26 May 2010; Pacho Ramos <pacho@gentoo.org> puppet-0.25.4-r1.ebuild:
+  stable amd64, bug 306195
 
 *puppet-0.25.5 (18 May 2010)
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 98c6764bc389..ad3a504fd47b 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,9 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50puppet-mode-gentoo.el 217 RMD160 6ab7ace77c4e2da030c894f6b7f1a520e4950311 SHA1 7f6e97e1db4079bc45021360b0ada69c0482c008 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91
 AUX puppet-0.24.6-eix.patch 2228 RMD160 a2465eba3775cacb54d9e20f97efd6cbb3e91627 SHA1 17e828e676d6e8f6abd7b008ca250e69557b2ea9 SHA256 d822a12eaaa6eaf8316fe04fc6c9b654f0427e4d80fb6c5cd15ca2a7368bb754
 AUX puppet-0.24.8-rc-update-show.patch 961 RMD160 2fed961a81b4e5b7659db3c587b17e81ea463bc5 SHA1 832b1a2bd32e6efc0764fa82bf4ef9f705348df3 SHA256 94a32f3d969d00de29564f895426f8c7c9cdbe6b8962d051a4f28b02efa17449
@@ -19,31 +16,14 @@ DIST puppet-0.25.4.tar.gz 1424240 RMD160 67610414d6e5c41e9541eb7f392f391b94f1802
 DIST puppet-0.25.5.tar.gz 1446756 RMD160 c9b934ef9135c5b0d5abe9b97a2491e52145abb7 SHA1 5d77345c35926efb57fedbb8fe97d9ad717701c8 SHA256 88038160a4a91790475012df10396e6292dcf39c0402ac42edf89f755fb9b105
 EBUILD puppet-0.24.8-r1.ebuild 3628 RMD160 0899d628f3bf08b6db4a386680902d236a48f956 SHA1 fd01ce2d33e9055e706ff4665e9d3d41be98a05b SHA256 09d71b16ce2506306b7a22bcd8f258a5e92772bd4c713108d473ac49d96961e9
 EBUILD puppet-0.25.3.ebuild 3445 RMD160 d42c699e3dbaf5dddc268d51723f59223be76be4 SHA1 37e8cc242fd306afc0618575e5efe89ebc0e1076 SHA256 74614106c4dc2617f063c816c020567ea9e4007dd435e31371424a0ab10f95ca
-EBUILD puppet-0.25.4-r1.ebuild 3479 RMD160 a0c0ad0525d03a9cef282238fef3e134b64f5fed SHA1 8c5125282e2aa90d1b72a084de2100da00fe36c5 SHA256 44ce9066cfa2a1ff148eb14f41554e7ae1db02461a24634704bc6ea01645de44
+EBUILD puppet-0.25.4-r1.ebuild 3477 RMD160 bcf39391589e8fecf93dfb75a3d2b7445b6d7e7c SHA1 192038e8193a70a401021e5f0e911ae8d0d0b0d6 SHA256 cc49a02852b9f114a765a772469a06cebbd6b16c65f35f61a4711a16e224460f
 EBUILD puppet-0.25.5.ebuild 3468 RMD160 3a1594a36e24ad7bd19c2b5263fc5a8a535958e9 SHA1 99477ae684b457c21ee3c375ca0c1c391cc2ae42 SHA256 f1735ea1cf698ff1031404bf2ccbe1200c6d49d50f88aeabd2db901587156a92
-MISC ChangeLog 10847 RMD160 79b7df44773b9dd93d9db9b97d18e458043b5384 SHA1 fe3b8fc24c00f4dbe49d9ddddaf3558cff4d1550 SHA256 68b92b387272997e8b69d30ffb7675333afff94aac2fc393c54198cbd70d3713
+MISC ChangeLog 10945 RMD160 0a570ed2d7f836154e0c1b980c23ef4abfba12cb SHA1 c6246eed8001593fa188f2f1a7506514fb35e1ed SHA256 55868537d525c3176711da3bc963ea0b7458d667a6ddeb8798dbb84558d0e933
 MISC metadata.xml 1104 RMD160 ad88e28f2133835ffd72b6e4621bd3e5d61ed4ff SHA1 aa694fb688719a7a1fa327bbc5f40c7326daee0c SHA256 24012dce9971f449f7b4bad4402b7d229a5bb4fb073ce363ecb2b01f21c4acd2
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkvzO7UACgkQ/ejvha5XGaMi6wCgnJ+sW0/QdhorVgj/zGIrYtiO
-MGUAn1OfOvBCof0qcVjKT0HIyPoYoC7h
-=ZWQ8
-- -----END PGP SIGNATURE-----
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBAgAGBQJL9AkkAAoJECaGw+YFKA1pqTwP/3gBwpSDG7sm8FMa9M81ODAS
-q9wN8VIgPrmzt2hTzjgubCC3qdsvGbxlkdkBaZcjNwOmwJpYvFJo8RB/HLvI0ZL2
-8VQcojV3bG6gs7X43OUCH4I9lDjDjSkLXUIVlCV2aM0P53aHMBOc9u7GFwjIA9H+
-gV79cZ0lvqDM9xbbLmJNOdRWtknElueLogHB8xaiu7P3eWId8+pW/1p9mr0WlYBv
-ToL+8HD2CIjZV+a6ArD+8vIdbJXe9I/k9sKNBGv4+D3ElDQzjqq6vXjqKtoSxoPD
-NnOpLEZI8fHkxVe12KHzCSmH/OrOmCBv+AeDOCwNG4WkG6ohY4oz2mR2DwoFjaIc
-bzxeKTbUMAXASdrgOdFrYtmRMidkCppijHSGhs6ZQ9XaGr1AGSeJua+nSx1wZBqv
-qxFww6taoE8b26pi4tq+1Pdsp+oxENgTXuF6IR2bahUanHOXqC5MpBjXAkzcw842
-hIu+M6VpZ3hZb2UKqh6S6yA394uVHgm/5JcJvFHbFoQyfXvKw5TchTX/N1cXJRWP
-G586uAw4l9c2/eWmJvC3nKhe1x9zqL1CozqVdYebdVqYQCBHd2pNrSeKea7iBDU7
-sBvPrh62syKhPt9hpB7crT/UOnOglF987DqGvwBee+KKPjnFsWw7GYyab2Sgu39G
-GmBVfW8ToVjTWcjKjvEQ
-=dNTN
+iEYEARECAAYFAkv9AsgACgkQCaWpQKGI+9QVSACggILb8Sh0jSQn1WRfd0/QlRiS
+6M4Anim/sjr2KfpQevW8x76v4tOZMagH
+=u8mE
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-0.25.4-r1.ebuild b/app-admin/puppet/puppet-0.25.4-r1.ebuild
index 073a228fda95..fcdf87faf28d 100644
--- a/app-admin/puppet/puppet-0.25.4-r1.ebuild
+++ b/app-admin/puppet/puppet-0.25.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.25.4-r1.ebuild,v 1.4 2010/04/11 12:22:42 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-0.25.4-r1.ebuild,v 1.5 2010/05/26 11:15:15 pacho Exp $
 
 EAPI="2"
 inherit elisp-common eutils ruby
@@ -12,7 +12,7 @@ SRC_URI="http://reductivelabs.com/downloads/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="augeas emacs ldap rrdtool shadow vim-syntax"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 DEPEND="dev-lang/ruby[ssl]
 	emacs? ( virtual/emacs )