updating the conflicts to be runtime as well bug 556110

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

4 files changed, 18 insertions, 92 deletions

diff --git a/app-admin/puppet-agent/ChangeLog b/app-admin/puppet-agent/ChangeLog
index a2099fa5f1d3..aa2204816299 100644
--- a/app-admin/puppet-agent/ChangeLog
+++ b/app-admin/puppet-agent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/puppet-agent
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/ChangeLog,v 1.7 2015/07/23 22:53:12 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/ChangeLog,v 1.8 2015/07/28 21:42:09 prometheanfire Exp $
+
+*puppet-agent-1.2.2-r1 (28 Jul 2015)
+
+  28 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +puppet-agent-1.2.2-r1.ebuild, -puppet-agent-1.2.1.ebuild,
+  -puppet-agent-1.2.2.ebuild:
+  updating the conflicts to be runtime as well bug 556110
 
 *puppet-agent-1.2.2 (23 Jul 2015)
 
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 4b0cfa9f448d..eaecd4115f60 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,32 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX mcollective.initd 597 SHA256 98bfcda5af17d82c7cd9d03de0c42a1f2687be27a88e0bf52a8bfc006d530e35 SHA512 a8e93c3fa04716c91ddf2a06be6c8a9e846486c33b9982909e796c16d5ac738b2f92d5674208df3fe36438af312a98c8280b438f6236cd6ddf1a412212ef4d2f WHIRLPOOL 74f8e6d36a89711fff269009db2c784a0014c71f81f9f86408207135265aef62dc60739720aaded960c0b074a8063afd069325586f4c6064759d6e4186f49af7
 AUX mcollective.service 394 SHA256 e24038f40bea728107c233322e308e9e4d9a8248ed91031a61c8a8a8084103ac SHA512 3f220ecfd3ce2c1edf8eed34bf16c06ef957d1f7c57afe092e501dd774e7e3b512922906eca67112520e4a03866a55a440215435f0004f94b21c95e8975a1660 WHIRLPOOL 6a8fc4851961243be2915f6ff8b7f49a4dfaa6e06edb78fbeba960889f48f037cd332765ba599a755478f9657d40412580fa4645632c03585f36888247980dab
 AUX puppet-agent.conf.tmpfilesd 39 SHA256 41ea7cfc1eea6f7c125560236da8fee3fb340d5b995a746ad0d0d56100d6e6a7 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5 WHIRLPOOL 04acbc8c88abdb55db32e9f9a3bc5162724b3739e7073a508ff468097a68e0166794920c18a504e6d03f6d30a635095ee43674e98ed60facafc71e5ccf8837b0
 AUX puppet.initd 888 SHA256 bfe4a34a157dc44ac7982a6a0d1dc43cb93897d71425bd2f659b6afc3945b132 SHA512 e92c54383b454b69a8ce92ce50140901d1d9190b61bb810435a629f70cf05c1282743e5992311f140d2bbcd64ddda2447f998028ed7e625a288d7616fa956706 WHIRLPOOL 7c0a3ad15be7724b7769ac962c226c06284c530c6b19c3dbeb900973186d4295fb017be0a60ee9f3321b41113315473072d742916519d2422d01f70188a03d42
 AUX puppet.service 355 SHA256 9ffee4138261d0abd9a45a38d23b16cc8beb6a90aca05d1a64efea5b5ddc2edc SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6 WHIRLPOOL 0f64879163051ce1cb4d4ca1d17e11e9dd7abca890824a15621b635a7c1fc391010c190952b63db637c08a0eb8130bb0f9147a378206916c3e71d43e1fb8758a
-DIST puppet-agent_1.2.1-1wheezy_amd64.deb 14844872 SHA256 32cbaa58766dc6d7dd35cfa952c161fd44414110b9cd787080375fd18850bf5f SHA512 22e39fb4110d4b3c7ea2df5a7ed76f0eb5879e9dd57f8c8f0cae360640e6b4058405fd07a5ba0ac25535cedf8e8435d14f719e79e225d4500b0384685bb78425 WHIRLPOOL ab4e1c746c9c2eb3648a27ced7a765f71d4b39afeef9a46a5e8bbb17646e91f278bcac2baa9fc8ccda22b7b74685ebee0f5710b64046701dbf809849e12f29f3
-DIST puppet-agent_1.2.1-1wheezy_i386.deb 14792652 SHA256 9fd6ce453c6b5183cad74941f763d7b8fca2754d733e2b52e3b7b5e7be4c7a3d SHA512 c773b18b424fb98a6213529787a1c52216bbd5070da86a96ae03293c3b2e079b2d77511ac05501056e1ec01f2ffce3ec357c25b6150c76375d407f6b1024d26d WHIRLPOOL 9bdfcc5ac2649a6d477097abe59cec80eb30eda0ebf15af6de0e328dee51bb7f7604092006b3e274ec50419bc27b2f6c2f1f0480eed3fe7492dc65d479de9190
 DIST puppet-agent_1.2.2-1wheezy_amd64.deb 14860604 SHA256 5910ff850e8814092b50dc70a68d8c5497d5fe3d960bfef9cd13f8dc689dc665 SHA512 ad11b0ba820186f4b315ac156e8bf78348acd69d11e4c03cb12314fc73e4e3fbfef0814664e7fd04f692e8db42f9e137194e267354b2fc4ec8dda424af9f5d98 WHIRLPOOL 25c42e9f7871ccf61eb55b83327813e6090ee359c42e1e473ef09155db69adebfe412fd61a5752b4b634e5ad8aa7bd45d4a86f7e5ba29c1bdb74033b91f45c3f
 DIST puppet-agent_1.2.2-1wheezy_i386.deb 14816930 SHA256 092b8bfe1e1156322d0ab68d411487c80146bd778916409b1c907791f41a49c8 SHA512 50879ce4eebcd451dafb33cb7a12c36ee9bcaedfc29ffa0d60552efa5aa4cd66d0007061d28a80d31615c67442f8526863185e6753418772d8275e58454d6886 WHIRLPOOL 7abb0b6f52f5dd07a5ccb56b1c795c05f8c4efd18665d2ca209400e51419e4ae335e630a845c031a47df09d96ce20fbc92d7cafa082deb3872306daf74838612
-EBUILD puppet-agent-1.2.1.ebuild 1854 SHA256 b2c949de88ef1ca8c7c43f08ad49268670bedd01284f8513a503f5b21681f2ee SHA512 5945c4957561726364ddcdc29562a8758f93b71fab869c89b0298e9ee065a9f75ffe232620424064ed5c9700353a39b73d12b1af2874991fda1d3e4abc8d7ce1 WHIRLPOOL 4122f3d78afced21e3cd3773eef8933b9313a68e04448671478e6157728a2968db4fe96910655a440fb60e9d33baa3951f3a00fea3c1ba84e2fe05a1c52d1ca6
-EBUILD puppet-agent-1.2.2.ebuild 1854 SHA256 2be635f6995c48cb65b7058664a113067b13fb730e39170793dafc1de30bee64 SHA512 ab3b42cc36fe9137fa2b5bb46172c34aaec770e22f8e9e576a37203037530efa520a00c60648806d0653dd1a2e74dcfbf3552e6de4b87bc40bde13148ca32230 WHIRLPOOL 4acfa8f1169c172645548016b9b5ec26804714224feeda99400f5da2e501070ee231cd245a5bc76fee0b4cfa2bd7cda4f253e2a71af52deaf32054f7e9f841f7
-MISC ChangeLog 1179 SHA256 0d928fe110a70b4c389cd06882a8d044c4388a1631567aefd8cc7ac3d8d75fd7 SHA512 aaa449c1f7ec89cda3df8f9eb5c6293f21d167f0c885a19067be0fe02a61f2f0bcb83a1d1531080cdfe7491a4a2f887639adc402706ea26aab71bdd69e9a16ef WHIRLPOOL 402a7952cfeaceb079a76f48f26f2506f97658c8f8c1a3b09db424252856fbad5624e64e60c76568597ccc7647c910c6f1a18797240368abd6c89e83c08944b4
+EBUILD puppet-agent-1.2.2-r1.ebuild 1892 SHA256 d40ceb89c244432cebf7b8d7dbd7cd27cbae9b1b92706a9180d127858f47af1c SHA512 9579ae7c6f41b9173026e38b6f99a90915692f5c3bc0ce169e0aa950eeed4361705a7f7052c6e45965964125cea846ae37ca5fdecbd2f6ac303a0fb2b7d29c2f WHIRLPOOL 201a7f14fbe4a2e70cf4325aa3db534deeef37cc2cfea2821915f02ff85fe59072d72c19280cc5ee150e69df6ef9365caea36b1fc3e07ef2d7b89879f2b42379
+MISC ChangeLog 1424 SHA256 113892e05b864621bd4082ed8b75ae791c1d01367e7a0fe8283520d7274aafab SHA512 0d504e2faae02ff223d987f32dd74582f9e1d0f7fb1dd491774ed81433c572352aaf4035eaca80f834d7876937dd4c24b7cfb4f7588a480b1b5457a4ce8b8fc4 WHIRLPOOL a939a324f4197ddc86607961585c80cad215be63aeb3d22a9a2b49bbf1c8fd3121bdd7184eeaafb5ebda5b8c41c91f68fcd6b48b80604941f41400d57afcb208
 MISC metadata.xml 418 SHA256 0ce9d30f40186a14f9916fb95869d05661930936f0bd03781c94c890e7559576 SHA512 d95d5c2c96aba451c8af4535ef9995b199dd18331c92b84ee9beaf11b504f63a7c066cb89592149a4d3652966ea72f29c43e4665356166f4f605505a779f40c0 WHIRLPOOL de50eb1ec2a4d57d9a9c5adeb682cb66710a58100c9077f0281b1b97900fab973117fd3e8b266b91d11c49f1a4f5e67caf71ac47b0ec8aace9d3efeb20fb0ef9
------BEGIN PGP SIGNATURE-----
-
-iQIcBAEBCAAGBQJVsXCdAAoJEGSje+quGaToXBkP/2k0aI2UGqlMh7y9Phe/EWXA
-YGpoUl/jwFRweZBLF1ZSQYLj4Bw+0wo7SZrPG+XroL0bEOkG0WIBaECSwt2IVGaR
-hmRqZhBKo2o20mmcLitJMEdwpa5NddLjvS6HG2NhRWMYO40ihvpt016iQ1AMpsBR
-/I3HHZMq3UR1dKAF0kvG7tzLvk+IWlDRCeCg1o1kvzAzY8SJ/xZB1dTuLrGlcsoI
-i0NDLDmRHjzVMG7Y1bMsNUkhmoDLj6ZTCYV00TAkfBBhBsmiuVDCDnV/wqpGwwn6
-tzeNY+QN9yo45ZOnAnCtKPYivB+piXMLCUDOqvNaK7wtPPqE+OqGTggwvB4FVZE1
-xd2kaCo8VzsjTTASY3eyXwdrqXXXvnjz911UFcncitvGbKpqphKFreWgwYQQMCbm
-xq49hviBkN9df1WvwtI106uffeKkeSrwln+kK6xI021uYzqtSQlW0MFYGL/BxUvU
-l9Y5hpOTFRcvMkCJN0PMPSndzW6ZDcNCFV9EJIu0sGdeHB3hvrXkKLh7nto52MiB
-MiALl3DUmOV8W2VOmstjtBotClq0L+9TDMYcuyTfa5jXrRpQZeselYlxfIdSVdPP
-x0AbKKFo4VLgcD0LJQRsyac/MwCrN6tEpDPcD2H4VgKV2PNM6GL2YfIB/nljr58D
-m70NPs6jw0nQke0FiPi7
-=XNWt
------END PGP SIGNATURE-----
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.1.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild
index 7230185e6377..3c252ba481ae 100644
--- a/app-admin/puppet-agent/puppet-agent-1.2.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.2.2-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-agent/puppet-agent-1.2.1.ebuild,v 1.5 2015/07/20 04:51:23 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild,v 1.1 2015/07/28 21:42:09 prometheanfire Exp $
 
 EAPI=5
 inherit eutils systemd unpacker
@@ -19,13 +19,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE="puppetdb"
 RESTRICT="strip"
 
-DEPEND="
-		${DEPEND}
-		!app-admin/puppet
+CDEPEND="!app-admin/puppet
 		!app-admin/mcollective
 		!dev-ruby/hiera
 		!dev-ruby/facter"
-RDEPEND="puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
+
+DEPEND="
+		${DEPEND}
+		${CDEPEND}"
+RDEPEND="${CDEPEND}
+		puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
 
 S=${WORKDIR}
 
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.2.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.2.ebuild
deleted file mode 100644
index 4afefc7beaa8..000000000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/puppet-agent-1.2.2.ebuild,v 1.1 2015/07/23 22:53:12 prometheanfire Exp $
-
-EAPI=5
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
-		amd64? ( ${SRC_BASE}_amd64.deb )
-		x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb"
-RESTRICT="strip"
-
-DEPEND="
-		${DEPEND}
-		!app-admin/puppet
-		!app-admin/mcollective
-		!dev-ruby/hiera
-		!dev-ruby/facter"
-RDEPEND="puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
-
-S=${WORKDIR}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit "${FILESDIR}/puppet.service"
-	systemd_dounit "${FILESDIR}/mcollective.service"
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-}