we provide virt-what that the rest of hiera too

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

3 files changed, 93 insertions, 15 deletions

diff --git a/app-admin/puppet-agent/ChangeLog b/app-admin/puppet-agent/ChangeLog
index e73e06d7cb2f..fede2519af8c 100644
--- a/app-admin/puppet-agent/ChangeLog
+++ b/app-admin/puppet-agent/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2015/07/28 21:43:25 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet-agent/ChangeLog,v 1.10 2015/07/29 22:12:50 prometheanfire Exp $
+
+*puppet-agent-1.2.2-r2 (29 Jul 2015)
+
+  29 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +puppet-agent-1.2.2-r2.ebuild:
+  we provide virt-what that the rest of hiera too
 
   28 Jul 2015; Matthew Thode <prometheanfire@gentoo.org> metadata.xml:
   signing
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index fba84cd29f30..022988d1a064 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -9,21 +9,22 @@ AUX puppet.service 355 SHA256 9ffee4138261d0abd9a45a38d23b16cc8beb6a90aca05d1a64
 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.2-r1.ebuild 1892 SHA256 d40ceb89c244432cebf7b8d7dbd7cd27cbae9b1b92706a9180d127858f47af1c SHA512 9579ae7c6f41b9173026e38b6f99a90915692f5c3bc0ce169e0aa950eeed4361705a7f7052c6e45965964125cea846ae37ca5fdecbd2f6ac303a0fb2b7d29c2f WHIRLPOOL 201a7f14fbe4a2e70cf4325aa3db534deeef37cc2cfea2821915f02ff85fe59072d72c19280cc5ee150e69df6ef9365caea36b1fc3e07ef2d7b89879f2b42379
-MISC ChangeLog 1506 SHA256 17e0d68b0453ed066c731c5596eec95a3447e23a23059e6323b70594a1ed619b SHA512 8c594a3be7258c381be19cd1e51e498008cf7a835fa5ad2b76c4265092ed773b1f1a963348c35677fa3f0fa6015dcae7cefc20de20f4d5a89adeb4ea86348a70 WHIRLPOOL c29ca501cf381246a86fa52f67181775ee8c922b8da243828b5cab3164b9bd485a507542384ece4ddb2ca29dfeb9625b7e0659f07feb9f865bc0bde6e33c0803
+EBUILD puppet-agent-1.2.2-r2.ebuild 2265 SHA256 be83e30d125bc07dc4c8f83e6665b87f16ccebb1ad03eb39c00dcf2867e53df4 SHA512 b62e80d01ed1f475e9890160fbd86d65b47bab09c3851e64e06338ef3413a5a021cba3b593e47e5e920f4c991e3625439fe913a0531a834f5373c370135c51a2 WHIRLPOOL 91ef61ebc73ac0e51edccbafa12f010049646ed2c2798e3ac318b3767fa48d662ad2b35ac89400fc253637f10a724510b1c2e7c60e5742f108245d386630b47c
+MISC ChangeLog 1686 SHA256 cf84756d2b2e9063ac236b5ae3bb9869d42eae2c5e19aeccd4e56950822db280 SHA512 525b1974a7d5aa2def880d908b5c1288a4df6d0cc8c157794cfd148248152b04e203fcf673240cdc0adf8e55d48a5c27fa92d14f1935bc9b7b40b843abd58278 WHIRLPOOL c48baf76717994ffbece905f07ef199559a2111216afa31f13ae16cb38f91cd8c94304c662a53cf0ebf7d16bf433580b82b59884604ff99b7ed9d05c091875bc
 MISC metadata.xml 419 SHA256 56c6b62c6abdbdb0f136d0edcb3ed57abff0f54a632274e7f78b419fa0639705 SHA512 7e1b379967953ead9fa26f09993ae50cc2e4b9fda5d30c0a5be08f8707632daf837adac1faf96f0d29f91c8b12e61710ba88f174044e646e7e253a3dc6e7927c WHIRLPOOL 1de177d45780a85ad7f2f30692461cb55a31f3146a78feaa196ab7aef16cd30caa34ce5f0d63b597d8fcc5d83a16ee9042b142d1301bf1a79e624a04140ef1ca
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJVt/fJAAoJEGSje+quGaTo3gAQAKOIuYexTrNhtOyC5m8T8BcD
-W8dMPcxyiGZ7vEybD3pBoQGAckHt0Kw1AMuk6vAymxauPQLSddfz4RJbvB7ISSw0
-BUsKjpp7TjqQvvDh46qv9QvlMpwznkHO8S39nehzemph8Xx5m3V8GUgTEnXJzybi
-BZra9JwBuhnwsMhi3njwsb0GyJfsOR+MEVUmZ/WbbrTZX7bht0dYDuw7Xry8aFxJ
-15+gG8mMfAUMhfwyLkVdqFIXANJb9dQ3F9doa3Z13W+mfZQ78E64VBAQxRGwLjFv
-uq5foIayw9NDqV8H0g6WFYXg9lYgu1k7j9eN6ShdgCmdAjQyTXOV4p91zX0uBDES
-dzocIOsLD++MrEUuuFIbVdJoYIiAEqqX0Y785LS/iZRBybsWHAxRRnjFmHslZDXo
-OL0mA51O8JvHpJdZOdm6i3HFoq0LWAPxfSSdnIBtMmser8LcuNalB0exqeEOIVPg
-ddW0sb4ULr9cKtX82Cbhv9632dBzkmis4+KUtS2/y27fQJl4Gx+ojJ1GZdhSf58q
-ghs94WruaKoeXfi1S9tIO7lhb7NIUrVEKt95xrDA0+tVa3Qs3U2yn2vtAgIWYv3h
-5gANvvv4xa2tXs2wq6PrAsNBnzBba7Br4uzNoKQhQR8laQ7IUYPbVHpNv6Rqa7Vv
-M8TBYqUJq5GlYXZYj0SJ
-=FHjF
+iQIcBAEBCAAGBQJVuVAwAAoJEGSje+quGaToR4AP+wdBeptz1hqJLTJ2IQu6jAQG
+a4Bd8MlM5JjR/S8Ox9eGkBE8qWHatd+Ic/uml5YXTmVBCq/dPpDcoc40rcmCXtdh
+UmhJMn+KO5yQQ59q6rMG9Er5ftwmOIMhQ4Zl4c8vxEKKjBqq5U8A+IrAlW4tTLWo
+abAQ2Li4eoFBUDmBwSMt4nxAxNkgI9LT5BuhhGHwCcQ2c97cfENygz1Ga+CCkMGn
+hd97aIOHKdKKHiEVSwUULlBEhlu9F2MexrCom1wJANGkkuYX2cLBaygyfF68JGar
+6fiSBG23S1+VCqMEOI7WqJHYma4fiQiBWceIR2TcmdK00kJJQYHPsr0sDO2vuOQS
+3nufA5HUJa+wkdgI7jmOBZ9UE1OJXbjxrRcGb2Ovr0cM3LeSKgQxGue6Z7LYsrJt
+0zyQ9t7MIX0Y4krSLYEpehndWVBXbH8kXoWIGACQ1+/m3Q+UT9OTv+CcmFtLC3Q2
+Or6tqJeXyrOazng62rxdi7MMnWZYy/PkpBBUARiL1hEtvESVJ74qwjRWjmGQcaLP
+EzK6CR6i00ltGP8IoLITK4aeJn+HEEloj3g49CoVlw6B8ampi/qrIVD4+ED/P4fQ
+lHDRF8+XWx2BrQ64CQpTflRtee/r8uD7OUoJ2iOONzsc9G1r/5hxTsFy5qKQ42iy
+Im38a484UqQyHxfCqRAk
+=Q7PZ
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..5966275d80f5
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild
@@ -0,0 +1,71 @@
+# 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-r2.ebuild,v 1.1 2015/07/29 22:12:50 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"
+
+CDEPEND="!app-admin/puppet
+		!app-admin/mcollective
+		!dev-ruby/hiera
+		!dev-ruby/facter
+		!app-emulation/virt-what"
+
+DEPEND="
+		${CDEPEND}"
+RDEPEND="${CDEPEND}
+		sys-apps/dmidecode
+		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/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	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
+	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}