removing puppetdb support, use puppet-agent instead for that

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

4 files changed, 27 insertions, 22 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 0037a8e585cf..66df5f5dc125 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,12 @@
 # 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.230 2015/07/16 05:47:32 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.231 2015/07/18 23:29:20 prometheanfire Exp $
+
+*puppet-4.2.0-r1 (18 Jul 2015)
+
+  18 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +puppet-4.2.0-r1.ebuild, -puppet-4.2.0.ebuild, metadata.xml:
+  removing puppetdb support, use puppet-agent instead for that
 
   16 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> metadata.xml,
   puppet-4.2.0.ebuild:
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index fa69166aa75d..fd5a5b0c279d 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -22,22 +22,22 @@ EBUILD puppet-3.7.4-r2.ebuild 5246 SHA256 8c1b4e0d69c71c8d0de390a0a3c5192354e9ff
 EBUILD puppet-3.8.1-r1.ebuild 5221 SHA256 5943c19eb5bb5db2c02a25b08d34d017e00e83785e84dfe95439817b0d5a23dc SHA512 ede1726941acff9abf7c799b44b577be6b3651fcee931eb6c092775e0b88c944456a0b97829f2a04675193c259e9de9d17ccb9d5cda0f246686493b232d67445 WHIRLPOOL fdca27d4ee2d5b7076fb03b6ed42128b9fd7892802d882ad0d24a964827932f275dd9d8603fe57eeb1d603a4c2124b31e4a46d9355f9c93f407f059d7c892186
 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
-EBUILD puppet-4.2.0.ebuild 4567 SHA256 af1c75d9447e450d4128a94798fb413bbb0c1ca849d7a8c0f3d57608a98b7b9a SHA512 c297df2e4a8fa313397de33f0b02377b8aca5f0fa0bf23dd17781be80dccd683669f9ab5c19aafdced3c86c52683c060c47949383cea43fe5a43085fb7fb837f WHIRLPOOL 0b292c909c644490846a3c3d339b419f5482810c0eef678e57b33da1ae598346aaa27d5e346c77ba0abb751a5ae2761fb7e9ee8b5aa52a43fcec881b63312c68
-MISC ChangeLog 36970 SHA256 bda2618a7d83d139b6d93df539112fb34de8267ee0132d03db6346e9f8d36bbf SHA512 db2840c58960a3a12dcf95f0ebbb14dd0b0079a60f75d8a257d6560371916c5dee9ef6505a4c9d2b80d9196b715b85b350d8e6a1eec6a835ce27ebaed4356830 WHIRLPOOL b1e080621a204811ed975d73fcf166d8fcafe2c1250d91c31d001214aca0b14280c2f56d667a9f6bc876642669dfb3468d001004c0826132e52becab8567a926
-MISC metadata.xml 1233 SHA256 48c86430ab086011ad1e947fbf294312684f075814d2ddb4cdf78b3c8bb4652c SHA512 3643fbb43b78bdc5e683233076bfc53517a5dca0aee0a4b9efc28b9926464b5a249228026fa6094dfb6e7b2eac419f0684bd522d8003482320dbe561af020735 WHIRLPOOL 3fe38ceb356c1cc7d4d3df7cad880480f69c7e0133911288ffc3818d09d1c9e809d580f8058818939f0e861abf52d8a74451379cb202d0acbdd8890f1f50f578
+EBUILD puppet-4.2.0-r1.ebuild 4521 SHA256 95d60a06e58a08ecc265f6a1a54358d375fa23f6d9ee335225360f12a70a51c7 SHA512 ffd12bc909bed287a63d95ddbe3ca666a86ea15d1d02b4f258ee4668b858f44e6b099fa283fb701896d93d4e372d62a68aa940f1a7acc00a09d145ae8b5cbe40 WHIRLPOOL d72d150e8583bcf68735e646ef9f6866832359367ba227b6b337df2c0f14ab0fff7ddf0273ca91174caf89a584c99840d00b9fe58d5b2014ba9612870540d955
+MISC ChangeLog 37186 SHA256 7f0c457871e5013df72679b717fa63f97866cef72fa701b7e8abcb5f90497468 SHA512 cf667e0f9f1a83530339a47207a8c86dd3faee6971ef66cb1991b223f4dcb363314b9a15b7696fa5659b0b04b5c82e8c1faa1f1b0ab330637f6343695274dbcb WHIRLPOOL 5ffc7e07bbd9519349c5cd12c1338719c81358e0f3d341d7d994244974fc2804589d0af30ca080fdb750e93e477a77244a65451ed782235ca91c0d732d8b1c73
+MISC metadata.xml 1241 SHA256 6dc0cd19fc91fdc3d38a020329de7a9eaadeaa4f96e4d779211b36b3720951ff SHA512 81a8d21ba798de148e406cc22ee465c466fbebe4c14b8e71274da8369fcf1c3e23f11514f3e061c78acd4adc9015dc664e2c20d443e38a6f9162d35f6ec2856e WHIRLPOOL 2e709845671c7cd441519203f09a5d1312dfb6a6eebac91c24fe4100c95b70a5b7e0f897f03b280dbc156ddd1fe3c2d33f820777f40e5ee3c1e55c53ff686e97
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJVp0WzAAoJEGSje+quGaToTg0QANiIYV2l0/nqDhm+a/4XdcGs
-f9cg1Z8t8Y7CsRVFzXPVF5GrffkXyw1W/1jdhGJ/enC3IlvUTXKynReYfqAsLgZ8
-lZTnLd2TcIJcPXfNeol9iYm+zYqFuroSdnBkLDMdiQrrI0EJbCFWGJxR5OsHLVwf
-biuzWjv6y7ygE6c+UCFr7qZEllx9YmxJrNiyKz28ULoz7REcymSuXk4l+K/w6JYX
-1irQh3qblUXEVLkFCLylMqt074eBCtw8Uls+D4SEx+CUzm11TXUHiFADpf/AcqEE
-hmmm25qrOEbhCPgypDVigeZYabgIcRaoz7OL4l+9tv56ceoGwHVfY0D6lCqOIvi+
-pn6ky1Bvzx70JK8I6aqSCP7ojXhbsrpq6n7HXfBKqHqnN17Q1rBXGy0RDr+ad1xi
-mlhuYoLxd9ViVtffixar8Dmv0RwZRT9hkVq8kzajWOov2DmGe4EMKdoVvtofaIkh
-Zqo9jktN0t8qBBWM7VFsBEppnRdQQVd0d97MbDRDJprn5zEzknJgJtTCqbHGh6TM
-qyHXYtkddGLb1wD5ri1l6pXGO9l/b3yO471s9LOuPJSPX48xq62m8ixohTIIe9Td
-kOOkCBLgs3R0UOrAR1l9aHdGeQz3gYteQzm8hx/O7IkecCo+NYhoOjnHhy1igDjd
-IbIvewqV2wA56Q6A4RbN
-=8LOa
+iQIcBAEBCAAGBQJVquGTAAoJEGSje+quGaToqy0P/irfAVYkFEVxelRTiKT7nQJa
++sRf4TWX/xTJfOZsTcr1SX4WeRKn6lRguqJyv5y/fcQhLv+4oYc9btMXffmLllJ9
+838bax7olJMm47uY/4IvUeuSk3GDlb5VfIHNXnh+TQ6yF0WBDvZV+WKyA8WKEweE
+O0QOT2/L9Fe82bQ6BIUF6xZdHgPUKiyVV0tDKo833NFKg49m561XD+bT9d1kWIE7
+/PLla1IlHwyFnkgKeKMPjECPK7uX1UJ3pjA6jlcdc2l9eCxYSS0/QuxPAlDAfjYY
+S3YjODtFuZHZxq1QRtfsYOwhs8C4HIEFEwPh6pOAYCUpbJBG17yUwPX+g8IdAlAu
+uF18F2xtBGP3Jc36ehJRGiiwbn8SDbImUIf+dCcb/0NyplMnzmLVDJGZP940+Vb5
+GlbGs3y8q2wBTs9BXit+SL6qspLaSZYpoCTjXMNoX7WabjRRzIZNMMUc0I2v6FLz
+hbEOdstiIu2ziw/J5a3QIHeahz1xhgnnkxueTeZq0iXi6DHE5xvlZ7F6I2lhOXh3
+MDXBCuj2uKTB9sTzZixT33UVVWSU9leSscV8ifRoaDrVogWmJnfL1iFm498KXcqx
+XyaA0CZSMNl7R/Tf8r7+AnilcMbtgOpjV0y9Mt2MRmbwOZAMZG2ISdyu49LpSFXl
+cj67fvGnHIMk2iP4Nq25
+=N5ad
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml
index b76910a66e39..93a305eeb2e8 100644
--- a/app-admin/puppet/metadata.xml
+++ b/app-admin/puppet/metadata.xml
@@ -20,7 +20,7 @@
 		and prerequisite relationships between objects clearly and explicitly.
 	</longdescription>
 	<use>
-		<flag name='puppetdb'>Enable puppetdb support</flag>
+<!--		<flag name='puppetdb'>Enable puppetdb support</flag> -->
 		<flag name='augeas'>Enable augeas support</flag>
 		<flag name='diff'>Enable diff support</flag>
 		<flag name='rrdtool'>Enable rrdtool support</flag>
diff --git a/app-admin/puppet/puppet-4.2.0.ebuild b/app-admin/puppet/puppet-4.2.0-r1.ebuild
index ce27d6aeb8ef..7dc971817654 100644
--- a/app-admin/puppet/puppet-4.2.0.ebuild
+++ b/app-admin/puppet/puppet-4.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-4.2.0.ebuild,v 1.3 2015/07/16 05:47:32 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.2.0-r1.ebuild,v 1.1 2015/07/18 23:29:20 prometheanfire Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="augeas diff doc emacs ldap puppetdb rrdtool selinux shadow sqlite vim-syntax xemacs"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
 
 ruby_add_rdepend "
 	dev-ruby/hiera
@@ -27,7 +27,6 @@ ruby_add_rdepend "
 	diff? ( dev-ruby/diff-lcs )
 	doc? ( dev-ruby/rdoc )
 	ldap? ( dev-ruby/ruby-ldap )
-	puppetdb? ( dev-ruby/puppetdb-termini )
 	shadow? ( dev-ruby/ruby-shadow )
 	sqlite? ( dev-ruby/sqlite3 )
 	virtual/ruby-ssl"
@@ -81,7 +80,7 @@ all_ruby_compile() {
 
 each_ruby_install() {
 	each_fakegem_install
-	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
 }
 
 all_ruby_install() {